From bb2de53d93adb517fbfcfb37e33adc959b2848b3 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 18 Nov 2007 14:32:39 +0000
Subject: [PATCH 001/710] Added an alternate theme which provides issue list
 colorization based on issues priority.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@912 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/issues/show.rhtml                   |  2 +-
 .../alternate/stylesheets/application.css     | 68 +++++++++++++++++++
 2 files changed, 69 insertions(+), 1 deletion(-)
 create mode 100644 public/themes/alternate/stylesheets/application.css

diff --git a/app/views/issues/show.rhtml b/app/views/issues/show.rhtml
index 0745f01f3..6e4f22574 100644
--- a/app/views/issues/show.rhtml
+++ b/app/views/issues/show.rhtml
@@ -10,7 +10,7 @@
 
 <h2><%= @issue.tracker.name %> #<%= @issue.id %></h2>
 
-<div class="issue">
+<div class="issue <%= "status-#{@issue.status.position} priority-#{@issue.priority.position}" %>">
         <h3><%=h @issue.subject %></h3>
         <p class="author">
         <%= authoring @issue.created_on, @issue.author %>.
diff --git a/public/themes/alternate/stylesheets/application.css b/public/themes/alternate/stylesheets/application.css
new file mode 100644
index 000000000..ced63a418
--- /dev/null
+++ b/public/themes/alternate/stylesheets/application.css
@@ -0,0 +1,68 @@
+@import url(../../../stylesheets/application.css);
+
+body { background-color:#EEEEEE; }
+#header, #top-menu { margin: 0px 10px 0px 11px; }
+#main { background: #EEEEEE; margin: 8px 10px 0px 10px; }
+#content { background: #fff; border-right: 1px solid #bbb; border-bottom: 1px solid #bbb; border-left: 1px solid #d7d7d7; border-top: 1px solid #d7d7d7; }
+#footer { background-color:#EEEEEE; border: 0px; }
+
+/* Headers */
+h2, h3, h4, .wiki h1, .wiki h2, .wiki h3 {border-bottom: 0px;}
+
+/* Menu */
+#main-menu li a { background-color: #507AAA; font-weight: bold;}
+#main-menu li a:hover { background: #507AAA; text-decoration: underline; }
+
+/* Tables */
+table.list tbody td, table.list tbody tr:hover td { border: solid 1px #d7d7d7; }
+table.list thead th {
+    border-width: 1px;
+    border-style: solid;
+    border-top-color: #d7d7d7;
+    border-right-color: #d7d7d7;
+    border-left-color: #d7d7d7;
+    border-bottom-color: #999999;
+}
+
+/* Issues grid styles by priorities (provided by Wynn Netherland) */
+table.list tr.issue a { color: #666; }
+
+tr.odd.priority-5, table.list tbody tr.odd.priority-5:hover { color: #900; font-weight: bold; }
+tr.odd.priority-5 { background: #ffc4c4; }
+tr.even.priority-5, table.list tbody tr.even.priority-5:hover { color: #900; font-weight: bold; }
+tr.even.priority-5 { background: #ffd4d4; }
+tr.priority-5 a, tr.priority-5:hover a { color: #900; }
+tr.odd.priority-5 td, tr.even.priority-5 td { border-color: #ffb4b4; }
+
+tr.odd.priority-4, table.list tbody tr.odd.priority-4:hover { color: #900; }
+tr.odd.priority-4 { background: #ffc4c4; }
+tr.even.priority-4, table.list tbody tr.even.priority-4:hover { color: #900; }
+tr.even.priority-4 { background: #ffd4d4; }
+tr.priority-4 a { color: #900; }
+tr.odd.priority-4 td, tr.even.priority-4 td { border-color: #ffb4b4; }
+
+tr.odd.priority-3, table.list tbody tr.odd.priority-3:hover { color: #900; }
+tr.odd.priority-3 { background: #fee; }
+tr.even.priority-3, table.list tbody tr.even.priority-3:hover { color: #900; }
+tr.even.priority-3 { background: #fff2f2; }
+tr.priority-3 a { color: #900; }
+tr.odd.priority-3 td, tr.even.priority-3 td { border-color: #fcc; }
+
+tr.odd.priority-1, table.list tbody tr.odd.priority-1:hover { color: #559; }
+tr.odd.priority-1 { background: #eaf7ff; }
+tr.even.priority-1, table.list tbody tr.even.priority-1:hover { color: #559; }
+tr.even.priority-1 { background: #f2faff; }
+tr.priority-1 a { color: #559; }
+tr.odd.priority-1 td, tr.even.priority-1 td { border-color: #add7f3; }
+
+/* Buttons */
+input[type="button"], input[type="submit"], input[type="reset"] { background-color: #f2f2f2; color: #222222; border: 1px outset #cccccc; }
+input[type="button"]:hover, input[type="submit"]:hover, input[type="reset"]:hover { background-color: #ccccbb; }
+
+/* Fields */
+input[type="text"], textarea, select { padding: 2px; border: 1px solid #d7d7d7; }
+input[type="text"] { padding: 3px; }
+input[type="text"]:focus, textarea:focus, select:focus { border: 1px solid #888866; }
+
+/* Misc */
+.box { background-color: #fcfcfc; }

From f8aa2dc9b71640a4da008e8ef0968a8cd9ce7385 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 18 Nov 2007 15:53:58 +0000
Subject: [PATCH 002/710] 'fixed version' field can now be displayed on the
 issue list. Category and fixed version fields added to the CSV export.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@914 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/issues_controller.rb | 2 +-
 app/helpers/issues_helper.rb         | 6 +++++-
 app/models/query.rb                  | 1 +
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index a1f910243..92443441c 100644
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -49,7 +49,7 @@ class IssuesController < ApplicationController
       @issue_count = Issue.count(:include => [:status, :project], :conditions => @query.statement)
       @issue_pages = Paginator.new self, @issue_count, limit, params['page']
       @issues = Issue.find :all, :order => sort_clause,
-                           :include => [ :assigned_to, :status, :tracker, :project, :priority, :category ],
+                           :include => [ :assigned_to, :status, :tracker, :project, :priority, :category, :fixed_version ],
                            :conditions => @query.statement,
                            :limit  =>  limit,
                            :offset =>  @issue_pages.current.offset
diff --git a/app/helpers/issues_helper.rb b/app/helpers/issues_helper.rb
index c779c9d16..f9a88f6dd 100644
--- a/app/helpers/issues_helper.rb
+++ b/app/helpers/issues_helper.rb
@@ -116,6 +116,8 @@ module IssuesHelper
                   l(:field_priority),
                   l(:field_subject),
                   l(:field_assigned_to),
+                  l(:field_category),
+                  l(:field_fixed_version),
                   l(:field_author),
                   l(:field_start_date),
                   l(:field_due_date),
@@ -136,7 +138,9 @@ module IssuesHelper
                   issue.tracker.name, 
                   issue.priority.name,
                   issue.subject,
-                  (issue.assigned_to ? issue.assigned_to.name : ""),
+                  issue.assigned_to,
+                  issue.category,
+                  issue.fixed_version,
                   issue.author.name,
                   issue.start_date ? l_date(issue.start_date) : nil,
                   issue.due_date ? l_date(issue.due_date) : nil,
diff --git a/app/models/query.rb b/app/models/query.rb
index 8b15e294b..30df55b96 100644
--- a/app/models/query.rb
+++ b/app/models/query.rb
@@ -100,6 +100,7 @@ class Query < ActiveRecord::Base
     QueryColumn.new(:assigned_to, :sortable => "#{User.table_name}.lastname"),
     QueryColumn.new(:updated_on, :sortable => "#{Issue.table_name}.updated_on"),
     QueryColumn.new(:category, :sortable => "#{IssueCategory.table_name}.name"),
+    QueryColumn.new(:fixed_version),
     QueryColumn.new(:start_date, :sortable => "#{Issue.table_name}.start_date"),
     QueryColumn.new(:due_date, :sortable => "#{Issue.table_name}.due_date"),
     QueryColumn.new(:estimated_hours, :sortable => "#{Issue.table_name}.estimated_hours"),

From 9c9ae217716304f7062fc31c2f4e4f8adafee2b1 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 18 Nov 2007 17:46:55 +0000
Subject: [PATCH 003/710] There's now 3 account activation strategies
 (available in application settings): * activation by email: the user receives
 an email containing a link to active his account * manual activation: an
 email is sent to administrators for account approval (default) * automatic
 activation: the user can log in as soon as he has registered

git-svn-id: http://redmine.rubyforge.org/svn/trunk@915 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/account_controller.rb         | 68 ++++++++++++-------
 app/models/mailer.rb                          | 10 ++-
 app/views/account/register.rhtml              |  3 -
 ...account_activation_request.text.html.rhtml |  2 +
 ...ccount_activation_request.text.plain.rhtml |  2 +
 app/views/settings/edit.rhtml                 |  7 +-
 config/settings.yml                           |  2 +-
 lang/bg.yml                                   |  6 ++
 lang/cs.yml                                   |  6 ++
 lang/de.yml                                   |  6 ++
 lang/en.yml                                   | 10 ++-
 lang/es.yml                                   |  6 ++
 lang/fr.yml                                   | 10 ++-
 lang/he.yml                                   |  6 ++
 lang/it.yml                                   |  6 ++
 lang/ja.yml                                   |  6 ++
 lang/ko.yml                                   |  8 ++-
 lang/nl.yml                                   |  6 ++
 lang/pl.yml                                   |  6 ++
 lang/pt-br.yml                                |  6 ++
 lang/pt.yml                                   |  6 ++
 lang/ro.yml                                   |  6 ++
 lang/ru.yml                                   |  6 ++
 lang/sr.yml                                   |  6 ++
 lang/sv.yml                                   |  6 ++
 lang/zh.yml                                   |  6 ++
 test/integration/account_test.rb              | 43 +++++++++++-
 27 files changed, 226 insertions(+), 35 deletions(-)
 create mode 100644 app/views/mailer/account_activation_request.text.html.rhtml
 create mode 100644 app/views/mailer/account_activation_request.text.plain.rhtml

diff --git a/app/controllers/account_controller.rb b/app/controllers/account_controller.rb
index e8e70076b..37a810bdf 100644
--- a/app/controllers/account_controller.rb
+++ b/app/controllers/account_controller.rb
@@ -21,7 +21,7 @@ class AccountController < ApplicationController
   include CustomFieldsHelper   
   
   # prevents login action to be filtered by check_if_login_required application scope filter
-  skip_before_filter :check_if_login_required, :only => [:login, :lost_password, :register]
+  skip_before_filter :check_if_login_required, :only => [:login, :lost_password, :register, :activate]
 
   # Show user's account
   def show
@@ -106,40 +106,62 @@ class AccountController < ApplicationController
   # User self-registration
   def register
     redirect_to(home_url) && return unless Setting.self_registration?
-    if params[:token]
-      token = Token.find_by_action_and_value("register", params[:token])
-      redirect_to(home_url) && return unless token and !token.expired?
-      user = token.user
-      redirect_to(home_url) && return unless user.status == User::STATUS_REGISTERED
-      user.status = User::STATUS_ACTIVE
-      if user.save
-        token.destroy
-        flash[:notice] = l(:notice_account_activated)
-        redirect_to :action => 'login'
-        return
-      end      
+    if request.get?
+      @user = User.new(:language => Setting.default_language)
+      @custom_values = UserCustomField.find(:all).collect { |x| CustomValue.new(:custom_field => x, :customized => @user) }
     else
-      if request.get?
-        @user = User.new(:language => Setting.default_language)
-        @custom_values = UserCustomField.find(:all).collect { |x| CustomValue.new(:custom_field => x, :customized => @user) }
-      else
-        @user = User.new(params[:user])
-        @user.admin = false
-        @user.login = params[:user][:login]
-        @user.status = User::STATUS_REGISTERED
-        @user.password, @user.password_confirmation = params[:password], params[:password_confirmation]
+      @user = User.new(params[:user])
+      @user.admin = false
+      @user.login = params[:user][:login]
+      @user.status = User::STATUS_REGISTERED
+      @user.password, @user.password_confirmation = params[:password], params[:password_confirmation]
+      if params["custom_fields"]
         @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
+      end
+      case Setting.self_registration
+      when '1'
+        # Email activation
         token = Token.new(:user => @user, :action => "register")
         if @user.save and token.save
           Mailer.deliver_register(token)
           flash[:notice] = l(:notice_account_register_done)
-          redirect_to :controller => 'account', :action => 'login'
+          redirect_to :action => 'login'
+        end
+      when '3'
+        # Automatic activation
+        @user.status = User::STATUS_ACTIVE
+        if @user.save
+          flash[:notice] = l(:notice_account_activated)
+          redirect_to :action => 'login'
+        end
+      else
+        # Manual activation by the administrator
+        if @user.save
+          # Sends an email to the administrators
+          Mailer.deliver_account_activation_request(@user)
+          flash[:notice] = l(:notice_account_pending)
+          redirect_to :action => 'login'
         end
       end
     end
   end
   
+  # Token based account activation
+  def activate
+    redirect_to(home_url) && return unless Setting.self_registration? && params[:token]
+    token = Token.find_by_action_and_value('register', params[:token])
+    redirect_to(home_url) && return unless token and !token.expired?
+    user = token.user
+    redirect_to(home_url) && return unless user.status == User::STATUS_REGISTERED
+    user.status = User::STATUS_ACTIVE
+    if user.save
+      token.destroy
+      flash[:notice] = l(:notice_account_activated)
+    end
+    redirect_to :action => 'login'
+  end
+  
 private
   def logged_user=(user)
     if user && user.is_a?(User)
diff --git a/app/models/mailer.rb b/app/models/mailer.rb
index aa372120d..fe432e9a6 100644
--- a/app/models/mailer.rb
+++ b/app/models/mailer.rb
@@ -88,6 +88,14 @@ class Mailer < ActionMailer::Base
          :password => password,
          :login_url => url_for(:controller => 'account', :action => 'login')
   end
+  
+  def account_activation_request(user)
+    # Send the email to all active administrators
+    recipients User.find_active(:all, :conditions => {:admin => true}).collect { |u| u.mail }.compact
+    subject l(:mail_subject_account_activation_request)
+    body :user => user,
+         :url => url_for(:controller => 'users', :action => 'index', :status => User::STATUS_REGISTERED, :sort_key => 'created_on', :sort_order => 'desc')
+  end
 
   def lost_password(token)
     set_language_if_valid(token.user.language)
@@ -102,7 +110,7 @@ class Mailer < ActionMailer::Base
     recipients token.user.mail
     subject l(:mail_subject_register)
     body :token => token,
-         :url => url_for(:controller => 'account', :action => 'register', :token => token.value)
+         :url => url_for(:controller => 'account', :action => 'activate', :token => token.value)
   end
   
   def test(user)
diff --git a/app/views/account/register.rhtml b/app/views/account/register.rhtml
index ef9a12ac0..f04bfbb0e 100644
--- a/app/views/account/register.rhtml
+++ b/app/views/account/register.rhtml
@@ -29,9 +29,6 @@
 <% for @custom_value in @custom_values %>
 	<p><%= custom_field_tag_with_label @custom_value %></p>
 <% end %>
-
-<p><label for="user_mail_notification"><%=l(:field_mail_notification)%></label>
-<%= check_box 'user', 'mail_notification' %></p>
 <!--[eoform:user]-->
 </div>
 
diff --git a/app/views/mailer/account_activation_request.text.html.rhtml b/app/views/mailer/account_activation_request.text.html.rhtml
new file mode 100644
index 000000000..145ecfc8e
--- /dev/null
+++ b/app/views/mailer/account_activation_request.text.html.rhtml
@@ -0,0 +1,2 @@
+<p><%= l(:mail_body_account_activation_request, @user.login) %></p>
+<p><%= link_to @url, @url %></p>
diff --git a/app/views/mailer/account_activation_request.text.plain.rhtml b/app/views/mailer/account_activation_request.text.plain.rhtml
new file mode 100644
index 000000000..f431e22d3
--- /dev/null
+++ b/app/views/mailer/account_activation_request.text.plain.rhtml
@@ -0,0 +1,2 @@
+<%= l(:mail_body_account_activation_request, @user.login) %>
+<%= @url %>
diff --git a/app/views/settings/edit.rhtml b/app/views/settings/edit.rhtml
index 62aa7974c..9b4cc2d57 100644
--- a/app/views/settings/edit.rhtml
+++ b/app/views/settings/edit.rhtml
@@ -78,7 +78,12 @@
 <%= select_tag 'settings[autologin]', options_for_select( [[l(:label_disabled), "0"]] + [1, 7, 30, 365].collect{|days| [lwr(:actionview_datehelper_time_in_words_day, days), days.to_s]}, Setting.autologin) %></p>
 
 <p><label><%= l(:setting_self_registration) %></label>
-<%= check_box_tag 'settings[self_registration]', 1, Setting.self_registration? %><%= hidden_field_tag 'settings[self_registration]', 0 %></p>
+<%= select_tag 'settings[self_registration]',
+      options_for_select( [[l(:label_disabled), "0"],
+                           [l(:label_registration_activation_by_email), "1"],
+                           [l(:label_registration_manual_activation), "2"],
+                           [l(:label_registration_automatic_activation), "3"]
+                          ], Setting.self_registration ) %></p>
 
 <p><label><%= l(:label_password_lost) %></label>
 <%= check_box_tag 'settings[lost_password]', 1, Setting.lost_password? %><%= hidden_field_tag 'settings[lost_password]', 0 %></p>
diff --git a/config/settings.yml b/config/settings.yml
index c59a5242e..e9b9eebfd 100644
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -28,7 +28,7 @@ welcome_text:
 login_required:
   default: 0
 self_registration:
-  default: 1
+  default: '2'
 lost_password:
   default: 1
 attachment_max_size:
diff --git a/lang/bg.yml b/lang/bg.yml
index 09a943973..b60173ae1 100644
--- a/lang/bg.yml
+++ b/lang/bg.yml
@@ -538,3 +538,9 @@ mail_body_account_information: Your Redmine account information
 setting_protocol: Protocol
 label_user_mail_no_self_notified: "I don't want to be notified of changes that I make myself"
 setting_time_format: Time format
+label_registration_activation_by_email: account activation by email
+mail_subject_account_activation_request: Redmine account activation request
+mail_body_account_activation_request: 'A new user (%s) has registered. His account his pending your approval:'
+label_registration_automatic_activation: automatic account activation
+label_registration_manual_activation: manual account activation
+notice_account_pending: "Your account was created and is now pending administrator approval."
diff --git a/lang/cs.yml b/lang/cs.yml
index 493bc77a5..487ec967a 100644
--- a/lang/cs.yml
+++ b/lang/cs.yml
@@ -538,3 +538,9 @@ mail_body_account_information: Your Redmine account information
 setting_protocol: Protocol
 label_user_mail_no_self_notified: "I don't want to be notified of changes that I make myself"
 setting_time_format: Time format
+label_registration_activation_by_email: account activation by email
+mail_subject_account_activation_request: Redmine account activation request
+mail_body_account_activation_request: 'A new user (%s) has registered. His account his pending your approval:'
+label_registration_automatic_activation: automatic account activation
+label_registration_manual_activation: manual account activation
+notice_account_pending: "Your account was created and is now pending administrator approval."
diff --git a/lang/de.yml b/lang/de.yml
index 7463e93ec..fc00753b3 100644
--- a/lang/de.yml
+++ b/lang/de.yml
@@ -538,3 +538,9 @@ mail_body_account_information: Your Redmine account information
 setting_protocol: Protocol
 label_user_mail_no_self_notified: "I don't want to be notified of changes that I make myself"
 setting_time_format: Time format
+label_registration_activation_by_email: account activation by email
+mail_subject_account_activation_request: Redmine account activation request
+mail_body_account_activation_request: 'A new user (%s) has registered. His account his pending your approval:'
+label_registration_automatic_activation: automatic account activation
+label_registration_manual_activation: manual account activation
+notice_account_pending: "Your account was created and is now pending administrator approval."
diff --git a/lang/en.yml b/lang/en.yml
index c51a76c80..1df0cf7c9 100644
--- a/lang/en.yml
+++ b/lang/en.yml
@@ -75,6 +75,7 @@ notice_email_error: An error occurred while sending mail (%s)
 notice_feeds_access_key_reseted: Your RSS access key was reseted.
 notice_failed_to_save_issues: "Failed to save %d issue(s) on %d selected: %s."
 notice_no_issue_selected: "No issue is selected! Please, check the issues you want to edit."
+notice_account_pending: "Your account was created and is now pending administrator approval."
 
 mail_subject_lost_password: Your Redmine password
 mail_body_lost_password: 'To change your Redmine password, click on the following link:'
@@ -82,6 +83,8 @@ mail_subject_register: Redmine account activation
 mail_body_register: 'To activate your Redmine account, click on the following link:'
 mail_body_account_information_external: You can use your "%s" account to log into Redmine.
 mail_body_account_information: Your Redmine account information
+mail_subject_account_activation_request: Redmine account activation request
+mail_body_account_activation_request: 'A new user (%s) has registered. His account his pending your approval:'
 
 gui_validation_error: 1 error
 gui_validation_error_plural: %d errors
@@ -171,8 +174,8 @@ setting_app_title: Application title
 setting_app_subtitle: Application subtitle
 setting_welcome_text: Welcome text
 setting_default_language: Default language
-setting_login_required: Authent. required
-setting_self_registration: Self-registration enabled
+setting_login_required: Authentication required
+setting_self_registration: Self-registration
 setting_attachment_max_size: Attachment max. size
 setting_issues_export_limit: Issues export limit
 setting_mail_from: Emission email address
@@ -446,6 +449,9 @@ label_user_mail_option_all: "For any event on all my projects"
 label_user_mail_option_selected: "For any event on the selected projects only..."
 label_user_mail_option_none: "Only for things I watch or I'm involved in"
 label_user_mail_no_self_notified: "I don't want to be notified of changes that I make myself"
+label_registration_activation_by_email: account activation by email
+label_registration_manual_activation: manual account activation
+label_registration_automatic_activation: automatic account activation
 
 button_login: Login
 button_submit: Submit
diff --git a/lang/es.yml b/lang/es.yml
index 6807cacb9..5175e6c19 100644
--- a/lang/es.yml
+++ b/lang/es.yml
@@ -541,3 +541,9 @@ mail_body_account_information: Your Redmine account information
 setting_protocol: Protocol
 label_user_mail_no_self_notified: "I don't want to be notified of changes that I make myself"
 setting_time_format: Time format
+label_registration_activation_by_email: account activation by email
+mail_subject_account_activation_request: Redmine account activation request
+mail_body_account_activation_request: 'A new user (%s) has registered. His account his pending your approval:'
+label_registration_automatic_activation: automatic account activation
+label_registration_manual_activation: manual account activation
+notice_account_pending: "Your account was created and is now pending administrator approval."
diff --git a/lang/fr.yml b/lang/fr.yml
index a44604a0d..8e1af9a4f 100644
--- a/lang/fr.yml
+++ b/lang/fr.yml
@@ -75,6 +75,7 @@ notice_email_error: "Erreur lors de l'envoi de l'email (%s)"
 notice_feeds_access_key_reseted: Votre clé d'accès aux flux RSS a été réinitialisée.
 notice_failed_to_save_issues: "%d demande(s) sur les %d sélectionnées n'ont pas pu être mise(s) à jour: %s."
 notice_no_issue_selected: "Aucune demande sélectionnée ! Cochez les demandes que vous voulez mettre à jour."
+notice_account_pending: "Votre compte a été créé et attend l'approbation de l'administrateur."
 
 mail_subject_lost_password: Votre mot de passe redMine
 mail_body_lost_password: 'Pour changer votre mot de passe Redmine, cliquez sur le lien suivant:'
@@ -82,6 +83,8 @@ mail_subject_register: Activation de votre compte redMine
 mail_body_register: 'Pour activer votre compte Redmine, cliquez sur le lien suivant:'
 mail_body_account_information_external: Vous pouvez utiliser votre compte "%s" pour vous connecter à Redmine.
 mail_body_account_information: Paramètres de connexion de votre compte Redmine
+mail_subject_account_activation_request: "Demande d'activation d'un compte Redmine"
+mail_body_account_activation_request: "Un nouvel utilisateur (%s) s'est inscrit. Son compte nécessite votre approbation:"
 
 gui_validation_error: 1 erreur
 gui_validation_error_plural: %d erreurs
@@ -171,8 +174,8 @@ setting_app_title: Titre de l'application
 setting_app_subtitle: Sous-titre de l'application
 setting_welcome_text: Texte d'accueil
 setting_default_language: Langue par défaut
-setting_login_required: Authentif. obligatoire
-setting_self_registration: Enregistrement autorisé
+setting_login_required: Authentification obligatoire
+setting_self_registration: Inscription des nouveaux utilisateurs
 setting_attachment_max_size: Taille max des fichiers
 setting_issues_export_limit: Limite export demandes
 setting_mail_from: Adresse d'émission
@@ -446,6 +449,9 @@ label_user_mail_option_all: "Pour tous les événements de tous mes projets"
 label_user_mail_option_selected: "Pour tous les événements des projets sélectionnés..."
 label_user_mail_option_none: "Seulement pour ce que je surveille ou à quoi je participe"
 label_user_mail_no_self_notified: "Je ne veux pas être notifié des changements que j'effectue"
+label_registration_activation_by_email: activation du compte par email
+label_registration_manual_activation: activation manuelle du compte
+label_registration_automatic_activation: activation automatique du compte
 
 button_login: Connexion
 button_submit: Soumettre
diff --git a/lang/he.yml b/lang/he.yml
index 089cfdc7d..26e808e00 100644
--- a/lang/he.yml
+++ b/lang/he.yml
@@ -538,3 +538,9 @@ mail_body_account_information: Your Redmine account information
 setting_protocol: Protocol
 label_user_mail_no_self_notified: "I don't want to be notified of changes that I make myself"
 setting_time_format: Time format
+label_registration_activation_by_email: account activation by email
+mail_subject_account_activation_request: Redmine account activation request
+mail_body_account_activation_request: 'A new user (%s) has registered. His account his pending your approval:'
+label_registration_automatic_activation: automatic account activation
+label_registration_manual_activation: manual account activation
+notice_account_pending: "Your account was created and is now pending administrator approval."
diff --git a/lang/it.yml b/lang/it.yml
index 13c848935..a80070894 100644
--- a/lang/it.yml
+++ b/lang/it.yml
@@ -538,3 +538,9 @@ mail_body_account_information: Your Redmine account information
 setting_protocol: Protocol
 label_user_mail_no_self_notified: "I don't want to be notified of changes that I make myself"
 setting_time_format: Time format
+label_registration_activation_by_email: account activation by email
+mail_subject_account_activation_request: Redmine account activation request
+mail_body_account_activation_request: 'A new user (%s) has registered. His account his pending your approval:'
+label_registration_automatic_activation: automatic account activation
+label_registration_manual_activation: manual account activation
+notice_account_pending: "Your account was created and is now pending administrator approval."
diff --git a/lang/ja.yml b/lang/ja.yml
index 6fd8dfcc6..86a104d15 100644
--- a/lang/ja.yml
+++ b/lang/ja.yml
@@ -539,3 +539,9 @@ mail_body_account_information: Your Redmine account information
 setting_protocol: Protocol
 label_user_mail_no_self_notified: "I don't want to be notified of changes that I make myself"
 setting_time_format: Time format
+label_registration_activation_by_email: account activation by email
+mail_subject_account_activation_request: Redmine account activation request
+mail_body_account_activation_request: 'A new user (%s) has registered. His account his pending your approval:'
+label_registration_automatic_activation: automatic account activation
+label_registration_manual_activation: manual account activation
+notice_account_pending: "Your account was created and is now pending administrator approval."
diff --git a/lang/ko.yml b/lang/ko.yml
index 9998f2f64..e46a63959 100644
--- a/lang/ko.yml
+++ b/lang/ko.yml
@@ -170,7 +170,7 @@ setting_app_subtitle: Application subtitle
 setting_welcome_text: Welcome text
 setting_default_language: Default language
 setting_login_required: Authent. required
-setting_self_registration: Self-registration enabled
+setting_self_registration: Self-registration
 setting_attachment_max_size: Attachment max. size
 setting_issues_export_limit: Issues export limit
 setting_mail_from: Emission mail address
@@ -538,3 +538,9 @@ setting_protocol: Protocol
 mail_body_account_information: Your Redmine account information
 label_user_mail_no_self_notified: "I don't want to be notified of changes that I make myself"
 setting_time_format: Time format
+label_registration_activation_by_email: account activation by email
+mail_subject_account_activation_request: Redmine account activation request
+mail_body_account_activation_request: 'A new user (%s) has registered. His account his pending your approval:'
+label_registration_automatic_activation: automatic account activation
+label_registration_manual_activation: manual account activation
+notice_account_pending: "Your account was created and is now pending administrator approval."
diff --git a/lang/nl.yml b/lang/nl.yml
index ab1913e19..1758514a8 100644
--- a/lang/nl.yml
+++ b/lang/nl.yml
@@ -539,3 +539,9 @@ mail_body_account_information: Your Redmine account information
 setting_protocol: Protocol
 label_user_mail_no_self_notified: "I don't want to be notified of changes that I make myself"
 setting_time_format: Time format
+label_registration_activation_by_email: account activation by email
+mail_subject_account_activation_request: Redmine account activation request
+mail_body_account_activation_request: 'A new user (%s) has registered. His account his pending your approval:'
+label_registration_automatic_activation: automatic account activation
+label_registration_manual_activation: manual account activation
+notice_account_pending: "Your account was created and is now pending administrator approval."
diff --git a/lang/pl.yml b/lang/pl.yml
index 0b433bacb..e2d90de74 100644
--- a/lang/pl.yml
+++ b/lang/pl.yml
@@ -538,3 +538,9 @@ mail_body_account_information: Twoje konto w Redmine
 setting_protocol: Protocol
 label_user_mail_no_self_notified: "I don't want to be notified of changes that I make myself"
 setting_time_format: Time format
+label_registration_activation_by_email: account activation by email
+mail_subject_account_activation_request: Redmine account activation request
+mail_body_account_activation_request: 'A new user (%s) has registered. His account his pending your approval:'
+label_registration_automatic_activation: automatic account activation
+label_registration_manual_activation: manual account activation
+notice_account_pending: "Your account was created and is now pending administrator approval."
diff --git a/lang/pt-br.yml b/lang/pt-br.yml
index d4f51b61d..80c57d3f4 100644
--- a/lang/pt-br.yml
+++ b/lang/pt-br.yml
@@ -538,3 +538,9 @@ mail_body_account_information: Your Redmine account information
 setting_protocol: Protocol
 label_user_mail_no_self_notified: "I don't want to be notified of changes that I make myself"
 setting_time_format: Time format
+label_registration_activation_by_email: account activation by email
+mail_subject_account_activation_request: Redmine account activation request
+mail_body_account_activation_request: 'A new user (%s) has registered. His account his pending your approval:'
+label_registration_automatic_activation: automatic account activation
+label_registration_manual_activation: manual account activation
+notice_account_pending: "Your account was created and is now pending administrator approval."
diff --git a/lang/pt.yml b/lang/pt.yml
index bfd89bbae..00d136416 100644
--- a/lang/pt.yml
+++ b/lang/pt.yml
@@ -538,3 +538,9 @@ mail_body_account_information: Your Redmine account information
 setting_protocol: Protocol
 label_user_mail_no_self_notified: "I don't want to be notified of changes that I make myself"
 setting_time_format: Time format
+label_registration_activation_by_email: account activation by email
+mail_subject_account_activation_request: Redmine account activation request
+mail_body_account_activation_request: 'A new user (%s) has registered. His account his pending your approval:'
+label_registration_automatic_activation: automatic account activation
+label_registration_manual_activation: manual account activation
+notice_account_pending: "Your account was created and is now pending administrator approval."
diff --git a/lang/ro.yml b/lang/ro.yml
index 049efa7b1..ad8881b92 100644
--- a/lang/ro.yml
+++ b/lang/ro.yml
@@ -538,3 +538,9 @@ mail_body_account_information: Your Redmine account information
 setting_protocol: Protocol
 label_user_mail_no_self_notified: "I don't want to be notified of changes that I make myself"
 setting_time_format: Time format
+label_registration_activation_by_email: account activation by email
+mail_subject_account_activation_request: Redmine account activation request
+mail_body_account_activation_request: 'A new user (%s) has registered. His account his pending your approval:'
+label_registration_automatic_activation: automatic account activation
+label_registration_manual_activation: manual account activation
+notice_account_pending: "Your account was created and is now pending administrator approval."
diff --git a/lang/ru.yml b/lang/ru.yml
index 782d715d9..100fad703 100644
--- a/lang/ru.yml
+++ b/lang/ru.yml
@@ -538,3 +538,9 @@ default_activity_development: Разработка
 enumeration_issue_priorities: Приоритеты задач
 enumeration_doc_categories: Категории документов
 enumeration_activities: Действия (учет времени)
+label_registration_activation_by_email: account activation by email
+mail_subject_account_activation_request: Redmine account activation request
+mail_body_account_activation_request: 'A new user (%s) has registered. His account his pending your approval:'
+label_registration_automatic_activation: automatic account activation
+label_registration_manual_activation: manual account activation
+notice_account_pending: "Your account was created and is now pending administrator approval."
diff --git a/lang/sr.yml b/lang/sr.yml
index 1072af7eb..769d8177f 100644
--- a/lang/sr.yml
+++ b/lang/sr.yml
@@ -539,3 +539,9 @@ button_copy: Copy
 setting_protocol: Protocol
 label_user_mail_no_self_notified: "I don't want to be notified of changes that I make myself"
 setting_time_format: Time format
+label_registration_activation_by_email: account activation by email
+mail_subject_account_activation_request: Redmine account activation request
+mail_body_account_activation_request: 'A new user (%s) has registered. His account his pending your approval:'
+label_registration_automatic_activation: automatic account activation
+label_registration_manual_activation: manual account activation
+notice_account_pending: "Your account was created and is now pending administrator approval."
diff --git a/lang/sv.yml b/lang/sv.yml
index d22b5c478..6421173fd 100644
--- a/lang/sv.yml
+++ b/lang/sv.yml
@@ -539,3 +539,9 @@ mail_body_account_information: Your Redmine account information
 setting_protocol: Protocol
 label_user_mail_no_self_notified: "I don't want to be notified of changes that I make myself"
 setting_time_format: Time format
+label_registration_activation_by_email: account activation by email
+mail_subject_account_activation_request: Redmine account activation request
+mail_body_account_activation_request: 'A new user (%s) has registered. His account his pending your approval:'
+label_registration_automatic_activation: automatic account activation
+label_registration_manual_activation: manual account activation
+notice_account_pending: "Your account was created and is now pending administrator approval."
diff --git a/lang/zh.yml b/lang/zh.yml
index 19e5b122b..d738afdb4 100644
--- a/lang/zh.yml
+++ b/lang/zh.yml
@@ -541,3 +541,9 @@ mail_body_account_information: Your Redmine account information
 setting_protocol: Protocol
 label_user_mail_no_self_notified: "I don't want to be notified of changes that I make myself"
 setting_time_format: Time format
+label_registration_activation_by_email: account activation by email
+mail_subject_account_activation_request: Redmine account activation request
+mail_body_account_activation_request: 'A new user (%s) has registered. His account his pending your approval:'
+label_registration_automatic_activation: automatic account activation
+label_registration_manual_activation: manual account activation
+notice_account_pending: "Your account was created and is now pending administrator approval."
diff --git a/test/integration/account_test.rb b/test/integration/account_test.rb
index 6799b9288..e9d665d19 100644
--- a/test/integration/account_test.rb
+++ b/test/integration/account_test.rb
@@ -56,5 +56,46 @@ class AccountTest < ActionController::IntegrationTest
     
     log_user('jsmith', 'newpass')
     assert_equal 0, Token.count    
-  end    
+  end
+  
+  def test_register_with_automatic_activation
+    Setting.self_registration = '3'
+    
+    get 'account/register'
+    assert_response :success
+    assert_template 'account/register'
+    
+    post 'account/register', :user => {:login => "newuser", :language => "en", :firstname => "New", :lastname => "User", :mail => "newuser@foo.bar"}, 
+                             :password => "newpass", :password_confirmation => "newpass"
+    assert_redirected_to 'account/login'
+    log_user('newuser', 'newpass')
+  end
+  
+  def test_register_with_manual_activation
+    Setting.self_registration = '2'
+    
+    post 'account/register', :user => {:login => "newuser", :language => "en", :firstname => "New", :lastname => "User", :mail => "newuser@foo.bar"}, 
+                             :password => "newpass", :password_confirmation => "newpass"
+    assert_redirected_to 'account/login'
+    assert !User.find_by_login('newuser').active?
+  end
+  
+  def test_register_with_email_activation
+    Setting.self_registration = '1'
+    Token.delete_all
+    
+    post 'account/register', :user => {:login => "newuser", :language => "en", :firstname => "New", :lastname => "User", :mail => "newuser@foo.bar"}, 
+                             :password => "newpass", :password_confirmation => "newpass"
+    assert_redirected_to 'account/login'
+    assert !User.find_by_login('newuser').active?
+    
+    token = Token.find(:first)
+    assert_equal 'register', token.action
+    assert_equal 'newuser@foo.bar', token.user.mail
+    assert !token.expired?
+    
+    get 'account/activate', :token => token.value
+    assert_redirected_to 'account/login'
+    log_user('newuser', 'newpass')
+  end
 end

From a1f3497ec46881753fc13d25c3cd2cb344ae27d8 Mon Sep 17 00:00:00 2001
From: Nicolas Chuche <nicolas.chuche@barna.be>
Date: Sun, 18 Nov 2007 18:51:48 +0000
Subject: [PATCH 004/710] * add Redmine.pm to authenticate with mod_perl * add
 a --test option in reposman.rb * change owner right to fit with apache write
 access to repositories * add a deprecated warning in reposman.pl

git-svn-id: http://redmine.rubyforge.org/svn/trunk@916 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 extra/svn/Redmine.pm  | 210 ++++++++++++++++++++++++++++++++++++++++++
 extra/svn/reposman.pl |   5 +
 extra/svn/reposman.rb |  24 ++++-
 3 files changed, 237 insertions(+), 2 deletions(-)
 create mode 100644 extra/svn/Redmine.pm

diff --git a/extra/svn/Redmine.pm b/extra/svn/Redmine.pm
new file mode 100644
index 000000000..7505b71cb
--- /dev/null
+++ b/extra/svn/Redmine.pm
@@ -0,0 +1,210 @@
+package Apache::Authn::Redmine;
+
+=head1 Apache::Authn::Redmine
+
+Redmine - a mod_perl module to authenticate webdav subversion users
+against redmine database
+
+=head1 SYNOPSIS
+
+This module allow anonymous users to browse public project and
+registred users to browse and commit their project. authentication is
+done on the redmine database.
+
+This method is far simpler than the one with pam_* and works with all
+database without an hassle but you need to have apache/mod_perl on the
+svn server.
+
+=head1 INSTALLATION
+
+For this to automagically work, you need to have a recent reposman.rb
+(after r860) and if you already use reposman, read the last section to
+migrate.
+
+Sorry ruby users but you need some perl modules, at least mod_perl2,
+DBI and DBD::mysql (or the DBD driver for you database as it should
+work on allmost all databases).
+
+On debian/ubuntu you must do :
+
+  aptitude install libapache-dbi-perl libapache2-mod-perl2 libdbd-mysql-perl
+
+=head1 CONFIGURATION
+
+   ## if the module isn't in your perl path
+   PerlRequire /usr/local/apache/Redmine.pm
+   ## else
+   # PerlModule Apache::Authn::Redmine
+   <Location /svn>
+     DAV svn
+     SVNParentPath "/var/svn"
+
+     AuthType Basic
+     AuthName redmine
+     Require valid-user
+
+     PerlAccessHandler Apache::Authn::Redmine::access_handler
+     PerlAuthenHandler Apache::Authn::Redmine::authen_handler
+  
+     ## for mysql
+     PerlSetVar dsn DBI:mysql:database=databasename;host=my.db.server
+     ## for postgres
+     # PerlSetVar dsn DBI:Pg:dbname=databasename;host=my.db.server
+
+     PerlSetVar db_user redmine
+     PerlSetVar db_pass password
+  </Location>
+
+To be able to browse repository inside redmine, you must add something
+like that :
+
+   <Location /svn-private>
+     DAV svn
+     SVNParentPath "/var/svn"
+     Order deny,allow
+     Deny from all
+     # only allow reading orders
+     <Limit GET PROPFIND OPTIONS REPORT>
+       Allow from redmine.server.ip
+     </Limit>
+   </Location>
+
+and you will have to use this reposman.rb command line to create repository :
+
+  reposman.rb --redmine my.redmine.server --svn-dir /var/svn --owner www-data -u http://svn.server/svn-private/
+
+=head1 MIGRATION FROM OLDER RELEASES
+
+If you use an older reposman.rb (r860 or before), you need to change
+rights on repositories to allow the apache user to read and write
+S<them :>
+
+  sudo chown -R www-data /var/svn/*
+  sudo chmod -R u+w /var/svn/*
+
+And you need to upgrade at least reposman.rb (after r860).
+
+=cut
+
+use strict;
+
+use DBI;
+use Digest::SHA1;
+
+use Apache2::Module;
+use Apache2::Access;
+use Apache2::ServerRec qw();
+use Apache2::RequestRec qw();
+use Apache2::RequestUtil qw();
+use Apache2::Const qw(:common);
+# use Apache2::Directive qw();
+
+my %read_only_methods = map { $_ => 1 } qw/GET PROPFIND REPORT OPTIONS/;
+
+sub access_handler {
+  my $r = shift;
+
+  unless ($r->some_auth_required) {
+      $r->log_reason("No authentication has been configured");
+      return FORBIDDEN;
+  }
+
+  my $method = $r->method;
+  return OK unless 1 == $read_only_methods{$method};
+
+  my $project_id = get_project_identifier($r);
+
+  $r->set_handlers(PerlAuthenHandler => [\&OK])
+      if is_public_project($project_id, $r);
+
+  return OK
+}
+
+sub authen_handler {
+  my $r = shift;
+  
+  my ($res, $redmine_pass) =  $r->get_basic_auth_pw();
+  return $res unless $res == OK;
+  
+  if (is_member($r->user, $redmine_pass, $r)) {
+      return OK;
+  } else {
+      $r->note_auth_failure();
+      return AUTH_REQUIRED;
+  }
+}
+
+sub is_public_project {
+    my $project_id = shift;
+    my $r = shift;
+
+    my $dbh = connect_database($r);
+    my $sth = $dbh->prepare(
+	"SELECT * FROM projects WHERE projects.identifier=? and projects.is_public=true;"
+    );
+
+    $sth->execute($project_id);
+    my $ret = $sth->fetchrow_array ? 1 : 0;
+    $dbh->disconnect();
+
+    $ret;
+}
+
+# perhaps we should use repository right (other read right) to check public access.
+# it could be faster BUT it doesn't work for the moment.
+# sub is_public_project_by_file {
+#     my $project_id = shift;
+#     my $r = shift;
+
+#     my $tree = Apache2::Directive::conftree();
+#     my $node = $tree->lookup('Location', $r->location);
+#     my $hash = $node->as_hash;
+
+#     my $svnparentpath = $hash->{SVNParentPath};
+#     my $repos_path = $svnparentpath . "/" . $project_id;
+#     return 1 if (stat($repos_path))[2] & 00007;
+# }
+
+sub is_member {
+  my $redmine_user = shift;
+  my $redmine_pass = shift;
+  my $r = shift;
+
+  my $dbh         = connect_database($r);
+  my $project_id  = get_project_identifier($r);
+
+  my $pass_digest = Digest::SHA1::sha1_hex($redmine_pass);
+
+  my $sth = $dbh->prepare(
+      "SELECT hashed_password FROM members, projects, users WHERE projects.id=members.project_id AND users.id=members.user_id AND login=? AND identifier=?;"
+  );
+  $sth->execute($redmine_user, $project_id);
+
+  my $ret;
+  while (my @row = $sth->fetchrow_array) {
+      if ($row[0] eq $pass_digest) {
+	  $ret = 1;
+	  last;
+      }
+  }
+  $dbh->disconnect();
+
+  $ret;
+}
+
+sub get_project_identifier {
+    my $r = shift;
+    
+    my $location = $r->location;
+    my ($identifier) = $r->uri =~ m{$location/*([^/]+)};
+    $identifier;
+}
+
+sub connect_database {
+    my $r = shift;
+
+    my ($dsn, $db_user, $db_pass) = map { $r->dir_config($_) } qw/dsn db_user db_pass/;
+    return DBI->connect($dsn, $db_user, $db_pass);
+}
+
+1;
diff --git a/extra/svn/reposman.pl b/extra/svn/reposman.pl
index bee800b8b..b8ce8f8af 100755
--- a/extra/svn/reposman.pl
+++ b/extra/svn/reposman.pl
@@ -23,6 +23,11 @@ use vars qw/$VERSION/;
 
 $VERSION = "1.0";
 
+my $warning = "This program is now deprecated. Use the reposman.rb for new features";
+print STDERR "*" x length($warning), "\n",
+    $warning, "\n",
+    "*" x length($warning), "\n\n";
+
 my %opts = (verbose => 0);
 GetOptions(\%opts, 'verbose|v+', 'version|V', 'help|h', 'man|m', 'quiet|q', 'svn-dir|s=s', 'redmine-host|r=s') or pod2usage(2);
 
diff --git a/extra/svn/reposman.rb b/extra/svn/reposman.rb
index d950f45e4..729970406 100755
--- a/extra/svn/reposman.rb
+++ b/extra/svn/reposman.rb
@@ -37,6 +37,8 @@
 #    -u file:///var/svn/                       # if the repository is local
 #    if this option isn't set, reposman won't register the repository
 #
+# -t, --test
+#    only show what should be done
 #
 # -h, --help:
 #    show help and exit
@@ -64,6 +66,7 @@ opts = GetoptLong.new(
                       ['--redmine-host', '-r', GetoptLong::REQUIRED_ARGUMENT],
                       ['--owner',        '-o', GetoptLong::REQUIRED_ARGUMENT],
                       ['--url',          '-u', GetoptLong::REQUIRED_ARGUMENT],
+                      ['--test',         '-t', GetoptLong::NO_ARGUMENT],
                       ['--verbose',      '-v', GetoptLong::NO_ARGUMENT],
                       ['--version',      '-V', GetoptLong::NO_ARGUMENT],
                       ['--help'   ,      '-h', GetoptLong::NO_ARGUMENT],
@@ -76,6 +79,7 @@ $redmine_host = ''
 $repos_base   = ''
 $svn_owner    = 'root'
 $svn_url      = false
+$test         = false
 
 def log(text,level=0, exit=false)
   return if $quiet or level > $verbose
@@ -91,6 +95,7 @@ begin
     when '--owner';          $svn_owner    = arg.dup
     when '--url';            $svn_url      = arg.dup
     when '--verbose';        $verbose += 1
+    when '--test';           $test = true
     when '--version';        puts Version; exit
     when '--help';           RDoc::usage
     when '--quiet';          $quiet = true
@@ -100,6 +105,10 @@ rescue
   exit 1
 end
 
+if $test
+  log("running in test mode")
+end
+
 $svn_url += "/" if $svn_url and not $svn_url.match(/\/$/)
 
 if ($redmine_host.empty? or $repos_base.empty?)
@@ -136,7 +145,7 @@ def set_owner_and_rights(project, repos_path, &block)
     yield if block_given?
   else
     uid, gid = Etc.getpwnam($svn_owner).uid, Etc.getgrnam(project.identifier).gid
-    right = project.is_public ? 0575 : 0570
+    right = project.is_public ? 0775 : 0770
     yield if block_given?
     Find.find(repos_path) do |f|
       File.chmod right, f
@@ -176,6 +185,11 @@ projects.each do |project|
     owner      = owner_name(repos_path)
     next if project.is_public == other_read and owner == $svn_owner
 
+    if $test
+      log("\tchange mode on #{repos_path}")
+      next
+    end
+
     begin
       set_owner_and_rights(project, repos_path)
     rescue Errno::EPERM => e
@@ -186,7 +200,13 @@ projects.each do |project|
     log("\tmode change on #{repos_path}");
 
   else
-    project.is_public ? File.umask(0202) : File.umask(0207)
+    project.is_public ? File.umask(0002) : File.umask(0007)
+
+    if $test
+      log("\tcreate repository #{repos_path}")
+      log("\trepository #{repos_path} registered in Redmine with url #{$svn_url}#{project.identifier}") if $svn_url;
+      next
+    end
 
     begin
       set_owner_and_rights(project, repos_path) do

From deb182337d14872c5481059382459f5c21502162 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Mon, 19 Nov 2007 22:28:43 +0000
Subject: [PATCH 005/710] * Added time zone support: users can select their
 time zone on their account view. * Updated Polish translation (Mariusz
 Olejnik). * Fixed: Projects should be listed with case mixed.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@917 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/helpers/application_helper.rb             |   8 +-
 app/models/project.rb                         |   2 +-
 app/models/user.rb                            |   8 ++
 app/views/my/account.rhtml                    |   1 +
 .../079_add_user_preferences_time_zone.rb     |   9 ++
 lang/bg.yml                                   |   1 +
 lang/cs.yml                                   |   1 +
 lang/de.yml                                   |   1 +
 lang/en.yml                                   |   1 +
 lang/es.yml                                   |   1 +
 lang/fr.yml                                   |   1 +
 lang/he.yml                                   |   1 +
 lang/it.yml                                   |   1 +
 lang/ja.yml                                   |   1 +
 lang/ko.yml                                   |   1 +
 lang/nl.yml                                   |   1 +
 lang/pl.yml                                   | 119 +++++++++---------
 lang/pt-br.yml                                |   1 +
 lang/pt.yml                                   |   1 +
 lang/ro.yml                                   |   1 +
 lang/ru.yml                                   |   1 +
 lang/sr.yml                                   |   1 +
 lang/sv.yml                                   |   1 +
 lang/zh.yml                                   |   1 +
 24 files changed, 104 insertions(+), 61 deletions(-)
 create mode 100644 db/migrate/079_add_user_preferences_time_zone.rb

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 215945423..80694e744 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -79,9 +79,15 @@ module ApplicationHelper
   def format_time(time, include_date = true)
     return nil unless time
     time = time.to_time if time.is_a?(String)
+    zone = User.current.time_zone
+    if time.utc?
+      local = zone ? zone.adjust(time) : time.getlocal
+    else
+      local = zone ? zone.adjust(time.getutc) : time
+    end
     @date_format ||= (Setting.date_format.blank? || Setting.date_format.size < 2 ? l(:general_fmt_date) : Setting.date_format)
     @time_format ||= (Setting.time_format.blank? ? l(:general_fmt_time) : Setting.time_format)
-    include_date ? time.strftime("#{@date_format} #{@time_format}") : time.strftime(@time_format)
+    include_date ? local.strftime("#{@date_format} #{@time_format}") : local.strftime(@time_format)
   end
   
   def authoring(created, author)
diff --git a/app/models/project.rb b/app/models/project.rb
index 1fbab2e4d..afaa049c6 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -150,7 +150,7 @@ class Project < ActiveRecord::Base
   end
   
   def <=>(project)
-    name <=> project.name
+    name.downcase <=> project.name.downcase
   end
   
   def allows_to?(action)
diff --git a/app/models/user.rb b/app/models/user.rb
index 9c8d1d9a3..2543bed19 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -130,6 +130,10 @@ class User < ActiveRecord::Base
     self.preference ||= UserPreference.new(:user => self)
   end
   
+  def time_zone
+    self.pref.time_zone.nil? ? nil : TimeZone[self.pref.time_zone]
+  end
+  
   # Return user's RSS key (a 40 chars long string), used to access feeds
   def rss_key
     token = self.rss_token || Token.create(:user => self, :action => 'feeds')
@@ -231,6 +235,10 @@ class AnonymousUser < User
     false
   end
   
+  def time_zone
+    nil
+  end
+  
   # Anonymous user has no RSS key
   def rss_key
     nil
diff --git a/app/views/my/account.rhtml b/app/views/my/account.rhtml
index 11bba9c8d..e64051771 100644
--- a/app/views/my/account.rhtml
+++ b/app/views/my/account.rhtml
@@ -14,6 +14,7 @@
 <p><%= f.select :language, lang_options_for_select %></p>
 
 <% fields_for :pref, @user.pref, :builder => TabularFormBuilder, :lang => current_language do |pref_fields| %>
+<p><%= pref_fields.select :time_zone, TimeZone.all.collect {|z| [ z.to_s, z.name ]}, :include_blank => true %></p>
 <p><%= pref_fields.check_box :hide_mail %></p>
 <% end %>
 </div>
diff --git a/db/migrate/079_add_user_preferences_time_zone.rb b/db/migrate/079_add_user_preferences_time_zone.rb
new file mode 100644
index 000000000..9e36790a9
--- /dev/null
+++ b/db/migrate/079_add_user_preferences_time_zone.rb
@@ -0,0 +1,9 @@
+class AddUserPreferencesTimeZone < ActiveRecord::Migration
+  def self.up
+    add_column :user_preferences, :time_zone, :string
+  end
+
+  def self.down
+    remove_column :user_preferences, :time_zone
+  end
+end
diff --git a/lang/bg.yml b/lang/bg.yml
index b60173ae1..50b54cb7c 100644
--- a/lang/bg.yml
+++ b/lang/bg.yml
@@ -544,3 +544,4 @@ mail_body_account_activation_request: 'A new user (%s) has registered. His accou
 label_registration_automatic_activation: automatic account activation
 label_registration_manual_activation: manual account activation
 notice_account_pending: "Your account was created and is now pending administrator approval."
+field_time_zone: Time zone
diff --git a/lang/cs.yml b/lang/cs.yml
index 487ec967a..d64e8d888 100644
--- a/lang/cs.yml
+++ b/lang/cs.yml
@@ -544,3 +544,4 @@ mail_body_account_activation_request: 'A new user (%s) has registered. His accou
 label_registration_automatic_activation: automatic account activation
 label_registration_manual_activation: manual account activation
 notice_account_pending: "Your account was created and is now pending administrator approval."
+field_time_zone: Time zone
diff --git a/lang/de.yml b/lang/de.yml
index fc00753b3..b25e8d930 100644
--- a/lang/de.yml
+++ b/lang/de.yml
@@ -544,3 +544,4 @@ mail_body_account_activation_request: 'A new user (%s) has registered. His accou
 label_registration_automatic_activation: automatic account activation
 label_registration_manual_activation: manual account activation
 notice_account_pending: "Your account was created and is now pending administrator approval."
+field_time_zone: Time zone
diff --git a/lang/en.yml b/lang/en.yml
index 1df0cf7c9..c1745b4e9 100644
--- a/lang/en.yml
+++ b/lang/en.yml
@@ -169,6 +169,7 @@ field_assignable: Issues can be assigned to this role
 field_redirect_existing_links: Redirect existing links
 field_estimated_hours: Estimated time
 field_column_names: Columns
+field_time_zone: Time zone
 
 setting_app_title: Application title
 setting_app_subtitle: Application subtitle
diff --git a/lang/es.yml b/lang/es.yml
index 5175e6c19..824c84681 100644
--- a/lang/es.yml
+++ b/lang/es.yml
@@ -547,3 +547,4 @@ mail_body_account_activation_request: 'A new user (%s) has registered. His accou
 label_registration_automatic_activation: automatic account activation
 label_registration_manual_activation: manual account activation
 notice_account_pending: "Your account was created and is now pending administrator approval."
+field_time_zone: Time zone
diff --git a/lang/fr.yml b/lang/fr.yml
index 8e1af9a4f..322ddd261 100644
--- a/lang/fr.yml
+++ b/lang/fr.yml
@@ -169,6 +169,7 @@ field_assignable: Demandes assignables à ce rôle
 field_redirect_existing_links: Rediriger les liens existants
 field_estimated_hours: Temps estimé
 field_column_names: Colonnes
+field_time_zone: Fuseau horaire
 
 setting_app_title: Titre de l'application
 setting_app_subtitle: Sous-titre de l'application
diff --git a/lang/he.yml b/lang/he.yml
index 26e808e00..f630fe051 100644
--- a/lang/he.yml
+++ b/lang/he.yml
@@ -544,3 +544,4 @@ mail_body_account_activation_request: 'A new user (%s) has registered. His accou
 label_registration_automatic_activation: automatic account activation
 label_registration_manual_activation: manual account activation
 notice_account_pending: "Your account was created and is now pending administrator approval."
+field_time_zone: Time zone
diff --git a/lang/it.yml b/lang/it.yml
index a80070894..f103e18cc 100644
--- a/lang/it.yml
+++ b/lang/it.yml
@@ -544,3 +544,4 @@ mail_body_account_activation_request: 'A new user (%s) has registered. His accou
 label_registration_automatic_activation: automatic account activation
 label_registration_manual_activation: manual account activation
 notice_account_pending: "Your account was created and is now pending administrator approval."
+field_time_zone: Time zone
diff --git a/lang/ja.yml b/lang/ja.yml
index 86a104d15..3a801fcf8 100644
--- a/lang/ja.yml
+++ b/lang/ja.yml
@@ -545,3 +545,4 @@ mail_body_account_activation_request: 'A new user (%s) has registered. His accou
 label_registration_automatic_activation: automatic account activation
 label_registration_manual_activation: manual account activation
 notice_account_pending: "Your account was created and is now pending administrator approval."
+field_time_zone: Time zone
diff --git a/lang/ko.yml b/lang/ko.yml
index e46a63959..3886d7781 100644
--- a/lang/ko.yml
+++ b/lang/ko.yml
@@ -544,3 +544,4 @@ mail_body_account_activation_request: 'A new user (%s) has registered. His accou
 label_registration_automatic_activation: automatic account activation
 label_registration_manual_activation: manual account activation
 notice_account_pending: "Your account was created and is now pending administrator approval."
+field_time_zone: Time zone
diff --git a/lang/nl.yml b/lang/nl.yml
index 1758514a8..1397f4c6e 100644
--- a/lang/nl.yml
+++ b/lang/nl.yml
@@ -545,3 +545,4 @@ mail_body_account_activation_request: 'A new user (%s) has registered. His accou
 label_registration_automatic_activation: automatic account activation
 label_registration_manual_activation: manual account activation
 notice_account_pending: "Your account was created and is now pending administrator approval."
+field_time_zone: Time zone
diff --git a/lang/pl.yml b/lang/pl.yml
index e2d90de74..7796d6d2a 100644
--- a/lang/pl.yml
+++ b/lang/pl.yml
@@ -102,12 +102,12 @@ field_value: Wartość
 field_category: Kategoria
 field_title: Tytuł
 field_project: Projekt
-field_issue: Zgłoszenie
+field_issue: Zagadnienie
 field_status: Status
 field_notes: Notatki
-field_is_closed: Zgłoszenie zamknięte
+field_is_closed: Zagadnienie zamknięte
 field_is_default: Domyślny status
-field_tracker: Typ zgłoszenia
+field_tracker: Typ zagadnienia
 field_subject: Temat
 field_due_date: Data oddania
 field_assigned_to: Przydzielony do
@@ -117,9 +117,9 @@ field_user: Użytkownik
 field_role: Rola
 field_homepage: Strona www
 field_is_public: Publiczny
-field_parent: Subprojekt
-field_is_in_chlog: Zgłoszenia pokazane w zapisie zmian
-field_is_in_roadmap: Zgłoszenia pokazane na mapie
+field_parent: Podprojekt
+field_is_in_chlog: Zagadnienie pokazywane w zapisie zmian
+field_is_in_roadmap: Zagadnienie pokazywane na mapie
 field_login: Login
 field_mail_notification: Powiadomienia Email
 field_admin: Administrator
@@ -152,8 +152,8 @@ field_hours: Godzin
 field_activity: Aktywność
 field_spent_on: Data
 field_identifier: Identifikator
-field_is_filter: Używane jako filter
-field_issue_to_id: Powiązane zgłoszenie
+field_is_filter: Atrybut filtrowania
+field_issue_to_id: Powiązania zagadnienia
 field_delay: Opóźnienie
 
 setting_app_title: Tytuł aplikacji
@@ -163,7 +163,7 @@ setting_default_language: Domyślny język
 setting_login_required: Identyfikacja wymagana
 setting_self_registration: Własna rejestracja umożliwiona
 setting_attachment_max_size: Maks. rozm. załącznika
-setting_issues_export_limit: Limit eksportu zgłoszeń
+setting_issues_export_limit: Limit eksportu zagadnień
 setting_mail_from: Adres email wysyłki
 setting_host_name: Nazwa hosta
 setting_text_formatting: Formatowanie tekstu
@@ -184,10 +184,10 @@ label_project_new: Nowy projekt
 label_project_plural: Projekty
 label_project_all: Wszystkie projekty
 label_project_latest: Ostatnie projekty
-label_issue: Zgłoszenie
-label_issue_new: Nowe zgłoszenie
-label_issue_plural: Zgłoszenia
-label_issue_view_all: Zobacz wszystkie zgłoszenia
+label_issue: Zagadnienie
+label_issue_new: Nowe zagadnienie
+label_issue_plural: Zagadnienia
+label_issue_view_all: Zobacz wszystkie zagadnienia
 label_document: Dokument
 label_document_new: Nowy dokument
 label_document_plural: Dokumenty
@@ -198,15 +198,15 @@ label_role_and_permissions: Role i Uprawnienia
 label_member: Uczestnik
 label_member_new: Nowy uczestnik
 label_member_plural: Uczestnicy
-label_tracker: Typ zgłoszenia
-label_tracker_plural: Typy zgłoszeń
-label_tracker_new: Nowy typ zgłoszenia
+label_tracker: Typ zagadnienia
+label_tracker_plural: Typy zagadnień
+label_tracker_new: Nowy typ zagadnienia
 label_workflow: Przepływ
-label_issue_status: Status zgłoszenia
-label_issue_status_plural: Statusy zgłoszeń
+label_issue_status: Status zagadnienia
+label_issue_status_plural: Statusy zagadnień
 label_issue_status_new: Nowy status
-label_issue_category: Kategoria zgłoszenia
-label_issue_category_plural: Kategorie zgłoszeń
+label_issue_category: Kategoria zagadnienia
+label_issue_category_plural: Kategorie zagadnień
 label_issue_category_new: Nowa kategoria
 label_custom_field: Dowolne pole
 label_custom_field_plural: Dowolne pola
@@ -226,8 +226,8 @@ label_administration: Administracja
 label_login: Login
 label_logout: Wylogowanie
 label_help: Pomoc
-label_reported_issues: Zaraportowane zgłoszenia
-label_assigned_to_me_issues: Zgłoszenia przypisane do mnie
+label_reported_issues: Wprowadzone zagadnienia
+label_assigned_to_me_issues: Zagadnienia przypisane do mnie
 label_last_login: Ostatnie połączenie
 label_last_updates: Ostatnia zmieniana
 label_last_updates_plural: %d ostatnie zmiany
@@ -244,8 +244,8 @@ label_subproject_plural: Podprojekty
 label_min_max_length: Min - Maks długość
 label_list: Lista
 label_date: Data
-label_integer: L. pojedyńcza
-label_boolean: Wart. logiczna
+label_integer: Liczba całkowita
+label_boolean: Wartość logiczna
 label_string: Tekst
 label_text: Długi tekst
 label_attribute: Atrybut
@@ -333,7 +333,7 @@ label_deleted: usunięte
 label_latest_revision: Ostatnia zmiana
 label_latest_revision_plural: Ostatnie zmiany
 label_view_revisions: Pokaż zmiany
-label_max_size: Kamsymalny rozmiar
+label_max_size: Maksymalny rozmiar
 label_on: 'włączone'
 label_sort_highest: Przesuń na górę
 label_sort_higher: Do góry
@@ -341,7 +341,7 @@ label_sort_lower: Do dołu
 label_sort_lowest: Przesuń na dół
 label_roadmap: Mapa
 label_roadmap_due_in: W czasie 
-label_roadmap_no_issues: Brak zgłoszeń do tej wersji
+label_roadmap_no_issues: Brak zagadnień do tej wersji
 label_search: Szukaj
 label_result_plural: Rezultatów
 label_all_words: Wszystkie słowa
@@ -356,7 +356,7 @@ label_current_version: Obecna wersja
 label_preview: Podgląd
 label_feed_plural: Ilość RSS
 label_changes_details: Szczegóły wszystkich zmian
-label_issue_tracking: Śledzenie zgłoszeń
+label_issue_tracking: Śledzenie zagadnień
 label_spent_time: Spędzony czas
 label_f_hour: %.2f godzina
 label_f_hour_plural: %.2f godzin
@@ -371,8 +371,8 @@ label_diff_side_by_side: obok siebie
 label_options: Opcje
 label_copy_workflow_from: Kopiuj przepływ z 
 label_permissions_report: Raport uprawnień
-label_watched_issues: Obserwowane zgłoszenia
-label_related_issues: Powiązane zgłoszenia
+label_watched_issues: Obserwowane zagadnienia
+label_related_issues: Powiązane zagadnienia
 label_applied_status: Stosowany status
 label_loading: Ładowanie...
 label_relation_new: Nowe powiązanie
@@ -446,7 +446,7 @@ text_select_mail_notifications: Zaznacz czynności przy których użytkownik pow
 text_regexp_info: np. ^[A-Z0-9]+$
 text_min_max_length_info: 0 oznacza brak restrykcji
 text_project_destroy_confirmation: Jesteś pewien, że chcesz usunąć ten projekt i wszyskie powiązane dane?
-text_workflow_edit: Zaznacz rolę i typ zgłoszenia do edycji przepływu
+text_workflow_edit: Zaznacz rolę i typ zagadnienia do edycji przepływu
 text_are_you_sure: Jesteś pewien ?
 text_journal_changed: zmienione %s do %s
 text_journal_set_to: ustawione na %s
@@ -457,14 +457,14 @@ text_tip_task_begin_end_day: zadanie zaczynające i kończące się dzisiaj
 text_project_identifier_info: 'Małe litery (a-z), liczby i myślniki dozwolone.<br />Raz zapisany, identyfikator nie może być zmieniony.'
 text_caracters_maximum: %d znaków maksymalnie.
 text_length_between: Długość pomiędzy %d i %d znaków.
-text_tracker_no_workflow: Brak przepływu zefiniowanego dla tego typu zgłoszenia
+text_tracker_no_workflow: Brak przepływu zefiniowanego dla tego typu zagadnienia
 text_unallowed_characters: Niedozwolone znaki
 text_comma_separated: Wielokrotne wartości dozwolone (rozdzielone przecinkami).
-text_issues_ref_in_commit_messages: Zgłoszenia odnoszące i ustalające we wrzutkach CVS
+text_issues_ref_in_commit_messages: Zagadnienia odnoszące i ustalające we wrzutkach CVS
 
 default_role_manager: Kierownik
 default_role_developper: Programista
-default_role_reporter: Raportujący
+default_role_reporter: Wprowadzajacy
 default_tracker_bug: Błąd
 default_tracker_feature: Cecha
 default_tracker_support: Wsparcie
@@ -484,25 +484,25 @@ default_priority_immediate: Natyczmiastowy
 default_activity_design: Projektowanie
 default_activity_development: Rozwój
 
-enumeration_issue_priorities: Priorytety zgłoszeń
+enumeration_issue_priorities: Priorytety zagadnień
 enumeration_doc_categories: Kategorie dokumentów
 enumeration_activities: Działania (śledzenie czasu)
 button_rename: Zmień nazwę
-text_issue_category_destroy_question: Zgłoszenia (%d) są przypisane do tej kategorii. Co chcesz uczynić?
+text_issue_category_destroy_question: Zagadnienia (%d) są przypisane do tej kategorii. Co chcesz uczynić?
 label_feeds_access_key_created_on: Klucz dostępu RSS stworzony %s dni temu
-setting_cross_project_issue_relations: Zezwól na powiązania zgłoszeń między projektami
+setting_cross_project_issue_relations: Zezwól na powiązania zagadnień między projektami
 label_roadmap_overdue: %s spóźnienia
 label_module_plural: Moduły
 label_this_week: ten tydzień
 label_jump_to_a_project: Skocz do projektu...
-field_assignable: Zgłoszenia mogą być przypisane do tej roli
+field_assignable: Zagadnienia mogą być przypisane do tej roli
 label_sort_by: Sortuj po %s
-text_issue_updated: Zgłoszenie %s zostało zaktualizowane.
+text_issue_updated: Zagadnienie %s zostało zaktualizowane.
 notice_feeds_access_key_reseted: Twój klucz dostępu RSS został zrestetowany.
 field_redirect_existing_links: Przekierowanie istniejących odnośników
-text_issue_category_reassign_to: Przywróć zgłoszenia do tej kategorii
+text_issue_category_reassign_to: Przydziel zagadnienie do tej kategorii
 notice_email_sent: Email został wysłany do %s
-text_issue_added: Zgłoszenie %s zostało zaraportowane.
+text_issue_added: Zagadnienie %s zostało wprowadzone.
 text_wiki_destroy_confirmation: Jesteś pewien, że chcesz usunąć to wiki i całą jego zawartość ?
 notice_email_error: Wystąpił błąd w trakcie wysyłania maila (%s)
 label_updated_time: Zaktualizowane %s temu
@@ -518,29 +518,30 @@ label_default_columns: Domyślne kolumny
 setting_issue_list_default_columns: Domyślne kolumny wiświetlane na liście zagadnień
 setting_repositories_encodings: Kodowanie repozytoriów
 notice_no_issue_selected: "Nie wybrano zagadnienia! Zaznacz zagadnienie, które chcesz edytować."
-label_bulk_edit_selected_issues: Bulk edit selected issues
+label_bulk_edit_selected_issues: Zbiorowa edycja zagadnień
 label_no_change_option: (Bez zmian)
 notice_failed_to_save_issues: "Błąd podczas zapisu zagadnień %d z %d zaznaczonych: %s."
 label_theme: Temat
 label_default: Domyślne
 label_search_titles_only: Przeszukuj tylko tytuły
-label_nobody: nobody
-button_change_password: Change password
-text_user_mail_option: "For unselected projects, you will only receive notifications about things you watch or you're involved in (eg. issues you're the author or assignee)."
-label_user_mail_option_selected: "For any event on the selected projects only..."
-label_user_mail_option_all: "For any event on all my projects"
-label_user_mail_option_none: "Only for things I watch or I'm involved in"
-setting_emails_footer: Emails footer
-label_float: Float
-button_copy: Copy
+label_nobody: nikt
+button_change_password: Zmień hasło
+text_user_mail_option: "W przypadku niezaznaczonych projektów, będziesz otrzymywał powiadomienia tylko na temat zagadnien, które obserwujesz, lub w których bierzesz udział (np. jesteś autorem lub adresatem)."
+label_user_mail_option_selected: "Tylko dla każdego zdarzenia w wybranych projektach..."
+label_user_mail_option_all: "Dla każdego zdarzenia w każdym moim projekcie"
+label_user_mail_option_none: "Tylko to co obserwuje lub w czym biorę udział"
+setting_emails_footer: Stopka e-mail
+label_float: Liczba rzeczywista
+button_copy: Kopia
 mail_body_account_information_external: Możesz użyć twojego "%s" konta do zalogowania do Redmine.
 mail_body_account_information: Twoje konto w Redmine
-setting_protocol: Protocol
-label_user_mail_no_self_notified: "I don't want to be notified of changes that I make myself"
-setting_time_format: Time format
-label_registration_activation_by_email: account activation by email
-mail_subject_account_activation_request: Redmine account activation request
-mail_body_account_activation_request: 'A new user (%s) has registered. His account his pending your approval:'
-label_registration_automatic_activation: automatic account activation
-label_registration_manual_activation: manual account activation
-notice_account_pending: "Your account was created and is now pending administrator approval."
+setting_protocol: Protokoł
+label_user_mail_no_self_notified: "Nie chcę powiadomień o zmianach, które sam wprowadzam."
+setting_time_format: Format czasu
+label_registration_activation_by_email: aktywacja konta przez e-mail
+mail_subject_account_activation_request: Zapytanie aktywacyjne konta Redmine
+mail_body_account_activation_request: 'Zarejestrowano nowego użytkownika: (%s). Konto oczekuje na twoje zatwierdzenie:'
+label_registration_automatic_activation: automatyczna aktywacja kont
+label_registration_manual_activation: manualna aktywacja kont
+notice_account_pending: "Twoje konto zostało utworzone i oczekuje na zatwierdzenie administratora."
+field_time_zone: Time zone
diff --git a/lang/pt-br.yml b/lang/pt-br.yml
index 80c57d3f4..7444aad99 100644
--- a/lang/pt-br.yml
+++ b/lang/pt-br.yml
@@ -544,3 +544,4 @@ mail_body_account_activation_request: 'A new user (%s) has registered. His accou
 label_registration_automatic_activation: automatic account activation
 label_registration_manual_activation: manual account activation
 notice_account_pending: "Your account was created and is now pending administrator approval."
+field_time_zone: Time zone
diff --git a/lang/pt.yml b/lang/pt.yml
index 00d136416..d75247aa9 100644
--- a/lang/pt.yml
+++ b/lang/pt.yml
@@ -544,3 +544,4 @@ mail_body_account_activation_request: 'A new user (%s) has registered. His accou
 label_registration_automatic_activation: automatic account activation
 label_registration_manual_activation: manual account activation
 notice_account_pending: "Your account was created and is now pending administrator approval."
+field_time_zone: Time zone
diff --git a/lang/ro.yml b/lang/ro.yml
index ad8881b92..4cb2e4f8e 100644
--- a/lang/ro.yml
+++ b/lang/ro.yml
@@ -544,3 +544,4 @@ mail_body_account_activation_request: 'A new user (%s) has registered. His accou
 label_registration_automatic_activation: automatic account activation
 label_registration_manual_activation: manual account activation
 notice_account_pending: "Your account was created and is now pending administrator approval."
+field_time_zone: Time zone
diff --git a/lang/ru.yml b/lang/ru.yml
index 100fad703..010b687e6 100644
--- a/lang/ru.yml
+++ b/lang/ru.yml
@@ -544,3 +544,4 @@ mail_body_account_activation_request: 'A new user (%s) has registered. His accou
 label_registration_automatic_activation: automatic account activation
 label_registration_manual_activation: manual account activation
 notice_account_pending: "Your account was created and is now pending administrator approval."
+field_time_zone: Time zone
diff --git a/lang/sr.yml b/lang/sr.yml
index 769d8177f..27be7da86 100644
--- a/lang/sr.yml
+++ b/lang/sr.yml
@@ -545,3 +545,4 @@ mail_body_account_activation_request: 'A new user (%s) has registered. His accou
 label_registration_automatic_activation: automatic account activation
 label_registration_manual_activation: manual account activation
 notice_account_pending: "Your account was created and is now pending administrator approval."
+field_time_zone: Time zone
diff --git a/lang/sv.yml b/lang/sv.yml
index 6421173fd..f5bd5a139 100644
--- a/lang/sv.yml
+++ b/lang/sv.yml
@@ -545,3 +545,4 @@ mail_body_account_activation_request: 'A new user (%s) has registered. His accou
 label_registration_automatic_activation: automatic account activation
 label_registration_manual_activation: manual account activation
 notice_account_pending: "Your account was created and is now pending administrator approval."
+field_time_zone: Time zone
diff --git a/lang/zh.yml b/lang/zh.yml
index d738afdb4..257286778 100644
--- a/lang/zh.yml
+++ b/lang/zh.yml
@@ -547,3 +547,4 @@ mail_body_account_activation_request: 'A new user (%s) has registered. His accou
 label_registration_automatic_activation: automatic account activation
 label_registration_manual_activation: manual account activation
 notice_account_pending: "Your account was created and is now pending administrator approval."
+field_time_zone: Time zone

From 99f9aea80a2bc43cdfc2933728f0ab72d7bf99d5 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Tue, 20 Nov 2007 12:07:28 +0000
Subject: [PATCH 006/710] * Referencing issues in commit messages: enter * in
 'Referencing keywords' to link any issue id without using keywords. * Updated
 Polish translation (Mariusz Olejnik).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@918 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/helpers/application_helper.rb |  2 +-
 app/models/changeset.rb           |  9 +++++++
 lang/pl.yml                       | 14 +++++------
 test/unit/changeset_test.rb       | 42 +++++++++++++++++++++++++++++++
 test/unit/repository_test.rb      |  2 +-
 5 files changed, 60 insertions(+), 9 deletions(-)
 create mode 100644 test/unit/changeset_test.rb

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 80694e744..9c8e9c67d 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -231,7 +231,7 @@ module ApplicationHelper
     # example:
     #   #52 -> <a href="/issues/show/52">#52</a>
     #   r52 -> <a href="/repositories/revision/6?rev=52">r52</a> (project.id is 6)
-    text = text.gsub(%r{([\s,-^])(#|r)(\d+)(?=[[:punct:]]|\s|<|$)}) do |m|
+    text = text.gsub(%r{([\s\(,-^])(#|r)(\d+)(?=[[:punct:]]|\s|<|$)}) do |m|
       leading, otype, oid = $1, $2, $3
       link = nil
       if otype == 'r'
diff --git a/app/models/changeset.rb b/app/models/changeset.rb
index e4e221732..355a5754c 100644
--- a/app/models/changeset.rb
+++ b/app/models/changeset.rb
@@ -63,6 +63,14 @@ class Changeset < ActiveRecord::Base
     return if kw_regexp.blank?
     
     referenced_issues = []
+    
+    if ref_keywords.delete('*')
+      # find any issue ID in the comments
+      target_issue_ids = []
+      comments.scan(%r{([\s\(,-^])#(\d+)(?=[[:punct:]]|\s|<|$)}).each { |m| target_issue_ids << m[1] }
+      referenced_issues += repository.project.issues.find_all_by_id(target_issue_ids)
+    end
+    
     comments.scan(Regexp.new("(#{kw_regexp})[\s:]+(([\s,;&]*#?\\d+)+)", Regexp::IGNORECASE)).each do |match|
       action = match[0]
       target_issue_ids = match[1].scan(/\d+/)
@@ -80,6 +88,7 @@ class Changeset < ActiveRecord::Base
       end
       referenced_issues += target_issues
     end
+    
     self.issues = referenced_issues.uniq
   end
 end
diff --git a/lang/pl.yml b/lang/pl.yml
index 7796d6d2a..760250e69 100644
--- a/lang/pl.yml
+++ b/lang/pl.yml
@@ -261,11 +261,11 @@ label_attachment_delete: Skasuj plik
 label_attachment_plural: Pliki
 label_report: Raport
 label_report_plural: Raporty
-label_news: Nowość
-label_news_new: Dodaj nowość
-label_news_plural: Nowości
-label_news_latest: Ostatnie nowości
-label_news_view_all: Pokaż wszystkie nowości
+label_news: Wiadomość
+label_news_new: Dodaj wiadomość
+label_news_plural: Wiadomości
+label_news_latest: Ostatnie wiadomości
+label_news_view_all: Pokaż wszystkie wiadomości
 label_change_log: Lista zmian
 label_settings: Ustawienia
 label_overview: Przegląd
@@ -334,7 +334,7 @@ label_latest_revision: Ostatnia zmiana
 label_latest_revision_plural: Ostatnie zmiany
 label_view_revisions: Pokaż zmiany
 label_max_size: Maksymalny rozmiar
-label_on: 'włączone'
+label_on: 'z'
 label_sort_highest: Przesuń na górę
 label_sort_higher: Do góry
 label_sort_lower: Do dołu
@@ -544,4 +544,4 @@ mail_body_account_activation_request: 'Zarejestrowano nowego użytkownika: (%s).
 label_registration_automatic_activation: automatyczna aktywacja kont
 label_registration_manual_activation: manualna aktywacja kont
 notice_account_pending: "Twoje konto zostało utworzone i oczekuje na zatwierdzenie administratora."
-field_time_zone: Time zone
+field_time_zone: Strefa czasowa
diff --git a/test/unit/changeset_test.rb b/test/unit/changeset_test.rb
new file mode 100644
index 000000000..ee53f18ff
--- /dev/null
+++ b/test/unit/changeset_test.rb
@@ -0,0 +1,42 @@
+# 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 File.dirname(__FILE__) + '/../test_helper'
+
+class ChangesetTest < Test::Unit::TestCase
+  fixtures :projects, :repositories, :issues, :issue_statuses, :changesets, :changes, :issue_categories, :enumerations, :custom_fields, :custom_values, :users, :members, :trackers
+
+  def setup
+  end
+  
+  def test_ref_keywords_any
+    Setting.commit_fix_status_id = IssueStatus.find(:first, :conditions => ["is_closed = ?", true]).id
+    Setting.commit_fix_done_ratio = '90'
+    Setting.commit_ref_keywords = '*'
+    Setting.commit_fix_keywords = 'fixes , closes'
+    
+    c = Changeset.new(:repository => Project.find(1).repository,
+                      :committed_on => Time.now,
+                      :comments => 'New commit (#2). Fixes #1')
+    c.scan_comment_for_issue_ids
+    
+    assert_equal [1, 2], c.issue_ids.sort
+    fixed = Issue.find(1)
+    assert fixed.closed?
+    assert_equal 90, fixed.done_ratio
+  end
+end
diff --git a/test/unit/repository_test.rb b/test/unit/repository_test.rb
index b802403f5..843b0b42c 100644
--- a/test/unit/repository_test.rb
+++ b/test/unit/repository_test.rb
@@ -68,7 +68,7 @@ class RepositoryTest < Test::Unit::TestCase
     COMMENT
     changeset = Changeset.new(
       :comments => comment, :commit_date => Time.now, :revision => 0, :scmid => 'f39b7922fb3c',
-      :committer => 'foo <foo@example.com>', :committed_on => Time.now, :repository_id => repository )
+      :committer => 'foo <foo@example.com>', :committed_on => Time.now, :repository => repository )
     assert( changeset.save )
     assert_not_equal( comment, changeset.comments )
     assert_equal( 'This is a loooooooooooooooooooooooooooong comment', changeset.comments )

From 987a5aa22114ec2e931464782351431e4dfec97c Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Tue, 20 Nov 2007 15:40:16 +0000
Subject: [PATCH 007/710] Anonymous users can now be allowed to create, edit,
 comment issues, comment news and post messages in the forums. These
 permissions need to be explicitly given to the Anonymous role (Admin -> Roles
 & Permissions -> Anonymous).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@919 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/application.rb          |  4 ---
 app/controllers/documents_controller.rb |  2 +-
 app/controllers/issues_controller.rb    | 19 ++++++------
 app/controllers/messages_controller.rb  |  6 ++--
 app/controllers/my_controller.rb        | 10 +++----
 app/controllers/news_controller.rb      |  2 +-
 app/controllers/projects_controller.rb  | 11 ++++---
 app/controllers/queries_controller.rb   |  8 ++---
 app/controllers/search_controller.rb    |  4 +--
 app/controllers/timelog_controller.rb   |  6 ++--
 app/controllers/welcome_controller.rb   |  4 +--
 app/controllers/wiki_controller.rb      |  4 +--
 app/models/attachment.rb                |  7 +----
 app/models/query.rb                     |  7 ++---
 app/models/user.rb                      | 40 +++++++++++++++----------
 app/views/news/show.rhtml               |  2 +-
 db/migrate/080_add_users_type.rb        | 10 +++++++
 lib/redmine.rb                          | 12 ++++----
 test/unit/user_test.rb                  |  9 +++++-
 19 files changed, 88 insertions(+), 79 deletions(-)
 create mode 100644 db/migrate/080_add_users_type.rb

diff --git a/app/controllers/application.rb b/app/controllers/application.rb
index 991b3fff7..e186455a3 100644
--- a/app/controllers/application.rb
+++ b/app/controllers/application.rb
@@ -23,10 +23,6 @@ class ApplicationController < ActionController::Base
     require_dependency "repository/#{scm.underscore}"
   end
   
-  def logged_in_user
-    User.current.logged? ? User.current : nil
-  end
-  
   def current_role
     @current_role ||= User.current.role_for_project(@project)
   end
diff --git a/app/controllers/documents_controller.rb b/app/controllers/documents_controller.rb
index 63ee96134..94532b65b 100644
--- a/app/controllers/documents_controller.rb
+++ b/app/controllers/documents_controller.rb
@@ -49,7 +49,7 @@ class DocumentsController < ApplicationController
     @attachments = []
     params[:attachments].each { |file|
       next unless file.size > 0
-      a = Attachment.create(:container => @document, :file => file, :author => logged_in_user)
+      a = Attachment.create(:container => @document, :file => file, :author => User.current)
       @attachments << a unless a.new_record?
     } if params[:attachments] and params[:attachments].is_a? Array
     Mailer.deliver_attachments_added(@attachments) if !@attachments.empty? && Setting.notified_events.include?('document_added')
diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index 92443441c..cca3fe623 100644
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -82,7 +82,7 @@ class IssuesController < ApplicationController
   def show
     @custom_values = @issue.custom_values.find(:all, :include => :custom_field, :order => "#{CustomField.table_name}.position")
     @journals = @issue.journals.find(:all, :include => [:user, :details], :order => "#{Journal.table_name}.created_on ASC")
-    @status_options = @issue.status.find_new_statuses_allowed_to(logged_in_user.role_for_project(@project), @issue.tracker) if logged_in_user
+    @status_options = @issue.status.find_new_statuses_allowed_to(User.current.role_for_project(@project), @issue.tracker)
     respond_to do |format|
       format.html { render :template => 'issues/show.rhtml' }
       format.pdf  { send_data(render(:template => 'issues/show.rfpdf', :layout => false), :type => 'application/pdf', :filename => "#{@project.identifier}-#{@issue.id}.pdf") }
@@ -95,7 +95,7 @@ class IssuesController < ApplicationController
       @custom_values = @project.custom_fields_for_issues(@issue.tracker).collect { |x| @issue.custom_values.find_by_custom_field_id(x.id) || CustomValue.new(:custom_field => x, :customized => @issue) }
     else
       begin
-        @issue.init_journal(self.logged_in_user)
+        @issue.init_journal(User.current)
         # Retrieve custom fields and values
         if params["custom_fields"]
           @custom_values = @project.custom_fields_for_issues(@issue.tracker).collect { |x| CustomValue.new(:custom_field => x, :customized => @issue, :value => params["custom_fields"][x.id.to_s]) }
@@ -117,7 +117,7 @@ class IssuesController < ApplicationController
     journal = @issue.init_journal(User.current, params[:notes])
     params[:attachments].each { |file|
       next unless file.size > 0
-      a = Attachment.create(:container => @issue, :file => file, :author => logged_in_user)
+      a = Attachment.create(:container => @issue, :file => file, :author => User.current)
       journal.details << JournalDetail.new(:property => 'attachment',
                                            :prop_key => a.id,
                                            :value => a.filename) unless a.new_record?
@@ -132,17 +132,17 @@ class IssuesController < ApplicationController
   end
 
   def change_status
-    @status_options = @issue.status.find_new_statuses_allowed_to(logged_in_user.role_for_project(@project), @issue.tracker) if logged_in_user
+    @status_options = @issue.status.find_new_statuses_allowed_to(User.current.role_for_project(@project), @issue.tracker)
     @new_status = IssueStatus.find(params[:new_status_id])
     if params[:confirm]
       begin
-        journal = @issue.init_journal(self.logged_in_user, params[:notes])
+        journal = @issue.init_journal(User.current, params[:notes])
         @issue.status = @new_status
         if @issue.update_attributes(params[:issue])
           # Save attachments
           params[:attachments].each { |file|
             next unless file.size > 0
-            a = Attachment.create(:container => @issue, :file => file, :author => logged_in_user)            
+            a = Attachment.create(:container => @issue, :file => file, :author => User.current)            
             journal.details << JournalDetail.new(:property => 'attachment',
                                                  :prop_key => a.id,
                                                  :value => a.filename) unless a.new_record?
@@ -150,7 +150,7 @@ class IssuesController < ApplicationController
         
           # Log time
           if current_role.allowed_to?(:log_time)
-            @time_entry ||= TimeEntry.new(:project => @project, :issue => @issue, :user => logged_in_user, :spent_on => Date.today)
+            @time_entry ||= TimeEntry.new(:project => @project, :issue => @issue, :user => User.current, :spent_on => Date.today)
             @time_entry.attributes = params[:time_entry]
             @time_entry.save
           end
@@ -176,7 +176,7 @@ class IssuesController < ApplicationController
   def destroy_attachment
     a = @issue.attachments.find(params[:attachment_id])
     a.destroy
-    journal = @issue.init_journal(self.logged_in_user)
+    journal = @issue.init_journal(User.current)
     journal.details << JournalDetail.new(:property => 'attachment',
                                          :prop_key => a.id,
                                          :old_value => a.filename)
@@ -225,12 +225,11 @@ private
   def retrieve_query
     if params[:query_id]
       @query = Query.find(params[:query_id], :conditions => {:project_id => (@project ? @project.id : nil)})
-      @query.executed_by = logged_in_user
       session[:query] = @query
     else
       if params[:set_filter] or !session[:query] or session[:query].project != @project
         # Give it a name, required to be valid
-        @query = Query.new(:name => "_", :executed_by => logged_in_user)
+        @query = Query.new(:name => "_")
         @query.project = @project
         if params[:fields] and params[:fields].is_a? Array
           params[:fields].each do |field|
diff --git a/app/controllers/messages_controller.rb b/app/controllers/messages_controller.rb
index 74a957d6c..645aadf1c 100644
--- a/app/controllers/messages_controller.rb
+++ b/app/controllers/messages_controller.rb
@@ -31,12 +31,12 @@ class MessagesController < ApplicationController
   
   def new
     @message = Message.new(params[:message])
-    @message.author = logged_in_user
+    @message.author = User.current
     @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)
+        Attachment.create(:container => @message, :file => file, :author => User.current)
       } if params[:attachments] and params[:attachments].is_a? Array    
       redirect_to :action => 'show', :id => @message
     end
@@ -44,7 +44,7 @@ class MessagesController < ApplicationController
 
   def reply
     @reply = Message.new(params[:reply])
-    @reply.author = logged_in_user
+    @reply.author = User.current
     @reply.board = @board
     @message.children << @reply
     redirect_to :action => 'show', :id => @message
diff --git a/app/controllers/my_controller.rb b/app/controllers/my_controller.rb
index 2fa5a9d9c..cb326bc93 100644
--- a/app/controllers/my_controller.rb
+++ b/app/controllers/my_controller.rb
@@ -44,7 +44,7 @@ class MyController < ApplicationController
 
   # Show user's page
   def page
-    @user = self.logged_in_user
+    @user = User.current
     @blocks = @user.pref[:my_page_layout] || DEFAULT_LAYOUT
   end
 
@@ -76,7 +76,7 @@ class MyController < ApplicationController
 
   # Manage user's password
   def password
-    @user = self.logged_in_user
+    @user = User.current
     flash[:error] = l(:notice_can_t_change_password) and redirect_to :action => 'account' and return if @user.auth_source_id
     if request.post?
       if @user.check_password?(params[:password])
@@ -102,7 +102,7 @@ class MyController < ApplicationController
 
   # User's page layout configuration
   def page_layout
-    @user = self.logged_in_user
+    @user = User.current
     @blocks = @user.pref[:my_page_layout] || DEFAULT_LAYOUT.dup
     session[:page_layout] = @blocks
     %w(top left right).each {|f| session[:page_layout][f] ||= [] }
@@ -116,7 +116,7 @@ class MyController < ApplicationController
   def add_block
     block = params[:block]
     render(:nothing => true) and return unless block && (BLOCKS.keys.include? block)
-    @user = self.logged_in_user
+    @user = User.current
     # remove if already present in a group
     %w(top left right).each {|f| (session[:page_layout][f] ||= []).delete block }
     # add it on top
@@ -151,7 +151,7 @@ class MyController < ApplicationController
   
   # Save user's page layout  
   def page_layout_save
-    @user = self.logged_in_user
+    @user = User.current
     @user.pref[:my_page_layout] = session[:page_layout] if session[:page_layout]
     @user.pref.save
     session[:page_layout] = nil
diff --git a/app/controllers/news_controller.rb b/app/controllers/news_controller.rb
index c41c5844e..109afe454 100644
--- a/app/controllers/news_controller.rb
+++ b/app/controllers/news_controller.rb
@@ -45,7 +45,7 @@ class NewsController < ApplicationController
   
   def add_comment
     @comment = Comment.new(params[:comment])
-    @comment.author = logged_in_user
+    @comment.author = User.current
     if @news.comments << @comment
       flash[:notice] = l(:label_comment_added)
       redirect_to :action => 'show', :id => @news
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 289b34e24..0f50cd780 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -48,7 +48,7 @@ class ProjectsController < ApplicationController
   # Lists visible projects
   def list
     projects = Project.find :all,
-                            :conditions => Project.visible_by(logged_in_user),
+                            :conditions => Project.visible_by(User.current),
                             :include => :parent
     @project_tree = projects.group_by {|p| p.parent || p}
     @project_tree.each_key {|p| @project_tree[p] -= [p]}
@@ -176,7 +176,7 @@ class ProjectsController < ApplicationController
     if request.post? and @document.save	
       # Save the attachments
       params[:attachments].each { |a|
-        Attachment.create(:container => @document, :file => a, :author => logged_in_user) unless a.size == 0
+        Attachment.create(:container => @document, :file => a, :author => User.current) unless a.size == 0
       } if params[:attachments] and params[:attachments].is_a? Array
       flash[:notice] = l(:notice_successful_create)
       Mailer.deliver_document_added(@document) if Setting.notified_events.include?('document_added')
@@ -216,7 +216,7 @@ class ProjectsController < ApplicationController
       return
     end    
     @issue.status = default_status
-    @allowed_statuses = ([default_status] + 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(User.current.role_for_project(@project), @issue.tracker))
     
     if request.get?
       @issue.start_date ||= Date.today
@@ -321,10 +321,9 @@ class ProjectsController < ApplicationController
 
   # Add a news to @project
   def add_news
-    @news = News.new(:project => @project)
+    @news = News.new(:project => @project, :author => User.current)
     if request.post?
       @news.attributes = params[:news]
-      @news.author_id = self.logged_in_user.id if self.logged_in_user
       if @news.save
         flash[:notice] = l(:notice_successful_create)
         Mailer.deliver_news_added(@news) if Setting.notified_events.include?('news_added')
@@ -340,7 +339,7 @@ class ProjectsController < ApplicationController
       @attachments = []
       params[:attachments].each { |file|
         next unless file.size > 0
-        a = Attachment.create(:container => @version, :file => file, :author => logged_in_user)
+        a = Attachment.create(:container => @version, :file => file, :author => User.current)
         @attachments << a unless a.new_record?
       } if params[:attachments] and params[:attachments].is_a? Array
       Mailer.deliver_attachments_added(@attachments) if !@attachments.empty? && Setting.notified_events.include?('file_added')
diff --git a/app/controllers/queries_controller.rb b/app/controllers/queries_controller.rb
index 7feafd35b..69bad345a 100644
--- a/app/controllers/queries_controller.rb
+++ b/app/controllers/queries_controller.rb
@@ -22,14 +22,13 @@ class QueriesController < ApplicationController
   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)])
+                                     :conditions => ["is_public = ? or user_id = ?", true, (User.current.logged? ? User.current.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.user = User.current
     @query.is_public = false unless current_role.allowed_to?(:manage_public_queries)
     @query.column_names = nil if params[:default_columns]
     
@@ -71,9 +70,8 @@ private
   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)
+      render_403 unless @query.editable_by?(User.current)
     else
       @project = Project.find(params[:project_id])
     end
diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb
index 2c00b3d74..7c50d4dcb 100644
--- a/app/controllers/search_controller.rb
+++ b/app/controllers/search_controller.rb
@@ -31,7 +31,7 @@ class SearchController < ApplicationController
     begin; offset = params[:offset].to_time if params[:offset]; rescue; end
     
     # quick jump to an issue
-    if @question.match(/^#?(\d+)$/) && Issue.find_by_id($1, :include => :project, :conditions => Project.visible_by(logged_in_user))
+    if @question.match(/^#?(\d+)$/) && Issue.find_by_id($1, :include => :project, :conditions => Project.visible_by(User.current))
       redirect_to :controller => "issues", :action => "show", :id => $1
       return
     end
@@ -87,7 +87,7 @@ class SearchController < ApplicationController
         end
       else
         operator = @all_words ? ' AND ' : ' OR '
-        Project.with_scope(:find => {:conditions => Project.visible_by(logged_in_user)}) do
+        Project.with_scope(:find => {:conditions => Project.visible_by(User.current)}) 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
diff --git a/app/controllers/timelog_controller.rb b/app/controllers/timelog_controller.rb
index 68c0edefa..1a1bace3a 100644
--- a/app/controllers/timelog_controller.rb
+++ b/app/controllers/timelog_controller.rb
@@ -107,15 +107,15 @@ class TimelogController < ApplicationController
     @entries = (@issue ? @issue : @project).time_entries.find(:all, :include => [:activity, :user, {:issue => [:tracker, :assigned_to, :priority]}], :order => sort_clause)
 
     @total_hours = @entries.inject(0) { |sum,entry| sum + entry.hours }
-    @owner_id = logged_in_user ? logged_in_user.id : 0
+    @owner_id = User.current.id
     
     send_csv and return if 'csv' == params[:export]    
     render :action => 'details', :layout => false if request.xhr?
   end
   
   def edit
-    render_404 and return if @time_entry && @time_entry.user != logged_in_user
-    @time_entry ||= TimeEntry.new(:project => @project, :issue => @issue, :user => logged_in_user, :spent_on => Date.today)
+    render_404 and return if @time_entry && @time_entry.user != User.current
+    @time_entry ||= TimeEntry.new(:project => @project, :issue => @issue, :user => User.current, :spent_on => Date.today)
     @time_entry.attributes = params[:time_entry]
     if request.post? and @time_entry.save
       flash[:notice] = l(:notice_successful_update)
diff --git a/app/controllers/welcome_controller.rb b/app/controllers/welcome_controller.rb
index 2eac2268f..b4be7fb1c 100644
--- a/app/controllers/welcome_controller.rb
+++ b/app/controllers/welcome_controller.rb
@@ -19,7 +19,7 @@ class WelcomeController < ApplicationController
   layout 'base'
 
   def index
-    @news = News.latest logged_in_user
-    @projects = Project.latest logged_in_user
+    @news = News.latest User.current
+    @projects = Project.latest User.current
   end
 end
diff --git a/app/controllers/wiki_controller.rb b/app/controllers/wiki_controller.rb
index 7609323f4..37a36bf56 100644
--- a/app/controllers/wiki_controller.rb
+++ b/app/controllers/wiki_controller.rb
@@ -69,7 +69,7 @@ class WikiController < ApplicationController
       #@content.text = params[:content][:text]
       #@content.comments = params[:content][:comments]
       @content.attributes = params[:content]
-      @content.author = logged_in_user
+      @content.author = User.current
       # 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
@@ -157,7 +157,7 @@ class WikiController < ApplicationController
     # Save the attachments
     params[:attachments].each { |file|
       next unless file.size > 0
-      a = Attachment.create(:container => @page, :file => file, :author => logged_in_user)
+      a = Attachment.create(:container => @page, :file => file, :author => User.current)
     } if params[:attachments] and params[:attachments].is_a? Array
     redirect_to :action => 'index', :page => @page.title
   end
diff --git a/app/models/attachment.rb b/app/models/attachment.rb
index d2bcab33f..7262498c4 100644
--- a/app/models/attachment.rb
+++ b/app/models/attachment.rb
@@ -21,7 +21,7 @@ class Attachment < ActiveRecord::Base
   belongs_to :container, :polymorphic => true
   belongs_to :author, :class_name => "User", :foreign_key => "author_id"
   
-  validates_presence_of :container, :filename
+  validates_presence_of :container, :filename, :author
   validates_length_of :filename, :maximum => 255
   validates_length_of :disk_filename, :maximum => 255
 
@@ -82,11 +82,6 @@ class Attachment < ActiveRecord::Base
   def increment_download
     increment!(:downloads)
   end
-	
-	# returns last created projects
-	def self.most_downloaded
-		find(:all, :limit => 5, :order => "downloads DESC")	
-	end
 
   def project
     container.is_a?(Project) ? container : container.project
diff --git a/app/models/query.rb b/app/models/query.rb
index 30df55b96..f869f648b 100644
--- a/app/models/query.rb
+++ b/app/models/query.rb
@@ -112,11 +112,8 @@ class Query < ActiveRecord::Base
   def initialize(attributes = nil)
     super attributes
     self.filters ||= { 'status_id' => {:operator => "o", :values => [""]} }
-  end
-  
-  def executed_by=(user)
-    @executed_by = user
-    set_language_if_valid(user.language) if user
+    @executed_by = User.current.logged? ? User.current : nil
+    set_language_if_valid(executed_by.language) if executed_by
   end
   
   def validate
diff --git a/app/models/user.rb b/app/models/user.rb
index 2543bed19..93b73dd7a 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -19,6 +19,7 @@ require "digest/sha1"
 
 class User < ActiveRecord::Base
   # Account statuses
+  STATUS_ANONYMOUS  = 0
   STATUS_ACTIVE     = 1
   STATUS_REGISTERED = 2
   STATUS_LOCKED     = 3
@@ -36,15 +37,15 @@ class User < ActiveRecord::Base
   # Prevents unauthorized assignments
   attr_protected :login, :admin, :password, :password_confirmation, :hashed_password
 	
-  validates_presence_of :login, :firstname, :lastname, :mail
+  validates_presence_of :login, :firstname, :lastname, :mail, :if => Proc.new { |user| !user.is_a?(AnonymousUser) }
   validates_uniqueness_of :login, :mail	
   # Login must contain lettres, numbers, underscores only
-  validates_format_of :login, :with => /^[a-z0-9_\-@\.]+$/i
+  validates_format_of :login, :with => /^[a-z0-9_\-@\.]*$/i
   validates_length_of :login, :maximum => 30
   validates_format_of :firstname, :lastname, :with => /^[\w\s\'\-]*$/i
   validates_length_of :firstname, :lastname, :maximum => 30
-  validates_format_of :mail, :with => /^([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})$/i
-  validates_length_of :mail, :maximum => 60
+  validates_format_of :mail, :with => /^([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})$/i, :allow_nil => true
+  validates_length_of :mail, :maximum => 60, :allow_nil => true
   # Password length between 4 and 12
   validates_length_of :password, :in => 4..12, :allow_nil => true
   validates_confirmation_of :password, :allow_nil => true
@@ -216,11 +217,17 @@ class User < ActiveRecord::Base
   end
   
   def self.current
-    @current_user ||= AnonymousUser.new
+    @current_user ||= User.anonymous
   end
   
   def self.anonymous
-    AnonymousUser.new
+    return @anonymous_user if @anonymous_user
+    anonymous_user = AnonymousUser.find(:first)
+    if anonymous_user.nil?
+      anonymous_user = AnonymousUser.create(:lastname => 'Anonymous', :firstname => '', :mail => '', :login => '', :status => 0)
+      raise 'Unable to create the anonymous user.' if anonymous_user.new_record?
+    end
+    @anonymous_user = anonymous_user
   end
   
 private
@@ -231,16 +238,17 @@ private
 end
 
 class AnonymousUser < User
-  def logged?
-    false
+  
+  def validate_on_create
+    # There should be only one AnonymousUser in the database
+    errors.add_to_base 'An anonymous user already exists.' if AnonymousUser.find(:first)
   end
   
-  def time_zone
-    nil
-  end
-  
-  # Anonymous user has no RSS key
-  def rss_key
-    nil
-  end
+  # Overrides a few properties
+  def logged?; false end
+  def admin; false end
+  def name; 'Anonymous' end
+  def mail; nil end
+  def time_zone; nil end
+  def rss_key; nil end
 end
diff --git a/app/views/news/show.rhtml b/app/views/news/show.rhtml
index ef5bbcd4c..2b51c1fee 100644
--- a/app/views/news/show.rhtml
+++ b/app/views/news/show.rhtml
@@ -26,7 +26,7 @@
 <h3 class="icon22 icon22-comment"><%= l(:label_comment_plural) %></h3>
 <% @news.comments.each do |comment| %>
     <% next if comment.new_record? %>
-    <h4><%= format_time(comment.created_on) %> - <%= comment.author.name %></h4>
+    <h4><%= authoring comment.created_on, comment.author %></h4>
     <div class="contextual">
         <%= link_to_if_authorized l(:button_delete), {:controller => 'news', :action => 'destroy_comment', :id => @news, :comment_id => comment}, :confirm => l(:text_are_you_sure), :method => :post, :class => 'icon icon-del' %>
     </div>
diff --git a/db/migrate/080_add_users_type.rb b/db/migrate/080_add_users_type.rb
new file mode 100644
index 000000000..c907b472e
--- /dev/null
+++ b/db/migrate/080_add_users_type.rb
@@ -0,0 +1,10 @@
+class AddUsersType < ActiveRecord::Migration
+  def self.up
+    add_column :users, :type, :string
+    User.update_all "type = 'User'"
+  end
+
+  def self.down
+    remove_column :users, :type
+  end
+end
diff --git a/lib/redmine.rb b/lib/redmine.rb
index 959cfc0c8..8a79b265a 100644
--- a/lib/redmine.rb
+++ b/lib/redmine.rb
@@ -29,11 +29,11 @@ Redmine::AccessControl.map do |map|
                                   :issues => [:index, :changes, :show, :context_menu],
                                   :queries => :index,
                                   :reports => :issue_report}, :public => true                    
-    map.permission :add_issues, {:projects => :add_issue}, :require => :loggedin
+    map.permission :add_issues, {:projects => :add_issue}
     map.permission :edit_issues, {:projects => :bulk_edit_issues,
-                                  :issues => [:edit, :destroy_attachment]}, :require => :loggedin
-    map.permission :manage_issue_relations, {:issue_relations => [:new, :destroy]}, :require => :loggedin
-    map.permission :add_issue_notes, {:issues => :add_note}, :require => :loggedin
+                                  :issues => [:edit, :destroy_attachment]}
+    map.permission :manage_issue_relations, {:issue_relations => [:new, :destroy]}
+    map.permission :add_issue_notes, {:issues => :add_note}
     map.permission :change_issue_status, {:issues => :change_status}, :require => :loggedin
     map.permission :move_issues, {:projects => :move_issues}, :require => :loggedin
     map.permission :delete_issues, {:issues => :destroy}, :require => :member
@@ -53,7 +53,7 @@ Redmine::AccessControl.map do |map|
   map.project_module :news do |map|
     map.permission :manage_news, {:projects => :add_news, :news => [:edit, :destroy, :destroy_comment]}, :require => :member
     map.permission :view_news, {:news => [:index, :show]}, :public => true
-    map.permission :comment_news, {:news => :add_comment}, :require => :loggedin
+    map.permission :comment_news, {:news => :add_comment}
   end
 
   map.project_module :documents do |map|
@@ -83,7 +83,7 @@ Redmine::AccessControl.map do |map|
   map.project_module :boards do |map|
     map.permission :manage_boards, {:boards => [:new, :edit, :destroy]}, :require => :member
     map.permission :view_messages, {:boards => [:index, :show], :messages => [:show]}, :public => true
-    map.permission :add_messages, {:messages => [:new, :reply]}, :require => :loggedin
+    map.permission :add_messages, {:messages => [:new, :reply]}
   end
 end
 
diff --git a/test/unit/user_test.rb b/test/unit/user_test.rb
index 82cbbdaa7..9f58d278f 100644
--- a/test/unit/user_test.rb
+++ b/test/unit/user_test.rb
@@ -60,7 +60,7 @@ class UserTest < Test::Unit::TestCase
   def test_validate
     @admin.login = ""
     assert !@admin.save
-    assert_equal 2, @admin.errors.count
+    assert_equal 1, @admin.errors.count
   end
   
   def test_password
@@ -87,6 +87,13 @@ class UserTest < Test::Unit::TestCase
     assert_equal nil, user  
   end
   
+  def test_create_anonymous
+    AnonymousUser.delete_all
+    anon = User.anonymous
+    assert !anon.new_record?
+    assert_kind_of AnonymousUser, anon
+  end
+  
   def test_rss_key
     assert_nil @jsmith.rss_token
     key = @jsmith.rss_key

From 8d91afc33e3b5e7ef491fb30fb5ccbda35a1d02d Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Tue, 20 Nov 2007 20:29:03 +0000
Subject: [PATCH 008/710] Added per-project tracker selection. Trackers can be
 selected on project settings.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@920 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/issues_controller.rb        |  1 +
 app/controllers/projects_controller.rb      | 26 +++++++-----
 app/controllers/reports_controller.rb       |  4 +-
 app/helpers/projects_helper.rb              |  2 +-
 app/models/custom_value.rb                  |  4 +-
 app/models/issue.rb                         |  6 ++-
 app/models/project.rb                       |  1 +
 app/models/tracker.rb                       |  4 ++
 app/views/issues/_sidebar.rhtml             |  2 +-
 app/views/issues/context_menu.rhtml         |  2 +-
 app/views/projects/_form.rhtml              | 24 +++++++++--
 app/views/projects/add.rhtml                | 12 +++---
 app/views/projects/move_issues.rhtml        |  9 +++-
 app/views/projects/show.rhtml               |  2 +-
 db/migrate/081_create_projects_trackers.rb  | 19 +++++++++
 test/fixtures/projects_trackers.yml         | 46 +++++++++++++++++++++
 test/functional/projects_controller_test.rb |  2 +-
 test/unit/issue_test.rb                     |  2 +-
 18 files changed, 135 insertions(+), 33 deletions(-)
 create mode 100644 db/migrate/081_create_projects_trackers.rb
 create mode 100644 test/fixtures/projects_trackers.yml

diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index cca3fe623..081d8f895 100644
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -194,6 +194,7 @@ class IssuesController < ApplicationController
             :change_status => User.current.allowed_to?(:change_issue_status, @project),
             :add => User.current.allowed_to?(:add_issues, @project),
             :move => User.current.allowed_to?(:move_issues, @project),
+            :copy => (@project.trackers.include?(@issue.tracker) && User.current.allowed_to?(:add_issues, @project)),
             :delete => User.current.allowed_to?(:delete_issues, @project)}
     render :layout => false
   end
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 0f50cd780..37a788690 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -57,11 +57,13 @@ class ProjectsController < ApplicationController
   # Add a new project
   def add
     @custom_fields = IssueCustomField.find(:all, :order => "#{CustomField.table_name}.position")
+    @trackers = Tracker.all
     @root_projects = Project.find(:all, :conditions => "parent_id IS NULL AND status = #{Project::STATUS_ACTIVE}")
     @project = Project.new(params[:project])
     @project.enabled_module_names = Redmine::AccessControl.available_project_modules
     if request.get?
       @custom_values = ProjectCustomField.find(:all, :order => "#{CustomField.table_name}.position").collect { |x| CustomValue.new(:custom_field => x, :customized => @project) }
+      @project.trackers = Tracker.all
     else
       @project.custom_fields = CustomField.find(params[:custom_field_ids]) if params[:custom_field_ids]
       @custom_values = ProjectCustomField.find(:all, :order => "#{CustomField.table_name}.position").collect { |x| CustomValue.new(:custom_field => x, :customized => @project, :value => (params[:custom_fields] ? params["custom_fields"][x.id.to_s] : nil)) }
@@ -80,7 +82,7 @@ class ProjectsController < ApplicationController
     @members_by_role = @project.members.find(:all, :include => [:user, :role], :order => 'position').group_by {|m| m.role}
     @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')
+    @trackers = @project.trackers
     @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])
     @total_issues_by_tracker = Issue.count(:group => :tracker, :conditions => ["project_id=?", @project.id])
     @total_hours = @project.time_entries.sum(:hours)
@@ -92,6 +94,7 @@ class ProjectsController < ApplicationController
     @custom_fields = IssueCustomField.find(:all)
     @issue_category ||= IssueCategory.new
     @member ||= @project.members.new
+    @trackers = Tracker.all
     @custom_values ||= ProjectCustomField.find(:all, :order => "#{CustomField.table_name}.position").collect { |x| @project.custom_values.find_by_custom_field_id(x.id) || CustomValue.new(:custom_field => x) }
     @repository ||= @project.repository
     @wiki ||= @project.wiki
@@ -207,7 +210,7 @@ class ProjectsController < ApplicationController
     @issue = params[:copy_from] ? Issue.new.copy_from(params[:copy_from]) : Issue.new(params[:issue])
     @issue.project = @project
     @issue.author = User.current
-    @issue.tracker ||= Tracker.find(params[:tracker_id])
+    @issue.tracker ||= @project.trackers.find(params[:tracker_id])
     
     default_status = IssueStatus.default
     unless default_status
@@ -293,6 +296,7 @@ class ProjectsController < ApplicationController
   def move_issues
     @issues = @project.issues.find(params[:issue_ids]) if params[:issue_ids]
     redirect_to :controller => 'issues', :action => 'index', :project_id => @project and return unless @issues
+    
     @projects = []
     # find projects to which the user is allowed to move the issue
     if User.current.admin?
@@ -301,14 +305,14 @@ class ProjectsController < ApplicationController
     else
       User.current.memberships.each {|m| @projects << m.project if m.role.allowed_to?(:move_issues)}
     end
-    # issue can be moved to any tracker
-    @trackers = Tracker.find(:all)
-    if request.post? && params[:new_project_id] && @projects.collect(&:id).include?(params[:new_project_id].to_i) && params[:new_tracker_id]    
-      new_project = Project.find_by_id(params[:new_project_id])
-      new_tracker = params[:new_tracker_id].blank? ? nil : Tracker.find_by_id(params[:new_tracker_id])
+    @target_project = @projects.detect {|p| p.id.to_s == params[:new_project_id]} if params[:new_project_id]
+    @target_project ||= @project    
+    @trackers = @target_project.trackers
+    if request.post?
+      new_tracker = params[:new_tracker_id].blank? ? nil : @target_project.trackers.find_by_id(params[:new_tracker_id])
       unsaved_issue_ids = []
       @issues.each do |issue|
-        unsaved_issue_ids << issue.id unless issue.move_to(new_project, new_tracker)
+        unsaved_issue_ids << issue.id unless issue.move_to(@target_project, new_tracker)
       end
       if unsaved_issue_ids.empty?
         flash[:notice] = l(:notice_successful_update) unless @issues.empty?
@@ -316,7 +320,9 @@ class ProjectsController < ApplicationController
         flash[:error] = l(:notice_failed_to_save_issues, unsaved_issue_ids.size, @issues.size, '#' + unsaved_issue_ids.join(', #'))
       end
       redirect_to :controller => 'issues', :action => 'index', :project_id => @project
+      return
     end
+    render :layout => false if request.xhr?
   end
 
   # Add a news to @project
@@ -354,13 +360,13 @@ class ProjectsController < ApplicationController
   
   # Show changelog for @project
   def changelog
-    @trackers = Tracker.find(:all, :conditions => ["is_in_chlog=?", true], :order => 'position')
+    @trackers = @project.trackers.find(:all, :conditions => ["is_in_chlog=?", true], :order => 'position')
     retrieve_selected_tracker_ids(@trackers)    
     @versions = @project.versions.sort
   end
 
   def roadmap
-    @trackers = Tracker.find(:all, :conditions => ["is_in_roadmap=?", true], :order => 'position')
+    @trackers = @project.trackers.find(:all, :conditions => ["is_in_roadmap=?", true])
     retrieve_selected_tracker_ids(@trackers)
     @versions = @project.versions.sort
     @versions = @versions.select {|v| !v.completed? } unless params[:completed]
diff --git a/app/controllers/reports_controller.rb b/app/controllers/reports_controller.rb
index 6b95944a0..e18e117a6 100644
--- a/app/controllers/reports_controller.rb
+++ b/app/controllers/reports_controller.rb
@@ -25,7 +25,7 @@ class ReportsController < ApplicationController
     case params[:detail]
     when "tracker"
       @field = "tracker_id"
-      @rows = Tracker.find :all, :order => 'position'
+      @rows = @project.trackers
       @data = issues_by_tracker
       @report_title = l(:field_tracker)
       render :template => "reports/issue_report_details"
@@ -60,7 +60,7 @@ class ReportsController < ApplicationController
       @report_title = l(:field_subproject)
       render :template => "reports/issue_report_details"  
     else
-      @trackers = Tracker.find(:all, :order => 'position')
+      @trackers = @project.trackers
       @versions = @project.versions.sort
       @priorities = Enumeration::get_values('IPRI')
       @categories = @project.issue_categories
diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb
index 5b78db71c..4b1b1a954 100644
--- a/app/helpers/projects_helper.rb
+++ b/app/helpers/projects_helper.rb
@@ -190,7 +190,7 @@ module ProjectsHelper
   end if Object.const_defined?(:Magick)
   
   def new_issue_selector
-    trackers = Tracker.find(:all, :order => 'position')
+    trackers = @project.trackers
     # can't use form tag inside helper
     content_tag('form',
       select_tag('tracker_id', '<option></option>' + options_from_collection_for_select(trackers, 'id', 'name'), :onchange => "if (this.value != '') {this.form.submit()}"),
diff --git a/app/models/custom_value.rb b/app/models/custom_value.rb
index afe4c1afb..c3d6b7bb9 100644
--- a/app/models/custom_value.rb
+++ b/app/models/custom_value.rb
@@ -31,9 +31,9 @@ protected
     when 'float'
       begin; !value.blank? && Kernel.Float(value); rescue; errors.add(:value, :activerecord_error_invalid) end
     when 'date'
-      errors.add(:value, :activerecord_error_not_a_date) unless value =~ /^\d{4}-\d{2}-\d{2}$/ or value.empty?
+      errors.add(:value, :activerecord_error_not_a_date) unless value =~ /^\d{4}-\d{2}-\d{2}$/ or value.blank?
     when 'list'
-      errors.add(:value, :activerecord_error_inclusion) unless custom_field.possible_values.include? value or value.empty?
+      errors.add(:value, :activerecord_error_inclusion) unless custom_field.possible_values.include?(value) or value.blank?
     end
   end
 end
diff --git a/app/models/issue.rb b/app/models/issue.rb
index 60cca4051..f7b01ea6a 100644
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -40,7 +40,7 @@ class Issue < ActiveRecord::Base
   acts_as_event :title => Proc.new {|o| "#{o.tracker.name} ##{o.id}: #{o.subject}"},
                 :url => Proc.new {|o| {:controller => 'issues', :action => 'show', :id => o.id}}                
   
-  validates_presence_of :subject, :description, :priority, :tracker, :author, :status
+  validates_presence_of :subject, :description, :priority, :project, :tracker, :author, :status
   validates_length_of :subject, :maximum => 255
   validates_inclusion_of :done_ratio, :in => 0..100
   validates_numericality_of :estimated_hours, :allow_nil => true
@@ -106,6 +106,10 @@ class Issue < ActiveRecord::Base
     end
   end
   
+  def validate_on_create
+    errors.add :tracker_id, :activerecord_error_invalid unless project.trackers.include?(tracker)
+  end
+  
   def before_create
     # default assignment based on category
     if assigned_to.nil? && category && category.assigned_to
diff --git a/app/models/project.rb b/app/models/project.rb
index afaa049c6..be46d6189 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -24,6 +24,7 @@ class Project < ActiveRecord::Base
   has_many :users, :through => :members
   has_many :custom_values, :dependent => :delete_all, :as => :customized
   has_many :enabled_modules, :dependent => :delete_all
+  has_and_belongs_to_many :trackers, :order => "#{Tracker.table_name}.position"
   has_many :issues, :dependent => :destroy, :order => "#{Issue.table_name}.created_on DESC", :include => [:status, :tracker]
   has_many :issue_changes, :through => :issues, :source => :journals
   has_many :versions, :dependent => :destroy, :order => "#{Version.table_name}.effective_date DESC, #{Version.table_name}.name DESC"
diff --git a/app/models/tracker.rb b/app/models/tracker.rb
index 90ef31912..6de2a098c 100644
--- a/app/models/tracker.rb
+++ b/app/models/tracker.rb
@@ -29,6 +29,10 @@ class Tracker < ActiveRecord::Base
 
   def to_s; name end
   
+  def self.all
+    find(:all, :order => 'position')
+  end
+  
 private
   def check_integrity
     raise "Can't delete tracker" if Issue.find(:first, :conditions => ["tracker_id=?", self.id])
diff --git a/app/views/issues/_sidebar.rhtml b/app/views/issues/_sidebar.rhtml
index 3b42ce465..6e61755e8 100644
--- a/app/views/issues/_sidebar.rhtml
+++ b/app/views/issues/_sidebar.rhtml
@@ -1,4 +1,4 @@
-<% if authorize_for('projects', 'add_issue') %>
+<% if authorize_for('projects', 'add_issue') && @project.trackers.any? %>
 <h3><%= l(:label_issue_new) %></h3>
 <%= l(:label_tracker) %>: <%= new_issue_selector %>
 <% end %>
diff --git a/app/views/issues/context_menu.rhtml b/app/views/issues/context_menu.rhtml
index e44911daf..3af49fb04 100644
--- a/app/views/issues/context_menu.rhtml
+++ b/app/views/issues/context_menu.rhtml
@@ -32,7 +32,7 @@
 		</ul>
 	</li>
 	<li><%= context_menu_link l(:button_copy), {:controller => 'projects', :action => 'add_issue', :id => @project, :copy_from => @issue},
-	        :class => 'icon-copy', :disabled => !@can[:add] %></li>
+	        :class => 'icon-copy', :disabled => !@can[:copy] %></li>
 	<li><%= context_menu_link l(:button_move), {:controller => 'projects', :action => 'move_issues', :id => @project, "issue_ids[]" => @issue.id },
 	                          :class => 'icon-move', :disabled => !@can[:move]  %>
     <li><%= context_menu_link l(:button_delete), {:controller => 'issues', :action => 'destroy', :id => @issue},
diff --git a/app/views/projects/_form.rhtml b/app/views/projects/_form.rhtml
index aa30f1eaa..885ccf4bd 100644
--- a/app/views/projects/_form.rhtml
+++ b/app/views/projects/_form.rhtml
@@ -17,16 +17,32 @@
 <% for @custom_value in @custom_values %>
 	<p><%= custom_field_tag_with_label @custom_value %></p>
 <% end %>
+</div>
+
+<% unless @trackers.empty? %>
+<fieldset class="box"><legend><%=l(:label_tracker_plural)%></legend>
+<% @trackers.each do |tracker| %>
+    <label class="floating">
+    <%= check_box_tag 'project[tracker_ids][]', tracker.id, @project.trackers.include?(tracker) %>
+    <%= tracker %>
+    </label>
+<% end %>
+<%= hidden_field_tag 'project[tracker_ids][]', '' %>
+</fieldset>
+<% end %>
 
 <% unless @custom_fields.empty? %>
-<p><label><%=l(:label_custom_field_plural)%></label>
+<fieldset class="box"><legend><%=l(:label_custom_field_plural)%></legend>
 <% for custom_field in @custom_fields %>
+    <label class="floating">
 	<%= check_box_tag "custom_field_ids[]", custom_field.id, ((@project.custom_fields.include? custom_field) or custom_field.is_for_all?), (custom_field.is_for_all? ? {:disabled => "disabled"} : {}) %>
-	<%= custom_field.name %>	
-<% end %></p>
+	<%= custom_field.name %>
+	</label>
+<% end %>
+</fieldset>
 <% end %>
 <!--[eoform:project]-->
-</div>
+
 
 <% content_for :header_tags do %>
 <%= javascript_include_tag 'calendar/calendar' %>
diff --git a/app/views/projects/add.rhtml b/app/views/projects/add.rhtml
index 4818cae4a..e3ee0b591 100644
--- a/app/views/projects/add.rhtml
+++ b/app/views/projects/add.rhtml
@@ -3,13 +3,13 @@
 <% labelled_tabular_form_for :project, @project, :url => { :action => "add" } do |f| %>
 <%= render :partial => 'form', :locals => { :f => f } %>
 
-<div class="box">
-<p><label><%= l(:label_module_plural) %></label>
+<fieldset class="box"><legend><%= l(:label_module_plural) %></legend>
 <% Redmine::AccessControl.available_project_modules.each do |m| %>
-<%= check_box_tag 'enabled_modules[]', m, @project.module_enabled?(m) %> <%= m.to_s.humanize %>
-<% end %></p>
-</div>
-
+    <label class="floating">
+    <%= check_box_tag 'enabled_modules[]', m, @project.module_enabled?(m) %> <%= m.to_s.humanize %>
+    </label>
+<% end %>
+</fieldset>
 
 <%= submit_tag l(:button_save) %>
 <% end %>
diff --git a/app/views/projects/move_issues.rhtml b/app/views/projects/move_issues.rhtml
index b29653037..95eaf9dec 100644
--- a/app/views/projects/move_issues.rhtml
+++ b/app/views/projects/move_issues.rhtml
@@ -1,7 +1,7 @@
 <h2><%=l(:button_move)%></h2>
 
 
-<% form_tag({:action => 'move_issues', :id => @project}, :class => "tabular") do %>
+<% form_tag({:action => 'move_issues', :id => @project}, :class => 'tabular', :id => 'move_form') do %>
 
 <div class="box">
 <p><label><%= l(:label_issue_plural) %> :</label>
@@ -15,7 +15,12 @@
 
 <!--[form:issue]-->
 <p><label for="new_project_id"><%=l(:field_project)%> :</label>
-<%= select_tag "new_project_id", options_from_collection_for_select(@projects, "id", "name", @project.id) %></p>
+<%= select_tag "new_project_id",
+               options_from_collection_for_select(@projects, 'id', 'name', @target_project.id),
+               :onchange => remote_function(:url => {:action => 'move_issues' , :id => @project},
+                                            :method => :get,
+                                            :update => 'content',
+                                            :with => "Form.serialize('move_form')") %></p>
 
 <p><label for="new_tracker_id"><%=l(:field_tracker)%> :</label>
 <%= select_tag "new_tracker_id", "<option value=\"\">#{l(:label_no_change_option)}</option>" + options_from_collection_for_select(@trackers, "id", "name") %></p>
diff --git a/app/views/projects/show.rhtml b/app/views/projects/show.rhtml
index 94df0bf3d..458e7975e 100644
--- a/app/views/projects/show.rhtml
+++ b/app/views/projects/show.rhtml
@@ -56,7 +56,7 @@
 </div>
 
 <% content_for :sidebar do %>
-    <% if authorize_for('projects', 'add_issue') %>
+    <% if authorize_for('projects', 'add_issue') && @project.trackers.any? %>
     <h3><%= l(:label_issue_new) %></h3>
     <%= l(:label_tracker) %>: <%= new_issue_selector %>
     <% end %>
diff --git a/db/migrate/081_create_projects_trackers.rb b/db/migrate/081_create_projects_trackers.rb
new file mode 100644
index 000000000..70fea188e
--- /dev/null
+++ b/db/migrate/081_create_projects_trackers.rb
@@ -0,0 +1,19 @@
+class CreateProjectsTrackers < ActiveRecord::Migration
+  def self.up
+    create_table :projects_trackers, :id => false do |t|
+      t.column :project_id, :integer, :default => 0, :null => false
+      t.column :tracker_id, :integer, :default => 0, :null => false
+    end
+    add_index :projects_trackers, :project_id, :name => :projects_trackers_project_id
+    
+    # Associates all trackers to all projects (as it was before)
+    tracker_ids = Tracker.find(:all).collect(&:id)
+    Project.find(:all).each do |project|
+      project.tracker_ids = tracker_ids
+    end
+  end
+
+  def self.down
+    drop_table :projects_trackers
+  end
+end
diff --git a/test/fixtures/projects_trackers.yml b/test/fixtures/projects_trackers.yml
new file mode 100644
index 000000000..cfca5b228
--- /dev/null
+++ b/test/fixtures/projects_trackers.yml
@@ -0,0 +1,46 @@
+--- 
+projects_trackers_012: 
+  project_id: 4
+  tracker_id: 3
+projects_trackers_001: 
+  project_id: 1
+  tracker_id: 1
+projects_trackers_013: 
+  project_id: 5
+  tracker_id: 1
+projects_trackers_002: 
+  project_id: 1
+  tracker_id: 2
+projects_trackers_014: 
+  project_id: 5
+  tracker_id: 2
+projects_trackers_003: 
+  project_id: 1
+  tracker_id: 3
+projects_trackers_015: 
+  project_id: 5
+  tracker_id: 3
+projects_trackers_004: 
+  project_id: 2
+  tracker_id: 1
+projects_trackers_005: 
+  project_id: 2
+  tracker_id: 2
+projects_trackers_006: 
+  project_id: 2
+  tracker_id: 3
+projects_trackers_007: 
+  project_id: 3
+  tracker_id: 1
+projects_trackers_008: 
+  project_id: 3
+  tracker_id: 2
+projects_trackers_009: 
+  project_id: 3
+  tracker_id: 3
+projects_trackers_010: 
+  project_id: 4
+  tracker_id: 1
+projects_trackers_011: 
+  project_id: 4
+  tracker_id: 2
diff --git a/test/functional/projects_controller_test.rb b/test/functional/projects_controller_test.rb
index e6c06cf56..c41adaa6c 100644
--- a/test/functional/projects_controller_test.rb
+++ b/test/functional/projects_controller_test.rb
@@ -22,7 +22,7 @@ require 'projects_controller'
 class ProjectsController; def rescue_action(e) raise e end; end
 
 class ProjectsControllerTest < Test::Unit::TestCase
-  fixtures :projects, :users, :roles, :members, :issues, :journals, :journal_details, :trackers, :issue_statuses, :enabled_modules, :enumerations
+  fixtures :projects, :users, :roles, :members, :issues, :journals, :journal_details, :trackers, :projects_trackers, :issue_statuses, :enabled_modules, :enumerations
 
   def setup
     @controller = ProjectsController.new
diff --git a/test/unit/issue_test.rb b/test/unit/issue_test.rb
index 6ffbe0a8b..da91dd02c 100644
--- a/test/unit/issue_test.rb
+++ b/test/unit/issue_test.rb
@@ -18,7 +18,7 @@
 require File.dirname(__FILE__) + '/../test_helper'
 
 class IssueTest < Test::Unit::TestCase
-  fixtures :projects, :users, :members, :trackers, :issue_statuses, :issue_categories, :enumerations, :issues, :custom_fields, :custom_values, :time_entries
+  fixtures :projects, :users, :members, :trackers, :projects_trackers, :issue_statuses, :issue_categories, :enumerations, :issues, :custom_fields, :custom_values, :time_entries
 
   def test_category_based_assignment
     issue = Issue.create(:project_id => 1, :tracker_id => 1, :author_id => 3, :status_id => 1, :priority => Enumeration.get_values('IPRI').first, :subject => 'Assignment test', :description => 'Assignment test', :category_id => 1)

From 5e6fa147da47a4b1e17b0d39567b8ab7641b1a8c Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Wed, 21 Nov 2007 18:45:18 +0000
Subject: [PATCH 009/710] * Fixed: Error when displaying the issue list if a
 float custom field is marked as 'used as filter' * Fixed: Mercurial adapter
 breaks on missing :files entry in changeset hash (James Britt) * Fixed: Wrong
 feed URLs on the home page

git-svn-id: http://redmine.rubyforge.org/svn/trunk@921 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/models/query.rb                           | 4 ++--
 app/views/welcome/index.rhtml                 | 3 +--
 lib/redmine/scm/adapters/mercurial_adapter.rb | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/app/models/query.rb b/app/models/query.rb
index f869f648b..4cc5a63a5 100644
--- a/app/models/query.rb
+++ b/app/models/query.rb
@@ -164,8 +164,6 @@ class Query < ActiveRecord::Base
       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"
@@ -174,6 +172,8 @@ class Query < ActiveRecord::Base
           options = { :type => :date, :order => 20 }
         when "bool"
           options = { :type => :list, :values => [[l(:general_text_yes), "1"], [l(:general_text_no), "0"]], :order => 20 }
+        else
+          options = { :type => :string, :order => 20 }
         end          
         @available_filters["cf_#{field.id}"] = options.merge({ :name => field.name })
       end
diff --git a/app/views/welcome/index.rhtml b/app/views/welcome/index.rhtml
index af09eea93..d1e871c4a 100644
--- a/app/views/welcome/index.rhtml
+++ b/app/views/welcome/index.rhtml
@@ -26,6 +26,5 @@
 </div>	
 
 <% content_for :header_tags do %>
-<%= auto_discovery_link_tag(:rss,  {:controller => 'feeds', :action => 'news', :key => @key}, {:title => l(:label_news_latest)}) %>
-<%= auto_discovery_link_tag(:atom, {:controller => 'feeds', :action => 'news', :key => @key, :format => 'atom'}, {:title => l(:label_news_latest)}) %>
+<%= auto_discovery_link_tag(:atom, {:controller => 'news', :action => 'index', :key => User.current.rss_key, :format => 'atom'}, {:title => l(:label_news_latest)}) %>
 <% end %>
diff --git a/lib/redmine/scm/adapters/mercurial_adapter.rb b/lib/redmine/scm/adapters/mercurial_adapter.rb
index 54fa8c4f8..a631916c5 100644
--- a/lib/redmine/scm/adapters/mercurial_adapter.rb
+++ b/lib/redmine/scm/adapters/mercurial_adapter.rb
@@ -91,7 +91,7 @@ module Redmine
                                              :author => changeset[:user],
                                              :time => Time.parse(changeset[:date]),
                                              :message => changeset[:description],
-                                             :paths => changeset[:files].split.collect{|path| {:action => 'X', :path => "/#{path}"}}
+                                             :paths => changeset[:files].to_s.split.collect{|path| {:action => 'X', :path => "/#{path}"}}
                   })
                   changeset = {}
                 end

From 0634591b3db01098057f2e20e101d7886ddbff5a Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Thu, 22 Nov 2007 18:03:02 +0000
Subject: [PATCH 010/710] Themes: * Fixed: themes are not found when running
 Apache+fastcgi * Added 'Classic' theme (inspired from the v0.51 design)

git-svn-id: http://redmine.rubyforge.org/svn/trunk@922 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/layouts/base.rhtml                  | 18 ++++-----
 lib/redmine/themes.rb                         |  2 +-
 .../classic/stylesheets/application.css       | 39 +++++++++++++++++++
 3 files changed, 49 insertions(+), 10 deletions(-)
 create mode 100644 public/themes/classic/stylesheets/application.css

diff --git a/app/views/layouts/base.rhtml b/app/views/layouts/base.rhtml
index 3cd384c1e..df7b2daf9 100644
--- a/app/views/layouts/base.rhtml
+++ b/app/views/layouts/base.rhtml
@@ -22,18 +22,18 @@
     <div id="account">
         <% if User.current.logged? %>
             <%=l(:label_logged_as)%> <%= User.current.login %> -
-            <%= link_to l(:label_my_account), { :controller => 'my', :action => 'account' } %>
-            <%= link_to l(:label_logout), { :controller => 'account', :action => 'logout' } %>
+            <%= link_to l(:label_my_account), { :controller => 'my', :action => 'account' }, :class => 'myaccount' %>
+            <%= link_to l(:label_logout), { :controller => 'account', :action => 'logout' }, :class => 'logout' %>
         <% else %>
-            <%= link_to l(:label_login), { :controller => 'account', :action => 'login' } %>
-            <%= link_to(l(:label_register), :controller => 'account',:action => 'register') if Setting.self_registration? %>
+            <%= link_to l(:label_login), { :controller => 'account', :action => 'login' }, :class => 'signin' %>
+            <%= link_to(l(:label_register), { :controller => 'account',:action => 'register' }, :class => 'register') if Setting.self_registration? %>
         <% end %>
     </div>
-    <%= link_to l(:label_home), home_url %>
-    <%= link_to l(:label_my_page), { :controller => 'my', :action => 'page'} if User.current.logged? %>
-    <%= link_to l(:label_project_plural), { :controller => 'projects' } %>
-    <%= link_to l(:label_administration), { :controller => 'admin' } if User.current.admin? %>
-    <%= link_to l(:label_help), Redmine::Info.help_url %>
+    <%= link_to l(:label_home), home_url, :class => 'home' %>
+    <%= link_to l(:label_my_page), { :controller => 'my', :action => 'page'}, :class => 'mypage' if User.current.logged? %>
+    <%= link_to l(:label_project_plural), { :controller => 'projects' }, :class => 'projects' %>
+    <%= link_to l(:label_administration), { :controller => 'admin' }, :class => 'admin' if User.current.admin? %>
+    <%= link_to l(:label_help), Redmine::Info.help_url, :class => 'help' %>
 </div>
       
 <div id="header">
diff --git a/lib/redmine/themes.rb b/lib/redmine/themes.rb
index abbd34cd1..a7cf940b8 100644
--- a/lib/redmine/themes.rb
+++ b/lib/redmine/themes.rb
@@ -54,7 +54,7 @@ module Redmine
     private
         
     def self.scan_themes
-      dirs = Dir.glob('public/themes/*').select do |f|
+      dirs = Dir.glob("#{RAILS_ROOT}/public/themes/*").select do |f|
         # A theme should at least override application.css
         File.directory?(f) && File.exist?("#{f}/stylesheets/application.css")
       end
diff --git a/public/themes/classic/stylesheets/application.css b/public/themes/classic/stylesheets/application.css
new file mode 100644
index 000000000..6bb148210
--- /dev/null
+++ b/public/themes/classic/stylesheets/application.css
@@ -0,0 +1,39 @@
+@import url(../../../stylesheets/application.css);
+
+body{ color:#303030; background:#e8eaec; }
+
+#top-menu { font-size: 80%; height: 2em; padding-top: 0.5em; background-color: #578bb8; }
+#top-menu a { font-weight: bold; }
+#header { background: #467aa7; height:5.8em; padding: 10px 0 0 0; }
+#header h1 { margin-left: 6px; }
+#quick-search { margin-right: 6px; }
+#main-menu { background-color: #578bb8; left: 0; border-top: 1px solid #fff; width: 100%; }
+#main-menu li { margin: 0; padding: 0; }
+#main-menu li a { background-color: #578bb8; border-right: 1px solid #fff; font-size: 80%; padding: 4px 8px 4px 8px; font-weight: bold; }
+#main-menu li a:hover { background-color: #80b0da; color: #ffffff; }
+
+#footer { background-color: #578bb8; border: 0; color: #fff;}
+#footer a { color: #fff; font-weight: bold; }
+
+#main { font:90% Verdana,Tahoma,Arial,sans-serif; background: #e8eaec; }
+#main a { font-weight: bold; color: #467aa7;}
+#main a:hover { color: #2a5a8a; text-decoration: underline; }
+#content { background: #fff; }
+
+h2, h3, h4, .wiki h1, .wiki h2, .wiki h3 { border-bottom: 0px; color:#606060; font-family: Trebuchet MS,Georgia,"Times New Roman",serif; }
+h2, .wiki h1 { letter-spacing:-1px; }
+h4 { border-bottom: dotted 1px #c0c0c0; }
+
+#top-menu a.home, #top-menu a.mypage, #top-menu a.projects, #top-menu a.admin, #top-menu a.help { 
+    background-position: 0% 40%;
+    background-repeat: no-repeat;
+    padding-left: 20px;
+    padding-top: 2px;
+    padding-bottom: 3px;
+}
+
+#top-menu a.home { background-image: url(../../../images/home.png); }
+#top-menu a.mypage { background-image: url(../../../images/user_page.png); }
+#top-menu a.projects { background-image: url(../../../images/projects.png); }
+#top-menu a.admin { background-image: url(../../../images/admin.png); }
+#top-menu a.help { background-image: url(../../../images/help.png); }

From 7704e2d9191d00d19115198f981e2262bc11dc25 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Thu, 22 Nov 2007 19:19:47 +0000
Subject: [PATCH 011/710] Forums: attachments can now be added to replies.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@923 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/messages_controller.rb |  8 ++++++--
 app/views/messages/_form.rhtml         |  3 ++-
 app/views/messages/show.rhtml          | 17 ++++++++++-------
 3 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/app/controllers/messages_controller.rb b/app/controllers/messages_controller.rb
index 645aadf1c..9352c4af4 100644
--- a/app/controllers/messages_controller.rb
+++ b/app/controllers/messages_controller.rb
@@ -35,8 +35,7 @@ class MessagesController < ApplicationController
     @message.board = @board 
     if request.post? && @message.save
       params[:attachments].each { |file|
-        next unless file.size > 0
-        Attachment.create(:container => @message, :file => file, :author => User.current)
+        Attachment.create(:container => @message, :file => file, :author => User.current) if file.size > 0
       } if params[:attachments] and params[:attachments].is_a? Array    
       redirect_to :action => 'show', :id => @message
     end
@@ -47,6 +46,11 @@ class MessagesController < ApplicationController
     @reply.author = User.current
     @reply.board = @board
     @message.children << @reply
+    if !@reply.new_record?
+      params[:attachments].each { |file|
+        Attachment.create(:container => @reply, :file => file, :author => User.current) if file.size > 0
+      } if params[:attachments] and params[:attachments].is_a? Array
+    end
     redirect_to :action => 'show', :id => @message
   end
   
diff --git a/app/views/messages/_form.rhtml b/app/views/messages/_form.rhtml
index e484baf2f..25d88cd44 100644
--- a/app/views/messages/_form.rhtml
+++ b/app/views/messages/_form.rhtml
@@ -5,10 +5,11 @@
 <p><label><%= l(:field_subject) %></label><br />
 <%= f.text_field :subject, :required => true, :size => 120 %></p>
 
-<p><%= f.text_area :content, :required => true, :cols => 80, :rows => 15, :class => 'wiki-edit' %></p>
+<p><%= f.text_area :content, :required => true, :cols => 80, :rows => 15, :class => 'wiki-edit', :id => 'message_content' %></p>
 <%= wikitoolbar_for 'message_content' %>
 <!--[eoform:message]-->
 
 <span class="tabular">
 <%= render :partial => 'attachments/form' %>
+</span>
 </div>
diff --git a/app/views/messages/show.rhtml b/app/views/messages/show.rhtml
index 772f0653e..e39c09d50 100644
--- a/app/views/messages/show.rhtml
+++ b/app/views/messages/show.rhtml
@@ -1,27 +1,30 @@
 <h2><%= link_to h(@board.name), :controller => 'boards', :action => 'show', :project_id => @project, :id => @board %> &#187; <%=h @message.subject %></h2>
 
+<div class="message">
 <p><span class="author"><%= authoring @message.created_on, @message.author %></span></p>
 <div class="wiki">
 <%= textilizable(@message.content, :attachments => @message.attachments) %>
 </div>
 <%= link_to_attachments @message.attachments, :no_author => true %>
+</div>
 <br />
 
+<div class="message reply">
 <h3 class="icon22 icon22-comment"><%= l(:label_reply_plural) %></h3>
 <% @message.children.each do |message| %>
   <a name="<%= "message-#{message.id}" %>"></a>
-  <h4><%=h message.subject %> - <%= message.author.name %>, <%= format_time(message.created_on) %></h4>
+  <h4><%=h message.subject %> - <%= authoring message.created_on, message.author %></h4>
   <div class="wiki"><%= textilizable message.content %></div>
+  <%= link_to_attachments message.attachments, :no_author => true %>
 <% end %>
+</div>
 
 <% if authorize_for('messages', 'reply') %>
-<p><%= toggle_link l(:button_reply), "reply", :focus => "reply_content" %></p>
+<p><%= toggle_link l(:button_reply), "reply", :focus => 'message_content' %></p>
 <div id="reply" style="display:none;">
-<%= error_messages_for 'message' %>
-<% form_for :reply, @reply, :url => {:action => 'reply', :id => @message} do |f| %>
-  <p><%= f.text_field :subject, :required => true, :size => 60 %></p>
-  <p><%= f.text_area :content, :required => true, :cols => 80, :rows => 10 %></p>
-  <p><%= submit_tag l(:button_submit) %></p>
+<% form_for :reply, @reply, :url => {:action => 'reply', :id => @message}, :html => {:multipart => true} do |f| %>
+    <%= render :partial => 'form', :locals => {:f => f} %>
+    <%= submit_tag l(:button_submit) %>
 <% end %>
 </div>
 <% end %>

From c21ee95ade208c09562c1a3940bec7535839a17c Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Fri, 23 Nov 2007 18:27:26 +0000
Subject: [PATCH 012/710] * Updated Russian translation (iGor kMeta) * Fixed
 front page typo: View all issues instead of View all news (Derek Montgomery)

git-svn-id: http://redmine.rubyforge.org/svn/trunk@924 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/welcome/index.rhtml |  2 +-
 lang/ru.yml                   | 34 +++++++++++++++++-----------------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/app/views/welcome/index.rhtml b/app/views/welcome/index.rhtml
index d1e871c4a..2e7ec2c06 100644
--- a/app/views/welcome/index.rhtml
+++ b/app/views/welcome/index.rhtml
@@ -6,7 +6,7 @@
   <div class="box">
 	<h3><%=l(:label_news_latest)%></h3>
 		<%= render :partial => 'news/news', :collection => @news %>
-		<%= link_to l(:label_issue_view_all), :controller => 'news' %>
+		<%= link_to l(:label_news_view_all), :controller => 'news' %>
   </div>
   <% end %>
 </div>
diff --git a/lang/ru.yml b/lang/ru.yml
index 010b687e6..ffc964f0c 100644
--- a/lang/ru.yml
+++ b/lang/ru.yml
@@ -29,7 +29,7 @@ activerecord_error_blank: необходимо заполнить
 activerecord_error_too_long: слишком длинное значение
 activerecord_error_too_short: слишком короткое значение
 activerecord_error_wrong_length: не соответствует длине
-activerecord_error_taken: уже был принят
+activerecord_error_taken: уже используется
 activerecord_error_not_a_number: не является числом
 activerecord_error_not_a_date: дата недействительна
 activerecord_error_greater_than_start_date: должна быть позднее даты начала
@@ -48,8 +48,8 @@ general_text_no: 'Нет'
 general_text_yes: 'Да'
 general_lang_name: 'Russian (Русский)'
 general_csv_separator: ','
-general_csv_encoding: ISO-8859-1
-general_pdf_encoding: ISO-8859-1
+general_csv_encoding: UTF-8
+general_pdf_encoding: UTF-8
 general_day_names: Понедельник,Вторник,Среда,Четверг,Пятница,Суббота,Воскресенье
 general_first_day_of_week: '1'
 
@@ -148,17 +148,17 @@ field_attr_lastname: Атрибут Фамилия
 field_attr_mail: Атрибут Email
 field_onthefly: Создание пользователя на лету
 field_start_date: Начало
-field_done_ratio: %% Готовности
+field_done_ratio: Готовность в %%
 field_auth_source: Режим аутентификации
 field_hide_mail: Скрывать мой email
 field_comments: Комментарий
 field_url: URL
 field_start_page: Стартовая страница
 field_subproject: Подпроект
-field_hours: Часы
+field_hours: Час(а)(ов)
 field_activity: Деятельность
 field_spent_on: Дата
-field_identifier: Признак
+field_identifier: Ун. идентификатор
 field_is_filter: Используется в качестве фильтра
 field_issue_to_id: Связанные задачи
 field_delay: Отложить
@@ -243,13 +243,13 @@ label_administration: Администрирование
 label_login: Войти
 label_logout: Выйти
 label_help: Помощь
-label_reported_issues: Задачи, по которым предоставлен отчет
+label_reported_issues: Созданые задачи
 label_assigned_to_me_issues: Мои задачи
 label_last_login: Последнее подключение
 label_last_updates: Последнее обновление
 label_last_updates_plural: %d последние обновления
-label_registered_on: Зарегистрировано на 
-label_activity: События
+label_registered_on: Зарегистрирован(а) 
+label_activity: Активность
 label_new: Новый
 label_logged_as: Вошел как
 label_environment: Окружение
@@ -460,7 +460,7 @@ button_add: Добавить
 button_change: Изменить
 button_apply: Применить
 button_clear: Очистить
-button_lock: Закрыть
+button_lock: Заблокировать
 button_unlock: Открыть
 button_download: Загрузить
 button_list: Список
@@ -538,10 +538,10 @@ default_activity_development: Разработка
 enumeration_issue_priorities: Приоритеты задач
 enumeration_doc_categories: Категории документов
 enumeration_activities: Действия (учет времени)
-label_registration_activation_by_email: account activation by email
-mail_subject_account_activation_request: Redmine account activation request
-mail_body_account_activation_request: 'A new user (%s) has registered. His account his pending your approval:'
-label_registration_automatic_activation: automatic account activation
-label_registration_manual_activation: manual account activation
-notice_account_pending: "Your account was created and is now pending administrator approval."
-field_time_zone: Time zone
+label_registration_activation_by_email: активация аккаунтов по email
+mail_subject_account_activation_request: Запрос на активацию пользователя в системе Redmine
+mail_body_account_activation_request: 'Новый пользователь (%s) зарегистирован. Аккаунт ожидает вашего утверждения:'
+label_registration_automatic_activation: автоматическая активация аккаунтов
+label_registration_manual_activation: активировать аккаунты вручную
+notice_account_pending: "Ваш аккаунт уже создан и ожидает подтверждения администратора."
+field_time_zone: Часовой пояс

From 866e9e2503713c67fd33b389d4e840c04ce1562d Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Fri, 23 Nov 2007 23:23:39 +0000
Subject: [PATCH 013/710] Fixed: error on account/register when validation
 fails.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@925 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/account_controller.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/controllers/account_controller.rb b/app/controllers/account_controller.rb
index 37a810bdf..a1cbf5ffd 100644
--- a/app/controllers/account_controller.rb
+++ b/app/controllers/account_controller.rb
@@ -115,10 +115,10 @@ class AccountController < ApplicationController
       @user.login = params[:user][:login]
       @user.status = User::STATUS_REGISTERED
       @user.password, @user.password_confirmation = params[:password], params[:password_confirmation]
-      if params["custom_fields"]
-        @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
-      end
+      @custom_values = UserCustomField.find(:all).collect { |x| CustomValue.new(:custom_field => x, 
+                                                                                :customized => @user, 
+                                                                                :value => (params["custom_fields"] ? params["custom_fields"][x.id.to_s] : nil)) }
+      @user.custom_values = @custom_values
       case Setting.self_registration
       when '1'
         # Email activation

From 29b3614bcb759214bb1aba77c27ac11c8ef6b15b Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sat, 24 Nov 2007 12:25:07 +0000
Subject: [PATCH 014/710] Forums enhancements: * messages can now be
 edited/deleted (explicit permissions need to be given) * topics can be locked
 so that no reply can be added (only by users allowed to edit messages) *
 topics can be marked as sticky so that they always appear at the top of the
 list (only by users allowed to edit messages)

git-svn-id: http://redmine.rubyforge.org/svn/trunk@926 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/boards_controller.rb        |   2 +-
 app/controllers/messages_controller.rb      |  51 +++++++++++++++++---
 app/helpers/application_helper.rb           |   4 +-
 app/models/message.rb                       |  18 +++++++
 app/views/boards/index.rhtml                |   2 +-
 app/views/boards/show.rhtml                 |  18 +++----
 app/views/messages/_form.rhtml              |   8 ++-
 app/views/messages/edit.rhtml               |   6 +++
 app/views/messages/show.rhtml               |  27 +++++++----
 db/migrate/082_add_messages_locked.rb       |   9 ++++
 db/migrate/083_add_messages_sticky.rb       |   9 ++++
 lib/redmine.rb                              |   2 +
 public/images/sticky.png                    | Bin 0 -> 461 bytes
 public/stylesheets/application.css          |   5 ++
 test/fixtures/boards.yml                    |   6 +--
 test/fixtures/messages.yml                  |  38 +++++++++++++--
 test/functional/boards_controller_test.rb   |  50 +++++++++++++++++++
 test/functional/messages_controller_test.rb |  49 +++++++++++++++++++
 test/unit/message_test.rb                   |  26 ++++++++++
 19 files changed, 294 insertions(+), 36 deletions(-)
 create mode 100644 app/views/messages/edit.rhtml
 create mode 100644 db/migrate/082_add_messages_locked.rb
 create mode 100644 db/migrate/083_add_messages_sticky.rb
 create mode 100644 public/images/sticky.png
 create mode 100644 test/functional/boards_controller_test.rb
 create mode 100644 test/functional/messages_controller_test.rb

diff --git a/app/controllers/boards_controller.rb b/app/controllers/boards_controller.rb
index 3a8b021a3..200792370 100644
--- a/app/controllers/boards_controller.rb
+++ b/app/controllers/boards_controller.rb
@@ -41,7 +41,7 @@ class BoardsController < ApplicationController
       
     @topic_count = @board.topics.count
     @topic_pages = Paginator.new self, @topic_count, 25, params['page']
-    @topics =  @board.topics.find :all, :order => sort_clause,
+    @topics =  @board.topics.find :all, :order => "#{Message.table_name}.sticky DESC, #{sort_clause}",
                                   :include => [:author, {:last_reply => :author}],
                                   :limit  =>  @topic_pages.items_per_page,
                                   :offset =>  @topic_pages.current.offset
diff --git a/app/controllers/messages_controller.rb b/app/controllers/messages_controller.rb
index 9352c4af4..46c9adadd 100644
--- a/app/controllers/messages_controller.rb
+++ b/app/controllers/messages_controller.rb
@@ -17,22 +17,30 @@
 
 class MessagesController < ApplicationController
   layout 'base'
-  before_filter :find_project, :authorize
+  before_filter :find_board, :only => :new
+  before_filter :find_message, :except => :new
+  before_filter :authorize
 
   verify :method => :post, :only => [ :reply, :destroy ], :redirect_to => { :action => :show }
 
   helper :attachments
   include AttachmentsHelper   
 
+  # Show a topic and its replies
   def show
     @reply = Message.new(:subject => "RE: #{@message.subject}")
     render :action => "show", :layout => false if request.xhr?
   end
   
+  # Create a new topic
   def new
     @message = Message.new(params[:message])
     @message.author = User.current
-    @message.board = @board 
+    @message.board = @board
+    if params[:message] && User.current.allowed_to?(:edit_messages, @project)
+      @message.locked = params[:message]['locked']
+      @message.sticky = params[:message]['sticky']
+    end
     if request.post? && @message.save
       params[:attachments].each { |file|
         Attachment.create(:container => @message, :file => file, :author => User.current) if file.size > 0
@@ -41,24 +49,55 @@ class MessagesController < ApplicationController
     end
   end
 
+  # Reply to a topic
   def reply
     @reply = Message.new(params[:reply])
     @reply.author = User.current
     @reply.board = @board
-    @message.children << @reply
+    @topic.children << @reply
     if !@reply.new_record?
       params[:attachments].each { |file|
         Attachment.create(:container => @reply, :file => file, :author => User.current) if file.size > 0
       } if params[:attachments] and params[:attachments].is_a? Array
     end
-    redirect_to :action => 'show', :id => @message
+    redirect_to :action => 'show', :id => @topic
+  end
+
+  # Edit a message
+  def edit
+    if params[:message] && User.current.allowed_to?(:edit_messages, @project)
+      @message.locked = params[:message]['locked']
+      @message.sticky = params[:message]['sticky']
+    end
+    if request.post? && @message.update_attributes(params[:message])
+      params[:attachments].each { |file|
+        Attachment.create(:container => @message, :file => file, :author => User.current) if file.size > 0
+      } if params[:attachments] and params[:attachments].is_a? Array
+      flash[:notice] = l(:notice_successful_update)
+      redirect_to :action => 'show', :id => @topic
+    end
+  end
+  
+  # Delete a messages
+  def destroy
+    @message.destroy
+    redirect_to @message.parent.nil? ?
+      { :controller => 'boards', :action => 'show', :project_id => @project, :id => @board } :
+      { :action => 'show', :id => @message.parent }
   end
   
 private
-  def find_project
+  def find_message
+    find_board
+    @message = @board.messages.find(params[:id], :include => :parent)
+    @topic = @message.root
+  rescue ActiveRecord::RecordNotFound
+    render_404
+  end
+  
+  def find_board
     @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
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 9c8e9c67d..f4746c627 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -34,7 +34,7 @@ module ApplicationHelper
 
   # Display a link to user's account page
   def link_to_user(user)
-    link_to user.name, :controller => 'account', :action => 'show', :id => user
+    user ? link_to(user, :controller => 'account', :action => 'show', :id => user) : 'Anonymous'
   end
   
   def link_to_issue(issue)
@@ -92,7 +92,7 @@ module ApplicationHelper
   
   def authoring(created, author)
     time_tag = content_tag('acronym', distance_of_time_in_words(Time.now, created), :title => format_time(created))
-    l(:label_added_time_by, author.name, time_tag)
+    l(:label_added_time_by, author || 'Anonymous', time_tag)
   end
   
   def day_name(day)
diff --git a/app/models/message.rb b/app/models/message.rb
index 909c06a9e..038665cce 100644
--- a/app/models/message.rb
+++ b/app/models/message.rb
@@ -30,9 +30,15 @@ class Message < ActiveRecord::Base
                 :description => :content,
                 :url => Proc.new {|o| {:controller => 'messages', :action => 'show', :board_id => o.board_id, :id => o.id}}
   
+  attr_protected :locked, :sticky
   validates_presence_of :subject, :content
   validates_length_of :subject, :maximum => 255
   
+  def validate_on_create
+    # Can not reply to a locked topic
+    errors.add_to_base 'Topic is locked' if root.locked?
+  end
+  
   def after_create
     board.update_attribute(:last_message_id, self.id)
     board.increment! :messages_count
@@ -43,6 +49,18 @@ class Message < ActiveRecord::Base
     end
   end
   
+  def after_destroy
+    # The following line is required so that the previous counter
+    # updates (due to children removal) are not overwritten
+    board.reload
+    board.decrement! :messages_count
+    board.decrement! :topics_count unless parent
+  end
+  
+  def sticky?
+    sticky == 1
+  end
+  
   def project
     board.project
   end
diff --git a/app/views/boards/index.rhtml b/app/views/boards/index.rhtml
index 3291d0194..cd4e85e9a 100644
--- a/app/views/boards/index.rhtml
+++ b/app/views/boards/index.rhtml
@@ -19,7 +19,7 @@
     <td>
     <small>
       <% if board.last_message %>
-      <%= board.last_message.author.name %>, <%= format_time(board.last_message.created_on) %><br />
+      <%= authoring board.last_message.created_on, board.last_message.author %><br />
       <%= link_to_message board.last_message %>  
       <% end %>
     </small>
diff --git a/app/views/boards/show.rhtml b/app/views/boards/show.rhtml
index 0af89fdb7..8bcf960b2 100644
--- a/app/views/boards/show.rhtml
+++ b/app/views/boards/show.rhtml
@@ -18,7 +18,7 @@
 <h2><%=h @board.name %></h2>
 
 <% if @topics.any? %>
-<table class="list">
+<table class="list messages">
   <thead><tr>
     <th><%= l(:field_subject) %></th>
     <th><%= l(:field_author) %></th>
@@ -28,18 +28,16 @@
   </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>
+    <tr class="message <%= cycle 'odd', 'even' %> <%= topic.sticky? ? 'sticky' : '' %> <%= topic.locked? ? 'locked' : '' %>">
+      <td class="subject"><%= link_to h(topic.subject), { :controller => 'messages', :action => 'show', :board_id => @board, :id => topic }, :class => 'icon' %></td>
+      <td class="author" align="center"><%= topic.author %></td>
+      <td class="created_on" align="center"><%= format_time(topic.created_on) %></td>
+      <td class="replies" align="center"><%= topic.replies_count %></td>
+      <td class="last_message">
         <% if topic.last_reply %>
-        <%= topic.last_reply.author.name %>, <%= format_time(topic.last_reply.created_on) %><br />
+        <%= authoring topic.last_reply.created_on, topic.last_reply.author %><br />
         <%= link_to_message topic.last_reply %>
         <% end %>
-      </small>
       </td>
     </tr>
   <% end %>
diff --git a/app/views/messages/_form.rhtml b/app/views/messages/_form.rhtml
index 25d88cd44..c2f7fb569 100644
--- a/app/views/messages/_form.rhtml
+++ b/app/views/messages/_form.rhtml
@@ -3,7 +3,13 @@
 <div class="box">
 <!--[form:message]-->
 <p><label><%= l(:field_subject) %></label><br />
-<%= f.text_field :subject, :required => true, :size => 120 %></p>
+<%= f.text_field :subject, :required => true, :size => 120 %>
+
+<% if User.current.allowed_to?(:edit_messages, @project) %>
+    <label><%= f.check_box :sticky %> Sticky</label>
+    <label><%= f.check_box :locked %> Locked</label>
+<% end %>
+</p>
 
 <p><%= f.text_area :content, :required => true, :cols => 80, :rows => 15, :class => 'wiki-edit', :id => 'message_content' %></p>
 <%= wikitoolbar_for 'message_content' %>
diff --git a/app/views/messages/edit.rhtml b/app/views/messages/edit.rhtml
new file mode 100644
index 000000000..808b6ea27
--- /dev/null
+++ b/app/views/messages/edit.rhtml
@@ -0,0 +1,6 @@
+<h2><%= link_to h(@board.name), :controller => 'boards', :action => 'show', :project_id => @project, :id => @board %> &#187; <%=h @message.subject %></h2>
+
+<% form_for :message, @message, :url => {:action => 'edit'}, :html => {:multipart => true} do |f| %>
+  <%= render :partial => 'form', :locals => {:f => f} %>
+  <%= submit_tag l(:button_save) %>
+<% end %>
diff --git a/app/views/messages/show.rhtml b/app/views/messages/show.rhtml
index e39c09d50..bb7e2b7f3 100644
--- a/app/views/messages/show.rhtml
+++ b/app/views/messages/show.rhtml
@@ -1,28 +1,37 @@
-<h2><%= link_to h(@board.name), :controller => 'boards', :action => 'show', :project_id => @project, :id => @board %> &#187; <%=h @message.subject %></h2>
+<div class="contextual">
+    <%= link_to_if_authorized l(:button_edit), {:action => 'edit', :id => @topic}, :class => 'icon icon-edit' %>
+    <%= link_to_if_authorized l(:button_delete), {:action => 'destroy', :id => @topic}, :method => :post, :confirm => l(:text_are_you_sure), :class => 'icon icon-del' %>
+</div>
+
+<h2><%= link_to h(@board.name), :controller => 'boards', :action => 'show', :project_id => @project, :id => @board %> &#187; <%=h @topic.subject %></h2>
 
 <div class="message">
-<p><span class="author"><%= authoring @message.created_on, @message.author %></span></p>
+<p><span class="author"><%= authoring @topic.created_on, @topic.author %></span></p>
 <div class="wiki">
-<%= textilizable(@message.content, :attachments => @message.attachments) %>
+<%= textilizable(@topic.content, :attachments => @topic.attachments) %>
 </div>
-<%= link_to_attachments @message.attachments, :no_author => true %>
+<%= link_to_attachments @topic.attachments, :no_author => true %>
 </div>
 <br />
 
-<div class="message reply">
 <h3 class="icon22 icon22-comment"><%= l(:label_reply_plural) %></h3>
-<% @message.children.each do |message| %>
+<% @topic.children.each do |message| %>
   <a name="<%= "message-#{message.id}" %>"></a>
+  <div class="contextual">
+    <%= link_to_if_authorized l(:button_edit), {:action => 'edit', :id => message}, :class => 'icon icon-edit' %>
+    <%= link_to_if_authorized l(:button_delete), {:action => 'destroy', :id => message}, :method => :post, :confirm => l(:text_are_you_sure), :class => 'icon icon-del' %>
+  </div>
+  <div class="message reply">
   <h4><%=h message.subject %> - <%= authoring message.created_on, message.author %></h4>
   <div class="wiki"><%= textilizable message.content %></div>
   <%= link_to_attachments message.attachments, :no_author => true %>
+  </div>
 <% end %>
-</div>
 
-<% if authorize_for('messages', 'reply') %>
+<% if !@topic.locked? && authorize_for('messages', 'reply') %>
 <p><%= toggle_link l(:button_reply), "reply", :focus => 'message_content' %></p>
 <div id="reply" style="display:none;">
-<% form_for :reply, @reply, :url => {:action => 'reply', :id => @message}, :html => {:multipart => true} do |f| %>
+<% form_for :reply, @reply, :url => {:action => 'reply', :id => @topic}, :html => {:multipart => true} do |f| %>
     <%= render :partial => 'form', :locals => {:f => f} %>
     <%= submit_tag l(:button_submit) %>
 <% end %>
diff --git a/db/migrate/082_add_messages_locked.rb b/db/migrate/082_add_messages_locked.rb
new file mode 100644
index 000000000..20a172565
--- /dev/null
+++ b/db/migrate/082_add_messages_locked.rb
@@ -0,0 +1,9 @@
+class AddMessagesLocked < ActiveRecord::Migration
+  def self.up
+    add_column :messages, :locked, :boolean, :default => false
+  end
+
+  def self.down
+    remove_column :messages, :locked
+  end
+end
diff --git a/db/migrate/083_add_messages_sticky.rb b/db/migrate/083_add_messages_sticky.rb
new file mode 100644
index 000000000..8fd5d2ce3
--- /dev/null
+++ b/db/migrate/083_add_messages_sticky.rb
@@ -0,0 +1,9 @@
+class AddMessagesSticky < ActiveRecord::Migration
+  def self.up
+    add_column :messages, :sticky, :integer, :default => 0
+  end
+
+  def self.down
+    remove_column :messages, :sticky
+  end
+end
diff --git a/lib/redmine.rb b/lib/redmine.rb
index 8a79b265a..ffc1cc27e 100644
--- a/lib/redmine.rb
+++ b/lib/redmine.rb
@@ -84,6 +84,8 @@ Redmine::AccessControl.map do |map|
     map.permission :manage_boards, {:boards => [:new, :edit, :destroy]}, :require => :member
     map.permission :view_messages, {:boards => [:index, :show], :messages => [:show]}, :public => true
     map.permission :add_messages, {:messages => [:new, :reply]}
+    map.permission :edit_messages, {:messages => :edit}, :require => :member
+    map.permission :delete_messages, {:messages => :destroy}, :require => :member
   end
 end
 
diff --git a/public/images/sticky.png b/public/images/sticky.png
new file mode 100644
index 0000000000000000000000000000000000000000..d32ee63a471527025cec4f060ef6372ae9ffd82c
GIT binary patch
literal 461
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbL!UWsc&iE~kEVo7Fxo<c}wZYo1@
zVy>Qok%>ZHei@K9FfdmzG`2D{wK6hO&^9nMFz7zqdLF2gy~NYkmHj%m1dky1o95H2
zfI^%F9+AZi4BSE>%y{W;-5;PJOS+@4BLl<6e(pbstU!KsfKQ0)e+Gv4@1MVazxVz7
zt?%C-`~Lm=^XF^7e_#9lJrFH@|9;N%=S%<p2a3%3{(b4adrR*<pY#6v(yd#o|NjSa
zdwQlMPnnXucW?Fg|4ZM0KX>g~%k$?wYqu8v|3Byd|0&<UPkH`+?f?Hh-@mtP-CF$p
z`}^<T&wc;C_51g0-@hMYdmz;VbOvKdkY6x^!?PP{Ku({hi(^Q|t={u@g_;xu+7ew|
z#9F#cjd;%dd;g#7_S#IVuh!M`Zzi^_irRnsv+BRX`W<sFZr`tQI>_skMx;XeD{swk
zmkBIQ3(gq&o>Z8_**D|Nlt-F;%2lobk2mx`OmNFOe&L-DhsW!^ug!TLY_~lxy<wVT
zaj6u;oc}Q^{4|$Z8!XV>A9(fA?qw4<#eF<({&WTBi$CoX+<-1)@O1TaS?83{1OWXM
B+a~}3

literal 0
HcmV?d00001

diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index f398895e8..1e3200135 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -77,6 +77,11 @@ tr.issue td.subject, tr.issue td.category { white-space: normal; }
 tr.issue td.subject { text-align: left; }
 tr.issue td.done_ratio table.progress { margin-left:auto; margin-right: auto;}
 
+tr.message { height: 2.6em; }
+tr.message td.last_message { font-size: 80%; }
+tr.message.locked td.subject a { background-image: url(../images/locked.png); }
+tr.message.sticky td.subject a { background-image: url(../images/sticky.png); font-weight: bold; }
+
 table.list tbody tr:hover { background-color:#ffffdd; }
 table td {padding:2px;}
 table p {margin:0;}
diff --git a/test/fixtures/boards.yml b/test/fixtures/boards.yml
index 7f2944fac..b6b42aaa3 100644
--- a/test/fixtures/boards.yml
+++ b/test/fixtures/boards.yml
@@ -2,12 +2,12 @@
 boards_001: 
   name: Help
   project_id: 1
-  topics_count: 1
+  topics_count: 2
   id: 1
   description: Help board
   position: 1
-  last_message_id: 2
-  messages_count: 2
+  last_message_id: 5
+  messages_count: 5
 boards_002: 
   name: Discussion
   project_id: 1
diff --git a/test/fixtures/messages.yml b/test/fixtures/messages.yml
index 88f54dbc2..5bb2438dd 100644
--- a/test/fixtures/messages.yml
+++ b/test/fixtures/messages.yml
@@ -4,8 +4,8 @@ messages_001:
   updated_on: 2007-05-12 17:15:32 +02:00
   subject: First post
   id: 1
-  replies_count: 1
-  last_reply_id: 2
+  replies_count: 2
+  last_reply_id: 3
   content: "This is the very first post\n\
     in the forum"
   author_id: 1
@@ -22,4 +22,36 @@ messages_002:
   author_id: 1
   parent_id: 1
   board_id: 1
-  
\ No newline at end of file
+messages_003: 
+  created_on: 2007-05-12 17:18:02 +02:00
+  updated_on: 2007-05-12 17:18:02 +02:00
+  subject: "RE: First post"
+  id: 3
+  replies_count: 0
+  last_reply_id: 
+  content: "An other reply"
+  author_id: 
+  parent_id: 1
+  board_id: 1
+messages_004: 
+  created_on: 2007-08-12 17:15:32 +02:00
+  updated_on: 2007-08-12 17:15:32 +02:00
+  subject: Post 2
+  id: 4
+  replies_count: 1
+  last_reply_id: 5
+  content: "This is an other post"
+  author_id: 
+  parent_id: 
+  board_id: 1
+messages_005: 
+  created_on: 2007-09-12 17:18:00 +02:00
+  updated_on: 2007-09-12 17:18:00 +02:00
+  subject: 'RE: post 2'
+  id: 5
+  replies_count: 0
+  last_reply_id: 
+  content: "Reply to the second post"
+  author_id: 1
+  parent_id: 4
+  board_id: 1
diff --git a/test/functional/boards_controller_test.rb b/test/functional/boards_controller_test.rb
new file mode 100644
index 000000000..3ff71bc4e
--- /dev/null
+++ b/test/functional/boards_controller_test.rb
@@ -0,0 +1,50 @@
+# 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 File.dirname(__FILE__) + '/../test_helper'
+require 'boards_controller'
+
+# Re-raise errors caught by the controller.
+class BoardsController; def rescue_action(e) raise e end; end
+
+class BoardsControllerTest < Test::Unit::TestCase
+  fixtures :projects, :users, :members, :roles, :boards, :messages, :enabled_modules
+  
+  def setup
+    @controller = BoardsController.new
+    @request    = ActionController::TestRequest.new
+    @response   = ActionController::TestResponse.new
+    User.current = nil
+  end
+  
+  def test_index
+    get :index, :project_id => 1
+    assert_response :success
+    assert_template 'index'
+    assert_not_nil assigns(:boards)
+    assert_not_nil assigns(:project)
+  end
+  
+  def test_show
+    get :show, :project_id => 1, :id => 1
+    assert_response :success
+    assert_template 'show'
+    assert_not_nil assigns(:board)
+    assert_not_nil assigns(:project)
+    assert_not_nil assigns(:topics)
+  end
+end
diff --git a/test/functional/messages_controller_test.rb b/test/functional/messages_controller_test.rb
new file mode 100644
index 000000000..25fc1363e
--- /dev/null
+++ b/test/functional/messages_controller_test.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.
+
+require File.dirname(__FILE__) + '/../test_helper'
+require 'messages_controller'
+
+# Re-raise errors caught by the controller.
+class MessagesController; def rescue_action(e) raise e end; end
+
+class MessagesControllerTest < Test::Unit::TestCase
+  fixtures :projects, :users, :members, :roles, :boards, :messages, :enabled_modules
+  
+  def setup
+    @controller = MessagesController.new
+    @request    = ActionController::TestRequest.new
+    @response   = ActionController::TestResponse.new
+    User.current = nil
+  end
+  
+  def test_show
+    get :show, :board_id => 1, :id => 1
+    assert_response :success
+    assert_template 'show'
+    assert_not_nil assigns(:board)
+    assert_not_nil assigns(:project)
+    assert_not_nil assigns(:topic)
+  end
+  
+  def test_reply
+    @request.session[:user_id] = 2
+    post :reply, :board_id => 1, :id => 1, :reply => { :content => 'This is a test reply', :subject => 'Test reply' }
+    assert_redirected_to 'messages/show'
+    assert Message.find_by_subject('Test reply')
+  end
+end
diff --git a/test/unit/message_test.rb b/test/unit/message_test.rb
index 6d8458bfc..82ed3fe13 100644
--- a/test/unit/message_test.rb
+++ b/test/unit/message_test.rb
@@ -41,4 +41,30 @@ class MessageTest < Test::Unit::TestCase
     assert_equal replies_count+1, @message[:replies_count]
     assert_equal reply, @message.last_reply
   end
+  
+  def test_destroy_topic
+    message = Message.find(1)
+    board = message.board
+    topics_count, messages_count = board.topics_count, board.messages_count    
+    assert message.destroy
+    board.reload
+    
+    # Replies deleted
+    assert Message.find_all_by_parent_id(1).empty?
+    # Checks counters
+    assert_equal topics_count - 1, board.topics_count
+    assert_equal messages_count - 3, board.messages_count
+  end
+  
+  def test_destroy_reply
+    message = Message.find(5)
+    board = message.board
+    topics_count, messages_count = board.topics_count, board.messages_count    
+    assert message.destroy
+    board.reload
+
+    # Checks counters
+    assert_equal topics_count, board.topics_count
+    assert_equal messages_count - 1, board.messages_count
+  end
 end

From fde4a42e2aa5327c81d159d5f79026e5d0246c08 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sat, 24 Nov 2007 12:52:29 +0000
Subject: [PATCH 015/710] Removed the 12 characters limit on passwords.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@927 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/models/user.rb                        | 3 +--
 app/views/account/password_recovery.rhtml | 2 +-
 app/views/account/register.rhtml          | 3 ++-
 app/views/my/password.rhtml               | 2 +-
 app/views/users/_form.rhtml               | 2 +-
 lang/bg.yml                               | 1 +
 lang/cs.yml                               | 1 +
 lang/de.yml                               | 1 +
 lang/en.yml                               | 1 +
 lang/es.yml                               | 1 +
 lang/fr.yml                               | 1 +
 lang/he.yml                               | 1 +
 lang/it.yml                               | 1 +
 lang/ja.yml                               | 1 +
 lang/ko.yml                               | 1 +
 lang/nl.yml                               | 1 +
 lang/pl.yml                               | 1 +
 lang/pt-br.yml                            | 1 +
 lang/pt.yml                               | 1 +
 lang/ro.yml                               | 1 +
 lang/ru.yml                               | 1 +
 lang/sr.yml                               | 1 +
 lang/sv.yml                               | 1 +
 lang/zh.yml                               | 1 +
 24 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/app/models/user.rb b/app/models/user.rb
index 93b73dd7a..5297b31b0 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -46,8 +46,7 @@ class User < ActiveRecord::Base
   validates_length_of :firstname, :lastname, :maximum => 30
   validates_format_of :mail, :with => /^([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})$/i, :allow_nil => true
   validates_length_of :mail, :maximum => 60, :allow_nil => true
-  # Password length between 4 and 12
-  validates_length_of :password, :in => 4..12, :allow_nil => true
+  validates_length_of :password, :minimum => 4, :allow_nil => true
   validates_confirmation_of :password, :allow_nil => true
   validates_associated :custom_values, :on => :update
 
diff --git a/app/views/account/password_recovery.rhtml b/app/views/account/password_recovery.rhtml
index 439ab11b5..7fdd2b2fd 100644
--- a/app/views/account/password_recovery.rhtml
+++ b/app/views/account/password_recovery.rhtml
@@ -6,7 +6,7 @@
 <div class="box tabular">
 <p><label for="new_password"><%=l(:field_new_password)%> <span class="required">*</span></label>
 <%= password_field_tag 'new_password', nil, :size => 25 %><br />
-<em><%= l(:text_length_between, 4, 12) %></em></p>
+<em><%= l(:text_caracters_minimum, 4) %></em></p>
 
 <p><label for="new_password_confirmation"><%=l(:field_password_confirmation)%> <span class="required">*</span></label>
 <%= password_field_tag 'new_password_confirmation', nil, :size => 25 %></p>
diff --git a/app/views/account/register.rhtml b/app/views/account/register.rhtml
index f04bfbb0e..c1425a380 100644
--- a/app/views/account/register.rhtml
+++ b/app/views/account/register.rhtml
@@ -9,7 +9,8 @@
 <%= text_field 'user', 'login', :size => 25  %></p>
 
 <p><label for="password"><%=l(:field_password)%> <span class="required">*</span></label>
-<%= password_field_tag 'password', nil, :size => 25  %></p>
+<%= password_field_tag 'password', nil, :size => 25  %><br />
+<em><%= l(:text_caracters_minimum, 4) %></em></p>
 
 <p><label for="password_confirmation"><%=l(:field_password_confirmation)%> <span class="required">*</span></label>
 <%= password_field_tag 'password_confirmation', nil, :size => 25  %></p>
diff --git a/app/views/my/password.rhtml b/app/views/my/password.rhtml
index 217a8758e..2e9fd0fa4 100644
--- a/app/views/my/password.rhtml
+++ b/app/views/my/password.rhtml
@@ -9,7 +9,7 @@
 
 <p><label for="new_password"><%=l(:field_new_password)%> <span class="required">*</span></label>
 <%= password_field_tag 'new_password', nil, :size => 25 %><br />
-<em><%= l(:text_length_between, 4, 12) %></em></p>
+<em><%= l(:text_caracters_minimum, 4) %></em></p>
 
 <p><label for="new_password_confirmation"><%=l(:field_password_confirmation)%> <span class="required">*</span></label>
 <%= password_field_tag 'new_password_confirmation', nil, :size => 25 %></p>
diff --git a/app/views/users/_form.rhtml b/app/views/users/_form.rhtml
index 72cf3c95c..d32399c60 100644
--- a/app/views/users/_form.rhtml
+++ b/app/views/users/_form.rhtml
@@ -24,7 +24,7 @@
 <div id="password_fields" style="<%= 'display:none;' if @user.auth_source %>">
 <p><label for="password"><%=l(:field_password)%><span class="required"> *</span></label>
 <%= password_field_tag 'password', nil, :size => 25  %><br />
-<em><%= l(:text_length_between, 4, 12) %></em></p>
+<em><%= l(:text_caracters_minimum, 4) %></em></p>
 <p><label for="password_confirmation"><%=l(:field_password_confirmation)%><span class="required"> *</span></label>
 <%= password_field_tag 'password_confirmation', nil, :size => 25  %></p>
 </div>
diff --git a/lang/bg.yml b/lang/bg.yml
index 50b54cb7c..5ec4577d8 100644
--- a/lang/bg.yml
+++ b/lang/bg.yml
@@ -545,3 +545,4 @@ label_registration_automatic_activation: automatic account activation
 label_registration_manual_activation: manual account activation
 notice_account_pending: "Your account was created and is now pending administrator approval."
 field_time_zone: Time zone
+text_caracters_minimum: Must be at least %d characters long.
diff --git a/lang/cs.yml b/lang/cs.yml
index d64e8d888..09394ef71 100644
--- a/lang/cs.yml
+++ b/lang/cs.yml
@@ -545,3 +545,4 @@ label_registration_automatic_activation: automatic account activation
 label_registration_manual_activation: manual account activation
 notice_account_pending: "Your account was created and is now pending administrator approval."
 field_time_zone: Time zone
+text_caracters_minimum: Must be at least %d characters long.
diff --git a/lang/de.yml b/lang/de.yml
index b25e8d930..ab3e47013 100644
--- a/lang/de.yml
+++ b/lang/de.yml
@@ -545,3 +545,4 @@ label_registration_automatic_activation: automatic account activation
 label_registration_manual_activation: manual account activation
 notice_account_pending: "Your account was created and is now pending administrator approval."
 field_time_zone: Time zone
+text_caracters_minimum: Must be at least %d characters long.
diff --git a/lang/en.yml b/lang/en.yml
index c1745b4e9..201ba1601 100644
--- a/lang/en.yml
+++ b/lang/en.yml
@@ -507,6 +507,7 @@ text_tip_task_end_day: task ending this day
 text_tip_task_begin_end_day: task beginning and ending this day
 text_project_identifier_info: 'Lower case letters (a-z), numbers and dashes allowed.<br />Once saved, the identifier can not be changed.'
 text_caracters_maximum: %d characters maximum.
+text_caracters_minimum: Must be at least %d characters long.
 text_length_between: Length between %d and %d characters.
 text_tracker_no_workflow: No workflow defined for this tracker
 text_unallowed_characters: Unallowed characters
diff --git a/lang/es.yml b/lang/es.yml
index 824c84681..8ade705c8 100644
--- a/lang/es.yml
+++ b/lang/es.yml
@@ -548,3 +548,4 @@ label_registration_automatic_activation: automatic account activation
 label_registration_manual_activation: manual account activation
 notice_account_pending: "Your account was created and is now pending administrator approval."
 field_time_zone: Time zone
+text_caracters_minimum: Must be at least %d characters long.
diff --git a/lang/fr.yml b/lang/fr.yml
index 322ddd261..e319db81c 100644
--- a/lang/fr.yml
+++ b/lang/fr.yml
@@ -507,6 +507,7 @@ text_tip_task_end_day: tâche finissant ce jour
 text_tip_task_begin_end_day: tâche commençant et finissant ce jour
 text_project_identifier_info: 'Lettres minuscules (a-z), chiffres et tirets autorisés.<br />Un fois sauvegardé, l''identifiant ne pourra plus être modifié.'
 text_caracters_maximum: %d caractères maximum.
+text_caracters_minimum: %d caractères minimum.
 text_length_between: Longueur comprise entre %d et %d caractères.
 text_tracker_no_workflow: Aucun worflow n'est défini pour ce tracker
 text_unallowed_characters: Caractères non autorisés
diff --git a/lang/he.yml b/lang/he.yml
index f630fe051..7b20240ab 100644
--- a/lang/he.yml
+++ b/lang/he.yml
@@ -545,3 +545,4 @@ label_registration_automatic_activation: automatic account activation
 label_registration_manual_activation: manual account activation
 notice_account_pending: "Your account was created and is now pending administrator approval."
 field_time_zone: Time zone
+text_caracters_minimum: Must be at least %d characters long.
diff --git a/lang/it.yml b/lang/it.yml
index f103e18cc..ceb3102aa 100644
--- a/lang/it.yml
+++ b/lang/it.yml
@@ -545,3 +545,4 @@ label_registration_automatic_activation: automatic account activation
 label_registration_manual_activation: manual account activation
 notice_account_pending: "Your account was created and is now pending administrator approval."
 field_time_zone: Time zone
+text_caracters_minimum: Must be at least %d characters long.
diff --git a/lang/ja.yml b/lang/ja.yml
index 3a801fcf8..a1a0d968e 100644
--- a/lang/ja.yml
+++ b/lang/ja.yml
@@ -546,3 +546,4 @@ label_registration_automatic_activation: automatic account activation
 label_registration_manual_activation: manual account activation
 notice_account_pending: "Your account was created and is now pending administrator approval."
 field_time_zone: Time zone
+text_caracters_minimum: Must be at least %d characters long.
diff --git a/lang/ko.yml b/lang/ko.yml
index 3886d7781..9dd8951fe 100644
--- a/lang/ko.yml
+++ b/lang/ko.yml
@@ -545,3 +545,4 @@ label_registration_automatic_activation: automatic account activation
 label_registration_manual_activation: manual account activation
 notice_account_pending: "Your account was created and is now pending administrator approval."
 field_time_zone: Time zone
+text_caracters_minimum: Must be at least %d characters long.
diff --git a/lang/nl.yml b/lang/nl.yml
index 1397f4c6e..16686d756 100644
--- a/lang/nl.yml
+++ b/lang/nl.yml
@@ -546,3 +546,4 @@ label_registration_automatic_activation: automatic account activation
 label_registration_manual_activation: manual account activation
 notice_account_pending: "Your account was created and is now pending administrator approval."
 field_time_zone: Time zone
+text_caracters_minimum: Must be at least %d characters long.
diff --git a/lang/pl.yml b/lang/pl.yml
index 760250e69..cf5494895 100644
--- a/lang/pl.yml
+++ b/lang/pl.yml
@@ -545,3 +545,4 @@ label_registration_automatic_activation: automatyczna aktywacja kont
 label_registration_manual_activation: manualna aktywacja kont
 notice_account_pending: "Twoje konto zostało utworzone i oczekuje na zatwierdzenie administratora."
 field_time_zone: Strefa czasowa
+text_caracters_minimum: Must be at least %d characters long.
diff --git a/lang/pt-br.yml b/lang/pt-br.yml
index 7444aad99..9e7bd9b4c 100644
--- a/lang/pt-br.yml
+++ b/lang/pt-br.yml
@@ -545,3 +545,4 @@ label_registration_automatic_activation: automatic account activation
 label_registration_manual_activation: manual account activation
 notice_account_pending: "Your account was created and is now pending administrator approval."
 field_time_zone: Time zone
+text_caracters_minimum: Must be at least %d characters long.
diff --git a/lang/pt.yml b/lang/pt.yml
index d75247aa9..78d739b87 100644
--- a/lang/pt.yml
+++ b/lang/pt.yml
@@ -545,3 +545,4 @@ label_registration_automatic_activation: automatic account activation
 label_registration_manual_activation: manual account activation
 notice_account_pending: "Your account was created and is now pending administrator approval."
 field_time_zone: Time zone
+text_caracters_minimum: Must be at least %d characters long.
diff --git a/lang/ro.yml b/lang/ro.yml
index 4cb2e4f8e..a81f61aec 100644
--- a/lang/ro.yml
+++ b/lang/ro.yml
@@ -545,3 +545,4 @@ label_registration_automatic_activation: automatic account activation
 label_registration_manual_activation: manual account activation
 notice_account_pending: "Your account was created and is now pending administrator approval."
 field_time_zone: Time zone
+text_caracters_minimum: Must be at least %d characters long.
diff --git a/lang/ru.yml b/lang/ru.yml
index ffc964f0c..30ab5dddc 100644
--- a/lang/ru.yml
+++ b/lang/ru.yml
@@ -545,3 +545,4 @@ label_registration_automatic_activation: автоматическая актив
 label_registration_manual_activation: активировать аккаунты вручную
 notice_account_pending: "Ваш аккаунт уже создан и ожидает подтверждения администратора."
 field_time_zone: Часовой пояс
+text_caracters_minimum: Must be at least %d characters long.
diff --git a/lang/sr.yml b/lang/sr.yml
index 27be7da86..d08d0172a 100644
--- a/lang/sr.yml
+++ b/lang/sr.yml
@@ -546,3 +546,4 @@ label_registration_automatic_activation: automatic account activation
 label_registration_manual_activation: manual account activation
 notice_account_pending: "Your account was created and is now pending administrator approval."
 field_time_zone: Time zone
+text_caracters_minimum: Must be at least %d characters long.
diff --git a/lang/sv.yml b/lang/sv.yml
index f5bd5a139..1b00eee1f 100644
--- a/lang/sv.yml
+++ b/lang/sv.yml
@@ -546,3 +546,4 @@ label_registration_automatic_activation: automatic account activation
 label_registration_manual_activation: manual account activation
 notice_account_pending: "Your account was created and is now pending administrator approval."
 field_time_zone: Time zone
+text_caracters_minimum: Must be at least %d characters long.
diff --git a/lang/zh.yml b/lang/zh.yml
index 257286778..b20dd1b75 100644
--- a/lang/zh.yml
+++ b/lang/zh.yml
@@ -548,3 +548,4 @@ label_registration_automatic_activation: automatic account activation
 label_registration_manual_activation: manual account activation
 notice_account_pending: "Your account was created and is now pending administrator approval."
 field_time_zone: Time zone
+text_caracters_minimum: Must be at least %d characters long.

From f80f04e379a8e0eef1bd72432c6a252d3559a9c6 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sat, 24 Nov 2007 15:14:32 +0000
Subject: [PATCH 016/710] Slight optimization in User#role_for_project.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@928 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/models/user.rb | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/app/models/user.rb b/app/models/user.rb
index 5297b31b0..37512fda0 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -178,14 +178,16 @@ class User < ActiveRecord::Base
   def role_for_project(project)
     # No role on archived projects
     return nil unless project && project.active?
-    # Find project membership
-    membership = memberships.detect {|m| m.project_id == project.id}
-    if membership
-      membership.role
-    elsif logged?
-      Role.non_member
+    if logged?
+      # Find project membership
+      membership = memberships.detect {|m| m.project_id == project.id}
+      if membership
+        membership.role
+      else
+        @role_non_member ||= Role.non_member
+      end
     else
-      Role.anonymous
+      @role_anonymous ||= Role.anonymous
     end
   end
   

From acad206063c159fa9eec62e12104c065c5424d78 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sat, 24 Nov 2007 15:16:04 +0000
Subject: [PATCH 017/710] Issue context menu now also available on 'My page'.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@929 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/issues/_list_simple.rhtml | 10 +++++-----
 app/views/my/page.rhtml             |  7 +++++++
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/app/views/issues/_list_simple.rhtml b/app/views/issues/_list_simple.rhtml
index 9051e46b8..517055e3a 100644
--- a/app/views/issues/_list_simple.rhtml
+++ b/app/views/issues/_list_simple.rhtml
@@ -7,14 +7,14 @@
 		</tr></thead>
 		<tbody>	
 		<% for issue in issues %>
-		<tr class="<%= cycle("odd", "even") %> <%= "status-#{issue.status.position} priority-#{issue.priority.position}" %>">
+		<tr id="issue-<%= issue.id %>" class="issue hascontextmenu <%= cycle('odd', 'even') %> <%= "status-#{issue.status.position} priority-#{issue.priority.position}" %>">
 			<td class="id">
 				<%= link_to issue.id, :controller => 'issues', :action => 'show', :id => issue %>
 			</td>
-			<td><p class="small"><%= issue.project.name %> - <%= issue.tracker.name %><br />
-                <%= issue.status.name %> - <%= format_time(issue.updated_on) %></p></td>
-			<td>
-                <p class="small"><%= link_to h(issue.subject), :controller => 'issues', :action => 'show', :id => issue %></p>
+			<td><%= issue.project.name %> - <%= issue.tracker.name %><br />
+                <%= issue.status.name %> - <%= format_time(issue.updated_on) %></td>
+			<td class="subject">
+                <%= link_to h(issue.subject), :controller => 'issues', :action => 'show', :id => issue %>
             </td>
 		</tr>
 		<% end %>
diff --git a/app/views/my/page.rhtml b/app/views/my/page.rhtml
index 5c6c906db..89d11ddea 100644
--- a/app/views/my/page.rhtml
+++ b/app/views/my/page.rhtml
@@ -31,3 +31,10 @@
 	<% end if @blocks['right'] %>
 </div>
 
+<% content_for :header_tags do %>
+    <%= javascript_include_tag 'context_menu' %>
+    <%= stylesheet_link_tag 'context_menu' %>
+<% end %>
+
+<div id="context-menu" style="display: none;"></div>
+<%= javascript_tag 'new ContextMenu({})' %>

From f2a12d9eb5aeacf2b538c9b0062f197112c0f3ab Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sat, 24 Nov 2007 16:55:08 +0000
Subject: [PATCH 018/710] Added user status criteria in Redmine.pm

git-svn-id: http://redmine.rubyforge.org/svn/trunk@930 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 extra/svn/Redmine.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extra/svn/Redmine.pm b/extra/svn/Redmine.pm
index 7505b71cb..b76622e3d 100644
--- a/extra/svn/Redmine.pm
+++ b/extra/svn/Redmine.pm
@@ -176,7 +176,7 @@ sub is_member {
   my $pass_digest = Digest::SHA1::sha1_hex($redmine_pass);
 
   my $sth = $dbh->prepare(
-      "SELECT hashed_password FROM members, projects, users WHERE projects.id=members.project_id AND users.id=members.user_id AND login=? AND identifier=?;"
+      "SELECT hashed_password FROM members, projects, users WHERE projects.id=members.project_id AND users.id=members.user_id AND users.status=1 AND login=? AND identifier=?;"
   );
   $sth->execute($redmine_user, $project_id);
 

From 3937caeb3c8fe87763e19c179d418949fb31dc61 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 25 Nov 2007 12:11:40 +0000
Subject: [PATCH 019/710] Trac importer improvements (by Mat Trudel): * better
 support for wiki internal links (still not perfect, but much improved) *
 support for unordered lists * support for most of trac's highlighting tags
 (underline, bold, etc) * import progress dots now flush to stdout on every
 dot, so the import doesn't look frozen * support for migration of multiple
 trac instances into a single Redmine install (as separate projects)

git-svn-id: http://redmine.rubyforge.org/svn/trunk@931 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 lib/tasks/migrate_from_trac.rake | 77 +++++++++++++++++++++++---------
 1 file changed, 57 insertions(+), 20 deletions(-)

diff --git a/lib/tasks/migrate_from_trac.rake b/lib/tasks/migrate_from_trac.rake
index ba002cb6f..6467a5430 100644
--- a/lib/tasks/migrate_from_trac.rake
+++ b/lib/tasks/migrate_from_trac.rake
@@ -24,6 +24,7 @@ namespace :redmine do
   task :migrate_from_trac => :environment do
     
     module TracMigrate
+        TICKET_MAP = [];
      
         DEFAULT_STATUS = IssueStatus.default
         assigned_status = IssueStatus.find_by_position(2)
@@ -181,11 +182,38 @@ namespace :redmine do
       # Basic wiki syntax conversion
       def self.convert_wiki_text(text)
         # Titles
-        text = text.gsub(/^(\=+)\s(.+)\s(\=+)/) {|s| "h#{$1.length}. #{$2}\n"}
-        # Links
+        text = text.gsub(/^(\=+)\s(.+)\s(\=+)/) {|s| "\nh#{$1.length}. #{$2}\n"}
+        # External Links
         text = text.gsub(/\[(http[^\s]+)\s+([^\]]+)\]/) {|s| "\"#{$2}\":#{$1}"}
+        # Internal Links
+        text = text.gsub(/[[BR]]/, "\n") # This has to go before the rules below
+        text = text.gsub(/\[\"(.+)\".*\]/) {|s| "[[#{$1.delete(',./?;|:')}]]"}
+        text = text.gsub(/\[wiki:\"(.+)\".*\]/) {|s| "[[#{$1.delete(',./?;|:')}]]"}
+        text = text.gsub(/\[wiki:\"(.+)\".*\]/) {|s| "[[#{$1.delete(',./?;|:')}]]"}
+        text = text.gsub(/\[wiki:([^\s\]]+).*\]/) {|s| "[[#{$1.delete(',./?;|:')}]]"}
         # Revisions links
         text = text.gsub(/\[(\d+)\]/, 'r\1')
+        # Ticket number re-writing
+        text = text.gsub(/#(\d+)/) do |s|
+          TICKET_MAP[$1.to_i] ||= $1
+          "\##{TICKET_MAP[$1.to_i]}"
+        end
+        # Preformatted blocks
+        text = text.gsub(/\{\{\{/, '<pre>')
+        text = text.gsub(/\}\}\}/, '</pre>')          
+        # Highlighting
+        text = text.gsub(/'''''([^\s])/, '_*\1')
+        text = text.gsub(/([^\s])'''''/, '\1*_')
+        text = text.gsub(/'''/, '*')
+        text = text.gsub(/''/, '_')
+        text = text.gsub(/__/, '+')
+        text = text.gsub(/~~/, '-')
+        text = text.gsub(/`/, '@')
+        text = text.gsub(/,,/, '~')        
+        # Lists
+        text = text.gsub(/^([ ]+)\* /) {|s| '*' * $1.length + " "}
+        
+
         text
       end
     
@@ -193,16 +221,9 @@ namespace :redmine do
         establish_connection({:adapter => trac_adapter, 
                               :database => trac_db_path})
 
-        # Quick database test before clearing Redmine data
+        # Quick database test
         TracComponent.count
-        
-        puts "Deleting data"
-        CustomField.destroy_all
-        Issue.destroy_all
-        IssueCategory.destroy_all
-        Version.destroy_all
-        User.destroy_all "login <> 'admin'"
-        
+                
         migrated_components = 0
         migrated_milestones = 0
         migrated_tickets = 0
@@ -215,6 +236,7 @@ namespace :redmine do
         issues_category_map = {}
         TracComponent.find(:all).each do |component|
       	print '.'
+      	STDOUT.flush
           c = IssueCategory.new :project => @target_project,
                                 :name => encode(component.name[0, limit_for(IssueCategory, 'name')])
       	next unless c.save
@@ -228,9 +250,10 @@ namespace :redmine do
         version_map = {}
         TracMilestone.find(:all).each do |milestone|
           print '.'
+          STDOUT.flush
           v = Version.new :project => @target_project,
                           :name => encode(milestone.name[0, limit_for(Version, 'name')]),
-                          :description => encode(milestone.description[0, limit_for(Version, 'description')]),
+                          :description => encode(milestone.description.to_s[0, limit_for(Version, 'description')]),
                           :effective_date => milestone.due
           next unless v.save
           version_map[milestone.name] = v
@@ -244,9 +267,16 @@ namespace :redmine do
         custom_field_map = {}
         TracTicketCustom.find_by_sql("SELECT DISTINCT name FROM #{TracTicketCustom.table_name}").each do |field|
           print '.'
-          f = IssueCustomField.new :name => encode(field.name[0, limit_for(IssueCustomField, 'name')]).humanize,
-                                   :field_format => 'string'
-          next unless f.save
+          STDOUT.flush
+          # Redmine custom field name
+          field_name = encode(field.name[0, limit_for(IssueCustomField, 'name')]).humanize
+          # Find if the custom already exists in Redmine
+          f = IssueCustomField.find_by_name(field_name)
+          # Or create a new one
+          f ||= IssueCustomField.create(:name => encode(field.name[0, limit_for(IssueCustomField, 'name')]).humanize,
+                                        :field_format => 'string')
+                                   
+          next if f.new_record?
           f.trackers = Tracker.find(:all)
           f.projects << @target_project
           custom_field_map[field.name] = f
@@ -254,9 +284,10 @@ namespace :redmine do
         puts
         
         # Trac 'resolution' field as a Redmine custom field
-        r = IssueCustomField.new :name => 'Resolution',
+        r = IssueCustomField.find(:first, :conditions => { :name => "Resolution" })
+        r = IssueCustomField.new(:name => 'Resolution',
                                  :field_format => 'list',
-                                 :is_filter => true
+                                 :is_filter => true) if r.nil?
         r.trackers = Tracker.find(:all)
         r.projects << @target_project
         r.possible_values = %w(fixed invalid wontfix duplicate worksforme)
@@ -264,8 +295,9 @@ namespace :redmine do
             
         # Tickets
         print "Migrating tickets"
-          TracTicket.find(:all).each do |ticket|
+          TracTicket.find(:all, :order => 'id ASC').each do |ticket|
         	print '.'
+        	STDOUT.flush
         	i = Issue.new :project => @target_project, 
                           :subject => encode(ticket.summary[0, limit_for(Issue, 'subject')]),
                           :description => convert_wiki_text(encode(ticket.description)),
@@ -276,9 +308,10 @@ namespace :redmine do
         	i.fixed_version = version_map[ticket.milestone] unless ticket.milestone.blank?
         	i.status = STATUS_MAPPING[ticket.status] || DEFAULT_STATUS
         	i.tracker = TRACKER_MAPPING[ticket.ticket_type] || DEFAULT_TRACKER
-        	i.id = ticket.id
         	i.custom_values << CustomValue.new(:custom_field => custom_field_map['resolution'], :value => ticket.resolution) unless ticket.resolution.blank?
+        	i.id = ticket.id unless Issue.exists?(ticket.id)
         	next unless i.save
+        	TICKET_MAP[ticket.id] = i.id
         	migrated_tickets += 1
         	
         	# Owner
@@ -327,6 +360,7 @@ namespace :redmine do
         	
         	# Custom fields
         	ticket.customs.each do |custom|
+        	  next if custom_field_map[custom.name].nil?
               v = CustomValue.new :custom_field => custom_field_map[custom.name],
                                   :value => custom.value
               v.customized = i
@@ -344,6 +378,7 @@ namespace :redmine do
         if wiki.save
           TracWikiPage.find(:all, :order => 'name, version').each do |page|
             print '.'
+            STDOUT.flush
             p = wiki.find_or_new_page(page.name)
             p.content = WikiContent.new(:page => p) if p.new_record?
             p.content.text = page.text
@@ -415,6 +450,8 @@ namespace :redmine do
           puts "Unable to create a project with identifier '#{identifier}'!" unless project.save
           # enable issues and wiki for the created project
           project.enabled_module_names = ['issue_tracking', 'wiki']
+          project.trackers << TRACKER_BUG
+          project.trackers << TRACKER_FEATURE          
         end        
         @target_project = project.new_record? ? nil : project
       end
@@ -436,7 +473,7 @@ namespace :redmine do
     end
     
     puts
-    puts "WARNING: Your Redmine data will be deleted during this process."
+    puts "WARNING: Your Redmine install will have a new project added during this process."
     print "Are you sure you want to continue ? [y/N] "
     break unless STDIN.gets.match(/^y$/i)  
     puts

From 508b0bbb8edf1423160021db6a4844a0d957c476 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Mon, 26 Nov 2007 18:47:49 +0000
Subject: [PATCH 020/710] =?UTF-8?q?*=20Updated=20Spanish=20translation=20(?=
 =?UTF-8?q?Gumer=20Coronel=20P=C3=A9rez)=20*=20Fixed=20mailer=20test=20err?=
 =?UTF-8?q?ors?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: http://redmine.rubyforge.org/svn/trunk@932 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 .../mailer/message_posted.text.html.rhtml     |   2 +-
 .../mailer/message_posted.text.plain.rhtml    |   2 +-
 lang/es.yml                                   | 202 +++++++++---------
 3 files changed, 103 insertions(+), 103 deletions(-)

diff --git a/app/views/mailer/message_posted.text.html.rhtml b/app/views/mailer/message_posted.text.html.rhtml
index 558a6e52a..837272c0a 100644
--- a/app/views/mailer/message_posted.text.html.rhtml
+++ b/app/views/mailer/message_posted.text.html.rhtml
@@ -1,4 +1,4 @@
 <h1><%=h @message.board.project.name %> - <%=h @message.board.name %>: <%= link_to @message.subject, @message_url %></h1>
-<em><%= @message.author.name %></em>
+<em><%= @message.author %></em>
 
 <%= textilizable @message.content %>
diff --git a/app/views/mailer/message_posted.text.plain.rhtml b/app/views/mailer/message_posted.text.plain.rhtml
index cc1120567..ef6a3b3ae 100644
--- a/app/views/mailer/message_posted.text.plain.rhtml
+++ b/app/views/mailer/message_posted.text.plain.rhtml
@@ -1,4 +1,4 @@
 <%= @message_url %>
-<%= @message.author.name %>
+<%= @message.author %>
 
 <%= @message.content %>
diff --git a/lang/es.yml b/lang/es.yml
index 8ade705c8..ab4309ca1 100644
--- a/lang/es.yml
+++ b/lang/es.yml
@@ -5,8 +5,8 @@ actionview_datehelper_select_month_names: Enero,Febrero,Marzo,Abril,Mayo,Junio,J
 actionview_datehelper_select_month_names_abbr: Ene,Feb,Mar,Abr,Mayo,Jun,Jul,Ago,Sep,Oct,Nov,Dic
 actionview_datehelper_select_month_prefix:
 actionview_datehelper_select_year_prefix:
-actionview_datehelper_time_in_words_day: 1 day
-actionview_datehelper_time_in_words_day_plural: %d days
+actionview_datehelper_time_in_words_day: 1 día
+actionview_datehelper_time_in_words_day_plural: %d días
 actionview_datehelper_time_in_words_hour_about: una hora aproximadamente
 actionview_datehelper_time_in_words_hour_about_plural: aproximadamente %d horas
 actionview_datehelper_time_in_words_hour_about_single: una hora aproximadamente
@@ -17,15 +17,15 @@ actionview_datehelper_time_in_words_minute_plural: %d minutos
 actionview_datehelper_time_in_words_minute_single: 1 minuto
 actionview_datehelper_time_in_words_second_less_than: menos de un segundo
 actionview_datehelper_time_in_words_second_less_than_plural: menos de %d segundos
-actionview_instancetag_blank_option: Por favor selecciona
+actionview_instancetag_blank_option: Por favor seleccione
 
-activerecord_error_inclusion: is not included in the list
-activerecord_error_exclusion: is reserved
-activerecord_error_invalid: is invalid
-activerecord_error_confirmation: doesn't match confirmation
-activerecord_error_accepted: must be accepted
-activerecord_error_empty: can't be empty
-activerecord_error_blank: can't be blank
+activerecord_error_inclusion: no está incluído en la lista
+activerecord_error_exclusion: está reservado
+activerecord_error_invalid: no es válido
+activerecord_error_confirmation: la confirmación no coincide
+activerecord_error_accepted: debe ser aceptado
+activerecord_error_empty: no puede estar vacío
+activerecord_error_blank: no puede estar en blanco
 activerecord_error_too_long: es demasiado largo
 activerecord_error_too_short: es demasiado corto
 activerecord_error_wrong_length: la longitud es incorrecta
@@ -54,27 +54,27 @@ general_day_names: Lunes,Martes,Miércoles,Jueves,Viernes,Sábado,Domingo
 general_first_day_of_week: '1'
 
 notice_account_updated: Cuenta creada correctamente.
-notice_account_invalid_creditentials: Inválido usuario o contraseña
+notice_account_invalid_creditentials: Usuario o contraseña inválido.
 notice_account_password_updated: Contraseña modificada correctamente.
-notice_account_wrong_password: Contraseña incorrecta
+notice_account_wrong_password: Contraseña incorrecta.
 notice_account_register_done: Cuenta creada correctamente.
 notice_account_unknown_email: Usuario desconocido.
-notice_can_t_change_password: This account uses an external authentication source. Impossible to change the password.
+notice_can_t_change_password: Esta cuenta utiliza una fuente de autenticación externa. No es posible cambiar la contraseña.
 notice_account_lost_email_sent: Un correo con instrucciones para elegir una nueva contraseña le ha sido enviado.
-notice_account_activated: Tu cuenta ha sido activada. Ahora se encuentra conectado.
+notice_account_activated: Su cuenta ha sido activada. Ahora se encuentra conectado.
 notice_successful_create: Creación correcta.
 notice_successful_update: Modificación correcta.
 notice_successful_delete: Borrado correcto.
 notice_successful_connection: Conexión correcta.
-notice_file_not_found: La página que intentabas tener acceso no existe ni se ha quitado.
+notice_file_not_found: La página a la que intentas acceder no existe.
 notice_locking_conflict: Los datos han sido modificados por otro usuario.
-notice_scm_error: La entrada y/o la revisión no existe en el depósito.
+notice_scm_error: La entrada y/o la revisión no existe en el repositorio.
 notice_not_authorized: No tiene autorización para acceder a esta página.
 
 mail_subject_lost_password: Tu contraseña del CIYAT - Gestor de Solicitudes
-mail_body_lost_password: 'To change your Redmine password, click on the following link:'
+mail_body_lost_password: 'Para cambiar su contraseña de Redmine, haga click en el siguiente enlace:'
 mail_subject_register: Activación de la cuenta del CIYAT - Gestor de Solicitudes
-mail_body_register: 'To activate your Redmine account, click on the following link:'
+mail_body_register: 'Para activar su cuenta Redmine, haga click en el siguiente enlace:'
 
 gui_validation_error: 1 error
 gui_validation_error_plural: %d errores
@@ -85,7 +85,7 @@ field_summary: Resumen
 field_is_required: Obligatorio
 field_firstname: Nombre
 field_lastname: Apellido
-field_mail: Email
+field_mail: Correo electrónico 
 field_filename: Fichero
 field_filesize: Tamaño
 field_downloads: Descargas
@@ -109,7 +109,7 @@ field_is_closed: Petición resuelta
 field_is_default: Estado por defecto
 field_tracker: Tracker
 field_subject: Tema
-field_due_date: Fecha debida
+field_due_date: Fecha fin
 field_assigned_to: Asignado a
 field_priority: Prioridad
 field_fixed_version: Versión corregida
@@ -117,11 +117,11 @@ field_user: Usuario
 field_role: Perfil
 field_homepage: Sitio web
 field_is_public: Público
-field_parent: Proyecto secundario de
+field_parent: Proyecto padre
 field_is_in_chlog: Consultar las peticiones en el histórico
 field_is_in_roadmap: Consultar las peticiones en el roadmap
 field_login: Identificador
-field_mail_notification: Notificación por mail
+field_mail_notification: Notificaciones por correo
 field_admin: Administrador
 field_last_login_on: Última conexión
 field_language: Idioma
@@ -139,11 +139,11 @@ field_attr_login: Cualidad del identificador
 field_attr_firstname: Cualidad del nombre
 field_attr_lastname: Cualidad del apellido
 field_attr_mail: Cualidad del Email
-field_onthefly: Creación del usuario On-the-fly
-field_start_date: Comienzo
+field_onthefly: Creación del usuario "al vuelo"
+field_start_date: Fecha de inicio 
 field_done_ratio: %% Realizado
-field_auth_source: Modo de la autentificación
-field_hide_mail: Ocultar mi dirección de email 
+field_auth_source: Modo de identificación
+field_hide_mail: Ocultar mi dirección de correo
 field_comment: Comentario
 field_url: URL
 field_start_page: Página principal
@@ -156,24 +156,24 @@ field_is_filter: Usado como filtro
 field_issue_to_id: Petición Relacionada
 field_delay: Retraso
 
-setting_app_title: Título del aplicación
-setting_app_subtitle: Subtítulo del aplicación
-setting_welcome_text: Texto bienvenida
+setting_app_title: Título de la aplicación
+setting_app_subtitle: Subtítulo de la aplicación
+setting_welcome_text: Texto de bienvenida
 setting_default_language: Idioma por defecto
-setting_login_required: Autentif. requerida
+setting_login_required: Se requiere identificación
 setting_self_registration: Registro permitido
 setting_attachment_max_size: Tamaño máximo del fichero
-setting_issues_export_limit: Issues export limit
-setting_mail_from: Email de la emisión
-setting_host_name: Nombre de anfitrión
+setting_issues_export_limit: Límite de exportación de peticiones
+setting_mail_from: Correo desde el que enviar mensajes
+setting_host_name: Nombre de host 
 setting_text_formatting: Formato de texto
-setting_wiki_compression: Compresión de la historia de Wiki
-setting_feeds_limit: Feed content limit
-setting_autofetch_changesets: Autofetch SVN commits
+setting_wiki_compression: Compresión del historial de Wiki
+setting_feeds_limit: Límite de contenido para sindicación
+setting_autofetch_changesets: Autorellenar los commits del repositorio
 setting_sys_api_enabled: Enable WS for repository management
-setting_commit_ref_keywords: Referencing keywords
-setting_commit_fix_keywords: Fixing keywords
-setting_autologin: Autologin
+setting_commit_ref_keywords: Palabras clave para la referencia
+setting_commit_fix_keywords: Palabras clave para la corrección
+setting_autologin: Conexión automática 
 setting_date_format: Formato de la fecha
 
 label_user: Usuario
@@ -183,7 +183,7 @@ label_project: Proyecto
 label_project_new: Nuevo proyecto
 label_project_plural: Proyectos
 label_project_all: Todos los proyectos
-label_project_latest: Los proyectos más últimos
+label_project_latest: Últimos proyectos
 label_issue: Petición
 label_issue_new: Nueva petición
 label_issue_plural: Peticiones
@@ -201,7 +201,7 @@ label_member_plural: Miembros
 label_tracker: Tracker
 label_tracker_plural: Trackers
 label_tracker_new: Nuevo tracker
-label_workflow: Workflow
+label_workflow: Flujo de trabajo
 label_issue_status: Estado de petición
 label_issue_status_plural: Estados de las peticiones
 label_issue_status_new: Nuevo estado
@@ -213,12 +213,12 @@ label_custom_field_plural: Campos personalizados
 label_custom_field_new: Nuevo campo personalizado
 label_enumerations: Listas de valores
 label_enumeration_new: Nuevo valor
-label_information: Informacion
-label_information_plural: Informaciones
+label_information: Información
+label_information_plural: Información
 label_please_login: Conexión
 label_register: Registrar
 label_password_lost: ¿Olvidaste la contraseña?
-label_home: Principal
+label_home: Inicio
 label_my_page: Mi página
 label_my_account: Mi cuenta
 label_my_projects: Mis proyectos
@@ -290,7 +290,7 @@ label_next: Próximo
 label_previous: Anterior
 label_used_by: Utilizado por
 label_details: Detalles
-label_add_note: Agregar una nota
+label_add_note: Añadir una nota
 label_per_page: Por la página
 label_calendar: Calendario
 label_months_from: meses de
@@ -307,7 +307,7 @@ label_comment_delete: Suprimir comentarios
 label_query: Pregunta personalizada
 label_query_plural: Preguntas personalizadas
 label_query_new: Nueva pregunta
-label_filter_add: Agregar el filtro
+label_filter_add: Añadir el filtro
 label_filter_plural: Filtros
 label_equals: igual
 label_not_equals: no igual
@@ -321,7 +321,7 @@ label_ago: hace
 label_contains: contiene 
 label_not_contains: no contiene
 label_day_plural: días
-label_repository: Depósito SVN
+label_repository: Repositorio
 label_browse: Hojear
 label_modification: %d modificación
 label_modification_plural: %d modificaciones
@@ -356,7 +356,7 @@ label_current_version: Versión actual
 label_preview: Previo
 label_feed_plural: Feeds
 label_changes_details: Detalles de todos los cambios
-label_issue_tracking: Petición tracking
+label_issue_tracking: Peticiones
 label_spent_time: Tiempo dedicado
 label_f_hour: %.2f hora
 label_f_hour_plural: %.2f horas
@@ -367,7 +367,7 @@ label_commits_per_month: Commits por mes
 label_commits_per_author: Commits por autor
 label_view_diff: Ver diferencias
 label_diff_inline: inline
-label_diff_side_by_side: side by side
+label_diff_side_by_side: cara a cara
 label_options: Opciones
 label_copy_workflow_from: Copiar workflow desde
 label_permissions_report: Informe de permisos
@@ -387,7 +387,7 @@ label_end_to_start: fin a principio
 label_end_to_end: fin a fin
 label_start_to_start: principio a principio
 label_start_to_end: principio a fin
-label_stay_logged_in: Stay logged in
+label_stay_logged_in: Recordar conexión 
 label_disabled: deshabilitado
 label_show_completed_versions: Muestra las versiones completas
 label_me: me
@@ -405,7 +405,7 @@ label_month: Mes
 label_week: Semana
 label_date_from: Desde
 label_date_to: Hasta
-label_language_based: Idioma basado
+label_language_based: Badado en el idioma
 
 button_login: Conexión
 button_submit: Aceptar
@@ -442,11 +442,11 @@ status_active: activo
 status_registered: registrado
 status_locked: bloqueado
 
-text_select_mail_notifications: Seleccionar las actividades que necesitan la activación de la notificación por mail.
+text_select_mail_notifications: Seleccionar los eventos a notificar
 text_regexp_info: eg. ^[A-Z0-9]+$
 text_min_max_length_info: 0 para ninguna restricción
 text_project_destroy_confirmation: ¿ Estás seguro de querer eliminar el proyecto ?
-text_workflow_edit: Seleccionar un workflow para actualizar
+text_workflow_edit: Seleccionar un flujo de trabajo para actualizar
 text_are_you_sure: ¿ Estás seguro ?
 text_journal_changed: cambiado de %s a %s
 text_journal_set_to: fijado a %s
@@ -487,65 +487,65 @@ default_activity_development: Desarrollo
 enumeration_issue_priorities: Prioridad de las peticiones
 enumeration_doc_categories: Categorías del documento
 enumeration_activities: Actividades (tiempo dedicado)
-label_index_by_date: Index by date
-field_column_names: Columns
-button_rename: Rename
-text_issue_category_destroy_question: Some issues (%d) are assigned to this category. What do you want to do ?
-label_feeds_access_key_created_on: RSS access key created %s ago
-label_default_columns: Default columns
-setting_cross_project_issue_relations: Allow cross-project issue relations
+label_index_by_date: Índice por fecha
+field_column_names: Columnas
+button_rename: Renombrar
+text_issue_category_destroy_question: Algunas peticiones (%d) están asignadas a esta categoría. ¿Qué desea hacer?
+label_feeds_access_key_created_on: Clave de acceso por RSS creada hace %s
+label_default_columns: Columnas por defecto
+setting_cross_project_issue_relations: Permitir relacionar peticiones de distintos proyectos
 label_roadmap_overdue: %s late
-label_module_plural: Modules
+label_module_plural: Módulos
 label_this_week: this week
 label_index_by_title: Index by title
-label_jump_to_a_project: Jump to a project...
-field_assignable: Issues can be assigned to this role
+label_jump_to_a_project: Ir al proyecto...
+field_assignable: Se pueden asignar peticiones a este perfil
 label_sort_by: Sort by %s
-setting_issue_list_default_columns: Default columns displayed on the issue list
-text_issue_updated: Issue %s has been updated.
-notice_feeds_access_key_reseted: Your RSS access key was reseted.
-field_redirect_existing_links: Redirect existing links
-text_issue_category_reassign_to: Reassign issues to this category
-notice_email_sent: An email was sent to %s
-text_issue_added: Issue %s has been reported.
-field_comments: Comment
-label_file_plural: Files
-text_wiki_destroy_confirmation: Are you sure you want to delete this wiki and all its content ?
-notice_email_error: An error occurred while sending mail (%s)
-label_updated_time: Updated %s ago
-text_issue_category_destroy_assignments: Remove category assignments
-label_send_test_email: Send a test email
+setting_issue_list_default_columns: Columnas por defecto para la lista de peticiones
+text_issue_updated: La petición %s ha sido actualizada.
+notice_feeds_access_key_reseted: Su clave de acceso para RSS ha sido reiniciada
+field_redirect_existing_links: Redireccionar enlaces existentes
+text_issue_category_reassign_to: Reasignar las peticiones a la categoría
+notice_email_sent: Se ha enviado un correo a %s
+text_issue_added: Petición añadida
+field_comments: Comentario
+label_file_plural: Archivos
+text_wiki_destroy_confirmation: ¿Seguro que quiere borrar el wiki y todo su contenido?
+notice_email_error: Ha ocurrido un error mientras enviando el correo (%s)
+label_updated_time: Actualizado hace %s
+text_issue_category_destroy_assignments: Dejar las peticiones sin categoría
+label_send_test_email: Enviar un correo de prueba
 button_reset: Reset
-label_added_time_by: Added by %s %s ago
-field_estimated_hours: Estimated time
+label_added_time_by: Añadido por %s hace %s
+field_estimated_hours: Tiempo estimado
 label_changeset_plural: Changesets
-setting_repositories_encodings: Repositories encodings
-notice_no_issue_selected: "No issue is selected! Please, check the issues you want to edit."
+setting_repositories_encodings: Codificaciones del repositorio
+notice_no_issue_selected: "Ninguna petición seleccionada. Por favor, compruebe la petición que quiere modificar"
 label_bulk_edit_selected_issues: Bulk edit selected issues
 label_no_change_option: (No change)
-notice_failed_to_save_issues: "Failed to save %d issue(s) on %d selected: %s."
-label_theme: Theme
-label_default: Default
-label_search_titles_only: Search titles only
-label_nobody: nobody
-button_change_password: Change password
-text_user_mail_option: "For unselected projects, you will only receive notifications about things you watch or you're involved in (eg. issues you're the author or assignee)."
-label_user_mail_option_selected: "For any event on the selected projects only..."
-label_user_mail_option_all: "For any event on all my projects"
-label_user_mail_option_none: "Only for things I watch or I'm involved in"
-setting_emails_footer: Emails footer
-label_float: Float
-button_copy: Copy
-mail_body_account_information_external: You can use your "%s" account to log into Redmine.
-mail_body_account_information: Your Redmine account information
-setting_protocol: Protocol
-label_user_mail_no_self_notified: "I don't want to be notified of changes that I make myself"
-setting_time_format: Time format
+notice_failed_to_save_issues: "Imposible salvar %s peticion(es) en %d seleccionado: %s."
+label_theme: Tema
+label_default: Por defecto
+label_search_titles_only: Buscar sólo en títulos
+label_nobody: nadie
+button_change_password: Cambiar contraseña
+text_user_mail_option: "En los proyectos no seleccionados, sólo recibirá notificaciones sobre elementos monitorizados o elementos en los que esté involucrado (por ejemplo, peticiones de las que usted sea autor o asignadas a usted)." 
+label_user_mail_option_selected: "Para cualquier evento del proyecto seleccionado..."
+label_user_mail_option_all: "Para cualquier evento en todos mis proyectos"
+label_user_mail_option_none: "Sólo para elementos monitorizados o relacionados conmigo" 
+setting_emails_footer: Pie de mensajes
+label_float: Flotante
+button_copy: Copiar
+mail_body_account_information_external: Puede usar su cuenta "%s" para conectarse a Redmine.
+mail_body_account_information: Información sobre su cuenta de Redmine
+setting_protocol: Protocolo
+text_caracters_minimum: Must be at least %d characters long.
+field_time_zone: Time zone
 label_registration_activation_by_email: account activation by email
+label_user_mail_no_self_notified: "I don't want to be notified of changes that I make myself"
 mail_subject_account_activation_request: Redmine account activation request
 mail_body_account_activation_request: 'A new user (%s) has registered. His account his pending your approval:'
 label_registration_automatic_activation: automatic account activation
 label_registration_manual_activation: manual account activation
 notice_account_pending: "Your account was created and is now pending administrator approval."
-field_time_zone: Time zone
-text_caracters_minimum: Must be at least %d characters long.
+setting_time_format: Time format

From c383486d711d12a2a9e716bedf3a444e140c00d6 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Tue, 27 Nov 2007 17:04:13 +0000
Subject: [PATCH 021/710] Added custom fields marked as "For all projects" to
 the csv export of the cross project issue list.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@933 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/helpers/issues_helper.rb | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/app/helpers/issues_helper.rb b/app/helpers/issues_helper.rb
index f9a88f6dd..4727fdf96 100644
--- a/app/helpers/issues_helper.rb
+++ b/app/helpers/issues_helper.rb
@@ -125,10 +125,10 @@ module IssuesHelper
                   l(:field_created_on),
                   l(:field_updated_on)
                   ]
-      # only export custom fields if project is given
-      for custom_field in project.all_custom_fields
-        headers << custom_field.name
-      end if project
+      # Export project custom fields if project is given
+      # otherwise export custom fields marked as "For all projects"
+      custom_fields = project.nil? ? IssueCustomField.for_all : project.all_custom_fields
+      custom_fields.each {|f| headers << f.name}
       csv << headers.collect {|c| begin; ic.iconv(c.to_s); rescue; c.to_s; end }
       # csv lines
       issues.each do |issue|
@@ -148,9 +148,7 @@ module IssuesHelper
                   l_datetime(issue.created_on),  
                   l_datetime(issue.updated_on)
                   ]
-        for custom_field in project.all_custom_fields
-          fields << (show_value issue.custom_value_for(custom_field))
-        end if project
+        custom_fields.each {|f| fields << show_value(issue.custom_value_for(f)) }
         csv << fields.collect {|c| begin; ic.iconv(c.to_s); rescue; c.to_s; end }
       end
     end

From 233990dac389ad7b6924703a3752fcfb858e5060 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Tue, 27 Nov 2007 17:20:57 +0000
Subject: [PATCH 022/710] =?UTF-8?q?*=20Updated=20German=20translation=20(T?=
 =?UTF-8?q?homas=20L=C3=B6ber)=20*=20Updated=20Spanish=20translation=20(Gu?=
 =?UTF-8?q?mer=20Coronel=20P=C3=A9rez)=20*=20Fixed:=20test=20in=20method?=
 =?UTF-8?q?=20project=20in=20Attachment=20Model=20useless=20(Cyril=20Mouge?=
 =?UTF-8?q?l)=20*=20Fixed:=20public/.htaccess=20lacks=20support=20for=20mo?=
 =?UTF-8?q?d=5Ffcgid=20and=20adds=20handlers=20without=20checking=20for=20?=
 =?UTF-8?q?their=20existance=20(Nils=20Adermann)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: http://redmine.rubyforge.org/svn/trunk@934 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/models/attachment.rb |   2 +-
 lang/de.yml              | 100 +++++++++++++++++++--------------------
 lang/es.yml              |  88 +++++++++++++++++-----------------
 public/.htaccess         |  93 +++++++++++++++++++++---------------
 4 files changed, 149 insertions(+), 134 deletions(-)

diff --git a/app/models/attachment.rb b/app/models/attachment.rb
index 7262498c4..927aa1735 100644
--- a/app/models/attachment.rb
+++ b/app/models/attachment.rb
@@ -84,7 +84,7 @@ class Attachment < ActiveRecord::Base
   end
 
   def project
-    container.is_a?(Project) ? container : container.project
+    container.project
   end
   
   def image?
diff --git a/lang/de.yml b/lang/de.yml
index ab3e47013..1fc6f6b69 100644
--- a/lang/de.yml
+++ b/lang/de.yml
@@ -6,16 +6,16 @@ actionview_datehelper_select_month_names_abbr: Jan,Feb,Mär,Apr,Mai,Jun,Jul,Aug,
 actionview_datehelper_select_month_prefix:
 actionview_datehelper_select_year_prefix:
 actionview_datehelper_time_in_words_day: 1 Tag
-actionview_datehelper_time_in_words_day_plural: %d Tage
-actionview_datehelper_time_in_words_hour_about: ungefähr eine Stunde
+actionview_datehelper_time_in_words_day_plural: %d Tagen
+actionview_datehelper_time_in_words_hour_about: ungefähr einer Stunde
 actionview_datehelper_time_in_words_hour_about_plural: ungefähr %d Stunden
-actionview_datehelper_time_in_words_hour_about_single: ungefähr eine Stunde
+actionview_datehelper_time_in_words_hour_about_single: ungefähr einer Stunde
 actionview_datehelper_time_in_words_minute: 1 Minute
-actionview_datehelper_time_in_words_minute_half: halbe Minute
-actionview_datehelper_time_in_words_minute_less_than: weniger als eine Minute
+actionview_datehelper_time_in_words_minute_half: einer halben Minute
+actionview_datehelper_time_in_words_minute_less_than: weniger als einer Minute
 actionview_datehelper_time_in_words_minute_plural: %d Minuten
 actionview_datehelper_time_in_words_minute_single: 1 Minute
-actionview_datehelper_time_in_words_second_less_than: Weniger als eine Sekunde
+actionview_datehelper_time_in_words_second_less_than: weniger als einer Sekunde
 actionview_datehelper_time_in_words_second_less_than_plural: weniger als %d Sekunden
 actionview_instancetag_blank_option: Bitte auswählen
 
@@ -74,10 +74,10 @@ notice_email_sent: Eine E-Mail wurde an %s gesendet.
 notice_email_error: Beim Senden einer E-Mail ist ein Fehler aufgetreten (%s).
 notice_feeds_access_key_reseted: Ihr RSS-Zugriffsschlüssel wurde zurückgesetzt.
 
-mail_subject_lost_password: Ihr Redmine Kennwort
-mail_body_lost_password: 'Benutzen Sie folgenden Link, um das Password zu Ãndern:'
+mail_subject_lost_password: Ihr Redmine-Kennwort
+mail_body_lost_password: 'Benutzen Sie den folgenden Link, um Ihr Kennwort zu ändern:'
 mail_subject_register: Redmine Kontoaktivierung
-mail_body_register: 'Um Ihren Account zu aktivieren, benutzen Sie folgenden Link:'
+mail_body_register: 'Um Ihr Konto zu aktivieren, benutzen Sie folgenden Link:'
 
 gui_validation_error: 1 Fehler
 gui_validation_error_plural: %d Fehler
@@ -88,7 +88,7 @@ field_summary: Zusammenfassung
 field_is_required: Erforderlich
 field_firstname: Vorname
 field_lastname: Nachname
-field_mail: Email
+field_mail: E-Mail
 field_filename: Datei
 field_filesize: Größe
 field_downloads: Downloads
@@ -146,7 +146,7 @@ field_onthefly: On-the-fly-Benutzererstellung
 field_start_date: Beginn
 field_done_ratio: %% erledigt
 field_auth_source: Authentifizierungs-Modus
-field_hide_mail: Email-Adresse nicht anzeigen
+field_hide_mail: E-Mail-Adresse nicht anzeigen
 field_comments: Kommentar
 field_url: URL
 field_start_page: Hauptseite
@@ -421,7 +421,7 @@ label_feeds_access_key_created_on: RSS-Zugriffsschlüssel vor %s erstellt
 label_module_plural: Module
 label_added_time_by: Von %s vor %s hinzugefügt
 label_updated_time: Vor %s aktualisiert
-label_jump_to_a_project: Jump to a project...
+label_jump_to_a_project: Zu einem Projekt springen...
 
 button_login: Anmelden
 button_submit: OK
@@ -470,8 +470,8 @@ text_journal_changed: geändert von %s zu %s
 text_journal_set_to: gestellt zu %s
 text_journal_deleted: gelöscht
 text_tip_task_begin_day: Aufgabe, die an diesem Tag beginnt
-text_tip_task_end_day: Aufgabe, die an diesem Tag beendet
-text_tip_task_begin_end_day: Aufgabe, die an diesem Tag beginnt und beendet
+text_tip_task_end_day: Aufgabe, die an diesem Tag endet
+text_tip_task_begin_end_day: Aufgabe, die an diesem Tag beginnt und endet
 text_project_identifier_info: 'Kleinbuchstaben (a-z), Ziffern und Bindestriche erlaubt.<br />Einmal gespeichert, kann die Kennung nicht mehr geändert werden.'
 text_caracters_maximum: Max. %d Zeichen.
 text_length_between: Länge zwischen %d und %d Zeichen.
@@ -482,9 +482,9 @@ text_issues_ref_in_commit_messages: Ticket-Beziehungen und -Status in Commit-Log
 text_issue_added: Ticket %s wurde erstellt.
 text_issue_updated: Ticket %s wurde aktualisiert.
 text_wiki_destroy_confirmation: Sind Sie sicher, dass Sie dieses Wiki mit sämtlichem Inhalt löschen möchten?
-text_issue_category_destroy_question: Some issues (%d) are assigned to this category. What do you want to do ?
-text_issue_category_destroy_assignments: Remove category assignments
-text_issue_category_reassign_to: Reassing issues to this category
+text_issue_category_destroy_question: Einige Tickets (%d) sind dieser Kategorie zugeodnet. Was möchten Sie tun?
+text_issue_category_destroy_assignments: Kategorie-Zuordnung entfernen
+text_issue_category_reassign_to: Tickets dieser Kategorie zuordnen
 
 default_role_manager: Manager
 default_role_developper: Developer
@@ -511,38 +511,38 @@ default_activity_development: Development
 enumeration_issue_priorities: Ticket-Prioritäten
 enumeration_doc_categories: Dokumentenkategorien
 enumeration_activities: Aktivitäten (Zeiterfassung)
-label_file_plural: Files
+label_file_plural: Dateien
 label_changeset_plural: Changesets
-field_column_names: Columns
-label_default_columns: Default columns
-setting_issue_list_default_columns: Default columns displayed on the issue list
-setting_repositories_encodings: Repositories encodings
-notice_no_issue_selected: "No issue is selected! Please, check the issues you want to edit."
-label_bulk_edit_selected_issues: Bulk edit selected issues
-label_no_change_option: (No change)
-notice_failed_to_save_issues: "Failed to save %d issue(s) on %d selected: %s."
-label_theme: Theme
+field_column_names: Spalten
+label_default_columns: Default-Spalten
+setting_issue_list_default_columns: Default-Spalten in der Ticket-Auflistung
+setting_repositories_encodings: Repository-Kodierung
+notice_no_issue_selected: "Kein Ticket ausgewählt! Bitte wählen Sie die Tickets, die Sie bearbeiten möchten."
+label_bulk_edit_selected_issues: Alle ausgewählten Tickets bearbeiten
+label_no_change_option: (Keine Änderung)
+notice_failed_to_save_issues: "%d von %d ausgewählten Tickets konnte(n) nicht gespeichert werden: %s."
+label_theme: Stil
 label_default: Default
-label_search_titles_only: Search titles only
-label_nobody: nobody
-button_change_password: Change password
-text_user_mail_option: "For unselected projects, you will only receive notifications about things you watch or you're involved in (eg. issues you're the author or assignee)."
-label_user_mail_option_selected: "For any event on the selected projects only..."
-label_user_mail_option_all: "For any event on all my projects"
-label_user_mail_option_none: "Only for things I watch or I'm involved in"
-setting_emails_footer: Emails footer
-label_float: Float
-button_copy: Copy
-mail_body_account_information_external: You can use your "%s" account to log into Redmine.
-mail_body_account_information: Your Redmine account information
-setting_protocol: Protocol
-label_user_mail_no_self_notified: "I don't want to be notified of changes that I make myself"
-setting_time_format: Time format
-label_registration_activation_by_email: account activation by email
-mail_subject_account_activation_request: Redmine account activation request
-mail_body_account_activation_request: 'A new user (%s) has registered. His account his pending your approval:'
-label_registration_automatic_activation: automatic account activation
-label_registration_manual_activation: manual account activation
-notice_account_pending: "Your account was created and is now pending administrator approval."
-field_time_zone: Time zone
-text_caracters_minimum: Must be at least %d characters long.
+label_search_titles_only: Nur Titel durchsuchen
+label_nobody: Niemand
+button_change_password: Kennwort ändern
+text_user_mail_option: "Für nicht ausgewählte Projekte werden Sie nur Benachrichtigungen für Dinge erhalten, die Sie beobachten oder an denen Sie beteiligt sind (z.B. Tickets, deren Autor Sie sind oder die Ihnen zugewiesen sind)."
+label_user_mail_option_selected: "Für alle Ereignisse in den ausgewählten Projekten..."
+label_user_mail_option_all: "Für alle Ereignisse in all meinen Projekten"
+label_user_mail_option_none: "Nur für Dinge, die ich beobachte oder an denen ich beteiligt bin"
+setting_emails_footer: E-Mail-Fußzeile
+label_float: Fließkommazahl
+button_copy: Kopieren
+mail_body_account_information_external: Sie können sich mit Ihrem Konto "%s" an Redmine anmelden.
+mail_body_account_information: Ihre Redmine Konto-Informationen
+setting_protocol: Protokoll
+label_user_mail_no_self_notified: "Ich möchte nicht über Änderungen benachrichtigt werden, die ich selbst durchführe."
+setting_time_format: Zeitformat
+label_registration_activation_by_email: Kontoaktivierung durch E-Mail
+mail_subject_account_activation_request: Antrag auf Redmine Kontoaktivierung
+mail_body_account_activation_request: 'Ein neuer Benutzer (%s) hat sich registriert. Sein Konto wartet auf Ihre Genehmigung:'
+label_registration_automatic_activation: Automatische Kontoaktivierung
+label_registration_manual_activation: Manuelle Kontoaktivierung
+notice_account_pending: "Ihr Konto wurde erstellt und wartet jetzt auf die Genehmigung des Administrators."
+field_time_zone: Zeitzone
+text_caracters_minimum: Muss mindestens %d Zeichen lang sein.
diff --git a/lang/es.yml b/lang/es.yml
index ab4309ca1..b10bbd929 100644
--- a/lang/es.yml
+++ b/lang/es.yml
@@ -29,7 +29,7 @@ activerecord_error_blank: no puede estar en blanco
 activerecord_error_too_long: es demasiado largo
 activerecord_error_too_short: es demasiado corto
 activerecord_error_wrong_length: la longitud es incorrecta
-activerecord_error_taken: has already been taken
+activerecord_error_taken: ya está siendo usado
 activerecord_error_not_a_number: no es un número
 activerecord_error_not_a_date: no es una fecha válida
 activerecord_error_greater_than_start_date: debe ser la fecha mayor que del comienzo
@@ -60,7 +60,7 @@ notice_account_wrong_password: Contraseña incorrecta.
 notice_account_register_done: Cuenta creada correctamente.
 notice_account_unknown_email: Usuario desconocido.
 notice_can_t_change_password: Esta cuenta utiliza una fuente de autenticación externa. No es posible cambiar la contraseña.
-notice_account_lost_email_sent: Un correo con instrucciones para elegir una nueva contraseña le ha sido enviado.
+notice_account_lost_email_sent: Se le ha enviado un correo con instrucciones para elegir una nueva contraseña.
 notice_account_activated: Su cuenta ha sido activada. Ahora se encuentra conectado.
 notice_successful_create: Creación correcta.
 notice_successful_update: Modificación correcta.
@@ -226,7 +226,7 @@ label_administration: Administración
 label_login: Conexión
 label_logout: Desconexión
 label_help: Ayuda
-label_reported_issues: Peticiones registradas
+label_reported_issues: Peticiones registradas por mí
 label_assigned_to_me_issues: Peticiones que me están asignadas
 label_last_login: Última conexión
 label_last_updates: Actualizado
@@ -257,7 +257,7 @@ label_change_status: Cambiar el estado
 label_history: Histórico
 label_attachment: Fichero
 label_attachment_new: Nuevo fichero
-label_attachment_delete: Suprimir el fichero
+label_attachment_delete: Borrar el fichero
 label_attachment_plural: Ficheros
 label_report: Informe
 label_report_plural: Informes
@@ -303,10 +303,10 @@ label_comment: Comentario
 label_comment_plural: Comentarios
 label_comment_add: Añadir un comentario
 label_comment_added: Comentario añadido
-label_comment_delete: Suprimir comentarios
-label_query: Pregunta personalizada
-label_query_plural: Preguntas personalizadas
-label_query_new: Nueva pregunta
+label_comment_delete: Borrar comentarios
+label_query: Consulta personalizada
+label_query_plural: Consultas personalizadas
+label_query_new: Nueva consulta
 label_filter_add: Añadir el filtro
 label_filter_plural: Filtros
 label_equals: igual
@@ -334,7 +334,7 @@ label_latest_revision: La revisión más actual
 label_latest_revision_plural: Las revisiones más actuales
 label_view_revisions: Ver las revisiones
 label_max_size: Tamaño máximo
-label_on: en
+label_on: de
 label_sort_highest: Primero
 label_sort_higher: Subir
 label_sort_lower: Bajar
@@ -344,7 +344,7 @@ label_roadmap_due_in: Realizado en
 label_roadmap_no_issues: No hay peticiones para esta versión
 label_search: Búsqueda
 label_result: %d resultado
-label_result_plural: %d resultados
+label_result_plural: Resultados
 label_all_words: Todas las palabras
 label_wiki: Wiki
 label_wiki_edit: Wiki edicción
@@ -353,7 +353,7 @@ label_wiki_page: Wiki página
 label_wiki_page_plural: Wiki páginas
 label_page_index: Índice
 label_current_version: Versión actual
-label_preview: Previo
+label_preview: Previsualizar
 label_feed_plural: Feeds
 label_changes_details: Detalles de todos los cambios
 label_issue_tracking: Peticiones
@@ -391,10 +391,10 @@ label_stay_logged_in: Recordar conexión
 label_disabled: deshabilitado
 label_show_completed_versions: Muestra las versiones completas
 label_me: me
-label_board: Forum
-label_board_new: Nuevo forum
-label_board_plural: Forums
-label_topic_plural: Topics
+label_board: Foro
+label_board_new: Nuevo foro
+label_board_plural: Foros
+label_topic_plural: Temas
 label_message_plural: Mensajes
 label_message_last: Último mensaje
 label_message_new: Nuevo mensaje
@@ -409,10 +409,10 @@ label_language_based: Badado en el idioma
 
 button_login: Conexión
 button_submit: Aceptar
-button_save: Validar
+button_save: Guardar
 button_check_all: Seleccionar todo
 button_uncheck_all: No seleccionar nada
-button_delete: Suprimir
+button_delete: Borrar
 button_create: Crear
 button_test: Testar
 button_edit: Modificar
@@ -455,30 +455,30 @@ text_tip_task_begin_day: tarea que comienza este día
 text_tip_task_end_day: tarea que termina este día
 text_tip_task_begin_end_day: tarea que comienza y termina este día
 text_project_identifier_info: 'Letras minúsculas (a-z), números y signos de puntuación permitidos.<br />Una vez guardado, el identificador no puede modificarse.'
-text_caracters_maximum: %d caracteres máximo.
-text_length_between: Longitud entre %d y %d caracteres.
+text_caracters_maximum: %d carácteres como máximo.
+text_length_between: Longitud entre %d y %d carácteres.
 text_tracker_no_workflow: No hay ningún workflow definido para este tracker
-text_unallowed_characters: Caracteres no permitidos
+text_unallowed_characters: Carácteres no permitidos
 text_comma_separated: Múltiples valores permitidos (separados por coma).
 text_issues_ref_in_commit_messages: Referencia y petición de corrección en los mensajes
 
-default_role_manager: Manager
+default_role_manager: Jefe de proyecto
 default_role_developper: Desarrollador
 default_role_reporter: Informador
-default_tracker_bug: Anomalía
-default_tracker_feature: Evolución
-default_tracker_support: Asistencia
-default_issue_status_new: Nuevo
+default_tracker_bug: Errores
+default_tracker_feature: Tareas
+default_tracker_support: Soporte
+default_issue_status_new: Nueva
 default_issue_status_assigned: Asignada
 default_issue_status_resolved: Resuelta
-default_issue_status_feedback: Comentario
+default_issue_status_feedback: Comentarios
 default_issue_status_closed: Cerrada
 default_issue_status_rejected: Rechazada
-default_doc_category_user: Documentación del usuario
+default_doc_category_user: Documentación de usuario
 default_doc_category_tech: Documentación tecnica
-default_priority_low: Bajo
+default_priority_low: Baja
 default_priority_normal: Normal
-default_priority_high: Alto
+default_priority_high: Alta
 default_priority_urgent: Urgente
 default_priority_immediate: Inmediata
 default_activity_design: Diseño
@@ -494,13 +494,13 @@ text_issue_category_destroy_question: Algunas peticiones (%d) están asignadas a
 label_feeds_access_key_created_on: Clave de acceso por RSS creada hace %s
 label_default_columns: Columnas por defecto
 setting_cross_project_issue_relations: Permitir relacionar peticiones de distintos proyectos
-label_roadmap_overdue: %s late
+label_roadmap_overdue: %s tarde
 label_module_plural: Módulos
-label_this_week: this week
-label_index_by_title: Index by title
+label_this_week: esta semana
+label_index_by_title: Índice por título
 label_jump_to_a_project: Ir al proyecto...
 field_assignable: Se pueden asignar peticiones a este perfil
-label_sort_by: Sort by %s
+label_sort_by: Ordenar por %s
 setting_issue_list_default_columns: Columnas por defecto para la lista de peticiones
 text_issue_updated: La petición %s ha sido actualizada.
 notice_feeds_access_key_reseted: Su clave de acceso para RSS ha sido reiniciada
@@ -518,7 +518,7 @@ label_send_test_email: Enviar un correo de prueba
 button_reset: Reset
 label_added_time_by: Añadido por %s hace %s
 field_estimated_hours: Tiempo estimado
-label_changeset_plural: Changesets
+label_changeset_plural: Cambios
 setting_repositories_encodings: Codificaciones del repositorio
 notice_no_issue_selected: "Ninguna petición seleccionada. Por favor, compruebe la petición que quiere modificar"
 label_bulk_edit_selected_issues: Bulk edit selected issues
@@ -539,13 +539,13 @@ button_copy: Copiar
 mail_body_account_information_external: Puede usar su cuenta "%s" para conectarse a Redmine.
 mail_body_account_information: Información sobre su cuenta de Redmine
 setting_protocol: Protocolo
-text_caracters_minimum: Must be at least %d characters long.
-field_time_zone: Time zone
-label_registration_activation_by_email: account activation by email
-label_user_mail_no_self_notified: "I don't want to be notified of changes that I make myself"
-mail_subject_account_activation_request: Redmine account activation request
-mail_body_account_activation_request: 'A new user (%s) has registered. His account his pending your approval:'
-label_registration_automatic_activation: automatic account activation
-label_registration_manual_activation: manual account activation
-notice_account_pending: "Your account was created and is now pending administrator approval."
-setting_time_format: Time format
+text_caracters_minimum: %d carácteres como mínimo
+field_time_zone: Zona horaria
+label_registration_activation_by_email: activación de cuenta por correo
+label_user_mail_no_self_notified: "No quiero ser avisado de cambios hechos por mí"
+mail_subject_account_activation_request: Petición de activación de cuenta Redmine
+mail_body_account_activation_request: "Un nuevo usuario (%s) ha sido registrado. Esta cuenta está pendiende de aprobación"
+label_registration_automatic_activation: activación automática de cuenta
+label_registration_manual_activation: activación manual de cuenta
+notice_account_pending: "Su cuenta ha sido creada y está pendiende de la aprobación por parte de administrador"
+setting_time_format: Formato de hora
diff --git a/public/.htaccess b/public/.htaccess
index d3c998345..3d3fb88bc 100644
--- a/public/.htaccess
+++ b/public/.htaccess
@@ -1,40 +1,55 @@
-# General Apache options
-AddHandler fastcgi-script .fcgi
-AddHandler cgi-script .cgi
-Options +FollowSymLinks +ExecCGI
-
-# If you don't want Rails to look in certain directories,
-# use the following rewrite rules so that Apache won't rewrite certain requests
-# 
-# Example:
-#   RewriteCond %{REQUEST_URI} ^/notrails.*
-#   RewriteRule .* - [L]
-
-# Redirect all requests not available on the filesystem to Rails
-# By default the cgi dispatcher is used which is very slow
-# 
-# For better performance replace the dispatcher with the fastcgi one
-#
-# Example:
-#   RewriteRule ^(.*)$ dispatch.fcgi [QSA,L]
-RewriteEngine On
-
-# If your Rails application is accessed via an Alias directive,
-# then you MUST also set the RewriteBase in this htaccess file.
-#
-# Example:
-#   Alias /myrailsapp /path/to/myrailsapp/public
-#   RewriteBase /myrailsapp
-
-RewriteRule ^$ index.html [QSA]
-RewriteRule ^([^.]+)$ $1.html [QSA]
-RewriteCond %{REQUEST_FILENAME} !-f
-RewriteRule ^(.*)$ dispatch.cgi [QSA,L]
-
-# In case Rails experiences terminal errors
-# Instead of displaying this message you can supply a file here which will be rendered instead
-# 
-# Example:
-#   ErrorDocument 500 /500.html
-
+# General Apache options
+<IfModule mod_fastcgi.c>
+	AddHandler fastcgi-script .fcgi
+</IfModule>
+<IfModule mod_fcgid.c>
+	AddHandler fcgid-script .fcgi
+</IfModule>
+<IfModule mod_cgi.c>
+	AddHandler cgi-script .cgi
+</IfModule>
+Options +FollowSymLinks +ExecCGI
+
+# If you don't want Rails to look in certain directories,
+# use the following rewrite rules so that Apache won't rewrite certain requests
+# 
+# Example:
+#   RewriteCond %{REQUEST_URI} ^/notrails.*
+#   RewriteRule .* - [L]
+
+# Redirect all requests not available on the filesystem to Rails
+# By default the cgi dispatcher is used which is very slow
+# 
+# For better performance replace the dispatcher with the fastcgi one
+#
+# Example:
+#   RewriteRule ^(.*)$ dispatch.fcgi [QSA,L]
+RewriteEngine On
+
+# If your Rails application is accessed via an Alias directive,
+# then you MUST also set the RewriteBase in this htaccess file.
+#
+# Example:
+#   Alias /myrailsapp /path/to/myrailsapp/public
+#   RewriteBase /myrailsapp
+
+RewriteRule ^$ index.html [QSA]
+RewriteRule ^([^.]+)$ $1.html [QSA]
+RewriteCond %{REQUEST_FILENAME} !-f
+<IfModule mod_fastcgi.c>
+	RewriteRule ^(.*)$ dispatch.fcgi [QSA,L]
+</IfModule>
+<IfModule mod_fcgid.c>
+	RewriteRule ^(.*)$ dispatch.fcgi [QSA,L]
+</IfModule>
+<IfModule mod_cgi.c>
+	RewriteRule ^(.*)$ dispatch.cgi [QSA,L]
+</IfModule>
+
+# In case Rails experiences terminal errors
+# Instead of displaying this message you can supply a file here which will be rendered instead
+# 
+# Example:
+#   ErrorDocument 500 /500.html
+
 ErrorDocument 500 "<h2>Application error</h2>Rails application failed to start properly"
\ No newline at end of file

From bf6e02c7394a468ac4a385c179e2eb7c3769eb52 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Thu, 29 Nov 2007 18:33:42 +0000
Subject: [PATCH 023/710] Search engine: search can be restricted to an exact
 phrase by using quotation marks (eg. hello "bye bye" can be used to search
 for "hello" and "bye bye" strings).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@935 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/search_controller.rb | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb
index 7c50d4dcb..ee4f863aa 100644
--- a/app/controllers/search_controller.rb
+++ b/app/controllers/search_controller.rb
@@ -52,8 +52,11 @@ class SearchController < ApplicationController
       @object_types = @scope = %w(projects)
     end
     
+    # extract tokens from the question
+    # eg. hello "bye bye" => ["hello", "bye bye"]
+    @tokens = @question.scan(%r{((\s|^)"[\s\w]+"(\s|$)|\S+)}).collect {|m| m.first.gsub(%r{(^\s*"\s*|\s*"\s*$)}, '')}
     # tokens must be at least 3 character long
-    @tokens = @question.split.uniq.select {|w| w.length > 2 }
+    @tokens = @tokens.uniq.select {|w| w.length > 2 }
     
     if !@tokens.empty?
       # no more than 5 tokens to search for
@@ -93,7 +96,6 @@ class SearchController < ApplicationController
         # 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

From 2cf11bd64e7b272171f72cac1572e26224daf4ca Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Thu, 29 Nov 2007 20:08:14 +0000
Subject: [PATCH 024/710] Fixed Mantis importer: projects trackers and modules
 assignment Fixed Trac and Mantis importers: roles assignments

git-svn-id: http://redmine.rubyforge.org/svn/trunk@936 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 lib/tasks/migrate_from_mantis.rake        | 10 +++++++---
 lib/tasks/migrate_from_trac.rake          | 11 ++++++-----
 test/functional/search_controller_test.rb |  5 +++++
 3 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/lib/tasks/migrate_from_mantis.rake b/lib/tasks/migrate_from_mantis.rake
index fff668b64..593d59d82 100644
--- a/lib/tasks/migrate_from_mantis.rake
+++ b/lib/tasks/migrate_from_mantis.rake
@@ -53,9 +53,10 @@ task :migrate_from_mantis => :environment do
       TRACKER_BUG = Tracker.find_by_position(1)
       TRACKER_FEATURE = Tracker.find_by_position(2)
       
-      DEFAULT_ROLE = Role.find_by_position(3)
-      manager_role = Role.find_by_position(1)
-      developer_role = Role.find_by_position(2)
+      roles = Role.find(:all, :conditions => {:builtin => 0}, :order => 'position ASC')
+      manager_role = roles[0]
+      developer_role = roles[1]
+      DEFAULT_ROLE = roles.last
       ROLE_MAPPING = {10 => DEFAULT_ROLE,   # viewer
                       25 => DEFAULT_ROLE,   # reporter
                       40 => DEFAULT_ROLE,   # updater
@@ -268,6 +269,9 @@ task :migrate_from_mantis => :environment do
     	p.identifier = project.identifier
     	next unless p.save
     	projects_map[project.id] = p.id
+    	p.enabled_module_names = ['issue_tracking', 'news', 'wiki']
+        p.trackers << TRACKER_BUG
+        p.trackers << TRACKER_FEATURE
     	print '.'
     	
     	# Project members
diff --git a/lib/tasks/migrate_from_trac.rake b/lib/tasks/migrate_from_trac.rake
index 6467a5430..429b39623 100644
--- a/lib/tasks/migrate_from_trac.rake
+++ b/lib/tasks/migrate_from_trac.rake
@@ -54,10 +54,11 @@ namespace :redmine do
                            'task' => TRACKER_FEATURE,
                            'patch' =>TRACKER_FEATURE
                            }
-                            
-        DEFAULT_ROLE = Role.find_by_position(3)
-        manager_role = Role.find_by_position(1)
-        developer_role = Role.find_by_position(2)
+        
+        roles = Role.find(:all, :conditions => {:builtin => 0}, :order => 'position ASC')
+        manager_role = roles[0]
+        developer_role = roles[1]
+        DEFAULT_ROLE = roles.last
         ROLE_MAPPING = {'admin' => manager_role,
                         'developer' => developer_role
                         }
@@ -173,7 +174,7 @@ namespace :redmine do
           elsif TracPermission.find_by_username_and_action(username, 'developer')
             role = ROLE_MAPPING['developer']
           end
-          Member.create(:user => u, :project => @target_project, :role => DEFAULT_ROLE)
+          Member.create(:user => u, :project => @target_project, :role => role)
           u.reload
         end
         u
diff --git a/test/functional/search_controller_test.rb b/test/functional/search_controller_test.rb
index 4ed7931f6..5e3673a4e 100644
--- a/test/functional/search_controller_test.rb
+++ b/test/functional/search_controller_test.rb
@@ -46,4 +46,9 @@ class SearchControllerTest < Test::Unit::TestCase
     assert_response :success
     assert_template 'index'
   end
+  
+  def test_tokens_with_quotes
+    get :index, :id => 1, :q => '"good bye" hello "bye bye"'
+    assert_equal ["good bye", "hello", "bye bye"], assigns(:tokens)
+  end
 end

From 3baf086e2d8e5d969ce12217e1e143e5b4ec971a Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Thu, 29 Nov 2007 20:14:01 +0000
Subject: [PATCH 025/710] Fixed: 'View all issues' link doesn't work on
 issues/show.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@937 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/issues/_sidebar.rhtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/issues/_sidebar.rhtml b/app/views/issues/_sidebar.rhtml
index 6e61755e8..e6c63896b 100644
--- a/app/views/issues/_sidebar.rhtml
+++ b/app/views/issues/_sidebar.rhtml
@@ -4,7 +4,7 @@
 <% end %>
 
 <h3><%= l(:label_issue_plural) %></h3>
-<%= link_to l(:label_issue_view_all), { :set_filter => 1 } %><br />
+<%= link_to l(:label_issue_view_all), { :controller => 'issues', :action => 'index', :project_id => @project, :set_filter => 1 } %><br />
 <%= link_to l(:field_summary), :controller => 'reports', :action => 'issue_report', :id => @project %><br />
 <%= link_to l(:label_change_log), :controller => 'projects', :action => 'changelog', :id => @project %>
 

From db002edabdec9050e6d512ae8759783894b9624a Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sat, 1 Dec 2007 17:15:42 +0000
Subject: [PATCH 026/710] * Added links to previous and next revisions on
 revision view (patch by Cyril Mougel slightly edited) * Fixed
 TimelogController#report december error * Fixed
 ProjectsControllerTest#test_activity 1st and 2nd day of the month failure

git-svn-id: http://redmine.rubyforge.org/svn/trunk@938 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/repositories_controller.rb    | 14 ++++--
 app/controllers/timelog_controller.rb         |  2 +-
 app/models/changeset.rb                       | 10 ++++
 app/views/repositories/revision.rhtml         | 22 +++++++--
 public/stylesheets/application.css            |  2 +
 test/fixtures/repositories.yml                |  7 +++
 test/functional/projects_controller_test.rb   |  2 +-
 .../repositories_controller_test.rb           | 46 +++++++++++++++++++
 test/unit/changeset_test.rb                   | 20 ++++++++
 test/unit/repository_test.rb                  |  4 +-
 10 files changed, 118 insertions(+), 11 deletions(-)
 create mode 100644 test/functional/repositories_controller_test.rb

diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb
index 8ff464c5b..b332c7213 100644
--- a/app/controllers/repositories_controller.rb
+++ b/app/controllers/repositories_controller.rb
@@ -19,6 +19,9 @@ require 'SVG/Graph/Bar'
 require 'SVG/Graph/BarHorizontal'
 require 'digest/sha1'
 
+class ChangesetNotFound < Exception
+end
+
 class RepositoriesController < ApplicationController
   layout 'base'
   before_filter :find_repository, :except => :edit
@@ -94,14 +97,19 @@ class RepositoriesController < ApplicationController
   
   def revision
     @changeset = @repository.changesets.find_by_revision(@rev)
-    show_error and return unless @changeset
+    raise ChangesetNotFound 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?	
+
+    respond_to do |format|
+      format.html
+      format.js {render :layout => false}
+    end
+  rescue ChangesetNotFound
+    show_error
   end
   
   def diff
diff --git a/app/controllers/timelog_controller.rb b/app/controllers/timelog_controller.rb
index 1a1bace3a..f90c4527e 100644
--- a/app/controllers/timelog_controller.rb
+++ b/app/controllers/timelog_controller.rb
@@ -54,7 +54,7 @@ class TimelogController < ApplicationController
       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
+    @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(', ')
diff --git a/app/models/changeset.rb b/app/models/changeset.rb
index 355a5754c..1b79104c4 100644
--- a/app/models/changeset.rb
+++ b/app/models/changeset.rb
@@ -91,4 +91,14 @@ class Changeset < ActiveRecord::Base
     
     self.issues = referenced_issues.uniq
   end
+
+  # Returns the previous changeset
+  def previous
+    @previous ||= Changeset.find(:first, :conditions => ['revision < ? AND repository_id = ?', self.revision, self.repository_id], :order => 'revision DESC')
+  end
+
+  # Returns the next changeset
+  def next
+    @next ||= Changeset.find(:first, :conditions => ['revision > ? AND repository_id = ?', self.revision, self.repository_id], :order => 'revision ASC')
+  end
 end
diff --git a/app/views/repositories/revision.rhtml b/app/views/repositories/revision.rhtml
index 32f8583a7..64d1668bc 100644
--- a/app/views/repositories/revision.rhtml
+++ b/app/views/repositories/revision.rhtml
@@ -1,8 +1,22 @@
 <div class="contextual">
-<% form_tag do %>
-<%= l(:label_revision) %>: <%= text_field_tag 'rev', @rev, :size => 5 %>
-<%= submit_tag 'OK' %>
-<% end %>
+  &#171;
+  <% unless @changeset.previous.nil? -%>
+    <%= link_to l(:label_previous), :controller => 'repositories', :action => 'revision', :id => @project, :rev => @changeset.previous.revision %>
+  <% else -%>
+    <%= l(:label_previous) %>
+  <% end -%>
+|
+  <% unless @changeset.next.nil? -%>
+    <%= link_to l(:label_next), :controller => 'repositories', :action => 'revision', :id => @project, :rev => @changeset.next.revision %>
+  <% else -%>
+    <%= l(:label_next) %>
+  <% end -%>
+  &#187;&nbsp;
+  
+  <% form_tag do %>
+    <%= text_field_tag 'rev', @rev, :size => 5 %>
+    <%= submit_tag 'OK' %>
+  <% end %>
 </div>
 
 <h2><%= l(:label_revision) %> <%= @changeset.revision %></h2>
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 1e3200135..acdb40cd0 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -111,6 +111,8 @@ div.square {
 }
 
 .contextual {float:right; white-space: nowrap; line-height:1.4em;margin-top:5px;font-size:0.9em;}
+.contextual input {font-size:0.9em;}
+
 .splitcontentleft{float:left; width:49%;}
 .splitcontentright{float:right; width:49%;}
 form {display: inline;}
diff --git a/test/fixtures/repositories.yml b/test/fixtures/repositories.yml
index 6d288b192..46afed245 100644
--- a/test/fixtures/repositories.yml
+++ b/test/fixtures/repositories.yml
@@ -6,3 +6,10 @@ repositories_001:
   root_url: svn://localhost
   password: ""
   login: ""
+repositories_002: 
+  project_id: 2
+  url: svn://localhost/test
+  id: 11
+  root_url: svn://localhost
+  password: ""
+  login: ""
diff --git a/test/functional/projects_controller_test.rb b/test/functional/projects_controller_test.rb
index c41adaa6c..a48fa26bc 100644
--- a/test/functional/projects_controller_test.rb
+++ b/test/functional/projects_controller_test.rb
@@ -89,7 +89,7 @@ class ProjectsControllerTest < Test::Unit::TestCase
   end
 
   def test_activity
-    get :activity, :id => 1
+    get :activity, :id => 1, :year => 2.days.ago.to_date.year, :month => 2.days.ago.to_date.month
     assert_response :success
     assert_template 'activity'
     assert_not_nil assigns(:events_by_day)
diff --git a/test/functional/repositories_controller_test.rb b/test/functional/repositories_controller_test.rb
new file mode 100644
index 000000000..d5ccc660d
--- /dev/null
+++ b/test/functional/repositories_controller_test.rb
@@ -0,0 +1,46 @@
+# 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 File.dirname(__FILE__) + '/../test_helper'
+require 'repositories_controller'
+
+# Re-raise errors caught by the controller.
+class RepositoriesController; def rescue_action(e) raise e end; end
+
+class RepositoriesControllerTest < Test::Unit::TestCase
+  fixtures :projects, :users, :roles, :members, :repositories, :issues, :issue_statuses, :changesets, :changes, :issue_categories, :enumerations, :custom_fields, :custom_values, :trackers
+  
+  def setup
+    @controller = RepositoriesController.new
+    @request    = ActionController::TestRequest.new
+    @response   = ActionController::TestResponse.new
+    User.current = nil
+  end
+  
+  def test_revision_with_before_nil_and_afer_normal
+    get :revision, {:id => 1, :rev => 1}
+    assert_response :success
+    assert_template 'revision'
+    assert_no_tag :tag => "div", :attributes => { :class => "contextual" },
+      :child => { :tag => "a", :attributes => { :href => '/repositories/revision/1?rev=0'}
+    }
+    assert_tag :tag => "div", :attributes => { :class => "contextual" },
+        :child => { :tag => "a", :attributes => { :href => '/repositories/revision/1?rev=2'}
+    }
+  end
+
+end
diff --git a/test/unit/changeset_test.rb b/test/unit/changeset_test.rb
index ee53f18ff..2442a8b8c 100644
--- a/test/unit/changeset_test.rb
+++ b/test/unit/changeset_test.rb
@@ -39,4 +39,24 @@ class ChangesetTest < Test::Unit::TestCase
     assert fixed.closed?
     assert_equal 90, fixed.done_ratio
   end
+
+  def test_previous
+    changeset = Changeset.find_by_revision(3)
+    assert_equal Changeset.find_by_revision(2), changeset.previous
+  end
+
+  def test_previous_nil
+    changeset = Changeset.find_by_revision(1)
+    assert_nil changeset.previous
+  end
+
+  def test_next
+    changeset = Changeset.find_by_revision(2)
+    assert_equal Changeset.find_by_revision(3), changeset.next
+  end
+
+  def test_next_nil
+    changeset = Changeset.find_by_revision(4)
+    assert_nil changeset.next
+  end
 end
diff --git a/test/unit/repository_test.rb b/test/unit/repository_test.rb
index 843b0b42c..5e0432c60 100644
--- a/test/unit/repository_test.rb
+++ b/test/unit/repository_test.rb
@@ -25,14 +25,14 @@ class RepositoryTest < Test::Unit::TestCase
   end
   
   def test_create
-    repository = Repository::Subversion.new(:project => Project.find(2))
+    repository = Repository::Subversion.new(:project => Project.find(3))
     assert !repository.save
   
     repository.url = "svn://localhost"
     assert repository.save
     repository.reload
     
-    project = Project.find(2)
+    project = Project.find(3)
     assert_equal repository, project.repository
   end
   

From 81ada666bb54eeb26c207284e6369f371bb9147a Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sat, 1 Dec 2007 17:42:26 +0000
Subject: [PATCH 027/710] 'Assigned to' drop down list is now sorted by user's
 lastname.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@939 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/models/project.rb | 2 +-
 app/models/query.rb   | 2 +-
 app/models/user.rb    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/models/project.rb b/app/models/project.rb
index be46d6189..03ada035c 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -132,7 +132,7 @@ class Project < ActiveRecord::Base
   
   # Users issues can be assigned to
   def assignable_users
-    members.select {|m| m.role.assignable?}.collect {|m| m.user}
+    members.select {|m| m.role.assignable?}.collect {|m| m.user}.sort
   end
   
   # Returns the mail adresses of users that should be always notified on project events
diff --git a/app/models/query.rb b/app/models/query.rb
index 4cc5a63a5..4133abd88 100644
--- a/app/models/query.rb
+++ b/app/models/query.rb
@@ -147,7 +147,7 @@ class Query < ActiveRecord::Base
     user_values = []
     user_values << ["<< #{l(:label_me)} >>", "me"] if executed_by
     if project
-      user_values += project.users.collect{|s| [s.name, s.id.to_s] }
+      user_values += project.users.sort.collect{|s| [s.name, s.id.to_s] }
     elsif executed_by
       # members of the user's projects
       user_values += executed_by.projects.collect(&:users).flatten.uniq.sort.collect{|s| [s.name, s.id.to_s] }
diff --git a/app/models/user.rb b/app/models/user.rb
index 37512fda0..737a8cc8e 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -163,7 +163,7 @@ class User < ActiveRecord::Base
   end
 
   def <=>(user)
-    lastname == user.lastname ? firstname <=> user.firstname : lastname <=> user.lastname
+    user.nil? ? -1 : (lastname == user.lastname ? firstname <=> user.firstname : lastname <=> user.lastname)
   end
   
   def to_s

From f5d68cf688dabb41fc81b9658969dd994bffbc8d Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sat, 1 Dec 2007 21:33:15 +0000
Subject: [PATCH 028/710] Fixed a broken link in the SCM browser

git-svn-id: http://redmine.rubyforge.org/svn/trunk@940 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/repositories/_navigation.rhtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/repositories/_navigation.rhtml b/app/views/repositories/_navigation.rhtml
index 823b4f44f..9f40e0abd 100644
--- a/app/views/repositories/_navigation.rhtml
+++ b/app/views/repositories/_navigation.rhtml
@@ -13,7 +13,7 @@ dirs.each do |dir|
     / <%= link_to h(dir), :action => 'browse', :id => @project, :path => link_path, :rev => @rev %>
 <% end %>
 <% if filename %>
-    / <%= link_to h(filename), :action => 'revisions', :id => @project, :path => "#{link_path}/#{filename}", :rev => @rev %>
+    / <%= link_to h(filename), :action => 'changes', :id => @project, :path => "#{link_path}/#{filename}", :rev => @rev %>
 <% end %>
 
 <%= "@ #{revision}" if revision %>

From 3f2f7153a90272539e58016228db6c83b661feaf Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sat, 1 Dec 2007 21:34:16 +0000
Subject: [PATCH 029/710] Fixed: Date and time formats defined in settings not
 applied to the issues CSV export.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@941 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/helpers/issues_helper.rb | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/helpers/issues_helper.rb b/app/helpers/issues_helper.rb
index 4727fdf96..197760b53 100644
--- a/app/helpers/issues_helper.rb
+++ b/app/helpers/issues_helper.rb
@@ -18,6 +18,7 @@
 require 'csv'
 
 module IssuesHelper
+  include ApplicationHelper
 
   def render_issue_tooltip(issue)
     @cached_label_start_date ||= l(:field_start_date)
@@ -142,11 +143,11 @@ module IssuesHelper
                   issue.category,
                   issue.fixed_version,
                   issue.author.name,
-                  issue.start_date ? l_date(issue.start_date) : nil,
-                  issue.due_date ? l_date(issue.due_date) : nil,
+                  format_date(issue.start_date),
+                  format_date(issue.due_date),
                   issue.done_ratio,
-                  l_datetime(issue.created_on),  
-                  l_datetime(issue.updated_on)
+                  format_time(issue.created_on),  
+                  format_time(issue.updated_on)
                   ]
         custom_fields.each {|f| fields << show_value(issue.custom_value_for(f)) }
         csv << fields.collect {|c| begin; ic.iconv(c.to_s); rescue; c.to_s; end }

From 457c9a8e727dff3167065954ef7269f2a6edb296 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sat, 1 Dec 2007 22:03:45 +0000
Subject: [PATCH 030/710] Fixed: svn or ldap password can be found in clear
 text in the html source in editing mode.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@942 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/helpers/repositories_helper.rb | 5 ++++-
 app/views/auth_sources/_form.rhtml | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/helpers/repositories_helper.rb b/app/helpers/repositories_helper.rb
index 41218fa79..333b30b1c 100644
--- a/app/helpers/repositories_helper.rb
+++ b/app/helpers/repositories_helper.rb
@@ -62,7 +62,10 @@ module RepositoriesHelper
       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))
+      content_tag('p', form.password_field(:password, :size => 30, :name => 'ignore',
+                                           :value => ((repository.new_record? || repository.password.blank?) ? '' : ('x'*15)),
+                                           :onfocus => "this.value=''; this.name='repository[password]';",
+                                           :onchange => "this.name='repository[password]';"))
   end
 
   def darcs_field_tags(form, repository)
diff --git a/app/views/auth_sources/_form.rhtml b/app/views/auth_sources/_form.rhtml
index 24d2913e3..3d148c11f 100644
--- a/app/views/auth_sources/_form.rhtml
+++ b/app/views/auth_sources/_form.rhtml
@@ -15,7 +15,10 @@
 <%= text_field 'auth_source', 'account'  %></p>
 
 <p><label for="auth_source_account_password"><%=l(:field_password)%></label>
-<%= password_field 'auth_source', 'account_password'  %></p>
+<%= password_field 'auth_source', 'account_password', :name => 'ignore',
+                                           :value => ((@auth_source.new_record? || @auth_source.account_password.blank?) ? '' : ('x'*15)),
+                                           :onfocus => "this.value=''; this.name='auth_source[account_password]';",
+                                           :onchange => "this.name='auth_source[account_password]';" %></p>
 
 <p><label for="auth_source_base_dn"><%=l(:field_base_dn)%> <span class="required">*</span></label>
 <%= text_field 'auth_source', 'base_dn', :size => 60 %></p>

From aebcfb1eda843b90851e0facdc0a386bf06c5d29 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 2 Dec 2007 12:58:07 +0000
Subject: [PATCH 031/710] When creating a new role, permissions are pre-filled
 with 'Non member' role permissions.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@943 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/roles_controller.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/controllers/roles_controller.rb b/app/controllers/roles_controller.rb
index a8f21ff65..3b5766aaf 100644
--- a/app/controllers/roles_controller.rb
+++ b/app/controllers/roles_controller.rb
@@ -33,7 +33,8 @@ class RolesController < ApplicationController
   end
 
   def new
-    @role = Role.new(params[:role])
+    # Prefills the form with 'Non member' role permissions
+    @role = Role.new(params[:role] || {:permissions => Role.non_member.permissions})
     if request.post? && @role.save
       flash[:notice] = l(:notice_successful_create)
       redirect_to :action => 'list'

From bc060b31ae086db5a6baf6e3a892c525b2b6f0cd Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 2 Dec 2007 13:52:16 +0000
Subject: [PATCH 032/710] Email notifications are now sent as Blind carbon copy
 by default. This can be changed in email notifications settings (new setting
 added). Emission email address setting moved to the email notifications
 settings view.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@944 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/admin_controller.rb |  5 +++--
 app/models/mailer.rb                | 17 +++++++++++++----
 app/views/admin/mail_options.rhtml  | 13 +++++++++++--
 app/views/settings/edit.rhtml       |  7 +------
 config/settings.yml                 |  2 ++
 lang/bg.yml                         |  1 +
 lang/cs.yml                         |  1 +
 lang/de.yml                         |  1 +
 lang/en.yml                         |  1 +
 lang/es.yml                         |  1 +
 lang/fr.yml                         |  1 +
 lang/he.yml                         |  1 +
 lang/it.yml                         |  1 +
 lang/ja.yml                         |  1 +
 lang/ko.yml                         |  1 +
 lang/nl.yml                         |  1 +
 lang/pl.yml                         |  1 +
 lang/pt-br.yml                      |  1 +
 lang/pt.yml                         |  1 +
 lang/ro.yml                         |  1 +
 lang/ru.yml                         |  1 +
 lang/sr.yml                         |  1 +
 lang/sv.yml                         |  1 +
 lang/zh.yml                         |  1 +
 public/stylesheets/application.css  |  4 ++--
 25 files changed, 51 insertions(+), 16 deletions(-)

diff --git a/app/controllers/admin_controller.rb b/app/controllers/admin_controller.rb
index b448affcc..58d6115ee 100644
--- a/app/controllers/admin_controller.rb
+++ b/app/controllers/admin_controller.rb
@@ -48,8 +48,9 @@ class AdminController < ApplicationController
   def mail_options
     @notifiables = %w(issue_added issue_updated news_added document_added file_added message_posted)
     if request.post?
-      Setting.notified_events = (params[:notified_events] || [])
-      Setting.emails_footer = params[:emails_footer] if params[:emails_footer]
+      settings = (params[:settings] || {}).dup
+      settings[:notified_events] ||= []
+      settings.each { |name, value| Setting[name] = value }
       flash[:notice] = l(:notice_successful_update)
       redirect_to :controller => 'admin', :action => 'mail_options'
     end
diff --git a/app/models/mailer.rb b/app/models/mailer.rb
index fe432e9a6..9639e1a9c 100644
--- a/app/models/mailer.rb
+++ b/app/models/mailer.rb
@@ -129,11 +129,20 @@ class Mailer < ActionMailer::Base
     default_url_options[:protocol] = Setting.protocol
   end
   
-  # Overrides the create_mail method to remove the current user from the recipients and cc
-  # if he doesn't want to receive notifications about what he does
+  # Overrides the create_mail method
   def create_mail
-    recipients.delete(User.current.mail) if recipients && User.current.pref[:no_self_notified]
-    cc.delete(User.current.mail) if cc && User.current.pref[:no_self_notified]
+    # Removes the current user from the recipients and cc
+    # if he doesn't want to receive notifications about what he does
+    if User.current.pref[:no_self_notified]
+      recipients.delete(User.current.mail) if recipients
+      cc.delete(User.current.mail) if cc
+    end
+    # Blind carbon copy recipients
+    if Setting.bcc_recipients?
+      bcc([recipients, cc].flatten.compact.uniq)
+      recipients []
+      cc []
+    end    
     super
   end
   
diff --git a/app/views/admin/mail_options.rhtml b/app/views/admin/mail_options.rhtml
index 3c95ebd71..997cc3b22 100644
--- a/app/views/admin/mail_options.rhtml
+++ b/app/views/admin/mail_options.rhtml
@@ -6,16 +6,25 @@
 
 <% form_tag({:action => 'mail_options'}, :id => 'mail-options-form') do %>
 
+<fieldset class="box tabular settings"><legend><%=l(:label_settings)%></legend>
+<p><label><%= l(:setting_mail_from) %></label>
+<%= text_field_tag 'settings[mail_from]', Setting.mail_from, :size => 60 %></p>
+
+<p><label><%= l(:setting_bcc_recipients) %></label>
+<%= check_box_tag 'settings[bcc_recipients]', 1, Setting.bcc_recipients? %>
+<%= hidden_field_tag 'settings[bcc_recipients]', 0 %></p>
+</fieldset>
+
 <fieldset class="box"><legend><%=l(:text_select_mail_notifications)%></legend>
 <% @notifiables.each do |notifiable| %>
-  <label><%= check_box_tag "notified_events[]", notifiable, Setting.notified_events.include?(notifiable) %>
+  <label><%= check_box_tag 'settings[notified_events][]', notifiable, Setting.notified_events.include?(notifiable) %>
   <%= notifiable.humanize %></label><br />
 <% end %>
 <p><%= check_all_links('mail-options-form') %></p>
 </fieldset>
 
 <fieldset class="box"><legend><%= l(:setting_emails_footer) %></legend>
-<%= text_area_tag 'emails_footer', Setting.emails_footer, :class => 'wiki-edit', :rows => 5 %>
+<%= text_area_tag 'settings[emails_footer]', Setting.emails_footer, :class => 'wiki-edit', :rows => 5 %>
 </fieldset>
 
 <%= submit_tag l(:button_save) %>
diff --git a/app/views/settings/edit.rhtml b/app/views/settings/edit.rhtml
index 9b4cc2d57..4a0a400a3 100644
--- a/app/views/settings/edit.rhtml
+++ b/app/views/settings/edit.rhtml
@@ -1,8 +1,7 @@
 <h2><%= l(:label_settings) %></h2>
 
-<div id="settings">
 <% form_tag({:action => 'edit'}) do %>
-<div class="box tabular">
+<div class="box tabular settings">
 <p><label><%= l(:setting_app_title) %></label>
 <%= text_field_tag 'settings[app_title]', Setting.app_title, :size => 30 %></p>
 
@@ -34,9 +33,6 @@
 <p><label><%= l(:setting_cross_project_issue_relations) %></label>
 <%= check_box_tag 'settings[cross_project_issue_relations]', 1, Setting.cross_project_issue_relations? %><%= hidden_field_tag 'settings[cross_project_issue_relations]', 0 %></p>
 
-<p><label><%= l(:setting_mail_from) %></label>
-<%= text_field_tag 'settings[mail_from]', Setting.mail_from, :size => 60 %></p>
-
 <p><label><%= l(:setting_host_name) %></label>
 <%= text_field_tag 'settings[host_name]', Setting.host_name, :size => 60 %></p>
 
@@ -101,5 +97,4 @@
 </fieldset>
 
 <%= submit_tag l(:button_save) %>
-</div>
 <% end %>
diff --git a/config/settings.yml b/config/settings.yml
index e9b9eebfd..9f6671f0d 100644
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -39,6 +39,8 @@ issues_export_limit:
   default: 500
 mail_from:
   default: redmine@somenet.foo
+bcc_recipients:
+  default: 1
 text_formatting:
   default: textile
 wiki_compression:
diff --git a/lang/bg.yml b/lang/bg.yml
index 5ec4577d8..6f5f527c7 100644
--- a/lang/bg.yml
+++ b/lang/bg.yml
@@ -546,3 +546,4 @@ label_registration_manual_activation: manual account activation
 notice_account_pending: "Your account was created and is now pending administrator approval."
 field_time_zone: Time zone
 text_caracters_minimum: Must be at least %d characters long.
+setting_bcc_recipients: Blind carbon copy recipients (bcc)
diff --git a/lang/cs.yml b/lang/cs.yml
index 09394ef71..1bc80c9dc 100644
--- a/lang/cs.yml
+++ b/lang/cs.yml
@@ -546,3 +546,4 @@ label_registration_manual_activation: manual account activation
 notice_account_pending: "Your account was created and is now pending administrator approval."
 field_time_zone: Time zone
 text_caracters_minimum: Must be at least %d characters long.
+setting_bcc_recipients: Blind carbon copy recipients (bcc)
diff --git a/lang/de.yml b/lang/de.yml
index 1fc6f6b69..b26129263 100644
--- a/lang/de.yml
+++ b/lang/de.yml
@@ -546,3 +546,4 @@ label_registration_manual_activation: Manuelle Kontoaktivierung
 notice_account_pending: "Ihr Konto wurde erstellt und wartet jetzt auf die Genehmigung des Administrators."
 field_time_zone: Zeitzone
 text_caracters_minimum: Muss mindestens %d Zeichen lang sein.
+setting_bcc_recipients: Blind carbon copy recipients (bcc)
diff --git a/lang/en.yml b/lang/en.yml
index 201ba1601..fb99bbb82 100644
--- a/lang/en.yml
+++ b/lang/en.yml
@@ -180,6 +180,7 @@ setting_self_registration: Self-registration
 setting_attachment_max_size: Attachment max. size
 setting_issues_export_limit: Issues export limit
 setting_mail_from: Emission email address
+setting_bcc_recipients: Blind carbon copy recipients (bcc)
 setting_host_name: Host name
 setting_text_formatting: Text formatting
 setting_wiki_compression: Wiki history compression
diff --git a/lang/es.yml b/lang/es.yml
index b10bbd929..1b5638eb5 100644
--- a/lang/es.yml
+++ b/lang/es.yml
@@ -549,3 +549,4 @@ label_registration_automatic_activation: activación automática de cuenta
 label_registration_manual_activation: activación manual de cuenta
 notice_account_pending: "Su cuenta ha sido creada y está pendiende de la aprobación por parte de administrador"
 setting_time_format: Formato de hora
+setting_bcc_recipients: Blind carbon copy recipients (bcc)
diff --git a/lang/fr.yml b/lang/fr.yml
index e319db81c..b2466f1e1 100644
--- a/lang/fr.yml
+++ b/lang/fr.yml
@@ -180,6 +180,7 @@ setting_self_registration: Inscription des nouveaux utilisateurs
 setting_attachment_max_size: Taille max des fichiers
 setting_issues_export_limit: Limite export demandes
 setting_mail_from: Adresse d'émission
+setting_bcc_recipients: Destinataires en copie cachée (cci)
 setting_host_name: Nom d'hôte
 setting_text_formatting: Formatage du texte
 setting_wiki_compression: Compression historique wiki
diff --git a/lang/he.yml b/lang/he.yml
index 7b20240ab..0f75a6ec1 100644
--- a/lang/he.yml
+++ b/lang/he.yml
@@ -546,3 +546,4 @@ label_registration_manual_activation: manual account activation
 notice_account_pending: "Your account was created and is now pending administrator approval."
 field_time_zone: Time zone
 text_caracters_minimum: Must be at least %d characters long.
+setting_bcc_recipients: Blind carbon copy recipients (bcc)
diff --git a/lang/it.yml b/lang/it.yml
index ceb3102aa..a3a858cef 100644
--- a/lang/it.yml
+++ b/lang/it.yml
@@ -546,3 +546,4 @@ label_registration_manual_activation: manual account activation
 notice_account_pending: "Your account was created and is now pending administrator approval."
 field_time_zone: Time zone
 text_caracters_minimum: Must be at least %d characters long.
+setting_bcc_recipients: Blind carbon copy recipients (bcc)
diff --git a/lang/ja.yml b/lang/ja.yml
index a1a0d968e..2233c2a38 100644
--- a/lang/ja.yml
+++ b/lang/ja.yml
@@ -547,3 +547,4 @@ label_registration_manual_activation: manual account activation
 notice_account_pending: "Your account was created and is now pending administrator approval."
 field_time_zone: Time zone
 text_caracters_minimum: Must be at least %d characters long.
+setting_bcc_recipients: Blind carbon copy recipients (bcc)
diff --git a/lang/ko.yml b/lang/ko.yml
index 9dd8951fe..8962d8cd5 100644
--- a/lang/ko.yml
+++ b/lang/ko.yml
@@ -546,3 +546,4 @@ label_registration_manual_activation: manual account activation
 notice_account_pending: "Your account was created and is now pending administrator approval."
 field_time_zone: Time zone
 text_caracters_minimum: Must be at least %d characters long.
+setting_bcc_recipients: Blind carbon copy recipients (bcc)
diff --git a/lang/nl.yml b/lang/nl.yml
index 16686d756..ca6ad66f3 100644
--- a/lang/nl.yml
+++ b/lang/nl.yml
@@ -547,3 +547,4 @@ label_registration_manual_activation: manual account activation
 notice_account_pending: "Your account was created and is now pending administrator approval."
 field_time_zone: Time zone
 text_caracters_minimum: Must be at least %d characters long.
+setting_bcc_recipients: Blind carbon copy recipients (bcc)
diff --git a/lang/pl.yml b/lang/pl.yml
index cf5494895..f478df8fb 100644
--- a/lang/pl.yml
+++ b/lang/pl.yml
@@ -546,3 +546,4 @@ label_registration_manual_activation: manualna aktywacja kont
 notice_account_pending: "Twoje konto zostało utworzone i oczekuje na zatwierdzenie administratora."
 field_time_zone: Strefa czasowa
 text_caracters_minimum: Must be at least %d characters long.
+setting_bcc_recipients: Blind carbon copy recipients (bcc)
diff --git a/lang/pt-br.yml b/lang/pt-br.yml
index 9e7bd9b4c..df893ff6d 100644
--- a/lang/pt-br.yml
+++ b/lang/pt-br.yml
@@ -546,3 +546,4 @@ label_registration_manual_activation: manual account activation
 notice_account_pending: "Your account was created and is now pending administrator approval."
 field_time_zone: Time zone
 text_caracters_minimum: Must be at least %d characters long.
+setting_bcc_recipients: Blind carbon copy recipients (bcc)
diff --git a/lang/pt.yml b/lang/pt.yml
index 78d739b87..1a499a2c5 100644
--- a/lang/pt.yml
+++ b/lang/pt.yml
@@ -546,3 +546,4 @@ label_registration_manual_activation: manual account activation
 notice_account_pending: "Your account was created and is now pending administrator approval."
 field_time_zone: Time zone
 text_caracters_minimum: Must be at least %d characters long.
+setting_bcc_recipients: Blind carbon copy recipients (bcc)
diff --git a/lang/ro.yml b/lang/ro.yml
index a81f61aec..a57330cc0 100644
--- a/lang/ro.yml
+++ b/lang/ro.yml
@@ -546,3 +546,4 @@ label_registration_manual_activation: manual account activation
 notice_account_pending: "Your account was created and is now pending administrator approval."
 field_time_zone: Time zone
 text_caracters_minimum: Must be at least %d characters long.
+setting_bcc_recipients: Blind carbon copy recipients (bcc)
diff --git a/lang/ru.yml b/lang/ru.yml
index 30ab5dddc..2f73a43b9 100644
--- a/lang/ru.yml
+++ b/lang/ru.yml
@@ -546,3 +546,4 @@ label_registration_manual_activation: активировать аккаунты
 notice_account_pending: "Ваш аккаунт уже создан и ожидает подтверждения администратора."
 field_time_zone: Часовой пояс
 text_caracters_minimum: Must be at least %d characters long.
+setting_bcc_recipients: Blind carbon copy recipients (bcc)
diff --git a/lang/sr.yml b/lang/sr.yml
index d08d0172a..49e2d5f3a 100644
--- a/lang/sr.yml
+++ b/lang/sr.yml
@@ -547,3 +547,4 @@ label_registration_manual_activation: manual account activation
 notice_account_pending: "Your account was created and is now pending administrator approval."
 field_time_zone: Time zone
 text_caracters_minimum: Must be at least %d characters long.
+setting_bcc_recipients: Blind carbon copy recipients (bcc)
diff --git a/lang/sv.yml b/lang/sv.yml
index 1b00eee1f..11a8ce059 100644
--- a/lang/sv.yml
+++ b/lang/sv.yml
@@ -547,3 +547,4 @@ label_registration_manual_activation: manual account activation
 notice_account_pending: "Your account was created and is now pending administrator approval."
 field_time_zone: Time zone
 text_caracters_minimum: Must be at least %d characters long.
+setting_bcc_recipients: Blind carbon copy recipients (bcc)
diff --git a/lang/zh.yml b/lang/zh.yml
index b20dd1b75..48176ceba 100644
--- a/lang/zh.yml
+++ b/lang/zh.yml
@@ -549,3 +549,4 @@ label_registration_manual_activation: manual account activation
 notice_account_pending: "Your account was created and is now pending administrator approval."
 field_time_zone: Time zone
 text_caracters_minimum: Must be at least %d characters long.
+setting_bcc_recipients: Blind carbon copy recipients (bcc)
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index acdb40cd0..1059d960b 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -153,8 +153,8 @@ width: 200px;
 
 #preview fieldset {margin-top: 1em; background: url(../images/draft.png)}
 
-#settings .tabular p{ padding-left: 300px; }
-#settings .tabular label{ margin-left: -300px; width: 295px; }
+.tabular.settings p{ padding-left: 300px; }
+.tabular.settings label{ margin-left: -300px; width: 295px; }
 
 .required {color: #bb0000;}
 .summary {font-style: italic;}

From 6e74a068082faea3cfbbbeb5b44e4798722eb3c0 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 2 Dec 2007 14:20:28 +0000
Subject: [PATCH 033/710] Fixed: error on admin/info if there's more than 1
 plugin installed.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@945 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/admin/info.rhtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/admin/info.rhtml b/app/views/admin/info.rhtml
index d84d2ad32..179fda1a8 100644
--- a/app/views/admin/info.rhtml
+++ b/app/views/admin/info.rhtml
@@ -12,7 +12,7 @@
 &nbsp;
 <h3 class="icon22 icon22-plugin">Plugins</h3>
 <table class="list">
-    <% @plugins.keys.sort.each do |plugin| %>
+    <% @plugins.keys.sort {|x,y| x.to_s <=> y.to_s}.each do |plugin| %>
         <tr class="<%= cycle('odd', 'even') %>">
         <td><%=h @plugins[plugin].name %></td>
         <td><%=h @plugins[plugin].description %></td>

From e4724c7626a329cee82875a7e1bbec450eab4667 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 2 Dec 2007 15:09:43 +0000
Subject: [PATCH 034/710] Trac importer: * should now support mysql and
 postgresql Trac database * minor fixes

git-svn-id: http://redmine.rubyforge.org/svn/trunk@946 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 lib/tasks/migrate_from_trac.rake | 88 +++++++++++++++++++++++++-------
 1 file changed, 69 insertions(+), 19 deletions(-)

diff --git a/lib/tasks/migrate_from_trac.rake b/lib/tasks/migrate_from_trac.rake
index 429b39623..37514df01 100644
--- a/lib/tasks/migrate_from_trac.rake
+++ b/lib/tasks/migrate_from_trac.rake
@@ -24,7 +24,7 @@ namespace :redmine do
   task :migrate_from_trac => :environment do
     
     module TracMigrate
-        TICKET_MAP = [];
+        TICKET_MAP = []
      
         DEFAULT_STATUS = IssueStatus.default
         assigned_status = IssueStatus.find_by_position(2)
@@ -187,7 +187,7 @@ namespace :redmine do
         # External Links
         text = text.gsub(/\[(http[^\s]+)\s+([^\]]+)\]/) {|s| "\"#{$2}\":#{$1}"}
         # Internal Links
-        text = text.gsub(/[[BR]]/, "\n") # This has to go before the rules below
+        text = text.gsub(/\[\[BR\]\]/, "\n") # This has to go before the rules below
         text = text.gsub(/\[\"(.+)\".*\]/) {|s| "[[#{$1.delete(',./?;|:')}]]"}
         text = text.gsub(/\[wiki:\"(.+)\".*\]/) {|s| "[[#{$1.delete(',./?;|:')}]]"}
         text = text.gsub(/\[wiki:\"(.+)\".*\]/) {|s| "[[#{$1.delete(',./?;|:')}]]"}
@@ -197,7 +197,7 @@ namespace :redmine do
         # Ticket number re-writing
         text = text.gsub(/#(\d+)/) do |s|
           TICKET_MAP[$1.to_i] ||= $1
-          "\##{TICKET_MAP[$1.to_i]}"
+          "\##{TICKET_MAP[$1.to_i] || $1}"
         end
         # Preformatted blocks
         text = text.gsub(/\{\{\{/, '<pre>')
@@ -213,14 +213,12 @@ namespace :redmine do
         text = text.gsub(/,,/, '~')        
         # Lists
         text = text.gsub(/^([ ]+)\* /) {|s| '*' * $1.length + " "}
-        
 
         text
       end
     
       def self.migrate
-        establish_connection({:adapter => trac_adapter, 
-                              :database => trac_db_path})
+        establish_connection
 
         # Quick database test
         TracComponent.count
@@ -418,26 +416,55 @@ namespace :redmine do
       end
       
       def self.set_trac_directory(path)
-        @trac_directory = path
+        @@trac_directory = path
         raise "This directory doesn't exist!" unless File.directory?(path)
-        raise "#{trac_db_path} doesn't exist!" unless File.exist?(trac_db_path)
         raise "#{trac_attachments_directory} doesn't exist!" unless File.directory?(trac_attachments_directory)
-        @trac_directory
+        @@trac_directory
       rescue Exception => e
         puts e
         return false
       end
 
       def self.trac_directory
-        @trac_directory
+        @@trac_directory
       end
 
       def self.set_trac_adapter(adapter)
-        return false unless %w(sqlite sqlite3).include?(adapter)
-        @trac_adapter = adapter
+        return false if adapter.blank?
+        raise "Unknown adapter: #{adapter}!" unless %w(sqlite sqlite3 mysql postgresql).include?(adapter)
+        # If adapter is sqlite or sqlite3, make sure that trac.db exists
+        raise "#{trac_db_path} doesn't exist!" if %w(sqlite sqlite3).include?(adapter) && !File.exist?(trac_db_path)
+        @@trac_adapter = adapter
+      rescue Exception => e
+        puts e
+        return false
       end
       
-      def self.trac_adapter; @trac_adapter end
+      def self.set_trac_db_host(host)
+        return nil if host.blank?
+        @@trac_db_host = host
+      end
+
+      def self.set_trac_db_port(port)
+        return nil if port.to_i == 0
+        @@trac_db_port = port.to_i
+      end
+      
+      def self.set_trac_db_name(name)
+        return nil if name.blank?
+        @@trac_db_name = name
+      end
+
+      def self.set_trac_db_username(username)
+        @@trac_db_username = username
+      end
+      
+      def self.set_trac_db_password(password)
+        @@trac_db_password = password
+      end
+      
+      mattr_reader :trac_directory, :trac_adapter, :trac_db_host, :trac_db_port, :trac_db_name, :trac_db_username, :trac_db_password
+      
       def self.trac_db_path; "#{trac_directory}/db/trac.db" end
       def self.trac_attachments_directory; "#{trac_directory}/attachments" end
       
@@ -451,17 +478,31 @@ namespace :redmine do
           puts "Unable to create a project with identifier '#{identifier}'!" unless project.save
           # enable issues and wiki for the created project
           project.enabled_module_names = ['issue_tracking', 'wiki']
-          project.trackers << TRACKER_BUG
-          project.trackers << TRACKER_FEATURE          
         end        
+        project.trackers << TRACKER_BUG
+        project.trackers << TRACKER_FEATURE          
         @target_project = project.new_record? ? nil : project
       end
       
-      def self.establish_connection(params)
+      def self.connection_params
+        if %w(sqlite sqlite3).include?(trac_adapter)
+          {:adapter => trac_adapter, 
+           :database => trac_db_path}
+        else
+          {:adapter => trac_adapter,
+           :database => trac_db_name,
+           :host => trac_db_host,
+           :port => trac_db_port,
+           :username => trac_db_username,
+           :password => trac_db_password}
+        end
+      end
+      
+      def self.establish_connection
         constants.each do |const|
           klass = const_get(const)
           next unless klass.respond_to? 'establish_connection'
-          klass.establish_connection params
+          klass.establish_connection connection_params
         end
       end
       
@@ -474,7 +515,7 @@ namespace :redmine do
     end
     
     puts
-    puts "WARNING: Your Redmine install will have a new project added during this process."
+    puts "WARNING: a new project will be added to Redmine during this process."
     print "Are you sure you want to continue ? [y/N] "
     break unless STDIN.gets.match(/^y$/i)  
     puts
@@ -489,8 +530,17 @@ namespace :redmine do
       end
     end
     
+    DEFAULT_PORTS = {'mysql' => 3306, 'postgresl' => 5432}
+    
     prompt('Trac directory') {|directory| TracMigrate.set_trac_directory directory}
-    prompt('Trac database adapter (sqlite, sqlite3)', :default => 'sqlite') {|adapter| TracMigrate.set_trac_adapter adapter}
+    prompt('Trac database adapter (sqlite, sqlite3, mysql, postgresql)', :default => 'sqlite') {|adapter| TracMigrate.set_trac_adapter adapter}
+    unless %w(sqlite sqlite3).include?(TracMigrate.trac_adapter)
+      prompt('Trac database host', :default => 'localhost') {|host| TracMigrate.set_trac_db_host host}
+      prompt('Trac database port', :default => DEFAULT_PORTS[TracMigrate.trac_adapter]) {|port| TracMigrate.set_trac_db_port port}
+      prompt('Trac database name') {|name| TracMigrate.set_trac_db_name name}
+      prompt('Trac database username') {|username| TracMigrate.set_trac_db_username username}
+      prompt('Trac database password') {|password| TracMigrate.set_trac_db_password password}
+    end
     prompt('Trac database encoding', :default => 'UTF-8') {|encoding| TracMigrate.encoding encoding}
     prompt('Target project identifier') {|identifier| TracMigrate.target_project_identifier identifier}
     puts

From 8c65cc47122b802150bf3591cb4eba4f8c4fb4b4 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 2 Dec 2007 20:58:02 +0000
Subject: [PATCH 035/710] Added Annotate/Blame view for Subversion, CVS and
 Mercurial repositories.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@947 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/repositories_controller.rb    |  5 ++
 app/models/repository.rb                      |  4 ++
 app/views/repositories/annotate.rhtml         | 26 +++++++++++
 app/views/repositories/changes.rhtml          | 11 +++--
 app/views/repositories/entry.rhtml            |  5 --
 config/routes.rb                              |  1 +
 lang/bg.yml                                   |  1 +
 lang/cs.yml                                   |  1 +
 lang/de.yml                                   |  1 +
 lang/en.yml                                   |  1 +
 lang/es.yml                                   |  1 +
 lang/fr.yml                                   |  1 +
 lang/he.yml                                   |  1 +
 lang/it.yml                                   |  1 +
 lang/ja.yml                                   |  1 +
 lang/ko.yml                                   |  1 +
 lang/nl.yml                                   |  1 +
 lang/pl.yml                                   |  1 +
 lang/pt-br.yml                                |  1 +
 lang/pt.yml                                   |  1 +
 lang/ro.yml                                   |  1 +
 lang/ru.yml                                   |  1 +
 lang/sr.yml                                   |  1 +
 lang/sv.yml                                   |  1 +
 lang/zh.yml                                   |  1 +
 lib/redmine.rb                                |  2 +-
 lib/redmine/scm/adapters/abstract_adapter.rb  | 32 +++++++++++--
 lib/redmine/scm/adapters/cvs_adapter.rb       | 20 +++++++-
 lib/redmine/scm/adapters/mercurial_adapter.rb | 19 ++++++++
 .../scm/adapters/subversion_adapter.rb        | 17 +++++++
 public/stylesheets/scm.css                    | 46 ++++++++++++++++---
 31 files changed, 186 insertions(+), 21 deletions(-)
 create mode 100644 app/views/repositories/annotate.rhtml

diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb
index b332c7213..dfd5d0a6f 100644
--- a/app/controllers/repositories_controller.rb
+++ b/app/controllers/repositories_controller.rb
@@ -95,6 +95,11 @@ class RepositoriesController < ApplicationController
     end
   end
   
+  def annotate
+    @annotate = @repository.scm.annotate(@path, @rev)
+    show_error and return if @annotate.nil? || @annotate.empty?
+  end
+  
   def revision
     @changeset = @repository.changesets.find_by_revision(@rev)
     raise ChangesetNotFound unless @changeset
diff --git a/app/models/repository.rb b/app/models/repository.rb
index 35dd6803f..be31ac2e5 100644
--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -33,6 +33,10 @@ class Repository < ActiveRecord::Base
   def supports_cat?
     scm.supports_cat?
   end
+
+  def supports_annotate?
+    scm.supports_annotate?
+  end
   
   def entries(path=nil, identifier=nil)
     scm.entries(path, identifier)
diff --git a/app/views/repositories/annotate.rhtml b/app/views/repositories/annotate.rhtml
new file mode 100644
index 000000000..b8f481ae5
--- /dev/null
+++ b/app/views/repositories/annotate.rhtml
@@ -0,0 +1,26 @@
+<h2><%= render :partial => 'navigation', :locals => { :path => @path, :kind => 'file', :revision => @rev } %></h2>
+
+<% colors = Hash.new {|k,v| k[v] = (k.size % 12) } %>
+
+<div class="autoscroll">
+<table class="filecontent annotate CodeRay">
+  <tbody>
+    <% line_num = 1 %>
+    <% syntax_highlight(@path, to_utf8(@annotate.content)).each_line do |line| %>
+    <% revision = @annotate.revisions[line_num-1] %>
+    <tr class="bloc-<%= revision.nil? ? 0 : colors[revision.identifier || revision.revision] %>">
+      <th class="line-num"><%= line_num %></th>
+      <td class="revision">
+      <%= (revision.identifier ? link_to(revision.identifier, :action => 'revision', :id => @project, :rev => revision.identifier) : revision.revision) if revision %></td>
+      <td class="author"><%= h(revision.author) if revision %></td>
+      <td class="line-code"><pre><%= line %></pre></td>
+    </tr>
+    <% line_num += 1 %>
+    <% end %>
+  <tbody>
+</table>
+</div>
+
+<% content_for :header_tags do %>
+<%= stylesheet_link_tag 'scm' %>
+<% end %>
diff --git a/app/views/repositories/changes.rhtml b/app/views/repositories/changes.rhtml
index 5d1db96ba..f843983db 100644
--- a/app/views/repositories/changes.rhtml
+++ b/app/views/repositories/changes.rhtml
@@ -2,14 +2,17 @@
 
 <h3><%=h @entry.name %></h3>
 
-<% if @repository.supports_cat? %>
 <p>
 <% if @entry.is_text? %>
-<%= link_to l(:button_view), {:action => 'entry', :id => @project, :path => @path, :rev => @rev } %> |
+    <% if @repository.supports_cat? %>
+        <%= link_to l(:button_view), {:action => 'entry', :id => @project, :path => @path, :rev => @rev } %> |
+    <% end %>
+    <% if @repository.supports_annotate? %>
+        <%= link_to l(:button_annotate), {:action => 'annotate', :id => @project, :path => @path, :rev => @rev } %> |
+    <% end %>
 <% end %>
-<%= link_to l(:button_download), {:action => 'entry', :id => @project, :path => @path, :rev => @rev, :format => 'raw' } %>
+<%= link_to(l(:button_download), {:action => 'entry', :id => @project, :path => @path, :rev => @rev, :format => 'raw' }) if @repository.supports_cat? %>
 <%= "(#{number_to_human_size(@entry.size)})" if @entry.size %>
 </p>
-<% end %>
 
 <%= render :partial => 'revisions', :locals => {:project => @project, :path => @path, :revisions => @changesets, :entry => @entry }%>
diff --git a/app/views/repositories/entry.rhtml b/app/views/repositories/entry.rhtml
index 94db240ab..9927601d7 100644
--- a/app/views/repositories/entry.rhtml
+++ b/app/views/repositories/entry.rhtml
@@ -2,11 +2,6 @@
 
 <div class="autoscroll">
 <table class="filecontent CodeRay">
-  <thead>
-    <tr>
-      <th colspan="2" class="filename"><%= @path %></th>
-    </tr>
-  </thead>
   <tbody>
     <% line_num = 1 %>
     <% syntax_highlight(@path, to_utf8(@content)).each_line do |line| %>
diff --git a/config/routes.rb b/config/routes.rb
index c3637304a..5048da2f5 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -24,6 +24,7 @@ ActionController::Routing::Routes.draw do |map|
     omap.repositories_changes 'repositories/changes/:id/*path', :action => 'changes'
     omap.repositories_diff 'repositories/diff/:id/*path', :action => 'diff'
     omap.repositories_entry 'repositories/entry/:id/*path', :action => 'entry'
+    omap.repositories_entry 'repositories/annotate/:id/*path', :action => 'annotate'
   end
   
   # Allow downloading Web Service WSDL as a file with an extension
diff --git a/lang/bg.yml b/lang/bg.yml
index 6f5f527c7..5f2dc6a8d 100644
--- a/lang/bg.yml
+++ b/lang/bg.yml
@@ -547,3 +547,4 @@ notice_account_pending: "Your account was created and is now pending administrat
 field_time_zone: Time zone
 text_caracters_minimum: Must be at least %d characters long.
 setting_bcc_recipients: Blind carbon copy recipients (bcc)
+button_annotate: Annotate
diff --git a/lang/cs.yml b/lang/cs.yml
index 1bc80c9dc..49697dda8 100644
--- a/lang/cs.yml
+++ b/lang/cs.yml
@@ -547,3 +547,4 @@ notice_account_pending: "Your account was created and is now pending administrat
 field_time_zone: Time zone
 text_caracters_minimum: Must be at least %d characters long.
 setting_bcc_recipients: Blind carbon copy recipients (bcc)
+button_annotate: Annotate
diff --git a/lang/de.yml b/lang/de.yml
index b26129263..870f45014 100644
--- a/lang/de.yml
+++ b/lang/de.yml
@@ -547,3 +547,4 @@ notice_account_pending: "Ihr Konto wurde erstellt und wartet jetzt auf die Geneh
 field_time_zone: Zeitzone
 text_caracters_minimum: Muss mindestens %d Zeichen lang sein.
 setting_bcc_recipients: Blind carbon copy recipients (bcc)
+button_annotate: Annotate
diff --git a/lang/en.yml b/lang/en.yml
index fb99bbb82..cdecb6693 100644
--- a/lang/en.yml
+++ b/lang/en.yml
@@ -489,6 +489,7 @@ button_reset: Reset
 button_rename: Rename
 button_change_password: Change password
 button_copy: Copy
+button_annotate: Annotate
 
 status_active: active
 status_registered: registered
diff --git a/lang/es.yml b/lang/es.yml
index 1b5638eb5..5f25de7cf 100644
--- a/lang/es.yml
+++ b/lang/es.yml
@@ -550,3 +550,4 @@ label_registration_manual_activation: activación manual de cuenta
 notice_account_pending: "Su cuenta ha sido creada y está pendiende de la aprobación por parte de administrador"
 setting_time_format: Formato de hora
 setting_bcc_recipients: Blind carbon copy recipients (bcc)
+button_annotate: Annotate
diff --git a/lang/fr.yml b/lang/fr.yml
index b2466f1e1..63f367f06 100644
--- a/lang/fr.yml
+++ b/lang/fr.yml
@@ -489,6 +489,7 @@ button_reset: Réinitialiser
 button_rename: Renommer
 button_change_password: Changer de mot de passe
 button_copy: Copier
+button_annotate: Annoter
 
 status_active: actif
 status_registered: enregistré
diff --git a/lang/he.yml b/lang/he.yml
index 0f75a6ec1..4ebbecf7a 100644
--- a/lang/he.yml
+++ b/lang/he.yml
@@ -547,3 +547,4 @@ notice_account_pending: "Your account was created and is now pending administrat
 field_time_zone: Time zone
 text_caracters_minimum: Must be at least %d characters long.
 setting_bcc_recipients: Blind carbon copy recipients (bcc)
+button_annotate: Annotate
diff --git a/lang/it.yml b/lang/it.yml
index a3a858cef..fa13513cb 100644
--- a/lang/it.yml
+++ b/lang/it.yml
@@ -547,3 +547,4 @@ notice_account_pending: "Your account was created and is now pending administrat
 field_time_zone: Time zone
 text_caracters_minimum: Must be at least %d characters long.
 setting_bcc_recipients: Blind carbon copy recipients (bcc)
+button_annotate: Annotate
diff --git a/lang/ja.yml b/lang/ja.yml
index 2233c2a38..d2f7d579f 100644
--- a/lang/ja.yml
+++ b/lang/ja.yml
@@ -548,3 +548,4 @@ notice_account_pending: "Your account was created and is now pending administrat
 field_time_zone: Time zone
 text_caracters_minimum: Must be at least %d characters long.
 setting_bcc_recipients: Blind carbon copy recipients (bcc)
+button_annotate: Annotate
diff --git a/lang/ko.yml b/lang/ko.yml
index 8962d8cd5..dd50ce2bc 100644
--- a/lang/ko.yml
+++ b/lang/ko.yml
@@ -547,3 +547,4 @@ notice_account_pending: "Your account was created and is now pending administrat
 field_time_zone: Time zone
 text_caracters_minimum: Must be at least %d characters long.
 setting_bcc_recipients: Blind carbon copy recipients (bcc)
+button_annotate: Annotate
diff --git a/lang/nl.yml b/lang/nl.yml
index ca6ad66f3..895feb5ed 100644
--- a/lang/nl.yml
+++ b/lang/nl.yml
@@ -548,3 +548,4 @@ notice_account_pending: "Your account was created and is now pending administrat
 field_time_zone: Time zone
 text_caracters_minimum: Must be at least %d characters long.
 setting_bcc_recipients: Blind carbon copy recipients (bcc)
+button_annotate: Annotate
diff --git a/lang/pl.yml b/lang/pl.yml
index f478df8fb..381dc5e26 100644
--- a/lang/pl.yml
+++ b/lang/pl.yml
@@ -547,3 +547,4 @@ notice_account_pending: "Twoje konto zostało utworzone i oczekuje na zatwierdze
 field_time_zone: Strefa czasowa
 text_caracters_minimum: Must be at least %d characters long.
 setting_bcc_recipients: Blind carbon copy recipients (bcc)
+button_annotate: Annotate
diff --git a/lang/pt-br.yml b/lang/pt-br.yml
index df893ff6d..4c4d862d3 100644
--- a/lang/pt-br.yml
+++ b/lang/pt-br.yml
@@ -547,3 +547,4 @@ notice_account_pending: "Your account was created and is now pending administrat
 field_time_zone: Time zone
 text_caracters_minimum: Must be at least %d characters long.
 setting_bcc_recipients: Blind carbon copy recipients (bcc)
+button_annotate: Annotate
diff --git a/lang/pt.yml b/lang/pt.yml
index 1a499a2c5..1aabc8ac7 100644
--- a/lang/pt.yml
+++ b/lang/pt.yml
@@ -547,3 +547,4 @@ notice_account_pending: "Your account was created and is now pending administrat
 field_time_zone: Time zone
 text_caracters_minimum: Must be at least %d characters long.
 setting_bcc_recipients: Blind carbon copy recipients (bcc)
+button_annotate: Annotate
diff --git a/lang/ro.yml b/lang/ro.yml
index a57330cc0..0c10c7727 100644
--- a/lang/ro.yml
+++ b/lang/ro.yml
@@ -547,3 +547,4 @@ notice_account_pending: "Your account was created and is now pending administrat
 field_time_zone: Time zone
 text_caracters_minimum: Must be at least %d characters long.
 setting_bcc_recipients: Blind carbon copy recipients (bcc)
+button_annotate: Annotate
diff --git a/lang/ru.yml b/lang/ru.yml
index 2f73a43b9..c6e27ca9f 100644
--- a/lang/ru.yml
+++ b/lang/ru.yml
@@ -547,3 +547,4 @@ notice_account_pending: "Ваш аккаунт уже создан и ожида
 field_time_zone: Часовой пояс
 text_caracters_minimum: Must be at least %d characters long.
 setting_bcc_recipients: Blind carbon copy recipients (bcc)
+button_annotate: Annotate
diff --git a/lang/sr.yml b/lang/sr.yml
index 49e2d5f3a..42aa3cc3e 100644
--- a/lang/sr.yml
+++ b/lang/sr.yml
@@ -548,3 +548,4 @@ notice_account_pending: "Your account was created and is now pending administrat
 field_time_zone: Time zone
 text_caracters_minimum: Must be at least %d characters long.
 setting_bcc_recipients: Blind carbon copy recipients (bcc)
+button_annotate: Annotate
diff --git a/lang/sv.yml b/lang/sv.yml
index 11a8ce059..7cbcc7a5f 100644
--- a/lang/sv.yml
+++ b/lang/sv.yml
@@ -548,3 +548,4 @@ notice_account_pending: "Your account was created and is now pending administrat
 field_time_zone: Time zone
 text_caracters_minimum: Must be at least %d characters long.
 setting_bcc_recipients: Blind carbon copy recipients (bcc)
+button_annotate: Annotate
diff --git a/lang/zh.yml b/lang/zh.yml
index 48176ceba..ad18cecc3 100644
--- a/lang/zh.yml
+++ b/lang/zh.yml
@@ -550,3 +550,4 @@ notice_account_pending: "Your account was created and is now pending administrat
 field_time_zone: Time zone
 text_caracters_minimum: Must be at least %d characters long.
 setting_bcc_recipients: Blind carbon copy recipients (bcc)
+button_annotate: Annotate
diff --git a/lib/redmine.rb b/lib/redmine.rb
index ffc1cc27e..b74f00aec 100644
--- a/lib/redmine.rb
+++ b/lib/redmine.rb
@@ -76,7 +76,7 @@ Redmine::AccessControl.map do |map|
     
   map.project_module :repository do |map|
     map.permission :manage_repository, {:repositories => [:edit, :destroy]}, :require => :member
-    map.permission :browse_repository, :repositories => [:show, :browse, :entry, :changes, :diff, :stats, :graph]
+    map.permission :browse_repository, :repositories => [:show, :browse, :entry, :annotate, :changes, :diff, :stats, :graph]
     map.permission :view_changesets, :repositories => [:show, :revisions, :revision]
   end
 
diff --git a/lib/redmine/scm/adapters/abstract_adapter.rb b/lib/redmine/scm/adapters/abstract_adapter.rb
index 4b524c538..720a4e9d9 100644
--- a/lib/redmine/scm/adapters/abstract_adapter.rb
+++ b/lib/redmine/scm/adapters/abstract_adapter.rb
@@ -38,6 +38,10 @@ module Redmine
         def supports_cat?
           true
         end
+
+        def supports_annotate?
+          respond_to?('annotate')
+        end
         
         def root_url
           @root_url
@@ -76,7 +80,7 @@ module Redmine
         def cat(path, identifier=nil)
           return nil
         end
-
+        
         def with_leading_slash(path)
           path ||= ''
           (path[0,1]!="/") ? "/#{path}" : path
@@ -237,7 +241,7 @@ module Redmine
     
         # 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")
+        def initialize(type="inline")
           @parsing = false
           @nb_line = 1
           @start = false
@@ -312,7 +316,7 @@ module Redmine
             CGI.escapeHTML(line)
         end
     
-        def parse_line (line, type="inline")
+        def parse_line(line, type="inline")
           if line[0, 1] == "+"
             diff = sbs? type, 'add'
             @before = 'add'
@@ -348,6 +352,28 @@ module Redmine
           end
         end
       end
+    
+      class Annotate
+        attr_reader :lines, :revisions
+        
+        def initialize
+          @lines = []
+          @revisions = []
+        end
+        
+        def add_line(line, revision)
+          @lines << line
+          @revisions << revision
+        end
+        
+        def content
+          content = lines.join("\n")
+        end
+        
+        def empty?
+          lines.empty?
+        end
+      end
     end
   end
 end
diff --git a/lib/redmine/scm/adapters/cvs_adapter.rb b/lib/redmine/scm/adapters/cvs_adapter.rb
index e84c1eea3..5c6c1775b 100644
--- a/lib/redmine/scm/adapters/cvs_adapter.rb
+++ b/lib/redmine/scm/adapters/cvs_adapter.rb
@@ -268,7 +268,25 @@ module Redmine
         rescue Errno::ENOENT => e
           raise CommandFailed    
         end  
-        
+
+        def annotate(path, identifier=nil)
+          identifier = (identifier) ? identifier : "HEAD"
+          logger.debug "<cvs> annotate path:'#{path}',identifier #{identifier}"
+          path_with_project="#{url}#{with_leading_slash(path)}"
+          cmd = "#{CVS_BIN} -d #{root_url} rannotate -r#{identifier} #{path_with_project}"
+          blame = Annotate.new
+          shellout(cmd) do |io|
+            io.each_line do |line|
+              next unless line =~ %r{^([\d\.]+)\s+\(([^\)]+)\s+[^\)]+\):\s(.*)$}
+              blame.add_line($3.rstrip, Revision.new(:revision => $1, :author => $2.strip))
+            end
+          end
+          return nil if $? && $?.exitstatus != 0
+          blame
+        rescue Errno::ENOENT => e
+          raise CommandFailed    
+        end
+         
         private
 
         # convert a date/time into the CVS-format
diff --git a/lib/redmine/scm/adapters/mercurial_adapter.rb b/lib/redmine/scm/adapters/mercurial_adapter.rb
index a631916c5..3cbf01f91 100644
--- a/lib/redmine/scm/adapters/mercurial_adapter.rb
+++ b/lib/redmine/scm/adapters/mercurial_adapter.rb
@@ -157,6 +157,25 @@ module Redmine
         rescue Errno::ENOENT => e
           raise CommandFailed
         end
+        
+        def annotate(path, identifier=nil)
+          path ||= ''
+          cmd = "#{HG_BIN} -R #{target('')}"
+          cmd << " annotate -n -u"
+          cmd << " -r #{identifier.to_i}" if identifier
+          cmd << " #{target(path)}"
+          blame = Annotate.new
+          shellout(cmd) do |io|
+            io.each_line do |line|
+              next unless line =~ %r{^([^:]+)\s(\d+):(.*)$}
+              blame.add_line($3.rstrip, Revision.new(:identifier => $2.to_i, :author => $1.strip))
+            end
+          end
+          return nil if $? && $?.exitstatus != 0
+          blame
+        rescue Errno::ENOENT => e
+          raise CommandFailed
+        end
       end
     end
   end
diff --git a/lib/redmine/scm/adapters/subversion_adapter.rb b/lib/redmine/scm/adapters/subversion_adapter.rb
index 9e8acce4c..d55b8712e 100644
--- a/lib/redmine/scm/adapters/subversion_adapter.rb
+++ b/lib/redmine/scm/adapters/subversion_adapter.rb
@@ -173,6 +173,23 @@ module Redmine
           raise CommandFailed    
         end
         
+        def annotate(path, identifier=nil)
+          identifier = (identifier and identifier.to_i > 0) ? identifier.to_i : "HEAD"
+          cmd = "#{SVN_BIN} blame #{target(path)}@#{identifier}"
+          cmd << credentials_string
+          blame = Annotate.new
+          shellout(cmd) do |io|
+            io.each_line do |line|
+              next unless line =~ %r{^\s*(\d+)\s*(\S+)\s(.*)$}
+              blame.add_line($3.rstrip, Revision.new(:identifier => $1.to_i, :author => $2.strip))
+            end
+          end
+          return nil if $? && $?.exitstatus != 0
+          blame
+        rescue Errno::ENOENT => e
+          raise CommandFailed
+        end
+        
         private
         
         def credentials_string
diff --git a/public/stylesheets/scm.css b/public/stylesheets/scm.css
index 3794db366..c3dc307d6 100644
--- a/public/stylesheets/scm.css
+++ b/public/stylesheets/scm.css
@@ -2,20 +2,52 @@
 table.filecontent { border: 1px solid #ccc;  border-collapse: collapse; width:98%; }
 table.filecontent th { border: 1px solid #ccc; background-color: #eee; }
 table.filecontent th.filename {	background-color: #ddc;	text-align: left; }
-div.action_M { background: #fd8 }
-div.action_D { background: #f88 }
-div.action_A { background: #bfb }
-
 table.filecontent tr.spacing { border: 1px solid #d7d7d7; }
-
-table.filecontent .line-num {
+table.filecontent th.line-num {
     border: 1px solid #d7d7d7;
 	font-size: 0.8em;
 	text-align: right;
-	width: 3em;
+	width: 2%;
 	padding-right: 3px;
 }
 
+/* 12 different colors for the annonate view */
+table.annotate tr.bloc-0 {background: #FFFFBF;}
+table.annotate tr.bloc-1 {background: #EABFFF;}
+table.annotate tr.bloc-2 {background: #BFFFFF;}
+table.annotate tr.bloc-3 {background: #FFD9BF;}
+table.annotate tr.bloc-4 {background: #E6FFBF;}
+table.annotate tr.bloc-5 {background: #BFCFFF;}
+table.annotate tr.bloc-6 {background: #FFBFEF;}
+table.annotate tr.bloc-7 {background: #FFE6BF;}
+table.annotate tr.bloc-8 {background: #FFE680;}
+table.annotate tr.bloc-9 {background: #AA80FF;}
+table.annotate tr.bloc-10 {background: #FFBFDC;}
+table.annotate tr.bloc-11 {background: #BFE4FF;}
+
+table.annotate td.revision {
+    text-align: center;
+    width: 2%;
+    padding-left: 1em;
+    background: inherit;
+}
+    
+table.annotate td.author {
+    text-align: center;
+    border-right: 1px solid #d7d7d7;
+    white-space: nowrap;
+    padding-left: 1em;
+    padding-right: 1em;
+    width: 3%;
+    background: inherit;
+}
+
+table.annotate td.line-code { background-color: #fafafa; }
+
+div.action_M { background: #fd8 }
+div.action_D { background: #f88 }
+div.action_A { background: #bfb }
+
 /************* Coderay styles *************/
 
 table.CodeRay {

From 7d8af70a6362517cab9aa2dc2054fa8dd8581ad8 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 2 Dec 2007 22:07:56 +0000
Subject: [PATCH 036/710] Changed the maximum length of LDAP account to 255
 characters. Added length validations on AuthSource model.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@948 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/models/auth_source.rb                           | 3 +++
 db/migrate/084_change_auth_sources_account_limit.rb | 9 +++++++++
 2 files changed, 12 insertions(+)
 create mode 100644 db/migrate/084_change_auth_sources_account_limit.rb

diff --git a/app/models/auth_source.rb b/app/models/auth_source.rb
index 47eec106d..2f651ade5 100644
--- a/app/models/auth_source.rb
+++ b/app/models/auth_source.rb
@@ -20,6 +20,9 @@ class AuthSource < ActiveRecord::Base
   
   validates_presence_of :name
   validates_uniqueness_of :name
+  validates_length_of :name, :host, :account_password, :maximum => 60
+  validates_length_of :account, :base_dn, :maximum => 255
+  validates_length_of :attr_login, :attr_firstname, :attr_lastname, :attr_mail, :maximum => 30
 
   def authenticate(login, password)
   end
diff --git a/db/migrate/084_change_auth_sources_account_limit.rb b/db/migrate/084_change_auth_sources_account_limit.rb
new file mode 100644
index 000000000..6a933b894
--- /dev/null
+++ b/db/migrate/084_change_auth_sources_account_limit.rb
@@ -0,0 +1,9 @@
+class ChangeAuthSourcesAccountLimit < ActiveRecord::Migration
+  def self.up
+    change_column :auth_sources, :account, :string
+  end
+
+  def self.down
+    change_column :auth_sources, :account, :string, :limit => 60
+  end
+end

From 92a23c05bb71e62426cec2298d90b39fadd0eb52 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Mon, 3 Dec 2007 10:28:08 +0000
Subject: [PATCH 037/710] Project name format limitation removed (name can now
 contain any character). Project identifier maximum length changed from 12 to
 20.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@949 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/projects_controller.rb              | 8 ++++++--
 app/helpers/queries_helper.rb                       | 2 +-
 app/models/project.rb                               | 3 +--
 app/views/admin/projects.rhtml                      | 2 +-
 app/views/issues/_list_simple.rhtml                 | 2 +-
 app/views/layouts/_project_selector.rhtml           | 4 ++--
 app/views/my/account.rhtml                          | 2 +-
 app/views/projects/_form.rhtml                      | 2 +-
 app/views/projects/destroy.rhtml                    | 2 +-
 app/views/projects/gantt.rhtml                      | 4 ++--
 app/views/projects/list.rhtml                       | 4 ++--
 app/views/projects/show.rhtml                       | 4 ++--
 lib/tasks/migrate_from_mantis.rake                  | 4 ++--
 public/themes/alternate/stylesheets/application.css | 1 +
 test/functional/projects_controller_test.rb         | 9 ++++++++-
 15 files changed, 32 insertions(+), 21 deletions(-)

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 37a788690..658e9d232 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -58,7 +58,9 @@ class ProjectsController < ApplicationController
   def add
     @custom_fields = IssueCustomField.find(:all, :order => "#{CustomField.table_name}.position")
     @trackers = Tracker.all
-    @root_projects = Project.find(:all, :conditions => "parent_id IS NULL AND status = #{Project::STATUS_ACTIVE}")
+    @root_projects = Project.find(:all,
+                                  :conditions => "parent_id IS NULL AND status = #{Project::STATUS_ACTIVE}",
+                                  :order => 'name')
     @project = Project.new(params[:project])
     @project.enabled_module_names = Redmine::AccessControl.available_project_modules
     if request.get?
@@ -90,7 +92,9 @@ class ProjectsController < ApplicationController
   end
 
   def settings
-    @root_projects = Project::find(:all, :conditions => ["parent_id IS NULL AND status = #{Project::STATUS_ACTIVE} AND id <> ?", @project.id])
+    @root_projects = Project.find(:all,
+                                  :conditions => ["parent_id IS NULL AND status = #{Project::STATUS_ACTIVE} AND id <> ?", @project.id],
+                                  :order => 'name')
     @custom_fields = IssueCustomField.find(:all)
     @issue_category ||= IssueCategory.new
     @member ||= @project.members.new
diff --git a/app/helpers/queries_helper.rb b/app/helpers/queries_helper.rb
index f92787278..3011d3aec 100644
--- a/app/helpers/queries_helper.rb
+++ b/app/helpers/queries_helper.rb
@@ -38,7 +38,7 @@ module QueriesHelper
       else
         case column.name
         when :subject
-        ((@project.nil? || @project != issue.project) ? "#{issue.project.name} - " : '') +
+        h((@project.nil? || @project != issue.project) ? "#{issue.project.name} - " : '') +
           link_to(h(value), :controller => 'issues', :action => 'show', :id => issue)
         when :done_ratio
           progress_bar(value, :width => '80px')
diff --git a/app/models/project.rb b/app/models/project.rb
index 03ada035c..5788732d7 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -57,10 +57,9 @@ class Project < ActiveRecord::Base
   validates_associated :custom_values, :on => :update
   validates_associated :repository, :wiki
   validates_length_of :name, :maximum => 30
-  validates_format_of :name, :with => /^[\w\s\'\-]*$/i
   validates_length_of :description, :maximum => 255
   validates_length_of :homepage, :maximum => 60
-  validates_length_of :identifier, :in => 3..12
+  validates_length_of :identifier, :in => 3..20
   validates_format_of :identifier, :with => /^[a-z0-9\-]*$/
   
   def identifier=(identifier)
diff --git a/app/views/admin/projects.rhtml b/app/views/admin/projects.rhtml
index d231be102..423d56ebe 100644
--- a/app/views/admin/projects.rhtml
+++ b/app/views/admin/projects.rhtml
@@ -26,7 +26,7 @@
   <tbody>
 <% for project in @projects %>
   <tr class="<%= cycle("odd", "even") %>">
-	<td><%= project.active? ? link_to(project.name, :controller => 'projects', :action => 'settings', :id => project) : h(project.name) %>
+	<td><%= project.active? ? link_to(h(project.name), :controller => 'projects', :action => 'settings', :id => project) : h(project.name) %>
 	<td><%= textilizable project.description, :project => project %>
 	<td align="center"><%= image_tag 'true.png' if project.is_public? %>
 	<td align="center"><%= project.children.size %>
diff --git a/app/views/issues/_list_simple.rhtml b/app/views/issues/_list_simple.rhtml
index 517055e3a..eb93f8ea1 100644
--- a/app/views/issues/_list_simple.rhtml
+++ b/app/views/issues/_list_simple.rhtml
@@ -11,7 +11,7 @@
 			<td class="id">
 				<%= link_to issue.id, :controller => 'issues', :action => 'show', :id => issue %>
 			</td>
-			<td><%= issue.project.name %> - <%= issue.tracker.name %><br />
+			<td><%=h issue.project.name %> - <%= issue.tracker.name %><br />
                 <%= issue.status.name %> - <%= format_time(issue.updated_on) %></td>
 			<td class="subject">
                 <%= link_to h(issue.subject), :controller => 'issues', :action => 'show', :id => issue %>
diff --git a/app/views/layouts/_project_selector.rhtml b/app/views/layouts/_project_selector.rhtml
index 499879c8c..ce2f15e03 100644
--- a/app/views/layouts/_project_selector.rhtml
+++ b/app/views/layouts/_project_selector.rhtml
@@ -3,10 +3,10 @@
 <option selected><%= l(:label_jump_to_a_project) %></option>
 <option disabled>---</option>
 <% user_projects_by_root.keys.sort.each do |root| %>
-    <%= content_tag('option', root.name, :value => url_for(:controller => 'projects', :action => 'show', :id => root)) %>
+    <%= content_tag('option', h(root.name), :value => url_for(:controller => 'projects', :action => 'show', :id => root)) %>
     <% user_projects_by_root[root].sort.each do |project| %>
         <% next if project == root %>
-        <%= content_tag('option', ('&#187; ' + project.name), :value => url_for(:controller => 'projects', :action => 'show', :id => project)) %>
+        <%= content_tag('option', ('&#187; ' + h(project.name)), :value => url_for(:controller => 'projects', :action => 'show', :id => project)) %>
     <% end %>
 <% end %>
 </select>
diff --git a/app/views/my/account.rhtml b/app/views/my/account.rhtml
index e64051771..2dda62d70 100644
--- a/app/views/my/account.rhtml
+++ b/app/views/my/account.rhtml
@@ -29,7 +29,7 @@
                                       :onchange => 'if ($("notification_option").value == "selected") {Element.show("notified-projects")} else {Element.hide("notified-projects")}' %>
 <% content_tag 'div', :id => 'notified-projects', :style => (@notification_option == 'selected' ? '' : 'display:none;') do %>
 <p><% User.current.projects.each do |project| %>
-    <label><%= check_box_tag 'notified_project_ids[]', project.id, @user.notified_projects_ids.include?(project.id) %> <%= project.name %></label><br />
+    <label><%= check_box_tag 'notified_project_ids[]', project.id, @user.notified_projects_ids.include?(project.id) %> <%=h project.name %></label><br />
 <% end %></p>
 <p><em><%= l(:text_user_mail_option) %></em></p>
 <% end %>
diff --git a/app/views/projects/_form.rhtml b/app/views/projects/_form.rhtml
index 885ccf4bd..e29777af4 100644
--- a/app/views/projects/_form.rhtml
+++ b/app/views/projects/_form.rhtml
@@ -9,7 +9,7 @@
 <% end %>
 
 <p><%= f.text_area :description, :required => true, :cols => 60, :rows => 5 %><em><%= l(:text_caracters_maximum, 255) %></em></p>
-<p><%= f.text_field :identifier, :required => true, :size => 15, :disabled => @project.identifier_frozen? %><br /><em><%= l(:text_length_between, 3, 12) %> <%= l(:text_project_identifier_info) unless @project.identifier_frozen? %></em></p>
+<p><%= f.text_field :identifier, :required => true, :disabled => @project.identifier_frozen? %><br /><em><%= l(:text_length_between, 3, 20) %> <%= l(:text_project_identifier_info) unless @project.identifier_frozen? %></em></p>
 <p><%= f.text_field :homepage, :size => 40 %></p>
 <p><%= f.check_box :is_public %></p>
 <%= wikitoolbar_for 'project_description' %>
diff --git a/app/views/projects/destroy.rhtml b/app/views/projects/destroy.rhtml
index 8ef23197d..4531cb845 100644
--- a/app/views/projects/destroy.rhtml
+++ b/app/views/projects/destroy.rhtml
@@ -1,7 +1,7 @@
 <h2><%=l(:label_confirmation)%></h2>
 <div class="box">
 <center>
-<p><strong><%= @project_to_destroy.name %></strong><br />
+<p><strong><%=h @project_to_destroy.name %></strong><br />
 <%=l(:text_project_destroy_confirmation)%></p>
 
 <p>
diff --git a/app/views/projects/gantt.rhtml b/app/views/projects/gantt.rhtml
index 21ef600a8..a66754842 100644
--- a/app/views/projects/gantt.rhtml
+++ b/app/views/projects/gantt.rhtml
@@ -72,8 +72,8 @@ top = headers_height + 8
 @events.each do |i| %>
     <div style="position: absolute;line-height:1.2em;height:16px;top:<%= top %>px;left:4px;overflow:hidden;"><small>    
     <% if i.is_a? Issue %>
-      	<%= link_to_issue i %><%= " (#{i.project.name})" unless @project && @project == i.project %>:
-      	<%=h i.subject %>
+      	<%= h("#{i.project.name} -") unless @project && @project == i.project %>
+      	<%= link_to_issue i %>:	<%=h i.subject %>
   	<% else %>
       	<%= link_to_version i, :class => "icon icon-package" %>
   	<% end %>  	
diff --git a/app/views/projects/list.rhtml b/app/views/projects/list.rhtml
index 51c1b544a..c6e5b4dec 100644
--- a/app/views/projects/list.rhtml
+++ b/app/views/projects/list.rhtml
@@ -1,13 +1,13 @@
 <h2><%=l(:label_project_plural)%></h2>
 
 <% @project_tree.keys.sort.each do |project| %>
-<h3><%= link_to project.name, {:action => 'show', :id => project}, :class => (User.current.member_of?(project) ? "icon icon-fav" : "") %></h3>
+<h3><%= link_to h(project.name), {:action => 'show', :id => project}, :class => (User.current.member_of?(project) ? "icon icon-fav" : "") %></h3>
 <%= textilizable(project.description, :project => project) %>
 
 <% if @project_tree[project].any? %>
     <p><%= l(:label_subproject_plural) %>:
     <%= @project_tree[project].sort.collect {|subproject| 
-       link_to(subproject.name, {:action => 'show', :id => subproject}, :class => (User.current.member_of?(subproject) ? "icon icon-fav" : ""))}.join(', ') %></p>
+       link_to(h(subproject.name), {:action => 'show', :id => subproject}, :class => (User.current.member_of?(subproject) ? "icon icon-fav" : ""))}.join(', ') %></p>
 <% end %>
 <% end %>
 
diff --git a/app/views/projects/show.rhtml b/app/views/projects/show.rhtml
index 458e7975e..bb01df1f4 100644
--- a/app/views/projects/show.rhtml
+++ b/app/views/projects/show.rhtml
@@ -5,10 +5,10 @@
 	<ul>
 	<% unless @project.homepage.blank? %><li><%=l(:field_homepage)%>: <%= auto_link @project.homepage %></li><% end %>
     <% if @subprojects.any? %>
- 	<li><%=l(:label_subproject_plural)%>: <%= @subprojects.collect{|p| link_to(p.name, :action => 'show', :id => p)}.join(", ") %></li>
+ 	<li><%=l(:label_subproject_plural)%>: <%= @subprojects.collect{|p| link_to(h(p.name), :action => 'show', :id => p)}.join(", ") %></li>
     <% end %>
 	<% if @project.parent %>
-	<li><%=l(:field_parent)%>: <%= link_to @project.parent.name, :controller => 'projects', :action => 'show', :id => @project.parent %></li>
+	<li><%=l(:field_parent)%>: <%= link_to h(@project.parent.name), :controller => 'projects', :action => 'show', :id => @project.parent %></li>
 	<% end %>
 	<% for custom_value in @custom_values %>
 	<% if !custom_value.value.empty? %>
diff --git a/lib/tasks/migrate_from_mantis.rake b/lib/tasks/migrate_from_mantis.rake
index 593d59d82..6d8d55e7c 100644
--- a/lib/tasks/migrate_from_mantis.rake
+++ b/lib/tasks/migrate_from_mantis.rake
@@ -115,7 +115,7 @@ task :migrate_from_mantis => :environment do
       has_many :members, :class_name => "MantisProjectUser", :foreign_key => :project_id
       
       def name
-        read_attribute(:name)[0..29].gsub(/[^\w\s\'\-]/, '-')
+        read_attribute(:name)[0..29]
       end
       
       def description
@@ -123,7 +123,7 @@ task :migrate_from_mantis => :environment do
       end
       
       def identifier
-        read_attribute(:name).underscore[0..11].gsub(/[^a-z0-9\-]/, '-')
+        read_attribute(:name).underscore[0..19].gsub(/[^a-z0-9\-]/, '-')
       end
     end
     
diff --git a/public/themes/alternate/stylesheets/application.css b/public/themes/alternate/stylesheets/application.css
index ced63a418..af787ae71 100644
--- a/public/themes/alternate/stylesheets/application.css
+++ b/public/themes/alternate/stylesheets/application.css
@@ -63,6 +63,7 @@ input[type="button"]:hover, input[type="submit"]:hover, input[type="reset"]:hove
 input[type="text"], textarea, select { padding: 2px; border: 1px solid #d7d7d7; }
 input[type="text"] { padding: 3px; }
 input[type="text"]:focus, textarea:focus, select:focus { border: 1px solid #888866; }
+option { border-bottom: 1px dotted #d7d7d7; }
 
 /* Misc */
 .box { background-color: #fcfcfc; }
diff --git a/test/functional/projects_controller_test.rb b/test/functional/projects_controller_test.rb
index a48fa26bc..d98e0d97b 100644
--- a/test/functional/projects_controller_test.rb
+++ b/test/functional/projects_controller_test.rb
@@ -103,9 +103,16 @@ class ProjectsControllerTest < Test::Unit::TestCase
                    }
                  }
                }
+               
+    get :activity, :id => 1, :year => 3.days.ago.to_date.year, :month => 3.days.ago.to_date.month
+    assert_response :success
+    assert_template 'activity'
+    assert_not_nil assigns(:events_by_day)
+               
     assert_tag :tag => "h3", 
                :content => /#{3.day.ago.to_date.day}/,
-               :sibling => { :tag => "ul",                 :child => { :tag => "li",
+               :sibling => { :tag => "ul",
+                 :child => { :tag => "li",
                    :child => { :tag => "p",
                      :content => /#{Issue.find(1).subject}/,
                    }

From 056e3703da194ade315004e7d91ce318eaf1e6b2 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Mon, 3 Dec 2007 17:40:43 +0000
Subject: [PATCH 038/710] Added Bazaar adapter. Fixed 'quick jump to a
 revision' form on the revisions list.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@950 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/helpers/repositories_helper.rb         |   4 +
 app/models/repository/bazaar.rb            |  86 +++++++++
 app/views/repositories/revisions.rhtml     |   6 +-
 lib/redmine.rb                             |   2 +-
 lib/redmine/scm/adapters/bazaar_adapter.rb | 204 +++++++++++++++++++++
 5 files changed, 298 insertions(+), 4 deletions(-)
 create mode 100644 app/models/repository/bazaar.rb
 create mode 100644 lib/redmine/scm/adapters/bazaar_adapter.rb

diff --git a/app/helpers/repositories_helper.rb b/app/helpers/repositories_helper.rb
index 333b30b1c..d2d04604d 100644
--- a/app/helpers/repositories_helper.rb
+++ b/app/helpers/repositories_helper.rb
@@ -80,4 +80,8 @@ module RepositoriesHelper
       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
+
+  def bazaar_field_tags(form, repository)
+      content_tag('p', form.text_field(:url, :label => 'Root directory', :size => 60, :required => true, :disabled => (repository && !repository.new_record?)))
+  end
 end
diff --git a/app/models/repository/bazaar.rb b/app/models/repository/bazaar.rb
new file mode 100644
index 000000000..6e387f957
--- /dev/null
+++ b/app/models/repository/bazaar.rb
@@ -0,0 +1,86 @@
+# 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/bazaar_adapter'
+
+class Repository::Bazaar < Repository
+  attr_protected :root_url
+  validates_presence_of :url
+
+  def scm_adapter
+    Redmine::Scm::Adapters::BazaarAdapter
+  end
+  
+  def self.scm_name
+    'Bazaar'
+  end
+  
+  def entries(path=nil, identifier=nil)
+    entries = scm.entries(path, identifier)
+    if entries
+      entries.each do |e|
+        next if e.lastrev.revision.blank?
+        c = Change.find(:first,
+                        :include => :changeset,
+                        :conditions => ["#{Change.table_name}.revision = ? and #{Changeset.table_name}.repository_id = ?", e.lastrev.revision, id],
+                        :order => "#{Changeset.table_name}.revision DESC")
+        if c
+          e.lastrev.identifier = c.changeset.revision
+          e.lastrev.name = c.changeset.revision
+          e.lastrev.author = c.changeset.committer
+        end
+      end
+    end
+  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,
+                                           :scmid => revision.scmid,
+                                           :comments => revision.message)
+              
+              revision.paths.each do |change|
+                Change.create(:changeset => changeset,
+                              :action => change[:action],
+                              :path => change[:path],
+                              :revision => change[:revision])
+              end
+            end
+          end unless revisions.nil?
+          identifier_from = identifier_to + 1
+        end
+      end
+    end
+  end
+end
diff --git a/app/views/repositories/revisions.rhtml b/app/views/repositories/revisions.rhtml
index 882d5ea4f..2a45fc2ef 100644
--- a/app/views/repositories/revisions.rhtml
+++ b/app/views/repositories/revisions.rhtml
@@ -1,7 +1,7 @@
 <div class="contextual">
-<% form_tag do %>
-<p><%= l(:label_revision) %>: <%= text_field_tag 'rev', @rev, :size => 5 %>
-<%= submit_tag 'OK' %></p>
+<% form_tag({:action => 'revision', :id => @project}) do %>
+<%= l(:label_revision) %>: <%= text_field_tag 'rev', @rev, :size => 5 %>
+<%= submit_tag 'OK' %>
 <% end %>
 </div>
 
diff --git a/lib/redmine.rb b/lib/redmine.rb
index b74f00aec..32239ce59 100644
--- a/lib/redmine.rb
+++ b/lib/redmine.rb
@@ -10,7 +10,7 @@ rescue LoadError
   # RMagick is not available
 end
 
-REDMINE_SUPPORTED_SCM = %w( Subversion Darcs Mercurial Cvs )
+REDMINE_SUPPORTED_SCM = %w( Subversion Darcs Mercurial Cvs Bazaar )
 
 # Permissions
 Redmine::AccessControl.map do |map|
diff --git a/lib/redmine/scm/adapters/bazaar_adapter.rb b/lib/redmine/scm/adapters/bazaar_adapter.rb
new file mode 100644
index 000000000..ec9fd741c
--- /dev/null
+++ b/lib/redmine/scm/adapters/bazaar_adapter.rb
@@ -0,0 +1,204 @@
+# 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/abstract_adapter'
+
+module Redmine
+  module Scm
+    module Adapters    
+      class BazaarAdapter < AbstractAdapter
+      
+        # Bazaar executable name
+        BZR_BIN = "bzr"
+        
+        # Get info about the repository
+        def info
+          cmd = "#{BZR_BIN} revno #{target('')}"
+          info = nil
+          shellout(cmd) do |io|
+            if io.read =~ %r{^(\d+)$}
+              info = Info.new({:root_url => url,
+                               :lastrev => Revision.new({
+                                 :identifier => $1
+                               })
+                             })
+            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)
+          path ||= ''
+          parts = path.split(%r{[\/\\]}).select {|p| !p.blank?}
+          if parts.size > 0
+            parent = parts[0..-2].join('/')
+            entries = entries(parent, identifier)
+            entries ? entries.detect {|e| e.name == parts.last} : nil
+          end
+        end
+        
+        # Returns an Entries collection
+        # or nil if the given path doesn't exist in the repository
+        def entries(path=nil, identifier=nil)
+          path ||= ''
+          entries = Entries.new
+          cmd = "#{BZR_BIN} ls -v --show-ids"
+          cmd << " -r#{identifier.to_i}" if identifier && identifier.to_i > 0
+          cmd << " #{target(path)}"
+          shellout(cmd) do |io|
+            prefix = "#{url}/#{path}".gsub('\\', '/')
+            logger.debug "PREFIX: #{prefix}"
+            re = %r{^V\s+#{Regexp.escape(prefix)}(\/?)([^\/]+)(\/?)\s+(\S+)$}
+            io.each_line do |line|
+              next unless line =~ re
+              entries << Entry.new({:name => $2.strip,
+                                    :path => ((path.empty? ? "" : "#{path}/") + $2.strip),
+                                    :kind => ($3.blank? ? 'file' : 'dir'),
+                                    :size => nil,
+                                    :lastrev => Revision.new(:revision => $4.strip)
+                                  })
+            end
+          end
+          return nil if $? && $?.exitstatus != 0
+          logger.debug("Found #{entries.size} entries in the repository for #{target(path)}") if logger && logger.debug?
+          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 = 'last:1' 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 = "#{BZR_BIN} log -v --show-ids -r#{identifier_to.to_i}..#{identifier_from} #{target(path)}"
+          shellout(cmd) do |io|
+            revision = nil
+            parsing = nil
+            io.each_line do |line|
+              if line =~ /^----/
+                revisions << revision if revision
+                revision = Revision.new(:paths => [], :message => '')
+                parsing = nil
+              else
+                next unless revision
+                
+                if line =~ /^revno: (\d+)$/
+                  revision.identifier = $1.to_i
+                elsif line =~ /^committer: (.+)$/
+                  revision.author = $1.strip
+                elsif line =~ /^revision-id:(.+)$/
+                  revision.scmid = $1.strip
+                elsif line =~ /^timestamp: (.+)$/
+                  revision.time = Time.parse($1).localtime
+                elsif line =~ /^(message|added|modified|removed|renamed):/
+                  parsing = $1
+                elsif line =~ /^  (.+)$/
+                  if parsing == 'message'
+                    revision.message << "#{$1}\n"
+                  else
+                    if $1 =~ /^(.*)\s+(\S+)$/
+                      path = $1.strip
+                      revid = $2
+                      case parsing
+                      when 'added'
+                        revision.paths << {:action => 'A', :path => "/#{path}", :revision => revid}
+                      when 'modified'
+                        revision.paths << {:action => 'M', :path => "/#{path}", :revision => revid}
+                      when 'removed'
+                        revision.paths << {:action => 'D', :path => "/#{path}", :revision => revid}
+                      when 'renamed'
+                        new_path = path.split('=>').last
+                        revision.paths << {:action => 'M', :path => "/#{new_path.strip}", :revision => revid} if new_path
+                      end
+                    end
+                  end
+                else
+                  parsing = nil
+                end
+              end
+            end
+            revisions << revision if revision
+          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
+            identifier_to = identifier_to.to_i 
+          else
+            identifier_to = identifier_from.to_i - 1
+          end
+          cmd = "#{BZR_BIN} diff -r#{identifier_to}..#{identifier_from} #{target(path)}"
+          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)
+          cmd = "#{BZR_BIN} cat"
+          cmd << " -r#{identifier.to_i}" if identifier && identifier.to_i > 0
+          cmd << " #{target(path)}"
+          cat = nil
+          shellout(cmd) do |io|
+            io.binmode
+            cat = io.read
+          end
+          return nil if $? && $?.exitstatus != 0
+          cat
+        rescue Errno::ENOENT => e
+          raise CommandFailed    
+        end
+        
+        def annotate(path, identifier=nil)
+          cmd = "#{BZR_BIN} annotate --all"
+          cmd << " -r#{identifier.to_i}" if identifier && identifier.to_i > 0
+          cmd << " #{target(path)}"
+          blame = Annotate.new
+          shellout(cmd) do |io|
+            author = nil
+            identifier = nil
+            io.each_line do |line|
+              next unless line =~ %r{^(\d+) ([^|]+)\| (.*)$}
+              blame.add_line($3.rstrip, Revision.new(:identifier => $1.to_i, :author => $2.strip))
+            end
+          end
+          return nil if $? && $?.exitstatus != 0
+          blame
+        rescue Errno::ENOENT => e
+          raise CommandFailed
+        end
+      end
+    end
+  end
+end

From 3b4cfe0ba8b4ea2ac36e0db36632afe3d042eb5a Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Mon, 3 Dec 2007 19:19:36 +0000
Subject: [PATCH 039/710] Added some unit tests for the Bazaar adapter.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@951 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 doc/RUNNING_TESTS                             |  13 +++
 .../repositories/bazaar_repository.tar.gz     | Bin 0 -> 9382 bytes
 .../repositories/subversion_repository.dump   | Bin 15812 -> 0 bytes
 .../subversion_repository.dump.gz             | Bin 0 -> 11015 bytes
 test/unit/repository_bazaar_test.rb           |  87 ++++++++++++++++++
 test/unit/repository_subversion_test.rb       |   2 +-
 6 files changed, 101 insertions(+), 1 deletion(-)
 create mode 100644 doc/RUNNING_TESTS
 create mode 100644 test/fixtures/repositories/bazaar_repository.tar.gz
 delete mode 100644 test/fixtures/repositories/subversion_repository.dump
 create mode 100644 test/fixtures/repositories/subversion_repository.dump.gz
 create mode 100644 test/unit/repository_bazaar_test.rb

diff --git a/doc/RUNNING_TESTS b/doc/RUNNING_TESTS
new file mode 100644
index 000000000..bd72ac71a
--- /dev/null
+++ b/doc/RUNNING_TESTS
@@ -0,0 +1,13 @@
+Creating test repositories
+===================
+
+mkdir tmp/test
+
+Subversion
+----------
+svnadmin create tmp/test/subversion_repository
+gunzip < test/fixtures/repositories/subversion_repository.dump.gz | svnadmin load tmp/test/subversion_repository
+
+Bazaar
+------
+gunzip < test/fixtures/repositories/bazaar_repository.tar.gz | tar -xv -C tmp/test
\ No newline at end of file
diff --git a/test/fixtures/repositories/bazaar_repository.tar.gz b/test/fixtures/repositories/bazaar_repository.tar.gz
new file mode 100644
index 0000000000000000000000000000000000000000..621c2f145e71c37be837b7bad3f0c9b28096a0ea
GIT binary patch
literal 9382
zcmV;XBw5=ZiwFn+LsUlq3u0k<VPSG#a%FIDb7^#Ma(OOvVR8WMT?t%_=^r0=&1%&W
zMavs)ipqPxGs#gTq0%98W!__InwqJZDM~_x<jA=wcjQ>2T?sj}`LmG@*Sh7F9BUCa
z{xgv?jj1tfdB2}(j?cXB^Zfcf-{*HczvmfJ5G4@E{AEn2R4!6TWszMtS_goF1VI2C
zKn3u<$5$^Pkbp4|g<t{#0OemC=Kz@YyYeBz<qCle0F;l6tftQe$fV(+y6BK@L4Kfr
zJ2Fb9-9ey%{y_vJl=??-6lC?U3w%WXq)Z^80<|;@G~qu2;Y$5uAi?rqC#YHfFCXkE
zsYF<ZHXsnhaa<Gr6EKK!08ndE)&N%jHRxX`m4yftb!|hf{!#cn{o@D<vHI5qoGSGX
zI92K!=u@e000*p;g8%^SAk3QkZ}*VJ=S0o?4;IK3wlXF{Bo|2~wQfT#|8eL&`%mB)
z%<^9sK!G56h)5CGQz(_%kph`541xp%g9t=mC=A;wP>>Yzf<;(V6iA^|06QIgT~Nb+
zDJ8CZ5TLpLkApDl|LX)b>t7)Vkk`Ep&HaCjz*+xKC#X^Xwz~5Fkq`ZUkk!8~@Y4Uc
zb$0<m7=-|!MKXp`4FenCrS1WUwfJ8%YUaPr?SB>jK^S4}zb^0*{ZoMqC6<OOw2}eV
zT>lt~Vyymk0d@LUrGA4&l%g(fpj!Knyl?*r6vSBjuM0R0^#ZDN3<Qhh3fAs_Q&7i$
zr9-GBh=Qq08*2CuV-WFv{ttoJ{GU$H;pG4Ts`Ly9g9WeW0EA1)C<L}w1>`WF526Uf
zm4t`*GZKYN#K`RdoC|R@%O7&M9FU`$T70~mo&CK$JbXAbNBNe7<EVl&J;+lQ+}GE+
zSE%FLaPHfs>T?>m$9Wypym|KaWiZIM715MbM$2eybT};+6PPVjeYaeDYu+swMr|WN
zMjC)AZ!Zg=W%9t6-I7waA!22h>=a`Zs#mXHynQtYVzvS#Fp@$-B%nMnn4ki}ZDEd(
zBV<S(L-A1|ABHG`MiBx<`9g{!1rUhwc@R#(6iA{J2PUAGayaz{m2!lHD&=qvct;Lb
zms;HM;}RnXX3I!XR0b+g8c_s73RJ3;_$@ssMGux&$^G(~TA?9j7x@An3GsO}Przqz
zj26Ho4I(Hh07-%-7={usd=v&59*01AFNN+!sFdgBt`gd#8lg43qsF7}9ihWRl+>vb
z`}GU8gHhE_h9q&2VGxD~(E^$jA}|K?XpEqQAcSEMg`hBm;Czgur0Ofl2dX3w3RDf-
z@M<L2@QxY}@Hdh(v`AqWDhYV~M6JY#vVSzqLkJi__&6ViF+M0nNQ5LIm<JOAh~NuR
z<-b^{v@9G*l`X0ixz9l7!J-hFR*78Q2-ozMnv?p!26gsd8yP^g{y+9X{7*n^{!b@(
zwf;X?Diez&0f3K;VXCSCP__!->xVl2Ya;_#i}gQ*t^d;vKB9jwXUE=d&RS|i-TV*1
z@7I5!7{Si}I)P81NDe4}1i+h>AWEu?@1((R7K7}#y`_LessN}!fh2$d1d>QVC<<nj
zS4sed>JD#x^xu|<g(mn2|Fyawq&D>*I9va(6R6jJ-6H@E>i??p{|L<1f9nLV{Qpn^
zB?jIo{q-UMU?pJ~S`NGn1o$u;2z+Hw&wr7G7Ez464t7BE`JX^p|6e!wbp3-u0gaKA
zkfLB17a}wS@=+KUKtdW}AWQ(;i9}<nZ$sVu55HCa4I!XvMF>RL`ahlE)%@=w6NCl=
zt`eFV13+AflxCDeLg=qr5SDj?xnd^Lp9yAE32S*bh#SmElz%^-90f7NmJ&<gD25*{
z6Qfd$p&5>V!>QqtYV)Za5aa7Be>ut!5g`BsLAk8`(Jr*ee_5^hk6|D1A7$%5bb?Re
zKlE?%pQBoQh5!U3SnhuYXp#T&+VUSD&=2?zv;5ZyK862ab^HfeI(`k%BL5Y&<v)hQ
zAMhVz^Zz<QE&PADlK%)-lVU1O4Zl98@=yR6;%ZnZqj^K_5RL#S25~hgPN_vJID`T?
zjC^Uc=BM)?VHhDPgkX|{AU@55D3HQIP(TTUAO%AxuP*Wbd-)%g{l{7U>jIx8{;#(F
zuV(+h+UmKt;(vk%z<l^iW6ysdTI7En;(zo5{-bRDw@&a`;(u-OU+D-Cpfddb;w<Oa
z0WI=hEAjtp`;V~v*9F-4|J#NZ`Cse!9|egI?LS-pp%c_P{;!P8KY8a)E!GOObNia(
z3U^hK0l~lFsqEAFPb%3-;uOq~5Jm7&g5pCYi82C40MZ1XChHLYzqS6STIW^m2u0ZV
zUnlr1@qe{Ru$uk<YD0!fo^k*T#Q}_6`~NJ^BLB6r{$Is^lwkR<3w)ONUz_~rD2E1*
zO#pl@Xp#R~iT|tk53~H&3E24m+lChTU;Fic0{Vde?D@~SL9OF|SQVht$~P4Z{eF~=
zz@V*Y^ynZAhonK_;iMc1P}CTuS8x6GE8}wn#JCzBj#9g9gLYb|UK9w&^_9OIcLXH>
zh|m9GCQl9ck0K~Y^7uT26w(mRClQ+Dkp#mK0wIJlb%_5V{B`~hBnYgM|Lpk>x`FQM
z|5Y_TJRVQUXV#Pda-c>2*E;^Mj{h*b|3@d#UHv~t8OcL@2tXh<llSF7i~QF{{9na?
z<s-{~U4V`Mzinud|FvKLhd$sx1hMOXIzipy|IfAl|0?vyVE$(g{Z$QBZZCws(d~um
z`Cs=F;A(OH0|>F_|L6qj^)DsmQdO4EUv)-It&RcF`1>DV2*glU|GI#B{j1b&D-nb+
zwf+hS_4R-6*Z(SKZFc{!PEc$AALXjs5URX8L?Ft^oB$941aOe6u7tGm3Rv~^p8$*_
zsw>njI=yZKQMN%;UZKWKRb2t`RjCMN8$8t&-=y8I!l&`SE~h`$%Kk&D@Bd@x|Id$4
z)xX-^->Q#&qzyImKY~N=pZ|p7IJ^HtCwTk(zc+{eiBt!`(%}?Ct4??Y?I4~t*9n3!
zF1Ot@y~^wAznFh`pTQ)+u+iS^K?M`8Wo&Ct44Zg6HrYzwWc;%|jn_<w%zT)7{@U%6
z_iqnN5AT;Tqv4qTp(l_+husB3hm@a8+_Jk>gARq0Zus~uKszRMxHb=KGIG?(2@9D?
zE+&8fob>EolRIO3n9Wyp5k=o^*vrl1ENIw`@Or*K0r9&Uw|PRmkHvDQpn91;i<gX<
zv&|x6;UYS-;$i08N$YoonLQbIc<g1<sWX1NH?2vBbJq`ScUx_Bs92G5RWv&!&!LCw
zwH70W-IBR%w7fIaio18cy_?Z@4tZOO26<m$V$$+L&aLwE6NZP)3CO(}X?nb0$&Ij;
zh0w_8#8h6CWe2??^JDqkp@L8YtH1$C%fIg>7H;XuOJN+t_O9IEyK0{s?EdT2)MXn^
z#|a;%?CrX*?A*zeXTL~^u)o2?j<PZCdg;5z^Cw$G7H9u0H{0h_F;UOu$48g5+awKX
z=XhBUO@zCR-9&%?kLkL<_`W5Xmof&AH8C?cDZL-ZU0ScAb-|{&j(!=<wqA(qZaC|p
zQCw1kuFfY;MTGU;&>9pSG`Kr<cUk$Byw>v-hQN8T=;*`N@rDhuzKiLffO%h!*gU;~
zEbtJOK3fd;?<@`&Z7}3<7P&vhZ2F+sr(>WS#(6#NHcvg@@Yb&8J12B}SR!2;9i?x7
z+VI3*FP4lt`J|WoZSN@0E?(IJy~16qV*hwn7{jj+cAIqT&yCL>nyvWXxZBb`<2kto
zIrWR{D^-ZA;_EjmEc59vZZ2q1F~_%fKx>=CEjwn3wiI~%aBa40a)I+)JUJeZw{W&?
zX)kIU(ra#V{Q8E@7Ue;!?Gmke->|$Wj`!tC+TUuwE&1x2zNVqr#T-x1?namFpXkRH
zxHWscbbq(dOB?cKJBB28xpH$-QAu>9#KPN(H-{|Dho+}oHCY<|o!Rv*U67kjzJ2vu
zCI0D?fi74*<%UmC!f3g}-LOcW`#sRK`=O3=ZHV8uJD(^!#9QPSFga}d+F^wUtviR$
zbJFwcwJ&2~`iPBXfyLV|!~p5jQq6eYZEe$XWu5zzG0=>DB`f113cn*`{&dVLDKIN#
z_?z|?#x>0YryRLNJYBQSELm^i`8ETVY<Q4gJf(OCGm^X1*1Y$)kd6CZ9FFuS&iuAp
zznxQx_~#xa-Q!OWR5%!|9Zb!58ui<s^Gf;KJ!dnf9a;_!fDZICw$9vKbkI6+<$)c?
z=J?MiJEgB(zuq;*jVn&>leT`9uesaQgQdOGjr`h=nSU`nR^0I9R7)eL<-55C4c*4=
z;5?3nIf?bxw>t)|^<Ey-(*iitGr1=Xm?YdW<d||ASaDiUh`A$Z_M(lR=^cYa`&60D
z4;RYN?4~U`rgh)d(QeX#=&94%1&rTVcGvIMhD{{Pvi#0>%ikECwJ2^`(%I<y8?!2Y
zPg<69rAcYW%Ljic9X5LG=#|&<ik*f!JTHp5m-X1Syv+3vVXClcYRJxAcN6a}Jo@-X
z(8GO}x7wl`LlhP^o%c(g7tAoY?7mAL9=-5Z(&Ctk)z20i`K>PVETuh0Hk;@)@!%=>
zi^Eu_B_0(N<~_ci@#CS<MU9lh4S{)Y54YU8=YsYFCX<hjHJ)=ht=MA*x9rrC7UR2n
zXZ>Vtd1S|kilUhjwoUs){E8TzKY4xJUL*Ok9X~rfc55Bskx}ZKf9(gWK~1d!`qfX6
ztvYoaKA1Ip%GtX??Wf{7qL9T~hr6U1jLvyFiU+PYw=cC_?zEw$;?U1zhI?5;S;5uO
zKV+XhCGb8NOPdwnd=kP<A=^6L-!^2*yu$I}X@eaW4BvF;uVeG9%k8E(7@Il0SV<q^
z7M*S^ZGXYxH^IUE@$%Sh<~RRYvB+}M<jeOuHytjJcs2U-jKh-a&7M7*Subh-)(d`H
ztqZm%wwE2VId!pp6Mg%>S359X@X<!#NYhCD)k#zRJC(aOo{VmI6jIUIVNb#~i|2k$
zddZzHp7m+mvvuq3m-C^5<u=}y+*{7828DN=80L7i<z@q9{E3q08;z4qW;am%H!<j)
z`FG9{Nhx4B>2VDA_m$b`KPGLCoeElJQ4(-F)H|-xS)U`t3$|pgymR{8a=!fqeh0f*
zzb4hI$eY$>&2{SoE~&*cjf%Yc@X8udWp|u_{G6#-X!bl0WX{1(IktZ<SuxbGFoJ87
zx@vC0#96z-eZzOH*ed>B-|qQb!DTP=Mnx0$gx<K6=}=+O<M37eRO>Y71@*q09=)xn
z6|}3}1J~ku{g1b{o<BP|Z)(3>w_i4T@67orW%|}+$7ThBEn!LLL-t;Hw0~`RBUxdd
z{iuFo<D$Q|j`P|1V(18JLcIqw4IS_)osL9JzMsnv?c3pc^Halwe@BQ96<qN*Z}%uA
zoxj2UxNqc6|LY4!Jq@ATm*+2SkRAJUS$;^1i=5PP;b$()IN4%w-`rkpv!49eXxFi`
zmN!RvWM3>ZP3q&H>2AE|z-{S@Uk+vcQ+!Y2?LTa9#>9)y%SFk}La;JHuyTgf)>-?S
z;#2)UwY&dn@Bcxn4c_m@|4RRlt^d;rH1Yos@SSPkNTE><(3Dd!K5Z1|)+DrVxqLon
zU5RLW=Nm3-MmN4t|L!mU3mlhq^uFXl*qNw3G{0rTgtmf*kYNd||JQ*{E%Tdm=Vv>o
z#Q)|o+;7gvUdD%wegCM>Ke2Xb@8;%KZAh0xk>0d@*R;b&!5t@ixIAcZ<+eriI#rKh
z9{x^0X6H$AKtt!pPq=xd@iYB1Y>kigaE$pO%XK(^a(#dQ`c7n?aFyR#<a&_%3LERA
zH^wgV`f)dz-$vZerJlu#y$LNA7p2QKd(LnjzUkt&uE4}qiJs1m+q2SJ9WLx^`n#2J
z=~zqWO$O$`mZ0T7*^0UsM|0&zuEvsfbJq>C0XtoqcjCdbD_P~;8toJZ_8%-8K=mx$
z<{cez`PX&VpK>{dO9cCKGenaalhs|#y2cg;r-dddlA89}lXezux5_7W*bINy7K#Ns
z^Kx5tc|J4d$!zkcZYeuQG&mlb{)_?XX_=ls2VR|DxT4khfu$3}#C!X7=@n`j=x)9?
zz-ol_(VPp9l1A)5vwM=|;pa#E@fW@5hn@{o{uYA1<8RHM)nB4CfboyJHzH>*X%04{
za<@iJTxy=<K%O?SnQoK2ri)vU^SR8f7u#J+c`~?pt5y!>Lo62@All@F&C1wdxIS!>
zUb^YV^{^*8BupNBX4cAE+=c}UJDfOncwj8rc5~4}7#+BZZ`^O1<%_`9<TO0_csG+y
z15D=(xP7sClkc+>&)vEYFE*{;ro_U#iD|?9O$XK(-d(`V+ZLC(*>{MqXE&?-g!RGB
zvobS*#dDMI_aPU@>FY(@$-Vhw`N<eV3u4hvheUUP0|uLnR`0ZzdG>G_b}ub1zC*)j
zD~}X8k92#{);HC$ZM{-S<G!2Z38L}A9@*)E0sn9BIiQ-#nhqkpsHg;Cg-25{kcEUI
zO#$iBiwMX<NFESLfg}{ANEMW-ASxn7L_iH-0Tn?66jqvxg)WM#L{Y?5*Psab-wXEr
z&gT|?_nhxAC+*!g@6OzrcW3V0H@SBi{dmcCGD{+DI*?$pi8!xhk@7Js>EOdWan7Oo
z^{Ff=zr|VD4Gjeom)ccWvWH)8QLT3_sFJ(C0_>R7Rec)K-GAR=Mm@6s{-A8tk2Yv_
zLy4rfsveKqziF<&Is94s|JCg8zi<CB+E~mN`QMs4+H?6I-v$1H{l~y*%b(g^Tf1iU
zh337R+Ln(Zw5-S8B2bd5yLY(+BlPn%(dmb}&N15_1rG?H1a))ShT9bjGW)I|BJwv&
zdnZZBrL8!RZm;mzcWg|$M0)4RigKH3SK<k$<v8Z0EnebB#{+M;j%QKQwj3Px&|*aO
z`nbLt$QAEAUG-3-NbPd#?$MtopF1R*)al!)ugMS%Lu`)GRLE0|I$srUnw*h1NvOZz
z-=Wi3Nye6L&fAxkZP0R>ku%apevwTUQVCel{p6&5=Gp!g_NdI~2?Sb}%=BpZt2gtU
zl{(7huOC7FZXzf7CWx`0@?^!NNM8hEr-H^qpOF(P_q%$LEy~!#1)S{j>5HG!Hu%*f
z7aFz>y63xHvMN;+>8RjDB~J1L*kjH#@j#;0(8Ycxunc3!2ro42HHHPI<m>Z;$;R_W
zVfBa|!M52ZyIOO$P3c*by_EExs2pyIQeigXU!yU1N_)ESPgVw|S_J;^rt$p9<+L)H
zq9+9NB7R;QgP(Nya^tSt$LiWIIhx&)>?i0}7k;qA(yFLN`j&<2(w_piS0_@FicN~U
ziN)#x7wmu6-NzR?>96J)Nn4u9Urx_<YB2KKu~}~=aT@8{Np+SVeH)#Uw{+s^_C;e0
zl*xtIx9}aJ^+hn1ecSF=^@WKOQ%fA5^47FANSIBn`1w`p;4j+d>7LQ~(aj3ALUDW>
zQR9ceN2%9z=q)Q(;|r2TLk(VrOesEyTon0eK7NM?|IjMLEytWwRjU_`<+vS?8JsW2
zd^uz(uh}NG*Z!fQl8KS*nlVACGsxq|qt|ph(6^GD&;s7Q%q<5^N@re=9F*-HXUkG6
z-Q4<+yMEM~GMrvbyO{f!kM5PBfmAJfnz80->R9-o=!_BeDs|m<jAFtQyVU3Aw$*L?
z?dNWv>3l$7^<VC=N^fmWh;)=2EA_kF-(ho0JM5wjYa)Ky(4r)18<t||eRfHlpQ%w!
zacid0DxBki{ZekbEHdNbL&sciuCtxlyJ$iyzN!)#);#L`;@Lp5+m-E<d58HF5qY5|
zt6C-I3&x6|I+jH2Q%b>TFp;)*fqsGAMgz{ukut&yPduKOpza-g{VH5kku;`Sq#KGI
z>HTHcE0-^qt;)9?RNw4b$s4eAk^F&xCBc%VMKZ#a*cEwGF{E`D6Mbz$WNR`OiSx>w
zjaaPHs(dqLG|<4t7#S8Ht`MfGe_*M+T6o^sSpAe9{p-T@f<GJaUyCzdzr;{iMXH}K
zWA`iG{AP;v;J(b!_Q69SC%}4VT**TMEzTldA~hR*Masax&AlQmS@q|0d3#2FblJzE
zvbUM>M!$&no}PanID1fv|38f|8X;>Sx?>`0*D3)D-YSc6d=u)Y82|lwePrG<<$D4I
z^Ybs2t)K*@;2%%DoifpQT~)=>oH8&Jmml&>zTlA@e<E>@Kyh}z<1c!<PB=cW@>|}w
z+p4rs`LU^fUvbT<D&kcuOxj6_bZINe%f@b{mPpQc5DvY^=H#z#%P&N9E@<cs!$;pG
z2?p;N3T{5&jXraK;hk&5dHum6Ps@s89@iR==f(2y+%zh4@YtE=93WGsJ6PwRaqwB?
z>ox7sN3(H1>7&8H9};@5520@S<SB<MN<VHcIP6x6$@Muhqf#hmAdm9Wo^<oA0(dV!
z?j<&eZ7f~tyL0cG!L41pcQicR+`BDo(Gv6cQMGib8=AD5AJ0sS)wNVPb>urW)Zgi!
zM|U4G-!yc_vo2z!K5;?Jrk8=1Gmo$HJ;%<7)#0qG)%x6A4o^=UyR~xHJ@p&p?>EBu
z)BgW!*<b&_|LbUCzR3U5)X|*F|NbuU7yQ2#=5u%Eyn%YqXyIDqPL6t836r4u_L%Jv
z>ok{gL({Zdnqx&{xR{gu;r+^|MRHy|))zS%no-}_p@Y4{tLIyKBG%sx<sCKPuHU&k
zYin+W{|knOXXW)<3M%4$GuH0yNhMy6R#hE9v+de;?FanWH&v^H^Y=aSJ%G=xY}ay(
z%~oTnkQK)71q{;g%Wq%YS-hs!t*hCNNGlWt!dK+BbZ0eBFWcRK2@q(g30rq@CcQYR
zMZ^NR&FU21b0vwHBwGuD2AU610yfh1V}f;j-iuzYy70JwZtm=Iqsn+Z4P0HxYIVAH
zOkjDo%DUkw&OBrr!2l(%CgX@c<z{w#x4aQ`s#_>~SNXFX`^7<}9w@rtV6Bjnl|^2P
zKy%ZzHZ5s;hj#a1od5Y2;8eqHv7)ydesikJBy~3S6`$XcR?<+odZ@xuhj;AcDT{~R
zfwacoVzvtH-?y>5|E55(y#iQh*^#rnP-P^Ul-<9eHBD=0GC6UhMKGfW?DSl)URN+n
zY4gF1iZU#9rILheEy{YHvUXYH=(RY$N8)ZCOo2Z8jrj@ug{bT}sy+J|I%+|>l5qBe
z%&c`1hf3mauJ*mU)+VN?IH5ZQ%-j_3bJUJ+!}<<Ij)lUxN8`&bR21FgR{~aDExsPR
z(WodibkalQ<(?XgJGIG|OE^>e4zJU!mXnC*&I@X2d@&%T#6tsv-s;QH_=Yc*H-X_=
z-p|;3Y@L95_zy!dwk_h0v^N6|<&Uk0!$%{i!vTIurOa5W&XzmtP=Tj6I<&or^n4cS
zOgdgSaOC#YXZlakjMd~siC9*ZT405#{5c0#_b}UP)Do)nRaCluH>s@#O>;$Q=N~zm
zQ12CRO1wZ;BBu&zGO}pCR9#b@pOFyH<u1=!P-u#FZ*s%gu(&IHuPP_pC3BOm3M8hC
zGolkT#bn7rNr`s?b;R!R7c0*vXO}pdt`)pNKXMJ377Z@&JC}I=IAW)&?n3h>*UawG
zhlh`5<jN)y_eQ>aCEOlnigf1p%cxMSKjMMi{%XKDT*|N0*XY+q&xiMh8zmz%why9t
z*I$Xr#DrE~liD%Bsc4Eu{1DIkyb~TAVst<ApUgeiC{603Ns#|6W1GyZ+>02u&CFU8
z$ZuPs4cvX?W`tiqfU~@?>G??3_JVQ6bZ2SI>-}$BYR|3_6%oKUt7xS<H>Mu8){Nfw
zns2cATvmKjjHyJBvF8z4Lh_2k;{1F_{xa=0cb{%lV0ZGCz0ViXm$hJbHutS}?>)9c
zQT9g2GwsBX>49h4oSD7@isy4=<oFv3Bp<lsI~<c<c)LGk?Tzw58BTP-CR@zQ@b$U+
zFAhC;035knPAV1etEDvR^$hqFnK9=DA<Htw%djuD{K8wa$N7x6Lv4pjYTncX>e^}a
zk>BjC-<DqIomz=f)XKONv);ui;<$(8`RZ6y`sv?P%a*0-t#ubNpV-*m`bcN#=(BrS
zt_7Qw6vFbj6B_DkzP#6(;W=n{Lc>c!w8iI2P3^eK;l|X(dk~UGckj8;OD2@xuD-51
z%6b&FEm!|&{}m(j>9E&twOh_%Gi&lRTxlz;l@BZ#9Fd+}d@zH-JZzd`y2qS|KOe_$
zB+a|=>d^`Z>DU^HvL{YCfnB?_M{Y-9cRWN|w%qJSrjsbIpB=2zeZZ@Xw~?h;C@Z6f
zH16-0ZG9~YS~T`~D9RL`DwaN3Bg}^s-o!l8?T{XSQ+jV9;eqTSuh{LK7FMCMEYaw(
z0C(+b-=+I}OZP?|%GdC*Fzb{WPYK=K71T6ic<#wv^SlDzw(;oO$norZ2`c(|Q`Oru
z5z!hNLQO%#{5qS7)Vo5N=|ZJzE>zwekKX$udP+{a{S5yT5z$u#a;j^2{G{aGyyp4p
zIO6O6KO~4m#S#8V0?6OU|G;X_<^O#b_@n+mEbIOacK)1&zoLJPjt2LMfDUF(|K9`t
zoBjz@yxMGr|39PgwdX(BkLy3HYhtjo`QLNTf4&Ql=wiYSAv8$)pq`MJu$Zt7k<R$I
zxib!6&_EC^ChSVb`M<+}_W~u+0Z#{G7fUZOVf!EkkxHS%=hW2vXjHNqjY?$zTvP`d
z6iGnA1tWkC&_EK7K@0@}1{GigfB+YZ>c{=<OT$s{0cf}eqCbU7gW`@)u76*|<%)|G
zNTd)9jh!rjk1T^w$U=mehHAt?6ln}1K7<5m7Dm<MUaI<WmugjjzLiWOQUc-HLRA4Z
zwNQ}e3&~)%LQ^6=h=kh;kRh^=6lUWhsF7US5GEb^{W*&t3qLX$LJ6c$!ziDky)XKJ
z6ado>07*f!Sk3{|Fo1hV2I;WGVVqzXCpd%%z7wiFg|roF$}Ec@jYg%>0UU(@gyCou
zBE^4}IE6}4gBlwGu@wr63BPL>m9mln%of89gET=8@qI59;yb?S5EE)d0{s(~AXJb>
z!I1!}?-mFbfX>cR2_cbY(cEZ62D~vifTQDyM8M9~23V!80?<K76*#DJz!zkMf#AEQ
z15jB2NP~0_Ujb0SFi08P#?k;tt#E^BU?>q5DXixA{5yjnpuiQ+`?K^Q5U&6St^fgK
z;D{ucEf@<&qElz@Ry>XYX`6v#g#7LN_5Wq~iv9nv^~yh?@iqIe{>l1Z>N@J&{a@$y
z|NA}wb&oF`z-&*3tumepb$bfqolS*1F4Vhc5BwpkLix}OVUrGtkwU=H2mm#N5fsAs
zqsxFO0p?aVW_HH5W}kbFZ_wxeq7nalCKX2p-#NH<oV@4J1riqQ<Nz22cAK#Ds3gLB
z=lN&MyeUY>(}-ND%*xEl51>##ikL`;4#`9cjsX%>xdcc!I^(nR&@D_r!<X7o8K55E
zf(wLnh@){mF62MC{rXEi0bv1<B17m<E1^oEO7K)N8E!fiHq5>dJ$N^8NcDd(tfV=6
z`ab~w&HlgN5bK}P_}cuxCfELJX{p1@zG8IX1!1%_=hlDvF0j+V4l=dU@PDAhtSn8P
zpznq7TaXv}T&1?a8Tvvq%r-IB(?G8I1YC$@5JAV0(SSCv1xE=*bN{XfU^MhJFnU@T
z0HqG;d#R9hBXp$z!^+l7pqEELR6{fE_#rQ-NGQnC9kLw4&)_$Y$qCK<P~m)kV_Rbc
z;$()%TO1z(!HaOPaWN}NaH=oKZfR-hDhceWkLc>^>OpAqB;b2`dWI7a!+F-j^?}2~
z!z`zTEV>Dc>BQ=ZV6j*eOp^(w^~A&k+arOU7r|~}vb(a`U3u&-Cc7t<-ILAk$z%7F
zuqT*oHk(tD%Be?iTA<fLPLDiiScNk@%wd^uSk@et2ZuGmVKX`GY7V=F!|vj+dpK;U
zgw5e}aX393&M=2F!QnuMb1(<r8W0Gc925@vL@=D}od0cZ{$)TovjvnPJF(Tu)Yv6_
z06&?*FBK$Wsj@3rLFDK1z?A0-LY8C8l2898KVRwP?^>>XVk7g6F77y$DL>>O6y>D_
z;uO!RNxacJX5C~ite_z5!?T_jtEL=nENg6B7L#z`Bm#*N$S4$a5lJ!7!7ffJoHtY=
znrdSpyvok)(o^K-c?dCP^?ET^DGF>et<3C9D@=Ui{w0(BP2oTIe=1(>!-^Z<gvQs`
zfBCroiw5LD01Yiot-1K`y8u_yV#2mKC~67%Gz{eWdvJDg=9B5I52M3B26)`608=X`
zG#dSRfcMAX?9T*Te<x^ifkPPR1wz4HD2@b0uW;~#=Z;;t5f1pV1zds*IQ+p82=G~G
gwEJ(XV-DtE4(4DE=3oxy;Qt-|4<oUrtN_RW0ML}rmH+?%

literal 0
HcmV?d00001

diff --git a/test/fixtures/repositories/subversion_repository.dump b/test/fixtures/repositories/subversion_repository.dump
deleted file mode 100644
index 322f0c102387af341c5e98f19bf6bd675ea9fbfd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 15812
zcmeHuc|4Tu_y0Y{GBX$>vZQoJge<ceGm`A2ZIooIX3X5fFw8WI2sO5n7ScvhR4P#^
zODbijMNHXRRH#rrg*NSeH}!lz_33#&%k%p#zdwHd825cG=bY=DbDeWt_v?L@`7E~J
zh%DHWaDfGfFAQgjEg~VIh|7<#1&J8U^5yegY(Z->nMAX(AzB1+Y*-c)Ycks+h{B>+
zSQDub8P5tLQP}X<rBEbye4<5!Bs>Tb+JbltUC0+$u=o*TC_-$(gCc^(Auu%x#`)JK
z%mR>#5k*GWvYBEC;{y_HFho4w#sW{XAmF_T6k9UI7EiV$TaySxYkv%V=@R-f3)jUi
zf54aU$9xF{;xCNH+hEQ%6P$VcV3;w%8Z$qFE9NqJAU9mV7m6+60R;TS2&P0F!WWK9
zhY1z@ONp(?wj`=0nM%gv@jpqtn9qhR1k7<|h$KPZ^}SjQiNu(Rt}t!{+ZJSVh2LJ8
zEb)Xrm~8f+tPKC_!tj_Mb@Z!oh<`%re?dvsL`x!`^zSRl%2FWYheE8Mw8i1_pnqRo
z-cXeI7sn(LXqcZm!r9igAce)Gk*Pr>GCl}TWU{Ow$ePTekZo8j8imZJv42rLkx2Vd
z_jdE5!g=6#BhNJ;SmF&pD1yajb0dQ18Z7sAv!EKxvscB~eP5IdBw`7<f^n0>t!TRl
zW;kU34{l;-HPJfW&EkiL!@JAg&g%E4@z(FOL=zOOetHX%aCz)y0*Ljk@8{PDrdT3`
zzEAu6i{0-eeijb%P2qp&$yOXbj}3kI;Qt1P{_{QbowHT25Q4;z&{7!m<F5J-{Dh4E
z*&TilU_>}J{pu$i3S`5iQSjC_Bz6#iLm}FbAu^SPXOf9Q)<it>S3jZHjK>}VX(F^h
ze4d3!91T0M4@kkls^>;RKkQ&b&^rVI-M=jfWbv3H5oY4|_cja&vLO!0{T8~o>mZYH
z7cqsKLC|6R5u6K-|FdK<1za(c2akaJpa?bw{61C0<VoPrJ3c`m5sN?r4~WO(gN88^
z)8l3sd>{X9jv?qQgy2vOGQkLFEyxd=*pR_6m+wMa!p$ZIYxzPR+W-~=V+byhh+)FN
z(_Jy%0}~Cl{Lc8_@FpvGAN;TT)!$^W5=w%i;iSR04CZqFqK{esL&*8v$Eemels|B?
zAP$v64q{moZKxbJnM39<S!@o8MzJ9U1yR@}n_rxaN+DVQ;AP?5aL7U&Ettr#WDHXv
z;Bi^7ukj<S_$)CbhFuW0YWNS1=RV(!N@FfStOZ5^U=02n9ew}q?by)E(V>?^LqlWz
zPrg3x8-4O*?7@T4hYw%%_Kw}X{r2ANhYuf)c6N?+v=6tpy=iM5ZEYEAZXRm6F><|W
zw5f5dp>C|U>ScZXP<?fCbMyPEOK&SnM=C2{RGu3<S2l3z(rDS);j*%-s;Ysqvf+}`
zW2XuSONxe0of<fGYV7FIho?>s6z0Fo&mYXsAIoa)Kaz7l|H$dnr^m9ghH`THbFzDK
zvIq9<8QZb#;l4dXyLb2R-gSTXuF-8<nzORHcI_PAvZa69)`w}^`nPVX*|n=PZQEEv
z^83WZhp7pz+fs*<lCrY0MmMaxnYyVzF>x#==0RfO{iJn6aqIeHV>{wEjEO||W1>by
zq9@UjU9s!Z($Zc^gtEAp0g>>bL{JqQJH!hg<8WF<yv{Xi`gx&)q3ru%oQI*I?cvaG
zY)BR!)D;@KVZ(;nh={?U)eqRrPBycd!+FT`Kf&WY2=sg4zwF5hdb^)rC4<qkbiq~M
z#qG<MR{O1J@}7Txfmgo2f48S|%Yp?Q4yVK2<)QPOOP-#0oNQ$db1%EN)H^xdo<n*<
zw!1oaZaa;(+ui*kfpD8ZxMyW{*4DO}M7l`9-!n5?vSdlQ_3RTiHuq=gcbd+SnVObb
zS#`}ce=uW4^DM&>3xfxs-r%%pod&uWO^w??@T{q63#i>SRi|v`^cFq68`E%AAXqzH
zXWqPd^?G_+%*=`mbenb5l1xn-b#TXK=(cF6l}yoU(A4b0DPGc=)T63;blRjI3{a0#
zs#I6sI&Dg>HjYFhUB;qIaJUvU(5V2NR8wn213dsxucUMYhdZhUTtul?Dk-hg)!mQ7
zRHA@=I9wSDbqb9xM**cuYI|_#W&qf&rnVi2D?$PJXmqWd+#W1&R0+5Y0Q*s>I2<lp
z2`C4EL@ahE3bhM`I0XP((ZE&|>L>uL!D5q8s6;f71pu)q)b#1oMJUu(crg450Ac{(
z0DzjB8u0Vqj1Te(ng9VXA8#Jt698%qV4<dZ6zA3?qBP6`uN3FiZNeFPW_z4D)UZW|
z6xw~|%;Baq&^dML{If@{?lf6;BJk?j{Of!1tZUixOOD>yPZd4uzFKmu^`Ju{W}0W|
z@tcP|cABlcR$9<@jDFZN$FuB2N1<;?=>2PDg<Yo^b*a-9lo#D8328gA@_M;N1Ax-B
z%VhM{Zc;N`Jh&*YR$=?JIT6hvH$myWIv)j(bT5|$*>e(bE2k_sTRuCWS&ATaS+274
zUMBz@7Wx+e3fgv26;hx&L61JwnIlGfKk?ana=x=oOG)q|2bI10Sj`$GlNif_XAPC=
zlNC@xZ^Ua~oFRQbWjDq+{9gH*_S(_0Q!A|K@_mCMOa<VIvkbqRJ|n>G;QAw2d11(W
z=iszlw;h#z+txnP49O)w;w?*?dp0EfK_U?i$W0llQF=&t_2t!qxFd9jYE|x$HH!LM
zbqo*0n`}?S+IHWr>xsrS9?t;u9@lK8_60_%Y}DaY^b%uG4uDGV8>T1a;pD+ZsS2mw
zV{L|dkedObkKa-xgg?BU)@MT6M!XhM@@V_38Ham`my%#}S?bg+A}z2qy^&#hDy3!4
zz?H-_b)R=1b^x@BTP=IqG(X<RWBQwLHom!2Yz&Z^ofeU<l34|0LG9BU8IgUPmslv1
z8ywM#DwrqqimROx4>~TY-ejA2VobD+)|En1J+%2*NPn!i9Y(6SYoR}vxSO-DAa!m3
zW;NWRnzOAXGW+L>h4$!Tq}7Z16Wfcr+Sfhbdp>pZj5yBwXZ!T`__Iv&f1_wTpmk?E
zV`*>X4YHR`-DSI^^wYuxFBW5(5n*%g^TM_l^=q27*f0{fGqPSun3jON-Halet5G`(
z$oJ2PT4*oRccz&u*tNTyFgaF4yp~kqCAXl(>G@C<)i2khTtPc_TT%DjkE#_-RFx4T
z9ROz{)>t?I>gNJ0pJv?46}8NHeB}{#?#-0pbiL1!FW#1X#PvCN8oA6N-LQ@;_Oz2P
z+$lQO9eHthZ;$Z>R;(4kh+kz{F(z}y8am7{&DV)3(X-JHc(M3Oto>s^HA#HK6}@ZO
zOGU!xXKgN?oWtQeF<0x`7PZ(7**$;yAkuF%`R;E)2syg9SF#o(Hr{RO!pt+NZJVl`
z-*!B%&}eia4}UuANFJ;k>YpWf`C%bZOu29`qAhj!X=&$2(xKI<1vh4)vSmus9=EM&
z(vQ)UQ_??L^xV?ATR`GpnbGCAV+6HE_IAXGHfFcbesCdGagfrsd%F+%@a|S@vWapY
z0tjIwfyOB)7rO-Yj7%3p74<EW<XNj;2{&~-W>#(PQJWFCMay{Ktdg;sB-E{C?$qNe
zE+AV%r(oW6zMG_wptLneGozy3cq|l|YH-47^8QTu*_H9zqjC@H4+(b6eY_?uX0Uht
z&Ax+<Q)Sj#p4XEtX$f!6x;i8GVdHOKbjv%+EVSHwSVN9pOZ4_iwcV4jz2M4W$lnVS
zP?~6`eAaz(VM^NUefTYyJK6@Hx}5N*W=cnNdQ?P_c+#Pfj51GOy#_CNgq@RKen_&J
zK%^VcQ>#@jQ^3>FTO(Co?S5a;q*sixu$VHFQ%2rAHZ?k9&~<4BRMe~6meLr};i-+m
zA!2<CJOe_G>NEg~<SZ|h&~oS0GnGpAkJrfi+h5<KQ1iq_a>rxUzQ^(p-Wwt22fHzY
z&WcOqkicEW_F&Hv9a;4(`#i#!YKTso&#C64l-778|0Ob8z9z8LvmAGgP>(R`ad7%P
z09Y~%mM8h{rr89=%jOGn+QW_+EomxAoMx_t@s*l3BW|pJ*Oqz5xo1!LOsphiXL`Hr
z?hFy_X2^|4V8Pwhjwpoklaaz>tHn}kUjF%j_2Jp_(I*C`FgCBFK04gaI)*=YfwVKC
zFvQ~c%y-R>omuNT3ZES>m^)n489=ViMNRe?iKM0HJ4wL3q|nmzyQhr@JHj#<#~mti
zJ=WhqYOoBiJR!QHN);T`Mg$w#@wB-)Yu=u{7wT^0@4V45r-Q-CDF{*9csS}Ya{6&P
z5U63WI1beb22%4J_X)g{#$1#|uS1-IXgwRNCLyCYg!7y-MvJP~MJOFGZCai~u)THZ
z#n~6;x679TfV^*QN!}N8zjN1D?z6n2arn;DmCBO>j(U2}NRovGvcSccUpiMP^g0Ms
zmr_Db(r2_JG`yaIyCAGTJhhi$DayHMu>(U2z8~VQCl5#`OCvAdxvy2ExX0olK-5nK
zt3#R3+g_U;x%|k&19Pxp#rr8Pm$xhoDV?+h_vGX`Px)czxv_27C)*>c{jA+>RCv|d
zWp$HJsyhT5+2Jvt8f&Gc?qL3H>^v1l9WoDL`L=gsm$7`k(xNLVqcvS6y6o#8El}at
zY4_qjcZw`inznMgRj*R^j#V3UoY{VVPftV?W09Pcmz>r-VA!gY{@Cl)+-Enp)4Y>b
z*L&OvKhJogcI^H2m@<nj)uqy^v%cW&jh#!>`^@`qE<_x!Xxedo$H_=k#d$wf)7A@w
zft%0*%w>$+J=?Yc{}@Ht0*;<8_KWvxH~H(&?+f>8PojmasR0|-?{QPEb&a!Y#dzvV
z3hu>jL(DnXQE*_D-75!RH8)o`|E0>w@NJKc?imKG>ai~M=a@aD+`VZxH>KF<i)-@M
z^A!PGeKI%QwQ60?(0SJ*+IB4N*|mP18u4~_BP|Ab2AYA`m9l9^!;Nx#r2kb*1M!>#
zxi2pUeYk`}l<zT&!(F&FTJA8m@{HrIwcOB4Oj)Qs5pk8u=;zG2m$N2W-b4$5_H{sN
z57!mdO?#R8i6&c`Epg17nrJap*QTOQgFiFjcCN^IhCFX`1?_b2)2(K?TKcPlan7Mj
z9~IpQagVCuP^+VK9?1bA0NNWs>fClv5Hj?V8&-ze&+<#1!f#TsJpd(?cGjuJm8P80
z@0h<gdqmE(C`@&A)V}B%*HGiu9d&c@q4%cNB!*rj*yo<pf5SjIOXW0^(l-ilmug+B
ztZ(gH^-K%*U{BUYEy9DiS5eMW{OeYEgl`x#U-F#acJQ72sjlqqu7}hYi3aN|9RR6@
z)KR$viPX8pP$WGL8gx7Ne(X2Ws!;x*cjfNsSDMg{`SqXHk5nI9Ta~Q#K}X;<irn0N
z=4N?9M7`lO?Z(*4BVHLZ8S*;Vk#uD}5U^n=g)kJ)X(&BGDxJcI^$x7v;2v{_s61H^
zqqKu}O-qt`%=fJ}(#IXAkjqEMqi-5`-Dr$iZU8`Z)vKUt*0JdQ?qZ@QBceZaq!=^B
z0eInMzgA#BkZ7ONqZ?zq{?RdZ??w#2L2TCOZP67o!!2QCH0o_6bTcSOfv}?WmT%yr
z<e~&15vOvVq4EfjBF=HXHc$XJX@s%ghEmKV2Y?HrT?eOYXzEU8qcR-Ul)Ve??>BH6
zK<61GBjbbKEAdy1rK~WDN<ez8nvsdi*vn0Ex0p;v7xiGy(-TL)NcOQLNIT;Ca_n0M
zS``Gu#b`}$$E{LFT{3zn4&C7paebC6qHFC72Xt@p`sc2jnS&`$l{U;Y-mr>;Gk<S>
z#YQ6QGY{TKF&;+c$j}FFt2~NN9BT-M+(TP>bT{Mz^2JJ*q^PqVTXxc2T)i=e@#qHW
z7VTqOPOn8xIhwLd+v55je&Ze-s1u9Yksy<kD6QFW(;&UQPcE5`+Kt0>WiHlk+;;eA
z659d5NKsV+v`gvsT}*dLDY_h=QgL((LTR@1fRfgX0OW@iAJaE)8#VuA%&A)|X+DlK
z)Y^tQvz0N1O!VoKi<2oO7N@I5Clb1Xzb;pMfRhL4hzzO9y!!1^{oD(3G12wz7w{2J
z%E9FK>ymxcKWbQf+Ka2LQ2U5mLH!_x-mOqH#eIIYdj#_SNKaNmYz!En8Rser)0Hq+
z)6WC5Y^ag$!RRRfFkOJTIJ|3JJ?2P~-ti<)A6?OiiR)7bF^?6ZQG>uVcypuER{ADS
zUjY&5z|wcC0*=zQby_Q4MWmKysCoGcu9_K06(E^nlqq^0IyGoCU73i5uViLY<z(9K
zJ&ww?^Od(;^=wH}{<=0S&NSm)G4?6A#<>goR8f7AAZztuwc_fGcWZO3bdg{tZT};&
z<=Ex~M&g1@fgM&B(CVaemnQrq%OPtZT%-!V;Qo2sZH08xCxZQ<N7=g^<ido=ptJ7z
z-q}S*bl=IVobyOYduq^f9^0cd+a9Oh_rZG2^1LQ0PGLBQndy5bIj0~29RWz*N_a-}
zJvW^oTUvU<sGYnFaCVYk3Mhv6?A$FwpGiM>Lz?Pgqq2kngdLI}CS(^TDL3>iM42sW
zKe9wtts?8mRDEXfv>4li7i&<WXf+6z-DVN8eSz;Y6lC%N7-ikELntrG4G)qYU4D`b
zpvsU-=?A0nsLe8TUNI&{H}xGJ%cmovd=!-vkD#V3O7dJJOJ9;)yTr0%@1n5~wVvVJ
zn+4d;V!35r0LN3krFPF45uh=YoI${#7%7;tU*v!63|;k(P<b6LDJ%gH4y!izEKI_v
zeDE%`%s(EM<j^+k?sYf&>2P6-Zrov(%7FV6h!lO`FyN1O#DFsdwhG~((!2spMGq#C
zp|Jkh>?Jt0x0;JePpEuOD(sM1WP1DbRTui2W_W)rTs9>uF-Y|p1A`?_ZOPc$Zh(lC
zqAm%LZW@T$JxJ1B#qeSUS~24OI}^EK!L?&+?<W-Et!Lvl`am7I?~6|@!(f+vJoQYf
zdK8y@#LMorpnz}|kpiNxSBFP!1eA*b8Pn3~ETAR>@VVIDO(eot{z~<7qdeb~Vd<IQ
zFhwsIs$Ejmj$%Pr?~0)Yde)w-A}6`rYV<`JMhj0sZ6T}D5qb`CmJV{!bnzoMw}X?J
z#t?R$S;lYAvV#M#9a2@7=cuYEt@EP?<Z2Rz=ab9?dJi4sEyK!umF2{1ku(|7t{9VX
zJ}LH`5tLk#U6ZX9Q=WFB+(l0%ahS~=Srdq(@zHKpbWfQSqY_*;DHpN+lbjW<qCk62
z2>dNlIY!%ql@j1{I3L^Jcq$E3q@$eIF|2Z7wo;g5y6N2mW4DkVp#}>;Knsxb54bRw
zE`P>(4(`3eW?<pzt_#|3ZhgakZ}A@Uwv^x7k3FxaQZq(Z<c;K<c<MpNEow|xxz~e^
zW?ndPOks6#+!`?c@oUV@g53);qoqxhZrAeV;_~e=XO@MkUH~rp%CwA%^S5fLR~nrq
z)*$wospA?H7V4?{RxfEds~TR7Jd+p4#aBfZZyHQQp?yMQv}4@QvELVO;Xd(v+f!2Z
zyd?M{wzFFKLay@CV)cbFX2&wpylWEPr6$<%%&gvpImeo@{kE!mc@1@}*Y;BEqN^sA
zs2+DvSdFjh7bV4}pf=(##=KhBjkPw%xA4kp!}?3Qx0GvL#I^|P&ZHx!^eS>w6SDl}
zSW%Ow0?O)@u9lo8(NmlPU2e!Npq@_KA<DbruWmY4(WH^5*pD|~I8!xFpy>ZO^{ffH
zMp`vVEAGRbMoXf{`*gJ=xBTweb*0K`EjZ;1IAybR^{kDnKULFrAS)Mn0T;V)911Q|
zL%rc}4#Wx)b*n?m>ajC`({fiIRI8qnD(x{xJ097dORr_iH}21_()DO`?mBfZ?AmiW
z_6$zBNOn!f5oM05{3wkLbZ(yC3uHQ6-$LE%>YCRQi96$Z$gswGN<6SdhTWAxK%Q0I
z%0THP?Ra*3$4O}wdzT+FF}}aiXVMDsk<TSnACI>bzy#6LrRx6sT2M8vt2Uu$`<*_X
zbzaX?WwWtwH1Ae~18Qn<-jE;Aa>$FE9#TIhI8SguesZFHB3fL^S1ZhD`f|uyxTWp&
zEZlJ?mDjRcJCMrwOKOEniF&E%*VPA<90NWzxspWf^S@-dSa(cKZ~7?BS+#e=C&8+=
zzFP~YwF$G&yQwOBeCaUASsm!!W}MS{K!!~Z1iNv{JLs|{ewYTS?EU^)v#n}sD?^9<
zv1;osmd(k3o~wL}j@FQ>$1kTi2HJf+H1EK9weylIyBqDajc~6T>@Efp-+BhL^{tq+
zJK^KxD?{ha%uOgoU$Trd0~Bxp1G>nI=D5d!#Ck^Hv6byfj6<J_n>I~F8Uf0rwtE*Y
zIn{0JZaBHevGU&3VyC0`SA3D%m)z7{wUU@U7RPJ4FP@=%pY5TpELizv>$XSL*c-*@
za;AIr9n38A+w1p6C+<=kt-i|E#CFhCQ*T@<eV$z-z@+5*YdIpDj?Q~>U)&Jh<W0eS
zDs}=@+dlbFCRwWuKk1ZAK6_@lT;OAFzzRxpowdsD5S(Qobl7W$A#VNhzEK6`sjH$F
zTinflcL0C6njq_w8@XqE+-o3zp1n#hh-oE!C6*d_**@qFH4SWdO$-#<ZOLv;#i{A;
zBrK{`Jx$kLR*<>X^mbg6Y{4G2f$|G&<rcSxReFoDEt?yw_rcmk@#m<2GCpS-Y<A&o
z%Yk>j&(_jQ8-kc5+=c@it{j`!tP!v|zxURd#a+(T9+ll@J7xuzO6=lS;a;Z)V0K&=
z&571&>GSh>N)H}X8o7ROGx`AKY31D3{RbZTxedDAfF5j)tt(QO7m&U*yUZ41Z_qJy
zrr8a-%H@D+;+H4u`>%#ASDUqPZl^<OD^8`e7&{E!L^h+P4(B!F%}his7Fx~j2PB`W
zgDx#ZU1@S%G3`DwzW2qs7Y}Hy1l-`6Q_lvBI&k(DzT3=RnB)5NpIs~Im_^wO)hWEj
zD!<*{{bBv8r^&dty!HXf5W381On-Rr<sc#bnaXALw1(DX)-3a-*|(B%U%x2x(aql!
zUORlP{L7`^6pC&<zkq!(jE)poO|t83sXfFRThuwz1E-)iVzV-8k^b`QFP>eP#=$J<
zt9<c#lM&8z@q>hgxH%he%+wdqyWN>zuFp?PSYO69{u&R34|(}){bKy~bXnhm1B0Tl
zojSb=p94*=)EW%QRNO9%wAZUtURj%Q^|*oVE4DX&=4#a*<;ymo9|q6C9voKCazy!)
zuU}c#zHv0;ec;P&$*;G}8?jrxLiEz=lHI$EH11>l03*?xOk=OK({Bcr+xfQ6D{204
z@G62_jR-UNXiU9tzxuVj`tzf!fk_G@4wmoKTi5HU%fHAa+)f!8kYaDPAL(7EDx5yr
zX}3Pftv|)0z~$4WO57K%Y03|B`^#f6%jxPy4(|fTG#>Y^#BKQeIMMon(`vboxNRx+
zxJ&`3bTTJ<?EUTNKDX6T=BPmjHD%V$uU-vbNmY-|*!coy(&$@tJ~GtB!1WsYAOIlO
zXdbS&w~@D)WL`Yf<C;*MvPN8TTHY}cHMtSzk-o(vA(Jxc&=s%#h5O_!w!YrO>!yn5
zKD=Z&psG_E=5o3qY%iH>m;WNOF>%W22i`HupA*9OdFPa!?5NaI)}myd^1a}j<5`Yf
zbwToUF}gsv3$ZXRNxt61A>@I59NE0(zVh`USL~;K0^Xrk)x4ciZ*SDqLkCu7Akoha
z6$`Jfa>Dx94ptBp&%|YVYT8dVJmTt<sW$6?lCsv=rfVeUNkU{H;6A1J-AMA}7=g;|
zv)qTA%9uR+HtqB8wJJUZ-M^@{|F`|4AJ2^F97o@(woga)-}(3~Vf+5ChosIg_RW9(
zRKw(AP}|Y0y0poKOTR46TYU1^i7#hEkL^EMT+p8tTs@`G+(+Loc_-sHzuD7PMA5CB
zRc*G`#7~ly9G6bQ_=ZsTxpXgbdF$=Xug5KEqr2Rt#;$SO%J_WUbqdr6xafxURl8}<
znaXXdh)rqQAKv%r>9pwXGyQs!VdoPCU$d9aGAoc{d*+z!esxwatk_Ye6O!7StbJBY
zcwV$@@#dL(B)|DJ?N;AfPg;_Yy4BHY?wCB8?x<u$c9tJA*}Q2=<n0gh^>e$K?o&mT
z%|g=!IsTptfU+b^bHs@nw;INQo31ykr;A_jT4K+gxl8<;Uw)!fu+j12)Kiak`m9|0
zq^!#>AU$-yaZc<~{jlSen%8F^-iJ9LX%}|h32vJ|>wvHi-J};*L@+Ko`yf_h*8=;^
zN4ni6?P%Pq8mn3g_~OI1uZ$kZKi37+qSE)fJ&C@Rvu37iXcgk%$05H&H44=~N{e%w
z5n5AYs>`~?ZrHudc1L}>rw=V}RoXm78aw^%@n_kh_xS_!h0W@-{1%`OJoDprI8|`=
z={D*PNN!&>)>|Fnm!IJ-AMMCKoaScBwX35J9EiEHW?=rhvF?$hP&@(h;p{(WPt7?H
zqtD4a7{97vQl4@Ra=Uf?6}fFLcyHT?^8<_hlN^R?_Um7|AKf(d>*vH&i<4n)1J8N2
z@16`Scey%KV}YjE<FtA2bDduh8Y>K5n^3y!w$l_h2LTt{XI*-;N+D#1ir=A|0sMr+
zQ<{d0`FSff8}(MR)vtc&amG^m8HuXIc2IvCsk6c^`iWKR=TwtwVAXbl3I5W$=ck)?
z0?JaEvj+2V-oOct(6K?&eX8z}H2YV@hFIIjp#A#3O$X;iQDoH{wmsS#tS@Tb|8T0#
zMw?1PE)b*S!jQ8#6mM8r6VFD~X%vAQt&hx5<rFif^f7A2NFlPsH6h5)kB=#S?rl|>
zrRj_*Np~tgW1;LP%kHOaQm~RTF;KOWRwxcocqiK=Qm$6%cTlvl>qRfXADY~`u|~x|
zeX}<2kitFLMq+7A(rR3tcJr`;rSOdM>LX6t*$xV`b`j8C0=Y?t(vwVmnHYY3t=6qf
z>GaN<+d*Xj+s{Zgd~-9!y*)waGHN3^HZOgXe4X~BtSe+`p2~J}=b1(Y$yW5G%6p5P
zv`;uFEEW>ci#?o7c1V+En)ISQ9r7m~%}tu_G6T6b2{Mm?5@;q&C6_^#W!kW-g*YDL
z4<s7R_Pe^k|5b)BP^Z;bp<qQ`mbJggiChRMnBm82_H}AHP0AcbM)aLUxx6=4Psx?n
z2lEuqx&+%I^QC6DGf<9Tf?9$=K8lmKv&#Ia)`|2b3!g1hUL!xKB_FDg;O~f`GvqWi
z{pF1{9Z_nN<<!>aBK6-hl;&PRs7IzJ>i<@)WG#!ws^l)t*dunHWm2oUt|xK#M~4HB
zxCD(%yj#|@W&3Ql8EXpt6-?i>ADbJOp!xN9(hL<xl<Q<CwWwlm{dQ1^n(l~Y3y`|r
zWhdqoBRmR%m!67zYk-V$#PVb}x4*0|qM{&w=PY`1dB@3!xgqMg!;6ek+D^Gg1>=0L
zdFQ{XR-_c4PzmgjtATHN<_t$wr=I1F!ZO5|RWU+^CqQ0X8mUN=A#AL#-`IF<`6*Y0
zlU~ls{st<{{A1Q(p=+dxRbSsKSmAk?K=7VsduRD92ZS;mywLbgD@Q|G6Sf*a_FaQN
zDgj)N-GzZN<G07{bmYYOh3)#@=PuAH5Rv@iyB+$Y6_!!)7*0Td#*rR*W597;M_7V-
z5-4w;dzk+u#$EY1Sb5qgVtrWg>aXw4DSF;OsL81?j#`$LNppTvWq`=O7C?~{f>80t
z_fF1sxTM`Utmsf2k7ef~O>RGnb?vTGI$m9GyfHp1U|6oc{B}c14sWYkEaM7hMa4!*
z4JHuZi{3AlpE(Sya~zIW)x2}XwR}vfm=TLmVdU1?O<l7~Ek!zg#RvIWzVT>!F=V+m
z>$>&&ld3!(>r-l1{cO79o)VrMB_<dCP%cH0bJ<1#)h&~Yfdj93@c8OhU7dnm3M(%G
zu~PYs@2b;oK40Z#bK$0;$?Lf5u|XQEKU}ltkoIp<38uE`woX1Sm3Og-N2Tv;S4#&J
zW&#LI{aV>+{rd{u#qnzG>)IAIN=`}UCTOHr-&&y`f4XpC!i){zB?Iu)ek)nLGWnC7
z<`vR$L;MRRyIe$9Bc)t-SSoJ^$Q3J&c262k!20&cxjX<Ad|w1dp1XK|qy3w_u(?D2
zZ6B}Pc=uY~5|3E_I-sL%y907eZhg3dW@QfwA627~3n&g#y47s_0XKYtvUiW1C#M=Q
zDIHK0cR!jQ>>y`S&E%|wKZ)XBHCQnQ;z}+)e6Yu%Y<h8cf(-+K@pWiXFBTmb>IP8M
zYJ_HwAVvENOVhzo$ry~s*fD@5Hr0R%UUEVY99(e_IJm+du_gG@!xyW{nssH;GbGrd
zmPED2*aLE)^o1e_bRX6aIoy@AN@);KG+~4zsqz2<u<JQ!A5{zAz%?A+_Chbi8`E+g
z1zWxEFlv2WZYTxzHrXL=Uyg1mx&QLu-Y($oNuX-)gEz;Nq=*waFSeaq{|JNo*imRN
zDOm93)&8!}{R;S%()-FFaCvO*kP-mNv{$b{O93P(0NQOHzCrDcl?5-66u9RMC$+{6
zZK#UtLCza~IP3CA!@T1NwjBbAztjU?w)$5*{McEw{_{b7X|LM!;RkA!&cM9&U!R+T
zz?^@IiU}D<=uALt{_9ar1RK&H08q#zCV_${Q7J(-5Daf3v4}LbHHpT;(+H#>DwFyP
z0EGzSoBl(T6Neejmx#b`@S_Qs5DXrIF>Jv?W;n<dfnp&yasr+i0k<!OF*uf>A728p
z`4O|kFc=A9+hPpi9y1u4WDw5eMi_wM5RBVoPqe|PBpx>c0%4RLQviu3+C)$|m&NDt
zBj8uK!2=RPvtTwb;0lK6LAEe>=|@1+@4%&hY8f#MFdT=PS&F0nt6_>%Yw8~u22X;R
z)=Ux+3ZjviG!ol}#Id$v(b!}%nG!^0aegrjl|uayrnrzVgkbFoM3Qh=lRUl<6mi8M
z3>Xue!&-<C!Ej4REP;d|lg$-yMJyP-2tqur*b-a@vB3y_1SsT+BqB>y%rc2c0As|s
zA`t}g;AyZa#W0MPFEocCt-%p+J2(6X;y=)ffLP|Bga_M~#f3zm2x7xi#$|!2It!U1
zm?1O{c7#RzHVPiZ<}$-A!9`4n1x3Ikc-&wKj|qmu_&BCH7|9fJVfOG7Y+?Z{JiL-%
z31kjJ60RtmKOwg{7|w<1(}jF)1UQcO6>}$K<qKI{*qd16Ym<bBM}y&f9*ofCj?a#O
zR{%ec%fscsYlTUePw0RH3BL<CE*A(dmiM=%f{>6YhB>*wyuZt12~NB)g)GVMB8yls
zQCO90BoG)01NC5b6Y5_hVTxgNpE<k{ATbx#0KBMiIV?ds90XvcKoe8GEfD6ie0=mb
zn}Csg7}*D-G-2()z-&G!2w}oRgiKHjYX#OW4CRAW7dgJVAPEnq9R!byfHC19Qv$0C
zW+7xkBA5pV1;c~J)eP~+$qOJhG@-li-9bDiY<MvUgIoEqj{itN*r*^|!UbU<-~@5-
z_c<ayn+YozCg<~aL74EmzB{Er$PI@T2Xo~xB`jD_5jbHYo@BzsAo1UQLckZno(k_?
zNf4LEWrEHUSpGSnBaaJfaoj3FAuyXoObM)Kkja8oKk+m!+W3m#pC2^(H<SM0Wk2}r
zgoNYnKVk6iivUAl^$B4!j@$bW5bC5q0bi4?f7zx4xDAe<KO)r0R16Uu4=y6uC)r#M
zcRb>m!90IV24=8ve+WT;6~YeV?qLW!h58?$vwxQ32SEF;&|6jrGa?xJIhy^BfFxKG
zf9{w-V+WDh6o>=iiDWjLz+pkwY={N}v6(~ykwhl2X}{_ZCIiRxarEr}W?uPkO(FkG
zjW%$(#jjvx0>y^S!CSMb94ZWCCqj5~P!Nn!W|EjekPV6OE2w>(4Cepmi2tb^@&BXu
z|HILn{3p>HE)sJ7hr%WT-1ZOA8$J&^PegC{B*li<f4#bhYD=V9Qf;jNT4-kdMZh||
zpr69Y@8O#EN70&zXF^m8n@MKj@j*=ZXlhL!uabb*&4J6wNWX>|0v?Xmf3NK_<VLV~
z5;!B<iNx@c!ZHM|Sy9Ds;e*Kdx!xp_&t;pcVq#Rk6)gzi4vvYzME)@cC$2?-5eBAn
z#^;PzHNa;ci7*1h!wqqNn3k>o#ISHd&o71@FY@_0Et80tMc>mg$cJwj<LPevxH5i^
z_*S&=7j120iznFPsg`(~|0E56WBG4a!ThrvGG5X2lhG$qF_jfWq;d#BcsA^WGzx)0
zWwDrWK4Ic1L1Z%Yt8pg^qy9GvS)BM0p?rz(f3lS2mtsiDpZFGBp7D!seJk1c@yJJ_
z!oC#=pHF`}T!9=RKOD4zuUFvrqNo2G4<p-HQm8inK{Wa9VLyrVucOMufsn-)M2`z^
zA%r4rLDIKbe{1~Xg0i3a{L|a_&qF6T{$51MhObv}mD3*_%5DC{LIm=!7J}RUVfPbk
z;2O*D2^;;s`Tx2xh_(cZB?V9W&yDeqMQ{Il+0;K-Htcf0Iwt(d;OC%6CSbfn;9Jyq
z@gWy38WX~Yb0J*b2;WVZ5%9+v_#$QrD~2Ni4T<p7zfeaDM?biZ*4mP4{hz4g2M_oc
zneLwjKH5JdyKiyN2L7-@WwF_K7M?<YYyGSt7F>=M#Ds4l6l)Ue7q!7uF#lDV?2q!;
F{{c%Xbua(`

diff --git a/test/fixtures/repositories/subversion_repository.dump.gz b/test/fixtures/repositories/subversion_repository.dump.gz
new file mode 100644
index 0000000000000000000000000000000000000000..997835048625569ed43e475c88348790d5f2d56d
GIT binary patch
literal 11015
zcmV+iEBMqOiwFpyedR^~3v+d1c4cyNX>V>{a%FIDb7^#Ma(OOfb!~6}?R$A#jBVTh
zHBHORRMVuih+LvnT4rmOB<&^JL}<fIGuPDAG&5#NshBpBDA|gl5F$j25Zbe(hBiy6
zP~oQHCVRiDc%JvZAMWRU?)!b-<&R$<pIq0u9Lx9kp6791eU5YK@<rBMi8V(SA+qKQ
z#Stv2btEK~@Pq<;kch!7TQ<+l9<(EqNpvceXdTR@vaKn0WR7((g-x-xBhnx;o*hi0
zaNw~^ph(`>L~DU8A{Y|egLn)>EEHL@g#sxgkXrL0L5MUImPWz2{@8?>57ID_NP#_v
zC514{K_V4H#N(;fc)B$K?@OTAlPUIivJKgeL?GG)U>HjlGnQJrFLL{dUc%4y5(vZ}
z6pyvRnyKTO`N9xbF~JTqPr#G%SbUHdArgwEHt+xfetZN=CJhye$E?GIiT+cI?a1~d
znhlvo#^dq7vv`q^16hk$V+KfM!Qb&-Erle~Z(ZR$0mmNX@WkI<S#0TeJXjpgA9#lU
z(J?&cw;F#0iTHm9Bs-!F5l{NpL9(?GiG^Vh`*&z@d3@+!hszg=lK#+6B+!4~5y7#u
z2Pte8olFZRk@3NJB8zPYL3U&|g-m6$=@c@D&iMf@B9Z=E>>cJtMexDz_RldP*x*e-
zNWd0yc!H2QCd+(1tZ6259W^ly-<@)UBy2HHH0A@`igpmNA|S_qK)}IvymhRbEsThO
zwL3c4{_Sb3^}8&|_>1lD-hyR3K4+;2Vt?!V{i}c_m5HJ6)BfY-?;?J0+&>KxSIFl;
z;{P^6|EHR5L&Ojyg~T@E;J?Td@*nX8Ch?Cv;Zh(fi%!AYQAwO&0+&Lhk|8pUjc1XG
z!FEJE>qnkYsAJ2DKpI~kkdSXJkw){!76}CdL(hwZe&g_T&^HtUJ-@jGviU5D1T+5o
zZ*3S5<Um}I_ia`3)<NcD6tRGtLC|UJ5u5{#{b$2wiFnfS5pW+Q;9$V-Qzb0EObU%p
z5Xqzx(8LSk^M&B_nDOax(@egP|2Ahj=qiTbH4U;r0kjqr29Gbu5LnB1gKXetbCb0~
zF`r{%F+O3jObQGBo7@#+J+ROao9~MMm6*cK|LeT^yA8HtS#UJG9|~<kc-+6pF+2Lt
zIYzUiQhq|RU@nb94rbdCsWdK!%q4SKYz~)1r%*}3!4wXO`h$Bk3d!y_EQ{bpK-SV|
z(fC$O#;`;pK99{Bv(Z+_mO@gPf^bwLeuIeTJP#V3H6O7S7y*D$_-AC~{kylLgRe#g
zUkwfpj`ltM`lNT{>C@4N4@Vw7dfn4AdhgEL`*$8adNk6}G1}fX)YkfIYs*MW^Jr7k
zVDru48;v844Wsq7qcvAv)zuBwRW&s=y}xqlZDr|jW#!AtbED_V`Y&A?DLXq<R(9pe
zmHx7_p_0?1r%nu%6b+s_)qm>L=#e9jPMz#OQShpuV4$F2G`p$qaPEVG!>3Q59?i}k
z%+2k~&FRj~>EFA1bo<svdv_1++SRvf=Yw54N49Qh%FgcGxnpR{mcFfNkJ7jHrERL-
zxw9jE>u5sq`^3aYsR=DxQ-_k0va_>CHmtjqx~VTQaWp38VPfKgq;-RF>-u72+v7Kk
zN+b_rqDCZ=r_qs}vFp;)(_hKNiny45iTIIBbR{-+kRLJ1<+e!p9c$L~@xunfI1j?P
zkHW&*BA{P5kRl?uGc0Vwh7C0W!9eipha6T1ht<U8K4JwN=kp&1`9BO;`g8@O&ELP0
z$?RS-|C-;Twxvs|{8u#k&U-N5rywAp%iFbi{(LT%+wST1$aVH5Z|}P<_6nytm)+dz
zTwLzVCOsuPT$?kejZWX?>G_C2xI-Y^x3xTLZ{I{BU8LaeTUst&ytv$M)^RHJ!A#>0
zi)jiAi&9(L&KXt@r%h{`IlaW%<RNG@Fl9=IiQz>HvsMs1Yhlq0>UT~yD4Q|0*~sYT
z6x<aMteI*sckbLeBcm;rmPICpO$J&?78VT#xTDhyn{~8GCh67d>UQE(FX>I_*3>*Q
zWkNRwsKcpMYHO!WnUtrGBauj#vFH*Ut{Dw<r~oImv>MPrHvrVBsU61Qj%WcFQQDPi
zYU>OQ_u(*=C}1xRSB65JLZi!3K&hJ6ZXCJ^0Cs6<ZNuS;P(T41U8AJ58w(s!11<x=
zJ`^erhs#j|$^jq|i`{`j?L;9?0YDlWNJF8H0Kgh7HVK7FL<89X5Q{=hojO&5LZ!ij
z;a32V0st2Pw6wH<-~UYepsb<`5CE&Om$5Ygphf{UYO+^xUUec$$1><@aenP4+;s08
zuQLbhw-}JZx~`r%)R+#srcR!B_VBeG=1Y$UT{~NFV-KEvJ!f9Yk(>KylILC5N{+T1
za7x5X@h&}f>yXzD%azwl3tNve4teK#mmP0E;a3v&;Ck7K&eP1=)G71Ji|&?$wjN)3
zqujb4K<PSUF?(t@X-!`=urR+yW!se5f~L@0p!|OAauu%(AGi5AvlDPDCoQvFHY>16
zjv#f~ta9*OCjy-o1QY@)`VLVQa-b@~h%wofD@FT0UB2h!JXdOSNytJcjXlO#-D)-S
z7@NZ9^_AKaRZwDI#2Y`{bjCi)E{s{k{qi+!H6x>^R@gF>dj}+#3cwv_6LBwNTA;^)
z^@p*_;?Q}nA?bM@+beswu6?W<nn!-jUz$GWY-q;AL?RkcnlxCg_K5KM%j@}ZhZ#;)
zn!LknRE^UNrtgn8-<F8A@48dl9gS-^mI)X=sZOKy21RLXG~ibB5MxkIfJVr#EN{xA
zi31B$RZhLfQU|+{n*ri-|0PHWe`p)M*POJKcs;b_@wV5~4)qW(CBfmcF{oWgnr~xq
zGt=T!O7ragtBL8_%in$24$v!ZH}7uM{dhB<6=2TY`0L$bGl10OvXFF*%q}F0YM$N9
zjO^XK*jk-j?~Gnp!8&eKT;-B@z<FWSCi}$Wqmr%k&J>d7!OhP@`(k|^FmlzM3j%n=
zUEIBescZW-YvC4FpKU2oIKEIl;fO9q+P<tizOAUUZQYAK=TkRNi{rk3zSnqn0NbMA
z7mCh9dRLAsmj0`<NzRhVJM9;jep)d9<swWIB7F7(e)zVcK3&UZDl>sME&H{MWdkTX
zOe>;Zi`r30esD(8On;TJBi%~Hq0Q~M`OzZc^`r_PrTNV+F9xsB{PVoZRrF)G7IoeG
zs9DiS(-<Z)0B{CkjkOb?eJ-f-S?2vbN%QO{S07{N+)5eBF!~(%@@>gST(6V2soQMQ
zO}n^aZwKWQJ0$12A}<c@={CE-j<p4t@vCeqMis8u=}yxu3JhXOjHt$eFBe^nb$kM7
zCP{C)qjxTSrAqkxyw%N{dnjTD=2~6r!e)m-hZoNtM*5E=-}@yPp~Ud@N!DY=#(PX&
zkaZ@tb<-8sx9v|VbQ;{qL!Zt%lLu-C`)0~seON%0QZC#Vw5AR{EA9A5I=DKu@a9ZZ
zjzVq9lh!qj#xc4|YQ{&3Uf9@miAch$(>k5E52My7-VU46M;#V84lJOl4p3TmZCj2$
zw5tW1Y_6V<0798bpjisa%^^WMGs|tdhV~X&^2}AQ#hconu&!+G)|wWyMbB*S%#zXS
zB-HJtp0r~tE+Cu3CSiW<csD^MK`kv<H?yM7Y%~m+YI59V;=U~9S(WkIqVf(I4~n+W
zd9o%wW}s*Nt=<F9lNEM)-ZzqM=n21`b$3PX#m3*c=#hVfb;4%zAsr<~4bj&p)qZ!v
zw!*82pa36CU}>U*`dQD3CsNX9?Zt1w+|@Vv)aimhHA6mZ(5)ef#FGvVXO?;U8P)qJ
zBOF|e3PO`DMH0in?i#&vg$ka5PK(rdz3Y8Nqfs%++IrFqZW(#==;Y|k0rw@DP*IOz
zYf6Kl-CG}nL&W+OdIyFcF{lSr$=N;{Vdbu=XDZbkpR7?1aJ;cwrTQsVcGqjw-Y3cr
z-<u-lg?O-n&q_;_kib3Wwh-?U14Y$L$9%%5W~f2y@>5MmC@t|w;VWd0a&=ItcRB7l
zp$=i%?d0;gAFyGXEKBm+MW+VGE9QxF+rp2UE^aJIoMNSi@snFLA#SdJ*P3<LwR?B@
z46H14M@F0C-ZTmQR_M*gVBx*h&M1WX)8P|GS4-uz{DSj=>mzcMqmTDbVs2hXdwi&k
zeH4H00%?cfM5y(#8Sk2$JF?fcpLl+(aL!P5M<BT>4>i$iIFg=G;35O}kitqc?wvLp
zXb;a~9&@V5^ICrssl%Rr^(oO4RjT5oH7wf5iKoxWUGw(r{V-3{0N0Jqx$R7DZegg_
z#zRq0kW-H_fFK={MRBMOFo>4#yjSF#H0q`<c@ydqOz+-!WdbsKLj>O?bEK$hoj`5B
zMdPwug8l7FFVDWTx>LRc0F?b|O7g#0`JcP7a<9!*okMq@tyG^7c*NUxT9P6>hz%~f
z{K~aLrN>F6xr7pWk}<70q5jPz+y!ynp~*c=8%gd(>+Kj)$b(Q%BV|B7Q672m?gPCd
z)!o*Q0HSd!SQW;4(fY>n@a4zWUYG;*E8b6XyS!yVXz7G4xTh!2c`FaO&WUZsKHVm$
z^0)J(YVfOa%4#Q`)OHFnb--gjHPpyUJ;8!I*tr_aT4X-L=55c$PBY~?wS`wxMyfkY
z3^_MGTB9Ov(C^26?vU7|G^X*oG_O(ij8>VnpV{_ccefylxll>YPfl;@pWb4S@x<r#
zoaeW;(S4Iv*LmHIIL~~lb@cs>m@?~Z%_Z_HXZ^rk8#@+j_geMcT7WoK(YXD__LGsQ
ziu3-O7A+SD{kNd`n9CTY`}VE<0WqqI`CKDI>=)lR9?CafJP_~EpFj^?Qw`Ry-|eAZ
z;~wYGg7G$%72c2CikN+_y>S03hu2QPYF?gU!7GiE5nG>_-k%=0s@twKfNS}Pa_^SI
zoRnhIFYd`{=PLr!mS=6cXWO!jY4EOFvh`@(^Xq*E)zWRArg}{BG&B>jGiB5E`kUpB
z$bf4$Ceqpa^IlyH{%{G0DBnFj4tL@9NV(JK$}`S8*Yd(Hu@qsBM8q{3vyVIbe(suN
zWph0Q+Rq88KU7;(JLOgCC%R%uj?6iKa-#KMZL5Yh9WzgW+p!||Ir2R9D%$1#r`t_R
zHH_B>;#|X)JTAH!>KRqdrBy{4JXQii0kkiGG`QoWB4!#T*RKq7oavuBN!X}izaL5{
z?Wom^D@{3L+&*tl&aje2QMl&nsJ+qE?qOyv+iU0G!|qS6P7J$9aLhYr{3{dXDp%4?
z%GfBvU8-@vVt0GTs^@yRhr6>k>Jc8sy^eC76i~a$D`LZ_)#4Yz)&uX9Pj%*Wbv~lK
zOf*?%;{?cc<j(3PNTk7SrYh-4@PNm;_oKg%R)q-%d@FZNz1oO&E~xvoez@xB+AGOg
z9}Gl3BgoBNXKs}z2<oO!(Qk;oJnWM>gQ;wQ9nMfU0s$&hEtIKxPDkx2QtcEzyr+Nd
z2G5wgMD>ZH7`5&E>w2=(qkeDok;^@CDtSV5Jo=W2&&`IIWhMZ`(7Xm}W*?2-=P4!X
zG6j8M!^N0MPQXha$F(BI{zS*zZo?R}^^cEodNyK&^-{|QU+d18X&wo~BT;W7p<BVh
zDufj+xBY@1Cl@6Ei8zh(OpV8Y9C42OwVnca$OUHp8%i+~oB$q(b|09kqiZ;kgUWPT
zQ}!;Tug}D-ADwTKjEoO{uO?hEnzF()Dgo)UYFZX9a}O`Y(|RHUUDS;^&qy2wBRNNt
zAbr7&W!Se&v?d5hi_yBi&S`RILo#{?4&Ck~xG~cm(Yf}e6S^mP{R{WatbvqgY8z&l
zZCJ&{S-rQqN|h;ktwJ_Z%!W|83iSRv8js@>N9#i%&#>lh!wq?Wa<SSaIqIy}mK_W?
zcVEmQJi1=KMgQoQ(`!+aj->3=x4yAk*svQ18pNWuCn%I;YHK#!GRbJ`RZ3={cHuCc
zS&Q@=wjMf?#Bl;Ja?}+O+O2fkPL`*v6kU!_sW`F)p*G94UrldXAo9bCj~Sb{j#zy%
z<JPW~H66oE*V~FYlg1oHCNA$)ic_d17H4QiClWeCzAn>xh*Jg_h)lW0+`4U({XGlw
zFwu3M7x03o<zVvrb;--MKk8V2+Jmd9(E5m5LHi(u-mOrzz<qwbYZ&tV$VgU0Yz*wD
zo8_sBGt@BGGR^}tskBJX5cDJfm@2|t9NM|A4s$rk=vb2Xazn|mx%)FGDW4sxQ;opX
z`|_gGSNbJST>%joz>;^X0*}zQcG#(2L!_2wYWetyu34JMRUn0Glm&VnIyHDCL!F3)
zKglfR>dEw7yPef*=BaPF=G~m6{&j75oJHolV(c?;jcX_NnX2|eQTFOXTE$hF@7Ctp
z8Y00g`o70fo6*e)%*6RwA_uG@u*F5=9$oxNkxSM=xXD%gz<qOhTTd`7o{IK`9pUVB
zQVJI%gU@;v_~sNHHhib7an36x{h3Mgd2F}ZEJvJn?+3dz%kmp(IF+GXR+itH<lMpp
zv;dI3mGMm(yKlKb_VkSU5eH=j;Oe5h1W=9W-my!8K9h0araaY)s<D^}gdbEMBIKM%
zQm^k`fU;cJc6hO(N<-0|rTN_CSuwU7FV&$$(W?<|yDSBYy+Q9YRTRpB7<I$4gD4-$
zO)ruWLwSM%pec|`7zd*9sLcv=elaG-F!dcCD`X&|maD2K9!5=CnB=`sk+C?rX0c8C
zo`s{KTHQl=w+gWx#Y#(k0Is)obItBiB0y)Vxq^U6F;X;XpCsVu8HVOvvHCh(Qg{L&
z9@1>;UXX;*_~3iOrr=n3l2hxDr_a5dXG15N4dV{6HTpd#L8R#YhkyXQGX|U{vR8=!
z)#esrD!MU=OqKP|XD!BQz13Y<dR*gk(usD3b(Zh)-l`LR7MZ>uPb{63ofxe7oQc5_
zCpTxNwV5Cy<)}*{q=yb-RyUG#Pc@=gg<gz!@XlOmNOb+^+6M_I@OHCs8<#`vdGCu)
zEyZA$emwPDu6YEPeAvg~ji``t7Lfv?Z&XD@Z3NVd0R_v(<t(730PuO(o=qgeXu(SD
za?^ajlp*<<Uob^4nVOw)&GuqZc+ZN#dPer{>>?MXyejlX1x61~Ky4vwG7v^iN;XbP
z(G2Nh503*AS!NJ+on_`P&vQZovF&nAw-=}@QF`Y`_A6B<49z21ii{pPDcgjX`Kc>O
z*COc(q(d<#^L$e5Ia4UPB&Rw@FQz>Gc)6RAM&b~MH@qeYM;D?!Y#H7PIYuL-Y(gGl
z{U;?`Tt%V&>`*+5tRAE9#ZC!aey9N3*KjHwQ)Hl?-#(;qVU}9BbB4ve{iC;$USTHl
zK|l{s3JAO~hoOANbvEw3%4T4}>COxK9v;0z{%`SKbGMY=--kVKq)|P}P~{Kj9)IS=
zz%6XZ(74}?j%HmrepF?3aoid({>dB6t-@XNv!dmVlrH!3WzzC(F=v*BX<h&>`ziEH
ziwn~9v@1=|5~~q=Ewyp=DhrIX{i+t%pVf@0LY~Qw<KeGF7H=9zM4^|5#puU)p5weP
z-okt8{kFTL>_th)MQlfv`h`68CB@ncVl0nlru$YWyh}}R;9J_h3wMpR<oKs)`}hpD
zuh;ic?PO>sm1rJwQdy0^(kDrZO+jtMVa)h7?i*{U$F}gxYQp<Uy0(<-UBotvYR_aK
zC-tcEQWLTRl-N-dCj;u*mF_m&M#(dr3PWkoBe0G^-!93&8lY`4TG6PJuiA&VS};R1
zPNW*}IrXeLx>|l^f?nK**$p;CulE^RNgf4VvuaD#wVHA27jWv98QR$!SAVKvY)4iu
z^Z_n*;<yxCmX3D)p<IX^Ea}pQmeygX0jHI&J*?6^C0E;Rg?2u?Ess&dQEu3mbH&iB
z!L{?${qXBA7}zs7^&-V}180;Ks`8^eHpsPUUJsDvbYlx`kGp$*b0qGJ`@!kec9Y_P
zEeh<;Oak((W*QS^khJ~zo$V*(S2#QUk%{qr4a+C2kRJYAa^>T(=0aE?da7JIU~e<3
z+I`g~^eq3=$Fk2Gd24Jo^NZ%+7C50M7v~T91I-70$Qhw^qoVT!C*&s=`X{3Gr2?%J
znT=l#`ii%-zL|+T=A!XNaeF&b9e+vd#1f)WD*8>;el_R7PmS&*N!z?H*=~02lQSAW
z%5zuk+3-oUs<rp_f+?-yobw)<>Rw;kO>$QUdA6G6w(M76GlIY_oceZ#VzED_Uaok*
zuf{S>OKWA=PykkI-Nmxm1uyc{k226Ya_#tK6z3p^uLtMuKd*IOc6C>SgT5*5b-lyI
zAmUr^z}DUs6LuwhoOpHcyrq>nrRYnxSyrG5F0kJadC>~@B#2nY3_7~9Es1&XQ*q;_
z$w*T`oz!~&!X=m5tzGpecRN?!pIq#6<iUzBN_&$VyRNJx=8VSi8y`rgsXyR&X{(D?
zeo5Q<xC(o-7+uctth$StX?17)p6JA#S|e50IJ($&hGy!`OQkPzszsQTyZ}9CWaE*!
zPajC@BN}}vxKG6{pl0i*<&+6_T0>7eWE0PxS*8^9gcrDi(o}1wu`3j369gUd**+b&
zep&B`iu&YL(Tl9_<-FUEzg$I7^ePSCH#_FjUoh8EqX)#a5WW&iO?~Vic7<64)xRMI
zNgcN2w4~y+40jL~)@Yt)7%nZ$O0&2V*Ql7kTdTkPLTkD8ogs~$Vr=u~hN`_VnkeCH
z?N4UsEJ7?Vylvk9uIKq$MrnO8i-g;-f5X+IbDMMmHy8BW9<{#5z1FR<%X0h7pi-Gb
z{3_g=j6lrx8<N@42F<<x%bzhq2GoXc9N3KBPkB~3r)A&%$NnAz9yg(fn`3K>w3S7q
zFHLT<#Mqk*Osz#ueV%$bpqcpP>H5BF;mfpUE|}BdRN8{m=qSbxfwz!NXt~pQ-FQoL
zNwc+HljnZfr>fvf3s6@Z-B(O`fQ;{XdG6&ydJ6$JaOTwWe$#fGqqW~w%a>NTUgPK2
zOWJ2r_CU2NZ?Nibw{?A3zv@{s?k&HqUp9y?a~U-r8hAB8$at=CSv$SHC7C_bYDv!R
zq`WsT%a$7!Y>KEEx?cX}(l07SH(y-9J{&?vifku1bTro-WREWFnBj#}(Hf?%j9O^C
z?8eLI7p8DAi+d|yzS(4ovsm;nVF7OT1{^E(CG>7r)|VUe(i7H~@yx!)LlJ{M%hSG?
zy**vlJAeOxBz%WKkILsDi>oyzg9;6g3&U-78kJYqW?nmHV)&Zli=VMtvs?W#_4A{U
z+1LX^DtgYS0P>BiOWQV%WWEo2wKe(8mbt?Yt5--~*<NyZmzmCcVjO5H`8CVTC;jxV
z{mUHuTIQBCeK>FpL9RlCn|w5*J#bw8Mp^sCk=4Kim0>5FciJuMjkJ|t<`M3s4EM{i
zx7rT(tkV=v9qDjbpXAY(VqNI==~5-`i{2FVhk1SFF_>ixZBwUrL8CfPdRF2#e14K>
z_t0gv(ns9Z6h~Z^h+8_5n=|_UPIRxw>L@GJfRmOwd&gIw`mdxbkIy*x0cX+~X$Bve
z+EU;~wPP><kgIhM)j3j?ttVI&4|cmJ6sN3_mYi00PDD*?z<FhC@k+>|OgMPer*FYt
zW$UyzyZK!->6}NGruS<al!m*VE)3s8<~bC+%xXxSbo!xh%(54Rh`qkKWhdJ!_0;t!
zS*QFi_~m++V^>{}JzIn>H0(qyh)YtgGj|Go=om+~YJQ-8W6&M@X|ITXuthU}N7UP!
zwRO<`m6=HNi|MK-uB~#xF1H`3AgG>+%ktKBoIL%oyGxeV%>8QWdZU}JlUyf=ktYDp
zNyYDmlPAWAH13?`J>piz<U6+NpMS4c@hSMhMZJB$>>K%bX4v2u`gWCL2D0z&$L9&#
z_I*7lcYV2c-iv2C<`;uok7U=TPdu^Y%cA^6CyyTgayIPfzLUj;ec2&ZlTKJIH+D$g
z!TiO4)|3@d3|m)CYFc&t1Vza)`2>t#C~dD>*Fv|qzP`db+~QV-+dW$B8jm#Q=Ns;m
zpkBbuFub?QLwELMUSmaUO5?tW-cQe_M0cI(Gm;It9xwcwvt*`ap%TYC*K*hEvqs^?
z&I*Ij)ShJhvr@u~qNR&A&)6;d#lLZvc3K^2aYAaEv+bNwWirEA&6Mn_JZipq)1=5d
zALbe7b+J4rODdbh7V~ohyypXDNth<V@oJB1=KfpmH|?fM-|SrM$eXcK`ip--qDzSB
zvEtNIk9RCzx%O#Ur$b;y*gmt|*d@l{$0~Ji%sR9evtQOG?zkJ$I&bEFaWA^jD7=VZ
zR&@4Ztj^B)j++m6c}&>eutzgivlQ^dhi_XM-CuC76R1ID?DKdUeLHu}4EL}rhyx!7
z{S&n)w16l*?j2@Wb+v^d`!=V3*HZiKbs65v>G`YD=c>{<8E=n0&yl<@=$|KU(w^x*
zAHDy%Kd;@Tg1gtS!LVO;=bD+(YJq=2rl)eWGv`pchds}sme#*N=IWaMdFw{IhL1q;
z1ZX*T-#JHG?*15KZq|YLRrM3{)vJ-)?CP#6ZFR%@+6&J2FA7L<8miuBeCa`S<K(ZO
z6H~2EhI{nC;Mcr++P}>0+6<lfx;{_R=f2N#eMxAjFnME6>2%meSKS;8T=1NE>DN^%
zq0=<{58etCCLEg7I8-dmU#Z(*w3?%R?L)UKmeR*e)Fifn##>1p6%Nr)ZCgI4npXj<
zwh_$nm)5;F-M9l#mn&R#SWoi%k8{P&^}3#u4G*U~zAm1QwSNLSuJ7G+U~UveQMF;~
z<2@n9lBRu+CL3&|Rub}n7&SMhlJ&v(>6O*-98|4N5xCLr@H9<sF>_KcvwD;isz_WD
ziv0ZKsOsmQ7LA#@u9%Vxm+~{#>i&wHKFTH)TR95@Rk`Se;Q*C)icJ#rDvdrTRa=K1
z^nComi5(lOH3Bj=>+=t)+*fQQmR2XN#?|UK4XN0O&#13H?4qCJq%w0S0qrAFns6{9
z$-<9?5!Th{-OiFv?YOlKR0ptq%;f36-b(RoOE9>M+DMMg&)B3~t3M(8Dp{VdvCYbL
zhG}84En|uLo+20h<4!7z#6<KWFBkLe@}wE&J!o&If(b|RlBT*%L#|DNtYV-9x;abD
zZGdf)KICpKjmHE4iKessugwp5o#_YE>h)Hr*pioK?<;a4p8!-W@uSsyJ9J$pWDOw&
zy=PHw@6EJR@|2CieATmVA@;}ux#gWqlrxy1l^{}%;^yzTVs%9Cc*f!d&zGvNQ6A7!
z4pT`8aK<p0O1ioM%4WLGD6NS~TI=(W#_ySGbFLz^BQp|>f2mTlQ^aF6@)l+8mb%U~
zuhCrBow)0x(|%`Mf=(9RBm4Q%z0|E{y5ay8i(lK0&WTIV{dz2EnuasVeWHt2RI#sd
z8>mLhaK>^(NJHPU<FktqUWFk`PDQ>oK}I=a`HEZHUR4#*P*8wtHY2&b{iI+{sCM4a
zLerGiQ=U;FIKS(@1+S}ADaFS%g1VKe;V(Tarn9C?_p%0Y8DiA77@@%zA+IlqRHZ8r
zRJ$8DH(p<M%3bB8kE?osi3Y3Ss9kv28hPTCuWwas@qA1Wcwe`zqkN_lLY)C#Xn3cW
zt0S)tUkxC8uQOFi0MBdJi6Dj9+hYy}O45Q8ZN|RmF3>9wk;3A8?ZzV&Hc{~yZeXC!
z;cjI!z<FJJc!G8ksBD#YNcc3yQ~elNdD>L4KD>DK*LUYsy>BA4lr)$}Y|6^yxxZ*K
zL1b?;ph^lwXawMUCgwO@(r*}2bt;a>a`KSocb><(ch#yLtEw~G7#|flq*Paar#>Z@
zpQaVdyoy;-u~Aly3BvcF_sNxK3<2w$hvGGL?_PB;AC;?S#v(MBd9@Cc*X-0vkxyOm
zL3yTMJepAq*{sdJVYmLICZEs#l-gN0i{ZSxgs()2$wLZX$x-Ayj%i?3^Tc9c{~JC$
zzN*F0pm3+k%1c13TzTWWs`OhgR(Vh_+?sCwChkUTu+Hia*B!Z}eVa5wXsw1V6OYN2
z-K^tL8GGBbG60ns00L9DR&m<+fr@W&yjI(~)`bnSQ?fY;IvG{BR~W~iKCvKS+6M5F
z3HW-Sts-8X{7FgoD(TpC{7W^5JVa*$rQC2xuIvCP6|0VPO&ChR`gJS0Jp@$zUWP=T
zyZB(E<FEPQa|Q!iKVH50?v1hy9<lySV0-H}C*-Ko`Un->%5D@ss#+%xP#vOlX;A|J
z4}5~UZ?}>+w+b;K15lNAJ)Rokq-0*j;;wZ<>f>M6+cNv(N-jQnxZA00YH>sYm5IRk
zIW=n+OZE?T0VrA(LbqF#qW^`h>*TCv2F7C?n80Fc6`+Ba9XA38RvZ8htZ+nZ3Ayy>
z<*KqKLxubd2`1FysFoN<Knaw;R0V;qL&l+pI&)X44FIa<%m^e+89)FI-3J__YTz$$
z9jCWF(5r}s^xVfGw(r|bTi%pUmjinm9T0aeM>m%|cy(Y;Cvfj1aAnWKUyrKE5yx|1
zZaugDF$VXs{e+{eaQ>Iq`#L}Oso+=2AE<-C<<U8VY5=6rU%dh?2auo$Xrn&*6}2Z;
z5wciT=$Si|)Dkzi;YwULa_-QhnU{y_=N?0F91uwSrEd6Rt8c}lj~!Rme?DL=@6nn%
z^iZqP6_~sJ>kA7InEg*HQbNZnX~s)z{{2->1S;t#1t??^i$KAXXp~?o1d(YZHj&P;
zBhlG-I)M~SW6^%Baw3raY?Tw26(N*Kz~7V!!5t#8FhtCX0C^HnD&|FwR~`!B_9e35
zXdBR9C<8e{!AvPAfFO=NW;)zs39>+w2o_IZ0!Bd6P$6f$O#rRs^8^qGN!TnABpGj$
zKoLB)kS`QS#wU6~VrV9;1~!EaLuiiyF~2Q{`di`BKaGqOMs6$!HqxkncbOv1j`owl
z;7Jh6jzuCu!E_RfPU28WTstb8&LNY@lwca0`;*Eb+HWhL76`=<jIKx`i-3{j3&o&>
zCk0tBa#k=30tqx$9wdXru)RDHPr~L2LO_VmliGkwAr2@I3P3SWB9qu?VwTDzB1pjD
zNhA=+ho`}zlnTZ0KP!;K3lYHWyolcj|BXBW#I^!ud^o;r9wdRo!m;{h3oO-D%#y$g
zp|KK2*u-z6;6WT7E5Zg`$b#6A03N~Tg~<3UFoGqKu&lsHmY4^tho9gOi^dA)gn|$m
zWCcPpo+LszZnqT}!Gq<)A>awXu~JqkZ`@X)n9UorXl#ruA|e`$5c1*3^2TNhU=QHu
zF?)Di*jHGD)i?%RNc`QvF}pz6S^nQ$1tBp@3TtwMb$_?V1{{B3iP^HhnJi($LSZP^
z$RIG1CuKq3;a?+TNnyrY!3zPB@?Zt5Z+6&#449R$PH23}HwR%Y%f?23iwPJh<jbTm
zPhoU|A+Zn?g|c8FViqWc#)@}sz;SRR$Gi)c@nPA)@HhcyOo?nv8psf{APKAkghJp!
zV=zO)G4UdZ1C3+%y*rrCf&(uFg&dv`#`tFj!a)T&G9D<CeiQ!pIT9g<1p^F=TmB!0
zu;6LmNhuQZB4Dgwtz4Fj4fjjFg@`X3rx=Xy-#H-?N?@kKV90`bd>#vQmB9wi2A%ml
z7{#%u1c$<E7P4gGG4R<i^y5!srj2<7|N4!=e-G(zSoRyvj$1eu`tg8&cLEHB;S<AQ
z9E<l)imyq3u;R&fKh`Ib?f$X&noPqG$2SrQ%t;Q9%NyJAEWzI=155CCThL#v&ZgLt
zX*OgE?N3x^|B0l;4rK{Kpg+hzcEq0*K$1BWhzsF~WDbYGWkYrxh|Z={SVRJmL?&?P
zKjH_A`9F|X{##SXKZB8K_p>@u0)@)q;_WyzE{)1&6Cpe~IGBiMu}G|7h)N>-Skyiy
z=Ktr2|FInL|99{I!@D>6kFL)Aq`G{py!;=o&X6#!<7;^A<Ogy7`o$TVJ&|rhquTwo
zt(pCAK9$mcwp+9CEQm(ou*hsYK9~g`P3_2Iw<KV{xl}5V^y4-|z!QIaD4os|u=z4L
zrVbJ*OiG(jM@@_-h6i(XZ2vWn6!JJ0nwS{PZ<iLta0l1iWZX$BaNNxxfr-WJu{mP{
z;8i0N3qU;F5cku-+Wmpc#Gj;<u}eO`4=jm@S@=C2gF-kHjK>%z{MdKIw+jP*G1gRj
zJi#7Mv%ypUOd9@^w_yHR4jH@A^kZ;o>|i2|O9;kuU=q?P1OkoCX2JP{g{K6Q$<QBM
zjQZcW$l@Xtgb8Kh|H-Q?KX8lk2izk4<j6<*;mAj#!Q6_3iS@g~7049}BS2d?b%M74
zb%v3tHWV85&ok^#{t;rlfh`n8j~Q<*h9bv~!@qC*SI(7x_6Yhn6F6`_{&|F`f3&TW
zf3mHUf7sTku*8V*82xSW|Mg%H?Fkec3ZDL7U+(|8+q6F-=8u2N8EgB;ZxI5<Hx$mk
zW0wzk@LChYhjTF`7|Y`<0eq;2Q@IVSlPdwI6aO+CWP6gG4bAS)!11qVx_`Fu(eXdq
z_o#MMHjT~U;MsTzffG!ygV<CWH<$%~g;4BB>>pr*rTp76+0XLW{{sr2X3oSt004RX
BzVrY9

literal 0
HcmV?d00001

diff --git a/test/unit/repository_bazaar_test.rb b/test/unit/repository_bazaar_test.rb
new file mode 100644
index 000000000..68a1ef5e3
--- /dev/null
+++ b/test/unit/repository_bazaar_test.rb
@@ -0,0 +1,87 @@
+# 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 File.dirname(__FILE__) + '/../test_helper'
+
+class RepositoryBazaarTest < Test::Unit::TestCase
+  fixtures :projects
+  
+  # No '..' in the repository path
+  REPOSITORY_PATH = RAILS_ROOT.gsub(%r{config\/\.\.}, '') + 'tmp/test/bazaar_repository'
+  
+  def setup
+    @project = Project.find(1)
+    assert @repository = Repository::Bazaar.create(:project => @project, :url => "file:///#{REPOSITORY_PATH}")
+  end
+  
+  if File.directory?(REPOSITORY_PATH)  
+    def test_fetch_changesets_from_scratch
+      @repository.fetch_changesets
+      @repository.reload
+      
+      assert_equal 4, @repository.changesets.count
+      assert_equal 9, @repository.changes.count
+      assert_equal 'Initial import', @repository.changesets.find_by_revision(1).comments
+    end
+    
+    def test_fetch_changesets_incremental
+      @repository.fetch_changesets
+      # Remove changesets with revision > 5
+      @repository.changesets.find(:all, :conditions => 'revision > 2').each(&:destroy)
+      @repository.reload
+      assert_equal 2, @repository.changesets.count
+      
+      @repository.fetch_changesets
+      assert_equal 4, @repository.changesets.count
+    end
+    
+    def test_entries
+      entries = @repository.entries
+      assert_equal 2, entries.size
+      
+      assert_equal 'dir', entries[0].kind
+      assert_equal 'directory', entries[0].name
+      
+      assert_equal 'file', entries[1].kind
+      assert_equal 'doc-mkdir.txt', entries[1].name
+    end
+    
+    def test_entries_in_subdirectory
+      entries = @repository.entries('directory')
+      assert_equal 3, entries.size
+
+      assert_equal 'file', entries.last.kind
+      assert_equal 'edit.png', entries.last.name
+    end
+    
+    def test_cat
+      cat = @repository.scm.cat('directory/document.txt')
+      assert cat =~ /Write the contents of a file as of a given revision to standard output/
+    end
+    
+    def test_annotate
+      annotate = @repository.scm.annotate('doc-mkdir.txt')
+      assert_equal 17, annotate.lines.size
+      assert_equal 1, annotate.revisions[0].identifier
+      assert_equal 'jsmith@', annotate.revisions[0].author
+      assert_equal 'mkdir', annotate.lines[0]
+    end
+  else
+    puts "Bazaar test repository NOT FOUND. Skipping tests !!!"
+    def test_fake; assert true end
+  end
+end
diff --git a/test/unit/repository_subversion_test.rb b/test/unit/repository_subversion_test.rb
index dd1c5eb6e..592eb4ffa 100644
--- a/test/unit/repository_subversion_test.rb
+++ b/test/unit/repository_subversion_test.rb
@@ -50,6 +50,6 @@ class RepositorySubversionTest < Test::Unit::TestCase
     end
   else
     puts "Subversion test repository NOT FOUND. Skipping tests !!!"
-    def test_fake; assert false end
+    def test_fake; assert true end
   end
 end

From d00014221ed1a5666b2eb5952c15242613421562 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Mon, 3 Dec 2007 23:05:45 +0000
Subject: [PATCH 040/710] Changesets retrieval optimization on the activity
 view. Prevents additional query from being executed for each displayed
 changeset.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@952 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/projects_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 658e9d232..c4d1b53fc 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -442,7 +442,7 @@ class ProjectsController < ApplicationController
     end
 
     if @scope.include?('changesets')
-      @events += @project.repository.changesets.find(:all, :conditions => ["#{Changeset.table_name}.committed_on BETWEEN ? AND ?", @date_from, @date_to])
+      @events += Changeset.find(:all, :include => :repository, :conditions => ["#{Repository.table_name}.project_id = ? AND #{Changeset.table_name}.committed_on BETWEEN ? AND ?", @project.id, @date_from, @date_to])
     end
     
     if @scope.include?('messages')

From b536f4c65794d8c2c5e5ae0c0a63166106bc3303 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Tue, 4 Dec 2007 18:14:09 +0000
Subject: [PATCH 041/710] Restored wiki syntax quick ref pop-up (accessible
 from wiki/edit).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@953 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/wiki/edit.rhtml    |  4 +--
 public/help/wiki_syntax.html | 57 ++++++++++++++++++++++++++++++++++++
 2 files changed, 59 insertions(+), 2 deletions(-)
 create mode 100644 public/help/wiki_syntax.html

diff --git a/app/views/wiki/edit.rhtml b/app/views/wiki/edit.rhtml
index 96295004a..94581104f 100644
--- a/app/views/wiki/edit.rhtml
+++ b/app/views/wiki/edit.rhtml
@@ -5,8 +5,8 @@
 <%= error_messages_for 'content' %>
 <div class="contextual">
 <%= l(:setting_text_formatting) %>:
-<%= link_to l(:label_help), {:controller => 'help', :ctrl => 'wiki', :page => 'syntax' },
-                            :onclick => "window.open('#{ url_for :controller => 'help', :ctrl => 'wiki', :page => 'syntax' }', '', 'resizable=yes, location=no, width=300, height=500, menubar=no, status=no, scrollbars=yes'); return false;" %>
+<%= link_to l(:label_help), '/help/wiki_syntax.html',
+                            :onclick => "window.open('#{ url_for '/help/wiki_syntax.html' }', '', 'resizable=yes, location=no, width=300, height=640, menubar=no, status=no, scrollbars=yes'); return false;" %>
 </div>
 <p><%= f.text_area :text, :cols => 100, :rows => 25, :class => 'wiki-edit', :accesskey => accesskey(:edit) %></p>
 <p><label><%= l(:field_comments) %></label><br /><%= f.text_field :comments, :size => 120 %></p>
diff --git a/public/help/wiki_syntax.html b/public/help/wiki_syntax.html
new file mode 100644
index 000000000..f02eb62ab
--- /dev/null
+++ b/public/help/wiki_syntax.html
@@ -0,0 +1,57 @@
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>Wiki formatting</title>
+<link rel="stylesheet" href="html.css" type="text/css">
+<style>
+h1 { font-family: Verdana, sans-serif; font-size: 14px; text-align: center; color: #444; }
+table { font-family: Verdana, sans-serif; font-size: 12px; color: #444; }
+table td { vertical-align: top; background-color: #f5f5f5; height: 2em; vertical-align: middle;}
+table td code { font-size: 1.2em; }
+table td h1 { font-size: 1.8em; text-align: left; }
+table td h2 { font-size: 1.4em; text-align: left; }
+table td h3 { font-size: 1.2em; text-align: left; }
+
+</style>
+</head>
+<body>
+
+<h1>Wiki Syntax Quick Reference</h1>
+
+<table width="100%">
+<tr><th colspan="3">Font Styles</th></tr>
+<tr><th><img src="../../images/jstoolbar/bt_strong.png" style="border: 1px solid #bbb;" /></th><td width="50%">*Strong*</td><td width="50%"><strong>Strong</strong></td></tr>
+<tr><th><img src="../../images/jstoolbar/bt_em.png" style="border: 1px solid #bbb;" /></th><td>_Italic_</td><td><em>Italic</em></td></tr>
+<tr><th><img src="../../images/jstoolbar/bt_ins.png" style="border: 1px solid #bbb;" /></th><td>+Underline+</td><td><ins>Underline</ins></td></tr>
+<tr><th><img src="../../images/jstoolbar/bt_del.png" style="border: 1px solid #bbb;" /></th><td>-Deleted-</td><td><del>Deleted</del></td></tr>
+<tr><th><img src="../../images/jstoolbar/bt_quote.png" style="border: 1px solid #bbb;" /></th><td>??Quote??</td><td><cite>Quote</cite></td></tr>
+<tr><th><img src="../../images/jstoolbar/bt_code.png" style="border: 1px solid #bbb;" /></th><td>@Code@</td><td><code>Code</code></td></tr>
+<tr><th></th><td>&lt;pre><br>&nbsp;lines<br />&nbsp;of code<br />&lt;/pre></td><td>
+<pre>
+ lines
+ of code
+</pre>
+</td></tr>
+
+<tr><th colspan="3">Lists</th></tr>
+<tr><th><img src="../../images/jstoolbar/bt_ul.png" style="border: 1px solid #bbb;" /></th><td>* Item 1<br />* Item 2</td><td><ul><li>Item 1</li><li>Item 2</li></ul></td></tr>
+<tr><th><img src="../../images/jstoolbar/bt_ol.png" style="border: 1px solid #bbb;" /></th><td># Item 1<br /># Item 2</td><td><ol><li>Item 1</li><li>Item 2</li></ol></td></tr>
+
+<tr><th colspan="3">Headings</th></tr>
+<tr><th></th><td>h1. Title 1</td><td><h1>Title 1</h1></td></tr>
+<tr><th><img src="../../images/jstoolbar/bt_heading.png" style="border: 1px solid #bbb;" /></th><td>h2. Title 2</td><td><h2>Title 2</h2></td></tr>
+<tr><th></th><td>h3. Title 3</td><td><h3>Title 3</h3></td></tr>
+
+<tr><th colspan="3">Links</th></tr>
+<tr><th></th><td>http://foo.bar</td><td><a href="#">http://foo.bar</a></td></tr>
+<tr><th><img src="../../images/jstoolbar/bt_link.png" style="border: 1px solid #bbb;" /></th><td>[[Wiki page]]</td><td><a href="#">Wiki page</a></td></tr>
+<tr><th></th><td>Issue #12</td><td>Issue <a href="#">#12</a></td></tr>
+<tr><th></th><td>Revision r43</td><td>Revision <a href="#">r43</a></td></tr>
+
+<tr><th colspan="3">Inline images</th></tr>
+<tr><th></th><td>!<em>image_url</em>!</td><td></td></tr>
+<tr><th></th><td>!<em>attached_image</em>!</td><td></td></tr>
+</table>
+
+</body>
+</html>
\ No newline at end of file

From 355289fa677f6a9a26e252e640861497a34cada6 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Wed, 5 Dec 2007 19:21:25 +0000
Subject: [PATCH 042/710] Roadmap progress bars now differentiate the progress
 due to closed issues from the open issues progress (2 different colors).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@954 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/helpers/application_helper.rb  | 10 +++++++---
 app/models/version.rb              |  8 ++++++++
 app/views/projects/roadmap.rhtml   |  2 +-
 public/stylesheets/application.css |  1 +
 4 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index f4746c627..37c8b1c9b 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -319,13 +319,17 @@ module ApplicationHelper
     link_to_function(l(:button_uncheck_all), "checkAll('#{form_name}', false)")   
   end
   
-  def progress_bar(pct, options={})
+  def progress_bar(pcts, options={})
+    pcts = [pcts, pcts] unless pcts.is_a?(Array)
+    pcts[1] = pcts[1] - pcts[0]
+    pcts << (100 - pcts[1] - pcts[0])
     width = options[:width] || '100px;'
     legend = options[:legend] || ''
     content_tag('table',
       content_tag('tr',
-        (pct > 0 ? content_tag('td', '', :width => "#{pct.floor}%;", :class => 'closed') : '') +
-        (pct < 100 ? content_tag('td', '', :width => "#{100-pct.floor}%;", :class => 'open') : '')
+        (pcts[0] > 0 ? content_tag('td', '', :width => "#{pcts[0].floor}%;", :class => 'closed') : '') +
+        (pcts[1] > 0 ? content_tag('td', '', :width => "#{pcts[1].floor}%;", :class => 'done') : '') +
+        (pcts[2] > 0 ? content_tag('td', '', :width => "#{pcts[2].floor}%;", :class => 'todo') : '')
       ), :class => 'progress', :style => "width: #{width};") +
       content_tag('p', legend, :class => 'pourcent')
   end
diff --git a/app/models/version.rb b/app/models/version.rb
index 0547dbabc..266346c7b 100644
--- a/app/models/version.rb
+++ b/app/models/version.rb
@@ -49,6 +49,14 @@ class Version < ActiveRecord::Base
     end
   end
   
+  def closed_pourcent
+    if fixed_issues.count == 0
+      0
+    else
+      closed_issues_count * 100.0 / fixed_issues.count
+    end
+  end
+  
   # Returns true if the version is overdue: due date reached and some open issues
   def overdue?
     effective_date && (effective_date < Date.today) && (open_issues_count > 0)
diff --git a/app/views/projects/roadmap.rhtml b/app/views/projects/roadmap.rhtml
index c2f3cbf34..7c3544a53 100644
--- a/app/views/projects/roadmap.rhtml
+++ b/app/views/projects/roadmap.rhtml
@@ -16,7 +16,7 @@
     <p><%=h version.description %></p>        
     
     <% if version.fixed_issues.count > 0 %>
-        <%= progress_bar(version.completed_pourcent, :width => '40em', :legend => ('%0.0f%' % version.completed_pourcent)) %>
+        <%= progress_bar([version.closed_pourcent, version.completed_pourcent], :width => '40em', :legend => ('%0.0f%' % version.completed_pourcent)) %>
         <p class="progress-info">
             <%= link_to(version.closed_issues_count, :controller => 'issues', :action => 'index', :project_id => @project, :status_id => 'c', :fixed_version_id => version, :set_filter => 1) %>
             <%= lwr(:label_closed_issues, version.closed_issues_count) %>
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 1059d960b..a10524dbb 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -262,6 +262,7 @@ table.progress {
 
 table.progress td { height: 0.9em; }
 table.progress td.closed { background: #BAE0BA none repeat scroll 0%; }
+table.progress td.done { background: #DEF0DE none repeat scroll 0%; }
 table.progress td.open { background: #FFF none repeat scroll 0%; }
 p.pourcent {font-size: 80%;}
 p.progress-info {clear: left; font-style: italic; font-size: 80%;}

From 3c44aac1f50cfee83e87baa21d758620749c01e0 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Fri, 7 Dec 2007 10:26:07 +0000
Subject: [PATCH 043/710] Added version details view accessible from the
 roadmap.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@955 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/versions_controller.rb      | 10 ++++
 app/helpers/versions_helper.rb              | 28 +++++++++
 app/models/issue_category.rb                |  4 ++
 app/models/tracker.rb                       |  4 ++
 app/views/projects/roadmap.rhtml            | 66 ++++++++-------------
 app/views/projects/settings/_versions.rhtml |  2 +-
 app/views/versions/_issue_counts.rhtml      | 35 +++++++++++
 app/views/versions/_overview.rhtml          | 24 ++++++++
 app/views/versions/show.rhtml               | 14 +++++
 lang/bg.yml                                 |  1 +
 lang/cs.yml                                 |  1 +
 lang/de.yml                                 |  1 +
 lang/en.yml                                 |  1 +
 lang/es.yml                                 |  1 +
 lang/fr.yml                                 |  1 +
 lang/he.yml                                 |  1 +
 lang/it.yml                                 |  1 +
 lang/ja.yml                                 |  1 +
 lang/ko.yml                                 |  1 +
 lang/nl.yml                                 |  1 +
 lang/pl.yml                                 |  1 +
 lang/pt-br.yml                              |  1 +
 lang/pt.yml                                 |  1 +
 lang/ro.yml                                 |  1 +
 lang/ru.yml                                 |  1 +
 lang/sr.yml                                 |  1 +
 lang/sv.yml                                 |  1 +
 lang/zh.yml                                 |  1 +
 lib/redmine.rb                              |  1 +
 public/stylesheets/application.css          |  2 +
 test/functional/versions_controller_test.rb | 42 +++++++++++++
 31 files changed, 208 insertions(+), 43 deletions(-)
 create mode 100644 app/views/versions/_issue_counts.rhtml
 create mode 100644 app/views/versions/_overview.rhtml
 create mode 100644 app/views/versions/show.rhtml
 create mode 100644 test/functional/versions_controller_test.rb

diff --git a/app/controllers/versions_controller.rb b/app/controllers/versions_controller.rb
index 4e9016ebf..1365c97e8 100644
--- a/app/controllers/versions_controller.rb
+++ b/app/controllers/versions_controller.rb
@@ -21,6 +21,9 @@ class VersionsController < ApplicationController
 
   cache_sweeper :version_sweeper, :only => [ :edit, :destroy ]
   
+  def show
+  end
+  
   def edit
     if request.post? and @version.update_attributes(params[:version])
       flash[:notice] = l(:notice_successful_update)
@@ -49,6 +52,13 @@ class VersionsController < ApplicationController
     flash[:notice] = l(:notice_successful_delete)
     redirect_to :controller => 'projects', :action => 'list_files', :id => @project
   end
+  
+  def status_by
+    respond_to do |format|
+      format.html { render :action => 'show' }
+      format.js { render(:update) {|page| page.replace_html 'status_by', render_issue_status_by(@version, params[:status_by])} }
+    end
+  end
 
 private
   def find_project
diff --git a/app/helpers/versions_helper.rb b/app/helpers/versions_helper.rb
index 452f4d7fb..0fcc6407c 100644
--- a/app/helpers/versions_helper.rb
+++ b/app/helpers/versions_helper.rb
@@ -16,4 +16,32 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 module VersionsHelper
+
+  STATUS_BY_CRITERIAS = %w(category tracker priority author assigned_to)
+  
+  def render_issue_status_by(version, criteria)
+    criteria ||= 'category'
+    raise 'Unknown criteria' unless STATUS_BY_CRITERIAS.include?(criteria)
+    
+    h = Hash.new {|k,v| k[v] = [0, 0]}
+    begin
+      # Total issue count
+      Issue.count(:group => criteria,
+                  :conditions => ["#{Issue.table_name}.fixed_version_id = ?", version.id]).each {|c,s| h[c][0] = s}
+      # Open issues count
+      Issue.count(:group => criteria,
+                  :include => :status,
+                  :conditions => ["#{Issue.table_name}.fixed_version_id = ? AND #{IssueStatus.table_name}.is_closed = ?", version.id, false]).each {|c,s| h[c][1] = s}
+    rescue ActiveRecord::RecordNotFound
+    # When grouping by an association, Rails throws this exception if there's no result (bug)
+    end
+    counts = h.keys.compact.sort.collect {|k| {:group => k, :total => h[k][0], :open => h[k][1], :closed => (h[k][0] - h[k][1])}}
+    max = counts.collect {|c| c[:total]}.max
+    
+    render :partial => 'issue_counts', :locals => {:version => version, :criteria => criteria, :counts => counts, :max => max}
+  end
+  
+  def status_by_options_for_select(value)
+    options_for_select(STATUS_BY_CRITERIAS.collect {|criteria| [l("field_#{criteria}".to_sym), criteria]}, value)
+  end
 end
diff --git a/app/models/issue_category.rb b/app/models/issue_category.rb
index 9478504f1..51baeb419 100644
--- a/app/models/issue_category.rb
+++ b/app/models/issue_category.rb
@@ -35,5 +35,9 @@ class IssueCategory < ActiveRecord::Base
     destroy_without_reassign
   end
   
+  def <=>(category)
+    name <=> category.name
+  end
+  
   def to_s; name end
 end
diff --git a/app/models/tracker.rb b/app/models/tracker.rb
index 6de2a098c..8d8647747 100644
--- a/app/models/tracker.rb
+++ b/app/models/tracker.rb
@@ -29,6 +29,10 @@ class Tracker < ActiveRecord::Base
 
   def to_s; name end
   
+  def <=>(tracker)
+    name <=> tracker.name
+  end
+
   def self.all
     find(:all, :order => 'position')
   end
diff --git a/app/views/projects/roadmap.rhtml b/app/views/projects/roadmap.rhtml
index 7c3544a53..daf7639fc 100644
--- a/app/views/projects/roadmap.rhtml
+++ b/app/views/projects/roadmap.rhtml
@@ -5,48 +5,28 @@
 <% end %>
 
 <% @versions.each do |version| %>   
-    <a name="<%= version.name %>"><h3 class="icon22 icon22-package"><%= version.name %></h3></a>
-    <% if version.completed? %>
-      <p><%= format_date(version.effective_date) %></p>
-    <% elsif version.overdue? %>
-      <p><strong><%= l(:label_roadmap_overdue, distance_of_time_in_words(Time.now, version.effective_date)) %> (<%= format_date(version.effective_date) %>)</strong></p>
-    <% elsif version.effective_date %>
-      <p><strong><%=l(:label_roadmap_due_in)%> <%= distance_of_time_in_words Time.now, version.effective_date %> (<%= format_date(version.effective_date) %>)</strong></p>
-    <% end %>
-    <p><%=h version.description %></p>        
-    
-    <% if version.fixed_issues.count > 0 %>
-        <%= progress_bar([version.closed_pourcent, version.completed_pourcent], :width => '40em', :legend => ('%0.0f%' % version.completed_pourcent)) %>
-        <p class="progress-info">
-            <%= link_to(version.closed_issues_count, :controller => 'issues', :action => 'index', :project_id => @project, :status_id => 'c', :fixed_version_id => version, :set_filter => 1) %>
-            <%= lwr(:label_closed_issues, version.closed_issues_count) %>
-            (<%= '%0.0f' % (version.closed_issues_count.to_f / version.fixed_issues.count * 100) %>%)
-            &#160;
-            <%= link_to(version.open_issues_count, :controller => 'issues', :action => 'index', :project_id => @project, :status_id => 'o', :fixed_version_id => version, :set_filter => 1) %>
-            <%= lwr(:label_open_issues, version.open_issues_count)%>
-            (<%= '%0.0f' % (version.open_issues_count.to_f / version.fixed_issues.count * 100) %>%)
-        </p>
-        <%= render(:partial => "wiki/content", :locals => {:content => version.wiki_page.content}) if version.wiki_page %>
-        <% issues = version.fixed_issues.find(:all,
-                                     :include => [:status, :tracker],
-                                     :conditions => ["tracker_id in (#{@selected_tracker_ids.join(',')})"],
-                                     :order => "#{Tracker.table_name}.position") unless @selected_tracker_ids.empty?
-           issues ||= []
-        %>
-        <ul>
-          <% if issues.size > 0 %>
-            <% issues.each do |issue| %>
-              <li>
-                <%= link = link_to_issue(issue)
-                    issue.status.is_closed? ? content_tag("del", link) : link %>: <%=h issue.subject %>
-                <%= content_tag "em", "(#{l(:label_closed_issues)})" if issue.status.is_closed? %>
-              </li>
-            <% end %>
-          <% end %>
-        </ul>
-    <% else %>
-        <p><em><%= l(:label_roadmap_no_issues) %></em></p>
-    <% end %>
+    <%= tag 'a', :name => version.name %>
+    <h3 class="icon22 icon22-package"><%= link_to h(version.name), :controller => 'versions', :action => 'show', :id => version %></h3>
+    <%= render :partial => 'versions/overview', :locals => {:version => version} %>
+    <%= render(:partial => "wiki/content", :locals => {:content => version.wiki_page.content}) if version.wiki_page %>
+
+    <% issues = version.fixed_issues.find(:all,
+                                          :include => [:status, :tracker],
+                                          :conditions => ["tracker_id in (#{@selected_tracker_ids.join(',')})"],
+                                          :order => "#{Tracker.table_name}.position") unless @selected_tracker_ids.empty?
+       issues ||= []
+    %>
+    <ul>
+      <% if issues.size > 0 %>
+        <% issues.each do |issue| %>
+          <li>
+            <%= link = link_to_issue(issue)
+                issue.status.is_closed? ? content_tag("del", link) : link %>: <%=h issue.subject %>
+            <%= content_tag "em", "(#{l(:label_closed_issues)})" if issue.status.is_closed? %>
+          </li>
+        <% end %>
+      <% end %>
+    </ul>
 <% end %>
 
 <% content_for :sidebar do %>
@@ -66,3 +46,5 @@
 <%= link_to version.name, :anchor => version.name %><br />
 <% end %>
 <% end %>
+
+<% set_html_title l(:label_roadmap) %>
diff --git a/app/views/projects/settings/_versions.rhtml b/app/views/projects/settings/_versions.rhtml
index 63c408b0d..7329c7f3b 100644
--- a/app/views/projects/settings/_versions.rhtml
+++ b/app/views/projects/settings/_versions.rhtml
@@ -11,7 +11,7 @@
 	<tbody>
 <% for version in @project.versions.sort %>
     <tr class="<%= cycle 'odd', 'even' %>">
-    <td><%=h version.name %></td>
+    <td><%= link_to h(version.name), :controller => 'versions', :action => 'show', :id => version %></td>
     <td align="center"><%= format_date(version.effective_date) %></td>
     <td><%=h version.description %></td>
     <td><%= link_to(version.wiki_page_title, :controller => 'wiki', :page => Wiki.titleize(version.wiki_page_title)) unless version.wiki_page_title.blank? || @project.wiki.nil? %></td>
diff --git a/app/views/versions/_issue_counts.rhtml b/app/views/versions/_issue_counts.rhtml
new file mode 100644
index 000000000..4bab5c659
--- /dev/null
+++ b/app/views/versions/_issue_counts.rhtml
@@ -0,0 +1,35 @@
+<form id="status_by_form">
+<fieldset>
+<legend>
+<%= l(:label_issues_by, 
+       select_tag('status_by',
+                   status_by_options_for_select(criteria),
+                   :id => 'status_by_select',
+                   :onchange => remote_function(:url => { :action => :status_by, :id => version },
+                                                :with => "Form.serialize('status_by_form')"))) %>
+</legend>
+<% if counts.empty? %>
+    <p><em><%= l(:label_no_data) %></em></p>
+<% else %>
+    <table>
+    <% counts.each do |count| %>
+    <tr>
+        <td width="130px" align="right" >
+            <%= link_to count[:group], {:controller => 'issues', 
+                                        :action => 'index',
+                                        :project_id => version.project,
+                                        :set_filter => 1,
+                                        :fixed_version_id => version,
+                                        "#{criteria}_id" => count[:group]} %>
+        </td>
+        <td width="240px">
+            <%= progress_bar((count[:closed].to_f / count[:total])*100, 
+                  :legend => "#{count[:closed]}/#{count[:total]}",
+                  :width => "#{(count[:total].to_f / max * 200).floor}px;") %>
+        </td>
+    </tr>
+    <% end %>
+    </table>
+<% end %>
+</fieldset>
+</form>
diff --git a/app/views/versions/_overview.rhtml b/app/views/versions/_overview.rhtml
new file mode 100644
index 000000000..d3aa6b18f
--- /dev/null
+++ b/app/views/versions/_overview.rhtml
@@ -0,0 +1,24 @@
+<% if version.completed? %>
+  <p><%= format_date(version.effective_date) %></p>
+<% elsif version.overdue? %>
+  <p><strong><%= l(:label_roadmap_overdue, distance_of_time_in_words(Time.now, version.effective_date)) %> (<%= format_date(version.effective_date) %>)</strong></p>
+<% elsif version.effective_date %>
+  <p><strong><%=l(:label_roadmap_due_in)%> <%= distance_of_time_in_words Time.now, version.effective_date %> (<%= format_date(version.effective_date) %>)</strong></p>
+<% end %>
+
+<p><%=h version.description %></p>
+
+<% if version.fixed_issues.count > 0 %>
+    <%= progress_bar([version.closed_pourcent, version.completed_pourcent], :width => '40em', :legend => ('%0.0f%' % version.completed_pourcent)) %>
+    <p class="progress-info">
+        <%= link_to(version.closed_issues_count, :controller => 'issues', :action => 'index', :project_id => version.project, :status_id => 'c', :fixed_version_id => version, :set_filter => 1) %>
+        <%= lwr(:label_closed_issues, version.closed_issues_count) %>
+        (<%= '%0.0f' % (version.closed_issues_count.to_f / version.fixed_issues.count * 100) %>%)
+        &#160;
+        <%= link_to(version.open_issues_count, :controller => 'issues', :action => 'index', :project_id => version.project, :status_id => 'o', :fixed_version_id => version, :set_filter => 1) %>
+        <%= lwr(:label_open_issues, version.open_issues_count)%>
+        (<%= '%0.0f' % (version.open_issues_count.to_f / version.fixed_issues.count * 100) %>%)
+    </p>
+<% else %>
+    <p><em><%= l(:label_roadmap_no_issues) %></em></p>
+<% end %>
diff --git a/app/views/versions/show.rhtml b/app/views/versions/show.rhtml
new file mode 100644
index 000000000..d8e2d243d
--- /dev/null
+++ b/app/views/versions/show.rhtml
@@ -0,0 +1,14 @@
+<div class="contextual">
+<%= link_to_if_authorized l(:button_edit), {:controller => 'versions', :action => 'edit', :id => @version}, :class => 'icon icon-edit' %>
+</div>
+
+<h2><%= h(@version.name) %></h2>
+
+<div id="status_by" style="float:right;">
+<%= render_issue_status_by(@version, params[:status_by]) if @version.fixed_issues.count > 0 %>
+</div>
+
+<%= render :partial => 'versions/overview', :locals => {:version => @version} %>
+<%= render(:partial => "wiki/content", :locals => {:content => @version.wiki_page.content}) if @version.wiki_page %>
+
+<% set_html_title h(@version.name) %>
diff --git a/lang/bg.yml b/lang/bg.yml
index 5f2dc6a8d..590952681 100644
--- a/lang/bg.yml
+++ b/lang/bg.yml
@@ -548,3 +548,4 @@ field_time_zone: Time zone
 text_caracters_minimum: Must be at least %d characters long.
 setting_bcc_recipients: Blind carbon copy recipients (bcc)
 button_annotate: Annotate
+label_issues_by: Issues by %s
diff --git a/lang/cs.yml b/lang/cs.yml
index 49697dda8..816f9b92e 100644
--- a/lang/cs.yml
+++ b/lang/cs.yml
@@ -548,3 +548,4 @@ field_time_zone: Time zone
 text_caracters_minimum: Must be at least %d characters long.
 setting_bcc_recipients: Blind carbon copy recipients (bcc)
 button_annotate: Annotate
+label_issues_by: Issues by %s
diff --git a/lang/de.yml b/lang/de.yml
index 870f45014..046ed9994 100644
--- a/lang/de.yml
+++ b/lang/de.yml
@@ -548,3 +548,4 @@ field_time_zone: Zeitzone
 text_caracters_minimum: Muss mindestens %d Zeichen lang sein.
 setting_bcc_recipients: Blind carbon copy recipients (bcc)
 button_annotate: Annotate
+label_issues_by: Issues by %s
diff --git a/lang/en.yml b/lang/en.yml
index cdecb6693..104e7fe6e 100644
--- a/lang/en.yml
+++ b/lang/en.yml
@@ -210,6 +210,7 @@ label_issue: Issue
 label_issue_new: New issue
 label_issue_plural: Issues
 label_issue_view_all: View all issues
+label_issues_by: Issues by %s
 label_document: Document
 label_document_new: New document
 label_document_plural: Documents
diff --git a/lang/es.yml b/lang/es.yml
index 5f25de7cf..d806d066e 100644
--- a/lang/es.yml
+++ b/lang/es.yml
@@ -551,3 +551,4 @@ notice_account_pending: "Su cuenta ha sido creada y está pendiende de la aproba
 setting_time_format: Formato de hora
 setting_bcc_recipients: Blind carbon copy recipients (bcc)
 button_annotate: Annotate
+label_issues_by: Issues by %s
diff --git a/lang/fr.yml b/lang/fr.yml
index 63f367f06..36ccc463f 100644
--- a/lang/fr.yml
+++ b/lang/fr.yml
@@ -210,6 +210,7 @@ label_issue: Demande
 label_issue_new: Nouvelle demande
 label_issue_plural: Demandes
 label_issue_view_all: Voir toutes les demandes
+label_issues_by: Demandes par %s
 label_document: Document
 label_document_new: Nouveau document
 label_document_plural: Documents
diff --git a/lang/he.yml b/lang/he.yml
index 4ebbecf7a..6be1a4c77 100644
--- a/lang/he.yml
+++ b/lang/he.yml
@@ -548,3 +548,4 @@ field_time_zone: Time zone
 text_caracters_minimum: Must be at least %d characters long.
 setting_bcc_recipients: Blind carbon copy recipients (bcc)
 button_annotate: Annotate
+label_issues_by: Issues by %s
diff --git a/lang/it.yml b/lang/it.yml
index fa13513cb..8a3e954f4 100644
--- a/lang/it.yml
+++ b/lang/it.yml
@@ -548,3 +548,4 @@ field_time_zone: Time zone
 text_caracters_minimum: Must be at least %d characters long.
 setting_bcc_recipients: Blind carbon copy recipients (bcc)
 button_annotate: Annotate
+label_issues_by: Issues by %s
diff --git a/lang/ja.yml b/lang/ja.yml
index d2f7d579f..1ecfb1ae9 100644
--- a/lang/ja.yml
+++ b/lang/ja.yml
@@ -549,3 +549,4 @@ field_time_zone: Time zone
 text_caracters_minimum: Must be at least %d characters long.
 setting_bcc_recipients: Blind carbon copy recipients (bcc)
 button_annotate: Annotate
+label_issues_by: Issues by %s
diff --git a/lang/ko.yml b/lang/ko.yml
index dd50ce2bc..ef081e622 100644
--- a/lang/ko.yml
+++ b/lang/ko.yml
@@ -548,3 +548,4 @@ field_time_zone: Time zone
 text_caracters_minimum: Must be at least %d characters long.
 setting_bcc_recipients: Blind carbon copy recipients (bcc)
 button_annotate: Annotate
+label_issues_by: Issues by %s
diff --git a/lang/nl.yml b/lang/nl.yml
index 895feb5ed..24a343eb3 100644
--- a/lang/nl.yml
+++ b/lang/nl.yml
@@ -549,3 +549,4 @@ field_time_zone: Time zone
 text_caracters_minimum: Must be at least %d characters long.
 setting_bcc_recipients: Blind carbon copy recipients (bcc)
 button_annotate: Annotate
+label_issues_by: Issues by %s
diff --git a/lang/pl.yml b/lang/pl.yml
index 381dc5e26..ff5f8d828 100644
--- a/lang/pl.yml
+++ b/lang/pl.yml
@@ -548,3 +548,4 @@ field_time_zone: Strefa czasowa
 text_caracters_minimum: Must be at least %d characters long.
 setting_bcc_recipients: Blind carbon copy recipients (bcc)
 button_annotate: Annotate
+label_issues_by: Issues by %s
diff --git a/lang/pt-br.yml b/lang/pt-br.yml
index 4c4d862d3..8c903edd4 100644
--- a/lang/pt-br.yml
+++ b/lang/pt-br.yml
@@ -548,3 +548,4 @@ field_time_zone: Time zone
 text_caracters_minimum: Must be at least %d characters long.
 setting_bcc_recipients: Blind carbon copy recipients (bcc)
 button_annotate: Annotate
+label_issues_by: Issues by %s
diff --git a/lang/pt.yml b/lang/pt.yml
index 1aabc8ac7..10de07b5f 100644
--- a/lang/pt.yml
+++ b/lang/pt.yml
@@ -548,3 +548,4 @@ field_time_zone: Time zone
 text_caracters_minimum: Must be at least %d characters long.
 setting_bcc_recipients: Blind carbon copy recipients (bcc)
 button_annotate: Annotate
+label_issues_by: Issues by %s
diff --git a/lang/ro.yml b/lang/ro.yml
index 0c10c7727..f7d3acd56 100644
--- a/lang/ro.yml
+++ b/lang/ro.yml
@@ -548,3 +548,4 @@ field_time_zone: Time zone
 text_caracters_minimum: Must be at least %d characters long.
 setting_bcc_recipients: Blind carbon copy recipients (bcc)
 button_annotate: Annotate
+label_issues_by: Issues by %s
diff --git a/lang/ru.yml b/lang/ru.yml
index c6e27ca9f..cad357c0c 100644
--- a/lang/ru.yml
+++ b/lang/ru.yml
@@ -548,3 +548,4 @@ field_time_zone: Часовой пояс
 text_caracters_minimum: Must be at least %d characters long.
 setting_bcc_recipients: Blind carbon copy recipients (bcc)
 button_annotate: Annotate
+label_issues_by: Issues by %s
diff --git a/lang/sr.yml b/lang/sr.yml
index 42aa3cc3e..f9008d890 100644
--- a/lang/sr.yml
+++ b/lang/sr.yml
@@ -549,3 +549,4 @@ field_time_zone: Time zone
 text_caracters_minimum: Must be at least %d characters long.
 setting_bcc_recipients: Blind carbon copy recipients (bcc)
 button_annotate: Annotate
+label_issues_by: Issues by %s
diff --git a/lang/sv.yml b/lang/sv.yml
index 7cbcc7a5f..a4f55a17a 100644
--- a/lang/sv.yml
+++ b/lang/sv.yml
@@ -549,3 +549,4 @@ field_time_zone: Time zone
 text_caracters_minimum: Must be at least %d characters long.
 setting_bcc_recipients: Blind carbon copy recipients (bcc)
 button_annotate: Annotate
+label_issues_by: Issues by %s
diff --git a/lang/zh.yml b/lang/zh.yml
index ad18cecc3..18fe3fda1 100644
--- a/lang/zh.yml
+++ b/lang/zh.yml
@@ -551,3 +551,4 @@ field_time_zone: Time zone
 text_caracters_minimum: Must be at least %d characters long.
 setting_bcc_recipients: Blind carbon copy recipients (bcc)
 button_annotate: Annotate
+label_issues_by: Issues by %s
diff --git a/lib/redmine.rb b/lib/redmine.rb
index 32239ce59..1f1053438 100644
--- a/lib/redmine.rb
+++ b/lib/redmine.rb
@@ -27,6 +27,7 @@ Redmine::AccessControl.map do |map|
     # Issues
     map.permission :view_issues, {:projects => [:changelog, :roadmap], 
                                   :issues => [:index, :changes, :show, :context_menu],
+                                  :versions => [:show, :status_by],
                                   :queries => :index,
                                   :reports => :issue_report}, :public => true                    
     map.permission :add_issues, {:projects => :add_issue}
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index a10524dbb..f05fb9d91 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -267,6 +267,8 @@ table.progress td.open { background: #FFF none repeat scroll 0%; }
 p.pourcent {font-size: 80%;}
 p.progress-info {clear: left; font-style: italic; font-size: 80%;}
 
+div#status_by { margin-left: 16px; margin-bottom: 16px; }
+
 /***** Tabs *****/
 #content .tabs{height: 2.6em;}
 #content .tabs ul{margin:0;}
diff --git a/test/functional/versions_controller_test.rb b/test/functional/versions_controller_test.rb
new file mode 100644
index 000000000..e8327938a
--- /dev/null
+++ b/test/functional/versions_controller_test.rb
@@ -0,0 +1,42 @@
+# 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 File.dirname(__FILE__) + '/../test_helper'
+require 'versions_controller'
+
+# Re-raise errors caught by the controller.
+class VersionsController; def rescue_action(e) raise e end; end
+
+class VersionsControllerTest < Test::Unit::TestCase
+  fixtures :projects, :versions, :users, :roles, :members, :enabled_modules
+  
+  def setup
+    @controller = VersionsController.new
+    @request    = ActionController::TestRequest.new
+    @response   = ActionController::TestResponse.new
+    User.current = nil
+  end
+  
+  def test_show
+    get :show, :id => 2
+    assert_response :success
+    assert_template 'show'
+    assert_not_nil assigns(:version)
+    
+    assert_tag :tag => 'h2', :content => /1.0/
+  end
+end

From a79cf8d574d1bdad8483586014019ed9ee2b3bdf Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Fri, 7 Dec 2007 10:27:52 +0000
Subject: [PATCH 044/710] Fixed a parenthesis warning in news/show.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@956 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/news/show.rhtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/news/show.rhtml b/app/views/news/show.rhtml
index 2b51c1fee..32a24e85e 100644
--- a/app/views/news/show.rhtml
+++ b/app/views/news/show.rhtml
@@ -30,7 +30,7 @@
     <div class="contextual">
         <%= link_to_if_authorized l(:button_delete), {:controller => 'news', :action => 'destroy_comment', :id => @news, :comment_id => comment}, :confirm => l(:text_are_you_sure), :method => :post, :class => 'icon icon-del' %>
     </div>
-    <%= simple_format(auto_link(h comment.comments))%>
+    <%= simple_format(auto_link(h(comment.comments)))%>
 <% end if @news.comments_count > 0 %>
 </div>
 

From 5e38bd93634b9135e5f294ec1823e8a6b04c3b64 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Fri, 7 Dec 2007 11:19:30 +0000
Subject: [PATCH 045/710] Performance improvement on workflow setup screen.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@957 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/roles_controller.rb                |  2 +-
 app/views/roles/workflow.rhtml                     | 14 ++++++--------
 ...d_role_tracker_old_status_index_to_workflows.rb |  9 +++++++++
 3 files changed, 16 insertions(+), 9 deletions(-)
 create mode 100644 db/migrate/085_add_role_tracker_old_status_index_to_workflows.rb

diff --git a/app/controllers/roles_controller.rb b/app/controllers/roles_controller.rb
index 3b5766aaf..a8a31cd4d 100644
--- a/app/controllers/roles_controller.rb
+++ b/app/controllers/roles_controller.rb
@@ -94,7 +94,7 @@ class RolesController < ApplicationController
     end
     @roles = Role.find(:all, :order => 'builtin, position')
     @trackers = Tracker.find(:all, :order => 'position')
-    @statuses = IssueStatus.find(:all, :include => :workflows, :order => 'position')
+    @statuses = IssueStatus.find(:all, :order => 'position')
   end
   
   def report    
diff --git a/app/views/roles/workflow.rhtml b/app/views/roles/workflow.rhtml
index 2bc2abd51..0a435744f 100644
--- a/app/views/roles/workflow.rhtml
+++ b/app/views/roles/workflow.rhtml
@@ -35,18 +35,16 @@
 	
 	<% for old_status in @statuses %>
 		<tr>
-		<td><%= old_status.name %></td>		
-		<% for new_status in @statuses %>
+		<td><%= old_status.name %></td>
+		<% new_status_ids_allowed = old_status.find_new_statuses_allowed_to(@role, @tracker).collect(&:id) -%>
+		<% for new_status in @statuses -%>
 			<td align="center">
-      
-     <input type="checkbox"
+      <input type="checkbox"
       name="issue_status[<%= old_status.id %>][]"
       value="<%= new_status.id %>"
-      <%if old_status.new_statuses_allowed_to(@role, @tracker).include? new_status%>checked="checked"<%end%>
-      >			
+      <%= 'checked="checked"' if new_status_ids_allowed.include? new_status.id %>>			
 			</td>
-		<% end %>		
-		
+		<% end -%>
 		</tr>
 	<% end %>
 	</table>
diff --git a/db/migrate/085_add_role_tracker_old_status_index_to_workflows.rb b/db/migrate/085_add_role_tracker_old_status_index_to_workflows.rb
new file mode 100644
index 000000000..523cf091b
--- /dev/null
+++ b/db/migrate/085_add_role_tracker_old_status_index_to_workflows.rb
@@ -0,0 +1,9 @@
+class AddRoleTrackerOldStatusIndexToWorkflows < ActiveRecord::Migration
+  def self.up
+    add_index :workflows, [:role_id, :tracker_id, :old_status_id], :name => :workflows_role_tracker_old_status
+  end
+
+  def self.down
+    remove_index :workflows, :name => :workflows_role_tracker_old_status
+  end
+end

From a7c2b63fb61082bb54afe49880ebe0c21566ba3f Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Fri, 7 Dec 2007 13:35:38 +0000
Subject: [PATCH 046/710] Transaction and performance improvement on workflow
 copy when creating a new tracker.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@958 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/trackers_controller.rb | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/controllers/trackers_controller.rb b/app/controllers/trackers_controller.rb
index 0fc91b527..46edea548 100644
--- a/app/controllers/trackers_controller.rb
+++ b/app/controllers/trackers_controller.rb
@@ -37,8 +37,10 @@ class TrackersController < ApplicationController
     if request.post? and @tracker.save
       # workflow copy
       if !params[:copy_workflow_from].blank? && (copy_from = Tracker.find_by_id(params[:copy_workflow_from]))
-        copy_from.workflows.each do |w|
-          @tracker.workflows << w.clone
+        Workflow.transaction do
+          copy_from.workflows.find(:all, :include => [:role, :old_status, :new_status]).each do |w|
+            Workflow.create(:tracker_id => @tracker.id, :role => w.role, :old_status => w.old_status, :new_status => w.new_status)
+          end
         end
       end
       flash[:notice] = l(:notice_successful_create)

From 36c0ab196ca772c123e7327b6829b8387f9e0aeb Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Fri, 7 Dec 2007 14:43:07 +0000
Subject: [PATCH 047/710] Added Traditional Chinese translation (by Shortie
 Lo).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@959 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/helpers/application_helper.rb             |   2 +-
 lang/zh-tw.yml                                | 551 ++++++++++++++++++
 lang/zh.yml                                   |   2 +-
 .../calendar/lang/calendar-zh-tw.js           | 127 ++++
 4 files changed, 680 insertions(+), 2 deletions(-)
 create mode 100644 lang/zh-tw.yml
 create mode 100644 public/javascripts/calendar/lang/calendar-zh-tw.js

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 37c8b1c9b..8deed9000 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -299,7 +299,7 @@ module ApplicationHelper
   
   def lang_options_for_select(blank=true)
     (blank ? [["(auto)", ""]] : []) + 
-      GLoc.valid_languages.collect{|lang| [ ll(lang.to_s, :general_lang_name), lang.to_s]}.sort{|x,y| x.first <=> y.first }
+      GLoc.valid_languages.collect{|lang| [ ll(lang.to_s, :general_lang_name), lang.to_s]}.sort{|x,y| x.last <=> y.last }
   end
   
   def label_tag_for(name, option_tags = nil, options = {})
diff --git a/lang/zh-tw.yml b/lang/zh-tw.yml
new file mode 100644
index 000000000..7d9cdc957
--- /dev/null
+++ b/lang/zh-tw.yml
@@ -0,0 +1,551 @@
+_gloc_rule_default: '|n| n==1 ? "" : "_plural" '
+
+actionview_datehelper_select_day_prefix:
+actionview_datehelper_select_month_names: 一月,二月,三月,四月,五月,六月,七月,八月,九月,十月,十一月,十二月
+actionview_datehelper_select_month_names_abbr: 一月,二月,三月,四月,五月,六月,七月,八月,九月,十月,十一月,十二月
+actionview_datehelper_select_month_prefix:
+actionview_datehelper_select_year_prefix:
+actionview_datehelper_time_in_words_day: 1 日
+actionview_datehelper_time_in_words_day_plural: %d 日
+actionview_datehelper_time_in_words_hour_about: 約 1 小時
+actionview_datehelper_time_in_words_hour_about_plural: 約 %d 小時
+actionview_datehelper_time_in_words_hour_about_single: 約 1 小時
+actionview_datehelper_time_in_words_minute: 1 分鐘
+actionview_datehelper_time_in_words_minute_half: 半分鐘
+actionview_datehelper_time_in_words_minute_less_than: 小於 1 分鐘
+actionview_datehelper_time_in_words_minute_plural: %d 分鐘
+actionview_datehelper_time_in_words_minute_single: 1 分鐘
+actionview_datehelper_time_in_words_second_less_than: 小於 1 秒
+actionview_datehelper_time_in_words_second_less_than_plural: 小於 %d 秒
+actionview_instancetag_blank_option: 請選擇
+
+activerecord_error_inclusion: is not included in the list
+activerecord_error_exclusion: is reserved
+activerecord_error_invalid: is invalid
+activerecord_error_confirmation: doesn't match confirmation
+activerecord_error_accepted: must be accepted
+activerecord_error_empty: 不可為空值
+activerecord_error_blank: 不可為空白
+activerecord_error_too_long: 長度過長
+activerecord_error_too_short: 長度太短
+activerecord_error_wrong_length: is the wrong length
+activerecord_error_taken: has already been taken
+activerecord_error_not_a_number: is not a number
+activerecord_error_not_a_date: is not a valid date
+activerecord_error_greater_than_start_date: must be greater than start date
+activerecord_error_not_same_project: doesn't belong to the same project
+activerecord_error_circular_dependency: This relation would create a circular dependency
+
+general_fmt_age: %d 年
+general_fmt_age_plural: %d yrs
+general_fmt_date: %%m/%%d/%%Y
+general_fmt_datetime: %%m/%%d/%%Y %%I:%%M %%p
+general_fmt_datetime_short: %%b %%d, %%I:%%M %%p
+general_fmt_time: %%I:%%M %%p
+general_text_No: 'No'
+general_text_Yes: 'Yes'
+general_text_no: 'no'
+general_text_yes: 'yes'
+general_lang_name: 'Traditional Chinese (繁體中文)'
+general_csv_separator: ','
+general_csv_encoding: ISO-8859-1
+general_pdf_encoding: big5
+general_day_names: 星期一,星期二,星期三,星期四,星期五,星期六,星期日
+general_first_day_of_week: '7'
+
+notice_account_updated: 帳戶更新資訊已儲存
+notice_account_invalid_creditentials: 帳戶或密碼不正確
+notice_account_password_updated: 帳戶新密碼已儲存
+notice_account_wrong_password: 密碼不正確
+notice_account_register_done: Account was successfully created. To activate your account, click on the link that was emailed to you.
+notice_account_unknown_email: Unknown user.
+notice_can_t_change_password: This account uses an external authentication source. Impossible to change the password.
+notice_account_lost_email_sent: An email with instructions to choose a new password has been sent to you.
+notice_account_activated: Your account has been activated. You can now log in.
+notice_successful_create: Successful creation.
+notice_successful_update: Successful update.
+notice_successful_delete: Successful deletion.
+notice_successful_connection: Successful connection.
+notice_file_not_found: The page you were trying to access doesn't exist or has been removed.
+notice_locking_conflict: Data have been updated by another user.
+notice_scm_error: Entry and/or revision doesn't exist in the repository.
+notice_not_authorized: You are not authorized to access this page.
+notice_email_sent: An email was sent to %s
+notice_email_error: An error occurred while sending mail (%s)
+notice_feeds_access_key_reseted: Your RSS access key was reseted.
+notice_failed_to_save_issues: "Failed to save %d issue(s) on %d selected: %s."
+notice_no_issue_selected: "No issue is selected! Please, check the issues you want to edit."
+notice_account_pending: "Your account was created and is now pending administrator approval."
+
+mail_subject_lost_password: Your Redmine password
+mail_body_lost_password: 'To change your Redmine password, click on the following link:'
+mail_subject_register: Redmine account activation
+mail_body_register: 'To activate your Redmine account, click on the following link:'
+mail_body_account_information_external: You can use your "%s" account to log into Redmine.
+mail_body_account_information: Your Redmine account information
+mail_subject_account_activation_request: Redmine account activation request
+mail_body_account_activation_request: 'A new user (%s) has registered. His account his pending your approval:'
+
+gui_validation_error: 1 個錯誤
+gui_validation_error_plural: %d 個錯誤
+
+field_name: 名稱
+field_description: 概述
+field_summary: 摘要
+field_is_required: 必填
+field_firstname: 名字
+field_lastname: 姓氏
+field_mail: 電子郵件
+field_filename: 檔案名稱
+field_filesize: 大小
+field_downloads: 下載次數
+field_author: 作者
+field_created_on: 建立日期
+field_updated_on: 更新
+field_field_format: 格式
+field_is_for_all: 給所有專案
+field_possible_values: Possible values
+field_regexp: 正規表示式
+field_min_length: 最小長度
+field_max_length: 最大長度
+field_value: 值
+field_category: 分類
+field_title: 標題
+field_project: 專案
+field_issue: 項目
+field_status: 狀態
+field_notes: 筆記
+field_is_closed: 項目結束
+field_is_default: 預設值
+field_tracker: 追蹤標籤
+field_subject: 主旨
+field_due_date: 完成日期
+field_assigned_to: 分派給
+field_priority: 重要性
+field_fixed_version: Fixed version
+field_user: 用戶
+field_role: 角色
+field_homepage: 網站首頁
+field_is_public: 公開
+field_parent: 父專案
+field_is_in_chlog: Issues displayed in changelog
+field_is_in_roadmap: Issues displayed in roadmap
+field_login: 帳戶名稱
+field_mail_notification: 電子郵件提醒選項
+field_admin: 管理者
+field_last_login_on: 最近連線日期
+field_language: 語系
+field_effective_date: 日期
+field_password: 目前密碼
+field_new_password: 新密碼
+field_password_confirmation: 確認新密碼
+field_version: 版本
+field_type: Type
+field_host: Host
+field_port: 連接埠
+field_account: 帳戶
+field_base_dn: Base DN
+field_attr_login: 登入屬性
+field_attr_firstname: 名字屬性
+field_attr_lastname: Lastname attribute
+field_attr_mail: Email attribute
+field_onthefly: On-the-fly user creation
+field_start_date: 開始日期
+field_done_ratio: %% 已完成
+field_auth_source: 認證模式
+field_hide_mail: 隱藏我的電子郵件
+field_comments: 註解
+field_url: URL
+field_start_page: Start page
+field_subproject: 子專案
+field_hours: 小時
+field_activity: Activity
+field_spent_on: 日期
+field_identifier: 代碼
+field_is_filter: Used as a filter
+field_issue_to_id: Related issue
+field_delay: 逾期
+field_assignable: Issues can be assigned to this role
+field_redirect_existing_links: Redirect existing links
+field_estimated_hours: 預估工時
+field_column_names: Columns
+field_time_zone: 時區
+
+setting_app_title: 標題
+setting_app_subtitle: 副標題
+setting_welcome_text: 歡迎詞
+setting_default_language: 預設語系
+setting_login_required: 需要驗證
+setting_self_registration: 註冊選項
+setting_attachment_max_size: 附件大小限制
+setting_issues_export_limit: 項目匯出限制
+setting_mail_from: 寄件者電子郵件
+setting_bcc_recipients: 使用密件副本 (BCC)
+setting_host_name: 主機名稱
+setting_text_formatting: 文字格式
+setting_wiki_compression: 壓縮 Wiki 歷史文章
+setting_feeds_limit: Feed content limit
+setting_autofetch_changesets: Autofetch commits
+setting_sys_api_enabled: Enable WS for repository management
+setting_commit_ref_keywords: Referencing keywords
+setting_commit_fix_keywords: Fixing keywords
+setting_autologin: 自動登入
+setting_date_format: 日期格式
+setting_time_format: 時間格式
+setting_cross_project_issue_relations: Allow cross-project issue relations
+setting_issue_list_default_columns: 預設顯示於項目清單的欄位
+setting_repositories_encodings: Repositories encodings
+setting_emails_footer: 電子郵件附帶說明
+setting_protocol: 協定
+
+label_user: 用戶
+label_user_plural: 用戶清單
+label_user_new: 建立新的帳戶
+label_project: 專案
+label_project_new: 建立新的專案
+label_project_plural: 專案清單
+label_project_all: 全部的專案
+label_project_latest: 最近的專案
+label_issue: 項目
+label_issue_new: 建立新的項目
+label_issue_plural: 項目清單
+label_issue_view_all: 檢視所有項目
+label_issues_by: Issues by %s
+label_document: 文件
+label_document_new: 建立新的文件
+label_document_plural: 文件
+label_role: 角色
+label_role_plural: 角色
+label_role_new: 建立新角色
+label_role_and_permissions: 角色與權限
+label_member: 成員
+label_member_new: 建立新的成員
+label_member_plural: 成員
+label_tracker: 追蹤標籤
+label_tracker_plural: 追蹤標籤清單
+label_tracker_new: 建立新的追蹤標籤
+label_workflow: 流程
+label_issue_status: 項目狀態
+label_issue_status_plural: 項目狀態清單
+label_issue_status_new: 建立新的狀態
+label_issue_category: 項目分類
+label_issue_category_plural: 項目分類清單
+label_issue_category_new: 建立新的分類
+label_custom_field: 自訂欄位
+label_custom_field_plural: 自訂欄位清單
+label_custom_field_new: 建立新的自訂欄位
+label_enumerations: 列舉值清單
+label_enumeration_new: 建立新的列舉值
+label_information: 資訊
+label_information_plural: 資訊
+label_please_login: 請先登入
+label_register: 註冊
+label_password_lost: 遺失密碼
+label_home: 網站首頁
+label_my_page: 帳戶首頁
+label_my_account: 我的帳戶
+label_my_projects: 我的專案
+label_administration: 網站管理
+label_login: 登入
+label_logout: 登出
+label_help: 說明
+label_reported_issues: 我通報的項目
+label_assigned_to_me_issues: 分派給我的項目
+label_last_login: 最近一次連線
+label_last_updates: 最近更新
+label_last_updates_plural: %d 個最近更新
+label_registered_on: 註冊於
+label_activity: 活動
+label_new: 建立新的...
+label_logged_as: 目前登入
+label_environment: 環境
+label_authentication: 認證
+label_auth_source: 認證模式
+label_auth_source_new: 建立新認證模式
+label_auth_source_plural: 認證模式清單
+label_subproject_plural: 子專案
+label_min_max_length: 最小 - 最大 長度
+label_list: 清單
+label_date: 日期
+label_integer: 整數
+label_float: 福點數
+label_boolean: 布林
+label_string: 文字
+label_text: 長文字
+label_attribute: 屬性
+label_attribute_plural: 屬性
+label_download: %d 個下載
+label_download_plural: %d 個下載
+label_no_data: 沒有任何資料可供顯示
+label_change_status: 變更狀態
+label_history: 歷史
+label_attachment: 檔案
+label_attachment_new: 建立新的檔案
+label_attachment_delete: 刪除檔案
+label_attachment_plural: 檔案
+label_report: 報告
+label_report_plural: 報告
+label_news: 新聞
+label_news_new: 建立新的新聞
+label_news_plural: 新聞
+label_news_latest: 最近新聞
+label_news_view_all: 檢視所有新聞
+label_change_log: 變更記錄
+label_settings: 設定
+label_overview: 概觀
+label_version: 版本
+label_version_new: 建立新的版本
+label_version_plural: 版本
+label_confirmation: 確認
+label_export_to: 匯出至
+label_read: Read...
+label_public_projects: 公開專案
+label_open_issues: 進行中
+label_open_issues_plural: 進行中
+label_closed_issues: 已結束
+label_closed_issues_plural: 已結束
+label_total: Total
+label_permissions: 權限
+label_current_status: Current status
+label_new_statuses_allowed: New statuses allowed
+label_all: 全部
+label_none: 空值
+label_nobody: nobody
+label_next: Next
+label_previous: Previous
+label_used_by: Used by
+label_details: Details
+label_add_note: 加入一個新筆記
+label_per_page: 每頁
+label_calendar: 日曆
+label_months_from: months from
+label_gantt: 甘特圖
+label_internal: Internal
+label_last_changes: 最近 %d 個變更
+label_change_view_all: 檢視所有變更
+label_personalize_page: 自訂版面
+label_comment: 註解
+label_comment_plural: 註解
+label_comment_add: 加入新註解
+label_comment_added: 新註解已加入
+label_comment_delete: 刪除註解
+label_query: 自訂查詢
+label_query_plural: 自訂查詢
+label_query_new: 建立新的查詢
+label_filter_add: 加入新篩選條件
+label_filter_plural: 篩選條件
+label_equals: 等於
+label_not_equals: 不等於
+label_in_less_than: 在小於
+label_in_more_than: 在大於
+label_in: 在
+label_today: 今天
+label_this_week: 本週
+label_less_than_ago: 小於幾天之前
+label_more_than_ago: 大於幾天之前
+label_ago: 天以前
+label_contains: 包含
+label_not_contains: 不包含
+label_day_plural: 天
+label_repository: 版本控管
+label_browse: 瀏覽
+label_modification: %d 變更
+label_modification_plural: %d 變更
+label_revision: 版次
+label_revision_plural: 版次清單
+label_added: 已新增
+label_modified: 已修改
+label_deleted: 已刪除
+label_latest_revision: 最新版次
+label_latest_revision_plural: 最近版次清單
+label_view_revisions: 檢視版次清單
+label_max_size: 最大長度
+label_on: 'on'
+label_sort_highest: 移動至開頭
+label_sort_higher: 往上移動
+label_sort_lower: 往下移動
+label_sort_lowest: 移動至結尾
+label_roadmap: 版本藍圖
+label_roadmap_due_in: 倒數天數： 
+label_roadmap_overdue: %s 逾期
+label_roadmap_no_issues: No issues for this version
+label_search: 搜尋
+label_result_plural: 結果
+label_all_words: All words
+label_wiki: Wiki
+label_wiki_edit: Wiki 編輯
+label_wiki_edit_plural: Wiki 編輯
+label_wiki_page: Wiki 網頁
+label_wiki_page_plural: Wiki 網頁
+label_index_by_title: 依標題索引
+label_index_by_date: 依日期索引
+label_current_version: 現行版本
+label_preview: 預覽
+label_feed_plural: Feeds
+label_changes_details: Details of all changes
+label_issue_tracking: 項目追蹤
+label_spent_time: 耗用時間
+label_f_hour: %.2f hour
+label_f_hour_plural: %.2f hours
+label_time_tracking: Time tracking
+label_change_plural: Changes
+label_statistics: Statistics
+label_commits_per_month: Commits per month
+label_commits_per_author: Commits per author
+label_view_diff: View differences
+label_diff_inline: inline
+label_diff_side_by_side: side by side
+label_options: 選項清單
+label_copy_workflow_from: Copy workflow from
+label_permissions_report: 權限報表
+label_watched_issues: 觀察中的項目清單
+label_related_issues: 相關的項目清單
+label_applied_status: 已套用狀態
+label_loading: 載入中...
+label_relation_new: 建立新關聯
+label_relation_delete: 刪除關聯
+label_relates_to: 關聯至
+label_duplicates: duplicates
+label_blocks: blocks
+label_blocked_by: blocked by
+label_precedes: precedes
+label_follows: follows
+label_end_to_start: end to start
+label_end_to_end: end to end
+label_start_to_start: start to start
+label_start_to_end: start to end
+label_stay_logged_in: Stay logged in
+label_disabled: 關閉
+label_show_completed_versions: 顯示已完成的版本
+label_me: 我自己
+label_board: 論壇
+label_board_new: 建立新論壇
+label_board_plural: 論壇
+label_topic_plural: 討論主題
+label_message_plural: 訊息
+label_message_last: 上一封訊息
+label_message_new: 建立新的訊息
+label_reply_plural: 回應
+label_send_information: 寄送帳戶資訊電子郵件給用戶
+label_year: 年
+label_month: 月
+label_week: 週
+label_date_from: 開始
+label_date_to: 結束
+label_language_based: 依用戶之語系決定
+label_sort_by: 按 %s 排序
+label_send_test_email: 寄送測試郵件
+label_feeds_access_key_created_on: RSS 存取鍵建立於 %s 之前
+label_module_plural: 模組
+label_added_time_by: Added by %s %s ago
+label_updated_time: Updated %s ago
+label_jump_to_a_project: 選擇欲前往的專案...
+label_file_plural: 檔案清單
+label_changeset_plural: Changesets
+label_default_columns: 預設欄位清單
+label_no_change_option: (No change)
+label_bulk_edit_selected_issues: Bulk edit selected issues
+label_theme: 畫面主題
+label_default: Default
+label_search_titles_only: Search titles only
+label_user_mail_option_all: "提醒與我的專案有關的所有事件"
+label_user_mail_option_selected: "只停醒我所選擇專案中的事件..."
+label_user_mail_option_none: "只提醒我觀察中或參與中的事件"
+label_user_mail_no_self_notified: "不提醒我自己所做的變更"
+label_registration_activation_by_email: 透過電子郵件啟用帳戶
+label_registration_manual_activation: 手動啟用帳戶
+label_registration_automatic_activation: 自動啟用帳戶
+
+button_login: 登入
+button_submit: 送出
+button_save: 儲存
+button_check_all: 全選
+button_uncheck_all: 全不選
+button_delete: 刪除
+button_create: 建立
+button_test: 測試
+button_edit: 編輯
+button_add: 新增
+button_change: 修改
+button_apply: 套用
+button_clear: 清除
+button_lock: 鎖定
+button_unlock: 解除鎖定
+button_download: 下載
+button_list: List
+button_view: 檢視
+button_move: 移動
+button_back: Back
+button_cancel: 取消
+button_activate: 啟用
+button_sort: 排序
+button_log_time: 記錄時間
+button_rollback: 還原至此版本
+button_watch: 觀察
+button_unwatch: 取消觀察
+button_reply: 回應
+button_archive: 歸檔
+button_unarchive: 取消歸檔
+button_reset: 回復
+button_rename: 重新命名
+button_change_password: 變更密碼
+button_copy: 複製
+button_annotate: 加注
+
+status_active: 活動中
+status_registered: 註冊完成
+status_locked: 鎖定中
+
+text_select_mail_notifications: 選擇欲寄送提醒通知郵件之動作
+text_regexp_info: eg. ^[A-Z0-9]+$
+text_min_max_length_info: 0 means no restriction
+text_project_destroy_confirmation: Are you sure you want to delete this project and all related data ?
+text_workflow_edit: Select a role and a tracker to edit the workflow
+text_are_you_sure: Are you sure ?
+text_journal_changed: changed from %s to %s
+text_journal_set_to: set to %s
+text_journal_deleted: deleted
+text_tip_task_begin_day: task beginning this day
+text_tip_task_end_day: task ending this day
+text_tip_task_begin_end_day: task beginning and ending this day
+text_project_identifier_info: '只允許小寫英文字母（a-z）、阿拉伯數字與連字符號（-）。<br />儲存後，代碼不可再被更改。'
+text_caracters_maximum: %d characters maximum.
+text_caracters_minimum: Must be at least %d characters long.
+text_length_between: Length between %d and %d characters.
+text_tracker_no_workflow: No workflow defined for this tracker
+text_unallowed_characters: Unallowed characters
+text_comma_separated: Multiple values allowed (comma separated).
+text_issues_ref_in_commit_messages: Referencing and fixing issues in commit messages
+text_issue_added: 已通報 %s 個項目
+text_issue_updated: 已更新 %s 個項目
+text_wiki_destroy_confirmation: Are you sure you want to delete this wiki and all its content ?
+text_issue_category_destroy_question: Some issues (%d) are assigned to this category. What do you want to do ?
+text_issue_category_destroy_assignments: Remove category assignments
+text_issue_category_reassign_to: Reassign issues to this category
+text_user_mail_option: "For unselected projects, you will only receive notifications about things you watch or you're involved in (eg. issues you're the author or assignee)."
+
+default_role_manager: 管理人員
+default_role_developper: 開發人員
+default_role_reporter: 報告人員
+default_tracker_bug: 臭蟲
+default_tracker_feature: 功能
+default_tracker_support: 支援
+default_issue_status_new: 新建立
+default_issue_status_assigned: 已指派
+default_issue_status_resolved: 已解決
+default_issue_status_feedback: 回應
+default_issue_status_closed: 已結束
+default_issue_status_rejected: 已拒絕
+default_doc_category_user: 使用手冊
+default_doc_category_tech: 技術文件
+default_priority_low: 低
+default_priority_normal: 正常
+default_priority_high: 高
+default_priority_urgent: 急
+default_priority_immediate: 特急
+default_activity_design: 設計
+default_activity_development: 開發
+
+enumeration_issue_priorities: 項目重要性
+enumeration_doc_categories: 文件分類
+enumeration_activities: 活動 (time tracking)
diff --git a/lang/zh.yml b/lang/zh.yml
index 18fe3fda1..de4ae1ece 100644
--- a/lang/zh.yml
+++ b/lang/zh.yml
@@ -49,7 +49,7 @@ general_text_No: '否'
 general_text_Yes: '是'
 general_text_no: '否'
 general_text_yes: '是'
-general_lang_name: 'Chinese (简体中文)'
+general_lang_name: 'Simplified Chinese (简体中文)'
 general_csv_separator: ','
 general_csv_encoding: gb2312
 general_pdf_encoding: Big5
diff --git a/public/javascripts/calendar/lang/calendar-zh-tw.js b/public/javascripts/calendar/lang/calendar-zh-tw.js
new file mode 100644
index 000000000..c48d25b0e
--- /dev/null
+++ b/public/javascripts/calendar/lang/calendar-zh-tw.js
@@ -0,0 +1,127 @@
+// ** I18N
+
+// Calendar EN language
+// Author: Mihai Bazon, <mihai_bazon@yahoo.com>
+// Encoding: any
+// Distributed under the same terms as the calendar itself.
+
+// For translators: please use UTF-8 if possible.  We strongly believe that
+// Unicode is the answer to a real internationalized world.  Also please
+// include your contact information in the header, as can be seen above.
+
+// full day names
+Calendar._DN = new Array
+("星期日",
+ "星期一",
+ "星期二",
+ "星期三",
+ "星期四",
+ "星期五",
+ "星期六",
+ "星期日");
+
+// Please note that the following array of short day names (and the same goes
+// for short month names, _SMN) isn't absolutely necessary.  We give it here
+// for exemplification on how one can customize the short day names, but if
+// they are simply the first N letters of the full name you can simply say:
+//
+//   Calendar._SDN_len = N; // short day name length
+//   Calendar._SMN_len = N; // short month name length
+//
+// If N = 3 then this is not needed either since we assume a value of 3 if not
+// present, to be compatible with translation files that were written before
+// this feature.
+
+// short day names
+Calendar._SDN = new Array
+("日",
+ "一",
+ "二",
+ "三",
+ "四",
+ "五",
+ "六",
+ "日");
+
+// First day of the week. "0" means display Sunday first, "1" means display
+// Monday first, etc.
+Calendar._FD = 0;
+
+// full month names
+Calendar._MN = new Array
+("一月",
+ "二月",
+ "三月",
+ "四月",
+ "五月",
+ "六月",
+ "七月",
+ "八月",
+ "九月",
+ "十月",
+ "十一月",
+ "十二月");
+
+// short month names
+Calendar._SMN = new Array
+("一月",
+ "二月",
+ "三月",
+ "四月",
+ "五月",
+ "六月",
+ "七月",
+ "八月",
+ "九月",
+ "十月",
+ "十一月",
+ "十二月");
+
+// tooltips
+Calendar._TT = {};
+Calendar._TT["INFO"] = "關於 calendar";
+
+Calendar._TT["ABOUT"] =
+"DHTML 日期/時間 選擇器\n" +
+"(c) dynarch.com 2002-2005 / Author: Mihai Bazon\n" + // don't translate this this ;-)
+"最For latest version visit: http://www.dynarch.com/projects/calendar/\n" +
+"Distributed under GNU LGPL.  See http://gnu.org/licenses/lgpl.html for details." +
+"\n\n" +
+"Date selection:\n" +
+"- Use the \xab, \xbb buttons to select year\n" +
+"- Use the " + String.fromCharCode(0x2039) + ", " + String.fromCharCode(0x203a) + " buttons to select month\n" +
+"- Hold mouse button on any of the above buttons for faster selection.";
+Calendar._TT["ABOUT_TIME"] = "\n\n" +
+"時間選擇方式：\n" +
+"- 「單擊」時分秒為遞增\n" +
+"- 或 「Shift-單擊」為遞減\n" +
+"- 或 「單擊且拖拉」為快速選擇";
+
+Calendar._TT["PREV_YEAR"] = "前一年 (按住不放可顯示選單)";
+Calendar._TT["PREV_MONTH"] = "前一個月 (按住不放可顯示選單)";
+Calendar._TT["GO_TODAY"] = "選擇今天";
+Calendar._TT["NEXT_MONTH"] = "後一個月 (按住不放可顯示選單)";
+Calendar._TT["NEXT_YEAR"] = "下一年 (按住不放可顯式選單)";
+Calendar._TT["SEL_DATE"] = "請點選日期";
+Calendar._TT["DRAG_TO_MOVE"] = "按住不放可拖拉視窗";
+Calendar._TT["PART_TODAY"] = " (今天)";
+
+// the following is to inform that "%s" is to be the first day of week
+// %s will be replaced with the day name.
+Calendar._TT["DAY_FIRST"] = "以 %s 做為一週的首日";
+
+// This may be locale-dependent.  It specifies the week-end days, as an array
+// of comma-separated numbers.  The numbers are from 0 to 6: 0 means Sunday, 1
+// means Monday, etc.
+Calendar._TT["WEEKEND"] = "0,6";
+
+Calendar._TT["CLOSE"] = "關閉視窗";
+Calendar._TT["TODAY"] = "今天";
+Calendar._TT["TIME_PART"] = "(Shift-)加「單擊」或「拖拉」可變更值";
+
+// date formats
+Calendar._TT["DEF_DATE_FORMAT"] = "%Y-%m-%d";
+Calendar._TT["TT_DATE_FORMAT"] = "星期 %a, %b %e 日";
+
+Calendar._TT["WK"] = "週";
+Calendar._TT["TIME"] = "時間:";

From 60c82a03dbdf00145a25f3443c72ee646736283e Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Fri, 7 Dec 2007 14:57:17 +0000
Subject: [PATCH 048/710] Fixed drop down lists overflow on My account.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@960 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/my/account.rhtml         | 5 ++++-
 public/stylesheets/application.css | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/views/my/account.rhtml b/app/views/my/account.rhtml
index 2dda62d70..0badc4b94 100644
--- a/app/views/my/account.rhtml
+++ b/app/views/my/account.rhtml
@@ -4,7 +4,10 @@
 <h2><%=l(:label_my_account)%></h2>
 <%= error_messages_for 'user' %>
 
-<% form_for :user, @user, :url => { :action => "account" }, :builder => TabularFormBuilder, :lang => current_language do |f| %>
+<% form_for :user, @user, :url => { :action => "account" }, 
+                          :builder => TabularFormBuilder, 
+                          :lang => current_language,
+                          :html => { :id => 'my_account_form' } do |f| %>
 <div class="splitcontentleft">
 <h3><%=l(:label_information_plural)%></h3>
 <div class="box tabular">
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index f05fb9d91..249b20291 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -124,7 +124,7 @@ textarea.wiki-edit { width: 99%; }
 li p {margin-top: 0;}
 div.issue {background:#ffffdd; padding:6px; margin-bottom:6px;border: 1px solid #d7d7d7;}
 .autoscroll {overflow-x: auto; padding:1px; width:100%;}
-#user_firstname, #user_lastname, #user_mail, #notification_option { width: 90%; }
+#user_firstname, #user_lastname, #user_mail, #my_account_form select { width: 90%; }
 
 /***** Tabular forms ******/
 .tabular p{

From 6239e319ac83e7770bb59a5e09bb7b7dd952d80f Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Fri, 7 Dec 2007 15:02:57 +0000
Subject: [PATCH 049/710] Fixed versions/show layout with IE.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@961 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/versions/show.rhtml      | 2 +-
 public/stylesheets/application.css | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/versions/show.rhtml b/app/views/versions/show.rhtml
index d8e2d243d..a7c4f2b37 100644
--- a/app/views/versions/show.rhtml
+++ b/app/views/versions/show.rhtml
@@ -4,7 +4,7 @@
 
 <h2><%= h(@version.name) %></h2>
 
-<div id="status_by" style="float:right;">
+<div id="status_by">
 <%= render_issue_status_by(@version, params[:status_by]) if @version.fixed_issues.count > 0 %>
 </div>
 
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 249b20291..8aa63d886 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -267,7 +267,7 @@ table.progress td.open { background: #FFF none repeat scroll 0%; }
 p.pourcent {font-size: 80%;}
 p.progress-info {clear: left; font-style: italic; font-size: 80%;}
 
-div#status_by { margin-left: 16px; margin-bottom: 16px; }
+div#status_by { float:right; width:380px; margin-left: 16px; margin-bottom: 16px; }
 
 /***** Tabs *****/
 #content .tabs{height: 2.6em;}

From 7fae4b089242526f59a778b0ca799bb86d370864 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Fri, 7 Dec 2007 17:51:54 +0000
Subject: [PATCH 050/710] Bazaar adapter: fixed log with partial revisions
 parsing.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@962 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 lib/redmine/scm/adapters/bazaar_adapter.rb | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/redmine/scm/adapters/bazaar_adapter.rb b/lib/redmine/scm/adapters/bazaar_adapter.rb
index ec9fd741c..4d7afeacc 100644
--- a/lib/redmine/scm/adapters/bazaar_adapter.rb
+++ b/lib/redmine/scm/adapters/bazaar_adapter.rb
@@ -110,9 +110,12 @@ module Redmine
                   revision.scmid = $1.strip
                 elsif line =~ /^timestamp: (.+)$/
                   revision.time = Time.parse($1).localtime
+                elsif line =~ /^    -----/
+                  # partial revisions
+                  parsing = nil unless parsing == 'message'
                 elsif line =~ /^(message|added|modified|removed|renamed):/
                   parsing = $1
-                elsif line =~ /^  (.+)$/
+                elsif line =~ /^  (.*)$/
                   if parsing == 'message'
                     revision.message << "#{$1}\n"
                   else

From 51adc242a31ef9af4d1857d0c6602bb39fdc6e98 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Fri, 7 Dec 2007 17:58:44 +0000
Subject: [PATCH 051/710] Updated Polish translation (Mariusz Olejnik).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@963 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 lang/pl.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lang/pl.yml b/lang/pl.yml
index ff5f8d828..222c7ea9d 100644
--- a/lang/pl.yml
+++ b/lang/pl.yml
@@ -545,7 +545,7 @@ label_registration_automatic_activation: automatyczna aktywacja kont
 label_registration_manual_activation: manualna aktywacja kont
 notice_account_pending: "Twoje konto zostało utworzone i oczekuje na zatwierdzenie administratora."
 field_time_zone: Strefa czasowa
-text_caracters_minimum: Must be at least %d characters long.
-setting_bcc_recipients: Blind carbon copy recipients (bcc)
-button_annotate: Annotate
-label_issues_by: Issues by %s
+text_caracters_minimum: Musi być nie krótsze niż %d znaków.
+setting_bcc_recipients: Odbiorcy kopii tajnej (kt/bcc)
+button_annotate: Adnotuj
+label_issues_by: Zagadnienia wprowadzone przez %s

From f58db70bdecdbfd0a0d81c0c452d58b88391f9f1 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Fri, 7 Dec 2007 18:42:40 +0000
Subject: [PATCH 052/710] More detailed html title on several views.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@964 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/admin/index.rhtml             | 4 +++-
 app/views/admin/info.rhtml              | 2 ++
 app/views/admin/mail_options.rhtml      | 2 ++
 app/views/admin/projects.rhtml          | 2 ++
 app/views/custom_fields/list.rhtml      | 4 +++-
 app/views/documents/show.rhtml          | 6 ++++--
 app/views/enumerations/list.rhtml       | 2 ++
 app/views/issue_statuses/list.rhtml     | 4 +++-
 app/views/my/account.rhtml              | 2 ++
 app/views/my/page.rhtml                 | 2 ++
 app/views/news/index.rhtml              | 2 ++
 app/views/news/show.rhtml               | 2 ++
 app/views/projects/activity.rhtml       | 2 ++
 app/views/projects/calendar.rhtml       | 2 ++
 app/views/projects/gantt.rhtml          | 2 ++
 app/views/projects/list.rhtml           | 2 ++
 app/views/projects/list_documents.rhtml | 2 ++
 app/views/projects/list_files.rhtml     | 4 +++-
 app/views/projects/settings.rhtml       | 2 ++
 app/views/projects/show.rhtml           | 2 ++
 app/views/repositories/changes.rhtml    | 2 ++
 app/views/repositories/revision.rhtml   | 2 ++
 app/views/repositories/revisions.rhtml  | 2 ++
 app/views/repositories/show.rhtml       | 2 ++
 app/views/roles/list.rhtml              | 2 ++
 app/views/roles/workflow.rhtml          | 2 ++
 app/views/search/index.rhtml            | 2 ++
 app/views/settings/edit.rhtml           | 2 ++
 app/views/trackers/list.rhtml           | 4 +++-
 app/views/users/list.rhtml              | 4 +++-
 30 files changed, 68 insertions(+), 8 deletions(-)

diff --git a/app/views/admin/index.rhtml b/app/views/admin/index.rhtml
index 02eb5ae89..933e288a0 100644
--- a/app/views/admin/index.rhtml
+++ b/app/views/admin/index.rhtml
@@ -42,4 +42,6 @@
 
 <p class="icon22 icon22-info">
 <%= link_to l(:label_information_plural), :controller => 'admin', :action => 'info' %>
-</p>
\ No newline at end of file
+</p>
+
+<% set_html_title l(:label_administration) -%>
diff --git a/app/views/admin/info.rhtml b/app/views/admin/info.rhtml
index 179fda1a8..4d442f5ad 100644
--- a/app/views/admin/info.rhtml
+++ b/app/views/admin/info.rhtml
@@ -23,3 +23,5 @@
     <% end %>
 </table>
 <% end %>
+
+<% set_html_title(l(:label_information_plural)) -%>
diff --git a/app/views/admin/mail_options.rhtml b/app/views/admin/mail_options.rhtml
index 997cc3b22..a4b923873 100644
--- a/app/views/admin/mail_options.rhtml
+++ b/app/views/admin/mail_options.rhtml
@@ -29,3 +29,5 @@
 
 <%= submit_tag l(:button_save) %>
 <% end %>
+
+<% set_html_title(l(:field_mail_notification)) -%>
diff --git a/app/views/admin/projects.rhtml b/app/views/admin/projects.rhtml
index 423d56ebe..e9d5e8537 100644
--- a/app/views/admin/projects.rhtml
+++ b/app/views/admin/projects.rhtml
@@ -47,3 +47,5 @@
 
 <p><%= pagination_links_full @project_pages, :status => @status %>
 [ <%= @project_pages.current.first_item %> - <%= @project_pages.current.last_item %> / <%= @project_count %> ]</p>
+
+<% set_html_title l(:label_project_plural) -%>
diff --git a/app/views/custom_fields/list.rhtml b/app/views/custom_fields/list.rhtml
index 8862b3de1..bbdfeffb4 100644
--- a/app/views/custom_fields/list.rhtml
+++ b/app/views/custom_fields/list.rhtml
@@ -50,4 +50,6 @@
 </div>
 <% end %>
 
-<%= javascript_tag "showTab('#{@tab}');" %>
\ No newline at end of file
+<%= javascript_tag "showTab('#{@tab}');" %>
+
+<% set_html_title(l(:label_custom_field_plural)) -%>
diff --git a/app/views/documents/show.rhtml b/app/views/documents/show.rhtml
index 779315b22..8f53f1abe 100644
--- a/app/views/documents/show.rhtml
+++ b/app/views/documents/show.rhtml
@@ -3,9 +3,9 @@
 <%= link_to_if_authorized l(:button_delete), {:controller => 'documents', :action => 'destroy', :id => @document}, :confirm => l(:text_are_you_sure), :method => :post, :class => 'icon icon-del' %>
 </div>
 
-<h2><%= @document.title %></h2>
+<h2><%=h @document.title %></h2>
 
-<p><em><%= @document.category.name %><br />
+<p><em><%=h @document.category.name %><br />
 <%= format_date @document.created_on %></em></p>
 <%= textilizable @document.description, :attachments => @document.attachments %>
 <br />
@@ -34,3 +34,5 @@
   <%= submit_tag l(:button_add) %>
   <% end %> 
 <% end %>
+
+<% set_html_title h(@document.title) -%>
diff --git a/app/views/enumerations/list.rhtml b/app/views/enumerations/list.rhtml
index bab4df830..2e069f392 100644
--- a/app/views/enumerations/list.rhtml
+++ b/app/views/enumerations/list.rhtml
@@ -24,3 +24,5 @@
 
 <p><%= link_to l(:label_enumeration_new), { :action => 'new', :opt => option } %></p>
 <% end %>
+
+<% set_html_title(l(:label_enumerations)) -%>
diff --git a/app/views/issue_statuses/list.rhtml b/app/views/issue_statuses/list.rhtml
index aaeec559a..05506f3c7 100644
--- a/app/views/issue_statuses/list.rhtml
+++ b/app/views/issue_statuses/list.rhtml
@@ -32,4 +32,6 @@
   </tbody>
 </table>
 
-<%= pagination_links_full @issue_status_pages %>
\ No newline at end of file
+<%= pagination_links_full @issue_status_pages %>
+
+<% set_html_title(l(:label_issue_status_plural)) -%>
diff --git a/app/views/my/account.rhtml b/app/views/my/account.rhtml
index 0badc4b94..fe2e5625b 100644
--- a/app/views/my/account.rhtml
+++ b/app/views/my/account.rhtml
@@ -44,3 +44,5 @@
 <% content_for :sidebar do %>
 <%= render :partial => 'sidebar' %>
 <% end %>
+
+<% set_html_title l(:label_my_account) -%>
diff --git a/app/views/my/page.rhtml b/app/views/my/page.rhtml
index 89d11ddea..db292da37 100644
--- a/app/views/my/page.rhtml
+++ b/app/views/my/page.rhtml
@@ -38,3 +38,5 @@
 
 <div id="context-menu" style="display: none;"></div>
 <%= javascript_tag 'new ContextMenu({})' %>
+
+<% set_html_title l(:label_my_page) -%>
diff --git a/app/views/news/index.rhtml b/app/views/news/index.rhtml
index a956f86d0..0b677d241 100644
--- a/app/views/news/index.rhtml
+++ b/app/views/news/index.rhtml
@@ -32,3 +32,5 @@
 <% content_for :header_tags do %>
   <%= auto_discovery_link_tag(:atom, params.merge({:format => 'atom', :page => nil, :key => User.current.rss_key})) %>
 <% end %>
+
+<% set_html_title l(:label_news_plural) -%>
diff --git a/app/views/news/show.rhtml b/app/views/news/show.rhtml
index 32a24e85e..e4d7da4db 100644
--- a/app/views/news/show.rhtml
+++ b/app/views/news/show.rhtml
@@ -41,3 +41,5 @@
 <p><%= submit_tag l(:button_add) %></p>
 <% end %>
 <% end %>
+
+<% set_html_title h(@news.title) -%>
diff --git a/app/views/projects/activity.rhtml b/app/views/projects/activity.rhtml
index c902d60a3..d22443bc0 100644
--- a/app/views/projects/activity.rhtml
+++ b/app/views/projects/activity.rhtml
@@ -39,3 +39,5 @@
 <p><%= submit_tag l(:button_apply), :class => 'button-small' %></p>
 <% end %>
 <% end %>
+
+<% set_html_title l(:label_activity) -%>
diff --git a/app/views/projects/calendar.rhtml b/app/views/projects/calendar.rhtml
index 2c02d59ad..39f171626 100644
--- a/app/views/projects/calendar.rhtml
+++ b/app/views/projects/calendar.rhtml
@@ -38,3 +38,5 @@
     <p><%= submit_tag l(:button_apply), :class => 'button-small' %></p>
     <% end %>
 <% end %>
+
+<% set_html_title l(:label_calendar) -%>
diff --git a/app/views/projects/gantt.rhtml b/app/views/projects/gantt.rhtml
index a66754842..395514b61 100644
--- a/app/views/projects/gantt.rhtml
+++ b/app/views/projects/gantt.rhtml
@@ -245,3 +245,5 @@ if Date.today >= @date_from and Date.today <= @date_to %>
     <p><%= submit_tag l(:button_apply), :class => 'button-small' %></p>
     <% end %>
 <% end %>
+
+<% set_html_title l(:label_gantt) -%>
diff --git a/app/views/projects/list.rhtml b/app/views/projects/list.rhtml
index c6e5b4dec..c7630c0a2 100644
--- a/app/views/projects/list.rhtml
+++ b/app/views/projects/list.rhtml
@@ -16,3 +16,5 @@
 <span class="icon icon-fav"><%= l(:label_my_projects) %></span>
 </div>
 <% end %>
+
+<% set_html_title l(:label_project_plural) -%>
diff --git a/app/views/projects/list_documents.rhtml b/app/views/projects/list_documents.rhtml
index bb272ee86..6829b9bf5 100644
--- a/app/views/projects/list_documents.rhtml
+++ b/app/views/projects/list_documents.rhtml
@@ -35,3 +35,5 @@
     <label><%= radio_button_tag 'sort_by', 'author', (@sort_by == 'author'), :onclick => 'this.form.submit();' %> <%= l(:field_author) %></label>
     <% end %>
 <% end %>
+
+<% set_html_title l(:label_document_plural) -%>
diff --git a/app/views/projects/list_files.rhtml b/app/views/projects/list_files.rhtml
index 0e4f19d81..b9f688509 100644
--- a/app/views/projects/list_files.rhtml
+++ b/app/views/projects/list_files.rhtml
@@ -41,4 +41,6 @@
   <% end %>
 <% end %>
   </tbody>
-</table>
\ No newline at end of file
+</table>
+
+<% set_html_title l(:label_attachment_plural) -%>
diff --git a/app/views/projects/settings.rhtml b/app/views/projects/settings.rhtml
index 13359de61..37a469df1 100644
--- a/app/views/projects/settings.rhtml
+++ b/app/views/projects/settings.rhtml
@@ -14,3 +14,5 @@
 
 <%= tab = params[:tab] ? h(params[:tab]) : project_settings_tabs.first[:name]
 javascript_tag "showTab('#{tab}');" %>
+
+<% set_html_title l(:label_settings) -%>
diff --git a/app/views/projects/show.rhtml b/app/views/projects/show.rhtml
index bb01df1f4..ecde32bde 100644
--- a/app/views/projects/show.rhtml
+++ b/app/views/projects/show.rhtml
@@ -81,3 +81,5 @@
 <% content_for :header_tags do %>
 <%= auto_discovery_link_tag(:atom, {:action => 'activity', :id => @project, :format => 'atom', :key => User.current.rss_key}) %>
 <% end %>
+
+<% set_html_title l(:label_overview) -%>
diff --git a/app/views/repositories/changes.rhtml b/app/views/repositories/changes.rhtml
index f843983db..218459128 100644
--- a/app/views/repositories/changes.rhtml
+++ b/app/views/repositories/changes.rhtml
@@ -16,3 +16,5 @@
 </p>
 
 <%= render :partial => 'revisions', :locals => {:project => @project, :path => @path, :revisions => @changesets, :entry => @entry }%>
+
+<% set_html_title(h(@entry.name)) -%>
diff --git a/app/views/repositories/revision.rhtml b/app/views/repositories/revision.rhtml
index 64d1668bc..d87dfa955 100644
--- a/app/views/repositories/revision.rhtml
+++ b/app/views/repositories/revision.rhtml
@@ -62,3 +62,5 @@
 <% content_for :header_tags do %>
 <%= stylesheet_link_tag "scm" %>
 <% end %>
+
+<% set_html_title("#{l(:label_revision)} #{@changeset.revision}") -%>
diff --git a/app/views/repositories/revisions.rhtml b/app/views/repositories/revisions.rhtml
index 2a45fc2ef..4483a482c 100644
--- a/app/views/repositories/revisions.rhtml
+++ b/app/views/repositories/revisions.rhtml
@@ -16,3 +16,5 @@
 <%= stylesheet_link_tag "scm" %>
 <%= auto_discovery_link_tag(:atom, params.merge({:format => 'atom', :page => nil, :key => User.current.rss_key})) %>
 <% end %>
+
+<% set_html_title l(:label_revision_plural) -%>
diff --git a/app/views/repositories/show.rhtml b/app/views/repositories/show.rhtml
index c9f44d575..9fb45514d 100644
--- a/app/views/repositories/show.rhtml
+++ b/app/views/repositories/show.rhtml
@@ -21,3 +21,5 @@
 <% content_for :header_tags do %>
 <%= stylesheet_link_tag "scm" %>
 <% end %>
+
+<% set_html_title l(:label_repository) -%>
diff --git a/app/views/roles/list.rhtml b/app/views/roles/list.rhtml
index bdea2475f..02bb20f5e 100644
--- a/app/views/roles/list.rhtml
+++ b/app/views/roles/list.rhtml
@@ -32,3 +32,5 @@
 <p><%= pagination_links_full @role_pages %></p>
 
 <p><%= link_to l(:label_permissions_report), :action => 'report' %></p>
+
+<% set_html_title(l(:label_role_plural)) -%>
diff --git a/app/views/roles/workflow.rhtml b/app/views/roles/workflow.rhtml
index 0a435744f..02f1b48a2 100644
--- a/app/views/roles/workflow.rhtml
+++ b/app/views/roles/workflow.rhtml
@@ -54,3 +54,5 @@
 <% end %>
 
 <% end %>
+
+<% set_html_title(l(:label_workflow)) -%>
diff --git a/app/views/search/index.rhtml b/app/views/search/index.rhtml
index 695107fe8..9f156cbe1 100644
--- a/app/views/search/index.rhtml
+++ b/app/views/search/index.rhtml
@@ -41,3 +41,5 @@
                    }, :href => url_for(params.merge(:previous => nil, :offset => @pagination_next_date.strftime("%Y%m%d%H%M%S"))) %>
 <% end %>
 </center></p>
+
+<% set_html_title(l(:label_search)) -%>
diff --git a/app/views/settings/edit.rhtml b/app/views/settings/edit.rhtml
index 4a0a400a3..758045f05 100644
--- a/app/views/settings/edit.rhtml
+++ b/app/views/settings/edit.rhtml
@@ -98,3 +98,5 @@
 
 <%= submit_tag l(:button_save) %>
 <% end %>
+
+<% set_html_title(l(:label_settings)) -%>
diff --git a/app/views/trackers/list.rhtml b/app/views/trackers/list.rhtml
index 8517c44d6..d339bdba0 100644
--- a/app/views/trackers/list.rhtml
+++ b/app/views/trackers/list.rhtml
@@ -30,4 +30,6 @@
   </tbody>
 </table>
 
-<%= pagination_links_full @tracker_pages %>
\ No newline at end of file
+<%= pagination_links_full @tracker_pages %>
+
+<% set_html_title(l(:label_tracker_plural)) -%>
diff --git a/app/views/users/list.rhtml b/app/views/users/list.rhtml
index 2ffbcd6f6..3f879d7a6 100644
--- a/app/views/users/list.rhtml
+++ b/app/views/users/list.rhtml
@@ -57,4 +57,6 @@
 
 <p><%= pagination_links_full @user_pages, :status => @status %>
 [ <%= @user_pages.current.first_item %> - <%= @user_pages.current.last_item %> / <%= @user_count %> ]
-</p>
\ No newline at end of file
+</p>
+
+<% set_html_title(l(:label_user_plural)) -%>

From 6d9490ddcc9c501d31a8b403146cd4ba6d8cc5b5 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Mon, 10 Dec 2007 17:58:07 +0000
Subject: [PATCH 053/710] Merged Rails 2.0 compatibility changes. Compatibility
 with Rails 1.2 is preserved.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@975 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/search_controller.rb          |    7 +-
 app/models/mailer.rb                          |    7 +-
 app/models/project.rb                         |    9 +-
 app/views/mailer/issue_add.text.html.rhtml    |    2 +-
 app/views/mailer/issue_add.text.plain.rhtml   |    2 +-
 app/views/mailer/issue_edit.text.html.rhtml   |    2 +-
 app/views/mailer/issue_edit.text.plain.rhtml  |    2 +-
 config/environment.rb                         |    1 +
 config/environments/development.rb            |    3 -
 test/fixtures/members.yml                     |    7 +
 test/fixtures/users.yml                       |   16 +
 test/functional/sys_api_test.rb               |   31 +
 test/unit/project_test.rb                     |   10 +-
 vendor/plugins/actionwebservice/CHANGELOG     |  265 ++++
 vendor/plugins/actionwebservice/MIT-LICENSE   |   21 +
 vendor/plugins/actionwebservice/README        |  364 +++++
 vendor/plugins/actionwebservice/Rakefile      |  172 ++
 vendor/plugins/actionwebservice/TODO          |   32 +
 vendor/plugins/actionwebservice/init.rb       |    7 +
 vendor/plugins/actionwebservice/install.rb    |   30 +
 .../lib/action_web_service.rb                 |   66 +
 .../lib/action_web_service/api.rb             |  297 ++++
 .../lib/action_web_service/base.rb            |   38 +
 .../lib/action_web_service/casting.rb         |  138 ++
 .../lib/action_web_service/client.rb          |    3 +
 .../lib/action_web_service/client/base.rb     |   28 +
 .../action_web_service/client/soap_client.rb  |  113 ++
 .../client/xmlrpc_client.rb                   |   58 +
 .../lib/action_web_service/container.rb       |    3 +
 .../container/action_controller_container.rb  |   93 ++
 .../container/delegated_container.rb          |   86 +
 .../container/direct_container.rb             |   69 +
 .../lib/action_web_service/dispatcher.rb      |    2 +
 .../action_web_service/dispatcher/abstract.rb |  207 +++
 .../action_controller_dispatcher.rb           |  379 +++++
 .../lib/action_web_service/invocation.rb      |  202 +++
 .../lib/action_web_service/protocol.rb        |    4 +
 .../action_web_service/protocol/abstract.rb   |  112 ++
 .../action_web_service/protocol/discovery.rb  |   37 +
 .../protocol/soap_protocol.rb                 |  176 +++
 .../protocol/soap_protocol/marshaler.rb       |  235 +++
 .../protocol/xmlrpc_protocol.rb               |  122 ++
 .../lib/action_web_service/scaffolding.rb     |  283 ++++
 .../lib/action_web_service/struct.rb          |   64 +
 .../support/class_inheritable_options.rb      |   26 +
 .../support/signature_types.rb                |  226 +++
 .../templates/scaffolds/layout.erb            |   65 +
 .../templates/scaffolds/layout.rhtml          |    0
 .../templates/scaffolds/methods.erb           |    6 +
 .../templates/scaffolds/methods.rhtml         |    0
 .../templates/scaffolds/parameters.erb        |   29 +
 .../templates/scaffolds/parameters.rhtml      |    0
 .../templates/scaffolds/result.erb            |   30 +
 .../templates/scaffolds/result.rhtml          |    0
 .../lib/action_web_service/test_invoke.rb     |  110 ++
 .../lib/action_web_service/version.rb         |    9 +
 .../actionwebservice/lib/actionwebservice.rb  |    1 +
 vendor/plugins/actionwebservice/setup.rb      | 1379 +++++++++++++++++
 vendor/plugins/acts_as_list/README            |   23 +
 vendor/plugins/acts_as_list/init.rb           |    3 +
 .../lib/active_record/acts/list.rb            |  256 +++
 vendor/plugins/acts_as_list/test/list_test.rb |  332 ++++
 vendor/plugins/acts_as_tree/README            |   26 +
 vendor/plugins/acts_as_tree/Rakefile          |   22 +
 vendor/plugins/acts_as_tree/init.rb           |    1 +
 .../lib/active_record/acts/tree.rb            |   96 ++
 .../acts_as_tree/test/abstract_unit.rb        |    0
 .../acts_as_tree/test/acts_as_tree_test.rb    |  219 +++
 vendor/plugins/acts_as_tree/test/database.yml |    0
 .../acts_as_tree/test/fixtures/mixin.rb       |    0
 .../acts_as_tree/test/fixtures/mixins.yml     |    0
 vendor/plugins/acts_as_tree/test/schema.rb    |    0
 vendor/plugins/classic_pagination/CHANGELOG   |  152 ++
 vendor/plugins/classic_pagination/README      |   18 +
 vendor/plugins/classic_pagination/Rakefile    |   22 +
 vendor/plugins/classic_pagination/init.rb     |   33 +
 vendor/plugins/classic_pagination/install.rb  |    1 +
 .../classic_pagination/lib/pagination.rb      |  405 +++++
 .../lib/pagination_helper.rb                  |  135 ++
 .../test/fixtures/companies.yml               |   24 +
 .../test/fixtures/company.rb                  |    9 +
 .../test/fixtures/developer.rb                |    7 +
 .../test/fixtures/developers.yml              |   21 +
 .../test/fixtures/developers_projects.yml     |   13 +
 .../test/fixtures/project.rb                  |    3 +
 .../test/fixtures/projects.yml                |    7 +
 .../test/fixtures/replies.yml                 |   13 +
 .../classic_pagination/test/fixtures/reply.rb |    5 +
 .../test/fixtures/schema.sql                  |   42 +
 .../classic_pagination/test/fixtures/topic.rb |    3 +
 .../test/fixtures/topics.yml                  |   22 +
 .../plugins/classic_pagination/test/helper.rb |  117 ++
 .../test/pagination_helper_test.rb            |   38 +
 .../test/pagination_test.rb                   |  177 +++
 94 files changed, 7918 insertions(+), 13 deletions(-)
 create mode 100644 test/functional/sys_api_test.rb
 create mode 100644 vendor/plugins/actionwebservice/CHANGELOG
 create mode 100644 vendor/plugins/actionwebservice/MIT-LICENSE
 create mode 100644 vendor/plugins/actionwebservice/README
 create mode 100644 vendor/plugins/actionwebservice/Rakefile
 create mode 100644 vendor/plugins/actionwebservice/TODO
 create mode 100644 vendor/plugins/actionwebservice/init.rb
 create mode 100644 vendor/plugins/actionwebservice/install.rb
 create mode 100644 vendor/plugins/actionwebservice/lib/action_web_service.rb
 create mode 100644 vendor/plugins/actionwebservice/lib/action_web_service/api.rb
 create mode 100644 vendor/plugins/actionwebservice/lib/action_web_service/base.rb
 create mode 100644 vendor/plugins/actionwebservice/lib/action_web_service/casting.rb
 create mode 100644 vendor/plugins/actionwebservice/lib/action_web_service/client.rb
 create mode 100644 vendor/plugins/actionwebservice/lib/action_web_service/client/base.rb
 create mode 100644 vendor/plugins/actionwebservice/lib/action_web_service/client/soap_client.rb
 create mode 100644 vendor/plugins/actionwebservice/lib/action_web_service/client/xmlrpc_client.rb
 create mode 100644 vendor/plugins/actionwebservice/lib/action_web_service/container.rb
 create mode 100644 vendor/plugins/actionwebservice/lib/action_web_service/container/action_controller_container.rb
 create mode 100644 vendor/plugins/actionwebservice/lib/action_web_service/container/delegated_container.rb
 create mode 100644 vendor/plugins/actionwebservice/lib/action_web_service/container/direct_container.rb
 create mode 100644 vendor/plugins/actionwebservice/lib/action_web_service/dispatcher.rb
 create mode 100644 vendor/plugins/actionwebservice/lib/action_web_service/dispatcher/abstract.rb
 create mode 100644 vendor/plugins/actionwebservice/lib/action_web_service/dispatcher/action_controller_dispatcher.rb
 create mode 100644 vendor/plugins/actionwebservice/lib/action_web_service/invocation.rb
 create mode 100644 vendor/plugins/actionwebservice/lib/action_web_service/protocol.rb
 create mode 100644 vendor/plugins/actionwebservice/lib/action_web_service/protocol/abstract.rb
 create mode 100644 vendor/plugins/actionwebservice/lib/action_web_service/protocol/discovery.rb
 create mode 100644 vendor/plugins/actionwebservice/lib/action_web_service/protocol/soap_protocol.rb
 create mode 100644 vendor/plugins/actionwebservice/lib/action_web_service/protocol/soap_protocol/marshaler.rb
 create mode 100644 vendor/plugins/actionwebservice/lib/action_web_service/protocol/xmlrpc_protocol.rb
 create mode 100644 vendor/plugins/actionwebservice/lib/action_web_service/scaffolding.rb
 create mode 100644 vendor/plugins/actionwebservice/lib/action_web_service/struct.rb
 create mode 100644 vendor/plugins/actionwebservice/lib/action_web_service/support/class_inheritable_options.rb
 create mode 100644 vendor/plugins/actionwebservice/lib/action_web_service/support/signature_types.rb
 create mode 100644 vendor/plugins/actionwebservice/lib/action_web_service/templates/scaffolds/layout.erb
 create mode 100644 vendor/plugins/actionwebservice/lib/action_web_service/templates/scaffolds/layout.rhtml
 create mode 100644 vendor/plugins/actionwebservice/lib/action_web_service/templates/scaffolds/methods.erb
 create mode 100644 vendor/plugins/actionwebservice/lib/action_web_service/templates/scaffolds/methods.rhtml
 create mode 100644 vendor/plugins/actionwebservice/lib/action_web_service/templates/scaffolds/parameters.erb
 create mode 100644 vendor/plugins/actionwebservice/lib/action_web_service/templates/scaffolds/parameters.rhtml
 create mode 100644 vendor/plugins/actionwebservice/lib/action_web_service/templates/scaffolds/result.erb
 create mode 100644 vendor/plugins/actionwebservice/lib/action_web_service/templates/scaffolds/result.rhtml
 create mode 100644 vendor/plugins/actionwebservice/lib/action_web_service/test_invoke.rb
 create mode 100644 vendor/plugins/actionwebservice/lib/action_web_service/version.rb
 create mode 100644 vendor/plugins/actionwebservice/lib/actionwebservice.rb
 create mode 100644 vendor/plugins/actionwebservice/setup.rb
 create mode 100644 vendor/plugins/acts_as_list/README
 create mode 100644 vendor/plugins/acts_as_list/init.rb
 create mode 100644 vendor/plugins/acts_as_list/lib/active_record/acts/list.rb
 create mode 100644 vendor/plugins/acts_as_list/test/list_test.rb
 create mode 100644 vendor/plugins/acts_as_tree/README
 create mode 100644 vendor/plugins/acts_as_tree/Rakefile
 create mode 100644 vendor/plugins/acts_as_tree/init.rb
 create mode 100644 vendor/plugins/acts_as_tree/lib/active_record/acts/tree.rb
 create mode 100644 vendor/plugins/acts_as_tree/test/abstract_unit.rb
 create mode 100644 vendor/plugins/acts_as_tree/test/acts_as_tree_test.rb
 create mode 100644 vendor/plugins/acts_as_tree/test/database.yml
 create mode 100644 vendor/plugins/acts_as_tree/test/fixtures/mixin.rb
 create mode 100644 vendor/plugins/acts_as_tree/test/fixtures/mixins.yml
 create mode 100644 vendor/plugins/acts_as_tree/test/schema.rb
 create mode 100644 vendor/plugins/classic_pagination/CHANGELOG
 create mode 100644 vendor/plugins/classic_pagination/README
 create mode 100644 vendor/plugins/classic_pagination/Rakefile
 create mode 100644 vendor/plugins/classic_pagination/init.rb
 create mode 100644 vendor/plugins/classic_pagination/install.rb
 create mode 100644 vendor/plugins/classic_pagination/lib/pagination.rb
 create mode 100644 vendor/plugins/classic_pagination/lib/pagination_helper.rb
 create mode 100644 vendor/plugins/classic_pagination/test/fixtures/companies.yml
 create mode 100644 vendor/plugins/classic_pagination/test/fixtures/company.rb
 create mode 100644 vendor/plugins/classic_pagination/test/fixtures/developer.rb
 create mode 100644 vendor/plugins/classic_pagination/test/fixtures/developers.yml
 create mode 100644 vendor/plugins/classic_pagination/test/fixtures/developers_projects.yml
 create mode 100644 vendor/plugins/classic_pagination/test/fixtures/project.rb
 create mode 100644 vendor/plugins/classic_pagination/test/fixtures/projects.yml
 create mode 100644 vendor/plugins/classic_pagination/test/fixtures/replies.yml
 create mode 100644 vendor/plugins/classic_pagination/test/fixtures/reply.rb
 create mode 100644 vendor/plugins/classic_pagination/test/fixtures/schema.sql
 create mode 100644 vendor/plugins/classic_pagination/test/fixtures/topic.rb
 create mode 100644 vendor/plugins/classic_pagination/test/fixtures/topics.yml
 create mode 100644 vendor/plugins/classic_pagination/test/helper.rb
 create mode 100644 vendor/plugins/classic_pagination/test/pagination_helper_test.rb
 create mode 100644 vendor/plugins/classic_pagination/test/pagination_test.rb

diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb
index ee4f863aa..69e1ee503 100644
--- a/app/controllers/search_controller.rb
+++ b/app/controllers/search_controller.rb
@@ -90,9 +90,10 @@ class SearchController < ApplicationController
         end
       else
         operator = @all_words ? ' AND ' : ' OR '
-        Project.with_scope(:find => {:conditions => Project.visible_by(User.current)}) 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
+        @results += Project.find(:all, 
+                                 :limit => limit,
+                                 :conditions => [ (["(#{Project.visible_by(User.current)}) AND (LOWER(name) like ? OR LOWER(description) like ?)"] * like_tokens.size).join(operator), * (like_tokens * 2).sort]
+                                 ) if @scope.include? 'projects'
         # 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
diff --git a/app/models/mailer.rb b/app/models/mailer.rb
index 9639e1a9c..257f57726 100644
--- a/app/models/mailer.rb
+++ b/app/models/mailer.rb
@@ -150,6 +150,11 @@ class Mailer < ActionMailer::Base
   def render_message(method_name, body)
     layout = method_name.match(%r{text\.html\.(rhtml|rxml)}) ? 'layout.text.html.rhtml' : 'layout.text.plain.rhtml'
     body[:content_for_layout] = render(:file => method_name, :body => body)
-    ActionView::Base.new(File.join(template_root, 'mailer'), body, self).render(:file => layout)
+    ActionView::Base.new(template_root, body, self).render(:file => "mailer/#{layout}")
   end
+  
+  # Makes partial rendering work with Rails 1.2 (retro-compatibility)
+  def self.controller_path
+    ''
+  end unless respond_to?('controller_path')
 end
diff --git a/app/models/project.rb b/app/models/project.rb
index 5788732d7..70b1eccd1 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -20,7 +20,7 @@ class Project < ActiveRecord::Base
   STATUS_ACTIVE     = 1
   STATUS_ARCHIVED   = 9
   
-  has_many :members, :dependent => :delete_all, :include => :user, :conditions => "#{User.table_name}.status=#{User::STATUS_ACTIVE}"
+  has_many :members, :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 :enabled_modules, :dependent => :delete_all
@@ -62,6 +62,8 @@ class Project < ActiveRecord::Base
   validates_length_of :identifier, :in => 3..20
   validates_format_of :identifier, :with => /^[a-z0-9\-]*$/
   
+  before_destroy :delete_all_members
+  
   def identifier=(identifier)
     super unless identifier_frozen?
   end
@@ -129,6 +131,11 @@ class Project < ActiveRecord::Base
     children.select {|child| child.active?}
   end
   
+  # Deletes all project's members
+  def delete_all_members
+    Member.delete_all(['project_id = ?', id])
+  end
+  
   # Users issues can be assigned to
   def assignable_users
     members.select {|m| m.role.assignable?}.collect {|m| m.user}.sort
diff --git a/app/views/mailer/issue_add.text.html.rhtml b/app/views/mailer/issue_add.text.html.rhtml
index adcb4c9fe..6d20c333f 100644
--- a/app/views/mailer/issue_add.text.html.rhtml
+++ b/app/views/mailer/issue_add.text.html.rhtml
@@ -1,3 +1,3 @@
 <%= l(:text_issue_added, "##{@issue.id}") %>
 <hr />
-<%= render :file => "_issue_text_html", :use_full_path => true, :locals => { :issue => @issue, :issue_url => @issue_url } %>
+<%= render :partial => "issue_text_html", :locals => { :issue => @issue, :issue_url => @issue_url } %>
diff --git a/app/views/mailer/issue_add.text.plain.rhtml b/app/views/mailer/issue_add.text.plain.rhtml
index 797fb11b6..38c17e777 100644
--- a/app/views/mailer/issue_add.text.plain.rhtml
+++ b/app/views/mailer/issue_add.text.plain.rhtml
@@ -1,3 +1,3 @@
 <%= l(:text_issue_added, "##{@issue.id}") %>
 ----------------------------------------
-<%= render :file => "_issue_text_plain", :use_full_path => true, :locals => { :issue => @issue, :issue_url => @issue_url } %>
+<%= render :partial => "issue_text_plain", :locals => { :issue => @issue, :issue_url => @issue_url } %>
diff --git a/app/views/mailer/issue_edit.text.html.rhtml b/app/views/mailer/issue_edit.text.html.rhtml
index 40d34968e..9af8592b4 100644
--- a/app/views/mailer/issue_edit.text.html.rhtml
+++ b/app/views/mailer/issue_edit.text.html.rhtml
@@ -7,4 +7,4 @@
 </ul>
 <%= textilizable(@journal.notes) %>
 <hr />
-<%= render :file => "_issue_text_html", :use_full_path => true, :locals => { :issue => @issue, :issue_url => @issue_url } %>
+<%= render :partial => "issue_text_html", :locals => { :issue => @issue, :issue_url => @issue_url } %>
diff --git a/app/views/mailer/issue_edit.text.plain.rhtml b/app/views/mailer/issue_edit.text.plain.rhtml
index 32019eaea..04b1bc54a 100644
--- a/app/views/mailer/issue_edit.text.plain.rhtml
+++ b/app/views/mailer/issue_edit.text.plain.rhtml
@@ -5,4 +5,4 @@
 <% end %>
 <%= @journal.notes if @journal.notes? %>
 ----------------------------------------
-<%= render :file => "_issue_text_plain", :use_full_path => true, :locals => { :issue => @issue, :issue_url => @issue_url } %>
+<%= render :partial => "issue_text_plain", :locals => { :issue => @issue, :issue_url => @issue_url } %>
diff --git a/config/environment.rb b/config/environment.rb
index 447e47e21..dced5993e 100644
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -23,6 +23,7 @@ Rails::Initializer.run do |config|
   # Use the database for sessions instead of the file system
   # (create the session table with 'rake create_sessions_table')
   # config.action_controller.session_store = :active_record_store
+  config.action_controller.session_store = :PStore
 
   # Enable page/fragment caching by setting a file-based store
   # (remember to create the caching directory and make it readable to the application)
diff --git a/config/environments/development.rb b/config/environments/development.rb
index 04b779200..c816f03e3 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -8,9 +8,6 @@ config.cache_classes     = false
 # Log error messages when you accidentally call methods on nil.
 config.whiny_nils        = true
 
-# Enable the breakpoint server that script/breakpointer connects to
-config.breakpoint_server = true
-
 # Show full error reports and disable caching
 config.action_controller.consider_all_requests_local = true
 config.action_controller.perform_caching             = false
diff --git a/test/fixtures/members.yml b/test/fixtures/members.yml
index 392225e52..2c9209131 100644
--- a/test/fixtures/members.yml
+++ b/test/fixtures/members.yml
@@ -17,4 +17,11 @@ members_003:
   role_id: 2
   id: 3
   user_id: 2
+members_004: 
+  id: 4
+  created_on: 2006-07-19 19:35:36 +02:00
+  project_id: 1
+  role_id: 2
+  # Locked user
+  user_id: 5
   
\ No newline at end of file
diff --git a/test/fixtures/users.yml b/test/fixtures/users.yml
index ffa2fe42e..df7123879 100644
--- a/test/fixtures/users.yml
+++ b/test/fixtures/users.yml
@@ -59,3 +59,19 @@ users_003:
   auth_source_id: 
   mail_notification: true
   login: dlopper
+users_005: 
+  id: 5
+  created_on: 2006-07-19 19:33:19 +02:00
+  # Locked
+  status: 3
+  last_login_on: 
+  language: en
+  hashed_password: 7feb7657aa7a7bf5aef3414a5084875f27192415
+  updated_on: 2006-07-19 19:33:19 +02:00
+  admin: false
+  mail: dlopper2@somenet.foo
+  lastname: Lopper2
+  firstname: Dave2
+  auth_source_id: 
+  mail_notification: true
+  login: dlopper2
diff --git a/test/functional/sys_api_test.rb b/test/functional/sys_api_test.rb
new file mode 100644
index 000000000..ec8d0964e
--- /dev/null
+++ b/test/functional/sys_api_test.rb
@@ -0,0 +1,31 @@
+require File.dirname(__FILE__) + '/../test_helper'
+require 'sys_controller'
+
+# Re-raise errors caught by the controller.
+class SysController; def rescue_action(e) raise e end; end
+
+class SysControllerTest < Test::Unit::TestCase
+  fixtures :projects, :repositories
+  
+  def setup
+    @controller = SysController.new
+    @request = ActionController::TestRequest.new
+    @response = ActionController::TestResponse.new
+    # Enable WS
+    Setting.sys_api_enabled = 1
+  end
+  
+  def test_projects
+    result = invoke :projects
+    assert_equal Project.count, result.size 
+    assert result.first.is_a?(Project)
+  end
+
+  def test_repository_created
+    project = Project.find(3)
+    assert_nil project.repository
+    assert invoke(:repository_created, project.identifier, 'http://localhost/svn')
+    project.reload
+    assert_not_nil project.repository
+  end
+end
diff --git a/test/unit/project_test.rb b/test/unit/project_test.rb
index a8cf46e4f..62ba2b02d 100644
--- a/test/unit/project_test.rb
+++ b/test/unit/project_test.rb
@@ -18,7 +18,7 @@
 require File.dirname(__FILE__) + '/../test_helper'
 
 class ProjectTest < Test::Unit::TestCase
-  fixtures :projects, :issues, :issue_statuses, :journals, :journal_details
+  fixtures :projects, :issues, :issue_statuses, :journals, :journal_details, :users, :members, :roles
 
   def setup
     @ecookbook = Project.find(1)
@@ -80,8 +80,16 @@ class ProjectTest < Test::Unit::TestCase
   end
   
   def test_destroy
+    # 2 active members
+    assert_equal 2, @ecookbook.members.size
+    # and 1 is locked
+    assert_equal 3, Member.find(:all, :conditions => ['project_id = ?', @ecookbook.id]).size
+    
     @ecookbook.destroy
+    # make sure that the project non longer exists
     assert_raise(ActiveRecord::RecordNotFound) { Project.find(@ecookbook.id) }
+    # make sure all members have been removed
+    assert_equal 0, Member.find(:all, :conditions => ['project_id = ?', @ecookbook.id]).size
   end
   
   def test_subproject_ok
diff --git a/vendor/plugins/actionwebservice/CHANGELOG b/vendor/plugins/actionwebservice/CHANGELOG
new file mode 100644
index 000000000..bb5280356
--- /dev/null
+++ b/vendor/plugins/actionwebservice/CHANGELOG
@@ -0,0 +1,265 @@
+*SVN*
+
+* Documentation for ActionWebService::API::Base. Closes #7275. [zackchandler]
+
+* Allow action_web_service to handle various HTTP methods including GET. Closes #7011. [zackchandler]
+
+* Ensure that DispatcherError is being thrown when a malformed request is received. [Kent Sibilev]
+
+* Added support for decimal types. Closes #6676. [Kent Sibilev]
+
+* Removed deprecated end_form_tag helper. [Kent Sibilev]
+
+* Removed deprecated @request and @response usages. [Kent Sibilev]
+
+* Removed invocation of deprecated before_action and around_action filter methods. Corresponding before_invocation and after_invocation methods should be used instead. #6275 [Kent Sibilev]
+
+* Provide access to the underlying SOAP driver. #6212 [bmilekic, Kent Sibilev]
+
+* Deprecation: update docs. #5998 [jakob@mentalized.net, Kevin Clark]
+
+* ActionWebService WSDL generation ignores HTTP_X_FORWARDED_HOST [Paul Butcher <paul@paulbutcher.com>]
+
+* Tighten rescue clauses.  #5985 [james@grayproductions.net]
+
+* Fixed XMLRPC multicall when one of the called methods returns a struct object. [Kent Sibilev] 
+
+* Replace Reloadable with Reloadable::Deprecated. [Nicholas Seckar]
+
+* Fix invoke_layered since api_method didn't declare :expects. Closes #4720. [Kevin Ballard <kevin@sb.org>, Kent Sibilev]
+
+* Replace alias method chaining with Module#alias_method_chain. [Marcel Molina Jr.]
+
+* Replace Ruby's deprecated append_features in favor of included. [Marcel Molina Jr.]
+
+* Fix test database name typo. [Marcel Molina Jr.]
+
+*1.1.2* (April 9th, 2006)
+
+* Rely on Active Record 1.14.2
+
+
+*1.1.1* (April 6th, 2006)
+
+* Do not convert driver options to strings (#4499)
+
+
+*1.1.0* (March 27th, 2006)
+
+* Make ActiveWebService::Struct type reloadable
+
+* Fix scaffolding action when one of the members of a structural type has date or time type
+
+* Remove extra index hash when generating scaffold html for parameters of structural type #4374 [joe@mjg2.com]
+
+* Fix Scaffold Fails with Struct as a Parameter #4363 [joe@mjg2.com]
+
+* Fix soap type registration of multidimensional arrays (#4232)
+
+* Fix that marshaler couldn't handle ActiveRecord models defined in a different namespace (#2392).
+
+* Fix that marshaler couldn't handle structs with members of ActiveRecord type (#1889).
+
+* Fix that marshaler couldn't handle nil values for inner structs (#3576).
+
+* Fix that changes to ActiveWebService::API::Base required restarting of the server (#2390).
+
+* Fix scaffolding for signatures with :date, :time and :base64 types (#3321, #2769, #2078).
+
+* Fix for incorrect casting of TrueClass/FalseClass instances (#2633, #3421).
+
+* Fix for incompatibility problems with SOAP4R 1.5.5 (#2553) [Kent Sibilev]
+
+
+*1.0.0* (December 13th, 2005)
+
+* Become part of Rails 1.0
+
+*0.9.4* (December 7th, 2005)
+
+* Update from LGPL to MIT license as per Minero Aoki's permission. [Marcel Molina Jr.]
+
+* Rename Version constant to VERSION. #2802 [Marcel Molina Jr.]
+
+* Fix that XML-RPC date/time values did not have well-defined behaviour (#2516, #2534). This fix has one caveat, in that we can't support pre-1970 dates from XML-RPC clients.
+
+*0.9.3* (November 7th, 2005)
+
+* Upgraded to Action Pack 1.11.0 and Active Record 1.13.0
+
+
+*0.9.2* (October 26th, 2005)
+
+* Upgraded to Action Pack 1.10.2 and Active Record 1.12.2
+
+
+*0.9.1* (October 19th, 2005)
+
+* Upgraded to Action Pack 1.10.1 and Active Record 1.12.1
+
+
+*0.9.0* (October 16th, 2005)
+
+* Fix invalid XML request generation bug in test_invoke [Ken Barker]
+
+* Add XML-RPC 'system.multicall' support #1941 [jbonnar]
+
+* Fix duplicate XSD entries for custom types shared across delegated/layered services #1729 [Tyler Kovacs]
+
+* Allow multiple invocations in the same test method #1720 [dkhawk]
+
+* Added ActionWebService::API::Base.soap_client and ActionWebService::API::Base.xmlrpc_client helper methods to create the internal clients for an API, useful for testing from ./script/console
+
+* ActionWebService now always returns UTF-8 responses.
+
+
+*0.8.1* (11 July, 2005)
+
+* Fix scaffolding for Action Pack controller changes
+
+
+*0.8.0* (6 July, 2005)
+
+* Fix WSDL generation by aliasing #inherited instead of trying to overwrite it, or the WSDL action may end up not being defined in the controller
+
+* Add ActionController::Base.wsdl_namespace option, to allow overriding of the namespace used in generated WSDL and SOAP messages. This is equivalent to the [WebService(Namespace = "Value")] attribute in .NET.
+
+* Add workaround for Ruby 1.8.3's SOAP4R changing the return value of SOAP::Mapping::Registry#find_mapped_soap_class #1414 [Shugo Maeda]
+
+* Fix moduled controller URLs in WSDL, and add unit test to verify the generated URL #1428
+
+* Fix scaffolding template paths, it was broken on Win32
+
+* Fix that functional testing of :layered controllers failed when using the SOAP protocol
+
+* Allow invocation filters in :direct controllers as well, as they have access to more information regarding the web service request than ActionPack filters
+
+* Add support for a :base64 signature type #1272 [Shugo Maeda]
+
+* Fix that boolean fields were not rendered correctly in scaffolding
+
+* Fix that scaffolding was not working for :delegated dispatching
+
+* Add support for structured types as input parameters to scaffolding, this should let one test the blogging APIs using scaffolding as well
+
+* Fix that generated WSDL was not using relative_url_root for base URI #1210 [Shugo Maeda]
+
+* Use UTF-8 encoding by default for SOAP responses, but if an encoding is supplied by caller, use that for the response  #1211 [Shugo Maeda, NAKAMURA Hiroshi]
+
+* If the WSDL was retrieved over HTTPS, use HTTPS URLs in the WSDL too
+
+* Fix that casting change in 0.7.0 would convert nil values to the default value for the type instead of leaving it as nil
+
+
+*0.7.1* (20th April, 2005)
+
+* Depend on Active Record 1.10.1 and Action Pack 1.8.1
+
+
+*0.7.0* (19th April, 2005)
+
+* When casting structured types, don't try to send obj.name= unless obj responds to it, causes casting to be less likely to fail for XML-RPC
+
+* Add scaffolding via ActionController::Base.web_service_scaffold for quick testing using a web browser
+
+* ActionWebService::API::Base#api_methods now returns a hash containing ActionWebService::API::Method objects instead of hashes. However, ActionWebService::API::Method defines a #[]() backwards compatibility method so any existing code utilizing this will still work.
+
+* The :layered dispatching mode can now be used with SOAP as well, allowing you to support SOAP and XML-RPC clients for APIs like the metaWeblog API
+
+* Remove ActiveRecordSoapMarshallable workaround, see #912 for details
+
+* Generalize casting code to be used by both SOAP and XML-RPC (previously, it was only XML-RPC)
+
+* Ensure return value is properly cast as well, fixes XML-RPC interoperability with Ecto and possibly other clients
+
+* Include backtraces in 500 error responses for failed request parsing, and remove "rescue nil" statements obscuring real errors for XML-RPC
+
+* Perform casting of struct members even if the structure is already of the correct type, so that the type we specify for the struct member is always the type of the value seen by the API implementation
+
+
+*0.6.2* (27th March, 2005)
+
+* Allow method declarations for direct dispatching to declare parameters as well. We treat an arity of < 0 or > 0 as an indication that we should send through parameters. Closes #939.
+
+
+*0.6.1* (22th March, 2005)
+
+* Fix that method response QNames mismatched with that declared in the WSDL, makes SOAP::WSDLDriverFactory work against AWS again
+
+* Fix that @request.env was being modified, instead, dup the value gotten from env
+
+* Fix XML-RPC example to use :layered mode, so it works again
+
+* Support casting '0' or 0 into false, and '1' or 1 into true, when expecting a boolean value
+
+* Fix that SOAP fault response fault code values were not QName's #804
+
+
+*0.6.0* (7th March, 2005)
+
+* Add action_controller/test_invoke, used for integrating AWS with the Rails testing infrastructure
+
+* Allow passing through options to the SOAP RPC driver for the SOAP client
+
+* Make the SOAP WS marshaler use #columns to decide which fields to marshal as well, avoids providing attributes brought in by associations
+  
+* Add <tt>ActionWebService::API::Base.allow_active_record_expects</tt> option, with a default of false. Setting this to true will allow specifying ActiveRecord::Base model classes in <tt>:expects</tt>. API writers should take care to validate the received ActiveRecord model objects when turning it on, and/or have an authentication mechanism in place to reduce the security risk.
+
+* Improve error message reporting. Bugs in either AWS or the web service itself will send back a protocol-specific error report message if possible, otherwise, provide as much detail as possible.
+
+* Removed type checking of received parameters, and perform casting for XML-RPC if possible, but fallback to the received parameters if casting fails, closes #677
+
+* Refactored SOAP and XML-RPC marshaling and encoding into a small library devoted exclusively to protocol specifics, also cleaned up the SOAP marshaling approach, so that array and custom type marshaling should be a bit faster.
+
+* Add namespaced XML-RPC method name support, closes #678
+
+* Replace '::' with '..' in fully qualified type names for marshaling and WSDL. This improves interoperability with .NET, and closes #676.
+
+
+*0.5.0* (24th February, 2005)
+
+	* lib/action_service/dispatcher*: replace "router" fragments with
+	  one file for Action Controllers, moves dispatching work out of
+	  the container
+	* lib/*,test/*,examples/*: rename project to
+	  ActionWebService. prefix all generic "service" type names with web_.
+	  update all using code as well as the RDoc.
+	* lib/action_service/router/wsdl.rb: ensure that #wsdl is
+	  defined in the final container class, or the new ActionPack
+	  filtering will exclude it
+	* lib/action_service/struct.rb,test/struct_test.rb: create a
+	  default #initialize on inherit that accepts a Hash containing
+	  the default member values
+	* lib/action_service/api/action_controller.rb: add support and
+	  tests for #client_api in controller
+	* test/router_wsdl_test.rb: add tests to ensure declared
+	  service names don't contain ':', as ':' causes interoperability
+	  issues
+	* lib/*, test/*: rename "interface" concept to "api", and change all
+	  related uses to reflect this change. update all uses of Inflector
+	  to call the method on String instead.
+	* test/api_test.rb: add test to ensure API definition not
+	  instantiatable
+	* lib/action_service/invocation.rb: change @invocation_params to
+	  @method_params
+	* lib/*: update RDoc
+	* lib/action_service/struct.rb: update to support base types
+	* lib/action_service/support/signature.rb: support the notion of
+	  "base types" in signatures, with well-known unambiguous names such as :int,
+	  :bool, etc, which map to the correct Ruby class. accept the same names
+	  used by ActiveRecord as well as longer versions of each, as aliases.
+	* examples/*: update for seperate API definition updates
+	* lib/action_service/*, test/*: extensive refactoring: define API methods in
+	  a seperate class, and specify it wherever used with 'service_api'.
+	  this makes writing a client API for accessing defined API methods
+	  with ActionWebService really easy.
+	* lib/action_service/container.rb: fix a bug in default call
+	  handling for direct dispatching, and add ActionController filter
+	  support for direct dispatching.
+	* test/router_action_controller_test.rb: add tests to ensure
+	  ActionController filters are actually called.
+	* test/protocol_soap_test.rb: add more tests for direct dispatching.
+
+0.3.0
+
+	* First public release
diff --git a/vendor/plugins/actionwebservice/MIT-LICENSE b/vendor/plugins/actionwebservice/MIT-LICENSE
new file mode 100644
index 000000000..528941e84
--- /dev/null
+++ b/vendor/plugins/actionwebservice/MIT-LICENSE
@@ -0,0 +1,21 @@
+Copyright (C) 2005 Leon Breedt
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
diff --git a/vendor/plugins/actionwebservice/README b/vendor/plugins/actionwebservice/README
new file mode 100644
index 000000000..78b91f081
--- /dev/null
+++ b/vendor/plugins/actionwebservice/README
@@ -0,0 +1,364 @@
+= Action Web Service -- Serving APIs on rails
+
+Action Web Service provides a way to publish interoperable web service APIs with
+Rails without spending a lot of time delving into protocol details.
+
+
+== Features
+
+* SOAP RPC protocol support
+* Dynamic WSDL generation for APIs
+* XML-RPC protocol support
+* Clients that use the same API definitions as the server for
+  easy interoperability with other Action Web Service based applications
+* Type signature hints to improve interoperability with static languages
+* Active Record model class support in signatures
+
+
+== Defining your APIs
+
+You specify the methods you want to make available as API methods in an
+ActionWebService::API::Base derivative, and then specify this API
+definition class wherever you want to use that API. 
+
+The implementation of the methods is done separately from the API
+specification.
+
+
+==== Method name inflection
+
+Action Web Service will camelcase the method names according to Rails Inflector
+rules for the API visible to public callers. What this means, for example,
+is that the method names in generated WSDL will be camelcased, and callers will
+have to supply the camelcased name in their requests for the request to
+succeed.
+
+If you do not desire this behaviour, you can turn it off with the
+ActionWebService::API::Base +inflect_names+ option.
+
+
+==== Inflection examples
+
+  :add       => Add
+  :find_all  => FindAll
+
+  
+==== Disabling inflection
+
+  class PersonAPI < ActionWebService::API::Base
+    inflect_names false
+  end
+
+
+==== API definition example
+
+  class PersonAPI < ActionWebService::API::Base
+    api_method :add, :expects => [:string, :string, :bool], :returns => [:int]
+    api_method :remove, :expects => [:int], :returns => [:bool]
+  end
+
+==== API usage example
+
+  class PersonController < ActionController::Base
+    web_service_api PersonAPI
+
+    def add
+    end
+
+    def remove
+    end
+  end
+
+
+== Publishing your APIs
+
+Action Web Service uses Action Pack to process protocol requests.  There are two
+modes of dispatching protocol requests, _Direct_, and _Delegated_.
+
+
+=== Direct dispatching
+
+This is the default mode. In this mode, public controller instance methods
+implement the API methods, and parameters are passed through to the methods in
+accordance with the API specification.
+
+The return value of the method is sent back as the return value to the
+caller.
+
+In this mode, a special <tt>api</tt> action is generated in the target
+controller to unwrap the protocol request, forward it on to the relevant method
+and send back the wrapped return value. <em>This action must not be
+overridden.</em>
+
+==== Direct dispatching example
+
+  class PersonController < ApplicationController
+    web_service_api PersonAPI
+
+    def add
+    end
+
+    def remove
+    end
+  end
+
+  class PersonAPI < ActionWebService::API::Base
+    ...
+  end
+
+
+For this example, protocol requests for +Add+ and +Remove+ methods sent to
+<tt>/person/api</tt> will be routed to the controller methods +add+ and +remove+.
+
+
+=== Delegated dispatching
+
+This mode can be turned on by setting the +web_service_dispatching_mode+ option
+in a controller to <tt>:delegated</tt>.
+
+In this mode, the controller contains one or more web service objects (objects
+that implement an ActionWebService::API::Base definition). These web service
+objects are each mapped onto one controller action only.
+
+==== Delegated dispatching example
+
+  class ApiController < ApplicationController
+    web_service_dispatching_mode :delegated
+
+    web_service :person, PersonService.new
+  end
+
+  class PersonService < ActionWebService::Base
+    web_service_api PersonAPI
+
+    def add
+    end
+
+    def remove
+    end
+  end
+
+  class PersonAPI < ActionWebService::API::Base
+    ...
+  end
+
+
+For this example, all protocol requests for +PersonService+ are
+sent to the <tt>/api/person</tt> action.
+
+The <tt>/api/person</tt> action is generated when the +web_service+
+method is called. <em>This action must not be overridden.</em>
+
+Other controller actions (actions that aren't the target of a +web_service+ call)
+are ignored for ActionWebService purposes, and can do normal action tasks.
+
+
+=== Layered dispatching
+
+This mode can be turned on by setting the +web_service_dispatching_mode+ option
+in a controller to <tt>:layered</tt>.
+
+This mode is similar to _delegated_ mode, in that multiple web service objects
+can be attached to one controller, however, all protocol requests are sent to a
+single endpoint.
+
+Use this mode when you want to share code between XML-RPC and SOAP clients,
+for APIs where the XML-RPC method names have prefixes. An example of such
+a method name would be <tt>blogger.newPost</tt>.
+
+
+==== Layered dispatching example
+
+
+  class ApiController < ApplicationController
+    web_service_dispatching_mode :layered
+
+    web_service :mt, MovableTypeService.new
+    web_service :blogger, BloggerService.new
+    web_service :metaWeblog, MetaWeblogService.new
+  end
+
+  class MovableTypeService < ActionWebService::Base
+    ...
+  end
+
+  class BloggerService < ActionWebService::Base
+    ...
+  end
+
+  class MetaWeblogService < ActionWebService::API::Base
+    ...
+  end
+
+
+For this example, an XML-RPC call for a method with a name like
+<tt>mt.getCategories</tt> will be sent to the <tt>getCategories</tt>
+method on the <tt>:mt</tt> service.
+
+
+== Customizing WSDL generation
+
+You can customize the names used for the SOAP bindings in the generated
+WSDL by using the wsdl_service_name option in a controller:
+
+  class WsController < ApplicationController
+    wsdl_service_name 'MyApp'
+  end
+
+You can also customize the namespace used in the generated WSDL for
+custom types and message definition types:
+
+  class WsController < ApplicationController
+    wsdl_namespace 'http://my.company.com/app/wsapi'
+  end
+
+The default namespace used is 'urn:ActionWebService', if you don't supply
+one.
+
+
+== ActionWebService and UTF-8
+
+If you're going to be sending back strings containing non-ASCII UTF-8
+characters using the <tt>:string</tt> data type, you need to make sure that
+Ruby is using UTF-8 as the default encoding for its strings.
+
+The default in Ruby is to use US-ASCII encoding for strings, which causes a string
+validation check in the Ruby SOAP library to fail and your string to be sent
+back as a Base-64 value, which may confuse clients that expected strings
+because of the WSDL.
+
+Two ways of setting the default string encoding are:
+
+* Start Ruby using the <tt>-Ku</tt> command-line option to the Ruby executable
+* Set the <tt>$KCODE</tt> flag in <tt>config/environment.rb</tt> to the
+  string <tt>'UTF8'</tt>
+
+
+== Testing your APIs
+
+
+=== Functional testing
+
+You can perform testing of your APIs by creating a functional test for the
+controller dispatching the API, and calling #invoke in the test case to
+perform the invocation.
+
+Example:
+
+  class PersonApiControllerTest < Test::Unit::TestCase
+    def setup
+      @controller = PersonController.new
+      @request    = ActionController::TestRequest.new
+      @response   = ActionController::TestResponse.new
+    end
+
+    def test_add
+      result = invoke :remove, 1
+      assert_equal true, result
+    end
+  end
+
+This example invokes the API method <tt>test</tt>, defined on 
+the PersonController, and returns the result.
+
+
+=== Scaffolding
+
+You can also test your APIs with a web browser by attaching scaffolding
+to the controller.
+
+Example:
+
+  class PersonController
+    web_service_scaffold :invocation
+  end
+
+This creates an action named <tt>invocation</tt> on the PersonController.
+
+Navigating to this action lets you select the method to invoke, supply the parameters,
+and view the result of the invocation.
+
+
+== Using the client support
+
+Action Web Service includes client classes that can use the same API
+definition as the server. The advantage of this approach is that your client
+will have the same support for Active Record and structured types as the
+server, and can just use them directly, and rely on the marshaling to Do The
+Right Thing.
+
+*Note*: The client support is intended for communication between Ruby on Rails
+applications that both use Action Web Service. It may work with other servers, but
+that is not its intended use, and interoperability can't be guaranteed, especially
+not for .NET web services. 
+
+Web services protocol specifications are complex, and Action Web Service client
+support can only be guaranteed to work with a subset.
+
+
+==== Factory created client example
+
+  class BlogManagerController < ApplicationController
+    web_client_api :blogger, :xmlrpc, 'http://url/to/blog/api/RPC2', :handler_name => 'blogger'
+  end
+
+  class SearchingController < ApplicationController
+    web_client_api :google, :soap, 'http://url/to/blog/api/beta', :service_name => 'GoogleSearch'
+  end
+
+See ActionWebService::API::ActionController::ClassMethods for more details.
+
+==== Manually created client example
+
+  class PersonAPI < ActionWebService::API::Base
+    api_method :find_all, :returns => [[Person]]
+  end
+
+  soap_client = ActionWebService::Client::Soap.new(PersonAPI, "http://...")
+  persons = soap_client.find_all
+
+  class BloggerAPI < ActionWebService::API::Base
+    inflect_names false
+    api_method :getRecentPosts, :returns => [[Blog::Post]]
+  end
+
+  blog = ActionWebService::Client::XmlRpc.new(BloggerAPI, "http://.../xmlrpc", :handler_name => "blogger")
+  posts = blog.getRecentPosts
+
+
+See ActionWebService::Client::Soap and ActionWebService::Client::XmlRpc for more details.
+
+== Dependencies
+
+Action Web Service requires that the Action Pack and Active Record are either
+available to be required immediately or are accessible as GEMs.
+
+It also requires a version of Ruby that includes SOAP support in the standard
+library. At least version 1.8.2 final (2004-12-25) of Ruby is recommended; this
+is the version tested against.
+
+
+== Download
+
+The latest Action Web Service version can be downloaded from
+http://rubyforge.org/projects/actionservice
+
+
+== Installation
+
+You can install Action Web Service with the following command.
+
+  % [sudo] ruby setup.rb
+
+
+== License
+
+Action Web Service is released under the MIT license.
+
+
+== Support
+
+The Ruby on Rails mailing list
+
+Or, to contact the author, send mail to bitserf@gmail.com
+
diff --git a/vendor/plugins/actionwebservice/Rakefile b/vendor/plugins/actionwebservice/Rakefile
new file mode 100644
index 000000000..ad2ad223e
--- /dev/null
+++ b/vendor/plugins/actionwebservice/Rakefile
@@ -0,0 +1,172 @@
+require 'rubygems'
+require 'rake'
+require 'rake/testtask'
+require 'rake/rdoctask'
+require 'rake/packagetask'
+require 'rake/gempackagetask'
+require 'rake/contrib/rubyforgepublisher'
+require 'fileutils'
+require File.join(File.dirname(__FILE__), 'lib', 'action_web_service', 'version')
+
+PKG_BUILD     = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : ''
+PKG_NAME      = 'actionwebservice'
+PKG_VERSION   = ActionWebService::VERSION::STRING + PKG_BUILD
+PKG_FILE_NAME   = "#{PKG_NAME}-#{PKG_VERSION}"
+PKG_DESTINATION = ENV["RAILS_PKG_DESTINATION"] || "../#{PKG_NAME}"
+
+RELEASE_NAME  = "REL #{PKG_VERSION}"
+
+RUBY_FORGE_PROJECT = "aws"
+RUBY_FORGE_USER    = "webster132"
+
+desc "Default Task"
+task :default => [ :test ]
+
+
+# Run the unit tests
+Rake::TestTask.new { |t|
+  t.libs << "test"
+  t.test_files = Dir['test/*_test.rb']
+  t.verbose = true
+}
+
+SCHEMA_PATH = File.join(File.dirname(__FILE__), *%w(test fixtures db_definitions))
+
+desc 'Build the MySQL test database'
+task :build_database do 
+  %x( mysqladmin  create actionwebservice_unittest )
+  %x( mysql  actionwebservice_unittest < #{File.join(SCHEMA_PATH, 'mysql.sql')} )
+end
+
+
+# Generate the RDoc documentation
+Rake::RDocTask.new { |rdoc|
+  rdoc.rdoc_dir = 'doc'
+  rdoc.title    = "Action Web Service -- Web services for Action Pack"
+  rdoc.options << '--line-numbers' << '--inline-source'
+  rdoc.options << '--charset' << 'utf-8'
+  rdoc.template = "#{ENV['template']}.rb" if ENV['template']
+  rdoc.rdoc_files.include('README')
+  rdoc.rdoc_files.include('CHANGELOG')
+  rdoc.rdoc_files.include('lib/action_web_service.rb')
+  rdoc.rdoc_files.include('lib/action_web_service/*.rb')
+  rdoc.rdoc_files.include('lib/action_web_service/api/*.rb')
+  rdoc.rdoc_files.include('lib/action_web_service/client/*.rb')
+  rdoc.rdoc_files.include('lib/action_web_service/container/*.rb')
+  rdoc.rdoc_files.include('lib/action_web_service/dispatcher/*.rb')
+  rdoc.rdoc_files.include('lib/action_web_service/protocol/*.rb')
+  rdoc.rdoc_files.include('lib/action_web_service/support/*.rb')
+}
+
+
+# Create compressed packages
+spec = Gem::Specification.new do |s|
+  s.platform = Gem::Platform::RUBY
+  s.name = PKG_NAME
+  s.summary = "Web service support for Action Pack."
+  s.description = %q{Adds WSDL/SOAP and XML-RPC web service support to Action Pack}
+  s.version = PKG_VERSION
+
+  s.author = "Leon Breedt"
+  s.email = "bitserf@gmail.com"
+  s.rubyforge_project = "aws"
+  s.homepage = "http://www.rubyonrails.org"
+
+  s.add_dependency('actionpack', '= 1.13.5' + PKG_BUILD)
+  s.add_dependency('activerecord', '= 1.15.5' + PKG_BUILD)
+
+  s.has_rdoc = true
+  s.requirements << 'none'
+  s.require_path = 'lib'
+  s.autorequire = 'action_web_service'
+
+  s.files = [ "Rakefile", "setup.rb", "README", "TODO", "CHANGELOG", "MIT-LICENSE" ]
+  s.files = s.files + Dir.glob( "examples/**/*" ).delete_if { |item| item.include?( "\.svn" ) }
+  s.files = s.files + Dir.glob( "lib/**/*" ).delete_if { |item| item.include?( "\.svn" ) }
+  s.files = s.files + Dir.glob( "test/**/*" ).delete_if { |item| item.include?( "\.svn" ) }
+end
+Rake::GemPackageTask.new(spec) do |p|
+  p.gem_spec = spec
+  p.need_tar = true
+  p.need_zip = true
+end
+
+
+# Publish beta gem
+desc "Publish the API documentation"
+task :pgem => [:package] do 
+  Rake::SshFilePublisher.new("davidhh@wrath.rubyonrails.org", "public_html/gems/gems", "pkg", "#{PKG_FILE_NAME}.gem").upload
+  `ssh davidhh@wrath.rubyonrails.org './gemupdate.sh'`
+end
+
+# Publish documentation
+desc "Publish the API documentation"
+task :pdoc => [:rdoc] do 
+  Rake::SshDirPublisher.new("davidhh@wrath.rubyonrails.org", "public_html/aws", "doc").upload
+end
+
+
+def each_source_file(*args)
+	prefix, includes, excludes, open_file = args
+	prefix ||= File.dirname(__FILE__)
+	open_file = true if open_file.nil?
+	includes ||= %w[lib\/action_web_service\.rb$ lib\/action_web_service\/.*\.rb$]
+	excludes ||= %w[lib\/action_web_service\/vendor]
+	Find.find(prefix) do |file_name|
+		next if file_name =~ /\.svn/
+		file_name.gsub!(/^\.\//, '')
+		continue = false
+		includes.each do |inc|
+			if file_name.match(/#{inc}/)
+				continue = true
+				break
+			end
+		end
+		next unless continue
+		excludes.each do |exc|
+			if file_name.match(/#{exc}/)
+				continue = false
+				break
+			end
+		end
+		next unless continue
+		if open_file
+			File.open(file_name) do |f|
+				yield file_name, f
+			end
+		else
+			yield file_name
+		end
+	end
+end
+
+desc "Count lines of the AWS source code"
+task :lines do
+  total_lines = total_loc = 0
+  puts "Per File:"
+	each_source_file do |file_name, f|
+    file_lines = file_loc = 0
+    while line = f.gets
+      file_lines += 1
+      next if line =~ /^\s*$/
+      next if line =~ /^\s*#/
+      file_loc += 1
+    end
+    puts "  #{file_name}: Lines #{file_lines}, LOC #{file_loc}"
+    total_lines += file_lines
+    total_loc += file_loc
+  end
+  puts "Total:"
+  puts "  Lines #{total_lines}, LOC #{total_loc}"
+end
+
+desc "Publish the release files to RubyForge."
+task :release => [ :package ] do
+  require 'rubyforge'
+
+  packages = %w( gem tgz zip ).collect{ |ext| "pkg/#{PKG_NAME}-#{PKG_VERSION}.#{ext}" }
+
+  rubyforge = RubyForge.new
+  rubyforge.login
+  rubyforge.add_release(PKG_NAME, PKG_NAME, "REL #{PKG_VERSION}", *packages)
+end
diff --git a/vendor/plugins/actionwebservice/TODO b/vendor/plugins/actionwebservice/TODO
new file mode 100644
index 000000000..7c022c14c
--- /dev/null
+++ b/vendor/plugins/actionwebservice/TODO
@@ -0,0 +1,32 @@
+= Post-1.0
+  - Document/Literal SOAP support
+    - URL-based dispatching, URL identifies method
+
+  - Add :rest dispatching mode, a.l.a. Backpack API. Clean up dispatching
+    in general. Support vanilla XML-format as a "Rails" protocol?
+    XML::Simple deserialization into params?
+
+      web_service_dispatching_mode :rest
+
+      def method1(params)
+      end
+
+      def method2(params)
+      end
+
+
+      /ws/method1
+        <xml>
+      /ws/method2
+        <yaml>
+
+  - Allow locking down a controller to only accept messages for a particular
+    protocol.  This will allow us to generate fully conformant error messages
+    in cases where we currently fudge it if we don't know the protocol.
+
+  - Allow AWS user to participate in typecasting, so they can centralize
+    workarounds for buggy input in one place
+  
+= Refactoring
+  - Don't have clean way to go from SOAP Class object to the xsd:NAME type
+    string -- NaHi possibly looking at remedying this situation
diff --git a/vendor/plugins/actionwebservice/init.rb b/vendor/plugins/actionwebservice/init.rb
new file mode 100644
index 000000000..582f73717
--- /dev/null
+++ b/vendor/plugins/actionwebservice/init.rb
@@ -0,0 +1,7 @@
+require 'action_web_service'
+
+# These need to be in the load path for action_web_service to work
+Dependencies.load_paths += ["#{RAILS_ROOT}/app/apis"]
+  
+# AWS Test helpers
+require 'action_web_service/test_invoke' if ENV['RAILS_ENV'] == 'test'
diff --git a/vendor/plugins/actionwebservice/install.rb b/vendor/plugins/actionwebservice/install.rb
new file mode 100644
index 000000000..da08bf5f9
--- /dev/null
+++ b/vendor/plugins/actionwebservice/install.rb
@@ -0,0 +1,30 @@
+require 'rbconfig'
+require 'find'
+require 'ftools'
+
+include Config
+
+# this was adapted from rdoc's install.rb by way of Log4r
+
+$sitedir = CONFIG["sitelibdir"]
+unless $sitedir
+  version = CONFIG["MAJOR"] + "." + CONFIG["MINOR"]
+  $libdir = File.join(CONFIG["libdir"], "ruby", version)
+  $sitedir = $:.find {|x| x =~ /site_ruby/ }
+  if !$sitedir
+    $sitedir = File.join($libdir, "site_ruby")
+  elsif $sitedir !~ Regexp.quote(version)
+    $sitedir = File.join($sitedir, version)
+  end
+end
+
+# the actual gruntwork
+Dir.chdir("lib")
+
+Find.find("action_web_service", "action_web_service.rb") { |f|
+  if f[-3..-1] == ".rb"
+    File::install(f, File.join($sitedir, *f.split(/\//)), 0644, true)
+  else
+    File::makedirs(File.join($sitedir, *f.split(/\//)))
+  end
+}
diff --git a/vendor/plugins/actionwebservice/lib/action_web_service.rb b/vendor/plugins/actionwebservice/lib/action_web_service.rb
new file mode 100644
index 000000000..0632dd1ec
--- /dev/null
+++ b/vendor/plugins/actionwebservice/lib/action_web_service.rb
@@ -0,0 +1,66 @@
+#--
+# Copyright (C) 2005 Leon Breedt
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#++
+
+begin
+  require 'active_support'
+  require 'action_controller'
+  require 'active_record'
+rescue LoadError
+  require 'rubygems'
+  gem 'activesupport', '>= 1.0.2'
+  gem 'actionpack', '>= 1.6.0'
+  gem 'activerecord', '>= 1.9.0'
+end
+
+$:.unshift(File.dirname(__FILE__) + "/action_web_service/vendor/")
+
+require 'action_web_service/support/class_inheritable_options'
+require 'action_web_service/support/signature_types'
+require 'action_web_service/base'
+require 'action_web_service/client'
+require 'action_web_service/invocation'
+require 'action_web_service/api'
+require 'action_web_service/casting'
+require 'action_web_service/struct'
+require 'action_web_service/container'
+require 'action_web_service/protocol'
+require 'action_web_service/dispatcher'
+require 'action_web_service/scaffolding'
+
+ActionWebService::Base.class_eval do
+  include ActionWebService::Container::Direct
+  include ActionWebService::Invocation
+end
+
+ActionController::Base.class_eval do
+  include ActionWebService::Protocol::Discovery
+  include ActionWebService::Protocol::Soap
+  include ActionWebService::Protocol::XmlRpc
+  include ActionWebService::Container::Direct
+  include ActionWebService::Container::Delegated
+  include ActionWebService::Container::ActionController
+  include ActionWebService::Invocation
+  include ActionWebService::Dispatcher
+  include ActionWebService::Dispatcher::ActionController
+  include ActionWebService::Scaffolding
+end
diff --git a/vendor/plugins/actionwebservice/lib/action_web_service/api.rb b/vendor/plugins/actionwebservice/lib/action_web_service/api.rb
new file mode 100644
index 000000000..d16dc420d
--- /dev/null
+++ b/vendor/plugins/actionwebservice/lib/action_web_service/api.rb
@@ -0,0 +1,297 @@
+module ActionWebService # :nodoc:
+  module API # :nodoc:
+    # A web service API class specifies the methods that will be available for
+    # invocation for an API. It also contains metadata such as the method type
+    # signature hints.
+    #
+    # It is not intended to be instantiated.
+    #
+    # It is attached to web service implementation classes like
+    # ActionWebService::Base and ActionController::Base derivatives by using
+    # <tt>container.web_service_api</tt>, where <tt>container</tt> is an
+    # ActionController::Base or a ActionWebService::Base.
+    #
+    # See ActionWebService::Container::Direct::ClassMethods for an example
+    # of use.
+    class Base
+      # Whether to transform the public API method names into camel-cased names 
+      class_inheritable_option :inflect_names, true
+
+      # By default only HTTP POST requests are processed
+      class_inheritable_option :allowed_http_methods, [ :post ]
+      
+      # Whether to allow ActiveRecord::Base models in <tt>:expects</tt>.
+      # The default is +false+; you should be aware of the security implications
+      # of allowing this, and ensure that you don't allow remote callers to
+      # easily overwrite data they should not have access to.
+      class_inheritable_option :allow_active_record_expects, false
+
+      # If present, the name of a method to call when the remote caller
+      # tried to call a nonexistent method. Semantically equivalent to
+      # +method_missing+.
+      class_inheritable_option :default_api_method
+
+      # Disallow instantiation
+      private_class_method :new, :allocate
+      
+      class << self
+        include ActionWebService::SignatureTypes
+
+        # API methods have a +name+, which must be the Ruby method name to use when
+        # performing the invocation on the web service object.
+        #
+        # The signatures for the method input parameters and return value can
+        # by specified in +options+.
+        #
+        # A signature is an array of one or more parameter specifiers. 
+        # A parameter specifier can be one of the following:
+        #
+        # * A symbol or string representing one of the Action Web Service base types.
+        #   See ActionWebService::SignatureTypes for a canonical list of the base types.
+        # * The Class object of the parameter type
+        # * A single-element Array containing one of the two preceding items. This
+        #   will cause Action Web Service to treat the parameter at that position
+        #   as an array containing only values of the given type.
+        # * A Hash containing as key the name of the parameter, and as value
+        #   one of the three preceding items
+        # 
+        # If no method input parameter or method return value signatures are given,
+        # the method is assumed to take no parameters and/or return no values of
+        # interest, and any values that are received by the server will be
+        # discarded and ignored.
+        #
+        # Valid options:
+        # [<tt>:expects</tt>]             Signature for the method input parameters
+        # [<tt>:returns</tt>]             Signature for the method return value
+        # [<tt>:expects_and_returns</tt>] Signature for both input parameters and return value
+        def api_method(name, options={})
+          unless options.is_a?(Hash)
+            raise(ActionWebServiceError, "Expected a Hash for options")
+          end
+          validate_options([:expects, :returns, :expects_and_returns], options.keys)
+          if options[:expects_and_returns]
+            expects = options[:expects_and_returns]
+            returns = options[:expects_and_returns]
+          else
+            expects = options[:expects]
+            returns = options[:returns]
+          end
+          expects = canonical_signature(expects)
+          returns = canonical_signature(returns)
+          if expects
+            expects.each do |type|
+              type = type.element_type if type.is_a?(ArrayType)
+              if type.type_class.ancestors.include?(ActiveRecord::Base) && !allow_active_record_expects
+                raise(ActionWebServiceError, "ActiveRecord model classes not allowed in :expects")
+              end
+            end
+          end
+          name = name.to_sym
+          public_name = public_api_method_name(name)
+          method = Method.new(name, public_name, expects, returns)
+          write_inheritable_hash("api_methods", name => method)
+          write_inheritable_hash("api_public_method_names", public_name => name)
+        end
+
+        # Whether the given method name is a service method on this API
+        #
+        #   class ProjectsApi < ActionWebService::API::Base
+        #     api_method :getCount, :returns => [:int]
+        #   end
+        #
+        #   ProjectsApi.has_api_method?('GetCount')   #=> false
+        #   ProjectsApi.has_api_method?(:getCount)    #=> true
+        def has_api_method?(name)
+          api_methods.has_key?(name)
+        end
+  
+        # Whether the given public method name has a corresponding service method
+        # on this API
+        #
+        #   class ProjectsApi < ActionWebService::API::Base
+        #     api_method :getCount, :returns => [:int]
+        #   end
+        #
+        #   ProjectsApi.has_api_method?(:getCount)    #=> false
+        #   ProjectsApi.has_api_method?('GetCount')   #=> true
+        def has_public_api_method?(public_name)
+          api_public_method_names.has_key?(public_name)
+        end
+  
+        # The corresponding public method name for the given service method name
+        #
+        #   ProjectsApi.public_api_method_name('GetCount')  #=> "GetCount"
+        #   ProjectsApi.public_api_method_name(:getCount)   #=> "GetCount"
+        def public_api_method_name(name)
+          if inflect_names
+            name.to_s.camelize
+          else
+            name.to_s
+          end
+        end
+  
+        # The corresponding service method name for the given public method name
+        #
+        #   class ProjectsApi < ActionWebService::API::Base
+        #     api_method :getCount, :returns => [:int]
+        #   end
+        #        
+        #   ProjectsApi.api_method_name('GetCount') #=> :getCount
+        def api_method_name(public_name)
+          api_public_method_names[public_name]
+        end
+  
+        # A Hash containing all service methods on this API, and their
+        # associated metadata.
+        #
+        #   class ProjectsApi < ActionWebService::API::Base
+        #     api_method :getCount,          :returns => [:int]
+        #     api_method :getCompletedCount, :returns => [:int]
+        #   end
+        #
+        #   ProjectsApi.api_methods #=> 
+        #     {:getCount=>#<ActionWebService::API::Method:0x24379d8 ...>,
+        #      :getCompletedCount=>#<ActionWebService::API::Method:0x2437794 ...>}
+        #   ProjectsApi.api_methods[:getCount].public_name #=> "GetCount"
+        def api_methods
+          read_inheritable_attribute("api_methods") || {}
+        end
+
+        # The Method instance for the given public API method name, if any
+        #
+        #   class ProjectsApi < ActionWebService::API::Base
+        #     api_method :getCount,          :returns => [:int]
+        #     api_method :getCompletedCount, :returns => [:int]
+        #   end
+        #
+        #   ProjectsApi.public_api_method_instance('GetCount')  #=> <#<ActionWebService::API::Method:0x24379d8 ...>
+        #   ProjectsApi.public_api_method_instance(:getCount)   #=> nil
+        def public_api_method_instance(public_method_name)
+          api_method_instance(api_method_name(public_method_name))
+        end
+
+        # The Method instance for the given API method name, if any
+        #
+        #   class ProjectsApi < ActionWebService::API::Base
+        #     api_method :getCount,          :returns => [:int]
+        #     api_method :getCompletedCount, :returns => [:int]
+        #   end
+        #
+        #   ProjectsApi.api_method_instance(:getCount) #=> <ActionWebService::API::Method:0x24379d8 ...>
+        #   ProjectsApi.api_method_instance('GetCount') #=> <ActionWebService::API::Method:0x24379d8 ...>
+        def api_method_instance(method_name)
+          api_methods[method_name]
+        end
+
+        # The Method instance for the default API method, if any
+        def default_api_method_instance
+          return nil unless name = default_api_method
+          instance = read_inheritable_attribute("default_api_method_instance")
+          if instance && instance.name == name
+            return instance
+          end
+          instance = Method.new(name, public_api_method_name(name), nil, nil)
+          write_inheritable_attribute("default_api_method_instance", instance)
+          instance
+        end
+
+        private
+          def api_public_method_names
+            read_inheritable_attribute("api_public_method_names") || {}
+          end
+  
+          def validate_options(valid_option_keys, supplied_option_keys)
+            unknown_option_keys = supplied_option_keys - valid_option_keys
+            unless unknown_option_keys.empty?
+              raise(ActionWebServiceError, "Unknown options: #{unknown_option_keys}")
+            end
+          end
+      end
+    end
+
+    # Represents an API method and its associated metadata, and provides functionality
+    # to assist in commonly performed API method tasks.
+    class Method
+      attr :name
+      attr :public_name
+      attr :expects
+      attr :returns
+
+      def initialize(name, public_name, expects, returns)
+        @name = name
+        @public_name = public_name
+        @expects = expects
+        @returns = returns
+        @caster = ActionWebService::Casting::BaseCaster.new(self)
+      end
+      
+      # The list of parameter names for this method
+      def param_names
+        return [] unless @expects
+        @expects.map{ |type| type.name }
+      end
+
+      # Casts a set of Ruby values into the expected Ruby values
+      def cast_expects(params)
+        @caster.cast_expects(params)
+      end
+
+      # Cast a Ruby return value into the expected Ruby value
+      def cast_returns(return_value)
+        @caster.cast_returns(return_value)
+      end
+
+      # Returns the index of the first expected parameter
+      # with the given name
+      def expects_index_of(param_name)
+        return -1 if @expects.nil?
+        (0..(@expects.length-1)).each do |i|
+          return i if @expects[i].name.to_s == param_name.to_s
+        end
+        -1
+      end
+
+      # Returns a hash keyed by parameter name for the given
+      # parameter list
+      def expects_to_hash(params)
+        return {} if @expects.nil?
+        h = {}
+        @expects.zip(params){ |type, param| h[type.name] = param }
+        h
+      end
+
+      # Backwards compatibility with previous API
+      def [](sig_type)
+        case sig_type
+        when :expects
+          @expects.map{|x| compat_signature_entry(x)}
+        when :returns
+          @returns.map{|x| compat_signature_entry(x)}
+        end
+      end
+
+      # String representation of this method
+      def to_s
+        fqn = ""
+        fqn << (@returns ? (@returns[0].human_name(false) + " ") : "void ")
+        fqn << "#{@public_name}("
+        fqn << @expects.map{ |p| p.human_name }.join(", ") if @expects
+        fqn << ")"
+        fqn
+      end
+
+      private
+        def compat_signature_entry(entry)
+          if entry.array?
+            [compat_signature_entry(entry.element_type)]
+          else
+            if entry.spec.is_a?(Hash)
+              {entry.spec.keys.first => entry.type_class}
+            else
+              entry.type_class
+            end
+          end
+        end
+    end
+  end
+end
diff --git a/vendor/plugins/actionwebservice/lib/action_web_service/base.rb b/vendor/plugins/actionwebservice/lib/action_web_service/base.rb
new file mode 100644
index 000000000..6282061d8
--- /dev/null
+++ b/vendor/plugins/actionwebservice/lib/action_web_service/base.rb
@@ -0,0 +1,38 @@
+module ActionWebService # :nodoc:
+  class ActionWebServiceError < StandardError # :nodoc:
+  end
+
+  # An Action Web Service object implements a specified API.
+  #
+  # Used by controllers operating in _Delegated_ dispatching mode.
+  #
+  # ==== Example
+  # 
+  #   class PersonService < ActionWebService::Base
+  #     web_service_api PersonAPI
+  #
+  #     def find_person(criteria)
+  #       Person.find(:all) [...]
+  #     end
+  #
+  #     def delete_person(id)
+  #       Person.find_by_id(id).destroy
+  #     end
+  #   end
+  #
+  #   class PersonAPI < ActionWebService::API::Base
+  #     api_method :find_person,   :expects => [SearchCriteria], :returns => [[Person]]
+  #     api_method :delete_person, :expects => [:int]
+  #   end
+  #
+  #   class SearchCriteria < ActionWebService::Struct
+  #     member :firstname, :string
+  #     member :lastname,  :string
+  #     member :email,     :string
+  #   end
+  class Base
+    # Whether to report exceptions back to the caller in the protocol's exception
+    # format
+    class_inheritable_option :web_service_exception_reporting, true
+  end
+end
diff --git a/vendor/plugins/actionwebservice/lib/action_web_service/casting.rb b/vendor/plugins/actionwebservice/lib/action_web_service/casting.rb
new file mode 100644
index 000000000..71f422eae
--- /dev/null
+++ b/vendor/plugins/actionwebservice/lib/action_web_service/casting.rb
@@ -0,0 +1,138 @@
+require 'time'
+require 'date'
+require 'xmlrpc/datetime'
+
+module ActionWebService # :nodoc:
+  module Casting # :nodoc:
+    class CastingError < ActionWebServiceError # :nodoc:
+    end
+
+    # Performs casting of arbitrary values into the correct types for the signature
+    class BaseCaster # :nodoc:
+      def initialize(api_method)
+        @api_method = api_method
+      end
+
+      # Coerces the parameters in +params+ (an Enumerable) into the types
+      # this method expects
+      def cast_expects(params)
+        self.class.cast_expects(@api_method, params)
+      end
+
+      # Coerces the given +return_value+ into the type returned by this
+      # method
+      def cast_returns(return_value)
+        self.class.cast_returns(@api_method, return_value)
+      end
+
+      class << self
+        include ActionWebService::SignatureTypes
+
+        def cast_expects(api_method, params) # :nodoc:
+          return [] if api_method.expects.nil?
+          api_method.expects.zip(params).map{ |type, param| cast(param, type) }
+        end
+
+        def cast_returns(api_method, return_value) # :nodoc:
+          return nil if api_method.returns.nil?
+          cast(return_value, api_method.returns[0])
+        end
+
+        def cast(value, signature_type) # :nodoc:
+          return value if signature_type.nil? # signature.length != params.length
+          return nil if value.nil?
+          # XMLRPC protocol doesn't support nil values. It uses false instead.
+          # It should never happen for SOAP.
+          if signature_type.structured? && value.equal?(false)
+            return nil
+          end
+          unless signature_type.array? || signature_type.structured?
+            return value if canonical_type(value.class) == signature_type.type
+          end
+          if signature_type.array?
+            unless value.respond_to?(:entries) && !value.is_a?(String)
+              raise CastingError, "Don't know how to cast #{value.class} into #{signature_type.type.inspect}"
+            end
+            value.entries.map do |entry|
+              cast(entry, signature_type.element_type)
+            end
+          elsif signature_type.structured?
+            cast_to_structured_type(value, signature_type)
+          elsif !signature_type.custom?
+            cast_base_type(value, signature_type)
+          end
+        end
+
+        def cast_base_type(value, signature_type) # :nodoc:
+          # This is a work-around for the fact that XML-RPC special-cases DateTime values into its own DateTime type
+          # in order to support iso8601 dates. This doesn't work too well for us, so we'll convert it into a Time,
+          # with the caveat that we won't be able to handle pre-1970 dates that are sent to us.
+          # 
+          # See http://dev.rubyonrails.com/ticket/2516
+          value = value.to_time if value.is_a?(XMLRPC::DateTime)
+
+          case signature_type.type
+          when :int
+            Integer(value)
+          when :string
+            value.to_s
+          when :base64
+            if value.is_a?(ActionWebService::Base64)
+              value
+            else
+              ActionWebService::Base64.new(value.to_s)
+            end
+          when :bool
+            return false if value.nil?
+            return value if value == true || value == false
+            case value.to_s.downcase
+            when '1', 'true', 'y', 'yes'
+              true
+            when '0', 'false', 'n', 'no'
+              false
+            else
+              raise CastingError, "Don't know how to cast #{value.class} into Boolean"
+            end
+          when :float
+            Float(value)
+          when :decimal
+            BigDecimal(value.to_s)
+          when :time
+            value = "%s/%s/%s %s:%s:%s" % value.values_at(*%w[2 3 1 4 5 6]) if value.kind_of?(Hash)
+            value.kind_of?(Time) ? value : Time.parse(value.to_s)
+          when :date
+            value = "%s/%s/%s" % value.values_at(*%w[2 3 1]) if value.kind_of?(Hash)
+            value.kind_of?(Date) ? value : Date.parse(value.to_s)
+          when :datetime
+            value = "%s/%s/%s %s:%s:%s" % value.values_at(*%w[2 3 1 4 5 6]) if value.kind_of?(Hash)
+            value.kind_of?(DateTime) ? value : DateTime.parse(value.to_s)
+          end
+        end
+
+        def cast_to_structured_type(value, signature_type) # :nodoc:
+          obj = nil
+          obj = value if canonical_type(value.class) == canonical_type(signature_type.type)
+          obj ||= signature_type.type_class.new
+          if value.respond_to?(:each_pair)
+            klass = signature_type.type_class
+            value.each_pair do |name, val|
+              type = klass.respond_to?(:member_type) ? klass.member_type(name) : nil
+              val = cast(val, type) if type
+              # See http://dev.rubyonrails.com/ticket/3567
+              val = val.to_time if val.is_a?(XMLRPC::DateTime)
+              obj.__send__("#{name}=", val) if obj.respond_to?(name)
+            end
+          elsif value.respond_to?(:attributes)
+            signature_type.each_member do |name, type|
+              val = value.__send__(name)
+              obj.__send__("#{name}=", cast(val, type)) if obj.respond_to?(name)
+            end
+          else
+            raise CastingError, "Don't know how to cast #{value.class} to #{signature_type.type_class}"
+          end
+          obj
+        end
+      end
+    end
+  end
+end
diff --git a/vendor/plugins/actionwebservice/lib/action_web_service/client.rb b/vendor/plugins/actionwebservice/lib/action_web_service/client.rb
new file mode 100644
index 000000000..2a1e33054
--- /dev/null
+++ b/vendor/plugins/actionwebservice/lib/action_web_service/client.rb
@@ -0,0 +1,3 @@
+require 'action_web_service/client/base'
+require 'action_web_service/client/soap_client'
+require 'action_web_service/client/xmlrpc_client'
diff --git a/vendor/plugins/actionwebservice/lib/action_web_service/client/base.rb b/vendor/plugins/actionwebservice/lib/action_web_service/client/base.rb
new file mode 100644
index 000000000..9dada7bf9
--- /dev/null
+++ b/vendor/plugins/actionwebservice/lib/action_web_service/client/base.rb
@@ -0,0 +1,28 @@
+module ActionWebService # :nodoc:
+  module Client # :nodoc:
+    class ClientError < StandardError # :nodoc:
+    end
+
+    class Base # :nodoc:
+      def initialize(api, endpoint_uri)
+        @api = api
+        @endpoint_uri = endpoint_uri
+      end
+
+      def method_missing(name, *args) # :nodoc:
+        call_name = method_name(name)
+        return super(name, *args) if call_name.nil?
+        self.perform_invocation(call_name, args)
+      end
+
+      private
+        def method_name(name)
+          if @api.has_api_method?(name.to_sym)
+            name.to_s
+          elsif @api.has_public_api_method?(name.to_s)
+            @api.api_method_name(name.to_s).to_s
+          end
+        end
+    end
+  end
+end
diff --git a/vendor/plugins/actionwebservice/lib/action_web_service/client/soap_client.rb b/vendor/plugins/actionwebservice/lib/action_web_service/client/soap_client.rb
new file mode 100644
index 000000000..ebabd8ea8
--- /dev/null
+++ b/vendor/plugins/actionwebservice/lib/action_web_service/client/soap_client.rb
@@ -0,0 +1,113 @@
+require 'soap/rpc/driver'
+require 'uri'
+
+module ActionWebService # :nodoc:
+  module Client # :nodoc:
+
+    # Implements SOAP client support (using RPC encoding for the messages).
+    #
+    # ==== Example Usage
+    #
+    #   class PersonAPI < ActionWebService::API::Base
+    #     api_method :find_all, :returns => [[Person]]
+    #   end
+    #
+    #   soap_client = ActionWebService::Client::Soap.new(PersonAPI, "http://...")
+    #   persons = soap_client.find_all
+    #
+    class Soap < Base
+      # provides access to the underlying soap driver
+      attr_reader :driver
+
+      # Creates a new web service client using the SOAP RPC protocol.
+      #
+      # +api+ must be an ActionWebService::API::Base derivative, and
+      # +endpoint_uri+ must point at the relevant URL to which protocol requests
+      # will be sent with HTTP POST.
+      #
+      # Valid options:
+      # [<tt>:namespace</tt>]    If the remote server has used a custom namespace to
+      #                          declare its custom types, you can specify it here. This would
+      #                          be the namespace declared with a [WebService(Namespace = "http://namespace")] attribute
+      #                          in .NET, for example.
+      # [<tt>:driver_options</tt>]    If you want to supply any custom SOAP RPC driver
+      #                               options, you can provide them as a Hash here
+      #
+      # The <tt>:driver_options</tt> option can be used to configure the backend SOAP
+      # RPC driver. An example of configuring the SOAP backend to do
+      # client-certificate authenticated SSL connections to the server:
+      #
+      #   opts = {}
+      #   opts['protocol.http.ssl_config.verify_mode'] = 'OpenSSL::SSL::VERIFY_PEER'
+      #   opts['protocol.http.ssl_config.client_cert'] = client_cert_file_path
+      #   opts['protocol.http.ssl_config.client_key'] = client_key_file_path
+      #   opts['protocol.http.ssl_config.ca_file'] = ca_cert_file_path
+      #   client = ActionWebService::Client::Soap.new(api, 'https://some/service', :driver_options => opts)
+      def initialize(api, endpoint_uri, options={})
+        super(api, endpoint_uri)
+        @namespace = options[:namespace] || 'urn:ActionWebService'
+        @driver_options = options[:driver_options] || {}
+        @protocol = ActionWebService::Protocol::Soap::SoapProtocol.new @namespace
+        @soap_action_base = options[:soap_action_base]
+        @soap_action_base ||= URI.parse(endpoint_uri).path
+        @driver = create_soap_rpc_driver(api, endpoint_uri)
+        @driver_options.each do |name, value|
+          @driver.options[name.to_s] = value
+        end
+      end
+
+      protected
+        def perform_invocation(method_name, args)
+          method = @api.api_methods[method_name.to_sym]
+          args = method.cast_expects(args.dup) rescue args
+          return_value = @driver.send(method_name, *args)
+          method.cast_returns(return_value.dup) rescue return_value
+        end
+
+        def soap_action(method_name)
+          "#{@soap_action_base}/#{method_name}"
+        end
+
+      private
+        def create_soap_rpc_driver(api, endpoint_uri)
+          @protocol.register_api(api)
+          driver = SoapDriver.new(endpoint_uri, nil)
+          driver.mapping_registry = @protocol.marshaler.registry
+          api.api_methods.each do |name, method|
+            qname = XSD::QName.new(@namespace, method.public_name)
+            action = soap_action(method.public_name)
+            expects = method.expects
+            returns = method.returns
+            param_def = []
+            if expects
+              expects.each do |type|
+                type_binding = @protocol.marshaler.lookup_type(type)
+                if SOAP::Version >= "1.5.5"
+                  param_def << ['in', type.name.to_s, [type_binding.type.type_class.to_s]]
+                else
+                  param_def << ['in', type.name, type_binding.mapping]
+                end
+              end
+            end
+            if returns
+              type_binding = @protocol.marshaler.lookup_type(returns[0])
+              if SOAP::Version >= "1.5.5"
+                param_def << ['retval', 'return', [type_binding.type.type_class.to_s]]
+              else
+                param_def << ['retval', 'return', type_binding.mapping]
+              end
+            end
+            driver.add_method(qname, action, method.name.to_s, param_def)
+          end
+          driver
+        end
+
+        class SoapDriver < SOAP::RPC::Driver # :nodoc:
+          def add_method(qname, soapaction, name, param_def)
+            @proxy.add_rpc_method(qname, soapaction, name, param_def)
+            add_rpc_method_interface(name, param_def)
+          end
+        end
+    end
+  end
+end
diff --git a/vendor/plugins/actionwebservice/lib/action_web_service/client/xmlrpc_client.rb b/vendor/plugins/actionwebservice/lib/action_web_service/client/xmlrpc_client.rb
new file mode 100644
index 000000000..42b5c5d4f
--- /dev/null
+++ b/vendor/plugins/actionwebservice/lib/action_web_service/client/xmlrpc_client.rb
@@ -0,0 +1,58 @@
+require 'uri'
+require 'xmlrpc/client'
+
+module ActionWebService # :nodoc:
+  module Client # :nodoc:
+
+    # Implements XML-RPC client support
+    #
+    # ==== Example Usage
+    #
+    #   class BloggerAPI < ActionWebService::API::Base
+    #     inflect_names false
+    #     api_method :getRecentPosts, :returns => [[Blog::Post]]
+    #   end
+    #
+    #   blog = ActionWebService::Client::XmlRpc.new(BloggerAPI, "http://.../RPC", :handler_name => "blogger")
+    #   posts = blog.getRecentPosts
+    class XmlRpc < Base
+
+      # Creates a new web service client using the XML-RPC protocol.
+      #
+      # +api+ must be an ActionWebService::API::Base derivative, and
+      # +endpoint_uri+ must point at the relevant URL to which protocol requests
+      # will be sent with HTTP POST.
+      #
+      # Valid options:
+      # [<tt>:handler_name</tt>]    If the remote server defines its services inside special
+      #                             handler (the Blogger API uses a <tt>"blogger"</tt> handler name for example),
+      #                             provide it here, or your method calls will fail
+      def initialize(api, endpoint_uri, options={})
+        @api = api
+        @handler_name = options[:handler_name]
+        @protocol = ActionWebService::Protocol::XmlRpc::XmlRpcProtocol.new
+        @client = XMLRPC::Client.new2(endpoint_uri, options[:proxy], options[:timeout])
+      end
+
+      protected
+        def perform_invocation(method_name, args)
+          method = @api.api_methods[method_name.to_sym]
+          if method.expects && method.expects.length != args.length
+            raise(ArgumentError, "#{method.public_name}: wrong number of arguments (#{args.length} for #{method.expects.length})")
+          end
+          args = method.cast_expects(args.dup) rescue args
+          if method.expects
+            method.expects.each_with_index{ |type, i| args[i] = @protocol.value_to_xmlrpc_wire_format(args[i], type) }
+          end
+          ok, return_value = @client.call2(public_name(method_name), *args)
+          return (method.cast_returns(return_value.dup) rescue return_value) if ok
+          raise(ClientError, "#{return_value.faultCode}: #{return_value.faultString}")
+        end
+
+        def public_name(method_name)
+          public_name = @api.public_api_method_name(method_name)
+          @handler_name ? "#{@handler_name}.#{public_name}" : public_name
+        end
+    end
+  end
+end
diff --git a/vendor/plugins/actionwebservice/lib/action_web_service/container.rb b/vendor/plugins/actionwebservice/lib/action_web_service/container.rb
new file mode 100644
index 000000000..13d9d8ab5
--- /dev/null
+++ b/vendor/plugins/actionwebservice/lib/action_web_service/container.rb
@@ -0,0 +1,3 @@
+require 'action_web_service/container/direct_container'
+require 'action_web_service/container/delegated_container'
+require 'action_web_service/container/action_controller_container'
diff --git a/vendor/plugins/actionwebservice/lib/action_web_service/container/action_controller_container.rb b/vendor/plugins/actionwebservice/lib/action_web_service/container/action_controller_container.rb
new file mode 100644
index 000000000..bbc28083c
--- /dev/null
+++ b/vendor/plugins/actionwebservice/lib/action_web_service/container/action_controller_container.rb
@@ -0,0 +1,93 @@
+module ActionWebService # :nodoc:
+  module Container # :nodoc:
+    module ActionController # :nodoc:
+      def self.included(base) # :nodoc:
+        class << base
+          include ClassMethods
+          alias_method_chain :inherited, :api
+          alias_method_chain :web_service_api, :require
+        end
+      end
+
+      module ClassMethods
+        # Creates a client for accessing remote web services, using the
+        # given +protocol+ to communicate with the +endpoint_uri+.
+        #
+        # ==== Example
+        #
+        #   class MyController < ActionController::Base
+        #     web_client_api :blogger, :xmlrpc, "http://blogger.com/myblog/api/RPC2", :handler_name => 'blogger'
+        #   end
+        #
+        # In this example, a protected method named <tt>blogger</tt> will
+        # now exist on the controller, and calling it will return the
+        # XML-RPC client object for working with that remote service.
+        #
+        # +options+ is the set of protocol client specific options (see
+        # a protocol client class for details).
+        #
+        # If your API definition does not exist on the load path with the
+        # correct rules for it to be found using +name+, you can pass in
+        # the API definition class via +options+, using a key of <tt>:api</tt>
+        def web_client_api(name, protocol, endpoint_uri, options={})
+          unless method_defined?(name)
+            api_klass = options.delete(:api) || require_web_service_api(name)
+            class_eval do
+              define_method(name) do
+                create_web_service_client(api_klass, protocol, endpoint_uri, options)
+              end
+              protected name
+            end
+          end
+        end
+
+        def web_service_api_with_require(definition=nil) # :nodoc:
+          return web_service_api_without_require if definition.nil?
+          case definition
+          when String, Symbol
+            klass = require_web_service_api(definition)
+          else
+            klass = definition
+          end
+          web_service_api_without_require(klass)
+        end
+
+        def require_web_service_api(name) # :nodoc:
+          case name
+          when String, Symbol
+            file_name = name.to_s.underscore + "_api"
+            class_name = file_name.camelize
+            class_names = [class_name, class_name.sub(/Api$/, 'API')]
+            begin
+              require_dependency(file_name)
+            rescue LoadError => load_error
+              requiree = / -- (.*?)(\.rb)?$/.match(load_error).to_a[1]
+              msg = requiree == file_name ? "Missing API definition file in apis/#{file_name}.rb" : "Can't load file: #{requiree}"
+              raise LoadError.new(msg).copy_blame!(load_error)
+            end
+            klass = nil
+            class_names.each do |name|
+              klass = name.constantize rescue nil
+              break unless klass.nil?
+            end
+            unless klass
+              raise(NameError, "neither #{class_names[0]} or #{class_names[1]} found")
+            end
+            klass
+          else
+            raise(ArgumentError, "expected String or Symbol argument")
+          end
+        end
+
+        private
+          def inherited_with_api(child)
+            inherited_without_api(child)
+            begin child.web_service_api(child.controller_path)
+            rescue MissingSourceFile => e
+              raise unless e.is_missing?("apis/#{child.controller_path}_api")
+            end
+          end
+      end
+    end
+  end
+end
diff --git a/vendor/plugins/actionwebservice/lib/action_web_service/container/delegated_container.rb b/vendor/plugins/actionwebservice/lib/action_web_service/container/delegated_container.rb
new file mode 100644
index 000000000..5477f8d10
--- /dev/null
+++ b/vendor/plugins/actionwebservice/lib/action_web_service/container/delegated_container.rb
@@ -0,0 +1,86 @@
+module ActionWebService # :nodoc:
+  module Container # :nodoc:
+    module Delegated # :nodoc:
+      class ContainerError < ActionWebServiceError # :nodoc:
+      end
+  
+      def self.included(base) # :nodoc:
+        base.extend(ClassMethods)
+        base.send(:include, ActionWebService::Container::Delegated::InstanceMethods)
+      end
+  
+      module ClassMethods
+        # Declares a web service that will provide access to the API of the given
+        # +object+. +object+ must be an ActionWebService::Base derivative.
+        #
+        # Web service object creation can either be _immediate_, where the object
+        # instance is given at class definition time, or _deferred_, where
+        # object instantiation is delayed until request time.
+        #
+        # ==== Immediate web service object example
+        #
+        #   class ApiController < ApplicationController
+        #     web_service_dispatching_mode :delegated
+        #
+        #     web_service :person, PersonService.new
+        #   end
+        #
+        # For deferred instantiation, a block should be given instead of an
+        # object instance. This block will be executed in controller instance
+        # context, so it can rely on controller instance variables being present.
+        #
+        # ==== Deferred web service object example
+        #
+        #   class ApiController < ApplicationController
+        #     web_service_dispatching_mode :delegated
+        #
+        #     web_service(:person) { PersonService.new(request.env) }
+        #   end
+        def web_service(name, object=nil, &block)
+          if (object && block_given?) || (object.nil? && block.nil?)
+            raise(ContainerError, "either service, or a block must be given")
+          end
+          name = name.to_sym
+          if block_given?
+            info = { name => { :block => block } }
+          else
+            info = { name => { :object => object } }
+          end
+          write_inheritable_hash("web_services", info)
+          call_web_service_definition_callbacks(self, name, info)
+        end
+  
+        # Whether this service contains a service with the given +name+
+        def has_web_service?(name)
+          web_services.has_key?(name.to_sym)
+        end
+  
+        def web_services # :nodoc:
+          read_inheritable_attribute("web_services") || {}
+        end
+  
+        def add_web_service_definition_callback(&block) # :nodoc:
+          write_inheritable_array("web_service_definition_callbacks", [block])
+        end
+  
+        private
+          def call_web_service_definition_callbacks(container_class, web_service_name, service_info)
+            (read_inheritable_attribute("web_service_definition_callbacks") || []).each do |block|
+              block.call(container_class, web_service_name, service_info)
+            end
+          end
+      end
+  
+      module InstanceMethods # :nodoc:
+        def web_service_object(web_service_name)
+          info = self.class.web_services[web_service_name.to_sym]
+          unless info
+            raise(ContainerError, "no such web service '#{web_service_name}'")
+          end
+          service = info[:block]
+          service ? self.instance_eval(&service) : info[:object]
+        end
+      end
+    end
+  end
+end
diff --git a/vendor/plugins/actionwebservice/lib/action_web_service/container/direct_container.rb b/vendor/plugins/actionwebservice/lib/action_web_service/container/direct_container.rb
new file mode 100644
index 000000000..8818d8f45
--- /dev/null
+++ b/vendor/plugins/actionwebservice/lib/action_web_service/container/direct_container.rb
@@ -0,0 +1,69 @@
+module ActionWebService # :nodoc:
+  module Container # :nodoc:
+    module Direct # :nodoc:
+      class ContainerError < ActionWebServiceError # :nodoc:
+      end
+
+      def self.included(base) # :nodoc:
+        base.extend(ClassMethods)
+      end
+  
+      module ClassMethods
+        # Attaches ActionWebService API +definition+ to the calling class.
+        #
+        # Action Controllers can have a default associated API, removing the need
+        # to call this method if you follow the Action Web Service naming conventions.
+        #
+        # A controller with a class name of GoogleSearchController will
+        # implicitly load <tt>app/apis/google_search_api.rb</tt>, and expect the
+        # API definition class to be named <tt>GoogleSearchAPI</tt> or
+        # <tt>GoogleSearchApi</tt>.
+        #
+        # ==== Service class example
+        #
+        #   class MyService < ActionWebService::Base
+        #     web_service_api MyAPI
+        #   end
+        #
+        #   class MyAPI < ActionWebService::API::Base
+        #     ...
+        #   end
+        #
+        # ==== Controller class example
+        #
+        #   class MyController < ActionController::Base
+        #     web_service_api MyAPI
+        #   end
+        #
+        #   class MyAPI < ActionWebService::API::Base
+        #     ...
+        #   end
+        def web_service_api(definition=nil)
+          if definition.nil?
+            read_inheritable_attribute("web_service_api")
+          else
+            if definition.is_a?(Symbol)
+              raise(ContainerError, "symbols can only be used for #web_service_api inside of a controller")
+            end
+            unless definition.respond_to?(:ancestors) && definition.ancestors.include?(ActionWebService::API::Base)
+              raise(ContainerError, "#{definition.to_s} is not a valid API definition")
+            end
+            write_inheritable_attribute("web_service_api", definition)
+            call_web_service_api_callbacks(self, definition)
+          end
+        end
+  
+        def add_web_service_api_callback(&block) # :nodoc:
+          write_inheritable_array("web_service_api_callbacks", [block])
+        end
+  
+        private
+          def call_web_service_api_callbacks(container_class, definition)
+            (read_inheritable_attribute("web_service_api_callbacks") || []).each do |block|
+              block.call(container_class, definition)
+            end
+          end
+      end
+    end
+  end
+end
diff --git a/vendor/plugins/actionwebservice/lib/action_web_service/dispatcher.rb b/vendor/plugins/actionwebservice/lib/action_web_service/dispatcher.rb
new file mode 100644
index 000000000..601d83137
--- /dev/null
+++ b/vendor/plugins/actionwebservice/lib/action_web_service/dispatcher.rb
@@ -0,0 +1,2 @@
+require 'action_web_service/dispatcher/abstract'
+require 'action_web_service/dispatcher/action_controller_dispatcher'
diff --git a/vendor/plugins/actionwebservice/lib/action_web_service/dispatcher/abstract.rb b/vendor/plugins/actionwebservice/lib/action_web_service/dispatcher/abstract.rb
new file mode 100644
index 000000000..cb94d649e
--- /dev/null
+++ b/vendor/plugins/actionwebservice/lib/action_web_service/dispatcher/abstract.rb
@@ -0,0 +1,207 @@
+require 'benchmark'
+
+module ActionWebService # :nodoc:
+  module Dispatcher # :nodoc:
+    class DispatcherError < ActionWebService::ActionWebServiceError # :nodoc:
+      def initialize(*args)
+        super
+        set_backtrace(caller)
+      end
+    end
+
+    def self.included(base) # :nodoc:
+      base.class_inheritable_option(:web_service_dispatching_mode, :direct)
+      base.class_inheritable_option(:web_service_exception_reporting, true)
+      base.send(:include, ActionWebService::Dispatcher::InstanceMethods)
+    end
+
+    module InstanceMethods # :nodoc:
+      private
+        def invoke_web_service_request(protocol_request)
+          invocation = web_service_invocation(protocol_request)
+          if invocation.is_a?(Array) && protocol_request.protocol.is_a?(Protocol::XmlRpc::XmlRpcProtocol)
+            xmlrpc_multicall_invoke(invocation)
+          else
+            web_service_invoke(invocation)
+          end
+        end
+      
+        def web_service_direct_invoke(invocation)
+          @method_params = invocation.method_ordered_params
+          arity = method(invocation.api_method.name).arity rescue 0
+          if arity < 0 || arity > 0
+            params = @method_params
+          else
+            params = []
+          end
+          web_service_filtered_invoke(invocation, params)
+        end
+
+        def web_service_delegated_invoke(invocation)
+          web_service_filtered_invoke(invocation, invocation.method_ordered_params)
+        end
+
+        def web_service_filtered_invoke(invocation, params)
+          cancellation_reason = nil
+          return_value = invocation.service.perform_invocation(invocation.api_method.name, params) do |x|
+            cancellation_reason = x
+          end
+          if cancellation_reason
+            raise(DispatcherError, "request canceled: #{cancellation_reason}")
+          end
+          return_value
+        end
+        
+        def web_service_invoke(invocation)
+          case web_service_dispatching_mode
+          when :direct
+            return_value = web_service_direct_invoke(invocation)
+          when :delegated, :layered
+            return_value = web_service_delegated_invoke(invocation)
+          end
+          web_service_create_response(invocation.protocol, invocation.protocol_options, invocation.api, invocation.api_method, return_value)
+        end
+        
+        def xmlrpc_multicall_invoke(invocations)
+          responses = []
+          invocations.each do |invocation|
+            if invocation.is_a?(Hash)
+              responses << [invocation, nil]
+              next
+            end
+            begin
+              case web_service_dispatching_mode
+              when :direct
+                return_value = web_service_direct_invoke(invocation)
+              when :delegated, :layered
+                return_value = web_service_delegated_invoke(invocation)
+              end
+              api_method = invocation.api_method
+              if invocation.api.has_api_method?(api_method.name)
+                response_type = (api_method.returns ? api_method.returns[0] : nil)
+                return_value = api_method.cast_returns(return_value)
+              else
+                response_type = ActionWebService::SignatureTypes.canonical_signature_entry(return_value.class, 0)
+              end
+              responses << [return_value, response_type]
+            rescue Exception => e
+              responses << [{ 'faultCode' => 3, 'faultString' => e.message }, nil]
+            end
+          end
+          invocation = invocations[0]
+          invocation.protocol.encode_multicall_response(responses, invocation.protocol_options)
+        end
+
+        def web_service_invocation(request, level = 0)
+          public_method_name = request.method_name
+          invocation = Invocation.new
+          invocation.protocol = request.protocol
+          invocation.protocol_options = request.protocol_options
+          invocation.service_name = request.service_name
+          if web_service_dispatching_mode == :layered
+            case invocation.protocol
+            when Protocol::Soap::SoapProtocol
+              soap_action = request.protocol_options[:soap_action]
+              if soap_action && soap_action =~ /^\/\w+\/(\w+)\//
+                invocation.service_name = $1
+              end
+            when Protocol::XmlRpc::XmlRpcProtocol
+              if request.method_name =~ /^([^\.]+)\.(.*)$/
+                public_method_name = $2
+                invocation.service_name = $1
+              end
+            end
+          end
+          if invocation.protocol.is_a? Protocol::XmlRpc::XmlRpcProtocol
+            if public_method_name == 'multicall' && invocation.service_name == 'system'
+              if level > 0
+                raise(DispatcherError, "Recursive system.multicall invocations not allowed")
+              end
+              multicall = request.method_params.dup
+              unless multicall.is_a?(Array) && multicall[0].is_a?(Array)
+                raise(DispatcherError, "Malformed multicall (expected array of Hash elements)")
+              end
+              multicall = multicall[0]
+              return multicall.map do |item|
+                raise(DispatcherError, "Multicall elements must be Hash") unless item.is_a?(Hash)
+                raise(DispatcherError, "Multicall elements must contain a 'methodName' key") unless item.has_key?('methodName')
+                method_name = item['methodName']
+                params = item.has_key?('params') ? item['params'] : []
+                multicall_request = request.dup
+                multicall_request.method_name = method_name
+                multicall_request.method_params = params
+                begin
+                  web_service_invocation(multicall_request, level + 1)
+                rescue Exception => e
+                  {'faultCode' => 4, 'faultMessage' => e.message}
+                end
+              end
+            end
+          end
+          case web_service_dispatching_mode
+          when :direct
+            invocation.api = self.class.web_service_api
+            invocation.service = self
+          when :delegated, :layered
+            invocation.service = web_service_object(invocation.service_name)
+            invocation.api = invocation.service.class.web_service_api
+          end
+          if invocation.api.nil?
+            raise(DispatcherError, "no API attached to #{invocation.service.class}")
+          end
+          invocation.protocol.register_api(invocation.api)
+          request.api = invocation.api
+          if invocation.api.has_public_api_method?(public_method_name)
+            invocation.api_method = invocation.api.public_api_method_instance(public_method_name)
+          else
+            if invocation.api.default_api_method.nil?
+              raise(DispatcherError, "no such method '#{public_method_name}' on API #{invocation.api}")
+            else
+              invocation.api_method = invocation.api.default_api_method_instance
+            end
+          end
+          if invocation.service.nil?
+            raise(DispatcherError, "no service available for service name #{invocation.service_name}")
+          end
+          unless invocation.service.respond_to?(invocation.api_method.name)
+            raise(DispatcherError, "no such method '#{public_method_name}' on API #{invocation.api} (#{invocation.api_method.name})")
+          end
+          request.api_method = invocation.api_method
+          begin
+            invocation.method_ordered_params = invocation.api_method.cast_expects(request.method_params.dup)
+          rescue
+            logger.warn "Casting of method parameters failed" unless logger.nil?
+            invocation.method_ordered_params = request.method_params
+          end
+          request.method_params = invocation.method_ordered_params
+          invocation.method_named_params = {}
+          invocation.api_method.param_names.inject(0) do |m, n|
+            invocation.method_named_params[n] = invocation.method_ordered_params[m]
+            m + 1
+          end
+          invocation
+        end
+
+        def web_service_create_response(protocol, protocol_options, api, api_method, return_value)
+          if api.has_api_method?(api_method.name)
+            return_type = api_method.returns ? api_method.returns[0] : nil
+            return_value = api_method.cast_returns(return_value)
+          else
+            return_type = ActionWebService::SignatureTypes.canonical_signature_entry(return_value.class, 0)
+          end
+          protocol.encode_response(api_method.public_name + 'Response', return_value, return_type, protocol_options)
+        end
+
+        class Invocation # :nodoc:
+          attr_accessor :protocol
+          attr_accessor :protocol_options
+          attr_accessor :service_name
+          attr_accessor :api
+          attr_accessor :api_method
+          attr_accessor :method_ordered_params
+          attr_accessor :method_named_params
+          attr_accessor :service
+        end
+    end
+  end
+end
diff --git a/vendor/plugins/actionwebservice/lib/action_web_service/dispatcher/action_controller_dispatcher.rb b/vendor/plugins/actionwebservice/lib/action_web_service/dispatcher/action_controller_dispatcher.rb
new file mode 100644
index 000000000..f9995197a
--- /dev/null
+++ b/vendor/plugins/actionwebservice/lib/action_web_service/dispatcher/action_controller_dispatcher.rb
@@ -0,0 +1,379 @@
+require 'benchmark'
+require 'builder/xmlmarkup'
+
+module ActionWebService # :nodoc:
+  module Dispatcher # :nodoc:
+    module ActionController # :nodoc:
+      def self.included(base) # :nodoc:
+        class << base
+          include ClassMethods
+          alias_method_chain :inherited, :action_controller
+        end
+        base.class_eval do
+          alias_method :web_service_direct_invoke_without_controller, :web_service_direct_invoke
+        end
+        base.add_web_service_api_callback do |klass, api|
+          if klass.web_service_dispatching_mode == :direct
+            klass.class_eval 'def api; dispatch_web_service_request; end'
+          end
+        end
+        base.add_web_service_definition_callback do |klass, name, info|
+          if klass.web_service_dispatching_mode == :delegated
+            klass.class_eval "def #{name}; dispatch_web_service_request; end"
+          elsif klass.web_service_dispatching_mode == :layered
+            klass.class_eval 'def api; dispatch_web_service_request; end'
+          end
+        end
+        base.send(:include, ActionWebService::Dispatcher::ActionController::InstanceMethods)
+      end
+
+      module ClassMethods # :nodoc:
+        def inherited_with_action_controller(child)
+          inherited_without_action_controller(child)
+          child.send(:include, ActionWebService::Dispatcher::ActionController::WsdlAction)
+        end
+      end
+
+      module InstanceMethods # :nodoc:
+        private
+          def dispatch_web_service_request
+            method = request.method.to_s.upcase
+            allowed_methods = self.class.web_service_api ? (self.class.web_service_api.allowed_http_methods || []) : [ :post ]
+            allowed_methods = allowed_methods.map{|m| m.to_s.upcase }
+            if !allowed_methods.include?(method)
+              render :text => "#{method} not supported", :status=>500
+              return
+            end
+            exception = nil
+            begin
+              ws_request = discover_web_service_request(request)
+            rescue Exception => e
+              exception = e
+            end
+            if ws_request
+              ws_response = nil
+              exception = nil
+              bm = Benchmark.measure do
+                begin
+                  ws_response = invoke_web_service_request(ws_request)
+                rescue Exception => e
+                  exception = e
+                end
+              end
+              log_request(ws_request, request.raw_post)
+              if exception
+                log_error(exception) unless logger.nil?
+                send_web_service_error_response(ws_request, exception)
+              else
+                send_web_service_response(ws_response, bm.real)
+              end
+            else
+              exception ||= DispatcherError.new("Malformed SOAP or XML-RPC protocol message")
+              log_error(exception) unless logger.nil?
+              send_web_service_error_response(ws_request, exception)
+            end
+          rescue Exception => e
+            log_error(e) unless logger.nil?
+            send_web_service_error_response(ws_request, e)
+          end
+
+          def send_web_service_response(ws_response, elapsed=nil)
+            log_response(ws_response, elapsed)
+            options = { :type => ws_response.content_type, :disposition => 'inline' }
+            send_data(ws_response.body, options)
+          end
+
+          def send_web_service_error_response(ws_request, exception)
+            if ws_request
+              unless self.class.web_service_exception_reporting
+                exception = DispatcherError.new("Internal server error (exception raised)")
+              end
+              api_method = ws_request.api_method
+              public_method_name = api_method ? api_method.public_name : ws_request.method_name
+              return_type = ActionWebService::SignatureTypes.canonical_signature_entry(Exception, 0)
+              ws_response = ws_request.protocol.encode_response(public_method_name + 'Response', exception, return_type, ws_request.protocol_options)
+              send_web_service_response(ws_response)
+            else
+              if self.class.web_service_exception_reporting
+                message = exception.message
+                backtrace = "\nBacktrace:\n#{exception.backtrace.join("\n")}"
+              else
+                message = "Exception raised"
+                backtrace = ""
+              end
+              render :text => "Internal protocol error: #{message}#{backtrace}", :status => 500
+            end
+          end
+
+          def web_service_direct_invoke(invocation)
+            invocation.method_named_params.each do |name, value|
+              params[name] = value
+            end
+            web_service_direct_invoke_without_controller(invocation)
+          end
+
+          def log_request(ws_request, body)
+            unless logger.nil?
+              name = ws_request.method_name
+              api_method = ws_request.api_method
+              params = ws_request.method_params
+              if api_method && api_method.expects
+                params = api_method.expects.zip(params).map{ |type, param| "#{type.name}=>#{param.inspect}" }
+              else
+                params = params.map{ |param| param.inspect }
+              end
+              service = ws_request.service_name
+              logger.debug("\nWeb Service Request: #{name}(#{params.join(", ")}) Entrypoint: #{service}")
+              logger.debug(indent(body))
+            end
+          end
+
+          def log_response(ws_response, elapsed=nil)
+            unless logger.nil?
+              elapsed = (elapsed ? " (%f):" % elapsed : ":")
+              logger.debug("\nWeb Service Response" + elapsed + " => #{ws_response.return_value.inspect}")
+              logger.debug(indent(ws_response.body))
+            end
+          end
+
+          def indent(body)
+            body.split(/\n/).map{|x| "  #{x}"}.join("\n")
+          end
+      end
+
+      module WsdlAction # :nodoc:
+        XsdNs             = 'http://www.w3.org/2001/XMLSchema'
+        WsdlNs            = 'http://schemas.xmlsoap.org/wsdl/'
+        SoapNs            = 'http://schemas.xmlsoap.org/wsdl/soap/'
+        SoapEncodingNs    = 'http://schemas.xmlsoap.org/soap/encoding/'
+        SoapHttpTransport = 'http://schemas.xmlsoap.org/soap/http'
+
+        def wsdl
+          case request.method
+          when :get
+            begin
+              options = { :type => 'text/xml', :disposition => 'inline' }
+              send_data(to_wsdl, options)
+            rescue Exception => e
+              log_error(e) unless logger.nil?
+            end
+          when :post
+            render :text => 'POST not supported', :status => 500
+          end
+        end
+
+        private
+          def base_uri
+            host = request.host_with_port
+            relative_url_root = request.relative_url_root
+            scheme = request.ssl? ? 'https' : 'http'
+            '%s://%s%s/%s/' % [scheme, host, relative_url_root, self.class.controller_path]
+          end
+
+          def to_wsdl
+            xml = ''
+            dispatching_mode = web_service_dispatching_mode
+            global_service_name = wsdl_service_name
+            namespace = wsdl_namespace || 'urn:ActionWebService'
+            soap_action_base = "/#{controller_name}"
+
+            marshaler = ActionWebService::Protocol::Soap::SoapMarshaler.new(namespace)
+            apis = {}
+            case dispatching_mode
+            when :direct
+              api = self.class.web_service_api
+              web_service_name = controller_class_name.sub(/Controller$/, '').underscore
+              apis[web_service_name] = [api, register_api(api, marshaler)]
+            when :delegated, :layered
+              self.class.web_services.each do |web_service_name, info|
+                service = web_service_object(web_service_name)
+                api = service.class.web_service_api
+                apis[web_service_name] = [api, register_api(api, marshaler)]
+              end
+            end
+            custom_types = []
+            apis.values.each do |api, bindings|
+              bindings.each do |b|
+                custom_types << b unless custom_types.include?(b)
+              end
+            end
+
+            xm = Builder::XmlMarkup.new(:target => xml, :indent => 2)
+            xm.instruct!
+            xm.definitions('name'            => wsdl_service_name,
+                           'targetNamespace' => namespace,
+                           'xmlns:typens'    => namespace,
+                           'xmlns:xsd'       => XsdNs,
+                           'xmlns:soap'      => SoapNs,
+                           'xmlns:soapenc'   => SoapEncodingNs,
+                           'xmlns:wsdl'      => WsdlNs,
+                           'xmlns'           => WsdlNs) do
+              # Generate XSD
+              if custom_types.size > 0
+                xm.types do
+                  xm.xsd(:schema, 'xmlns' => XsdNs, 'targetNamespace' => namespace) do
+                    custom_types.each do |binding|
+                      case
+                      when binding.type.array?
+                        xm.xsd(:complexType, 'name' => binding.type_name) do
+                          xm.xsd(:complexContent) do
+                            xm.xsd(:restriction, 'base' => 'soapenc:Array') do
+                              xm.xsd(:attribute, 'ref' => 'soapenc:arrayType',
+                                                 'wsdl:arrayType' => binding.element_binding.qualified_type_name('typens') + '[]')
+                            end
+                          end
+                        end
+                      when binding.type.structured?
+                        xm.xsd(:complexType, 'name' => binding.type_name) do
+                          xm.xsd(:all) do
+                            binding.type.each_member do |name, type|
+                              b = marshaler.register_type(type)
+                              xm.xsd(:element, 'name' => name, 'type' => b.qualified_type_name('typens'))
+                            end
+                          end
+                        end
+                      end
+                    end
+                  end
+                end
+              end
+
+              # APIs
+              apis.each do |api_name, values|
+                api = values[0]
+                api.api_methods.each do |name, method|
+                  gen = lambda do |msg_name, direction|
+                    xm.message('name' => message_name_for(api_name, msg_name)) do
+                      sym = nil
+                      if direction == :out
+                        returns = method.returns
+                        if returns
+                          binding = marshaler.register_type(returns[0])
+                          xm.part('name' => 'return', 'type' => binding.qualified_type_name('typens'))
+                        end
+                      else
+                        expects = method.expects
+                        expects.each do |type|
+                          binding = marshaler.register_type(type)
+                          xm.part('name' => type.name, 'type' => binding.qualified_type_name('typens'))
+                        end if expects
+                      end
+                    end
+                  end
+                  public_name = method.public_name
+                  gen.call(public_name, :in)
+                  gen.call("#{public_name}Response", :out)
+                end
+
+                # Port
+                port_name = port_name_for(global_service_name, api_name)
+                xm.portType('name' => port_name) do
+                  api.api_methods.each do |name, method|
+                    xm.operation('name' => method.public_name) do
+                      xm.input('message' => "typens:" + message_name_for(api_name, method.public_name))
+                      xm.output('message' => "typens:" + message_name_for(api_name, "#{method.public_name}Response"))
+                    end
+                  end
+                end
+
+                # Bind it
+                binding_name = binding_name_for(global_service_name, api_name)
+                xm.binding('name' => binding_name, 'type' => "typens:#{port_name}") do
+                  xm.soap(:binding, 'style' => 'rpc', 'transport' => SoapHttpTransport)
+                  api.api_methods.each do |name, method|
+                    xm.operation('name' => method.public_name) do
+                      case web_service_dispatching_mode
+                      when :direct
+                        soap_action = soap_action_base + "/api/" + method.public_name
+                      when :delegated, :layered
+                        soap_action = soap_action_base \
+                                    + "/" + api_name.to_s \
+                                    + "/" + method.public_name
+                      end
+                      xm.soap(:operation, 'soapAction' => soap_action)
+                      xm.input do
+                        xm.soap(:body,
+                                'use'           => 'encoded',
+                                'namespace'     => namespace,
+                                'encodingStyle' => SoapEncodingNs)
+                      end
+                      xm.output do
+                        xm.soap(:body,
+                                'use'           => 'encoded',
+                                'namespace'     => namespace,
+                                'encodingStyle' => SoapEncodingNs)
+                      end
+                    end
+                  end
+                end
+              end
+
+              # Define it
+              xm.service('name' => "#{global_service_name}Service") do
+                apis.each do |api_name, values|
+                  port_name = port_name_for(global_service_name, api_name)
+                  binding_name = binding_name_for(global_service_name,  api_name)
+                  case web_service_dispatching_mode
+                  when :direct, :layered
+                    binding_target = 'api'
+                  when :delegated
+                    binding_target = api_name.to_s
+                  end
+                  xm.port('name' => port_name, 'binding' => "typens:#{binding_name}") do
+                    xm.soap(:address, 'location' => "#{base_uri}#{binding_target}")
+                  end
+                end
+              end
+            end
+          end
+
+          def port_name_for(global_service, service)
+            "#{global_service}#{service.to_s.camelize}Port"
+          end
+
+          def binding_name_for(global_service, service)
+            "#{global_service}#{service.to_s.camelize}Binding"
+          end
+
+          def message_name_for(api_name, message_name)
+            mode = web_service_dispatching_mode
+            if mode == :layered || mode == :delegated
+              api_name.to_s + '-' + message_name
+            else
+              message_name
+            end
+          end
+
+          def register_api(api, marshaler)
+            bindings = {}
+            traverse_custom_types(api, marshaler, bindings) do |binding|
+              bindings[binding] = nil unless bindings.has_key?(binding)
+              element_binding = binding.element_binding
+              bindings[element_binding] = nil if element_binding && !bindings.has_key?(element_binding)
+            end
+            bindings.keys
+          end
+
+          def traverse_custom_types(api, marshaler, bindings, &block)
+            api.api_methods.each do |name, method|
+              expects, returns = method.expects, method.returns
+              expects.each{ |type| traverse_type(marshaler, type, bindings, &block) if type.custom? } if expects
+              returns.each{ |type| traverse_type(marshaler, type, bindings, &block) if type.custom? } if returns
+            end
+          end
+
+          def traverse_type(marshaler, type, bindings, &block)
+            binding = marshaler.register_type(type)
+            return if bindings.has_key?(binding)
+            bindings[binding] = nil
+            yield binding
+            if type.array?
+              yield marshaler.register_type(type.element_type)
+              type = type.element_type
+            end
+            type.each_member{ |name, type| traverse_type(marshaler, type, bindings, &block) } if type.structured?
+          end
+       end
+    end
+  end
+end
diff --git a/vendor/plugins/actionwebservice/lib/action_web_service/invocation.rb b/vendor/plugins/actionwebservice/lib/action_web_service/invocation.rb
new file mode 100644
index 000000000..2a9121ee2
--- /dev/null
+++ b/vendor/plugins/actionwebservice/lib/action_web_service/invocation.rb
@@ -0,0 +1,202 @@
+module ActionWebService # :nodoc:
+  module Invocation # :nodoc:
+    class InvocationError < ActionWebService::ActionWebServiceError # :nodoc:
+    end
+
+    def self.included(base) # :nodoc:
+      base.extend(ClassMethods)
+      base.send(:include, ActionWebService::Invocation::InstanceMethods)
+    end
+
+    # Invocation interceptors provide a means to execute custom code before
+    # and after method invocations on ActionWebService::Base objects.
+    #
+    # When running in _Direct_ dispatching mode, ActionController filters
+    # should be used for this functionality instead.
+    #
+    # The semantics of invocation interceptors are the same as ActionController
+    # filters, and accept the same parameters and options.
+    #
+    # A _before_ interceptor can also cancel execution by returning +false+,
+    # or returning a <tt>[false, "cancel reason"]</tt> array if it wishes to supply
+    # a reason for canceling the request.
+    #
+    # === Example
+    #
+    #   class CustomService < ActionWebService::Base
+    #     before_invocation :intercept_add, :only => [:add]
+    #
+    #     def add(a, b)
+    #       a + b
+    #     end
+    #
+    #     private
+    #       def intercept_add
+    #         return [false, "permission denied"] # cancel it
+    #       end
+    #   end
+    #
+    # Options:
+    # [<tt>:except</tt>]  A list of methods for which the interceptor will NOT be called
+    # [<tt>:only</tt>]    A list of methods for which the interceptor WILL be called
+    module ClassMethods
+      # Appends the given +interceptors+ to be called
+      # _before_ method invocation.
+      def append_before_invocation(*interceptors, &block)
+        conditions = extract_conditions!(interceptors)
+        interceptors << block if block_given?
+        add_interception_conditions(interceptors, conditions)
+        append_interceptors_to_chain("before", interceptors)
+      end
+
+      # Prepends the given +interceptors+ to be called
+      # _before_ method invocation.
+      def prepend_before_invocation(*interceptors, &block)
+        conditions = extract_conditions!(interceptors)
+        interceptors << block if block_given?
+        add_interception_conditions(interceptors, conditions)
+        prepend_interceptors_to_chain("before", interceptors)
+      end
+
+      alias :before_invocation :append_before_invocation
+
+      # Appends the given +interceptors+ to be called
+      # _after_ method invocation.
+      def append_after_invocation(*interceptors, &block)
+        conditions = extract_conditions!(interceptors)
+        interceptors << block if block_given?
+        add_interception_conditions(interceptors, conditions)
+        append_interceptors_to_chain("after", interceptors)
+      end
+
+      # Prepends the given +interceptors+ to be called
+      # _after_ method invocation.
+      def prepend_after_invocation(*interceptors, &block)
+        conditions = extract_conditions!(interceptors)
+        interceptors << block if block_given?
+        add_interception_conditions(interceptors, conditions)
+        prepend_interceptors_to_chain("after", interceptors)
+      end
+
+      alias :after_invocation :append_after_invocation
+
+      def before_invocation_interceptors # :nodoc:
+        read_inheritable_attribute("before_invocation_interceptors")
+      end
+
+      def after_invocation_interceptors # :nodoc:
+        read_inheritable_attribute("after_invocation_interceptors")
+      end
+
+      def included_intercepted_methods # :nodoc:
+        read_inheritable_attribute("included_intercepted_methods") || {}
+      end
+      
+      def excluded_intercepted_methods # :nodoc:
+        read_inheritable_attribute("excluded_intercepted_methods") || {}
+      end
+
+      private
+        def append_interceptors_to_chain(condition, interceptors)
+          write_inheritable_array("#{condition}_invocation_interceptors", interceptors)
+        end
+
+        def prepend_interceptors_to_chain(condition, interceptors)
+          interceptors = interceptors + read_inheritable_attribute("#{condition}_invocation_interceptors")
+          write_inheritable_attribute("#{condition}_invocation_interceptors", interceptors)
+        end
+
+        def extract_conditions!(interceptors)
+          return nil unless interceptors.last.is_a? Hash
+          interceptors.pop
+        end
+
+        def add_interception_conditions(interceptors, conditions)
+          return unless conditions
+          included, excluded = conditions[:only], conditions[:except]
+          write_inheritable_hash("included_intercepted_methods", condition_hash(interceptors, included)) && return if included
+          write_inheritable_hash("excluded_intercepted_methods", condition_hash(interceptors, excluded)) if excluded
+        end
+
+        def condition_hash(interceptors, *methods)
+          interceptors.inject({}) {|hash, interceptor| hash.merge(interceptor => methods.flatten.map {|method| method.to_s})}
+        end
+    end
+
+    module InstanceMethods # :nodoc:
+      def self.included(base)
+        base.class_eval do
+          alias_method_chain :perform_invocation, :interception
+        end
+      end
+
+      def perform_invocation_with_interception(method_name, params, &block)
+        return if before_invocation(method_name, params, &block) == false
+        return_value = perform_invocation_without_interception(method_name, params)
+        after_invocation(method_name, params, return_value)
+        return_value
+      end
+
+      def perform_invocation(method_name, params)
+        send(method_name, *params)
+      end
+
+      def before_invocation(name, args, &block)
+        call_interceptors(self.class.before_invocation_interceptors, [name, args], &block)
+      end
+
+      def after_invocation(name, args, result)
+        call_interceptors(self.class.after_invocation_interceptors, [name, args, result])
+      end
+
+      private
+
+        def call_interceptors(interceptors, interceptor_args, &block)
+          if interceptors and not interceptors.empty?
+            interceptors.each do |interceptor|
+              next if method_exempted?(interceptor, interceptor_args[0].to_s)
+              result = case
+                when interceptor.is_a?(Symbol)
+                  self.send(interceptor, *interceptor_args)
+                when interceptor_block?(interceptor)
+                  interceptor.call(self, *interceptor_args)
+                when interceptor_class?(interceptor)
+                  interceptor.intercept(self, *interceptor_args)
+                else
+                  raise(
+                    InvocationError,
+                    "Interceptors need to be either a symbol, proc/method, or a class implementing a static intercept method"
+                  )
+              end
+              reason = nil
+              if result.is_a?(Array)
+                reason = result[1] if result[1]
+                result = result[0]
+              end
+              if result == false
+                block.call(reason) if block && reason
+                return false
+              end
+            end
+          end
+        end
+
+        def interceptor_block?(interceptor)
+          interceptor.respond_to?("call") && (interceptor.arity == 3 || interceptor.arity == -1)
+        end
+        
+        def interceptor_class?(interceptor)
+          interceptor.respond_to?("intercept")
+        end
+
+        def method_exempted?(interceptor, method_name)
+          case
+            when self.class.included_intercepted_methods[interceptor]
+              !self.class.included_intercepted_methods[interceptor].include?(method_name)
+            when self.class.excluded_intercepted_methods[interceptor] 
+              self.class.excluded_intercepted_methods[interceptor].include?(method_name)
+          end
+        end
+    end
+  end
+end
diff --git a/vendor/plugins/actionwebservice/lib/action_web_service/protocol.rb b/vendor/plugins/actionwebservice/lib/action_web_service/protocol.rb
new file mode 100644
index 000000000..053e9cb4b
--- /dev/null
+++ b/vendor/plugins/actionwebservice/lib/action_web_service/protocol.rb
@@ -0,0 +1,4 @@
+require 'action_web_service/protocol/abstract'
+require 'action_web_service/protocol/discovery'
+require 'action_web_service/protocol/soap_protocol'
+require 'action_web_service/protocol/xmlrpc_protocol'
diff --git a/vendor/plugins/actionwebservice/lib/action_web_service/protocol/abstract.rb b/vendor/plugins/actionwebservice/lib/action_web_service/protocol/abstract.rb
new file mode 100644
index 000000000..fff5f622c
--- /dev/null
+++ b/vendor/plugins/actionwebservice/lib/action_web_service/protocol/abstract.rb
@@ -0,0 +1,112 @@
+module ActionWebService # :nodoc:
+  module Protocol # :nodoc:
+    class ProtocolError < ActionWebServiceError # :nodoc:
+    end
+
+    class AbstractProtocol # :nodoc:
+      def setup(controller)
+      end
+
+      def decode_action_pack_request(action_pack_request)
+      end
+
+      def encode_action_pack_request(service_name, public_method_name, raw_body, options={})
+        klass = options[:request_class] || SimpleActionPackRequest
+        request = klass.new
+        request.request_parameters['action'] = service_name.to_s
+        request.env['RAW_POST_DATA'] = raw_body
+        request.env['REQUEST_METHOD'] = 'POST'
+        request.env['HTTP_CONTENT_TYPE'] = 'text/xml'
+        request
+      end
+
+      def decode_request(raw_request, service_name, protocol_options={})
+      end
+
+      def encode_request(method_name, params, param_types)
+      end
+
+      def decode_response(raw_response)
+      end
+
+      def encode_response(method_name, return_value, return_type, protocol_options={})
+      end
+
+      def protocol_client(api, protocol_name, endpoint_uri, options)
+      end
+
+      def register_api(api)
+      end
+    end
+
+    class Request # :nodoc:
+      attr :protocol
+      attr_accessor :method_name
+      attr_accessor :method_params
+      attr :service_name
+      attr_accessor :api
+      attr_accessor :api_method
+      attr :protocol_options
+
+      def initialize(protocol, method_name, method_params, service_name, api=nil, api_method=nil, protocol_options=nil)
+        @protocol = protocol
+        @method_name = method_name
+        @method_params = method_params
+        @service_name = service_name
+        @api = api
+        @api_method = api_method
+        @protocol_options = protocol_options || {}
+      end
+    end
+
+    class Response # :nodoc:
+      attr :body
+      attr :content_type
+      attr :return_value
+
+      def initialize(body, content_type, return_value)
+        @body = body
+        @content_type = content_type
+        @return_value = return_value
+      end
+    end
+
+    class SimpleActionPackRequest < ActionController::AbstractRequest # :nodoc:
+      def initialize
+        @env = {}
+        @qparams = {}
+        @rparams = {}
+        @cookies = {}
+        reset_session
+      end
+
+      def query_parameters
+        @qparams
+      end
+
+      def request_parameters
+        @rparams
+      end
+
+      def env
+        @env
+      end
+
+      def host
+        ''
+      end
+
+      def cookies
+        @cookies
+      end
+
+      def session
+        @session
+      end
+
+      def reset_session
+        @session = {}
+      end
+    end
+  end
+end
diff --git a/vendor/plugins/actionwebservice/lib/action_web_service/protocol/discovery.rb b/vendor/plugins/actionwebservice/lib/action_web_service/protocol/discovery.rb
new file mode 100644
index 000000000..3d4e0818d
--- /dev/null
+++ b/vendor/plugins/actionwebservice/lib/action_web_service/protocol/discovery.rb
@@ -0,0 +1,37 @@
+module ActionWebService # :nodoc:
+  module Protocol # :nodoc:
+    module Discovery # :nodoc:
+      def self.included(base)
+        base.extend(ClassMethods)
+        base.send(:include, ActionWebService::Protocol::Discovery::InstanceMethods)
+      end
+
+      module ClassMethods # :nodoc:
+        def register_protocol(klass)
+          write_inheritable_array("web_service_protocols", [klass])
+        end
+      end
+
+      module InstanceMethods # :nodoc:
+        private
+          def discover_web_service_request(action_pack_request)
+            (self.class.read_inheritable_attribute("web_service_protocols") || []).each do |protocol|
+              protocol = protocol.create(self)
+              request = protocol.decode_action_pack_request(action_pack_request)
+              return request unless request.nil?
+            end
+            nil
+          end
+
+          def create_web_service_client(api, protocol_name, endpoint_uri, options)
+            (self.class.read_inheritable_attribute("web_service_protocols") || []).each do |protocol|
+              protocol = protocol.create(self)
+              client = protocol.protocol_client(api, protocol_name, endpoint_uri, options)
+              return client unless client.nil?
+            end
+            nil
+          end
+      end
+    end
+  end
+end
diff --git a/vendor/plugins/actionwebservice/lib/action_web_service/protocol/soap_protocol.rb b/vendor/plugins/actionwebservice/lib/action_web_service/protocol/soap_protocol.rb
new file mode 100644
index 000000000..1bce496a7
--- /dev/null
+++ b/vendor/plugins/actionwebservice/lib/action_web_service/protocol/soap_protocol.rb
@@ -0,0 +1,176 @@
+require 'action_web_service/protocol/soap_protocol/marshaler'
+require 'soap/streamHandler'
+require 'action_web_service/client/soap_client'
+
+module ActionWebService # :nodoc:
+  module API # :nodoc:
+    class Base # :nodoc:
+      def self.soap_client(endpoint_uri, options={})
+        ActionWebService::Client::Soap.new self, endpoint_uri, options
+      end
+    end
+  end
+
+  module Protocol # :nodoc:
+    module Soap # :nodoc:
+      def self.included(base)
+        base.register_protocol(SoapProtocol)
+        base.class_inheritable_option(:wsdl_service_name)
+        base.class_inheritable_option(:wsdl_namespace)
+      end
+      
+      class SoapProtocol < AbstractProtocol # :nodoc:
+        AWSEncoding = 'UTF-8'
+        XSDEncoding = 'UTF8'
+
+        attr :marshaler
+
+        def initialize(namespace=nil)
+          namespace ||= 'urn:ActionWebService'
+          @marshaler = SoapMarshaler.new namespace
+        end
+
+        def self.create(controller)
+          SoapProtocol.new(controller.wsdl_namespace)
+        end
+
+        def decode_action_pack_request(action_pack_request)
+          return nil unless soap_action = has_valid_soap_action?(action_pack_request)
+          service_name = action_pack_request.parameters['action']
+          input_encoding = parse_charset(action_pack_request.env['HTTP_CONTENT_TYPE'])
+          protocol_options = { 
+            :soap_action => soap_action,
+            :charset  => input_encoding
+          }
+          decode_request(action_pack_request.raw_post, service_name, protocol_options)
+        end
+
+        def encode_action_pack_request(service_name, public_method_name, raw_body, options={})
+          request = super
+          request.env['HTTP_SOAPACTION'] = '/soap/%s/%s' % [service_name, public_method_name]
+          request
+        end
+
+        def decode_request(raw_request, service_name, protocol_options={})
+          envelope = SOAP::Processor.unmarshal(raw_request, :charset => protocol_options[:charset])
+          unless envelope
+            raise ProtocolError, "Failed to parse SOAP request message"
+          end
+          request = envelope.body.request
+          method_name = request.elename.name
+          params = request.collect{ |k, v| marshaler.soap_to_ruby(request[k]) }
+          Request.new(self, method_name, params, service_name, nil, nil, protocol_options)
+        end
+
+        def encode_request(method_name, params, param_types)
+          param_types.each{ |type| marshaler.register_type(type) } if param_types
+          qname = XSD::QName.new(marshaler.namespace, method_name)
+          param_def = []
+          if param_types
+            params = param_types.zip(params).map do |type, param|
+              param_def << ['in', type.name, marshaler.lookup_type(type).mapping]
+              [type.name, marshaler.ruby_to_soap(param)]
+            end
+          else
+            params = []
+          end
+          request = SOAP::RPC::SOAPMethodRequest.new(qname, param_def)
+          request.set_param(params)
+          envelope = create_soap_envelope(request)
+          SOAP::Processor.marshal(envelope)
+        end
+
+        def decode_response(raw_response)
+          envelope = SOAP::Processor.unmarshal(raw_response)
+          unless envelope
+            raise ProtocolError, "Failed to parse SOAP request message"
+          end
+          method_name = envelope.body.request.elename.name
+          return_value = envelope.body.response
+          return_value = marshaler.soap_to_ruby(return_value) unless return_value.nil?
+          [method_name, return_value]
+        end
+
+        def encode_response(method_name, return_value, return_type, protocol_options={})
+          if return_type
+            return_binding = marshaler.register_type(return_type)
+            marshaler.annotate_arrays(return_binding, return_value)
+          end
+          qname = XSD::QName.new(marshaler.namespace, method_name)
+          if return_value.nil?
+            response = SOAP::RPC::SOAPMethodResponse.new(qname, nil)
+          else
+            if return_value.is_a?(Exception)
+              detail = SOAP::Mapping::SOAPException.new(return_value)
+              response = SOAP::SOAPFault.new(
+                SOAP::SOAPQName.new('%s:%s' % [SOAP::SOAPNamespaceTag, 'Server']),
+                SOAP::SOAPString.new(return_value.to_s),
+                SOAP::SOAPString.new(self.class.name),
+                marshaler.ruby_to_soap(detail))
+            else
+              if return_type
+                param_def = [['retval', 'return', marshaler.lookup_type(return_type).mapping]]
+                response = SOAP::RPC::SOAPMethodResponse.new(qname, param_def)
+                response.retval = marshaler.ruby_to_soap(return_value)
+              else
+                response = SOAP::RPC::SOAPMethodResponse.new(qname, nil)
+              end
+            end
+          end
+          envelope = create_soap_envelope(response)
+
+          # FIXME: This is not thread-safe, but StringFactory_ in SOAP4R only
+          #        reads target encoding from the XSD::Charset.encoding variable.
+          #        This is required to ensure $KCODE strings are converted
+          #        correctly to UTF-8 for any values of $KCODE.
+          previous_encoding = XSD::Charset.encoding
+          XSD::Charset.encoding = XSDEncoding
+          response_body = SOAP::Processor.marshal(envelope, :charset => AWSEncoding)
+          XSD::Charset.encoding = previous_encoding
+
+          Response.new(response_body, "text/xml; charset=#{AWSEncoding}", return_value)
+        end
+
+        def protocol_client(api, protocol_name, endpoint_uri, options={})
+          return nil unless protocol_name == :soap
+          ActionWebService::Client::Soap.new(api, endpoint_uri, options)
+        end
+
+        def register_api(api)
+          api.api_methods.each do |name, method|
+            method.expects.each{ |type| marshaler.register_type(type) } if method.expects
+            method.returns.each{ |type| marshaler.register_type(type) } if method.returns
+          end
+        end
+
+        private
+          def has_valid_soap_action?(request)
+            return nil unless request.method == :post
+            soap_action = request.env['HTTP_SOAPACTION']
+            return nil unless soap_action
+            soap_action = soap_action.dup
+            soap_action.gsub!(/^"/, '')
+            soap_action.gsub!(/"$/, '')
+            soap_action.strip!
+            return nil if soap_action.empty?
+            soap_action
+          end
+
+          def create_soap_envelope(body)
+            header = SOAP::SOAPHeader.new
+            body = SOAP::SOAPBody.new(body)
+            SOAP::SOAPEnvelope.new(header, body)
+          end
+
+          def parse_charset(content_type)
+            return AWSEncoding if content_type.nil?
+            if /^text\/xml(?:\s*;\s*charset=([^"]+|"[^"]+"))$/i =~ content_type
+              $1
+            else
+              AWSEncoding
+            end
+          end
+      end
+    end
+  end
+end
diff --git a/vendor/plugins/actionwebservice/lib/action_web_service/protocol/soap_protocol/marshaler.rb b/vendor/plugins/actionwebservice/lib/action_web_service/protocol/soap_protocol/marshaler.rb
new file mode 100644
index 000000000..187339627
--- /dev/null
+++ b/vendor/plugins/actionwebservice/lib/action_web_service/protocol/soap_protocol/marshaler.rb
@@ -0,0 +1,235 @@
+require 'soap/mapping'
+
+module ActionWebService
+  module Protocol
+    module Soap
+      # Workaround for SOAP4R return values changing
+      class Registry < SOAP::Mapping::Registry
+        if SOAP::Version >= "1.5.4"
+          def find_mapped_soap_class(obj_class)
+            return @map.instance_eval { @obj2soap[obj_class][0] }
+          end
+
+          def find_mapped_obj_class(soap_class)
+            return @map.instance_eval { @soap2obj[soap_class][0] }
+          end
+        end
+      end
+
+      class SoapMarshaler
+        attr :namespace
+        attr :registry
+
+        def initialize(namespace=nil)
+          @namespace = namespace || 'urn:ActionWebService'
+          @registry = Registry.new
+          @type2binding = {}
+          register_static_factories
+        end
+
+        def soap_to_ruby(obj)
+          SOAP::Mapping.soap2obj(obj, @registry)
+        end
+
+        def ruby_to_soap(obj)
+          soap = SOAP::Mapping.obj2soap(obj, @registry)
+          soap.elename = XSD::QName.new if SOAP::Version >= "1.5.5" && soap.elename == XSD::QName::EMPTY
+          soap
+        end
+
+        def register_type(type)
+          return @type2binding[type] if @type2binding.has_key?(type)
+
+          if type.array?
+            array_mapping = @registry.find_mapped_soap_class(Array)
+            qname = XSD::QName.new(@namespace, soap_type_name(type.element_type.type_class.name) + 'Array')
+            element_type_binding = register_type(type.element_type)
+            @type2binding[type] = SoapBinding.new(self, qname, type, array_mapping, element_type_binding)
+          elsif (mapping = @registry.find_mapped_soap_class(type.type_class) rescue nil)
+            qname = mapping[2] ? mapping[2][:type] : nil
+            qname ||= soap_base_type_name(mapping[0])
+            @type2binding[type] = SoapBinding.new(self, qname, type, mapping)
+          else
+            qname = XSD::QName.new(@namespace, soap_type_name(type.type_class.name))
+            @registry.add(type.type_class,
+              SOAP::SOAPStruct,
+              typed_struct_factory(type.type_class),
+              { :type => qname })
+            mapping = @registry.find_mapped_soap_class(type.type_class)
+            @type2binding[type] = SoapBinding.new(self, qname, type, mapping)
+          end
+
+          if type.structured?
+            type.each_member do |m_name, m_type|
+              register_type(m_type)
+            end
+          end
+          
+          @type2binding[type]
+        end
+        alias :lookup_type :register_type
+
+        def annotate_arrays(binding, value)
+          if value.nil?
+            return
+          elsif binding.type.array?
+            mark_typed_array(value, binding.element_binding.qname)
+            if binding.element_binding.type.custom?
+              value.each do |element|
+                annotate_arrays(binding.element_binding, element)
+              end
+            end
+          elsif binding.type.structured?
+            binding.type.each_member do |name, type|
+              member_binding = register_type(type)
+              member_value = value.respond_to?('[]') ? value[name] : value.send(name)
+              annotate_arrays(member_binding, member_value) if type.custom?
+            end
+          end
+        end
+
+        private
+          def typed_struct_factory(type_class)
+            if Object.const_defined?('ActiveRecord')
+              if type_class.ancestors.include?(ActiveRecord::Base)
+                qname =  XSD::QName.new(@namespace, soap_type_name(type_class.name))
+                type_class.instance_variable_set('@qname', qname)
+                return SoapActiveRecordStructFactory.new
+              end
+            end
+            SOAP::Mapping::Registry::TypedStructFactory
+          end
+
+          def mark_typed_array(array, qname)
+            (class << array; self; end).class_eval do 
+              define_method(:arytype) do
+                qname
+              end
+            end
+          end
+
+          def soap_base_type_name(type)
+            xsd_type = type.ancestors.find{ |c| c.const_defined? 'Type' }
+            xsd_type ? xsd_type.const_get('Type') : XSD::XSDAnySimpleType::Type
+          end
+
+          def soap_type_name(type_name)
+            type_name.gsub(/::/, '..')
+          end
+
+          def register_static_factories
+            @registry.add(ActionWebService::Base64, SOAP::SOAPBase64, SoapBase64Factory.new, nil)
+            mapping = @registry.find_mapped_soap_class(ActionWebService::Base64)
+            @type2binding[ActionWebService::Base64] =
+              SoapBinding.new(self, SOAP::SOAPBase64::Type, ActionWebService::Base64, mapping)
+            @registry.add(Array, SOAP::SOAPArray, SoapTypedArrayFactory.new, nil)
+            @registry.add(::BigDecimal, SOAP::SOAPDouble, SOAP::Mapping::Registry::BasetypeFactory, {:derived_class => true})
+          end
+      end
+
+      class SoapBinding
+        attr :qname
+        attr :type
+        attr :mapping
+        attr :element_binding
+
+        def initialize(marshaler, qname, type, mapping, element_binding=nil)
+          @marshaler = marshaler
+          @qname = qname
+          @type = type
+          @mapping = mapping
+          @element_binding = element_binding
+        end
+
+        def type_name
+          @type.custom? ? @qname.name : nil
+        end
+
+        def qualified_type_name(ns=nil)
+          if @type.custom?
+            "#{ns ? ns : @qname.namespace}:#{@qname.name}"
+          else
+            ns = XSD::NS.new
+            ns.assign(XSD::Namespace, SOAP::XSDNamespaceTag)
+            ns.assign(SOAP::EncodingNamespace, "soapenc")
+            xsd_klass = mapping[0].ancestors.find{|c| c.const_defined?('Type')}
+            return ns.name(XSD::AnyTypeName) unless xsd_klass
+            ns.name(xsd_klass.const_get('Type'))
+          end
+        end
+
+        def eql?(other)
+          @qname == other.qname
+        end
+        alias :== :eql?
+
+        def hash
+          @qname.hash
+        end
+      end
+
+      class SoapActiveRecordStructFactory < SOAP::Mapping::Factory
+        def obj2soap(soap_class, obj, info, map)
+          unless obj.is_a?(ActiveRecord::Base)
+            return nil
+          end
+          soap_obj = soap_class.new(obj.class.instance_variable_get('@qname'))
+          obj.class.columns.each do |column|
+            key = column.name.to_s
+            value = obj.send(key)
+            soap_obj[key] = SOAP::Mapping._obj2soap(value, map)
+          end
+          soap_obj
+        end
+
+        def soap2obj(obj_class, node, info, map)
+          unless node.type == obj_class.instance_variable_get('@qname')
+            return false
+          end
+          obj = obj_class.new
+          node.each do |key, value|
+            obj[key] = value.data
+          end
+          obj.instance_variable_set('@new_record', false)
+          return true, obj
+        end
+      end
+
+      class SoapTypedArrayFactory < SOAP::Mapping::Factory
+        def obj2soap(soap_class, obj, info, map)
+          unless obj.respond_to?(:arytype)
+            return nil
+          end
+          soap_obj = soap_class.new(SOAP::ValueArrayName, 1, obj.arytype)
+          mark_marshalled_obj(obj, soap_obj)
+          obj.each do |item|
+            child = SOAP::Mapping._obj2soap(item, map)
+            soap_obj.add(child)
+          end
+          soap_obj
+        end
+      
+        def soap2obj(obj_class, node, info, map)
+          return false
+        end
+      end
+
+      class SoapBase64Factory < SOAP::Mapping::Factory
+        def obj2soap(soap_class, obj, info, map)
+          unless obj.is_a?(ActionWebService::Base64)
+            return nil
+          end
+          return soap_class.new(obj)
+        end
+
+        def soap2obj(obj_class, node, info, map)
+          unless node.type == SOAP::SOAPBase64::Type
+            return false
+          end
+          return true, obj_class.new(node.string)
+        end
+      end
+
+    end
+  end
+end
diff --git a/vendor/plugins/actionwebservice/lib/action_web_service/protocol/xmlrpc_protocol.rb b/vendor/plugins/actionwebservice/lib/action_web_service/protocol/xmlrpc_protocol.rb
new file mode 100644
index 000000000..dfa4afc67
--- /dev/null
+++ b/vendor/plugins/actionwebservice/lib/action_web_service/protocol/xmlrpc_protocol.rb
@@ -0,0 +1,122 @@
+require 'xmlrpc/marshal'
+require 'action_web_service/client/xmlrpc_client'
+
+module XMLRPC # :nodoc:
+  class FaultException # :nodoc:
+    alias :message :faultString
+  end
+  
+  class Create
+    def wrong_type(value)
+      if BigDecimal === value
+        [true, value.to_f]
+      else
+        false
+      end
+    end
+  end
+end
+
+module ActionWebService # :nodoc:
+  module API # :nodoc: 
+    class Base # :nodoc:
+      def self.xmlrpc_client(endpoint_uri, options={})
+        ActionWebService::Client::XmlRpc.new self, endpoint_uri, options
+      end
+    end
+  end
+
+  module Protocol # :nodoc:
+    module XmlRpc # :nodoc:
+      def self.included(base)
+        base.register_protocol(XmlRpcProtocol)
+      end
+      
+      class XmlRpcProtocol < AbstractProtocol # :nodoc:
+        def self.create(controller)
+          XmlRpcProtocol.new
+        end
+
+        def decode_action_pack_request(action_pack_request)
+          service_name = action_pack_request.parameters['action']
+          decode_request(action_pack_request.raw_post, service_name)
+        end
+
+        def decode_request(raw_request, service_name)
+          method_name, params = XMLRPC::Marshal.load_call(raw_request)
+          Request.new(self, method_name, params, service_name)
+        rescue
+          return nil
+        end
+
+        def encode_request(method_name, params, param_types)
+          if param_types
+            params = params.dup
+            param_types.each_with_index{ |type, i| params[i] = value_to_xmlrpc_wire_format(params[i], type) }
+          end
+          XMLRPC::Marshal.dump_call(method_name, *params)
+        end
+
+        def decode_response(raw_response)
+          [nil, XMLRPC::Marshal.load_response(raw_response)]
+        end
+
+        def encode_response(method_name, return_value, return_type, protocol_options={})
+          if return_value && return_type
+            return_value = value_to_xmlrpc_wire_format(return_value, return_type)
+          end
+          return_value = false if return_value.nil?
+          raw_response = XMLRPC::Marshal.dump_response(return_value)
+          Response.new(raw_response, 'text/xml', return_value)
+        end
+
+        def encode_multicall_response(responses, protocol_options={})
+          result = responses.map do |return_value, return_type|
+            if return_value && return_type
+              return_value = value_to_xmlrpc_wire_format(return_value, return_type) 
+              return_value = [return_value] unless return_value.nil?
+            end
+            return_value = false if return_value.nil?
+            return_value
+          end
+          raw_response = XMLRPC::Marshal.dump_response(result)
+          Response.new(raw_response, 'text/xml', result)
+        end
+
+        def protocol_client(api, protocol_name, endpoint_uri, options={})
+          return nil unless protocol_name == :xmlrpc
+          ActionWebService::Client::XmlRpc.new(api, endpoint_uri, options)
+        end
+
+        def value_to_xmlrpc_wire_format(value, value_type)
+          if value_type.array?
+            value.map{ |val| value_to_xmlrpc_wire_format(val, value_type.element_type) }
+          else
+            if value.is_a?(ActionWebService::Struct)
+              struct = {}
+              value.class.members.each do |name, type|
+                member_value = value[name]
+                next if member_value.nil?
+                struct[name.to_s] = value_to_xmlrpc_wire_format(member_value, type)
+              end
+              struct
+            elsif value.is_a?(ActiveRecord::Base)
+              struct = {}
+              value.attributes.each do |key, member_value|
+                next if member_value.nil?
+                struct[key.to_s] = member_value
+              end
+              struct
+            elsif value.is_a?(ActionWebService::Base64)
+              XMLRPC::Base64.new(value)
+            elsif value.is_a?(Exception) && !value.is_a?(XMLRPC::FaultException)
+              XMLRPC::FaultException.new(2, value.message)
+            else
+              value
+            end
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/vendor/plugins/actionwebservice/lib/action_web_service/scaffolding.rb b/vendor/plugins/actionwebservice/lib/action_web_service/scaffolding.rb
new file mode 100644
index 000000000..f94a7ee91
--- /dev/null
+++ b/vendor/plugins/actionwebservice/lib/action_web_service/scaffolding.rb
@@ -0,0 +1,283 @@
+require 'benchmark'
+require 'pathname'
+
+module ActionWebService
+  module Scaffolding # :nodoc:
+    class ScaffoldingError < ActionWebServiceError # :nodoc:
+    end
+
+    def self.included(base)
+      base.extend(ClassMethods)
+    end
+
+    # Web service invocation scaffolding provides a way to quickly invoke web service methods in a controller. The
+    # generated scaffold actions have default views to let you enter the method parameters and view the
+    # results.
+    #
+    # Example:
+    #
+    #   class ApiController < ActionController
+    #     web_service_scaffold :invoke
+    #   end
+    #
+    # This example generates an +invoke+ action in the +ApiController+ that you can navigate to from
+    # your browser, select the API method, enter its parameters, and perform the invocation.
+    #
+    # If you want to customize the default views, create the following views in "app/views":
+    #
+    # * <tt>action_name/methods.erb</tt>
+    # * <tt>action_name/parameters.erb</tt>
+    # * <tt>action_name/result.erb</tt>
+    # * <tt>action_name/layout.erb</tt>
+    #
+    # Where <tt>action_name</tt> is the name of the action you gave to ClassMethods#web_service_scaffold.
+    #
+    # You can use the default views in <tt>RAILS_DIR/lib/action_web_service/templates/scaffolds</tt> as
+    # a guide.
+    module ClassMethods
+      # Generates web service invocation scaffolding for the current controller. The given action name
+      # can then be used as the entry point for invoking API methods from a web browser.
+      def web_service_scaffold(action_name)
+        add_template_helper(Helpers)
+        module_eval <<-"end_eval", __FILE__, __LINE__ + 1
+          def #{action_name}
+            if request.method == :get
+              setup_invocation_assigns
+              render_invocation_scaffold 'methods'
+            end
+          end
+
+          def #{action_name}_method_params
+            if request.method == :get
+              setup_invocation_assigns
+              render_invocation_scaffold 'parameters'
+            end
+          end
+
+          def #{action_name}_submit
+            if request.method == :post
+              setup_invocation_assigns
+              protocol_name = params['protocol'] ? params['protocol'].to_sym : :soap
+              case protocol_name
+              when :soap
+                @protocol = Protocol::Soap::SoapProtocol.create(self)
+              when :xmlrpc
+                @protocol = Protocol::XmlRpc::XmlRpcProtocol.create(self)
+              end
+              bm = Benchmark.measure do
+                @protocol.register_api(@scaffold_service.api)
+                post_params = params['method_params'] ? params['method_params'].dup : nil
+                params = []
+                @scaffold_method.expects.each_with_index do |spec, i|
+                  params << post_params[i.to_s]                                            
+                end if @scaffold_method.expects
+                params = @scaffold_method.cast_expects(params)
+                method_name = public_method_name(@scaffold_service.name, @scaffold_method.public_name)
+                @method_request_xml = @protocol.encode_request(method_name, params, @scaffold_method.expects)
+                new_request = @protocol.encode_action_pack_request(@scaffold_service.name, @scaffold_method.public_name, @method_request_xml)
+                prepare_request(new_request, @scaffold_service.name, @scaffold_method.public_name)
+                self.request = new_request
+                if @scaffold_container.dispatching_mode != :direct
+                  request.parameters['action'] = @scaffold_service.name
+                end
+                dispatch_web_service_request
+                @method_response_xml = response.body
+                method_name, obj = @protocol.decode_response(@method_response_xml)
+                return if handle_invocation_exception(obj)
+                @method_return_value = @scaffold_method.cast_returns(obj)
+              end
+              @method_elapsed = bm.real
+              add_instance_variables_to_assigns
+              reset_invocation_response
+              render_invocation_scaffold 'result'
+            end
+          end
+
+          private
+            def setup_invocation_assigns
+              @scaffold_class = self.class
+              @scaffold_action_name = "#{action_name}"
+              @scaffold_container = WebServiceModel::Container.new(self)
+              if params['service'] && params['method']
+                @scaffold_service = @scaffold_container.services.find{ |x| x.name == params['service'] }
+                @scaffold_method = @scaffold_service.api_methods[params['method']]
+              end
+              add_instance_variables_to_assigns
+            end
+
+            def render_invocation_scaffold(action)
+              customized_template = "\#{self.class.controller_path}/#{action_name}/\#{action}"
+              default_template = scaffold_path(action)
+              if template_exists?(customized_template)
+                content = @template.render :file => customized_template
+              else
+                content = @template.render :file => default_template
+              end
+              @template.instance_variable_set("@content_for_layout", content)
+              if self.active_layout.nil?
+                render :file => scaffold_path("layout")
+              else
+                render :file => self.active_layout
+              end
+            end
+
+            def scaffold_path(template_name)
+              File.dirname(__FILE__) + "/templates/scaffolds/" + template_name + ".erb"
+            end
+
+            def reset_invocation_response
+              erase_render_results
+              response.headers = ::ActionController::AbstractResponse::DEFAULT_HEADERS.merge("cookie" => [])
+            end
+
+            def public_method_name(service_name, method_name)
+              if web_service_dispatching_mode == :layered && @protocol.is_a?(ActionWebService::Protocol::XmlRpc::XmlRpcProtocol)
+                service_name + '.' + method_name
+              else
+                method_name
+              end
+            end
+
+            def prepare_request(new_request, service_name, method_name)
+              new_request.parameters.update(request.parameters)
+              request.env.each{ |k, v| new_request.env[k] = v unless new_request.env.has_key?(k) }
+              if web_service_dispatching_mode == :layered && @protocol.is_a?(ActionWebService::Protocol::Soap::SoapProtocol)
+                new_request.env['HTTP_SOAPACTION'] = "/\#{controller_name()}/\#{service_name}/\#{method_name}"
+              end
+            end
+
+            def handle_invocation_exception(obj)
+              exception = nil
+              if obj.respond_to?(:detail) && obj.detail.respond_to?(:cause) && obj.detail.cause.is_a?(Exception)
+                exception = obj.detail.cause
+              elsif obj.is_a?(XMLRPC::FaultException)
+                exception = obj
+              end
+              return unless exception
+              reset_invocation_response
+              rescue_action(exception)
+              true
+            end
+        end_eval
+      end
+    end
+
+    module Helpers # :nodoc:
+      def method_parameter_input_fields(method, type, field_name_base, idx, was_structured=false)
+        if type.array?
+          return content_tag('em', "Typed array input fields not supported yet (#{type.name})")
+        end
+        if type.structured?
+          return content_tag('em', "Nested structural types not supported yet (#{type.name})") if was_structured
+          parameters = ""
+          type.each_member do |member_name, member_type|
+            label = method_parameter_label(member_name, member_type)
+            nested_content = method_parameter_input_fields(
+              method,
+              member_type,
+              "#{field_name_base}[#{idx}][#{member_name}]",
+              idx,
+              true)
+            if member_type.custom?
+              parameters << content_tag('li', label)
+              parameters << content_tag('ul', nested_content)
+            else
+              parameters << content_tag('li', label + ' ' + nested_content)
+            end
+          end
+          content_tag('ul', parameters)
+        else
+          # If the data source was structured previously we already have the index set          
+          field_name_base = "#{field_name_base}[#{idx}]" unless was_structured
+          
+          case type.type
+          when :int
+            text_field_tag "#{field_name_base}"
+          when :string
+            text_field_tag "#{field_name_base}"
+          when :base64
+            text_area_tag "#{field_name_base}", nil, :size => "40x5"
+          when :bool
+            radio_button_tag("#{field_name_base}", "true") + " True" +
+            radio_button_tag("#{field_name_base}", "false") + "False"
+          when :float
+            text_field_tag "#{field_name_base}"
+          when :time, :datetime
+            time = Time.now
+            i = 0
+            %w|year month day hour minute second|.map do |name|
+              i += 1
+              send("select_#{name}", time, :prefix => "#{field_name_base}[#{i}]", :discard_type => true)
+            end.join
+          when :date
+            date = Date.today
+            i = 0
+            %w|year month day|.map do |name|
+              i += 1
+              send("select_#{name}", date, :prefix => "#{field_name_base}[#{i}]", :discard_type => true)
+            end.join
+          end
+        end
+      end
+
+      def method_parameter_label(name, type)
+        name.to_s.capitalize + ' (' + type.human_name(false) + ')'
+      end
+
+      def service_method_list(service)
+        action = @scaffold_action_name + '_method_params'
+        methods = service.api_methods_full.map do |desc, name|
+          content_tag("li", link_to(desc, :action => action, :service => service.name, :method => name))
+        end
+        content_tag("ul", methods.join("\n"))
+      end
+    end
+
+    module WebServiceModel # :nodoc:
+      class Container # :nodoc:
+        attr :services
+        attr :dispatching_mode
+
+        def initialize(real_container)
+          @real_container = real_container
+          @dispatching_mode = @real_container.class.web_service_dispatching_mode
+          @services = []
+          if @dispatching_mode == :direct
+            @services << Service.new(@real_container.controller_name, @real_container)
+          else
+            @real_container.class.web_services.each do |name, obj|
+              @services << Service.new(name, @real_container.instance_eval{ web_service_object(name) })
+            end
+          end
+        end
+      end
+
+      class Service # :nodoc:
+        attr :name
+        attr :object
+        attr :api
+        attr :api_methods
+        attr :api_methods_full
+
+        def initialize(name, real_service)
+          @name = name.to_s
+          @object = real_service
+          @api = @object.class.web_service_api
+          if @api.nil?
+            raise ScaffoldingError, "No web service API attached to #{object.class}"
+          end
+          @api_methods = {}
+          @api_methods_full = []
+          @api.api_methods.each do |name, method|
+            @api_methods[method.public_name.to_s] = method
+            @api_methods_full << [method.to_s, method.public_name.to_s]
+          end
+        end
+
+        def to_s
+          self.name.camelize
+        end
+      end
+    end
+  end
+end
diff --git a/vendor/plugins/actionwebservice/lib/action_web_service/struct.rb b/vendor/plugins/actionwebservice/lib/action_web_service/struct.rb
new file mode 100644
index 000000000..00eafc169
--- /dev/null
+++ b/vendor/plugins/actionwebservice/lib/action_web_service/struct.rb
@@ -0,0 +1,64 @@
+module ActionWebService
+  # To send structured types across the wire, derive from ActionWebService::Struct,
+  # and use +member+ to declare structure members.
+  #
+  # ActionWebService::Struct should be used in method signatures when you want to accept or return
+  # structured types that have no Active Record model class representations, or you don't
+  # want to expose your entire Active Record model to remote callers.
+  #
+  # === Example
+  #
+  #   class Person < ActionWebService::Struct
+  #     member :id,         :int
+  #     member :firstnames, [:string]
+  #     member :lastname,   :string
+  #     member :email,      :string
+  #   end
+  #   person = Person.new(:id => 5, :firstname => 'john', :lastname => 'doe')
+  #
+  # Active Record model classes are already implicitly supported in method
+  # signatures.
+  class Struct
+    # If a Hash is given as argument to an ActionWebService::Struct constructor,
+    # it can contain initial values for the structure member.
+    def initialize(values={})
+      if values.is_a?(Hash)
+        values.map{|k,v| __send__('%s=' % k.to_s, v)}
+      end
+    end
+
+    # The member with the given name
+    def [](name)
+      send(name.to_s)
+    end
+
+    # Iterates through each member
+    def each_pair(&block)
+      self.class.members.each do |name, type|
+        yield name, self.__send__(name)
+      end
+    end
+
+    class << self
+      # Creates a structure member with the specified +name+ and +type+. Generates
+      # accessor methods for reading and writing the member value.
+      def member(name, type)
+        name = name.to_sym
+        type = ActionWebService::SignatureTypes.canonical_signature_entry({ name => type }, 0)
+        write_inheritable_hash("struct_members", name => type)
+        class_eval <<-END
+          def #{name}; @#{name}; end
+          def #{name}=(value); @#{name} = value; end
+        END
+      end
+  
+      def members # :nodoc:
+        read_inheritable_attribute("struct_members") || {}
+      end
+
+      def member_type(name) # :nodoc:
+        members[name.to_sym]
+      end
+    end
+  end
+end
diff --git a/vendor/plugins/actionwebservice/lib/action_web_service/support/class_inheritable_options.rb b/vendor/plugins/actionwebservice/lib/action_web_service/support/class_inheritable_options.rb
new file mode 100644
index 000000000..4d1c2ed47
--- /dev/null
+++ b/vendor/plugins/actionwebservice/lib/action_web_service/support/class_inheritable_options.rb
@@ -0,0 +1,26 @@
+class Class # :nodoc:
+  def class_inheritable_option(sym, default_value=nil)
+    write_inheritable_attribute sym, default_value
+    class_eval <<-EOS
+      def self.#{sym}(value=nil)
+        if !value.nil?
+          write_inheritable_attribute(:#{sym}, value)
+        else
+          read_inheritable_attribute(:#{sym})
+        end
+      end
+      
+      def self.#{sym}=(value)
+        write_inheritable_attribute(:#{sym}, value)
+      end
+
+      def #{sym}
+        self.class.#{sym}
+      end
+
+      def #{sym}=(value)
+        self.class.#{sym} = value
+      end
+    EOS
+  end
+end
diff --git a/vendor/plugins/actionwebservice/lib/action_web_service/support/signature_types.rb b/vendor/plugins/actionwebservice/lib/action_web_service/support/signature_types.rb
new file mode 100644
index 000000000..66c86bf6d
--- /dev/null
+++ b/vendor/plugins/actionwebservice/lib/action_web_service/support/signature_types.rb
@@ -0,0 +1,226 @@
+module ActionWebService # :nodoc:
+  # Action Web Service supports the following base types in a signature:
+  #
+  # [<tt>:int</tt>]      Represents an integer value, will be cast to an integer using <tt>Integer(value)</tt>
+  # [<tt>:string</tt>]   Represents a string value, will be cast to an string using the <tt>to_s</tt> method on an object
+  # [<tt>:base64</tt>]   Represents a Base 64 value, will contain the binary bytes of a Base 64 value sent by the caller
+  # [<tt>:bool</tt>]     Represents a boolean value, whatever is passed will be cast to boolean (<tt>true</tt>, '1', 'true', 'y', 'yes' are taken to represent true; <tt>false</tt>, '0', 'false', 'n', 'no' and <tt>nil</tt> represent false)
+  # [<tt>:float</tt>]    Represents a floating point value, will be cast to a float using <tt>Float(value)</tt>
+  # [<tt>:time</tt>]     Represents a timestamp, will be cast to a <tt>Time</tt> object
+  # [<tt>:datetime</tt>] Represents a timestamp, will be cast to a <tt>DateTime</tt> object
+  # [<tt>:date</tt>]     Represents a date, will be cast to a <tt>Date</tt> object
+  #
+  # For structured types, you'll need to pass in the Class objects of
+  # ActionWebService::Struct and ActiveRecord::Base derivatives.
+  module SignatureTypes
+    def canonical_signature(signature) # :nodoc:
+      return nil if signature.nil?
+      unless signature.is_a?(Array)
+        raise(ActionWebServiceError, "Expected signature to be an Array")
+      end
+      i = -1
+      signature.map{ |spec| canonical_signature_entry(spec, i += 1) }
+    end
+
+    def canonical_signature_entry(spec, i) # :nodoc:
+      orig_spec = spec
+      name = "param#{i}"
+      if spec.is_a?(Hash)
+        name, spec = spec.keys.first, spec.values.first
+      end
+      type = spec
+      if spec.is_a?(Array)
+        ArrayType.new(orig_spec, canonical_signature_entry(spec[0], 0), name)
+      else
+        type = canonical_type(type)
+        if type.is_a?(Symbol)
+          BaseType.new(orig_spec, type, name)
+        else
+          StructuredType.new(orig_spec, type, name)
+        end
+      end
+    end
+
+    def canonical_type(type) # :nodoc:
+      type_name = symbol_name(type) || class_to_type_name(type)
+      type = type_name || type
+      return canonical_type_name(type) if type.is_a?(Symbol)
+      type
+    end
+
+    def canonical_type_name(name) # :nodoc:
+      name = name.to_sym
+      case name
+        when :int, :integer, :fixnum, :bignum
+          :int
+        when :string, :text
+          :string
+        when :base64, :binary
+          :base64
+        when :bool, :boolean
+          :bool
+        when :float, :double
+          :float
+        when :decimal
+          :decimal
+        when :time, :timestamp
+          :time
+        when :datetime
+          :datetime
+        when :date
+          :date
+        else
+          raise(TypeError, "#{name} is not a valid base type")
+      end
+    end
+
+    def canonical_type_class(type) # :nodoc:
+      type = canonical_type(type)
+      type.is_a?(Symbol) ? type_name_to_class(type) : type
+    end
+
+    def symbol_name(name) # :nodoc:
+      return name.to_sym if name.is_a?(Symbol) || name.is_a?(String)
+      nil
+    end
+
+    def class_to_type_name(klass) # :nodoc:
+      klass = klass.class unless klass.is_a?(Class)
+      if derived_from?(Integer, klass) || derived_from?(Fixnum, klass) || derived_from?(Bignum, klass)
+        :int
+      elsif klass == String
+        :string
+      elsif klass == Base64
+        :base64
+      elsif klass == TrueClass || klass == FalseClass
+        :bool
+      elsif derived_from?(Float, klass) || derived_from?(Precision, klass) || derived_from?(Numeric, klass)
+        :float
+      elsif klass == Time
+        :time
+      elsif klass == DateTime
+        :datetime
+      elsif klass == Date
+        :date
+      else
+        nil
+      end
+    end
+
+    def type_name_to_class(name) # :nodoc:
+      case canonical_type_name(name)
+      when :int
+        Integer
+      when :string
+        String
+      when :base64
+        Base64
+      when :bool
+        TrueClass
+      when :float
+        Float
+      when :decimal
+        BigDecimal
+      when :time
+        Time
+      when :date
+        Date
+      when :datetime
+        DateTime
+      else
+        nil
+      end
+    end
+
+    def derived_from?(ancestor, child) # :nodoc:
+      child.ancestors.include?(ancestor)
+    end
+
+    module_function :type_name_to_class
+    module_function :class_to_type_name
+    module_function :symbol_name
+    module_function :canonical_type_class
+    module_function :canonical_type_name
+    module_function :canonical_type
+    module_function :canonical_signature_entry
+    module_function :canonical_signature
+    module_function :derived_from?
+  end
+
+  class BaseType # :nodoc:
+    include SignatureTypes
+
+    attr :spec
+    attr :type
+    attr :type_class
+    attr :name
+
+    def initialize(spec, type, name)
+      @spec = spec
+      @type = canonical_type(type)
+      @type_class = canonical_type_class(@type)
+      @name = name
+    end
+
+    def custom?
+      false
+    end
+
+    def array?
+      false
+    end
+
+    def structured?
+      false
+    end
+
+    def human_name(show_name=true)
+      type_type = array? ? element_type.type.to_s : self.type.to_s
+      str = array? ? (type_type + '[]') : type_type
+      show_name ? (str + " " + name.to_s) : str
+    end
+  end
+
+  class ArrayType < BaseType # :nodoc:
+    attr :element_type
+
+    def initialize(spec, element_type, name)
+      super(spec, Array, name)
+      @element_type = element_type
+    end
+
+    def custom?
+      true
+    end
+
+    def array?
+      true
+    end
+  end
+
+  class StructuredType < BaseType # :nodoc:
+    def each_member
+      if @type_class.respond_to?(:members)
+        @type_class.members.each do |name, type|
+          yield name, type
+        end
+      elsif @type_class.respond_to?(:columns)
+        i = -1
+        @type_class.columns.each do |column|
+          yield column.name, canonical_signature_entry(column.type, i += 1)
+        end
+      end
+    end
+
+    def custom?
+      true
+    end
+
+    def structured?
+      true
+    end
+  end
+
+  class Base64 < String # :nodoc:
+  end
+end
diff --git a/vendor/plugins/actionwebservice/lib/action_web_service/templates/scaffolds/layout.erb b/vendor/plugins/actionwebservice/lib/action_web_service/templates/scaffolds/layout.erb
new file mode 100644
index 000000000..167613f68
--- /dev/null
+++ b/vendor/plugins/actionwebservice/lib/action_web_service/templates/scaffolds/layout.erb
@@ -0,0 +1,65 @@
+<html>
+<head>
+  <title><%= @scaffold_class.wsdl_service_name %> Web Service</title>
+  <style>
+    body { background-color: #fff; color: #333; }
+
+    body, p, ol, ul, td {
+      font-family: verdana, arial, helvetica, sans-serif;
+      font-size:   13px;
+      line-height: 18px;
+    }
+
+    pre {
+      background-color: #eee;
+      padding: 10px;
+      font-size: 11px;
+    }
+
+    a { color: #000; }
+    a:visited { color: #666; }
+    a:hover { color: #fff; background-color:#000; }
+
+    .fieldWithErrors {
+      padding: 2px;
+      background-color: red;
+      display: table;
+    }
+
+    #errorExplanation {
+      width: 400px;
+      border: 2px solid red;
+      padding: 7px;
+      padding-bottom: 12px;
+      margin-bottom: 20px;
+      background-color: #f0f0f0;
+    }
+
+    #errorExplanation h2 {
+      text-align: left;
+      font-weight: bold;
+      padding: 5px 5px 5px 15px;
+      font-size: 12px;
+      margin: -7px;
+      background-color: #c00;
+      color: #fff;
+    }
+
+    #errorExplanation p {
+      color: #333;
+      margin-bottom: 0;
+      padding: 5px;
+    }
+
+    #errorExplanation ul li {
+      font-size: 12px;
+      list-style: square;
+    }
+  </style>
+</head>
+<body>
+
+<%= @content_for_layout %>
+
+</body>
+</html>
diff --git a/vendor/plugins/actionwebservice/lib/action_web_service/templates/scaffolds/layout.rhtml b/vendor/plugins/actionwebservice/lib/action_web_service/templates/scaffolds/layout.rhtml
new file mode 100644
index 000000000..e69de29bb
diff --git a/vendor/plugins/actionwebservice/lib/action_web_service/templates/scaffolds/methods.erb b/vendor/plugins/actionwebservice/lib/action_web_service/templates/scaffolds/methods.erb
new file mode 100644
index 000000000..60dfe23f0
--- /dev/null
+++ b/vendor/plugins/actionwebservice/lib/action_web_service/templates/scaffolds/methods.erb
@@ -0,0 +1,6 @@
+<% @scaffold_container.services.each do |service| %>
+
+  <h4>API Methods for <%= service %></h4>
+  <%= service_method_list(service) %>
+
+<% end %>
diff --git a/vendor/plugins/actionwebservice/lib/action_web_service/templates/scaffolds/methods.rhtml b/vendor/plugins/actionwebservice/lib/action_web_service/templates/scaffolds/methods.rhtml
new file mode 100644
index 000000000..e69de29bb
diff --git a/vendor/plugins/actionwebservice/lib/action_web_service/templates/scaffolds/parameters.erb b/vendor/plugins/actionwebservice/lib/action_web_service/templates/scaffolds/parameters.erb
new file mode 100644
index 000000000..767284e0d
--- /dev/null
+++ b/vendor/plugins/actionwebservice/lib/action_web_service/templates/scaffolds/parameters.erb
@@ -0,0 +1,29 @@
+<h4>Method Invocation Details for <em><%= @scaffold_service %>#<%= @scaffold_method.public_name %></em></h4>
+
+<% form_tag(:action => @scaffold_action_name + '_submit') do  -%>
+<%= hidden_field_tag "service", @scaffold_service.name %>
+<%= hidden_field_tag "method", @scaffold_method.public_name %>
+
+<p>
+<label for="protocol">Protocol:</label><br />
+<%= select_tag 'protocol', options_for_select([['SOAP', 'soap'], ['XML-RPC', 'xmlrpc']], params['protocol']) %>
+</p>
+
+<% if @scaffold_method.expects %>
+
+<strong>Method Parameters:</strong><br />
+<% @scaffold_method.expects.each_with_index do |type, i| %>
+  <p>
+  <label for="method_params[<%= i %>]"><%= method_parameter_label(type.name, type) %> </label><br />
+  <%= method_parameter_input_fields(@scaffold_method, type, "method_params", i) %>
+  </p>
+<% end %>
+
+<% end %>
+
+<%= submit_tag "Invoke" %>
+<% end -%>
+
+<p>
+<%= link_to "Back", :action => @scaffold_action_name %>
+</p>
diff --git a/vendor/plugins/actionwebservice/lib/action_web_service/templates/scaffolds/parameters.rhtml b/vendor/plugins/actionwebservice/lib/action_web_service/templates/scaffolds/parameters.rhtml
new file mode 100644
index 000000000..e69de29bb
diff --git a/vendor/plugins/actionwebservice/lib/action_web_service/templates/scaffolds/result.erb b/vendor/plugins/actionwebservice/lib/action_web_service/templates/scaffolds/result.erb
new file mode 100644
index 000000000..5317688fc
--- /dev/null
+++ b/vendor/plugins/actionwebservice/lib/action_web_service/templates/scaffolds/result.erb
@@ -0,0 +1,30 @@
+<h4>Method Invocation Result for <em><%= @scaffold_service %>#<%= @scaffold_method.public_name %></em></h4>
+
+<p>
+Invocation took <tt><%= '%f' % @method_elapsed %></tt> seconds
+</p>
+
+<p>
+<strong>Return Value:</strong><br />
+<pre>
+<%= h @method_return_value.inspect %>
+</pre>
+</p>
+
+<p>
+<strong>Request XML:</strong><br />
+<pre>
+<%= h @method_request_xml %>
+</pre>
+</p>
+
+<p>
+<strong>Response XML:</strong><br />
+<pre>
+<%= h @method_response_xml %>
+</pre>
+</p>
+
+<p>
+<%= link_to "Back", :action => @scaffold_action_name + '_method_params', :method => @scaffold_method.public_name, :service => @scaffold_service.name %>
+</p>
diff --git a/vendor/plugins/actionwebservice/lib/action_web_service/templates/scaffolds/result.rhtml b/vendor/plugins/actionwebservice/lib/action_web_service/templates/scaffolds/result.rhtml
new file mode 100644
index 000000000..e69de29bb
diff --git a/vendor/plugins/actionwebservice/lib/action_web_service/test_invoke.rb b/vendor/plugins/actionwebservice/lib/action_web_service/test_invoke.rb
new file mode 100644
index 000000000..7e714c941
--- /dev/null
+++ b/vendor/plugins/actionwebservice/lib/action_web_service/test_invoke.rb
@@ -0,0 +1,110 @@
+require 'test/unit'
+
+module Test # :nodoc:
+  module Unit # :nodoc:
+    class TestCase # :nodoc:
+      private
+        # invoke the specified API method
+        def invoke_direct(method_name, *args)
+          prepare_request('api', 'api', method_name, *args)
+          @controller.process(@request, @response)
+          decode_rpc_response
+        end
+        alias_method :invoke, :invoke_direct
+
+        # invoke the specified API method on the specified service
+        def invoke_delegated(service_name, method_name, *args)
+          prepare_request(service_name.to_s, service_name, method_name, *args)
+          @controller.process(@request, @response)
+          decode_rpc_response
+        end
+
+        # invoke the specified layered API method on the correct service
+        def invoke_layered(service_name, method_name, *args)
+          prepare_request('api', service_name, method_name, *args)
+          @controller.process(@request, @response)
+          decode_rpc_response
+        end
+
+        # ---------------------- internal ---------------------------
+
+        def prepare_request(action, service_name, api_method_name, *args)
+          @request.recycle!
+          @request.request_parameters['action'] = action
+          @request.env['REQUEST_METHOD'] = 'POST'
+          @request.env['HTTP_CONTENT_TYPE'] = 'text/xml'
+          @request.env['RAW_POST_DATA'] = encode_rpc_call(service_name, api_method_name, *args)
+          case protocol
+          when ActionWebService::Protocol::Soap::SoapProtocol
+            soap_action = "/#{@controller.controller_name}/#{service_name}/#{public_method_name(service_name, api_method_name)}" 
+            @request.env['HTTP_SOAPACTION'] = soap_action
+          when ActionWebService::Protocol::XmlRpc::XmlRpcProtocol
+            @request.env.delete('HTTP_SOAPACTION')
+          end
+        end
+
+        def encode_rpc_call(service_name, api_method_name, *args)
+          case @controller.web_service_dispatching_mode
+          when :direct
+            api = @controller.class.web_service_api
+          when :delegated, :layered
+            api = @controller.web_service_object(service_name.to_sym).class.web_service_api
+          end
+          protocol.register_api(api)
+          method = api.api_methods[api_method_name.to_sym]
+          raise ArgumentError, "wrong number of arguments for rpc call (#{args.length} for #{method.expects.length})" if method && method.expects && args.length != method.expects.length
+          protocol.encode_request(public_method_name(service_name, api_method_name), args.dup, method.expects)
+        end
+
+        def decode_rpc_response
+          public_method_name, return_value = protocol.decode_response(@response.body)
+          exception = is_exception?(return_value)
+          raise exception if exception
+          return_value
+        end
+
+        def public_method_name(service_name, api_method_name)
+          public_name = service_api(service_name).public_api_method_name(api_method_name)
+          if @controller.web_service_dispatching_mode == :layered && protocol.is_a?(ActionWebService::Protocol::XmlRpc::XmlRpcProtocol)
+            '%s.%s' % [service_name.to_s, public_name]
+          else
+            public_name
+          end
+        end
+
+        def service_api(service_name)
+          case @controller.web_service_dispatching_mode
+          when :direct
+            @controller.class.web_service_api
+          when :delegated, :layered
+            @controller.web_service_object(service_name.to_sym).class.web_service_api
+          end
+        end
+
+        def protocol
+          if @protocol.nil?
+            @protocol ||= ActionWebService::Protocol::Soap::SoapProtocol.create(@controller)
+          else
+            case @protocol
+            when :xmlrpc
+              @protocol = ActionWebService::Protocol::XmlRpc::XmlRpcProtocol.create(@controller)
+            when :soap
+              @protocol = ActionWebService::Protocol::Soap::SoapProtocol.create(@controller)
+            else
+              @protocol
+            end
+          end
+        end
+
+        def is_exception?(obj)
+          case protocol
+          when :soap, ActionWebService::Protocol::Soap::SoapProtocol
+            (obj.respond_to?(:detail) && obj.detail.respond_to?(:cause) && \
+            obj.detail.cause.is_a?(Exception)) ? obj.detail.cause : nil
+          when :xmlrpc, ActionWebService::Protocol::XmlRpc::XmlRpcProtocol
+            obj.is_a?(XMLRPC::FaultException) ? obj : nil
+          end
+        end
+    end
+  end
+end
diff --git a/vendor/plugins/actionwebservice/lib/action_web_service/version.rb b/vendor/plugins/actionwebservice/lib/action_web_service/version.rb
new file mode 100644
index 000000000..a1b3d5929
--- /dev/null
+++ b/vendor/plugins/actionwebservice/lib/action_web_service/version.rb
@@ -0,0 +1,9 @@
+module ActionWebService
+  module VERSION #:nodoc:
+    MAJOR = 1
+    MINOR = 2
+    TINY  = 5
+
+    STRING = [MAJOR, MINOR, TINY].join('.')
+  end
+end
diff --git a/vendor/plugins/actionwebservice/lib/actionwebservice.rb b/vendor/plugins/actionwebservice/lib/actionwebservice.rb
new file mode 100644
index 000000000..25e3aa8e8
--- /dev/null
+++ b/vendor/plugins/actionwebservice/lib/actionwebservice.rb
@@ -0,0 +1 @@
+require 'action_web_service'
diff --git a/vendor/plugins/actionwebservice/setup.rb b/vendor/plugins/actionwebservice/setup.rb
new file mode 100644
index 000000000..aeef0d106
--- /dev/null
+++ b/vendor/plugins/actionwebservice/setup.rb
@@ -0,0 +1,1379 @@
+#
+# setup.rb
+#
+# Copyright (c) 2000-2004 Minero Aoki
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+# Note: Originally licensed under LGPL v2+. Using MIT license for Rails
+# with permission of Minero Aoki.
+
+#
+
+unless Enumerable.method_defined?(:map)   # Ruby 1.4.6
+  module Enumerable
+    alias map collect
+  end
+end
+
+unless File.respond_to?(:read)   # Ruby 1.6
+  def File.read(fname)
+    open(fname) {|f|
+      return f.read
+    }
+  end
+end
+
+def File.binread(fname)
+  open(fname, 'rb') {|f|
+    return f.read
+  }
+end
+
+# for corrupted windows stat(2)
+def File.dir?(path)
+  File.directory?((path[-1,1] == '/') ? path : path + '/')
+end
+
+
+class SetupError < StandardError; end
+
+def setup_rb_error(msg)
+  raise SetupError, msg
+end
+
+#
+# Config
+#
+
+if arg = ARGV.detect {|arg| /\A--rbconfig=/ =~ arg }
+  ARGV.delete(arg)
+  require arg.split(/=/, 2)[1]
+  $".push 'rbconfig.rb'
+else
+  require 'rbconfig'
+end
+
+def multipackage_install?
+  FileTest.directory?(File.dirname($0) + '/packages')
+end
+
+
+class ConfigItem
+  def initialize(name, template, default, desc)
+    @name = name.freeze
+    @template = template
+    @value = default
+    @default = default.dup.freeze
+    @description = desc
+  end
+
+  attr_reader :name
+  attr_reader :description
+
+  attr_accessor :default
+  alias help_default default
+
+  def help_opt
+    "--#{@name}=#{@template}"
+  end
+
+  def value
+    @value
+  end
+
+  def eval(table)
+    @value.gsub(%r<\$([^/]+)>) { table[$1] }
+  end
+
+  def set(val)
+    @value = check(val)
+  end
+
+  private
+
+  def check(val)
+    setup_rb_error "config: --#{name} requires argument" unless val
+    val
+  end
+end
+
+class BoolItem < ConfigItem
+  def config_type
+    'bool'
+  end
+
+  def help_opt
+    "--#{@name}"
+  end
+
+  private
+
+  def check(val)
+    return 'yes' unless val
+    unless /\A(y(es)?|n(o)?|t(rue)?|f(alse))\z/i =~ val
+      setup_rb_error "config: --#{@name} accepts only yes/no for argument"
+    end
+    (/\Ay(es)?|\At(rue)/i =~ value) ? 'yes' : 'no'
+  end
+end
+
+class PathItem < ConfigItem
+  def config_type
+    'path'
+  end
+
+  private
+
+  def check(path)
+    setup_rb_error "config: --#{@name} requires argument"  unless path
+    path[0,1] == '$' ? path : File.expand_path(path)
+  end
+end
+
+class ProgramItem < ConfigItem
+  def config_type
+    'program'
+  end
+end
+
+class SelectItem < ConfigItem
+  def initialize(name, template, default, desc)
+    super
+    @ok = template.split('/')
+  end
+
+  def config_type
+    'select'
+  end
+
+  private
+
+  def check(val)
+    unless @ok.include?(val.strip)
+      setup_rb_error "config: use --#{@name}=#{@template} (#{val})"
+    end
+    val.strip
+  end
+end
+
+class PackageSelectionItem < ConfigItem
+  def initialize(name, template, default, help_default, desc)
+    super name, template, default, desc
+    @help_default = help_default
+  end
+
+  attr_reader :help_default
+
+  def config_type
+    'package'
+  end
+
+  private
+
+  def check(val)
+    unless File.dir?("packages/#{val}")
+      setup_rb_error "config: no such package: #{val}"
+    end
+    val
+  end
+end
+
+class ConfigTable_class
+
+  def initialize(items)
+    @items = items
+    @table = {}
+    items.each do |i|
+      @table[i.name] = i
+    end
+    ALIASES.each do |ali, name|
+      @table[ali] = @table[name]
+    end
+  end
+
+  include Enumerable
+
+  def each(&block)
+    @items.each(&block)
+  end
+
+  def key?(name)
+    @table.key?(name)
+  end
+
+  def lookup(name)
+    @table[name] or raise ArgumentError, "no such config item: #{name}"
+  end
+
+  def add(item)
+    @items.push item
+    @table[item.name] = item
+  end
+
+  def remove(name)
+    item = lookup(name)
+    @items.delete_if {|i| i.name == name }
+    @table.delete_if {|name, i| i.name == name }
+    item
+  end
+
+  def new
+    dup()
+  end
+
+  def savefile
+    '.config'
+  end
+
+  def load
+    begin
+      t = dup()
+      File.foreach(savefile()) do |line|
+        k, v = *line.split(/=/, 2)
+        t[k] = v.strip
+      end
+      t
+    rescue Errno::ENOENT
+      setup_rb_error $!.message + "#{File.basename($0)} config first"
+    end
+  end
+
+  def save
+    @items.each {|i| i.value }
+    File.open(savefile(), 'w') {|f|
+      @items.each do |i|
+        f.printf "%s=%s\n", i.name, i.value if i.value
+      end
+    }
+  end
+
+  def [](key)
+    lookup(key).eval(self)
+  end
+
+  def []=(key, val)
+    lookup(key).set val
+  end
+
+end
+
+c = ::Config::CONFIG
+
+rubypath = c['bindir'] + '/' + c['ruby_install_name']
+
+major = c['MAJOR'].to_i
+minor = c['MINOR'].to_i
+teeny = c['TEENY'].to_i
+version = "#{major}.#{minor}"
+
+# ruby ver. >= 1.4.4?
+newpath_p = ((major >= 2) or
+             ((major == 1) and
+              ((minor >= 5) or
+               ((minor == 4) and (teeny >= 4)))))
+
+if c['rubylibdir']
+  # V < 1.6.3
+  _stdruby         = c['rubylibdir']
+  _siteruby        = c['sitedir']
+  _siterubyver     = c['sitelibdir']
+  _siterubyverarch = c['sitearchdir']
+elsif newpath_p
+  # 1.4.4 <= V <= 1.6.3
+  _stdruby         = "$prefix/lib/ruby/#{version}"
+  _siteruby        = c['sitedir']
+  _siterubyver     = "$siteruby/#{version}"
+  _siterubyverarch = "$siterubyver/#{c['arch']}"
+else
+  # V < 1.4.4
+  _stdruby         = "$prefix/lib/ruby/#{version}"
+  _siteruby        = "$prefix/lib/ruby/#{version}/site_ruby"
+  _siterubyver     = _siteruby
+  _siterubyverarch = "$siterubyver/#{c['arch']}"
+end
+libdir = '-* dummy libdir *-'
+stdruby = '-* dummy rubylibdir *-'
+siteruby = '-* dummy site_ruby *-'
+siterubyver = '-* dummy site_ruby version *-'
+parameterize = lambda {|path|
+  path.sub(/\A#{Regexp.quote(c['prefix'])}/, '$prefix')\
+      .sub(/\A#{Regexp.quote(libdir)}/,      '$libdir')\
+      .sub(/\A#{Regexp.quote(stdruby)}/,     '$stdruby')\
+      .sub(/\A#{Regexp.quote(siteruby)}/,    '$siteruby')\
+      .sub(/\A#{Regexp.quote(siterubyver)}/, '$siterubyver')
+}
+libdir          = parameterize.call(c['libdir'])
+stdruby         = parameterize.call(_stdruby)
+siteruby        = parameterize.call(_siteruby)
+siterubyver     = parameterize.call(_siterubyver)
+siterubyverarch = parameterize.call(_siterubyverarch)
+
+if arg = c['configure_args'].split.detect {|arg| /--with-make-prog=/ =~ arg }
+  makeprog = arg.sub(/'/, '').split(/=/, 2)[1]
+else
+  makeprog = 'make'
+end
+
+common_conf = [
+  PathItem.new('prefix', 'path', c['prefix'],
+               'path prefix of target environment'),
+  PathItem.new('bindir', 'path', parameterize.call(c['bindir']),
+               'the directory for commands'),
+  PathItem.new('libdir', 'path', libdir,
+               'the directory for libraries'),
+  PathItem.new('datadir', 'path', parameterize.call(c['datadir']),
+               'the directory for shared data'),
+  PathItem.new('mandir', 'path', parameterize.call(c['mandir']),
+               'the directory for man pages'),
+  PathItem.new('sysconfdir', 'path', parameterize.call(c['sysconfdir']),
+               'the directory for man pages'),
+  PathItem.new('stdruby', 'path', stdruby,
+               'the directory for standard ruby libraries'),
+  PathItem.new('siteruby', 'path', siteruby,
+      'the directory for version-independent aux ruby libraries'),
+  PathItem.new('siterubyver', 'path', siterubyver,
+               'the directory for aux ruby libraries'),
+  PathItem.new('siterubyverarch', 'path', siterubyverarch,
+               'the directory for aux ruby binaries'),
+  PathItem.new('rbdir', 'path', '$siterubyver',
+               'the directory for ruby scripts'),
+  PathItem.new('sodir', 'path', '$siterubyverarch',
+               'the directory for ruby extentions'),
+  PathItem.new('rubypath', 'path', rubypath,
+               'the path to set to #! line'),
+  ProgramItem.new('rubyprog', 'name', rubypath,
+                  'the ruby program using for installation'),
+  ProgramItem.new('makeprog', 'name', makeprog,
+                  'the make program to compile ruby extentions'),
+  SelectItem.new('shebang', 'all/ruby/never', 'ruby',
+                 'shebang line (#!) editing mode'),
+  BoolItem.new('without-ext', 'yes/no', 'no',
+               'does not compile/install ruby extentions')
+]
+class ConfigTable_class   # open again
+  ALIASES = {
+    'std-ruby'         => 'stdruby',
+    'site-ruby-common' => 'siteruby',     # For backward compatibility
+    'site-ruby'        => 'siterubyver',  # For backward compatibility
+    'bin-dir'          => 'bindir',
+    'bin-dir'          => 'bindir',
+    'rb-dir'           => 'rbdir',
+    'so-dir'           => 'sodir',
+    'data-dir'         => 'datadir',
+    'ruby-path'        => 'rubypath',
+    'ruby-prog'        => 'rubyprog',
+    'ruby'             => 'rubyprog',
+    'make-prog'        => 'makeprog',
+    'make'             => 'makeprog'
+  }
+end
+multipackage_conf = [
+  PackageSelectionItem.new('with', 'name,name...', '', 'ALL',
+                           'package names that you want to install'),
+  PackageSelectionItem.new('without', 'name,name...', '', 'NONE',
+                           'package names that you do not want to install')
+]
+if multipackage_install?
+  ConfigTable = ConfigTable_class.new(common_conf + multipackage_conf)
+else
+  ConfigTable = ConfigTable_class.new(common_conf)
+end
+
+
+module MetaConfigAPI
+
+  def eval_file_ifexist(fname)
+    instance_eval File.read(fname), fname, 1 if File.file?(fname)
+  end
+
+  def config_names
+    ConfigTable.map {|i| i.name }
+  end
+
+  def config?(name)
+    ConfigTable.key?(name)
+  end
+
+  def bool_config?(name)
+    ConfigTable.lookup(name).config_type == 'bool'
+  end
+
+  def path_config?(name)
+    ConfigTable.lookup(name).config_type == 'path'
+  end
+
+  def value_config?(name)
+    case ConfigTable.lookup(name).config_type
+    when 'bool', 'path'
+      true
+    else
+      false
+    end
+  end
+
+  def add_config(item)
+    ConfigTable.add item
+  end
+
+  def add_bool_config(name, default, desc)
+    ConfigTable.add BoolItem.new(name, 'yes/no', default ? 'yes' : 'no', desc)
+  end
+
+  def add_path_config(name, default, desc)
+    ConfigTable.add PathItem.new(name, 'path', default, desc)
+  end
+
+  def set_config_default(name, default)
+    ConfigTable.lookup(name).default = default
+  end
+
+  def remove_config(name)
+    ConfigTable.remove(name)
+  end
+
+end
+
+
+#
+# File Operations
+#
+
+module FileOperations
+
+  def mkdir_p(dirname, prefix = nil)
+    dirname = prefix + File.expand_path(dirname) if prefix
+    $stderr.puts "mkdir -p #{dirname}" if verbose?
+    return if no_harm?
+
+    # does not check '/'... it's too abnormal case
+    dirs = File.expand_path(dirname).split(%r<(?=/)>)
+    if /\A[a-z]:\z/i =~ dirs[0]
+      disk = dirs.shift
+      dirs[0] = disk + dirs[0]
+    end
+    dirs.each_index do |idx|
+      path = dirs[0..idx].join('')
+      Dir.mkdir path unless File.dir?(path)
+    end
+  end
+
+  def rm_f(fname)
+    $stderr.puts "rm -f #{fname}" if verbose?
+    return if no_harm?
+
+    if File.exist?(fname) or File.symlink?(fname)
+      File.chmod 0777, fname
+      File.unlink fname
+    end
+  end
+
+  def rm_rf(dn)
+    $stderr.puts "rm -rf #{dn}" if verbose?
+    return if no_harm?
+
+    Dir.chdir dn
+    Dir.foreach('.') do |fn|
+      next if fn == '.'
+      next if fn == '..'
+      if File.dir?(fn)
+        verbose_off {
+          rm_rf fn
+        }
+      else
+        verbose_off {
+          rm_f fn
+        }
+      end
+    end
+    Dir.chdir '..'
+    Dir.rmdir dn
+  end
+
+  def move_file(src, dest)
+    File.unlink dest if File.exist?(dest)
+    begin
+      File.rename src, dest
+    rescue
+      File.open(dest, 'wb') {|f| f.write File.binread(src) }
+      File.chmod File.stat(src).mode, dest
+      File.unlink src
+    end
+  end
+
+  def install(from, dest, mode, prefix = nil)
+    $stderr.puts "install #{from} #{dest}" if verbose?
+    return if no_harm?
+
+    realdest = prefix ? prefix + File.expand_path(dest) : dest
+    realdest = File.join(realdest, File.basename(from)) if File.dir?(realdest)
+    str = File.binread(from)
+    if diff?(str, realdest)
+      verbose_off {
+        rm_f realdest if File.exist?(realdest)
+      }
+      File.open(realdest, 'wb') {|f|
+        f.write str
+      }
+      File.chmod mode, realdest
+
+      File.open("#{objdir_root()}/InstalledFiles", 'a') {|f|
+        if prefix
+          f.puts realdest.sub(prefix, '')
+        else
+          f.puts realdest
+        end
+      }
+    end
+  end
+
+  def diff?(new_content, path)
+    return true unless File.exist?(path)
+    new_content != File.binread(path)
+  end
+
+  def command(str)
+    $stderr.puts str if verbose?
+    system str or raise RuntimeError, "'system #{str}' failed"
+  end
+
+  def ruby(str)
+    command config('rubyprog') + ' ' + str
+  end
+  
+  def make(task = '')
+    command config('makeprog') + ' ' + task
+  end
+
+  def extdir?(dir)
+    File.exist?(dir + '/MANIFEST')
+  end
+
+  def all_files_in(dirname)
+    Dir.open(dirname) {|d|
+      return d.select {|ent| File.file?("#{dirname}/#{ent}") }
+    }
+  end
+
+  REJECT_DIRS = %w(
+    CVS SCCS RCS CVS.adm .svn
+  )
+
+  def all_dirs_in(dirname)
+    Dir.open(dirname) {|d|
+      return d.select {|n| File.dir?("#{dirname}/#{n}") } - %w(. ..) - REJECT_DIRS
+    }
+  end
+
+end
+
+
+#
+# Main Installer
+#
+
+module HookUtils
+
+  def run_hook(name)
+    try_run_hook "#{curr_srcdir()}/#{name}" or
+    try_run_hook "#{curr_srcdir()}/#{name}.rb"
+  end
+
+  def try_run_hook(fname)
+    return false unless File.file?(fname)
+    begin
+      instance_eval File.read(fname), fname, 1
+    rescue
+      setup_rb_error "hook #{fname} failed:\n" + $!.message
+    end
+    true
+  end
+
+end
+
+
+module HookScriptAPI
+
+  def get_config(key)
+    @config[key]
+  end
+
+  alias config get_config
+
+  def set_config(key, val)
+    @config[key] = val
+  end
+
+  #
+  # srcdir/objdir (works only in the package directory)
+  #
+
+  #abstract srcdir_root
+  #abstract objdir_root
+  #abstract relpath
+
+  def curr_srcdir
+    "#{srcdir_root()}/#{relpath()}"
+  end
+
+  def curr_objdir
+    "#{objdir_root()}/#{relpath()}"
+  end
+
+  def srcfile(path)
+    "#{curr_srcdir()}/#{path}"
+  end
+
+  def srcexist?(path)
+    File.exist?(srcfile(path))
+  end
+
+  def srcdirectory?(path)
+    File.dir?(srcfile(path))
+  end
+  
+  def srcfile?(path)
+    File.file? srcfile(path)
+  end
+
+  def srcentries(path = '.')
+    Dir.open("#{curr_srcdir()}/#{path}") {|d|
+      return d.to_a - %w(. ..)
+    }
+  end
+
+  def srcfiles(path = '.')
+    srcentries(path).select {|fname|
+      File.file?(File.join(curr_srcdir(), path, fname))
+    }
+  end
+
+  def srcdirectories(path = '.')
+    srcentries(path).select {|fname|
+      File.dir?(File.join(curr_srcdir(), path, fname))
+    }
+  end
+
+end
+
+
+class ToplevelInstaller
+
+  Version   = '3.3.1'
+  Copyright = 'Copyright (c) 2000-2004 Minero Aoki'
+
+  TASKS = [
+    [ 'all',      'do config, setup, then install' ],
+    [ 'config',   'saves your configurations' ],
+    [ 'show',     'shows current configuration' ],
+    [ 'setup',    'compiles ruby extentions and others' ],
+    [ 'install',  'installs files' ],
+    [ 'clean',    "does `make clean' for each extention" ],
+    [ 'distclean',"does `make distclean' for each extention" ]
+  ]
+
+  def ToplevelInstaller.invoke
+    instance().invoke
+  end
+
+  @singleton = nil
+
+  def ToplevelInstaller.instance
+    @singleton ||= new(File.dirname($0))
+    @singleton
+  end
+
+  include MetaConfigAPI
+
+  def initialize(ardir_root)
+    @config = nil
+    @options = { 'verbose' => true }
+    @ardir = File.expand_path(ardir_root)
+  end
+
+  def inspect
+    "#<#{self.class} #{__id__()}>"
+  end
+
+  def invoke
+    run_metaconfigs
+    case task = parsearg_global()
+    when nil, 'all'
+      @config = load_config('config')
+      parsearg_config
+      init_installers
+      exec_config
+      exec_setup
+      exec_install
+    else
+      @config = load_config(task)
+      __send__ "parsearg_#{task}"
+      init_installers
+      __send__ "exec_#{task}"
+    end
+  end
+  
+  def run_metaconfigs
+    eval_file_ifexist "#{@ardir}/metaconfig"
+  end
+
+  def load_config(task)
+    case task
+    when 'config'
+      ConfigTable.new
+    when 'clean', 'distclean'
+      if File.exist?(ConfigTable.savefile)
+      then ConfigTable.load
+      else ConfigTable.new
+      end
+    else
+      ConfigTable.load
+    end
+  end
+
+  def init_installers
+    @installer = Installer.new(@config, @options, @ardir, File.expand_path('.'))
+  end
+
+  #
+  # Hook Script API bases
+  #
+
+  def srcdir_root
+    @ardir
+  end
+
+  def objdir_root
+    '.'
+  end
+
+  def relpath
+    '.'
+  end
+
+  #
+  # Option Parsing
+  #
+
+  def parsearg_global
+    valid_task = /\A(?:#{TASKS.map {|task,desc| task }.join '|'})\z/
+
+    while arg = ARGV.shift
+      case arg
+      when /\A\w+\z/
+        setup_rb_error "invalid task: #{arg}" unless valid_task =~ arg
+        return arg
+
+      when '-q', '--quiet'
+        @options['verbose'] = false
+
+      when       '--verbose'
+        @options['verbose'] = true
+
+      when '-h', '--help'
+        print_usage $stdout
+        exit 0
+
+      when '-v', '--version'
+        puts "#{File.basename($0)} version #{Version}"
+        exit 0
+      
+      when '--copyright'
+        puts Copyright
+        exit 0
+
+      else
+        setup_rb_error "unknown global option '#{arg}'"
+      end
+    end
+
+    nil
+  end
+
+
+  def parsearg_no_options
+    unless ARGV.empty?
+      setup_rb_error "#{task}:  unknown options: #{ARGV.join ' '}"
+    end
+  end
+
+  alias parsearg_show       parsearg_no_options
+  alias parsearg_setup      parsearg_no_options
+  alias parsearg_clean      parsearg_no_options
+  alias parsearg_distclean  parsearg_no_options
+
+  def parsearg_config
+    re = /\A--(#{ConfigTable.map {|i| i.name }.join('|')})(?:=(.*))?\z/
+    @options['config-opt'] = []
+
+    while i = ARGV.shift
+      if /\A--?\z/ =~ i
+        @options['config-opt'] = ARGV.dup
+        break
+      end
+      m = re.match(i)  or setup_rb_error "config: unknown option #{i}"
+      name, value = *m.to_a[1,2]
+      @config[name] = value
+    end
+  end
+
+  def parsearg_install
+    @options['no-harm'] = false
+    @options['install-prefix'] = ''
+    while a = ARGV.shift
+      case a
+      when /\A--no-harm\z/
+        @options['no-harm'] = true
+      when /\A--prefix=(.*)\z/
+        path = $1
+        path = File.expand_path(path) unless path[0,1] == '/'
+        @options['install-prefix'] = path
+      else
+        setup_rb_error "install: unknown option #{a}"
+      end
+    end
+  end
+
+  def print_usage(out)
+    out.puts 'Typical Installation Procedure:'
+    out.puts "  $ ruby #{File.basename $0} config"
+    out.puts "  $ ruby #{File.basename $0} setup"
+    out.puts "  # ruby #{File.basename $0} install (may require root privilege)"
+    out.puts
+    out.puts 'Detailed Usage:'
+    out.puts "  ruby #{File.basename $0} <global option>"
+    out.puts "  ruby #{File.basename $0} [<global options>] <task> [<task options>]"
+
+    fmt = "  %-24s %s\n"
+    out.puts
+    out.puts 'Global options:'
+    out.printf fmt, '-q,--quiet',   'suppress message outputs'
+    out.printf fmt, '   --verbose', 'output messages verbosely'
+    out.printf fmt, '-h,--help',    'print this message'
+    out.printf fmt, '-v,--version', 'print version and quit'
+    out.printf fmt, '   --copyright',  'print copyright and quit'
+    out.puts
+    out.puts 'Tasks:'
+    TASKS.each do |name, desc|
+      out.printf fmt, name, desc
+    end
+
+    fmt = "  %-24s %s [%s]\n"
+    out.puts
+    out.puts 'Options for CONFIG or ALL:'
+    ConfigTable.each do |item|
+      out.printf fmt, item.help_opt, item.description, item.help_default
+    end
+    out.printf fmt, '--rbconfig=path', 'rbconfig.rb to load',"running ruby's"
+    out.puts
+    out.puts 'Options for INSTALL:'
+    out.printf fmt, '--no-harm', 'only display what to do if given', 'off'
+    out.printf fmt, '--prefix=path',  'install path prefix', '$prefix'
+    out.puts
+  end
+
+  #
+  # Task Handlers
+  #
+
+  def exec_config
+    @installer.exec_config
+    @config.save   # must be final
+  end
+
+  def exec_setup
+    @installer.exec_setup
+  end
+
+  def exec_install
+    @installer.exec_install
+  end
+
+  def exec_show
+    ConfigTable.each do |i|
+      printf "%-20s %s\n", i.name, i.value
+    end
+  end
+
+  def exec_clean
+    @installer.exec_clean
+  end
+
+  def exec_distclean
+    @installer.exec_distclean
+  end
+
+end
+
+
+class ToplevelInstallerMulti < ToplevelInstaller
+
+  include HookUtils
+  include HookScriptAPI
+  include FileOperations
+
+  def initialize(ardir)
+    super
+    @packages = all_dirs_in("#{@ardir}/packages")
+    raise 'no package exists' if @packages.empty?
+  end
+
+  def run_metaconfigs
+    eval_file_ifexist "#{@ardir}/metaconfig"
+    @packages.each do |name|
+      eval_file_ifexist "#{@ardir}/packages/#{name}/metaconfig"
+    end
+  end
+
+  def init_installers
+    @installers = {}
+    @packages.each do |pack|
+      @installers[pack] = Installer.new(@config, @options,
+                                       "#{@ardir}/packages/#{pack}",
+                                       "packages/#{pack}")
+    end
+
+    with    = extract_selection(config('with'))
+    without = extract_selection(config('without'))
+    @selected = @installers.keys.select {|name|
+                  (with.empty? or with.include?(name)) \
+                      and not without.include?(name)
+                }
+  end
+
+  def extract_selection(list)
+    a = list.split(/,/)
+    a.each do |name|
+      setup_rb_error "no such package: #{name}"  unless @installers.key?(name)
+    end
+    a
+  end
+
+  def print_usage(f)
+    super
+    f.puts 'Included packages:'
+    f.puts '  ' + @packages.sort.join(' ')
+    f.puts
+  end
+
+  #
+  # multi-package metaconfig API
+  #
+
+  attr_reader :packages
+
+  def declare_packages(list)
+    raise 'package list is empty' if list.empty?
+    list.each do |name|
+      raise "directory packages/#{name} does not exist"\
+              unless File.dir?("#{@ardir}/packages/#{name}")
+    end
+    @packages = list
+  end
+
+  #
+  # Task Handlers
+  #
+
+  def exec_config
+    run_hook 'pre-config'
+    each_selected_installers {|inst| inst.exec_config }
+    run_hook 'post-config'
+    @config.save   # must be final
+  end
+
+  def exec_setup
+    run_hook 'pre-setup'
+    each_selected_installers {|inst| inst.exec_setup }
+    run_hook 'post-setup'
+  end
+
+  def exec_install
+    run_hook 'pre-install'
+    each_selected_installers {|inst| inst.exec_install }
+    run_hook 'post-install'
+  end
+
+  def exec_clean
+    rm_f ConfigTable.savefile
+    run_hook 'pre-clean'
+    each_selected_installers {|inst| inst.exec_clean }
+    run_hook 'post-clean'
+  end
+
+  def exec_distclean
+    rm_f ConfigTable.savefile
+    run_hook 'pre-distclean'
+    each_selected_installers {|inst| inst.exec_distclean }
+    run_hook 'post-distclean'
+  end
+
+  #
+  # lib
+  #
+
+  def each_selected_installers
+    Dir.mkdir 'packages' unless File.dir?('packages')
+    @selected.each do |pack|
+      $stderr.puts "Processing the package `#{pack}' ..." if @options['verbose']
+      Dir.mkdir "packages/#{pack}" unless File.dir?("packages/#{pack}")
+      Dir.chdir "packages/#{pack}"
+      yield @installers[pack]
+      Dir.chdir '../..'
+    end
+  end
+
+  def verbose?
+    @options['verbose']
+  end
+
+  def no_harm?
+    @options['no-harm']
+  end
+
+end
+
+
+class Installer
+
+  FILETYPES = %w( bin lib ext data )
+
+  include HookScriptAPI
+  include HookUtils
+  include FileOperations
+
+  def initialize(config, opt, srcroot, objroot)
+    @config = config
+    @options = opt
+    @srcdir = File.expand_path(srcroot)
+    @objdir = File.expand_path(objroot)
+    @currdir = '.'
+  end
+
+  def inspect
+    "#<#{self.class} #{File.basename(@srcdir)}>"
+  end
+
+  #
+  # Hook Script API base methods
+  #
+
+  def srcdir_root
+    @srcdir
+  end
+
+  def objdir_root
+    @objdir
+  end
+
+  def relpath
+    @currdir
+  end
+
+  #
+  # configs/options
+  #
+
+  def no_harm?
+    @options['no-harm']
+  end
+
+  def verbose?
+    @options['verbose']
+  end
+
+  def verbose_off
+    begin
+      save, @options['verbose'] = @options['verbose'], false
+      yield
+    ensure
+      @options['verbose'] = save
+    end
+  end
+
+  #
+  # TASK config
+  #
+
+  def exec_config
+    exec_task_traverse 'config'
+  end
+
+  def config_dir_bin(rel)
+  end
+
+  def config_dir_lib(rel)
+  end
+
+  def config_dir_ext(rel)
+    extconf if extdir?(curr_srcdir())
+  end
+
+  def extconf
+    opt = @options['config-opt'].join(' ')
+    command "#{config('rubyprog')} #{curr_srcdir()}/extconf.rb #{opt}"
+  end
+
+  def config_dir_data(rel)
+  end
+
+  #
+  # TASK setup
+  #
+
+  def exec_setup
+    exec_task_traverse 'setup'
+  end
+
+  def setup_dir_bin(rel)
+    all_files_in(curr_srcdir()).each do |fname|
+      adjust_shebang "#{curr_srcdir()}/#{fname}"
+    end
+  end
+
+  def adjust_shebang(path)
+    return if no_harm?
+    tmpfile = File.basename(path) + '.tmp'
+    begin
+      File.open(path, 'rb') {|r|
+        first = r.gets
+        return unless File.basename(config('rubypath')) == 'ruby'
+        return unless File.basename(first.sub(/\A\#!/, '').split[0]) == 'ruby'
+        $stderr.puts "adjusting shebang: #{File.basename(path)}" if verbose?
+        File.open(tmpfile, 'wb') {|w|
+          w.print first.sub(/\A\#!\s*\S+/, '#! ' + config('rubypath'))
+          w.write r.read
+        }
+        move_file tmpfile, File.basename(path)
+      }
+    ensure
+      File.unlink tmpfile if File.exist?(tmpfile)
+    end
+  end
+
+  def setup_dir_lib(rel)
+  end
+
+  def setup_dir_ext(rel)
+    make if extdir?(curr_srcdir())
+  end
+
+  def setup_dir_data(rel)
+  end
+
+  #
+  # TASK install
+  #
+
+  def exec_install
+    rm_f 'InstalledFiles'
+    exec_task_traverse 'install'
+  end
+
+  def install_dir_bin(rel)
+    install_files collect_filenames_auto(), "#{config('bindir')}/#{rel}", 0755
+  end
+
+  def install_dir_lib(rel)
+    install_files ruby_scripts(), "#{config('rbdir')}/#{rel}", 0644
+  end
+
+  def install_dir_ext(rel)
+    return unless extdir?(curr_srcdir())
+    install_files ruby_extentions('.'),
+                  "#{config('sodir')}/#{File.dirname(rel)}",
+                  0555
+  end
+
+  def install_dir_data(rel)
+    install_files collect_filenames_auto(), "#{config('datadir')}/#{rel}", 0644
+  end
+
+  def install_files(list, dest, mode)
+    mkdir_p dest, @options['install-prefix']
+    list.each do |fname|
+      install fname, dest, mode, @options['install-prefix']
+    end
+  end
+
+  def ruby_scripts
+    collect_filenames_auto().select {|n| /\.rb\z/ =~ n }
+  end
+  
+  # picked up many entries from cvs-1.11.1/src/ignore.c
+  reject_patterns = %w( 
+    core RCSLOG tags TAGS .make.state
+    .nse_depinfo #* .#* cvslog.* ,* .del-* *.olb
+    *~ *.old *.bak *.BAK *.orig *.rej _$* *$
+
+    *.org *.in .*
+  )
+  mapping = {
+    '.' => '\.',
+    '$' => '\$',
+    '#' => '\#',
+    '*' => '.*'
+  }
+  REJECT_PATTERNS = Regexp.new('\A(?:' +
+                               reject_patterns.map {|pat|
+                                 pat.gsub(/[\.\$\#\*]/) {|ch| mapping[ch] }
+                               }.join('|') +
+                               ')\z')
+
+  def collect_filenames_auto
+    mapdir((existfiles() - hookfiles()).reject {|fname|
+             REJECT_PATTERNS =~ fname
+           })
+  end
+
+  def existfiles
+    all_files_in(curr_srcdir()) | all_files_in('.')
+  end
+
+  def hookfiles
+    %w( pre-%s post-%s pre-%s.rb post-%s.rb ).map {|fmt|
+      %w( config setup install clean ).map {|t| sprintf(fmt, t) }
+    }.flatten
+  end
+
+  def mapdir(filelist)
+    filelist.map {|fname|
+      if File.exist?(fname)   # objdir
+        fname
+      else                    # srcdir
+        File.join(curr_srcdir(), fname)
+      end
+    }
+  end
+
+  def ruby_extentions(dir)
+    Dir.open(dir) {|d|
+      ents = d.select {|fname| /\.#{::Config::CONFIG['DLEXT']}\z/ =~ fname }
+      if ents.empty?
+        setup_rb_error "no ruby extention exists: 'ruby #{$0} setup' first"
+      end
+      return ents
+    }
+  end
+
+  #
+  # TASK clean
+  #
+
+  def exec_clean
+    exec_task_traverse 'clean'
+    rm_f ConfigTable.savefile
+    rm_f 'InstalledFiles'
+  end
+
+  def clean_dir_bin(rel)
+  end
+
+  def clean_dir_lib(rel)
+  end
+
+  def clean_dir_ext(rel)
+    return unless extdir?(curr_srcdir())
+    make 'clean' if File.file?('Makefile')
+  end
+
+  def clean_dir_data(rel)
+  end
+
+  #
+  # TASK distclean
+  #
+
+  def exec_distclean
+    exec_task_traverse 'distclean'
+    rm_f ConfigTable.savefile
+    rm_f 'InstalledFiles'
+  end
+
+  def distclean_dir_bin(rel)
+  end
+
+  def distclean_dir_lib(rel)
+  end
+
+  def distclean_dir_ext(rel)
+    return unless extdir?(curr_srcdir())
+    make 'distclean' if File.file?('Makefile')
+  end
+
+  #
+  # lib
+  #
+
+  def exec_task_traverse(task)
+    run_hook "pre-#{task}"
+    FILETYPES.each do |type|
+      if config('without-ext') == 'yes' and type == 'ext'
+        $stderr.puts 'skipping ext/* by user option' if verbose?
+        next
+      end
+      traverse task, type, "#{task}_dir_#{type}"
+    end
+    run_hook "post-#{task}"
+  end
+
+  def traverse(task, rel, mid)
+    dive_into(rel) {
+      run_hook "pre-#{task}"
+      __send__ mid, rel.sub(%r[\A.*?(?:/|\z)], '')
+      all_dirs_in(curr_srcdir()).each do |d|
+        traverse task, "#{rel}/#{d}", mid
+      end
+      run_hook "post-#{task}"
+    }
+  end
+
+  def dive_into(rel)
+    return unless File.dir?("#{@srcdir}/#{rel}")
+
+    dir = File.basename(rel)
+    Dir.mkdir dir unless File.dir?(dir)
+    prevdir = Dir.pwd
+    Dir.chdir dir
+    $stderr.puts '---> ' + rel if verbose?
+    @currdir = rel
+    yield
+    Dir.chdir prevdir
+    $stderr.puts '<--- ' + rel if verbose?
+    @currdir = File.dirname(rel)
+  end
+
+end
+
+
+if $0 == __FILE__
+  begin
+    if multipackage_install?
+      ToplevelInstallerMulti.invoke
+    else
+      ToplevelInstaller.invoke
+    end
+  rescue SetupError
+    raise if $DEBUG
+    $stderr.puts $!.message
+    $stderr.puts "Try 'ruby #{$0} --help' for detailed usage."
+    exit 1
+  end
+end
diff --git a/vendor/plugins/acts_as_list/README b/vendor/plugins/acts_as_list/README
new file mode 100644
index 000000000..36ae3188e
--- /dev/null
+++ b/vendor/plugins/acts_as_list/README
@@ -0,0 +1,23 @@
+ActsAsList
+==========
+
+This acts_as extension provides the capabilities for sorting and reordering a number of objects in a list. The class that has this specified needs to have a +position+ column defined as an integer on the mapped database table.
+
+
+Example
+=======
+
+  class TodoList < ActiveRecord::Base
+    has_many :todo_items, :order => "position"
+  end
+
+  class TodoItem < ActiveRecord::Base
+    belongs_to :todo_list
+    acts_as_list :scope => :todo_list
+  end
+
+  todo_list.first.move_to_bottom
+  todo_list.last.move_higher
+
+
+Copyright (c) 2007 David Heinemeier Hansson, released under the MIT license
\ No newline at end of file
diff --git a/vendor/plugins/acts_as_list/init.rb b/vendor/plugins/acts_as_list/init.rb
new file mode 100644
index 000000000..eb87e8790
--- /dev/null
+++ b/vendor/plugins/acts_as_list/init.rb
@@ -0,0 +1,3 @@
+$:.unshift "#{File.dirname(__FILE__)}/lib"
+require 'active_record/acts/list'
+ActiveRecord::Base.class_eval { include ActiveRecord::Acts::List }
diff --git a/vendor/plugins/acts_as_list/lib/active_record/acts/list.rb b/vendor/plugins/acts_as_list/lib/active_record/acts/list.rb
new file mode 100644
index 000000000..00d86928d
--- /dev/null
+++ b/vendor/plugins/acts_as_list/lib/active_record/acts/list.rb
@@ -0,0 +1,256 @@
+module ActiveRecord
+  module Acts #:nodoc:
+    module List #:nodoc:
+      def self.included(base)
+        base.extend(ClassMethods)
+      end
+
+      # This +acts_as+ extension provides the capabilities for sorting and reordering a number of objects in a list.
+      # The class that has this specified needs to have a +position+ column defined as an integer on
+      # the mapped database table.
+      #
+      # Todo list example:
+      #
+      #   class TodoList < ActiveRecord::Base
+      #     has_many :todo_items, :order => "position"
+      #   end
+      #
+      #   class TodoItem < ActiveRecord::Base
+      #     belongs_to :todo_list
+      #     acts_as_list :scope => :todo_list
+      #   end
+      #
+      #   todo_list.first.move_to_bottom
+      #   todo_list.last.move_higher
+      module ClassMethods
+        # Configuration options are:
+        #
+        # * +column+ - specifies the column name to use for keeping the position integer (default: +position+)
+        # * +scope+ - restricts what is to be considered a list. Given a symbol, it'll attach <tt>_id</tt> 
+        #   (if it hasn't already been added) and use that as the foreign key restriction. It's also possible 
+        #   to give it an entire string that is interpolated if you need a tighter scope than just a foreign key.
+        #   Example: <tt>acts_as_list :scope => 'todo_list_id = #{todo_list_id} AND completed = 0'</tt>
+        def acts_as_list(options = {})
+          configuration = { :column => "position", :scope => "1 = 1" }
+          configuration.update(options) if options.is_a?(Hash)
+
+          configuration[:scope] = "#{configuration[:scope]}_id".intern if configuration[:scope].is_a?(Symbol) && configuration[:scope].to_s !~ /_id$/
+
+          if configuration[:scope].is_a?(Symbol)
+            scope_condition_method = %(
+              def scope_condition
+                if #{configuration[:scope].to_s}.nil?
+                  "#{configuration[:scope].to_s} IS NULL"
+                else
+                  "#{configuration[:scope].to_s} = \#{#{configuration[:scope].to_s}}"
+                end
+              end
+            )
+          else
+            scope_condition_method = "def scope_condition() \"#{configuration[:scope]}\" end"
+          end
+
+          class_eval <<-EOV
+            include ActiveRecord::Acts::List::InstanceMethods
+
+            def acts_as_list_class
+              ::#{self.name}
+            end
+
+            def position_column
+              '#{configuration[:column]}'
+            end
+
+            #{scope_condition_method}
+
+            before_destroy :remove_from_list
+            before_create  :add_to_list_bottom
+          EOV
+        end
+      end
+
+      # All the methods available to a record that has had <tt>acts_as_list</tt> specified. Each method works
+      # by assuming the object to be the item in the list, so <tt>chapter.move_lower</tt> would move that chapter
+      # lower in the list of all chapters. Likewise, <tt>chapter.first?</tt> would return +true+ if that chapter is
+      # the first in the list of all chapters.
+      module InstanceMethods
+        # Insert the item at the given position (defaults to the top position of 1).
+        def insert_at(position = 1)
+          insert_at_position(position)
+        end
+
+        # Swap positions with the next lower item, if one exists.
+        def move_lower
+          return unless lower_item
+
+          acts_as_list_class.transaction do
+            lower_item.decrement_position
+            increment_position
+          end
+        end
+
+        # Swap positions with the next higher item, if one exists.
+        def move_higher
+          return unless higher_item
+
+          acts_as_list_class.transaction do
+            higher_item.increment_position
+            decrement_position
+          end
+        end
+
+        # Move to the bottom of the list. If the item is already in the list, the items below it have their
+        # position adjusted accordingly.
+        def move_to_bottom
+          return unless in_list?
+          acts_as_list_class.transaction do
+            decrement_positions_on_lower_items
+            assume_bottom_position
+          end
+        end
+
+        # Move to the top of the list. If the item is already in the list, the items above it have their
+        # position adjusted accordingly.
+        def move_to_top
+          return unless in_list?
+          acts_as_list_class.transaction do
+            increment_positions_on_higher_items
+            assume_top_position
+          end
+        end
+
+        # Removes the item from the list.
+        def remove_from_list
+          if in_list?
+            decrement_positions_on_lower_items
+            update_attribute position_column, nil
+          end
+        end
+
+        # Increase the position of this item without adjusting the rest of the list.
+        def increment_position
+          return unless in_list?
+          update_attribute position_column, self.send(position_column).to_i + 1
+        end
+
+        # Decrease the position of this item without adjusting the rest of the list.
+        def decrement_position
+          return unless in_list?
+          update_attribute position_column, self.send(position_column).to_i - 1
+        end
+
+        # Return +true+ if this object is the first in the list.
+        def first?
+          return false unless in_list?
+          self.send(position_column) == 1
+        end
+
+        # Return +true+ if this object is the last in the list.
+        def last?
+          return false unless in_list?
+          self.send(position_column) == bottom_position_in_list
+        end
+
+        # Return the next higher item in the list.
+        def higher_item
+          return nil unless in_list?
+          acts_as_list_class.find(:first, :conditions =>
+            "#{scope_condition} AND #{position_column} = #{(send(position_column).to_i - 1).to_s}"
+          )
+        end
+
+        # Return the next lower item in the list.
+        def lower_item
+          return nil unless in_list?
+          acts_as_list_class.find(:first, :conditions =>
+            "#{scope_condition} AND #{position_column} = #{(send(position_column).to_i + 1).to_s}"
+          )
+        end
+
+        # Test if this record is in a list
+        def in_list?
+          !send(position_column).nil?
+        end
+
+        private
+          def add_to_list_top
+            increment_positions_on_all_items
+          end
+
+          def add_to_list_bottom
+            self[position_column] = bottom_position_in_list.to_i + 1
+          end
+
+          # Overwrite this method to define the scope of the list changes
+          def scope_condition() "1" end
+
+          # Returns the bottom position number in the list.
+          #   bottom_position_in_list    # => 2
+          def bottom_position_in_list(except = nil)
+            item = bottom_item(except)
+            item ? item.send(position_column) : 0
+          end
+
+          # Returns the bottom item
+          def bottom_item(except = nil)
+            conditions = scope_condition
+            conditions = "#{conditions} AND #{self.class.primary_key} != #{except.id}" if except
+            acts_as_list_class.find(:first, :conditions => conditions, :order => "#{position_column} DESC")
+          end
+
+          # Forces item to assume the bottom position in the list.
+          def assume_bottom_position
+            update_attribute(position_column, bottom_position_in_list(self).to_i + 1)
+          end
+
+          # Forces item to assume the top position in the list.
+          def assume_top_position
+            update_attribute(position_column, 1)
+          end
+
+          # This has the effect of moving all the higher items up one.
+          def decrement_positions_on_higher_items(position)
+            acts_as_list_class.update_all(
+              "#{position_column} = (#{position_column} - 1)", "#{scope_condition} AND #{position_column} <= #{position}"
+            )
+          end
+
+          # This has the effect of moving all the lower items up one.
+          def decrement_positions_on_lower_items
+            return unless in_list?
+            acts_as_list_class.update_all(
+              "#{position_column} = (#{position_column} - 1)", "#{scope_condition} AND #{position_column} > #{send(position_column).to_i}"
+            )
+          end
+
+          # This has the effect of moving all the higher items down one.
+          def increment_positions_on_higher_items
+            return unless in_list?
+            acts_as_list_class.update_all(
+              "#{position_column} = (#{position_column} + 1)", "#{scope_condition} AND #{position_column} < #{send(position_column).to_i}"
+            )
+          end
+
+          # This has the effect of moving all the lower items down one.
+          def increment_positions_on_lower_items(position)
+            acts_as_list_class.update_all(
+              "#{position_column} = (#{position_column} + 1)", "#{scope_condition} AND #{position_column} >= #{position}"
+           )
+          end
+
+          # Increments position (<tt>position_column</tt>) of all items in the list.
+          def increment_positions_on_all_items
+            acts_as_list_class.update_all(
+              "#{position_column} = (#{position_column} + 1)",  "#{scope_condition}"
+            )
+          end
+
+          def insert_at_position(position)
+            remove_from_list
+            increment_positions_on_lower_items(position)
+            self.update_attribute(position_column, position)
+          end
+      end 
+    end
+  end
+end
diff --git a/vendor/plugins/acts_as_list/test/list_test.rb b/vendor/plugins/acts_as_list/test/list_test.rb
new file mode 100644
index 000000000..e89cb8e12
--- /dev/null
+++ b/vendor/plugins/acts_as_list/test/list_test.rb
@@ -0,0 +1,332 @@
+require 'test/unit'
+
+require 'rubygems'
+gem 'activerecord', '>= 1.15.4.7794'
+require 'active_record'
+
+require "#{File.dirname(__FILE__)}/../init"
+
+ActiveRecord::Base.establish_connection(:adapter => "sqlite3", :dbfile => ":memory:")
+
+def setup_db
+  ActiveRecord::Schema.define(:version => 1) do
+    create_table :mixins do |t|
+      t.column :pos, :integer
+      t.column :parent_id, :integer
+      t.column :created_at, :datetime      
+      t.column :updated_at, :datetime
+    end
+  end
+end
+
+def teardown_db
+  ActiveRecord::Base.connection.tables.each do |table|
+    ActiveRecord::Base.connection.drop_table(table)
+  end
+end
+
+class Mixin < ActiveRecord::Base
+end
+
+class ListMixin < Mixin
+  acts_as_list :column => "pos", :scope => :parent
+
+  def self.table_name() "mixins" end
+end
+
+class ListMixinSub1 < ListMixin
+end
+
+class ListMixinSub2 < ListMixin
+end
+
+class ListWithStringScopeMixin < ActiveRecord::Base
+  acts_as_list :column => "pos", :scope => 'parent_id = #{parent_id}'
+
+  def self.table_name() "mixins" end
+end
+
+
+class ListTest < Test::Unit::TestCase
+
+  def setup
+    setup_db
+    (1..4).each { |counter| ListMixin.create! :pos => counter, :parent_id => 5 }
+  end
+
+  def teardown
+    teardown_db
+  end
+
+  def test_reordering
+    assert_equal [1, 2, 3, 4], ListMixin.find(:all, :conditions => 'parent_id = 5', :order => 'pos').map(&:id)
+
+    ListMixin.find(2).move_lower
+    assert_equal [1, 3, 2, 4], ListMixin.find(:all, :conditions => 'parent_id = 5', :order => 'pos').map(&:id)
+
+    ListMixin.find(2).move_higher
+    assert_equal [1, 2, 3, 4], ListMixin.find(:all, :conditions => 'parent_id = 5', :order => 'pos').map(&:id)
+
+    ListMixin.find(1).move_to_bottom
+    assert_equal [2, 3, 4, 1], ListMixin.find(:all, :conditions => 'parent_id = 5', :order => 'pos').map(&:id)
+
+    ListMixin.find(1).move_to_top
+    assert_equal [1, 2, 3, 4], ListMixin.find(:all, :conditions => 'parent_id = 5', :order => 'pos').map(&:id)
+
+    ListMixin.find(2).move_to_bottom
+    assert_equal [1, 3, 4, 2], ListMixin.find(:all, :conditions => 'parent_id = 5', :order => 'pos').map(&:id)
+
+    ListMixin.find(4).move_to_top
+    assert_equal [4, 1, 3, 2], ListMixin.find(:all, :conditions => 'parent_id = 5', :order => 'pos').map(&:id)
+  end
+
+  def test_move_to_bottom_with_next_to_last_item
+    assert_equal [1, 2, 3, 4], ListMixin.find(:all, :conditions => 'parent_id = 5', :order => 'pos').map(&:id)
+    ListMixin.find(3).move_to_bottom
+    assert_equal [1, 2, 4, 3], ListMixin.find(:all, :conditions => 'parent_id = 5', :order => 'pos').map(&:id)
+  end
+
+  def test_next_prev
+    assert_equal ListMixin.find(2), ListMixin.find(1).lower_item
+    assert_nil ListMixin.find(1).higher_item
+    assert_equal ListMixin.find(3), ListMixin.find(4).higher_item
+    assert_nil ListMixin.find(4).lower_item
+  end
+
+  def test_injection
+    item = ListMixin.new(:parent_id => 1)
+    assert_equal "parent_id = 1", item.scope_condition
+    assert_equal "pos", item.position_column
+  end
+
+  def test_insert
+    new = ListMixin.create(:parent_id => 20)
+    assert_equal 1, new.pos
+    assert new.first?
+    assert new.last?
+
+    new = ListMixin.create(:parent_id => 20)
+    assert_equal 2, new.pos
+    assert !new.first?
+    assert new.last?
+
+    new = ListMixin.create(:parent_id => 20)
+    assert_equal 3, new.pos
+    assert !new.first?
+    assert new.last?
+
+    new = ListMixin.create(:parent_id => 0)
+    assert_equal 1, new.pos
+    assert new.first?
+    assert new.last?
+  end
+
+  def test_insert_at
+    new = ListMixin.create(:parent_id => 20)
+    assert_equal 1, new.pos
+
+    new = ListMixin.create(:parent_id => 20)
+    assert_equal 2, new.pos
+
+    new = ListMixin.create(:parent_id => 20)
+    assert_equal 3, new.pos
+
+    new4 = ListMixin.create(:parent_id => 20)
+    assert_equal 4, new4.pos
+
+    new4.insert_at(3)
+    assert_equal 3, new4.pos
+
+    new.reload
+    assert_equal 4, new.pos
+
+    new.insert_at(2)
+    assert_equal 2, new.pos
+
+    new4.reload
+    assert_equal 4, new4.pos
+
+    new5 = ListMixin.create(:parent_id => 20)
+    assert_equal 5, new5.pos
+
+    new5.insert_at(1)
+    assert_equal 1, new5.pos
+
+    new4.reload
+    assert_equal 5, new4.pos
+  end
+
+  def test_delete_middle
+    assert_equal [1, 2, 3, 4], ListMixin.find(:all, :conditions => 'parent_id = 5', :order => 'pos').map(&:id)
+
+    ListMixin.find(2).destroy
+
+    assert_equal [1, 3, 4], ListMixin.find(:all, :conditions => 'parent_id = 5', :order => 'pos').map(&:id)
+
+    assert_equal 1, ListMixin.find(1).pos
+    assert_equal 2, ListMixin.find(3).pos
+    assert_equal 3, ListMixin.find(4).pos
+
+    ListMixin.find(1).destroy
+
+    assert_equal [3, 4], ListMixin.find(:all, :conditions => 'parent_id = 5', :order => 'pos').map(&:id)
+
+    assert_equal 1, ListMixin.find(3).pos
+    assert_equal 2, ListMixin.find(4).pos
+  end
+
+  def test_with_string_based_scope
+    new = ListWithStringScopeMixin.create(:parent_id => 500)
+    assert_equal 1, new.pos
+    assert new.first?
+    assert new.last?
+  end
+
+  def test_nil_scope
+    new1, new2, new3 = ListMixin.create, ListMixin.create, ListMixin.create
+    new2.move_higher
+    assert_equal [new2, new1, new3], ListMixin.find(:all, :conditions => 'parent_id IS NULL', :order => 'pos')
+  end
+  
+  
+  def test_remove_from_list_should_then_fail_in_list? 
+    assert_equal true, ListMixin.find(1).in_list?
+    ListMixin.find(1).remove_from_list
+    assert_equal false, ListMixin.find(1).in_list?
+  end 
+  
+  def test_remove_from_list_should_set_position_to_nil 
+    assert_equal [1, 2, 3, 4], ListMixin.find(:all, :conditions => 'parent_id = 5', :order => 'pos').map(&:id)
+  
+    ListMixin.find(2).remove_from_list 
+  
+    assert_equal [2, 1, 3, 4], ListMixin.find(:all, :conditions => 'parent_id = 5', :order => 'pos').map(&:id)
+  
+    assert_equal 1,   ListMixin.find(1).pos
+    assert_equal nil, ListMixin.find(2).pos
+    assert_equal 2,   ListMixin.find(3).pos
+    assert_equal 3,   ListMixin.find(4).pos
+  end 
+  
+  def test_remove_before_destroy_does_not_shift_lower_items_twice 
+    assert_equal [1, 2, 3, 4], ListMixin.find(:all, :conditions => 'parent_id = 5', :order => 'pos').map(&:id)
+  
+    ListMixin.find(2).remove_from_list 
+    ListMixin.find(2).destroy 
+  
+    assert_equal [1, 3, 4], ListMixin.find(:all, :conditions => 'parent_id = 5', :order => 'pos').map(&:id)
+  
+    assert_equal 1, ListMixin.find(1).pos
+    assert_equal 2, ListMixin.find(3).pos
+    assert_equal 3, ListMixin.find(4).pos
+  end 
+  
+end
+
+class ListSubTest < Test::Unit::TestCase
+
+  def setup
+    setup_db
+    (1..4).each { |i| ((i % 2 == 1) ? ListMixinSub1 : ListMixinSub2).create! :pos => i, :parent_id => 5000 }
+  end
+
+  def teardown
+    teardown_db
+  end
+
+  def test_reordering
+    assert_equal [1, 2, 3, 4], ListMixin.find(:all, :conditions => 'parent_id = 5000', :order => 'pos').map(&:id)
+
+    ListMixin.find(2).move_lower
+    assert_equal [1, 3, 2, 4], ListMixin.find(:all, :conditions => 'parent_id = 5000', :order => 'pos').map(&:id)
+
+    ListMixin.find(2).move_higher
+    assert_equal [1, 2, 3, 4], ListMixin.find(:all, :conditions => 'parent_id = 5000', :order => 'pos').map(&:id)
+
+    ListMixin.find(1).move_to_bottom
+    assert_equal [2, 3, 4, 1], ListMixin.find(:all, :conditions => 'parent_id = 5000', :order => 'pos').map(&:id)
+
+    ListMixin.find(1).move_to_top
+    assert_equal [1, 2, 3, 4], ListMixin.find(:all, :conditions => 'parent_id = 5000', :order => 'pos').map(&:id)
+
+    ListMixin.find(2).move_to_bottom
+    assert_equal [1, 3, 4, 2], ListMixin.find(:all, :conditions => 'parent_id = 5000', :order => 'pos').map(&:id)
+
+    ListMixin.find(4).move_to_top
+    assert_equal [4, 1, 3, 2], ListMixin.find(:all, :conditions => 'parent_id = 5000', :order => 'pos').map(&:id)
+  end
+
+  def test_move_to_bottom_with_next_to_last_item
+    assert_equal [1, 2, 3, 4], ListMixin.find(:all, :conditions => 'parent_id = 5000', :order => 'pos').map(&:id)
+    ListMixin.find(3).move_to_bottom
+    assert_equal [1, 2, 4, 3], ListMixin.find(:all, :conditions => 'parent_id = 5000', :order => 'pos').map(&:id)
+  end
+
+  def test_next_prev
+    assert_equal ListMixin.find(2), ListMixin.find(1).lower_item
+    assert_nil ListMixin.find(1).higher_item
+    assert_equal ListMixin.find(3), ListMixin.find(4).higher_item
+    assert_nil ListMixin.find(4).lower_item
+  end
+
+  def test_injection
+    item = ListMixin.new("parent_id"=>1)
+    assert_equal "parent_id = 1", item.scope_condition
+    assert_equal "pos", item.position_column
+  end
+
+  def test_insert_at
+    new = ListMixin.create("parent_id" => 20)
+    assert_equal 1, new.pos
+
+    new = ListMixinSub1.create("parent_id" => 20)
+    assert_equal 2, new.pos
+
+    new = ListMixinSub2.create("parent_id" => 20)
+    assert_equal 3, new.pos
+
+    new4 = ListMixin.create("parent_id" => 20)
+    assert_equal 4, new4.pos
+
+    new4.insert_at(3)
+    assert_equal 3, new4.pos
+
+    new.reload
+    assert_equal 4, new.pos
+
+    new.insert_at(2)
+    assert_equal 2, new.pos
+
+    new4.reload
+    assert_equal 4, new4.pos
+
+    new5 = ListMixinSub1.create("parent_id" => 20)
+    assert_equal 5, new5.pos
+
+    new5.insert_at(1)
+    assert_equal 1, new5.pos
+
+    new4.reload
+    assert_equal 5, new4.pos
+  end
+
+  def test_delete_middle
+    assert_equal [1, 2, 3, 4], ListMixin.find(:all, :conditions => 'parent_id = 5000', :order => 'pos').map(&:id)
+
+    ListMixin.find(2).destroy
+
+    assert_equal [1, 3, 4], ListMixin.find(:all, :conditions => 'parent_id = 5000', :order => 'pos').map(&:id)
+
+    assert_equal 1, ListMixin.find(1).pos
+    assert_equal 2, ListMixin.find(3).pos
+    assert_equal 3, ListMixin.find(4).pos
+
+    ListMixin.find(1).destroy
+
+    assert_equal [3, 4], ListMixin.find(:all, :conditions => 'parent_id = 5000', :order => 'pos').map(&:id)
+
+    assert_equal 1, ListMixin.find(3).pos
+    assert_equal 2, ListMixin.find(4).pos
+  end
+
+end
diff --git a/vendor/plugins/acts_as_tree/README b/vendor/plugins/acts_as_tree/README
new file mode 100644
index 000000000..a6cc6a904
--- /dev/null
+++ b/vendor/plugins/acts_as_tree/README
@@ -0,0 +1,26 @@
+acts_as_tree
+============
+
+Specify this +acts_as+ extension if you want to model a tree structure by providing a parent association and a children
+association. This requires that you have a foreign key column, which by default is called +parent_id+.
+
+  class Category < ActiveRecord::Base
+    acts_as_tree :order => "name"
+  end
+
+  Example:
+  root
+   \_ child1
+        \_ subchild1
+        \_ subchild2
+
+  root      = Category.create("name" => "root")
+  child1    = root.children.create("name" => "child1")
+  subchild1 = child1.children.create("name" => "subchild1")
+
+  root.parent   # => nil
+  child1.parent # => root
+  root.children # => [child1]
+  root.children.first.children.first # => subchild1
+
+Copyright (c) 2007 David Heinemeier Hansson, released under the MIT license  
\ No newline at end of file
diff --git a/vendor/plugins/acts_as_tree/Rakefile b/vendor/plugins/acts_as_tree/Rakefile
new file mode 100644
index 000000000..da091d9dd
--- /dev/null
+++ b/vendor/plugins/acts_as_tree/Rakefile
@@ -0,0 +1,22 @@
+require 'rake'
+require 'rake/testtask'
+require 'rake/rdoctask'
+
+desc 'Default: run unit tests.'
+task :default => :test
+
+desc 'Test acts_as_tree plugin.'
+Rake::TestTask.new(:test) do |t|
+  t.libs << 'lib'
+  t.pattern = 'test/**/*_test.rb'
+  t.verbose = true
+end
+
+desc 'Generate documentation for acts_as_tree plugin.'
+Rake::RDocTask.new(:rdoc) do |rdoc|
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title    = 'acts_as_tree'
+  rdoc.options << '--line-numbers' << '--inline-source'
+  rdoc.rdoc_files.include('README')
+  rdoc.rdoc_files.include('lib/**/*.rb')
+end
diff --git a/vendor/plugins/acts_as_tree/init.rb b/vendor/plugins/acts_as_tree/init.rb
new file mode 100644
index 000000000..0901ddb4a
--- /dev/null
+++ b/vendor/plugins/acts_as_tree/init.rb
@@ -0,0 +1 @@
+ActiveRecord::Base.send :include, ActiveRecord::Acts::Tree
diff --git a/vendor/plugins/acts_as_tree/lib/active_record/acts/tree.rb b/vendor/plugins/acts_as_tree/lib/active_record/acts/tree.rb
new file mode 100644
index 000000000..1f00e90a9
--- /dev/null
+++ b/vendor/plugins/acts_as_tree/lib/active_record/acts/tree.rb
@@ -0,0 +1,96 @@
+module ActiveRecord
+  module Acts
+    module Tree
+      def self.included(base)
+        base.extend(ClassMethods)
+      end
+
+      # Specify this +acts_as+ extension if you want to model a tree structure by providing a parent association and a children
+      # association. This requires that you have a foreign key column, which by default is called +parent_id+.
+      #
+      #   class Category < ActiveRecord::Base
+      #     acts_as_tree :order => "name"
+      #   end
+      #
+      #   Example:
+      #   root
+      #    \_ child1
+      #         \_ subchild1
+      #         \_ subchild2
+      #
+      #   root      = Category.create("name" => "root")
+      #   child1    = root.children.create("name" => "child1")
+      #   subchild1 = child1.children.create("name" => "subchild1")
+      #
+      #   root.parent   # => nil
+      #   child1.parent # => root
+      #   root.children # => [child1]
+      #   root.children.first.children.first # => subchild1
+      #
+      # In addition to the parent and children associations, the following instance methods are added to the class
+      # after calling <tt>acts_as_tree</tt>:
+      # * <tt>siblings</tt> - Returns all the children of the parent, excluding the current node (<tt>[subchild2]</tt> when called on <tt>subchild1</tt>)
+      # * <tt>self_and_siblings</tt> - Returns all the children of the parent, including the current node (<tt>[subchild1, subchild2]</tt> when called on <tt>subchild1</tt>)
+      # * <tt>ancestors</tt> - Returns all the ancestors of the current node (<tt>[child1, root]</tt> when called on <tt>subchild2</tt>)
+      # * <tt>root</tt> - Returns the root of the current node (<tt>root</tt> when called on <tt>subchild2</tt>)
+      module ClassMethods
+        # Configuration options are:
+        #
+        # * <tt>foreign_key</tt> - specifies the column name to use for tracking of the tree (default: +parent_id+)
+        # * <tt>order</tt> - makes it possible to sort the children according to this SQL snippet.
+        # * <tt>counter_cache</tt> - keeps a count in a +children_count+ column if set to +true+ (default: +false+).
+        def acts_as_tree(options = {})
+          configuration = { :foreign_key => "parent_id", :order => nil, :counter_cache => nil }
+          configuration.update(options) if options.is_a?(Hash)
+
+          belongs_to :parent, :class_name => name, :foreign_key => configuration[:foreign_key], :counter_cache => configuration[:counter_cache]
+          has_many :children, :class_name => name, :foreign_key => configuration[:foreign_key], :order => configuration[:order], :dependent => :destroy
+
+          class_eval <<-EOV
+            include ActiveRecord::Acts::Tree::InstanceMethods
+
+            def self.roots
+              find(:all, :conditions => "#{configuration[:foreign_key]} IS NULL", :order => #{configuration[:order].nil? ? "nil" : %Q{"#{configuration[:order]}"}})
+            end
+
+            def self.root
+              find(:first, :conditions => "#{configuration[:foreign_key]} IS NULL", :order => #{configuration[:order].nil? ? "nil" : %Q{"#{configuration[:order]}"}})
+            end
+          EOV
+        end
+      end
+
+      module InstanceMethods
+        # Returns list of ancestors, starting from parent until root.
+        #
+        #   subchild1.ancestors # => [child1, root]
+        def ancestors
+          node, nodes = self, []
+          nodes << node = node.parent while node.parent
+          nodes
+        end
+
+        # Returns the root node of the tree.
+        def root
+          node = self
+          node = node.parent while node.parent
+          node
+        end
+
+        # Returns all siblings of the current node.
+        #
+        #   subchild1.siblings # => [subchild2]
+        def siblings
+          self_and_siblings - [self]
+        end
+
+        # Returns all siblings and a reference to the current node.
+        #
+        #   subchild1.self_and_siblings # => [subchild1, subchild2]
+        def self_and_siblings
+          parent ? parent.children : self.class.roots
+        end
+      end
+    end
+  end
+end
diff --git a/vendor/plugins/acts_as_tree/test/abstract_unit.rb b/vendor/plugins/acts_as_tree/test/abstract_unit.rb
new file mode 100644
index 000000000..e69de29bb
diff --git a/vendor/plugins/acts_as_tree/test/acts_as_tree_test.rb b/vendor/plugins/acts_as_tree/test/acts_as_tree_test.rb
new file mode 100644
index 000000000..018c58e1f
--- /dev/null
+++ b/vendor/plugins/acts_as_tree/test/acts_as_tree_test.rb
@@ -0,0 +1,219 @@
+require 'test/unit'
+
+require 'rubygems'
+require 'active_record'
+
+$:.unshift File.dirname(__FILE__) + '/../lib'
+require File.dirname(__FILE__) + '/../init'
+
+class Test::Unit::TestCase
+  def assert_queries(num = 1)
+    $query_count = 0
+    yield
+  ensure
+    assert_equal num, $query_count, "#{$query_count} instead of #{num} queries were executed."
+  end
+
+  def assert_no_queries(&block)
+    assert_queries(0, &block)
+  end
+end
+
+ActiveRecord::Base.establish_connection(:adapter => "sqlite3", :dbfile => ":memory:")
+
+# AR keeps printing annoying schema statements
+$stdout = StringIO.new
+
+def setup_db
+  ActiveRecord::Base.logger
+  ActiveRecord::Schema.define(:version => 1) do
+    create_table :mixins do |t|
+      t.column :type, :string
+      t.column :parent_id, :integer
+    end
+  end
+end
+
+def teardown_db
+  ActiveRecord::Base.connection.tables.each do |table|
+    ActiveRecord::Base.connection.drop_table(table)
+  end
+end
+
+class Mixin < ActiveRecord::Base
+end
+
+class TreeMixin < Mixin 
+  acts_as_tree :foreign_key => "parent_id", :order => "id"
+end
+
+class TreeMixinWithoutOrder < Mixin
+  acts_as_tree :foreign_key => "parent_id"
+end
+
+class RecursivelyCascadedTreeMixin < Mixin
+  acts_as_tree :foreign_key => "parent_id"
+  has_one :first_child, :class_name => 'RecursivelyCascadedTreeMixin', :foreign_key => :parent_id
+end
+
+class TreeTest < Test::Unit::TestCase
+  
+  def setup
+    setup_db
+    @root1 = TreeMixin.create!
+    @root_child1 = TreeMixin.create! :parent_id => @root1.id
+    @child1_child = TreeMixin.create! :parent_id => @root_child1.id
+    @root_child2 = TreeMixin.create! :parent_id => @root1.id
+    @root2 = TreeMixin.create!
+    @root3 = TreeMixin.create!
+  end
+
+  def teardown
+    teardown_db
+  end
+
+  def test_children
+    assert_equal @root1.children, [@root_child1, @root_child2]
+    assert_equal @root_child1.children, [@child1_child]
+    assert_equal @child1_child.children, []
+    assert_equal @root_child2.children, []
+  end
+
+  def test_parent
+    assert_equal @root_child1.parent, @root1
+    assert_equal @root_child1.parent, @root_child2.parent
+    assert_nil @root1.parent
+  end
+
+  def test_delete
+    assert_equal 6, TreeMixin.count
+    @root1.destroy
+    assert_equal 2, TreeMixin.count
+    @root2.destroy
+    @root3.destroy
+    assert_equal 0, TreeMixin.count
+  end
+
+  def test_insert
+    @extra = @root1.children.create
+
+    assert @extra
+
+    assert_equal @extra.parent, @root1
+
+    assert_equal 3, @root1.children.size
+    assert @root1.children.include?(@extra)
+    assert @root1.children.include?(@root_child1)
+    assert @root1.children.include?(@root_child2)
+  end
+
+  def test_ancestors
+    assert_equal [], @root1.ancestors
+    assert_equal [@root1], @root_child1.ancestors
+    assert_equal [@root_child1, @root1], @child1_child.ancestors
+    assert_equal [@root1], @root_child2.ancestors
+    assert_equal [], @root2.ancestors
+    assert_equal [], @root3.ancestors
+  end
+
+  def test_root
+    assert_equal @root1, TreeMixin.root
+    assert_equal @root1, @root1.root
+    assert_equal @root1, @root_child1.root
+    assert_equal @root1, @child1_child.root
+    assert_equal @root1, @root_child2.root
+    assert_equal @root2, @root2.root
+    assert_equal @root3, @root3.root
+  end
+
+  def test_roots
+    assert_equal [@root1, @root2, @root3], TreeMixin.roots
+  end
+
+  def test_siblings
+    assert_equal [@root2, @root3], @root1.siblings
+    assert_equal [@root_child2], @root_child1.siblings
+    assert_equal [], @child1_child.siblings
+    assert_equal [@root_child1], @root_child2.siblings
+    assert_equal [@root1, @root3], @root2.siblings
+    assert_equal [@root1, @root2], @root3.siblings
+  end
+
+  def test_self_and_siblings
+    assert_equal [@root1, @root2, @root3], @root1.self_and_siblings
+    assert_equal [@root_child1, @root_child2], @root_child1.self_and_siblings
+    assert_equal [@child1_child], @child1_child.self_and_siblings
+    assert_equal [@root_child1, @root_child2], @root_child2.self_and_siblings
+    assert_equal [@root1, @root2, @root3], @root2.self_and_siblings
+    assert_equal [@root1, @root2, @root3], @root3.self_and_siblings
+  end           
+end
+
+class TreeTestWithEagerLoading < Test::Unit::TestCase
+  
+  def setup 
+    teardown_db
+    setup_db
+    @root1 = TreeMixin.create!
+    @root_child1 = TreeMixin.create! :parent_id => @root1.id
+    @child1_child = TreeMixin.create! :parent_id => @root_child1.id
+    @root_child2 = TreeMixin.create! :parent_id => @root1.id
+    @root2 = TreeMixin.create!
+    @root3 = TreeMixin.create!
+    
+    @rc1 = RecursivelyCascadedTreeMixin.create!
+    @rc2 = RecursivelyCascadedTreeMixin.create! :parent_id => @rc1.id 
+    @rc3 = RecursivelyCascadedTreeMixin.create! :parent_id => @rc2.id
+    @rc4 = RecursivelyCascadedTreeMixin.create! :parent_id => @rc3.id
+  end
+
+  def teardown
+    teardown_db
+  end
+    
+  def test_eager_association_loading
+    roots = TreeMixin.find(:all, :include => :children, :conditions => "mixins.parent_id IS NULL", :order => "mixins.id")
+    assert_equal [@root1, @root2, @root3], roots                     
+    assert_no_queries do
+      assert_equal 2, roots[0].children.size
+      assert_equal 0, roots[1].children.size
+      assert_equal 0, roots[2].children.size
+    end   
+  end
+  
+  def test_eager_association_loading_with_recursive_cascading_three_levels_has_many
+    root_node = RecursivelyCascadedTreeMixin.find(:first, :include => { :children => { :children => :children } }, :order => 'mixins.id')
+    assert_equal @rc4, assert_no_queries { root_node.children.first.children.first.children.first }
+  end
+  
+  def test_eager_association_loading_with_recursive_cascading_three_levels_has_one
+    root_node = RecursivelyCascadedTreeMixin.find(:first, :include => { :first_child => { :first_child => :first_child } }, :order => 'mixins.id')
+    assert_equal @rc4, assert_no_queries { root_node.first_child.first_child.first_child }
+  end
+  
+  def test_eager_association_loading_with_recursive_cascading_three_levels_belongs_to
+    leaf_node = RecursivelyCascadedTreeMixin.find(:first, :include => { :parent => { :parent => :parent } }, :order => 'mixins.id DESC')
+    assert_equal @rc1, assert_no_queries { leaf_node.parent.parent.parent }
+  end 
+end
+
+class TreeTestWithoutOrder < Test::Unit::TestCase
+  
+  def setup                               
+    setup_db
+    @root1 = TreeMixinWithoutOrder.create!
+    @root2 = TreeMixinWithoutOrder.create!
+  end
+
+  def teardown
+    teardown_db
+  end
+
+  def test_root
+    assert [@root1, @root2].include?(TreeMixinWithoutOrder.root)
+  end
+  
+  def test_roots
+    assert_equal [], [@root1, @root2] - TreeMixinWithoutOrder.roots
+  end
+end 
diff --git a/vendor/plugins/acts_as_tree/test/database.yml b/vendor/plugins/acts_as_tree/test/database.yml
new file mode 100644
index 000000000..e69de29bb
diff --git a/vendor/plugins/acts_as_tree/test/fixtures/mixin.rb b/vendor/plugins/acts_as_tree/test/fixtures/mixin.rb
new file mode 100644
index 000000000..e69de29bb
diff --git a/vendor/plugins/acts_as_tree/test/fixtures/mixins.yml b/vendor/plugins/acts_as_tree/test/fixtures/mixins.yml
new file mode 100644
index 000000000..e69de29bb
diff --git a/vendor/plugins/acts_as_tree/test/schema.rb b/vendor/plugins/acts_as_tree/test/schema.rb
new file mode 100644
index 000000000..e69de29bb
diff --git a/vendor/plugins/classic_pagination/CHANGELOG b/vendor/plugins/classic_pagination/CHANGELOG
new file mode 100644
index 000000000..d7d11f129
--- /dev/null
+++ b/vendor/plugins/classic_pagination/CHANGELOG
@@ -0,0 +1,152 @@
+* Exported the changelog of Pagination code for historical reference.
+
+* Imported some patches from Rails Trac (others closed as "wontfix"):
+  #8176, #7325, #7028, #4113. Documentation is much cleaner now and there
+  are some new unobtrusive features!
+
+* Extracted Pagination from Rails trunk (r6795)
+
+#
+# ChangeLog for /trunk/actionpack/lib/action_controller/pagination.rb 
+# 
+# Generated by Trac 0.10.3
+# 05/20/07 23:48:02
+#
+
+09/03/06 23:28:54 david [4953]
+	* trunk/actionpack/lib/action_controller/pagination.rb (modified)
+	Docs and deprecation
+
+08/07/06 12:40:14 bitsweat [4715]
+	* trunk/actionpack/lib/action_controller/pagination.rb (modified)
+	Deprecate direct usage of @params. Update ActionView::Base for
+	instance var deprecation.
+
+06/21/06 02:16:11 rick [4476]
+	* trunk/actionpack/lib/action_controller/pagination.rb (modified)
+	Fix indent in pagination documentation. Closes #4990.  [Kevin Clark]
+
+04/25/06 17:42:48 marcel [4268]
+	* trunk/actionpack/lib/action_controller/pagination.rb (modified)
+	Remove all remaining references to @params in the documentation.
+
+03/16/06 06:38:08 rick [3899]
+	* trunk/actionpack/lib/action_view/helpers/pagination_helper.rb (modified)
+	trivial documentation patch for #pagination_links [Francois
+	Beausoleil] closes #4258
+
+02/20/06 03:15:22 david [3620]
+	* trunk/actionpack/lib/action_controller/pagination.rb (modified)
+	* trunk/actionpack/test/activerecord/pagination_test.rb (modified)
+	* trunk/activerecord/CHANGELOG (modified)
+	* trunk/activerecord/lib/active_record/base.rb (modified)
+	* trunk/activerecord/test/base_test.rb (modified)
+	Added :count option to pagination that'll make it possible for the
+	ActiveRecord::Base.count call to using something else than * for the
+	count. Especially important for count queries using DISTINCT #3839
+	[skaes]. Added :select option to Base.count that'll allow you to
+	select something else than * to be counted on. Especially important
+	for count queries using DISTINCT (closes #3839) [skaes].
+
+02/09/06 09:17:40 nzkoz [3553]
+	* trunk/actionpack/lib/action_controller/pagination.rb (modified)
+	* trunk/actionpack/test/active_record_unit.rb (added)
+	* trunk/actionpack/test/activerecord (added)
+	* trunk/actionpack/test/activerecord/active_record_assertions_test.rb (added)
+	* trunk/actionpack/test/activerecord/pagination_test.rb (added)
+	* trunk/actionpack/test/controller/active_record_assertions_test.rb (deleted)
+	* trunk/actionpack/test/fixtures/companies.yml (added)
+	* trunk/actionpack/test/fixtures/company.rb (added)
+	* trunk/actionpack/test/fixtures/db_definitions (added)
+	* trunk/actionpack/test/fixtures/db_definitions/sqlite.sql (added)
+	* trunk/actionpack/test/fixtures/developer.rb (added)
+	* trunk/actionpack/test/fixtures/developers_projects.yml (added)
+	* trunk/actionpack/test/fixtures/developers.yml (added)
+	* trunk/actionpack/test/fixtures/project.rb (added)
+	* trunk/actionpack/test/fixtures/projects.yml (added)
+	* trunk/actionpack/test/fixtures/replies.yml (added)
+	* trunk/actionpack/test/fixtures/reply.rb (added)
+	* trunk/actionpack/test/fixtures/topic.rb (added)
+	* trunk/actionpack/test/fixtures/topics.yml (added)
+	* Fix pagination problems when using include
+	* Introduce Unit Tests for pagination
+	* Allow count to work with :include by using count distinct.
+
+	[Kevin Clark &amp; Jeremy Hopple]
+
+11/05/05 02:10:29 bitsweat [2878]
+	* trunk/actionpack/lib/action_controller/pagination.rb (modified)
+	Update paginator docs.  Closes #2744.
+
+10/16/05 15:42:03 minam [2649]
+	* trunk/actionpack/lib/action_controller/pagination.rb (modified)
+	Update/clean up AP documentation (rdoc)
+
+08/31/05 00:13:10 ulysses [2078]
+	* trunk/actionpack/CHANGELOG (modified)
+	* trunk/actionpack/lib/action_controller/pagination.rb (modified)
+	Add option to specify the singular name used by pagination. Closes
+	#1960
+
+08/23/05 14:24:15 minam [2041]
+	* trunk/actionpack/CHANGELOG (modified)
+	* trunk/actionpack/lib/action_controller/pagination.rb (modified)
+	Add support for :include with pagination (subject to existing
+	constraints for :include with :limit and :offset) #1478
+	[michael@schubert.cx]
+
+07/15/05 20:27:38 david [1839]
+	* trunk/actionpack/lib/action_controller/pagination.rb (modified)
+	* trunk/actionpack/lib/action_view/helpers/pagination_helper.rb (modified)
+	More pagination speed #1334 [Stefan Kaes]
+
+07/14/05 08:02:01 david [1832]
+	* trunk/actionpack/lib/action_controller/pagination.rb (modified)
+	* trunk/actionpack/lib/action_view/helpers/pagination_helper.rb (modified)
+	* trunk/actionpack/test/controller/addresses_render_test.rb (modified)
+	Made pagination faster #1334 [Stefan Kaes]
+
+04/13/05 05:40:22 david [1159]
+	* trunk/actionpack/CHANGELOG (modified)
+	* trunk/actionpack/lib/action_controller/pagination.rb (modified)
+	* trunk/activerecord/lib/active_record/base.rb (modified)
+	Fixed pagination to work with joins #1034 [scott@sigkill.org]
+
+04/02/05 09:11:17 david [1067]
+	* trunk/actionpack/CHANGELOG (modified)
+	* trunk/actionpack/lib/action_controller/pagination.rb (modified)
+	* trunk/actionpack/lib/action_controller/scaffolding.rb (modified)
+	* trunk/actionpack/lib/action_controller/templates/scaffolds/list.rhtml (modified)
+	* trunk/railties/lib/rails_generator/generators/components/scaffold/templates/controller.rb (modified)
+	* trunk/railties/lib/rails_generator/generators/components/scaffold/templates/view_list.rhtml (modified)
+	Added pagination for scaffolding (10 items per page) #964
+	[mortonda@dgrmm.net]
+
+03/31/05 14:46:11 david [1048]
+	* trunk/actionpack/lib/action_view/helpers/pagination_helper.rb (modified)
+	Improved the message display on the exception handler pages #963
+	[Johan Sorensen]
+
+03/27/05 00:04:07 david [1017]
+	* trunk/actionpack/CHANGELOG (modified)
+	* trunk/actionpack/lib/action_view/helpers/pagination_helper.rb (modified)
+	Fixed that pagination_helper would ignore :params #947 [Sebastian
+	Kanthak]
+
+03/22/05 13:09:44 david [976]
+	* trunk/actionpack/lib/action_view/helpers/pagination_helper.rb (modified)
+	Fixed documentation and prepared for 0.11.0 release
+
+03/21/05 14:35:36 david [967]
+	* trunk/actionpack/lib/action_controller/pagination.rb (modified)
+	* trunk/actionpack/lib/action_view/helpers/pagination_helper.rb (modified)
+	Tweaked the documentation
+
+03/20/05 23:12:05 david [949]
+	* trunk/actionpack/CHANGELOG (modified)
+	* trunk/actionpack/lib/action_controller.rb (modified)
+	* trunk/actionpack/lib/action_controller/pagination.rb (added)
+	* trunk/actionpack/lib/action_view/helpers/pagination_helper.rb (added)
+	* trunk/activesupport/lib/active_support/core_ext/kernel.rb (added)
+	Added pagination support through both a controller and helper add-on
+	#817 [Sam Stephenson]
diff --git a/vendor/plugins/classic_pagination/README b/vendor/plugins/classic_pagination/README
new file mode 100644
index 000000000..e94904974
--- /dev/null
+++ b/vendor/plugins/classic_pagination/README
@@ -0,0 +1,18 @@
+Pagination
+==========
+
+To install:
+
+  script/plugin install svn://errtheblog.com/svn/plugins/classic_pagination
+
+This code was extracted from Rails trunk after the release 1.2.3.
+WARNING: this code is dead. It is unmaintained, untested and full of cruft.
+
+There is a much better pagination plugin called will_paginate.
+Install it like this and glance through the README:
+
+  script/plugin install svn://errtheblog.com/svn/plugins/will_paginate
+
+It doesn't have the same API, but is in fact much nicer. You can
+have both plugins installed until you change your controller/view code that
+handles pagination. Then, simply uninstall classic_pagination.
diff --git a/vendor/plugins/classic_pagination/Rakefile b/vendor/plugins/classic_pagination/Rakefile
new file mode 100644
index 000000000..c7e374b56
--- /dev/null
+++ b/vendor/plugins/classic_pagination/Rakefile
@@ -0,0 +1,22 @@
+require 'rake'
+require 'rake/testtask'
+require 'rake/rdoctask'
+
+desc 'Default: run unit tests.'
+task :default => :test
+
+desc 'Test the classic_pagination plugin.'
+Rake::TestTask.new(:test) do |t|
+  t.libs << 'lib'
+  t.pattern = 'test/**/*_test.rb'
+  t.verbose = true
+end
+
+desc 'Generate documentation for the classic_pagination plugin.'
+Rake::RDocTask.new(:rdoc) do |rdoc|
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title    = 'Pagination'
+  rdoc.options << '--line-numbers' << '--inline-source'
+  rdoc.rdoc_files.include('README')
+  rdoc.rdoc_files.include('lib/**/*.rb')
+end
diff --git a/vendor/plugins/classic_pagination/init.rb b/vendor/plugins/classic_pagination/init.rb
new file mode 100644
index 000000000..25e552f2a
--- /dev/null
+++ b/vendor/plugins/classic_pagination/init.rb
@@ -0,0 +1,33 @@
+#--
+# Copyright (c) 2004-2006 David Heinemeier Hansson
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#++
+
+require 'pagination'
+require 'pagination_helper'
+
+ActionController::Base.class_eval do
+  include ActionController::Pagination
+end
+
+ActionView::Base.class_eval do
+  include ActionView::Helpers::PaginationHelper
+end
diff --git a/vendor/plugins/classic_pagination/install.rb b/vendor/plugins/classic_pagination/install.rb
new file mode 100644
index 000000000..adf746f8b
--- /dev/null
+++ b/vendor/plugins/classic_pagination/install.rb
@@ -0,0 +1 @@
+puts "\n\n" + File.read(File.dirname(__FILE__) + '/README')
diff --git a/vendor/plugins/classic_pagination/lib/pagination.rb b/vendor/plugins/classic_pagination/lib/pagination.rb
new file mode 100644
index 000000000..b6e9cf4bc
--- /dev/null
+++ b/vendor/plugins/classic_pagination/lib/pagination.rb
@@ -0,0 +1,405 @@
+module ActionController
+  # === Action Pack pagination for Active Record collections
+  #
+  # The Pagination module aids in the process of paging large collections of
+  # Active Record objects. It offers macro-style automatic fetching of your
+  # model for multiple views, or explicit fetching for single actions. And if
+  # the magic isn't flexible enough for your needs, you can create your own
+  # paginators with a minimal amount of code.
+  #
+  # The Pagination module can handle as much or as little as you wish. In the
+  # controller, have it automatically query your model for pagination; or,
+  # if you prefer, create Paginator objects yourself.
+  #
+  # Pagination is included automatically for all controllers.
+  #
+  # For help rendering pagination links, see 
+  # ActionView::Helpers::PaginationHelper.
+  #
+  # ==== Automatic pagination for every action in a controller
+  #
+  #   class PersonController < ApplicationController   
+  #     model :person
+  #
+  #     paginate :people, :order => 'last_name, first_name',
+  #              :per_page => 20
+  #     
+  #     # ...
+  #   end
+  #
+  # Each action in this controller now has access to a <tt>@people</tt>
+  # instance variable, which is an ordered collection of model objects for the
+  # current page (at most 20, sorted by last name and first name), and a 
+  # <tt>@person_pages</tt> Paginator instance. The current page is determined
+  # by the <tt>params[:page]</tt> variable.
+  #
+  # ==== Pagination for a single action
+  #
+  #   def list
+  #     @person_pages, @people =
+  #       paginate :people, :order => 'last_name, first_name'
+  #   end
+  #
+  # Like the previous example, but explicitly creates <tt>@person_pages</tt>
+  # and <tt>@people</tt> for a single action, and uses the default of 10 items
+  # per page.
+  #
+  # ==== Custom/"classic" pagination 
+  #
+  #   def list
+  #     @person_pages = Paginator.new self, Person.count, 10, params[:page]
+  #     @people = Person.find :all, :order => 'last_name, first_name', 
+  #                           :limit  =>  @person_pages.items_per_page,
+  #                           :offset =>  @person_pages.current.offset
+  #   end
+  # 
+  # Explicitly creates the paginator from the previous example and uses 
+  # Paginator#to_sql to retrieve <tt>@people</tt> from the model.
+  #
+  module Pagination
+    unless const_defined?(:OPTIONS)
+      # A hash holding options for controllers using macro-style pagination
+      OPTIONS = Hash.new
+  
+      # The default options for pagination
+      DEFAULT_OPTIONS = {
+        :class_name => nil,
+        :singular_name => nil,
+        :per_page   => 10,
+        :conditions => nil,
+        :order_by   => nil,
+        :order      => nil,
+        :join       => nil,
+        :joins      => nil,
+        :count      => nil,
+        :include    => nil,
+        :select     => nil,
+        :group      => nil,
+        :parameter  => 'page'
+      }
+    else
+      DEFAULT_OPTIONS[:group] = nil
+    end
+      
+    def self.included(base) #:nodoc:
+      super
+      base.extend(ClassMethods)
+    end
+  
+    def self.validate_options!(collection_id, options, in_action) #:nodoc:
+      options.merge!(DEFAULT_OPTIONS) {|key, old, new| old}
+
+      valid_options = DEFAULT_OPTIONS.keys
+      valid_options << :actions unless in_action
+    
+      unknown_option_keys = options.keys - valid_options
+      raise ActionController::ActionControllerError,
+            "Unknown options: #{unknown_option_keys.join(', ')}" unless
+              unknown_option_keys.empty?
+
+      options[:singular_name] ||= Inflector.singularize(collection_id.to_s)
+      options[:class_name]  ||= Inflector.camelize(options[:singular_name])
+    end
+
+    # Returns a paginator and a collection of Active Record model instances
+    # for the paginator's current page. This is designed to be used in a
+    # single action; to automatically paginate multiple actions, consider
+    # ClassMethods#paginate.
+    #
+    # +options+ are:
+    # <tt>:singular_name</tt>:: the singular name to use, if it can't be inferred by singularizing the collection name
+    # <tt>:class_name</tt>:: the class name to use, if it can't be inferred by
+    #                        camelizing the singular name
+    # <tt>:per_page</tt>::   the maximum number of items to include in a 
+    #                        single page. Defaults to 10
+    # <tt>:conditions</tt>:: optional conditions passed to Model.find(:all, *params) and
+    #                        Model.count
+    # <tt>:order</tt>::      optional order parameter passed to Model.find(:all, *params)
+    # <tt>:order_by</tt>::   (deprecated, used :order) optional order parameter passed to Model.find(:all, *params)
+    # <tt>:joins</tt>::      optional joins parameter passed to Model.find(:all, *params)
+    #                        and Model.count
+    # <tt>:join</tt>::       (deprecated, used :joins or :include) optional join parameter passed to Model.find(:all, *params)
+    #                        and Model.count
+    # <tt>:include</tt>::    optional eager loading parameter passed to Model.find(:all, *params)
+    #                        and Model.count
+    # <tt>:select</tt>::     :select parameter passed to Model.find(:all, *params)
+    #
+    # <tt>:count</tt>::      parameter passed as :select option to Model.count(*params)
+    #
+    # <tt>:group</tt>::     :group parameter passed to Model.find(:all, *params). It forces the use of DISTINCT instead of plain COUNT to come up with the total number of records
+    #
+    def paginate(collection_id, options={})
+      Pagination.validate_options!(collection_id, options, true)
+      paginator_and_collection_for(collection_id, options)
+    end
+
+    # These methods become class methods on any controller 
+    module ClassMethods
+      # Creates a +before_filter+ which automatically paginates an Active
+      # Record model for all actions in a controller (or certain actions if
+      # specified with the <tt>:actions</tt> option).
+      #
+      # +options+ are the same as PaginationHelper#paginate, with the addition 
+      # of:
+      # <tt>:actions</tt>:: an array of actions for which the pagination is
+      #                     active. Defaults to +nil+ (i.e., every action)
+      def paginate(collection_id, options={})
+        Pagination.validate_options!(collection_id, options, false)
+        module_eval do
+          before_filter :create_paginators_and_retrieve_collections
+          OPTIONS[self] ||= Hash.new
+          OPTIONS[self][collection_id] = options
+        end
+      end
+    end
+
+    def create_paginators_and_retrieve_collections #:nodoc:
+      Pagination::OPTIONS[self.class].each do |collection_id, options|
+        next unless options[:actions].include? action_name if
+          options[:actions]
+
+        paginator, collection = 
+          paginator_and_collection_for(collection_id, options)
+
+        paginator_name = "@#{options[:singular_name]}_pages"
+        self.instance_variable_set(paginator_name, paginator)
+
+        collection_name = "@#{collection_id.to_s}"
+        self.instance_variable_set(collection_name, collection)     
+      end
+    end
+  
+    # Returns the total number of items in the collection to be paginated for
+    # the +model+ and given +conditions+. Override this method to implement a
+    # custom counter.
+    def count_collection_for_pagination(model, options)
+      model.count(:conditions => options[:conditions],
+                  :joins => options[:join] || options[:joins],
+                  :include => options[:include],
+                  :select => (options[:group] ? "DISTINCT #{options[:group]}" : options[:count]))
+    end
+    
+    # Returns a collection of items for the given +model+ and +options[conditions]+,
+    # ordered by +options[order]+, for the current page in the given +paginator+.
+    # Override this method to implement a custom finder.
+    def find_collection_for_pagination(model, options, paginator)
+      model.find(:all, :conditions => options[:conditions],
+                 :order => options[:order_by] || options[:order],
+                 :joins => options[:join] || options[:joins], :include => options[:include],
+                 :select => options[:select], :limit => options[:per_page],
+                 :group => options[:group], :offset => paginator.current.offset)
+    end
+  
+    protected :create_paginators_and_retrieve_collections,
+              :count_collection_for_pagination,
+              :find_collection_for_pagination
+
+    def paginator_and_collection_for(collection_id, options) #:nodoc:
+      klass = options[:class_name].constantize
+      page  = params[options[:parameter]]
+      count = count_collection_for_pagination(klass, options)
+      paginator = Paginator.new(self, count, options[:per_page], page)
+      collection = find_collection_for_pagination(klass, options, paginator)
+    
+      return paginator, collection 
+    end
+      
+    private :paginator_and_collection_for
+
+    # A class representing a paginator for an Active Record collection.
+    class Paginator
+      include Enumerable
+
+      # Creates a new Paginator on the given +controller+ for a set of items
+      # of size +item_count+ and having +items_per_page+ items per page.
+      # Raises ArgumentError if items_per_page is out of bounds (i.e., less
+      # than or equal to zero). The page CGI parameter for links defaults to
+      # "page" and can be overridden with +page_parameter+.
+      def initialize(controller, item_count, items_per_page, current_page=1)
+        raise ArgumentError, 'must have at least one item per page' if
+          items_per_page <= 0
+
+        @controller = controller
+        @item_count = item_count || 0
+        @items_per_page = items_per_page
+        @pages = {}
+        
+        self.current_page = current_page
+      end
+      attr_reader :controller, :item_count, :items_per_page
+      
+      # Sets the current page number of this paginator. If +page+ is a Page
+      # object, its +number+ attribute is used as the value; if the page does 
+      # not belong to this Paginator, an ArgumentError is raised.
+      def current_page=(page)
+        if page.is_a? Page
+          raise ArgumentError, 'Page/Paginator mismatch' unless
+            page.paginator == self
+        end
+        page = page.to_i
+        @current_page_number = has_page_number?(page) ? page : 1
+      end
+
+      # Returns a Page object representing this paginator's current page.
+      def current_page
+        @current_page ||= self[@current_page_number]
+      end
+      alias current :current_page
+
+      # Returns a new Page representing the first page in this paginator.
+      def first_page
+        @first_page ||= self[1]
+      end
+      alias first :first_page
+
+      # Returns a new Page representing the last page in this paginator.
+      def last_page
+        @last_page ||= self[page_count] 
+      end
+      alias last :last_page
+
+      # Returns the number of pages in this paginator.
+      def page_count
+        @page_count ||= @item_count.zero? ? 1 :
+                          (q,r=@item_count.divmod(@items_per_page); r==0? q : q+1)
+      end
+
+      alias length :page_count
+
+      # Returns true if this paginator contains the page of index +number+.
+      def has_page_number?(number)
+        number >= 1 and number <= page_count
+      end
+
+      # Returns a new Page representing the page with the given index
+      # +number+.
+      def [](number)
+        @pages[number] ||= Page.new(self, number)
+      end
+
+      # Successively yields all the paginator's pages to the given block.
+      def each(&block)
+        page_count.times do |n|
+          yield self[n+1]
+        end
+      end
+
+      # A class representing a single page in a paginator.
+      class Page
+        include Comparable
+
+        # Creates a new Page for the given +paginator+ with the index
+        # +number+. If +number+ is not in the range of valid page numbers or
+        # is not a number at all, it defaults to 1.
+        def initialize(paginator, number)
+          @paginator = paginator
+          @number = number.to_i
+          @number = 1 unless @paginator.has_page_number? @number
+        end
+        attr_reader :paginator, :number
+        alias to_i :number
+
+        # Compares two Page objects and returns true when they represent the 
+        # same page (i.e., their paginators are the same and they have the
+        # same page number).
+        def ==(page)
+          return false if page.nil?
+          @paginator == page.paginator and 
+            @number == page.number
+        end
+
+        # Compares two Page objects and returns -1 if the left-hand page comes
+        # before the right-hand page, 0 if the pages are equal, and 1 if the
+        # left-hand page comes after the right-hand page. Raises ArgumentError
+        # if the pages do not belong to the same Paginator object.
+        def <=>(page)
+          raise ArgumentError unless @paginator == page.paginator
+          @number <=> page.number
+        end
+
+        # Returns the item offset for the first item in this page.
+        def offset
+          @paginator.items_per_page * (@number - 1)
+        end
+        
+        # Returns the number of the first item displayed.
+        def first_item
+          offset + 1
+        end
+        
+        # Returns the number of the last item displayed.
+        def last_item
+          [@paginator.items_per_page * @number, @paginator.item_count].min
+        end
+
+        # Returns true if this page is the first page in the paginator.
+        def first?
+          self == @paginator.first
+        end
+
+        # Returns true if this page is the last page in the paginator.
+        def last?
+          self == @paginator.last
+        end
+
+        # Returns a new Page object representing the page just before this
+        # page, or nil if this is the first page.
+        def previous
+          if first? then nil else @paginator[@number - 1] end
+        end
+
+        # Returns a new Page object representing the page just after this
+        # page, or nil if this is the last page.
+        def next
+          if last? then nil else @paginator[@number + 1] end
+        end
+
+        # Returns a new Window object for this page with the specified 
+        # +padding+.
+        def window(padding=2)
+          Window.new(self, padding)
+        end
+
+        # Returns the limit/offset array for this page.
+        def to_sql
+          [@paginator.items_per_page, offset]
+        end
+        
+        def to_param #:nodoc:
+          @number.to_s
+        end
+      end
+
+      # A class for representing ranges around a given page.
+      class Window
+        # Creates a new Window object for the given +page+ with the specified
+        # +padding+.
+        def initialize(page, padding=2)
+          @paginator = page.paginator
+          @page = page
+          self.padding = padding
+        end
+        attr_reader :paginator, :page
+
+        # Sets the window's padding (the number of pages on either side of the
+        # window page).
+        def padding=(padding)
+          @padding = padding < 0 ? 0 : padding
+          # Find the beginning and end pages of the window
+          @first = @paginator.has_page_number?(@page.number - @padding) ?
+            @paginator[@page.number - @padding] : @paginator.first
+          @last =  @paginator.has_page_number?(@page.number + @padding) ?
+            @paginator[@page.number + @padding] : @paginator.last
+        end
+        attr_reader :padding, :first, :last
+
+        # Returns an array of Page objects in the current window.
+        def pages
+          (@first.number..@last.number).to_a.collect! {|n| @paginator[n]}
+        end
+        alias to_a :pages
+      end
+    end
+
+  end
+end
diff --git a/vendor/plugins/classic_pagination/lib/pagination_helper.rb b/vendor/plugins/classic_pagination/lib/pagination_helper.rb
new file mode 100644
index 000000000..069d77566
--- /dev/null
+++ b/vendor/plugins/classic_pagination/lib/pagination_helper.rb
@@ -0,0 +1,135 @@
+module ActionView
+  module Helpers
+    # Provides methods for linking to ActionController::Pagination objects using a simple generator API.  You can optionally
+    # also build your links manually using ActionView::Helpers::AssetHelper#link_to like so:
+    #
+    # <%= link_to "Previous page", { :page => paginator.current.previous } if paginator.current.previous %>
+    # <%= link_to "Next page", { :page => paginator.current.next } if paginator.current.next %>
+    module PaginationHelper
+      unless const_defined?(:DEFAULT_OPTIONS)
+        DEFAULT_OPTIONS = {
+          :name => :page,
+          :window_size => 2,
+          :always_show_anchors => true,
+          :link_to_current_page => false,
+          :params => {}
+        }
+      end
+
+      # Creates a basic HTML link bar for the given +paginator+.  Links will be created
+      # for the next and/or previous page and for a number of other pages around the current
+      # pages position. The +html_options+ hash is passed to +link_to+ when the links are created.
+      #
+      # ==== Options
+      # <tt>:name</tt>::                 the routing name for this paginator
+      #                                  (defaults to +page+)
+      # <tt>:prefix</tt>::               prefix for pagination links
+      #                                  (i.e. Older Pages: 1 2 3 4)
+      # <tt>:suffix</tt>::               suffix for pagination links
+      #                                  (i.e. 1 2 3 4 <- Older Pages)
+      # <tt>:window_size</tt>::          the number of pages to show around 
+      #                                  the current page (defaults to <tt>2</tt>)
+      # <tt>:always_show_anchors</tt>::  whether or not the first and last
+      #                                  pages should always be shown
+      #                                  (defaults to +true+)
+      # <tt>:link_to_current_page</tt>:: whether or not the current page
+      #                                  should be linked to (defaults to
+      #                                  +false+)
+      # <tt>:params</tt>::               any additional routing parameters
+      #                                  for page URLs
+      #
+      # ==== Examples
+      #  # We'll assume we have a paginator setup in @person_pages...
+      #
+      #  pagination_links(@person_pages)
+      #  # => 1 <a href="/?page=2/">2</a> <a href="/?page=3/">3</a>  ... <a href="/?page=10/">10</a>
+      #
+      #  pagination_links(@person_pages, :link_to_current_page => true)
+      #  # => <a href="/?page=1/">1</a> <a href="/?page=2/">2</a> <a href="/?page=3/">3</a>  ... <a href="/?page=10/">10</a>
+      #
+      #  pagination_links(@person_pages, :always_show_anchors => false)
+      #  # => 1 <a href="/?page=2/">2</a> <a href="/?page=3/">3</a> 
+      #
+      #  pagination_links(@person_pages, :window_size => 1)
+      #  # => 1 <a href="/?page=2/">2</a>  ... <a href="/?page=10/">10</a>
+      #
+      #  pagination_links(@person_pages, :params => { :viewer => "flash" })
+      #  # => 1 <a href="/?page=2&amp;viewer=flash/">2</a> <a href="/?page=3&amp;viewer=flash/">3</a>  ... 
+      #  #    <a href="/?page=10&amp;viewer=flash/">10</a>
+      def pagination_links(paginator, options={}, html_options={})
+        name = options[:name] || DEFAULT_OPTIONS[:name]
+        params = (options[:params] || DEFAULT_OPTIONS[:params]).clone
+        
+        prefix = options[:prefix] || ''
+        suffix = options[:suffix] || ''
+
+        pagination_links_each(paginator, options, prefix, suffix) do |n|
+          params[name] = n
+          link_to(n.to_s, params, html_options)
+        end
+      end
+
+      # Iterate through the pages of a given +paginator+, invoking a
+      # block for each page number that needs to be rendered as a link.
+      # 
+      # ==== Options
+      # <tt>:window_size</tt>::          the number of pages to show around 
+      #                                  the current page (defaults to +2+)
+      # <tt>:always_show_anchors</tt>::  whether or not the first and last
+      #                                  pages should always be shown
+      #                                  (defaults to +true+)
+      # <tt>:link_to_current_page</tt>:: whether or not the current page
+      #                                  should be linked to (defaults to
+      #                                  +false+)
+      #
+      # ==== Example
+      #  # Turn paginated links into an Ajax call
+      #  pagination_links_each(paginator, page_options) do |link|
+      #    options = { :url => {:action => 'list'}, :update => 'results' }
+      #    html_options = { :href => url_for(:action => 'list') }
+      #
+      #    link_to_remote(link.to_s, options, html_options)
+      #  end
+      def pagination_links_each(paginator, options, prefix = nil, suffix = nil)
+        options = DEFAULT_OPTIONS.merge(options)
+        link_to_current_page = options[:link_to_current_page]
+        always_show_anchors = options[:always_show_anchors]
+
+        current_page = paginator.current_page
+        window_pages = current_page.window(options[:window_size]).pages
+        return if window_pages.length <= 1 unless link_to_current_page
+        
+        first, last = paginator.first, paginator.last
+        
+        html = ''
+
+        html << prefix if prefix
+
+        if always_show_anchors and not (wp_first = window_pages[0]).first?
+          html << yield(first.number)
+          html << ' ... ' if wp_first.number - first.number > 1
+          html << ' '
+        end
+          
+        window_pages.each do |page|
+          if current_page == page && !link_to_current_page
+            html << page.number.to_s
+          else
+            html << yield(page.number)
+          end
+          html << ' '
+        end
+        
+        if always_show_anchors and not (wp_last = window_pages[-1]).last? 
+          html << ' ... ' if last.number - wp_last.number > 1
+          html << yield(last.number)
+        end
+
+        html << suffix if suffix
+
+        html
+      end
+      
+    end # PaginationHelper
+  end # Helpers
+end # ActionView
diff --git a/vendor/plugins/classic_pagination/test/fixtures/companies.yml b/vendor/plugins/classic_pagination/test/fixtures/companies.yml
new file mode 100644
index 000000000..707f72abc
--- /dev/null
+++ b/vendor/plugins/classic_pagination/test/fixtures/companies.yml
@@ -0,0 +1,24 @@
+thirty_seven_signals:
+  id: 1
+  name: 37Signals
+  rating: 4
+
+TextDrive:
+  id: 2
+  name: TextDrive
+  rating: 4
+
+PlanetArgon:
+  id: 3
+  name: Planet Argon
+  rating: 4
+
+Google:
+  id: 4
+  name: Google
+  rating: 4
+  
+Ionist:
+  id: 5
+  name: Ioni.st
+  rating: 4
\ No newline at end of file
diff --git a/vendor/plugins/classic_pagination/test/fixtures/company.rb b/vendor/plugins/classic_pagination/test/fixtures/company.rb
new file mode 100644
index 000000000..0d1c29b90
--- /dev/null
+++ b/vendor/plugins/classic_pagination/test/fixtures/company.rb
@@ -0,0 +1,9 @@
+class Company < ActiveRecord::Base
+  attr_protected :rating
+  set_sequence_name :companies_nonstd_seq
+
+  validates_presence_of :name
+  def validate
+    errors.add('rating', 'rating should not be 2') if rating == 2
+  end  
+end
\ No newline at end of file
diff --git a/vendor/plugins/classic_pagination/test/fixtures/developer.rb b/vendor/plugins/classic_pagination/test/fixtures/developer.rb
new file mode 100644
index 000000000..f5e5b901f
--- /dev/null
+++ b/vendor/plugins/classic_pagination/test/fixtures/developer.rb
@@ -0,0 +1,7 @@
+class Developer < ActiveRecord::Base
+  has_and_belongs_to_many :projects
+end
+
+class DeVeLoPeR < ActiveRecord::Base
+  set_table_name "developers"
+end
diff --git a/vendor/plugins/classic_pagination/test/fixtures/developers.yml b/vendor/plugins/classic_pagination/test/fixtures/developers.yml
new file mode 100644
index 000000000..308bf75de
--- /dev/null
+++ b/vendor/plugins/classic_pagination/test/fixtures/developers.yml
@@ -0,0 +1,21 @@
+david:
+  id: 1
+  name: David
+  salary: 80000
+
+jamis:
+  id: 2
+  name: Jamis
+  salary: 150000
+
+<% for digit in 3..10 %>
+dev_<%= digit %>:
+  id: <%= digit %>
+  name: fixture_<%= digit %>
+  salary: 100000
+<% end %>
+
+poor_jamis:
+  id: 11
+  name: Jamis
+  salary: 9000
\ No newline at end of file
diff --git a/vendor/plugins/classic_pagination/test/fixtures/developers_projects.yml b/vendor/plugins/classic_pagination/test/fixtures/developers_projects.yml
new file mode 100644
index 000000000..cee359c7c
--- /dev/null
+++ b/vendor/plugins/classic_pagination/test/fixtures/developers_projects.yml
@@ -0,0 +1,13 @@
+david_action_controller:
+  developer_id: 1
+  project_id: 2
+  joined_on: 2004-10-10
+
+david_active_record:
+  developer_id: 1
+  project_id: 1
+  joined_on: 2004-10-10
+
+jamis_active_record:
+  developer_id: 2
+  project_id: 1
\ No newline at end of file
diff --git a/vendor/plugins/classic_pagination/test/fixtures/project.rb b/vendor/plugins/classic_pagination/test/fixtures/project.rb
new file mode 100644
index 000000000..2b53d39ed
--- /dev/null
+++ b/vendor/plugins/classic_pagination/test/fixtures/project.rb
@@ -0,0 +1,3 @@
+class Project < ActiveRecord::Base
+  has_and_belongs_to_many :developers, :uniq => true
+end
diff --git a/vendor/plugins/classic_pagination/test/fixtures/projects.yml b/vendor/plugins/classic_pagination/test/fixtures/projects.yml
new file mode 100644
index 000000000..02800c782
--- /dev/null
+++ b/vendor/plugins/classic_pagination/test/fixtures/projects.yml
@@ -0,0 +1,7 @@
+action_controller:
+  id: 2
+  name: Active Controller
+
+active_record:
+  id: 1
+  name: Active Record
diff --git a/vendor/plugins/classic_pagination/test/fixtures/replies.yml b/vendor/plugins/classic_pagination/test/fixtures/replies.yml
new file mode 100644
index 000000000..284c9c079
--- /dev/null
+++ b/vendor/plugins/classic_pagination/test/fixtures/replies.yml
@@ -0,0 +1,13 @@
+witty_retort:
+  id: 1
+  topic_id: 1
+  content: Birdman is better!
+  created_at: <%= 6.hours.ago.to_s(:db) %>
+  updated_at: nil
+  
+another:
+  id: 2
+  topic_id: 2
+  content: Nuh uh!
+  created_at: <%= 1.hour.ago.to_s(:db) %>
+  updated_at: nil
\ No newline at end of file
diff --git a/vendor/plugins/classic_pagination/test/fixtures/reply.rb b/vendor/plugins/classic_pagination/test/fixtures/reply.rb
new file mode 100644
index 000000000..ea84042b9
--- /dev/null
+++ b/vendor/plugins/classic_pagination/test/fixtures/reply.rb
@@ -0,0 +1,5 @@
+class Reply < ActiveRecord::Base
+  belongs_to :topic, :include => [:replies]
+  
+  validates_presence_of :content
+end
diff --git a/vendor/plugins/classic_pagination/test/fixtures/schema.sql b/vendor/plugins/classic_pagination/test/fixtures/schema.sql
new file mode 100644
index 000000000..b4e7539d1
--- /dev/null
+++ b/vendor/plugins/classic_pagination/test/fixtures/schema.sql
@@ -0,0 +1,42 @@
+CREATE TABLE 'companies' (
+  'id' INTEGER PRIMARY KEY NOT NULL,
+  'name' TEXT DEFAULT NULL,
+  'rating' INTEGER DEFAULT 1
+);
+
+CREATE TABLE 'replies' (
+  'id' INTEGER PRIMARY KEY NOT NULL, 
+  'content' text, 
+  'created_at' datetime, 
+  'updated_at' datetime, 
+  'topic_id' integer
+);
+
+CREATE TABLE 'topics' (
+  'id' INTEGER PRIMARY KEY NOT NULL, 
+  'title' varchar(255), 
+  'subtitle' varchar(255), 
+  'content' text, 
+  'created_at' datetime, 
+  'updated_at' datetime
+);
+
+CREATE TABLE 'developers' (
+  'id' INTEGER PRIMARY KEY NOT NULL,
+  'name' TEXT DEFAULT NULL,
+  'salary' INTEGER DEFAULT 70000,
+  'created_at' DATETIME DEFAULT NULL,
+  'updated_at' DATETIME DEFAULT NULL
+);
+
+CREATE TABLE 'projects' (
+  'id' INTEGER PRIMARY KEY NOT NULL,
+  'name' TEXT DEFAULT NULL
+);
+
+CREATE TABLE 'developers_projects' (
+  'developer_id' INTEGER NOT NULL,
+  'project_id' INTEGER NOT NULL,
+  'joined_on' DATE DEFAULT NULL,
+  'access_level' INTEGER DEFAULT 1
+);
diff --git a/vendor/plugins/classic_pagination/test/fixtures/topic.rb b/vendor/plugins/classic_pagination/test/fixtures/topic.rb
new file mode 100644
index 000000000..0beeecf28
--- /dev/null
+++ b/vendor/plugins/classic_pagination/test/fixtures/topic.rb
@@ -0,0 +1,3 @@
+class Topic < ActiveRecord::Base
+  has_many :replies, :include => [:user], :dependent => :destroy
+end
diff --git a/vendor/plugins/classic_pagination/test/fixtures/topics.yml b/vendor/plugins/classic_pagination/test/fixtures/topics.yml
new file mode 100644
index 000000000..61ea02d76
--- /dev/null
+++ b/vendor/plugins/classic_pagination/test/fixtures/topics.yml
@@ -0,0 +1,22 @@
+futurama:
+  id: 1
+  title: Isnt futurama awesome?
+  subtitle: It really is, isnt it.
+  content: I like futurama
+  created_at: <%= 1.day.ago.to_s(:db) %>
+  updated_at:
+  
+harvey_birdman:
+  id: 2
+  title: Harvey Birdman is the king of all men
+  subtitle: yup
+  content: It really is
+  created_at: <%= 2.hours.ago.to_s(:db) %>
+  updated_at:
+
+rails:
+  id: 3
+  title: Rails is nice
+  subtitle: It makes me happy
+  content: except when I have to hack internals to fix pagination. even then really.
+  created_at: <%= 20.minutes.ago.to_s(:db) %>
diff --git a/vendor/plugins/classic_pagination/test/helper.rb b/vendor/plugins/classic_pagination/test/helper.rb
new file mode 100644
index 000000000..3f76d5a76
--- /dev/null
+++ b/vendor/plugins/classic_pagination/test/helper.rb
@@ -0,0 +1,117 @@
+require 'test/unit'
+
+unless defined?(ActiveRecord)
+  plugin_root = File.join(File.dirname(__FILE__), '..')
+
+  # first look for a symlink to a copy of the framework
+  if framework_root = ["#{plugin_root}/rails", "#{plugin_root}/../../rails"].find { |p| File.directory? p }
+    puts "found framework root: #{framework_root}"
+    # this allows for a plugin to be tested outside an app
+    $:.unshift "#{framework_root}/activesupport/lib", "#{framework_root}/activerecord/lib", "#{framework_root}/actionpack/lib"
+  else
+    # is the plugin installed in an application?
+    app_root = plugin_root + '/../../..'
+
+    if File.directory? app_root + '/config'
+      puts 'using config/boot.rb'
+      ENV['RAILS_ENV'] = 'test'
+      require File.expand_path(app_root + '/config/boot')
+    else
+      # simply use installed gems if available
+      puts 'using rubygems'
+      require 'rubygems'
+      gem 'actionpack'; gem 'activerecord'
+    end
+  end
+
+  %w(action_pack active_record action_controller active_record/fixtures action_controller/test_process).each {|f| require f}
+
+  Dependencies.load_paths.unshift "#{plugin_root}/lib"
+end
+
+# Define the connector
+class ActiveRecordTestConnector
+  cattr_accessor :able_to_connect
+  cattr_accessor :connected
+
+  # Set our defaults
+  self.connected = false
+  self.able_to_connect = true
+
+  class << self
+    def setup
+      unless self.connected || !self.able_to_connect
+        setup_connection
+        load_schema
+        require_fixture_models
+        self.connected = true
+      end
+    rescue Exception => e  # errors from ActiveRecord setup
+      $stderr.puts "\nSkipping ActiveRecord assertion tests: #{e}"
+      #$stderr.puts "  #{e.backtrace.join("\n  ")}\n"
+      self.able_to_connect = false
+    end
+
+    private
+
+    def setup_connection
+      if Object.const_defined?(:ActiveRecord)
+        defaults = { :database => ':memory:' }
+        begin
+          options = defaults.merge :adapter => 'sqlite3', :timeout => 500
+          ActiveRecord::Base.establish_connection(options)
+          ActiveRecord::Base.configurations = { 'sqlite3_ar_integration' => options }
+          ActiveRecord::Base.connection
+        rescue Exception  # errors from establishing a connection
+          $stderr.puts 'SQLite 3 unavailable; trying SQLite 2.'
+          options = defaults.merge :adapter => 'sqlite'
+          ActiveRecord::Base.establish_connection(options)
+          ActiveRecord::Base.configurations = { 'sqlite2_ar_integration' => options }
+          ActiveRecord::Base.connection
+        end
+
+        Object.send(:const_set, :QUOTED_TYPE, ActiveRecord::Base.connection.quote_column_name('type')) unless Object.const_defined?(:QUOTED_TYPE)
+      else
+        raise "Can't setup connection since ActiveRecord isn't loaded."
+      end
+    end
+
+    # Load actionpack sqlite tables
+    def load_schema
+      File.read(File.dirname(__FILE__) + "/fixtures/schema.sql").split(';').each do |sql|
+        ActiveRecord::Base.connection.execute(sql) unless sql.blank?
+      end
+    end
+
+    def require_fixture_models
+      Dir.glob(File.dirname(__FILE__) + "/fixtures/*.rb").each {|f| require f}
+    end
+  end
+end
+
+# Test case for inheritance
+class ActiveRecordTestCase < Test::Unit::TestCase
+  # Set our fixture path
+  if ActiveRecordTestConnector.able_to_connect
+    self.fixture_path = "#{File.dirname(__FILE__)}/fixtures/"
+    self.use_transactional_fixtures = false
+  end
+
+  def self.fixtures(*args)
+    super if ActiveRecordTestConnector.connected
+  end
+
+  def run(*args)
+    super if ActiveRecordTestConnector.connected
+  end
+
+  # Default so Test::Unit::TestCase doesn't complain
+  def test_truth
+  end
+end
+
+ActiveRecordTestConnector.setup
+ActionController::Routing::Routes.reload rescue nil
+ActionController::Routing::Routes.draw do |map|
+  map.connect ':controller/:action/:id'
+end
diff --git a/vendor/plugins/classic_pagination/test/pagination_helper_test.rb b/vendor/plugins/classic_pagination/test/pagination_helper_test.rb
new file mode 100644
index 000000000..d8394a793
--- /dev/null
+++ b/vendor/plugins/classic_pagination/test/pagination_helper_test.rb
@@ -0,0 +1,38 @@
+require File.dirname(__FILE__) + '/helper'
+require File.dirname(__FILE__) + '/../init'
+
+class PaginationHelperTest < Test::Unit::TestCase
+  include ActionController::Pagination
+  include ActionView::Helpers::PaginationHelper
+  include ActionView::Helpers::UrlHelper
+  include ActionView::Helpers::TagHelper
+
+  def setup
+    @controller = Class.new do
+      attr_accessor :url, :request
+      def url_for(options, *parameters_for_method_reference)
+        url
+      end
+    end
+    @controller = @controller.new
+    @controller.url = "http://www.example.com"
+  end
+
+  def test_pagination_links
+    total, per_page, page = 30, 10, 1
+    output = pagination_links Paginator.new(@controller, total, per_page, page)
+    assert_equal "1 <a href=\"http://www.example.com\">2</a> <a href=\"http://www.example.com\">3</a> ", output
+  end
+
+  def test_pagination_links_with_prefix
+    total, per_page, page = 30, 10, 1
+    output = pagination_links Paginator.new(@controller, total, per_page, page), :prefix => 'Newer '
+    assert_equal "Newer 1 <a href=\"http://www.example.com\">2</a> <a href=\"http://www.example.com\">3</a> ", output
+  end
+
+  def test_pagination_links_with_suffix
+    total, per_page, page = 30, 10, 1
+    output = pagination_links Paginator.new(@controller, total, per_page, page), :suffix => 'Older'
+    assert_equal "1 <a href=\"http://www.example.com\">2</a> <a href=\"http://www.example.com\">3</a> Older", output
+  end
+end
diff --git a/vendor/plugins/classic_pagination/test/pagination_test.rb b/vendor/plugins/classic_pagination/test/pagination_test.rb
new file mode 100644
index 000000000..16a6f1d84
--- /dev/null
+++ b/vendor/plugins/classic_pagination/test/pagination_test.rb
@@ -0,0 +1,177 @@
+require File.dirname(__FILE__) + '/helper'
+require File.dirname(__FILE__) + '/../init'
+
+class PaginationTest < ActiveRecordTestCase
+  fixtures :topics, :replies, :developers, :projects, :developers_projects
+  
+  class PaginationController < ActionController::Base
+    if respond_to? :view_paths=
+      self.view_paths = [ "#{File.dirname(__FILE__)}/../fixtures/" ]
+    else
+      self.template_root = [ "#{File.dirname(__FILE__)}/../fixtures/" ]
+    end
+    
+    def simple_paginate
+      @topic_pages, @topics = paginate(:topics)
+      render :nothing => true
+    end
+    
+    def paginate_with_per_page
+      @topic_pages, @topics = paginate(:topics, :per_page => 1)
+      render :nothing => true
+    end
+    
+    def paginate_with_order
+      @topic_pages, @topics = paginate(:topics, :order => 'created_at asc')
+      render :nothing => true
+    end
+    
+    def paginate_with_order_by
+      @topic_pages, @topics = paginate(:topics, :order_by => 'created_at asc')
+      render :nothing => true
+    end
+    
+    def paginate_with_include_and_order
+      @topic_pages, @topics = paginate(:topics, :include => :replies, :order => 'replies.created_at asc, topics.created_at asc')
+      render :nothing => true
+    end
+    
+    def paginate_with_conditions
+      @topic_pages, @topics = paginate(:topics, :conditions => ["created_at > ?", 30.minutes.ago])
+      render :nothing => true
+    end
+    
+    def paginate_with_class_name
+      @developer_pages, @developers = paginate(:developers, :class_name => "DeVeLoPeR")
+      render :nothing => true
+    end
+    
+    def paginate_with_singular_name
+      @developer_pages, @developers = paginate()
+      render :nothing => true
+    end
+    
+    def paginate_with_joins
+      @developer_pages, @developers = paginate(:developers, 
+                                             :joins => 'LEFT JOIN developers_projects ON developers.id = developers_projects.developer_id',
+                                             :conditions => 'project_id=1')        
+      render :nothing => true
+    end
+    
+    def paginate_with_join
+      @developer_pages, @developers = paginate(:developers, 
+                                             :join => 'LEFT JOIN developers_projects ON developers.id = developers_projects.developer_id',
+                                             :conditions => 'project_id=1')        
+      render :nothing => true
+    end
+     
+    def paginate_with_join_and_count
+      @developer_pages, @developers = paginate(:developers, 
+                                             :join => 'd LEFT JOIN developers_projects ON d.id = developers_projects.developer_id',
+                                             :conditions => 'project_id=1',
+                                             :count => "d.id")        
+      render :nothing => true
+    end
+
+    def paginate_with_join_and_group
+      @developer_pages, @developers = paginate(:developers, 
+                                             :join => 'INNER JOIN developers_projects ON developers.id = developers_projects.developer_id',
+                                             :group => 'developers.id')
+      render :nothing => true
+    end
+    
+    def rescue_errors(e) raise e end
+
+    def rescue_action(e) raise end
+    
+  end
+  
+  def setup
+    @controller = PaginationController.new
+    @request    = ActionController::TestRequest.new
+    @response   = ActionController::TestResponse.new
+    super
+  end
+
+  # Single Action Pagination Tests
+
+  def test_simple_paginate
+    get :simple_paginate
+    assert_equal 1, assigns(:topic_pages).page_count
+    assert_equal 3, assigns(:topics).size
+  end
+  
+  def test_paginate_with_per_page
+    get :paginate_with_per_page
+    assert_equal 1, assigns(:topics).size
+    assert_equal 3, assigns(:topic_pages).page_count
+  end
+  
+  def test_paginate_with_order
+    get :paginate_with_order
+    expected = [topics(:futurama),
+               topics(:harvey_birdman),
+               topics(:rails)]
+    assert_equal expected, assigns(:topics)
+    assert_equal 1, assigns(:topic_pages).page_count
+  end
+  
+  def test_paginate_with_order_by
+    get :paginate_with_order
+    expected = assigns(:topics)
+    get :paginate_with_order_by
+    assert_equal expected, assigns(:topics)  
+    assert_equal 1, assigns(:topic_pages).page_count    
+  end
+  
+  def test_paginate_with_conditions
+    get :paginate_with_conditions
+    expected = [topics(:rails)]
+    assert_equal expected, assigns(:topics)
+    assert_equal 1, assigns(:topic_pages).page_count
+  end
+  
+  def test_paginate_with_class_name
+    get :paginate_with_class_name
+    
+    assert assigns(:developers).size > 0
+    assert_equal DeVeLoPeR, assigns(:developers).first.class
+  end
+      
+  def test_paginate_with_joins
+    get :paginate_with_joins
+    assert_equal 2, assigns(:developers).size
+    developer_names = assigns(:developers).map { |d| d.name }
+    assert developer_names.include?('David')
+    assert developer_names.include?('Jamis')
+  end
+  
+  def test_paginate_with_join_and_conditions
+    get :paginate_with_joins
+    expected = assigns(:developers)
+    get :paginate_with_join
+    assert_equal expected, assigns(:developers)
+  end
+  
+  def test_paginate_with_join_and_count
+    get :paginate_with_joins
+    expected = assigns(:developers)
+    get :paginate_with_join_and_count
+    assert_equal expected, assigns(:developers)
+  end
+  
+  def test_paginate_with_include_and_order
+    get :paginate_with_include_and_order
+    expected = Topic.find(:all, :include => 'replies', :order => 'replies.created_at asc, topics.created_at asc', :limit => 10)
+    assert_equal expected, assigns(:topics)
+  end
+
+  def test_paginate_with_join_and_group
+    get :paginate_with_join_and_group
+    assert_equal 2, assigns(:developers).size
+    assert_equal 2, assigns(:developer_pages).item_count
+    developer_names = assigns(:developers).map { |d| d.name }
+    assert developer_names.include?('David')
+    assert developer_names.include?('Jamis')
+  end
+end

From c00b8fd12e12820b827721e36984f1172362ebd9 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Mon, 10 Dec 2007 18:39:57 +0000
Subject: [PATCH 054/710] Doc and version changes for 0.6.1 release.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@976 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 doc/CHANGELOG          | 59 ++++++++++++++++++++++++++++++++++++++++++
 doc/INSTALL            |  2 +-
 doc/UPGRADING          |  1 -
 lib/redmine/version.rb |  2 +-
 4 files changed, 61 insertions(+), 3 deletions(-)

diff --git a/doc/CHANGELOG b/doc/CHANGELOG
index 1d7e0f6a0..f5614f6f9 100644
--- a/doc/CHANGELOG
+++ b/doc/CHANGELOG
@@ -5,6 +5,65 @@ Copyright (C) 2006-2007  Jean-Philippe Lang
 http://www.redmine.org/
 
 
+== 2007-12-10 v0.6.1
+
+* Rails 2.0 compatibility
+* Custom fields can now be displayed as columns on the issue list
+* Added version details view (accessible from the roadmap)
+* Roadmap: more accurate completion percentage calculation (done ratio of open issues is now taken into account)
+* Added per-project tracker selection. Trackers can be selected on project settings
+* Anonymous users can now be allowed to create, edit, comment issues, comment news and post messages in the forums
+* Forums: messages can now be edited/deleted (explicit permissions need to be given)
+* Forums: topics can be locked so that no reply can be added
+* Forums: topics can be marked as sticky so that they always appear at the top of the list
+* Forums: attachments can now be added to replies
+* Added time zone support
+* Added a setting to choose the account activation strategy (available in application settings)
+* Added 'Classic' theme (inspired from the v0.51 design)
+* Added an alternate theme which provides issue list colorization based on issues priority
+* Added Bazaar SCM adapter
+* Added Annotate/Blame view in the repository browser (except for Darcs SCM)
+* Diff style (inline or side by side) automatically saved as a user preference
+* Added issues status changes on the activity view (by Cyril Mougel)
+* Added forums topics on the activity view (disabled by default)
+* Added an option on 'My account' for users who don�t want to be notified of changes that they make
+* Trac importer now supports mysql and postgresql databases
+* Trac importer improvements (by Mat Trudel)
+* 'fixed version' field can now be displayed on the issue list
+* Added a couple of new formats for the 'date format' setting
+* Added Traditional Chinese translation (by Shortie Lo)
+* Added Russian translation (iGor kMeta)
+* Project name format limitation removed (name can now contain any character)
+* Project identifier maximum length changed from 12 to 20
+* Changed the maximum length of LDAP account to 255 characters
+* Removed the 12 characters limit on passwords
+* Added wiki macros support
+* Performance improvement on workflow setup screen
+* More detailed html title on several views
+* Custom fields can now be reordered
+* Search engine: search can be restricted to an exact phrase by using quotation marks
+* Added custom fields marked as 'For all projects' to the csv export of the cross project issue list
+* Email notifications are now sent as Blind carbon copy by default
+* Fixed: all members (including non active) should be deleted when deleting a project
+* Fixed: Error on wiki syntax link (accessible from wiki/edit)
+* Fixed: 'quick jump to a revision' form on the revisions list
+* Fixed: error on admin/info if there's more than 1 plugin installed
+* Fixed: svn or ldap password can be found in clear text in the html source in editing mode
+* Fixed: 'Assigned to' drop down list is not sorted
+* Fixed: 'View all issues' link doesn't work on issues/show
+* Fixed: error on account/register when validation fails
+* Fixed: Error when displaying the issue list if a float custom field is marked as 'used as filter'
+* Fixed: Mercurial adapter breaks on missing :files entry in changeset hash (James Britt)
+* Fixed: Wrong feed URLs on the home page
+* Fixed: Update of time entry fails when the issue has been moved to an other project
+* Fixed: Error when moving an issue without changing its tracker (Postgresql)
+* Fixed: Changes not recorded when using :pserver string (CVS adapter)
+* Fixed: admin should be able to move issues to any project
+* Fixed: adding an attachment is not possible when changing the status of an issue
+* Fixed: No mime-types in documents/files downloading
+* Fixed: error when sorting the messages if there�s only one board for the project
+* Fixed: 'me' doesn't appear in the drop down filters on a project issue list.
+
 == 2007-11-04 v0.6.0
 
 * Permission model refactoring.
diff --git a/doc/INSTALL b/doc/INSTALL
index 4da5daef9..5eb4d5c68 100644
--- a/doc/INSTALL
+++ b/doc/INSTALL
@@ -7,7 +7,7 @@ http://www.redmine.org/
 
 == Requirements
 
-* Ruby on Rails 1.2.2 or higher (this release won't work with Rails 2.0)
+* Ruby on Rails 1.2.5 or 2.0.1
 * A database (see compatibility below)
 
 Optional:
diff --git a/doc/UPGRADING b/doc/UPGRADING
index 5ccffedf7..7cd085fa7 100644
--- a/doc/UPGRADING
+++ b/doc/UPGRADING
@@ -21,7 +21,6 @@ http://www.redmine.org/
 6. Copy the RAILS_ROOT/files directory content into your new installation
 
 Note 1: Rails 1.2.2 or higher is required for version 0.4.2 and later.
-This release won't work with Rails 2.0
 
 Note 2: when upgrading your code with svn update, don't forget to clear
 the application cache (RAILS_ROOT/tmp/cache) before restarting.
diff --git a/lib/redmine/version.rb b/lib/redmine/version.rb
index f09287e7c..dd0f4f82c 100644
--- a/lib/redmine/version.rb
+++ b/lib/redmine/version.rb
@@ -4,7 +4,7 @@ module Redmine
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 6
-    TINY  = 0
+    TINY  = 1
 
     def self.revision
       revision = nil

From 7e9c454478797cfaa4f5590188980ca045c9d5e5 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Mon, 10 Dec 2007 20:58:24 +0000
Subject: [PATCH 055/710] Fixed: 'LDAP account password is too long' error when
 leaving the field empty on creation.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@977 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/models/auth_source.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/models/auth_source.rb b/app/models/auth_source.rb
index 2f651ade5..47c121a13 100644
--- a/app/models/auth_source.rb
+++ b/app/models/auth_source.rb
@@ -20,7 +20,8 @@ class AuthSource < ActiveRecord::Base
   
   validates_presence_of :name
   validates_uniqueness_of :name
-  validates_length_of :name, :host, :account_password, :maximum => 60
+  validates_length_of :name, :host, :maximum => 60
+  validates_length_of :account_password, :maximum => 60, :allow_nil => true
   validates_length_of :account, :base_dn, :maximum => 255
   validates_length_of :attr_login, :attr_firstname, :attr_lastname, :attr_mail, :maximum => 30
 

From e29539df9c2b8f31b46ac20a7fb8337a5b4bc4de Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Wed, 12 Dec 2007 20:45:32 +0000
Subject: [PATCH 056/710] Fixed: 'assigned to me' filter broken.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@979 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/models/query.rb | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/app/models/query.rb b/app/models/query.rb
index 4133abd88..ded8be770 100644
--- a/app/models/query.rb
+++ b/app/models/query.rb
@@ -54,7 +54,6 @@ class Query < ActiveRecord::Base
   serialize :column_names
   
   attr_protected :project, :user
-  attr_accessor :executed_by
   
   validates_presence_of :name, :on => :save
   validates_length_of :name, :maximum => 255
@@ -112,8 +111,7 @@ class Query < ActiveRecord::Base
   def initialize(attributes = nil)
     super attributes
     self.filters ||= { 'status_id' => {:operator => "o", :values => [""]} }
-    @executed_by = User.current.logged? ? User.current : nil
-    set_language_if_valid(executed_by.language) if executed_by
+    set_language_if_valid(User.current.language)
   end
   
   def validate
@@ -145,12 +143,12 @@ class Query < ActiveRecord::Base
                            "done_ratio" =>  { :type => :integer, :order => 13 }}                          
     
     user_values = []
-    user_values << ["<< #{l(:label_me)} >>", "me"] if executed_by
+    user_values << ["<< #{l(:label_me)} >>", "me"] if User.current.logged?
     if project
       user_values += project.users.sort.collect{|s| [s.name, s.id.to_s] }
-    elsif executed_by
+    else
       # members of the user's projects
-      user_values += executed_by.projects.collect(&:users).flatten.uniq.sort.collect{|s| [s.name, s.id.to_s] }
+      user_values += User.current.projects.collect(&:users).flatten.uniq.sort.collect{|s| [s.name, s.id.to_s] }
     end
     @available_filters["assigned_to_id"] = { :type => :list_optional, :order => 4, :values => user_values } unless user_values.empty?
     @available_filters["author_id"] = { :type => :list, :order => 5, :values => user_values } unless user_values.empty?
@@ -267,7 +265,7 @@ class Query < ActiveRecord::Base
     elsif project
       clause << "#{Issue.table_name}.project_id=%d" % project.id
     else
-      clause << Project.visible_by(executed_by)
+      clause << Project.visible_by(User.current)
     end
     
     # filters clauses
@@ -292,7 +290,7 @@ class Query < ActiveRecord::Base
       
       # "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")
+        v.push(User.current.logged? ? User.current.id.to_s : "0") if v.delete("me")
       end
       
       case operator_for field

From 3539bef96b06d12248ef9d164be1e0fe0b536181 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Wed, 12 Dec 2007 20:49:02 +0000
Subject: [PATCH 057/710] Updated Chinese translation (Shortie Lo).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@980 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 lang/zh-tw.yml | 66 +++++++++++++++++++++++++-------------------------
 1 file changed, 33 insertions(+), 33 deletions(-)

diff --git a/lang/zh-tw.yml b/lang/zh-tw.yml
index 7d9cdc957..af0fd3ed4 100644
--- a/lang/zh-tw.yml
+++ b/lang/zh-tw.yml
@@ -5,8 +5,8 @@ actionview_datehelper_select_month_names: 一月,二月,三月,四月,五月,六
 actionview_datehelper_select_month_names_abbr: 一月,二月,三月,四月,五月,六月,七月,八月,九月,十月,十一月,十二月
 actionview_datehelper_select_month_prefix:
 actionview_datehelper_select_year_prefix:
-actionview_datehelper_time_in_words_day: 1 日
-actionview_datehelper_time_in_words_day_plural: %d 日
+actionview_datehelper_time_in_words_day: 1 天
+actionview_datehelper_time_in_words_day_plural: %d 天
 actionview_datehelper_time_in_words_hour_about: 約 1 小時
 actionview_datehelper_time_in_words_hour_about_plural: 約 %d 小時
 actionview_datehelper_time_in_words_hour_about_single: 約 1 小時
@@ -46,10 +46,10 @@ general_text_No: 'No'
 general_text_Yes: 'Yes'
 general_text_no: 'no'
 general_text_yes: 'yes'
-general_lang_name: 'Traditional Chinese (繁體中文)'
+general_lang_name: 'Chinese (繁體中文)'
 general_csv_separator: ','
-general_csv_encoding: ISO-8859-1
-general_pdf_encoding: big5
+general_csv_encoding: Big5
+general_pdf_encoding: Big5
 general_day_names: 星期一,星期二,星期三,星期四,星期五,星期六,星期日
 general_first_day_of_week: '7'
 
@@ -62,9 +62,9 @@ notice_account_unknown_email: Unknown user.
 notice_can_t_change_password: This account uses an external authentication source. Impossible to change the password.
 notice_account_lost_email_sent: An email with instructions to choose a new password has been sent to you.
 notice_account_activated: Your account has been activated. You can now log in.
-notice_successful_create: Successful creation.
-notice_successful_update: Successful update.
-notice_successful_delete: Successful deletion.
+notice_successful_create: 建立成功
+notice_successful_update: 更新成功
+notice_successful_delete: 刪除成功
 notice_successful_connection: Successful connection.
 notice_file_not_found: The page you were trying to access doesn't exist or has been removed.
 notice_locking_conflict: Data have been updated by another user.
@@ -122,7 +122,7 @@ field_subject: 主旨
 field_due_date: 完成日期
 field_assigned_to: 分派給
 field_priority: 重要性
-field_fixed_version: Fixed version
+field_fixed_version: 版本
 field_user: 用戶
 field_role: 角色
 field_homepage: 網站首頁
@@ -151,21 +151,21 @@ field_attr_lastname: Lastname attribute
 field_attr_mail: Email attribute
 field_onthefly: On-the-fly user creation
 field_start_date: 開始日期
-field_done_ratio: %% 已完成
+field_done_ratio: 完成百分比
 field_auth_source: 認證模式
 field_hide_mail: 隱藏我的電子郵件
 field_comments: 註解
 field_url: URL
-field_start_page: Start page
+field_start_page: 首頁
 field_subproject: 子專案
 field_hours: 小時
-field_activity: Activity
+field_activity: 活動
 field_spent_on: 日期
 field_identifier: 代碼
 field_is_filter: Used as a filter
 field_issue_to_id: Related issue
 field_delay: 逾期
-field_assignable: Issues can be assigned to this role
+field_assignable: 項目可被分派至此角色
 field_redirect_existing_links: Redirect existing links
 field_estimated_hours: 預估工時
 field_column_names: Columns
@@ -304,9 +304,9 @@ label_open_issues: 進行中
 label_open_issues_plural: 進行中
 label_closed_issues: 已結束
 label_closed_issues_plural: 已結束
-label_total: Total
+label_total: 總計
 label_permissions: 權限
-label_current_status: Current status
+label_current_status: 目前狀態
 label_new_statuses_allowed: New statuses allowed
 label_all: 全部
 label_none: 空值
@@ -314,11 +314,11 @@ label_nobody: nobody
 label_next: Next
 label_previous: Previous
 label_used_by: Used by
-label_details: Details
+label_details: 明細
 label_add_note: 加入一個新筆記
 label_per_page: 每頁
 label_calendar: 日曆
-label_months_from: months from
+label_months_from: 個月, 開始月份
 label_gantt: 甘特圖
 label_internal: Internal
 label_last_changes: 最近 %d 個變更
@@ -360,7 +360,7 @@ label_latest_revision: 最新版次
 label_latest_revision_plural: 最近版次清單
 label_view_revisions: 檢視版次清單
 label_max_size: 最大長度
-label_on: 'on'
+label_on: 總共
 label_sort_highest: 移動至開頭
 label_sort_higher: 往上移動
 label_sort_lower: 往下移動
@@ -368,7 +368,7 @@ label_sort_lowest: 移動至結尾
 label_roadmap: 版本藍圖
 label_roadmap_due_in: 倒數天數： 
 label_roadmap_overdue: %s 逾期
-label_roadmap_no_issues: No issues for this version
+label_roadmap_no_issues: 此版本尚未包含任何項目
 label_search: 搜尋
 label_result_plural: 結果
 label_all_words: All words
@@ -382,13 +382,13 @@ label_index_by_date: 依日期索引
 label_current_version: 現行版本
 label_preview: 預覽
 label_feed_plural: Feeds
-label_changes_details: Details of all changes
+label_changes_details: 所有變更的明細
 label_issue_tracking: 項目追蹤
 label_spent_time: 耗用時間
-label_f_hour: %.2f hour
-label_f_hour_plural: %.2f hours
+label_f_hour: %.2f 小時
+label_f_hour_plural: %.2f 小時
 label_time_tracking: Time tracking
-label_change_plural: Changes
+label_change_plural: 變更
 label_statistics: Statistics
 label_commits_per_month: Commits per month
 label_commits_per_author: Commits per author
@@ -405,11 +405,11 @@ label_loading: 載入中...
 label_relation_new: 建立新關聯
 label_relation_delete: 刪除關聯
 label_relates_to: 關聯至
-label_duplicates: duplicates
-label_blocks: blocks
-label_blocked_by: blocked by
-label_precedes: precedes
-label_follows: follows
+label_duplicates: 已重複
+label_blocks: 阻擋
+label_blocked_by: 被阻擋
+label_precedes: 優先於
+label_follows: 跟隨於
 label_end_to_start: end to start
 label_end_to_end: end to end
 label_start_to_start: start to start
@@ -501,9 +501,9 @@ text_regexp_info: eg. ^[A-Z0-9]+$
 text_min_max_length_info: 0 means no restriction
 text_project_destroy_confirmation: Are you sure you want to delete this project and all related data ?
 text_workflow_edit: Select a role and a tracker to edit the workflow
-text_are_you_sure: Are you sure ?
-text_journal_changed: changed from %s to %s
-text_journal_set_to: set to %s
+text_are_you_sure: 確定執行？
+text_journal_changed: 從 %s 變更為 %s
+text_journal_set_to: 設定為 %s
 text_journal_deleted: deleted
 text_tip_task_begin_day: task beginning this day
 text_tip_task_end_day: task ending this day
@@ -541,8 +541,8 @@ default_doc_category_tech: 技術文件
 default_priority_low: 低
 default_priority_normal: 正常
 default_priority_high: 高
-default_priority_urgent: 急
-default_priority_immediate: 特急
+default_priority_urgent: 速
+default_priority_immediate: 急
 default_activity_design: 設計
 default_activity_development: 開發
 

From 76ed8cc200c5a0ddcb5484efd53f31f577c9e2f6 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Wed, 12 Dec 2007 20:56:22 +0000
Subject: [PATCH 058/710] Added some functional tests (projects and
 repositories).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@981 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 test/fixtures/repositories.yml                |  6 +-
 test/functional/projects_controller_test.rb   | 57 +++++++++++-
 .../repositories_controller_test.rb           | 18 ++++
 ...repositories_subversion_controller_test.rb | 91 +++++++++++++++++++
 test/unit/repository_bazaar_test.rb           |  2 +-
 test/unit/repository_subversion_test.rb       |  2 +-
 6 files changed, 171 insertions(+), 5 deletions(-)
 create mode 100644 test/functional/repositories_subversion_controller_test.rb

diff --git a/test/fixtures/repositories.yml b/test/fixtures/repositories.yml
index 46afed245..d86e301c9 100644
--- a/test/fixtures/repositories.yml
+++ b/test/fixtures/repositories.yml
@@ -1,11 +1,12 @@
 --- 
 repositories_001: 
   project_id: 1
-  url: svn://localhost/test
+  url: file:///<%= RAILS_ROOT.gsub(%r{config\/\.\.}, '') %>/tmp/test/subversion_repository
   id: 10
-  root_url: svn://localhost
+  root_url: file:///<%= RAILS_ROOT.gsub(%r{config\/\.\.}, '') %>/tmp/test/subversion_repository
   password: ""
   login: ""
+  type: Subversion
 repositories_002: 
   project_id: 2
   url: svn://localhost/test
@@ -13,3 +14,4 @@ repositories_002:
   root_url: svn://localhost
   password: ""
   login: ""
+  type: Subversion
diff --git a/test/functional/projects_controller_test.rb b/test/functional/projects_controller_test.rb
index d98e0d97b..52c33ddd7 100644
--- a/test/functional/projects_controller_test.rb
+++ b/test/functional/projects_controller_test.rb
@@ -22,7 +22,7 @@ require 'projects_controller'
 class ProjectsController; def rescue_action(e) raise e end; end
 
 class ProjectsControllerTest < Test::Unit::TestCase
-  fixtures :projects, :users, :roles, :members, :issues, :journals, :journal_details, :trackers, :projects_trackers, :issue_statuses, :enabled_modules, :enumerations
+  fixtures :projects, :versions, :users, :roles, :members, :issues, :journals, :journal_details, :trackers, :projects_trackers, :issue_statuses, :enabled_modules, :enumerations
 
   def setup
     @controller = ProjectsController.new
@@ -41,6 +41,10 @@ class ProjectsControllerTest < Test::Unit::TestCase
     assert_response :success
     assert_template 'list'
     assert_not_nil assigns(:project_tree)
+    # Root project as hash key
+    assert assigns(:project_tree).has_key?(Project.find(1))
+    # Subproject in corresponding value
+    assert assigns(:project_tree)[Project.find(1)].include?(Project.find(3))
   end
   
   def test_show
@@ -86,6 +90,21 @@ class ProjectsControllerTest < Test::Unit::TestCase
     assert_response :success
     assert_template 'roadmap'
     assert_not_nil assigns(:versions)
+    # Version with no date set appears
+    assert assigns(:versions).include?(Version.find(3))
+    # Completed version doesn't appear
+    assert !assigns(:versions).include?(Version.find(1))
+  end
+  
+  def test_roadmap_with_completed_versions
+    get :roadmap, :id => 1, :completed => 1
+    assert_response :success
+    assert_template 'roadmap'
+    assert_not_nil assigns(:versions)
+    # Version with no date set appears
+    assert assigns(:versions).include?(Version.find(3))
+    # Completed version appears
+    assert assigns(:versions).include?(Version.find(1))
   end
 
   def test_activity
@@ -120,6 +139,42 @@ class ProjectsControllerTest < Test::Unit::TestCase
                }
   end
   
+  def test_calendar
+    get :calendar, :id => 1
+    assert_response :success
+    assert_template 'calendar'
+    assert_not_nil assigns(:calendar)
+  end
+
+  def test_calendar_with_subprojects
+    get :calendar, :id => 1, :with_subprojects => 1, :tracker_ids => [1, 2]
+    assert_response :success
+    assert_template 'calendar'
+    assert_not_nil assigns(:calendar)
+  end
+
+  def test_gantt
+    get :gantt, :id => 1
+    assert_response :success
+    assert_template 'gantt.rhtml'
+    assert_not_nil assigns(:events)
+  end
+
+  def test_gantt_with_subprojects
+    get :gantt, :id => 1, :with_subprojects => 1, :tracker_ids => [1, 2]
+    assert_response :success
+    assert_template 'gantt.rhtml'
+    assert_not_nil assigns(:events)
+  end
+  
+  def test_gantt_export_to_pdf
+    get :gantt, :id => 1, :format => 'pdf'
+    assert_response :success
+    assert_template 'gantt.rfpdf'
+    assert_equal 'application/pdf', @response.content_type
+    assert_not_nil assigns(:events)
+  end
+  
   def test_archive    
     @request.session[:user_id] = 1 # admin
     post :archive, :id => 1
diff --git a/test/functional/repositories_controller_test.rb b/test/functional/repositories_controller_test.rb
index d5ccc660d..2f0459505 100644
--- a/test/functional/repositories_controller_test.rb
+++ b/test/functional/repositories_controller_test.rb
@@ -31,6 +31,13 @@ class RepositoriesControllerTest < Test::Unit::TestCase
     User.current = nil
   end
   
+  def test_revisions
+    get :revisions, :id => 1
+    assert_response :success
+    assert_template 'revisions'
+    assert_not_nil assigns(:changesets)
+  end
+  
   def test_revision_with_before_nil_and_afer_normal
     get :revision, {:id => 1, :rev => 1}
     assert_response :success
@@ -43,4 +50,15 @@ class RepositoriesControllerTest < Test::Unit::TestCase
     }
   end
 
+  def test_graph_commits_per_month
+    get :graph, :id => 1, :graph => 'commits_per_month'
+    assert_response :success
+    assert_equal 'image/svg+xml', @response.content_type
+  end
+  
+  def test_graph_commits_per_author
+    get :graph, :id => 1, :graph => 'commits_per_author'
+    assert_response :success
+    assert_equal 'image/svg+xml', @response.content_type
+  end
 end
diff --git a/test/functional/repositories_subversion_controller_test.rb b/test/functional/repositories_subversion_controller_test.rb
new file mode 100644
index 000000000..9cc7048df
--- /dev/null
+++ b/test/functional/repositories_subversion_controller_test.rb
@@ -0,0 +1,91 @@
+# 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 File.dirname(__FILE__) + '/../test_helper'
+require 'repositories_controller'
+
+# Re-raise errors caught by the controller.
+class RepositoriesController; def rescue_action(e) raise e end; end
+
+class RepositoriesControllerTest < Test::Unit::TestCase
+  fixtures :projects, :users, :roles, :members, :repositories, :issues, :issue_statuses, :changesets, :changes, :issue_categories, :enumerations, :custom_fields, :custom_values, :trackers
+
+  # No '..' in the repository path for svn
+  REPOSITORY_PATH = RAILS_ROOT.gsub(%r{config\/\.\.}, '') + '/tmp/test/subversion_repository'
+
+  def setup
+    @controller = RepositoriesController.new
+    @request    = ActionController::TestRequest.new
+    @response   = ActionController::TestResponse.new
+    User.current = nil
+  end
+
+  if File.directory?(REPOSITORY_PATH)
+    def test_show
+      get :show, :id => 1
+      assert_response :success
+      assert_template 'show'
+      assert_not_nil assigns(:entries)
+      assert_not_nil assigns(:changesets)
+    end
+    
+    def test_browse_root
+      get :browse, :id => 1
+      assert_response :success
+      assert_template 'browse'
+      assert_not_nil assigns(:entries)
+      entry = assigns(:entries).detect {|e| e.name == 'subversion_test'}
+      assert_equal 'dir', entry.kind
+    end
+    
+    def test_browse_directory
+      get :browse, :id => 1, :path => ['subversion_test']
+      assert_response :success
+      assert_template 'browse'
+      assert_not_nil assigns(:entries)
+      entry = assigns(:entries).detect {|e| e.name == 'helloworld.c'}
+      assert_equal 'file', entry.kind
+      assert_equal 'subversion_test/helloworld.c', entry.path
+    end
+  
+    def test_entry
+      get :entry, :id => 1, :path => ['subversion_test', 'helloworld.c']
+      assert_response :success
+      assert_template 'entry'
+    end
+  
+    def test_entry_download
+      get :entry, :id => 1, :path => ['subversion_test', 'helloworld.c'], :format => 'raw'
+      assert_response :success
+    end
+    
+    def test_diff
+      get :diff, :id => 1, :rev => 3
+      assert_response :success
+      assert_template 'diff'
+    end
+    
+    def test_annotate
+      get :annotate, :id => 1, :path => ['subversion_test', 'helloworld.c']
+      assert_response :success
+      assert_template 'annotate'
+    end
+  else
+    puts "Subversion test repository NOT FOUND. Skipping functional tests !!!"
+    def test_fake; assert true end
+  end
+end
diff --git a/test/unit/repository_bazaar_test.rb b/test/unit/repository_bazaar_test.rb
index 68a1ef5e3..22a190990 100644
--- a/test/unit/repository_bazaar_test.rb
+++ b/test/unit/repository_bazaar_test.rb
@@ -81,7 +81,7 @@ class RepositoryBazaarTest < Test::Unit::TestCase
       assert_equal 'mkdir', annotate.lines[0]
     end
   else
-    puts "Bazaar test repository NOT FOUND. Skipping tests !!!"
+    puts "Bazaar test repository NOT FOUND. Skipping unit tests !!!"
     def test_fake; assert true end
   end
 end
diff --git a/test/unit/repository_subversion_test.rb b/test/unit/repository_subversion_test.rb
index 592eb4ffa..879feece8 100644
--- a/test/unit/repository_subversion_test.rb
+++ b/test/unit/repository_subversion_test.rb
@@ -49,7 +49,7 @@ class RepositorySubversionTest < Test::Unit::TestCase
       assert_equal 8, @repository.changesets.count
     end
   else
-    puts "Subversion test repository NOT FOUND. Skipping tests !!!"
+    puts "Subversion test repository NOT FOUND. Skipping unit tests !!!"
     def test_fake; assert true end
   end
 end

From d5cc40c9b6b70b45efbe7ca284203274ccf1b53a Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Wed, 12 Dec 2007 21:03:36 +0000
Subject: [PATCH 059/710] Fixed: calendar and gantt broken with Rails 2.0

git-svn-id: http://redmine.rubyforge.org/svn/trunk@982 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/models/project.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/models/project.rb b/app/models/project.rb
index 70b1eccd1..84eeefee4 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -79,7 +79,8 @@ class Project < ActiveRecord::Base
       conditions = ["#{Issue.table_name}.project_id IN (#{ids.join(',')})"]
     end
     conditions ||= ["#{Issue.table_name}.project_id = ?", id]
-    Issue.with_scope :find => { :conditions => conditions } do 
+    # Quick and dirty fix for Rails 2 compatibility
+    Issue.send(:with_scope, :find => { :conditions => conditions }) do 
       yield
     end 
   end

From bd8eded6702add06ae55cc960fe3b9cc378a9fd9 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Wed, 12 Dec 2007 21:10:04 +0000
Subject: [PATCH 060/710] Fixed: 500 error when validation fails on issue
 edition with no custom fields.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@983 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/issues_controller.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index 081d8f895..901e1432b 100644
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -91,6 +91,7 @@ class IssuesController < ApplicationController
 
   def edit
     @priorities = Enumeration::get_values('IPRI')
+    @custom_values = []
     if request.get?
       @custom_values = @project.custom_fields_for_issues(@issue.tracker).collect { |x| @issue.custom_values.find_by_custom_field_id(x.id) || CustomValue.new(:custom_field => x, :customized => @issue) }
     else

From 63ef594033da88cf0e18839f706d86e353f3bd5b Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Wed, 12 Dec 2007 22:22:33 +0000
Subject: [PATCH 061/710] Added some functional tests (issues).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@984 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 test/functional/issues_controller_test.rb | 67 +++++++++++++++++++++++
 test/unit/repository_bazaar_test.rb       |  2 +-
 2 files changed, 68 insertions(+), 1 deletion(-)

diff --git a/test/functional/issues_controller_test.rb b/test/functional/issues_controller_test.rb
index 484ebc62b..b9d232bfd 100644
--- a/test/functional/issues_controller_test.rb
+++ b/test/functional/issues_controller_test.rb
@@ -83,4 +83,71 @@ class IssuesControllerTest < Test::Unit::TestCase
     assert_not_nil assigns(:changes)
     assert_equal 'application/atom+xml', @response.content_type
   end
+  
+  def test_show
+    get :show, :id => 1
+    assert_response :success
+    assert_template 'show.rhtml'
+    assert_not_nil assigns(:issue)
+  end
+  
+  def test_get_edit
+    @request.session[:user_id] = 2
+    get :edit, :id => 1
+    assert_response :success
+    assert_template 'edit'
+    assert_not_nil assigns(:issue)
+    assert_equal Issue.find(1), assigns(:issue)
+  end
+
+  def test_post_edit
+    @request.session[:user_id] = 2
+    post :edit, :id => 1, :issue => {:subject => 'Modified subject'}
+    assert_redirected_to 'issues/show/1'
+    assert_equal 'Modified subject', Issue.find(1).subject
+  end
+  
+  def test_post_change_status
+    issue = Issue.find(1)
+    assert_equal 1, issue.status_id
+    @request.session[:user_id] = 2
+    post :change_status, :id => 1,
+                         :new_status_id => 2,
+                         :issue => { :assigned_to_id => 3 },
+                         :notes => 'Assigned to dlopper',
+                         :confirm => 1
+    assert_redirected_to 'issues/show/1'
+    issue.reload
+    assert_equal 2, issue.status_id
+    j = issue.journals.find(:first, :order => 'created_on DESC')
+    assert_equal 'Assigned to dlopper', j.notes
+    assert_equal 2, j.details.size
+  end
+  
+  def test_context_menu
+    @request.session[:user_id] = 2
+    get :context_menu, :id => 1
+    assert_response :success
+    assert_template 'context_menu'
+  end
+  
+  def test_destroy
+    @request.session[:user_id] = 2
+    post :destroy, :id => 1
+    assert_redirected_to 'projects/1/issues'
+    assert_nil Issue.find_by_id(1)
+  end
+
+  def test_destroy_attachment
+    issue = Issue.find(3)
+    a = issue.attachments.size
+    @request.session[:user_id] = 2
+    post :destroy_attachment, :id => 3, :attachment_id => 1
+    assert_redirected_to 'issues/show/3'
+    assert_nil Attachment.find_by_id(1)
+    issue.reload
+    assert_equal((a-1), issue.attachments.size)
+    j = issue.journals.find(:first, :order => 'created_on DESC')
+    assert_equal 'attachment', j.details.first.property
+  end
 end
diff --git a/test/unit/repository_bazaar_test.rb b/test/unit/repository_bazaar_test.rb
index 22a190990..6b21607bc 100644
--- a/test/unit/repository_bazaar_test.rb
+++ b/test/unit/repository_bazaar_test.rb
@@ -21,7 +21,7 @@ class RepositoryBazaarTest < Test::Unit::TestCase
   fixtures :projects
   
   # No '..' in the repository path
-  REPOSITORY_PATH = RAILS_ROOT.gsub(%r{config\/\.\.}, '') + 'tmp/test/bazaar_repository'
+  REPOSITORY_PATH = RAILS_ROOT.gsub(%r{config\/\.\.}, '') + '/tmp/test/bazaar_repository'
   
   def setup
     @project = Project.find(1)

From ab4ff48abc9b2402c2dc24805fd0d56b871fa5fe Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Wed, 12 Dec 2007 22:23:34 +0000
Subject: [PATCH 062/710] Added /coverage and /vendor/rails to svn-ignore.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@985 e93f8b46-1217-0410-a6f0-8f06a7374b81

From 86d756d22d6c191920970165d2dc40d1e823351d Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Wed, 12 Dec 2007 22:57:20 +0000
Subject: [PATCH 063/710] News comments are now textilized.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@986 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/news/show.rhtml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/views/news/show.rhtml b/app/views/news/show.rhtml
index e4d7da4db..2b71c48ad 100644
--- a/app/views/news/show.rhtml
+++ b/app/views/news/show.rhtml
@@ -30,16 +30,17 @@
     <div class="contextual">
         <%= link_to_if_authorized l(:button_delete), {:controller => 'news', :action => 'destroy_comment', :id => @news, :comment_id => comment}, :confirm => l(:text_are_you_sure), :method => :post, :class => 'icon icon-del' %>
     </div>
-    <%= simple_format(auto_link(h(comment.comments)))%>
+    <%= textilizable(comment.comments) %>
 <% end if @news.comments_count > 0 %>
 </div>
 
 <% if authorize_for 'news', 'add_comment' %>
 <p><%= toggle_link l(:label_comment_add), "add_comment_form", :focus => "comment_comments" %></p>
 <% form_tag({:action => 'add_comment', :id => @news}, :id => "add_comment_form", :style => "display:none;") do %>
-<%= text_area 'comment', 'comments', :cols => 60, :rows => 6 %>
+<%= text_area 'comment', 'comments', :cols => 80, :rows => 15, :class => 'wiki-edit' %>
+<%= wikitoolbar_for 'comment_comments' %>
 <p><%= submit_tag l(:button_add) %></p>
 <% end %>
 <% end %>
 
-<% set_html_title h(@news.title) -%>
+<% set_html_title(h(@news.title)) -%>

From 48949f979a7d132ccbbc2239cd9e4ecf35fdeef5 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Thu, 13 Dec 2007 18:52:09 +0000
Subject: [PATCH 064/710] Added some functional tests and a CVS test
 repository.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@987 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/admin_controller.rb           |   2 +-
 doc/RUNNING_TESTS                             |   4 +
 .../repositories/cvs_repository.tar.gz        | Bin 0 -> 12248 bytes
 test/fixtures/roles.yml                       |   2 +
 test/functional/account_controller_test.rb    |  73 ++++++++++++++++++
 test/functional/admin_controller_test.rb      |  61 +++++++++++++++
 test/functional/issues_controller_test.rb     |  12 ++-
 test/functional/messages_controller_test.rb   |  50 ++++++++++++
 test/functional/my_controller_test.rb         |   2 +-
 ...repositories_subversion_controller_test.rb |   2 +-
 test/functional/users_controller_test.rb      |  62 +++++++++++++++
 test/functional/versions_controller_test.rb   |  31 ++++++++
 test/functional/welcome_controller_test.rb    |  49 ++++++++++++
 test/unit/repository_cvs_test.rb              |  60 ++++++++++++++
 14 files changed, 406 insertions(+), 4 deletions(-)
 create mode 100644 test/fixtures/repositories/cvs_repository.tar.gz
 create mode 100644 test/functional/account_controller_test.rb
 create mode 100644 test/functional/admin_controller_test.rb
 create mode 100644 test/functional/users_controller_test.rb
 create mode 100644 test/functional/welcome_controller_test.rb
 create mode 100644 test/unit/repository_cvs_test.rb

diff --git a/app/controllers/admin_controller.rb b/app/controllers/admin_controller.rb
index 58d6115ee..5ad3d696b 100644
--- a/app/controllers/admin_controller.rb
+++ b/app/controllers/admin_controller.rb
@@ -48,7 +48,7 @@ class AdminController < ApplicationController
   def mail_options
     @notifiables = %w(issue_added issue_updated news_added document_added file_added message_posted)
     if request.post?
-      settings = (params[:settings] || {}).dup
+      settings = (params[:settings] || {}).dup.symbolize_keys
       settings[:notified_events] ||= []
       settings.each { |name, value| Setting[name] = value }
       flash[:notice] = l(:notice_successful_update)
diff --git a/doc/RUNNING_TESTS b/doc/RUNNING_TESTS
index bd72ac71a..eb8787d95 100644
--- a/doc/RUNNING_TESTS
+++ b/doc/RUNNING_TESTS
@@ -8,6 +8,10 @@ Subversion
 svnadmin create tmp/test/subversion_repository
 gunzip < test/fixtures/repositories/subversion_repository.dump.gz | svnadmin load tmp/test/subversion_repository
 
+CVS
+---
+gunzip < test/fixtures/repositories/cvs_repository.tar.gz | tar -xv -C tmp/test
+
 Bazaar
 ------
 gunzip < test/fixtures/repositories/bazaar_repository.tar.gz | tar -xv -C tmp/test
\ No newline at end of file
diff --git a/test/fixtures/repositories/cvs_repository.tar.gz b/test/fixtures/repositories/cvs_repository.tar.gz
new file mode 100644
index 0000000000000000000000000000000000000000..638b166b5e8ef53821313bb1e3f4e5ecb4637377
GIT binary patch
literal 12248
zcmZA71yfy3v@Ys}yM*BG65I(MT!L$mpuydJ;qDNETX1&>?(QzZ-Q8i$n{V%Ps&1Ws
zFspm?nB#rA$)XSuEBuV4K`16}&IV3D9PFJfUF@AaSzL^qK<E0N&TCS2Q(fvBoqgEO
zGOLu9i95Bmnj01*pRaYlxsB9)?4te=)E_Sa3#|uA9@oD_@YsC0XAcV6Qb<jq`g%S{
z`T6nA1!yfUF81E-y5AeVuk603#pry(m*pxuchmKuVACjuXpmVgJg78o*r{7{Q&`>q
z*11KQd86-0lQR)v6QtNOIA$JQdi;BBfk(1xdqTSeT%Z2>HI-xVLmt7p0#IpN54;z#
zYPh}MlufUP{H$(;S?O>a3b1|dNwJ+TThJ`$2EVVJhw1=kw<R0?_x2<Uga+YOv{ZVD
z7tb$Xnkslz?A>yGY@xA~-W#~_2nJ}ar`?(1duXH7A{^~1ljR*LFX1<u)~b&lRkrfC
zV;$AxebY|4$Ww?FM6&l!y-xj0=~eSxG$nNcn4zrDpNUtba&I(qu__Q==j#PUFtN&V
z5G{r=oA#BfQAbbl#To1naMhiySDKDwz6AM`_VGzfIfrShfw*1ur;;GUu3yKFqsE3<
z7eFL0uC4aH4T38J>&i3w*L%}7#A;r>=PGG6jIr_AhhE0?zMDt#nM|o%MvgpIMb><=
zM1~q8EGM<XJzs^EhzNVcA!S#mn}&u^E-Oc)(p`W8#-qy4YZr}9sLd?<m|b<WuXn-8
zMQb0$IQjij*uyK^fi5F{_<Qw3*WbSToGu`bo~dchxw)v8=C$j){ntyttWAIH5nxH&
z0Jg1)-MdzIjQ2)34ox^77-uvaVg3@g=LwdJAl5*S{c%iKj@UW+6+dlwnA%Wi6lKC(
zQ=R(F&|BM6GF)xDMe%ua);YunBc^q`sCQ5*d+jlr!rm|66~>+P(*1;59Zq2K2y~cu
z5SclU^j?d0N50u-;k)B7Zo*`$;g`FtN45;59uO1q7h0I$O~c)g&$q0GDq+_F44poK
z#bxx-o%&*rRvQ!b1<B@^{EX@<_`;ttbk*x(nO**=KHXv>Wgd0#^GApR6US%k>0Dkn
zu|;t`X;4?F-AhZiuoKDvzQ%_MeWPoeEdg4mb5aMN$3<zs5P_$RD!wnmhy0p&rsD1T
z!~#{^Q^7v0Z6@3i+IFz}Qt--Q+1MwBGBo@d2rI@7&Z3gal-n<&;$9GR*8t!N2%(f1
zUQSbeo05~n04y=+zt(OzV4*5arXfzMK!0NYF@?V-lc25eLEtII0M&dHKgJ*L_8?8A
zlT(T#56uiS&5))jSgK7bS~cgP=n-|I{J56|Dj?sY&w<vfY_8$-7O@2`6Pl7#<!$?H
z<hcB{+*pRWWkH_4k%^KEOx>nAC3hdfuPi7e!a9qOHYIJG`p3G3vageyR!>M1reg+^
zGCd=HGC?$#_W64^DdMZP(dVDVaY?wt;9~Q8PD_)BH-tQcj1*wOEf#Q3?8IXILB7$E
z>2E`n9UIgmd@=4G+ZK0b2%F>-RAIdpYdg21m1yvkO!C-xD1uMW2|o3r-3}<p|2XvS
zgyAm4?Qjuj`c#~0C}kDsISyOM3W2TYrR>@1;jN*Lwe%=zIe^x7Y!6H_xA#|8+5$vm
zgZ2!TV@Dky{9rY%v@3jRs{N_lX$f6HbLx#BkK)xqd>D&&idCwxX>53X5E??^+LEwB
zlw>{;ke1Sq_<DZue(dCaOoNh2%+91zffCq7C_*QZB3BR9nZEx+3spt`V6P4_-;Jhd
z(9*ExZ|G)3(m`Rrh_sC!2%gUK+R~>WLe+eMZKqDqbx4-~kG5DYK`aXu&Rh^WrX2`N
zb#wJ2vm%w-@5TEUgfRh62NMsBnn{G|LfGv)aNtPTUqOmc+sohn9`5&VXCqV9-vuGp
zE5|hNrft5tl)C;8$4^qc<WR%L@YX~Q%yQ@)Sup~_4NxwJG7-?P-GK~$@{#j+a?0B7
zMfb5TWb#!}G)Ps8U5gcW*27(2ReJ-|;x8Kz>VU>O|HXTdGVMhaj96SWHTpFk3{tGw
zQD_~;yRhb=yO1?D8yl^jEE~pP8J7qsW|<OZ!@b58+6uu<RcltP2catd-bj)oI2=B-
z+DbAQUedu8RW&KE6Glh9+m({7st`Y}<X7%ZXBb0Km25m#k$-6f^E>tdoW`bx1&9}Q
zk1`9}oQPMTJ5-oiNd_n7E=k<UA6|&tz@OEQ$^C4uo8QT>n=Z}_0}M4Dsu40*d@xC8
z4Z=|W=;s5SH(s&Nzx^|k`Gj%Hy@4P*E*$%TJ96eMped=RP0N<rfVky%yn_cM!hY7J
zggIbeojs8=SPX5zAKMHsx6PtLMnb&*{lY6Je8tr;NCio#*P$hntVC5iV8?j81F;HC
zKPej1N_^KqUZ8YdM0=U2kMv_~!wdR!eCat^sZq!l4mQ7t%#mr;g+QOFp+32zs4OQx
zkHWy&9~w`iHEoo8JnqC}4Sse-0sZH@RbeuIyehJ2gMpO0W6b+-6wfF#d|=cUt>D-T
z0O8J(2!?%*aWul8?<av7eMH!X@AHZmr28urWrgxO^obs`RD$$3UEv#w4BnbQ1z|%b
zQbR|Dh-~T0xCfA`Ab3bEKUp}ZMM<1NNO)Pf?Sbe7)ivl_b~jCGomMaw3*&Bar{V~M
z%<;oNjd=LuYHW#F6MX!gVOsGB>ciLQ0y!C`ELl-+{D-4XvI|v~XvqWav>I*4@*7_~
zzWS*hNi-O^7zwm7f1lBVZtUR~e7iX{jJpV;wA4)Bfbs8RpQv4qcH3%AblDiOx}m>;
za%sm*4{%}mWU?6*_LcX-mLJNs7A&Y@2w!YarJK|T1wk$KTE_+773xw}d=>pc9FFwa
z8+{5h?4pQmil)b3$G`J^m(^4XB2vb}9R83zq}sxCiW&4h#S>O$QBe{uS74GXD-oGG
zWP~!=2J!Ux<Bf{8G0Q+wZe5#615JGlEQ4ASjjq88w9!?#%(tPYFGl8(p=hakdJ;V-
zcy5z57IA)7hF!+#)xi2wGpW^cc9$)Y{9Tt$<w~Y7P^#tpZcisG>mU{+RgHi@iJ*Rz
z+9ZY^jld7@1U_g?k#@`N|EAzckG~h(J1*TR#t*7vr0RAi-Ovz63TO5GtJbNgl`zPF
zP&ZpGx`AH1AG?pgvF9+FiPWK)Jl4mbD!lE9`P;T%@#pfPc*markyQQZFDPAQb{}2=
zp=X9VnjHtB(l8L`3BL|$gj2P$A*|OfqlsajD2|}%DV>w^OL{#*2sFp*0tW_4$n~(q
zx&z|vc{&UES_I40+1bqyC-KhiA?t<%<W!6T>9u!N07Nan^YT(e-FbduM4^SgO=9s?
z6t{^9us(wir~i4Rp6>{s^Cn-2;RL_v)>RLzT=l;uAKZY+e}6>>I<-fEIKqj=hWF}?
zs)IK$o@^FSx}X^bKIxy*`dTR?MX7oeRlsMWY1%k`g3l!I<;QMcBLx%mVt!nkCcg#|
z^t>E#$$*VeEeyARPH36O%m<wlQv;H;{y4%?MjPY-c2NYi`Y&{3ex}_GnJO-`U@avV
z#i=Qg7th!e!wOI0!!mPwu2I<&`b71Vsco*Cd$eq6Xyls;^oHSw{C=oH6s|&FtIX>f
z7*lsqgbRy|#>~FNvad8;7e#e#ewYUcqd;1+Ym_LyCPumcz;s~fej*O#2;Wky_i1uC
z`OKn{6k#39w>tuh{!oT<i!!y8^qqm*sCwf%{tnfXVQtG}ua`6#5)qKAtXe-DCGx6~
zRcH8*8lxDSYK!B5x)v4X+n-GmF;NkN3HlBDAuIwWWY$QG3BI{Ou$9*gO!tXQ=GV8j
zE?U!TQKez4F$yG&H`uS+ZTYMuXQXG_6!fu+hye{tWX^|}g>o=%+!}+XLwy0EgH##|
zIAm9IerR_3@IyWp`X4uEyY8{jxa{;K1<><Hbqe8w%TRM9K3pjjqHh{^x#B+M$KH*D
zNh#JOiu_IOl;pf-9i?QBHG_79@K+8h9&39n)sRJ9j)mscG#QPEXx1YVFFH?xAiEZ^
zW|jDG<nI^VI0HMiHRC2<$U3j%;3(Hkme+goJnrcC+wT3%2hB3DNe-CG;s)ClvvPEF
z%ySNQM3m76MMJ(d)XoEpz7XB1_b#`j_-79+C_H)~`vFINJTZ;&n}nk^t|%F6GMXMI
ze<d7T_MO4oclv>4K&aOa#ZUDGTp|pNi>m!#Qf;fb^k-4=x+}S_la#4YZXp)P4+rC_
z)KE_|IJR|@{OtR!Tx4=$wxX{bzz@T$_$%Rd3?v9$n)B(yIO{f?l*mu8pooa|Ln#)m
zqG{e0^#0Ems5D2eHp!>@5*i!z^a27cBRpiSZ7xYTS^ShS5Y(OJ`tt1$`rkPQSwhq@
zF$fgM@k3WuA3~MYc`(U@F6}@JqKm$m^)AT0#>iVgVNWQo3n<WE&Wsi2=oT&DcUFCc
z=BI63koTjEHlvu%8e{sybEJl@^hyZ(ZIlM;RKDuwpoWbQ>wj3tIa@&V$IkuMUFD$3
zDhPv&cthJxe&25h0|OI4_lY!V#^!6m>m9r~9)?a9OZFIn*E41s`N3k2K+>{`uq&~{
zB&69V_Fs(oUG4*EnPQpvBk#{vKp3)Slx6wI$PtB3R7>U`>o4>$2%Eo*1Eq`h`lSXf
zS&D3$ka-F77e`aD&-nfa_Fl0z-oy^#Jjr2dANT061*9Q=r3w5?*>pxAK(S(jI*BJ`
z1t2<4eyb*Fbb9WJD!?bNez3X4c!&2Qb9POvX)f7>iRyQ5LuVMIuCiP4H%gau+NLJ3
z%-5E3oTSYU;h~&8)Vk{VzT;oHyeYSs&!Co2XoHvQSIW8Y!!2J@iZWA%UaA$56u~8J
z%x#49I;J{qd&KpNXL8S{WEr-iO1XXsbHbEm8r}<TB9pb$U-wtfW;FUUsNT`4Q6d;!
z_GHM^bk0qQ5xA_Hh-5=Pw|PAXo6*U%Pf)mj2MNbI>30Y;eTc9Dt{Y1hK-wD1bIoRR
zkOQ)5qgnh6F8@CD{4aCt{L38DOW<h)Sa)AmWy8u6j-$%;zH&bpc=zu2Y3QL6HphSq
z;cwoJ!U+a!t-Exj&m_26xHsVCg-cFlsDH~-7K073*IN4wY)VF6gLTfa0lId3dM$ex
zx0+Tg=!`-4gg?)#&ul*nt=oh*&=IGF5BchdHo2&#2&Fu!42<_Lge7ieBc_z_n}3Q4
zMm0;r?}C<xE5&!<pCBInxZvxTfq~h@hnZ~=QMI{4ro8?Dj@9@>UiMPsLXT9GDm{mF
zn4X`-UuVUh$?((kK>7#3LPg;opmG7UWnd=(E<D@@ufKCHQ!kdF2$u5N*nNVIC9r|-
z*a$@pH0vw3lHb}Ii6b%c5%nJZZ>`zW<l;}Eon|KdB_{3lN`%|t!xa+pKHgxg6TRT2
zGy9pQb=CerU5_z@tEI|lrGfMKAzO(uRr6UW0ufgp>9D|qB9&Fj9)a9M9jy$JOGF=U
zb2dSW?V+Ic_BRzZ)4i=~)1JrZY?~zxP!xBxbm!&VMXRG*!FXrgyMpqbj`_Lbc>eB(
zM<ea=5_Paf!q0tD1&`0sd<e?Oi*OmT)+Friw5}1{2kUqGz2*$tHT@}P6TT^(QLjuP
z1_vKZoig7J`$kZ%$+8Y@|84UtxZEwd4&ZeHfUE+1$nS;hAdn-1l8H!UwErs<wfzw*
zieX@FKa|EJXbOyxga@Db7Eb<){15COA}mv3Ak4m=9bkO~Dit>YTORA@=S#)J1Hh_r
z?f`5!TwnRhNDK;wg7p~?36yc{UBrJ<^C!7kiO4s@SHtyoiy%P%k_j578wkx`&@Pbt
zeA2l%s|H`&O8}!;5JzBR65SMX6>W4613z1P!x^e~v!8ewE7vJ#^zYntRCWD+-E8y{
z@&(#{<^Y$}4A0e?-hNl+B*p9IoRsxHoVIxroGfmoKjbj53Bnnf{fVL6R$HCYY-jBJ
z@T&Efpj@XL@>?G3=)?H8yUYV<3OvM|PZRq<KyCRG8JgjPB?O#&3+Pi101H;E=#V&b
zPa-KuT&zj&Z+v46dCHnoWov__D^=sOx0_RbzYkf1H{Y1ni`iaiT&c^2BX2%-s(wLe
zm}&0M?G#q!-Ypd57Ybc{vZ<3e9Kbe@L=TjA;fT&*A1+%c+(Bc?=0fsYXA;2@OxX6^
zs~(B_DYyUl=JOVtYFaAlC!C!VcX+t_Ei<nA+D87)6vZy+ts~{HaWW&KfTHs?7+=Eo
zl_w<&Xdt}5dj|VK>XQntz%8qmX#P1gxu_=(j81rK=OzxG8@=1x!r$}J=|d52RF?;^
z^;W~bKMSxKS4dFkR*0|Ulw6D3knHux6p|s4OO2q_HJ2i#BCNiASgz}n7BNDh9=MkM
z;HtlVe>G4v*<#T273WhWw)eCNwLbPnGYn4J-e4lObIx=mgUR976RAeOo+&5o(yd3#
zf<t_4KKajmP7N2`-B12Zu6*r^T4W*Xa!QT4YfOcboN{dIEIrjn3JgqyacqiT)O>;i
z^R$!j?_kK>!sD`HAFhP@SqS!W&#X}|`=Ep<Bf?2`{dxmK>c!Ht7?N&(m-wr33G9#~
zD<qyliF8m9pp}mPCRC?I)iE~qh~Ef?8W{#%ZP28Np}lgH5G#^YGL%XOn0wrK!DFiH
z!86uVcd^8W5`kCoW^Cwly#pjhXl2Fp+8aM6`o@^g>|EyI<YgJ-i`!kuTX1HJW?Vy7
zO1*j{yRai4uL+Rc*Huurr^gDO0x>A<B+E!2e!XIDMXE?x->1a=j{o<QiS!x0geob@
z5s-P`j#Zu^=Ep`3YKAgegbJISS1J3PB9x+aS(r%cCdtk<PfMExBmTt!ufz?<9(r&=
z+HKIr!aTs?U>HC(0BD{!Ew~oFfaXQ3e`6&c0~p{11MVXb)^!_M6Zr@5IXw<gyTCX4
z2q?~iOzLJnsap+sOa1CD#~kv8m@fC=D__xdj)odUngqhEZ+R$vOnHJZUcX;&Y>;Aa
z{?<a2`CYEL_EV=rRiJEM=dP=Z6vao+3<T@#=XFixBSzGUZGI^|<ZUCJ0=dqHQBJqo
z!u4NC)sf+Xc)k~K9=+XVxtkiGK@d1D(`GL(e1Z3DD^lv`jmK_3=(`0~$M~*Il-$vd
z%X$;%Zw`MtsyTKY*Xml%`1I0yX4rPm(7J~G|EP3CX|It^_ZM$y=g6iH0rlSRz6?Ol
zJ;d7%SWy|>1a}P`B7t?Rr6CY+zvZN2jak*_uEvLEJqWLE=_6qE{GPL3;9UgR!a8$&
z`MegCxsPv-)8X{FcLaIMG|YZ6gtx-O4#keApQrpwhHJuvRd*<SHdMt3^aAyln2T>_
z@n&igA1{Y_Jj~SioQG^aI`4PQ)pH<0?gvz#F~q>DkTnZlr`LbI&CBm?AC?cea;YGV
z8~Ro4cpE)`t}6^B$*P>F+gp5wZM6<&<M1KF5FH`K)JXOzh5UuPcvcc-D5Uj}R#fKM
zRyy(hNh*MFME`hVfx{T9<#2O`hIxYY2GHGq_4p52q*%Rf{~61`>;ja-(QBR+o#(ic
z|80`dPL^IFq7xHK=({|ZkFg4dJl=3BnC-~RnIkB3;hE9hB^Ki*Ge5xd<k;N{j>Ic4
z?}#d)0@i6u^=a;EhRWFPhUY$gGML1Paw^*Wx;gIQJ|W@%vWiq(mZ&=ZN@v9V(D%RW
z!}qBhHi!1-SN%ectud!w??L-nf-UUr2-<X=lbPh15GA(f_zb%KnseX1lFO>>9HHmu
zg{UDBVS$c<oass^p<o#Qq|Ur{gnaMsFjbPWXhrpoVc)Zd9BQy6*8<?woFs9?Y=t$X
zm*%L3+`K6GPv&LYiE8Z(<b2NIZ?cTvl9%?r7b5s`m>LjcwiqXP<A2uKZqDPy{rvIj
zhih*%Y+LeDAWtkzNiQw|YNxoi!g;siiJT6-8`?oLCMBwLw~^sfnWmaIzfp4nf9`*R
z;-ZfjZ5^?+S^I16axY;H$KVO?Y1XabPA$HM+DA)P={_I36n(W3rQgPY)`yhom@aH@
zYgf*yQ|f4IJJy#_TRPvl;dJI~n-yeNQ|9n8|F=|H-Xb^sYWE}J4>RT^q-u2=6$7ZQ
z-xF7vIW4P8#s>8WtBUZK-y0Kr9CJzg`B4vZo@f=qR<X1dai~6vJ4`5}$^@()$<j)4
zN&LO6dW=XNsqaT58RC-Bs%{yQL1UEZDpzb4cM$UUA2uNvut6t7Y<`K2Vlh8)q35o^
zJf7JP3|8Q|kv{Z>JIkXXX?GBPbvXE&*ly@fb;7DcU95H7&v)*!KWF{wbEMbe$L5El
zJ6r6+doQ-J^Z6%uzY~7er2`x<^+J5WH5kI|_i(m&^FLT}bk2G~y6J-UI&?zN;UmQw
za$S%NhB`Lh?Z6NhipHsLVm?(;EfeP45HVAD%QPMN<MJXGY@#N<+rdqY@r7k;sYU5$
zdQs-5krW~Hzj-s#`|$Mi(aT0s2sY}R<s;NW+6R^#0*B2!II=(EwfU3$AK1=jd`12i
z>ZQKj9&n{yX>V!nd;53|nqTLK_G}olvBK}Et@5dnubDVzWP5?S?M;oH9*+M|GM5i;
z%7?p~NDCQvO}(&pxDAgplNbL#QWE9$mPK%$_1XHT;>iNFb=vwNEF$^6!Sx-fU1Thj
zSnB4@0->eNL+`a5KNe356b%&fO&U|kSRFe1(T_A~|Go445|B&f^KUiPfC9D^xkNN0
zAzv|JWcl$zk67&>NM69rqr~XE>GKZ{Bm}%LDG4j)b>pPS{1JWD&X({%JeIReqZ!io
z`EI{~24!HZ`yt9Q0<!e4GB1JoRnNDutO9QnU_yB!Yu4$pZpIO>yv2x0m$4<|sCjID
z?RnL9`O?;94OM+D)ht8P=8;3w`p}}0U2H_OctW)>t9&L@e^M%ELOp9jHDf|KZ9?(a
zy68{+l97w^AHRppatH0o2h585?aKS4%<Xh7Yx1DmA|Zq<dnv1@DWle6?)tK>Xab#u
zJLxeS=?SZ?9gFEPv#m{&WpT3N1EHPTxz&RN!?>$f@S|3ttyWTHR#NFF2azZ33z^jg
zJ1TpE@0WvJ_g7!%Z=09cQ`UhJZZ(L=f|(zrIjNw4Y{>5N9`x|!qpLcihg(R}hw-~b
zn=~tf?!xM4SYXc=dd#D12k5b3P&CM1l&uz>#=qdswfe@jHL@XGB>tx#+>IL_OVa;>
zPZo|>rNyr>S2o{w3dQws{!g`2{Hn}$0`({_-?p_Dn2ig&=tLwt3r;Fs?it~g9UFvH
zlf6Tr`<jRh{wQE0tM`bzeL&K?=QhVchBM76|3Qk2y!*j&Lp;@f$ps2s(Ivp#{Fg}f
zHYS+}_&W5~01sKVAA4~F3Q-elX^EHS+Exn#<(ocYjA#d_uI9(Hfl2hLi5yKxa%!3p
z-RnQ@sUZ4a?pf}?P}7+Nnt7pFc7X}26Ue0s^C2K0`#1<`u1!V3X;%o*Q}4m0WVx7a
z$?`YRZYlFn`(uvWd~dqOpKq%$(iCgB3sp(As9M9%GJlaOu(@i94v4^rWv8Y*l1K4K
z{9d(dJ{$sfW6WI}WSp}~a7GROD)gQN4lBCqn9Sz}6Q2z7SCE&w^eY#R->QFh0gXv_
z?K5@@>1LJBQ2RGwWTcP-*#@CetJ7vfz8AD=*tdf=lWIorX)6Xq_1%BdCl|O7+U;dF
zDeTp&(<}wI2nxJ!udL7xkX=dVl;z<KiWYRB*&ll2RM)$YE)Z67mo<h;<yckvvVE=R
zaC-6nr5;n^*KB!NfQB!n=z5`6{pgZj4``?t*sN*?{)b=luNaL|%$q=)%!zTbj=d|R
zTtY>)gF%9#DpDNYaRbA3CfRFE0EhC*)5#1bE|m4mQb3*09F%xpX{46N0L4jVD+f_m
z2o453yoo=0ky(&k<kQS{=YDj)jEMWa6e~RY>+++g27<_8b4^oAOy_rUM;z#De>=)L
zQg3b5pQYFs6r^VE@8siMg76-7V$^A<RQ{}S0P|H~9+z0)8=_;kJx?4=RkId0f}pVL
z{ODYxc)(ON%p^$>N_^q|O!qDXksp;W4A6|dtVP`7K53qWHkePyex9N-%^1dxA3v9+
z)a3iDKiC^$kHgrG8;29?I}IkDxUNu-79$@1e`shGCYHV7<Ubn1S(aJXZC;^EW4ZnR
z(-7`%mkqJ#uk9|k69~9o#diP69`BfR1>79`CoT7Hg{U15KCgJVxBI2LeXt!bOmpiw
zYOXETiXEbjR$t?3?<$ju?P4yE?$<Vk0vi5d#A&l2bG*KlvuPVCLmp11HiBe*ypc(V
zj#0!xtjG!Menk@Pi5{@{5^-PMk0ADxLGafBu*KrdQ(T*Di-8b<ka7={29C4QcZtcu
zl60J^{Q_kkhlwNFsJj&asSEF9?;l15a{t39>D|27`Kjn`^+C!;6lxTgh>9lZ%3sWZ
z3?aSy%RP9f>%u~dzx-|cDWKie(J!OeXw-PeE&`F~B@=dB2tIeAf)Fv|O0jz0u)Z7K
zsXY(f-rhdDmjy?B{6^m{3aRoFMaP}6`v76Ga>V{g`!J=k9MY@7r=ao$i*%nOT;8|G
z=<In$*LJFUk`(K&gqBl?hKWNJqB#90UZ|X$ZF-}B7$v_aLt3JxX@fK`&ZHj%6>T2P
ztzdBag$$``eMuZ`9bV~JL3;g>5=Hu4#<0Koyx&0yF~g)Y>_3faGs8zu`Yd&<3U+E|
z6}1H!L&xI&xbGF%dNY-v6i&^?w=py%7Zz6*CSdmac!@U2BBcIBDGT50Svir4Y2iPM
z@})cB+X{TQ{~SBieHC4W968|YW;v<ft4OhM^k_OrdhRD_rcwiS?*vyfw2>-`V6e3F
zi%*^T#nObV8}0v6)WkZKad3#6J+(AcAHsLT;@jF4mYj~^B)O=4K=Dk3{9f&*OJ!^d
za7(;McsHj><wV#Ym*!wJBv!>pp~$p_nuLEcv-PN_ZT&{{*Cx((F^s38+#bWGuA6)Q
z*SWI7kxeT}(Fppia##}_7r}N~#nyPM#R0lN#AE`%R<6lP_1IMi0b<<bAVHv!{eLE8
zjN86ZKP7p@%jl#05pKHDs~(+I+-;aWkne?g?eTiWJ=#-FtY4xuq&F5r2{$`CUStUQ
zL*%c1I?a<QIRpl^A$rXxQUlombse|Rx+7RPI;_Z<Z(LsE?rDs!BQ`(`S*LAeLouaY
z_ou72{9`IS)qFF4Tt~z;kJJ_XoZmxyBiMq#yrdS_?zC81f=HY@nGbz@=J<*tya#Q6
z)BI5F^uqL3kiFDs_zTo#M*sgn*M0004?V>4ZZ6~v%zK@4vfvd7EI9*H|H4B7V9R(=
zm*}*D_~)yso*5+z5z;SQhXNrR){T;MjgU2cK^rBMCIa(VUHL|VisHTF-Ga|IWa}*S
zsw%j)OdY`b*LA?UA?|<t57wk*W2TJ{Ukic2gjM+<CVw<{#Q=ls3(3_sdN{lUx{Z{q
zV6IP2`}@78F{FEor0Y7d%cyvc1CkSh+@cOxH~)h-fk$9Pq1E7JlgHSuGr5h`uIrmj
zb49SOTb-@`jGMdA`sJg%ndd4sb3D*}zG3bJ+oBHPRejhrBLz%&8EEk>JJbRbQ1e0~
zV{Jjd)oO17I-XeSzy>11iKDZP`ec122uGbe|BUUB^?!`*cXP11&lSZBVe-=;6j6&@
zUJnM<DaIg_!<udwEW6CWb-2Ax<Ps}ON>fwZ%nXdn$Wtb_x?^r8F})d2?d^Zc##r@d
z#|r~{N$^Kv$_Su;1V~pNKZ#VHs8Id-*ZCinfKBWJ(*UO?_|HT}nNxGZ><AlsW>J4_
z5;B-M<Wcs(hNgF*x4I|R37r>+Jp|Hcr}~v`_B`g<%<<(pHtXF@6q(IyYbZxi;`&n3
z(NIoz7RJ1j{uC24Y$u2w8qB}-rlX)pGwcfW=cwoB|GJzHCt3z29^0^pi~W&-MblG)
zD<nq9gq;ncg51q?uEqtb^QB-h#C$n3TS7vmP=Yw_KbV8(LFkUx_&+cw;z1o_cqV)A
zg%yt*nyyU>FY%l>q?R&su89PH^I><jV?z)fv66Wa2Ohd-1qCJ`H(8$(6;YFi5i1;1
zQ&KYp0jfu<Dcl)UXsBP4#zh<#0#d1l3{VF8{0hHK2*2scKFb)Ycx53yrh4PJ*73BX
z8#^}zBMYn;zcnYlZpK(K?*lU>hmik<i77}u()hbeCz&q!-=9zy{7(<De+s^utexfB
zh7R-S8fGw5>60z`6)d~08Lu)?*oKDl5Q(;NWa}eL9)!;PWlJZLy7boZ2adB%{?%(6
zFjq!W_||pvq|_$MZus?72!W95Fav&IXR)5%0U4Bh)d4H2huVT((u&~0`M^dXyEamd
zxQ|=#H_(NbNoMQ`V0i;u#dw`SlsNxq*7^5&F{x|XqrTZJe1EDHs#Fg??dR}MBmr0Y
znoHo6A)vZw1I%x=e@*6=*kGuBn)MI`XT-gB=^BC}S_E4Zu5|DcIRu{&LZEBH$uO!F
zyHYHHGw@l#tKO-byqmZPt|lP5dzv$XyOrv=<dOf^%Vs3bU;A3h^8jli6G2a;b$c!M
zP8zbPw^)^`=Y#Z1k_DgJV9SWNseUL^%QxV+`dhK45EyWzJI+1^*19uMl_#6X=@_Gv
zkoqGi{#9dp!Y12jCF$e(3A;4JTc4~lZKa|1?5+8GPA9Nd!F}^YCLk-vR(2n|mye6_
zNrr=sA)aJUNRmZsyxl<{_c()8=g?ik?yt2QvB^b&1YzBT(y@pLD+h;WBXfp&H0nQX
zr2DNU$)?9)KI5Fu82m@<sdUyD()AGlPd}(aL}IL}fOG0~)^~ed_U6FkSM}9y!4JQ(
zg4e{l_se?pHP8;OfbOG9RDk!Sa{j$qhZHd9m1UP|+_)v6vI*hX@Sx~C(V`?*!u9Wm
z31CN;{hI71<>5=w-YR-kgCGD77&yuk`~43r_Xn5X@2gLrBwchPE<ep!Q%Q9dR56vt
z<-Y}!5$B<NooR+u?)pzGQ9@msk*#)#1Zi3oLRP+s{yf^j_LExq;ache6Gf*l)@7GM
zhLk;gwL1BKz*11Sm&9?T5ZcoxSWsAul#C+k39-0F{ePYsB?JdD=+^p)NAfRli;lCY
z2HS$fyA`Gb^a)oeoZ<rhnvnBi`nEUV1DCWA@%jasXQ0vfbxLvey$+}-Kd`CZugKqv
zSE0<?F)iG-Dc%~Nw%63Mzv;&JG>jHxlOo06<wT24NWe{ch2QV|;{F0MM2B>-+w_0&
zqqPM=>>G8QuSI-Qn}9<|SDWnZqJfvDJ;xnq1gK;DpB;As>lOQtU2ciV#@JQvI@}z}
zoyeoP8%WX*sH3<gs=hqi!AsfK0iL4NRqio?h}zr#9*Iy1BH|)QMH4Vy#krOQd0M?;
z>LMU{o1~qkO*n-T?eY20l1o^eO2=EG8@wayl5fEfGTw(>q4;Bf<lZ@s5+^;D6Yk)|
z>$34>@t~&8y9@0=e2L9`c4F?ini4F_CnKJ-sHK+`PCd=JMsic^HWgn&kf^g}5mApC
zu~s^=?+WG?6nC1hB6O#1Q)Y|4B|}>E#md_$Tb*BAzJ{9*a#N7QPEyc<YM^3LM{1L%
z+D<9_OB_~~LTv*M6wgB(pallsgW*ujLtMVA(H=^xKowiK_4h0v^6#r-U_zr9a0ILW
zl;$q^%Jx;;55b_-oS2tGbmBNsuPD@)KpnlfYLQ_Xw1t90pV^)b1&briHfprHNV0Z-
z>U^72P{gk$uW(%KF1Uw^Q<LX^0f$B7ZG)+~Uzt^N#?qkm_4Ev$-bx5Y9YH17Es{&f
z=j2PxC_7czf~2y2o(9RQ6j*0z?hsM`-_sxbFBJ52HOUpiF8`R7a;K!$Z&nq%)N9$`
zLfoGb{%E=1nluaPTuW@*3Y(39;&4Vm#6A9{k7OHzs}Ur(Z!2m+2Eo`;(Hlc@5PTu@
z8@hpba2eP2j^Q`Vd45bvKj2q&4X~nXp#R|hkdVbrG|Tupqp&`<2cYkC5ig`O0GDo@
zL*Rd1cMQ_TFg^m>w?T2@=;6~9&piJysRIgYxL4R#&^$7;cBrRl`nM6yqCDyoi!BE%
z>CIX_TwYksQe3(qLLPcM6!S%C&iM--Z8LfLBnb}piJPBvU)7#4zKsP{tYOAjwXJ_2
zfGpW*o=W>m#>SQ{{7ZMIvEy=&#K43O*cwrAd@2@o(EyODpBY~Q<5~8+5EXqR_)K8o
zFMlWEsE%<CRBF~oe#ncn`U3!pSSR3+)C;^%esbsXr9L5+G1c+&4=3Qt`O~40mO8D}
z@>3j2p=xr0l<P6p_mk6?xh*`+D`Ud%C0kjE(ooPClygFr+wYrEQDobF#o1F+%*@Nc
zSyciQigpvAd(H+iI1PUQx210an+kHP;AC+e-*j_~)>5GY14i!ap`*OfmcodVjf(lQ
z^3?EPE3drLqr2<+^6Ndfn<C$XxA9B~oVCt(SE6jo0<W@Y^;JCc^a#m!1=B;KBBO(^
zsq2C7aa!Lwp+KjXfM$Jm4sb!e|0=Qx%)J6PXLn)d<||JS6CGS2Zx!_tXiA@eKL+0u
z|9A8AW}vhUbo9Q(bjmQ4OsONUp3=k3E0^FkSSdlS-cEt{O_BC42-d|xTIDp$_tnww
z6g?6<{KHt2wcorMxs#M#Puef58+a?7F1h+Dfv0<UVYu*>>0@QYd&<f7$9Fm6p^B(g
zyU&W*7pmz4fUo<RD<>Do&JeIRd3*c|dAy#>zZXG+F3*6%si=iWpSz)4i-1CX-rW;Y
zs)5ReFAgKkCy|-V9g$1lP>5M>0ox_9SNk@d^4%!RN-GFtPI1=mYEz|AwQ@p2j<%r-
z7L?s-DdPEZx2bS>81<6j4F_VS*-Q{qmwv3Kbf;BHpSr4&CwO;+#On+GyNwoJr~TNu
zhGMt!W2;sm{VHT3Xeg}Y9@_hz%#v>(4`!@Mii%+p&BZa#TJ9`Sf;Z#pCXVih_CjrH
ziwXa0SPHYjCh6X?IR-t)>NNMvZ@5lEwRyH!&;gq7`QNME0mf^p^^LlLD953u)}6m6
zaznp-`kaF|pJ5(sx}lY75Lh)Z`aiZuORy*ny-?<M(rd<DP?ZuMXKx04Fl-juj;&dy
z_%oY}prMVG6>NqoM40Eci3Q_ckQr)x-4S4UH|U0>&p8<I^nARaG-aS4F&D+Vb2v9P
zHWyXSJG57^-&=hn_4x!;LMu&&kBuqg-$|z2Q(r$eB=RL<4lF1H_PU2}1NM#=23E#?
z?Tp;YJAV3}`Te_)@7u}Sooc&>>+{a@SbZcWYhfn>FW70M%_f}Xdl4$?*uz5ZW_REx
z_xJ$EpiVk{ONu`<`l`6q>F4~uzEJ$>eI}iE#L0YTe;!g~E9g9Fj&YbHiWQqxu_g#j
zIWnz@%-(;1R`Me0G%?D+#%)Ij4;V`rY_Iidm=yOql{!@<8rC$|C;OH^?5nMbI$8b9
zBJTOHwRh}yl3Bftb!Q&Ep-YScqv|)=eg1SI7^K!o+ZkRyD)aaP9aQ$dj+880ImnXm
zsQrwXI5;@`di$ywn9iMBB8R3av46q<0|kNCr^pq`XC?c!9^n<SJGK9g#7r68xyZdv
zo66L`V5VvZ{At?(cfOkwJsS*u*&`=MfC4*V<_0ev(08*bBwo-Hh*nL-zc7(cAn*B<
z2k%222p4P$9mnYn`Jn9b=wAn{$BCTPPVXxH{KD2S048U&O$lph8yKOgt@fI_=KS<Z
zbFJ+9!4I{)78_7lybU8;bh>g76f<+Bhuj*$5^o1}1DeTdkGfWl2KTt1G{GGqBb~yC
zVe0uRWDu>!pm0e*Ya&*<btLj*f7&Kt(|f`}1W}6`XCv=T1yPCqgcgSAzV1Ld!y$LV
zafHVPMGGSS7{<oK4+l05!`r7WVVC2uX8h*EN4X_@=rXvQd1u^cA?Z6*qNa!C+Uw+$
zPZbjN&yO$*p0~E<b>LJzEQ{1zldhtShVe~|q;A|g>2iV?Xu{Lj!jlh*$7@oJwLGKT
zGl2b+Kd_j`WFYNXenBmGx7Rg@>q9%`roH|o*el(dlqb?v$Z)9`FE>FYxWabS#Tmga
h8~*%3Ci^D2Sa6>~$#YaK`$GH$Ox!7t0cwE){eOE(X;lCK

literal 0
HcmV?d00001

diff --git a/test/fixtures/roles.yml b/test/fixtures/roles.yml
index bc4d65641..70490286f 100644
--- a/test/fixtures/roles.yml
+++ b/test/fixtures/roles.yml
@@ -76,6 +76,8 @@ roles_001:
     - :edit_wiki_pages
     - :delete_wiki_pages
     - :add_messages
+    - :edit_messages
+    - :delete_messages
     - :manage_boards
     - :view_files
     - :manage_files
diff --git a/test/functional/account_controller_test.rb b/test/functional/account_controller_test.rb
new file mode 100644
index 000000000..a923de3ea
--- /dev/null
+++ b/test/functional/account_controller_test.rb
@@ -0,0 +1,73 @@
+# 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 File.dirname(__FILE__) + '/../test_helper'
+require 'account_controller'
+
+# Re-raise errors caught by the controller.
+class AccountController; def rescue_action(e) raise e end; end
+
+class AccountControllerTest < Test::Unit::TestCase
+  fixtures :users
+  
+  def setup
+    @controller = AccountController.new
+    @request    = ActionController::TestRequest.new
+    @response   = ActionController::TestResponse.new
+    User.current = nil
+  end
+  
+  def test_show
+    get :show, :id => 2
+    assert_response :success
+    assert_template 'show'
+    assert_not_nil assigns(:user)
+  end
+  
+  def test_show_inactive
+    get :show, :id => 5
+    assert_response 404
+    assert_nil assigns(:user)
+  end
+  
+  def test_login_with_wrong_password
+    post :login, :login => 'admin', :password => 'bad'
+    assert_response :success
+    assert_template 'login'
+    assert_tag 'div',
+               :attributes => { :class => "flash error" },
+               :content => /Invalid user or password/
+  end
+  
+  def test_autologin
+    Setting.autologin = "7"
+    Token.delete_all
+    post :login, :login => 'admin', :password => 'admin', :autologin => 1
+    assert_redirected_to 'my/page'
+    token = Token.find :first
+    assert_not_nil token
+    assert_equal User.find_by_login('admin'), token.user
+    assert_equal 'autologin', token.action
+  end
+  
+  def test_logout
+    @request.session[:user_id] = 2
+    get :logout
+    assert_redirected_to ''
+    assert_nil @request.session[:user_id]
+  end
+end
diff --git a/test/functional/admin_controller_test.rb b/test/functional/admin_controller_test.rb
new file mode 100644
index 000000000..d49fe2dda
--- /dev/null
+++ b/test/functional/admin_controller_test.rb
@@ -0,0 +1,61 @@
+# 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 File.dirname(__FILE__) + '/../test_helper'
+require 'admin_controller'
+
+# Re-raise errors caught by the controller.
+class AdminController; def rescue_action(e) raise e end; end
+
+class AdminControllerTest < Test::Unit::TestCase
+  fixtures :projects, :users
+  
+  def setup
+    @controller = AdminController.new
+    @request    = ActionController::TestRequest.new
+    @response   = ActionController::TestResponse.new
+    User.current = nil
+    @request.session[:user_id] = 1 # admin
+  end
+  
+  def test_get_mail_options
+    get :mail_options
+    assert_response :success
+    assert_template 'mail_options'
+  end
+  
+  def test_post_mail_options
+    post :mail_options, :settings => {'mail_from' => 'functional@test.foo'}
+    assert_redirected_to 'admin/mail_options'
+    assert_equal 'functional@test.foo', Setting.mail_from
+  end
+  
+  def test_test_email
+    get :test_email
+    assert_redirected_to 'admin/mail_options'
+    mail = ActionMailer::Base.deliveries.last
+    assert_kind_of TMail::Mail, mail
+    user = User.find(1)
+    assert_equal [user.mail], mail.bcc
+  end
+
+  def test_info
+    get :info
+    assert_response :success
+    assert_template 'info'
+  end
+end
diff --git a/test/functional/issues_controller_test.rb b/test/functional/issues_controller_test.rb
index b9d232bfd..638362dbe 100644
--- a/test/functional/issues_controller_test.rb
+++ b/test/functional/issues_controller_test.rb
@@ -22,7 +22,17 @@ require 'issues_controller'
 class IssuesController; def rescue_action(e) raise e end; end
 
 class IssuesControllerTest < Test::Unit::TestCase
-  fixtures :projects, :users, :roles, :members, :issues, :enabled_modules, :enumerations
+  fixtures :projects,
+           :users,
+           :roles,
+           :members,
+           :issues,
+           :issue_statuses,
+           :trackers,
+           :issue_categories,
+           :enabled_modules,
+           :enumerations,
+           :attachments
   
   def setup
     @controller = IssuesController.new
diff --git a/test/functional/messages_controller_test.rb b/test/functional/messages_controller_test.rb
index 25fc1363e..dcfe0caa7 100644
--- a/test/functional/messages_controller_test.rb
+++ b/test/functional/messages_controller_test.rb
@@ -40,10 +40,60 @@ class MessagesControllerTest < Test::Unit::TestCase
     assert_not_nil assigns(:topic)
   end
   
+  def test_show_message_not_found
+    get :show, :board_id => 1, :id => 99999
+    assert_response 404
+  end
+  
+  def test_get_new
+    @request.session[:user_id] = 2
+    get :new, :board_id => 1
+    assert_response :success
+    assert_template 'new'    
+  end
+  
+  def test_post_new
+    @request.session[:user_id] = 2
+    post :new, :board_id => 1,
+               :message => { :subject => 'Test created message',
+                             :content => 'Message body'}
+    assert_redirected_to 'messages/show'
+    message = Message.find_by_subject('Test created message')
+    assert_not_nil message
+    assert_equal 'Message body', message.content
+    assert_equal 2, message.author_id
+    assert_equal 1, message.board_id
+  end
+  
+  def test_get_edit
+    @request.session[:user_id] = 2
+    get :edit, :board_id => 1, :id => 1
+    assert_response :success
+    assert_template 'edit'    
+  end
+  
+  def test_post_edit
+    @request.session[:user_id] = 2
+    post :edit, :board_id => 1, :id => 1,
+                :message => { :subject => 'New subject',
+                              :content => 'New body'}
+    assert_redirected_to 'messages/show'
+    message = Message.find(1)
+    assert_equal 'New subject', message.subject
+    assert_equal 'New body', message.content
+  end
+  
   def test_reply
     @request.session[:user_id] = 2
     post :reply, :board_id => 1, :id => 1, :reply => { :content => 'This is a test reply', :subject => 'Test reply' }
     assert_redirected_to 'messages/show'
     assert Message.find_by_subject('Test reply')
   end
+  
+  def test_destroy_topic
+    @request.session[:user_id] = 2
+    post :destroy, :board_id => 1, :id => 1
+    assert_redirected_to 'boards/show'
+    assert_nil Message.find_by_id(1)
+  end
 end
diff --git a/test/functional/my_controller_test.rb b/test/functional/my_controller_test.rb
index 5df2932ed..c1349ace4 100644
--- a/test/functional/my_controller_test.rb
+++ b/test/functional/my_controller_test.rb
@@ -22,7 +22,7 @@ require 'my_controller'
 class MyController; def rescue_action(e) raise e end; end
 
 class MyControllerTest < Test::Unit::TestCase
-  fixtures :users
+  fixtures :users, :issues, :issue_statuses, :trackers, :enumerations
   
   def setup
     @controller = MyController.new
diff --git a/test/functional/repositories_subversion_controller_test.rb b/test/functional/repositories_subversion_controller_test.rb
index 9cc7048df..d7ce45640 100644
--- a/test/functional/repositories_subversion_controller_test.rb
+++ b/test/functional/repositories_subversion_controller_test.rb
@@ -21,7 +21,7 @@ require 'repositories_controller'
 # Re-raise errors caught by the controller.
 class RepositoriesController; def rescue_action(e) raise e end; end
 
-class RepositoriesControllerTest < Test::Unit::TestCase
+class RepositoriesSubversionControllerTest < Test::Unit::TestCase
   fixtures :projects, :users, :roles, :members, :repositories, :issues, :issue_statuses, :changesets, :changes, :issue_categories, :enumerations, :custom_fields, :custom_values, :trackers
 
   # No '..' in the repository path for svn
diff --git a/test/functional/users_controller_test.rb b/test/functional/users_controller_test.rb
new file mode 100644
index 000000000..8629a7131
--- /dev/null
+++ b/test/functional/users_controller_test.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.
+
+require File.dirname(__FILE__) + '/../test_helper'
+require 'users_controller'
+
+# Re-raise errors caught by the controller.
+class UsersController; def rescue_action(e) raise e end; end
+
+class UsersControllerTest < Test::Unit::TestCase
+  fixtures :users, :projects, :members
+  
+  def setup
+    @controller = UsersController.new
+    @request    = ActionController::TestRequest.new
+    @response   = ActionController::TestResponse.new
+    User.current = nil
+    @request.session[:user_id] = 1 # admin
+  end
+  
+  def test_index
+    get :index
+    assert_response :success
+    assert_template 'list'
+  end
+
+  def test_list
+    get :list
+    assert_response :success
+    assert_template 'list'
+    assert_not_nil assigns(:users)
+    # active users only
+    assert_nil assigns(:users).detect {|u| !u.active?}
+  end
+  
+  def test_edit_membership
+    post :edit_membership, :id => 2, :membership_id => 1,
+                           :membership => { :role_id => 2}
+    assert_redirected_to 'users/edit/2'
+    assert_equal 2, Member.find(1).role_id
+  end
+  
+  def test_destroy_membership
+    post :destroy_membership, :id => 2, :membership_id => 1
+    assert_redirected_to 'users/edit/2'
+    assert_nil Member.find_by_id(1)
+  end
+end
diff --git a/test/functional/versions_controller_test.rb b/test/functional/versions_controller_test.rb
index e8327938a..17ebd3518 100644
--- a/test/functional/versions_controller_test.rb
+++ b/test/functional/versions_controller_test.rb
@@ -39,4 +39,35 @@ class VersionsControllerTest < Test::Unit::TestCase
     
     assert_tag :tag => 'h2', :content => /1.0/
   end
+  
+  def test_get_edit
+    @request.session[:user_id] = 2
+    get :edit, :id => 2
+    assert_response :success
+    assert_template 'edit'
+  end
+  
+  def test_post_edit
+    @request.session[:user_id] = 2
+    post :edit, :id => 2, 
+                :version => { :name => 'New version name', 
+                              :effective_date => Date.today.strftime("%Y-%m-%d")}
+    assert_redirected_to 'projects/settings/1'
+    version = Version.find(2)
+    assert_equal 'New version name', version.name
+    assert_equal Date.today, version.effective_date
+  end
+
+  def test_destroy
+    @request.session[:user_id] = 2
+    post :destroy, :id => 2
+    assert_redirected_to 'projects/settings/1'
+    assert_nil Version.find_by_id(2)
+  end
+  
+  def test_issue_status_by
+    xhr :get, :status_by, :id => 2
+    assert_response :success
+    assert_template '_issue_counts'
+  end
 end
diff --git a/test/functional/welcome_controller_test.rb b/test/functional/welcome_controller_test.rb
new file mode 100644
index 000000000..18146c6aa
--- /dev/null
+++ b/test/functional/welcome_controller_test.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.
+
+require File.dirname(__FILE__) + '/../test_helper'
+require 'welcome_controller'
+
+# Re-raise errors caught by the controller.
+class WelcomeController; def rescue_action(e) raise e end; end
+
+class WelcomeControllerTest < Test::Unit::TestCase
+  fixtures :projects, :news
+  
+  def setup
+    @controller = WelcomeController.new
+    @request    = ActionController::TestRequest.new
+    @response   = ActionController::TestResponse.new
+    User.current = nil
+  end
+  
+  def test_index
+    get :index
+    assert_response :success
+    assert_template 'index'
+    assert_not_nil assigns(:news)
+    assert_not_nil assigns(:projects)
+    assert !assigns(:projects).include?(Project.find(:first, :conditions => {:is_public => false}))
+  end
+  
+  def test_browser_language
+    Setting.default_language = 'en'
+    @request.env['HTTP_ACCEPT_LANGUAGE'] = 'fr,fr-fr;q=0.8,en-us;q=0.5,en;q=0.3'
+    get :index
+    assert_equal :fr, @controller.current_language
+  end
+end
diff --git a/test/unit/repository_cvs_test.rb b/test/unit/repository_cvs_test.rb
new file mode 100644
index 000000000..3f6db06eb
--- /dev/null
+++ b/test/unit/repository_cvs_test.rb
@@ -0,0 +1,60 @@
+# 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 File.dirname(__FILE__) + '/../test_helper'
+require 'pp'
+class RepositoryCvsTest < Test::Unit::TestCase
+  fixtures :projects
+  
+  # No '..' in the repository path
+  REPOSITORY_PATH = RAILS_ROOT.gsub(%r{config\/\.\.}, '') + '/tmp/test/cvs_repository'
+  REPOSITORY_PATH.gsub!(/\//, "\\") if RUBY_PLATFORM =~ /mswin/
+  # CVS module
+  MODULE_NAME = 'test'
+  
+  def setup
+    @project = Project.find(1)
+    assert @repository = Repository::Cvs.create(:project => @project, 
+                                                :root_url => REPOSITORY_PATH,
+                                                :url => MODULE_NAME)
+  end
+  
+  if File.directory?(REPOSITORY_PATH)  
+    def test_fetch_changesets_from_scratch
+      @repository.fetch_changesets
+      @repository.reload
+      
+      assert_equal 5, @repository.changesets.count
+      assert_equal 14, @repository.changes.count
+      assert_equal 'Two files changed', @repository.changesets.find_by_revision(3).comments
+    end
+    
+    def test_fetch_changesets_incremental
+      @repository.fetch_changesets
+      # Remove changesets with revision > 2
+      @repository.changesets.find(:all, :conditions => 'revision > 2').each(&:destroy)
+      @repository.reload
+      assert_equal 2, @repository.changesets.count
+      
+      @repository.fetch_changesets
+      assert_equal 5, @repository.changesets.count
+    end
+  else
+    puts "CVS test repository NOT FOUND. Skipping unit tests !!!"
+    def test_fake; assert true end
+  end
+end

From 17c7886791a7dd33daaa8ed0e334f733afefc4a1 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Thu, 13 Dec 2007 18:53:34 +0000
Subject: [PATCH 065/710] Removed unused UsersController#destroy.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@988 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/users_controller.rb | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index cf0128d7c..3f3adb57d 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -109,12 +109,4 @@ class UsersController < ApplicationController
     end
     redirect_to :action => 'edit', :id => @user and return
   end
-
-  def destroy
-    User.find(params[:id]).destroy
-    redirect_to :action => 'list'
-  rescue
-    flash[:error] = "Unable to delete user"
-    redirect_to :action => 'list'
-  end  
 end

From eb7cbd481e44fcb636957acc7896aefa52743f70 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Fri, 14 Dec 2007 17:31:24 +0000
Subject: [PATCH 066/710] Added some tests for projects controller and helper.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@989 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/helpers/projects_helper.rb              |  4 +-
 test/fixtures/issues.yml                    |  2 +
 test/functional/projects_controller_test.rb | 48 ++++++++++++++++++++-
 test/unit/helpers/projects_helper_test.rb   | 41 ++++++++++++++++++
 4 files changed, 92 insertions(+), 3 deletions(-)
 create mode 100644 test/unit/helpers/projects_helper_test.rb

diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb
index 4b1b1a954..df4b9c334 100644
--- a/app/helpers/projects_helper.rb
+++ b/app/helpers/projects_helper.rb
@@ -179,9 +179,9 @@ module ProjectsHelper
     end
     
     # today red line
-    if Date.today >= @date_from and Date.today <= @date_to
+    if Date.today >= date_from and Date.today <= date_to
       gc.stroke('red')
-      x = (Date.today-@date_from+1)*zoom + subject_width
+      x = (Date.today-date_from+1)*zoom + subject_width
       gc.line(x, headers_heigth, x, headers_heigth + g_height-1)      
     end    
     
diff --git a/test/fixtures/issues.yml b/test/fixtures/issues.yml
index 6649849d8..fc5b48dee 100644
--- a/test/fixtures/issues.yml
+++ b/test/fixtures/issues.yml
@@ -41,6 +41,8 @@ issues_003:
   assigned_to_id: 
   author_id: 2
   status_id: 1
+  start_date: <%= 1.day.from_now.to_date.to_s(:db) %>
+  due_date: <%= 40.day.ago.to_date.to_s(:db) %>
 issues_004: 
   created_on: 2006-07-19 21:07:27 +02:00
   project_id: 2
diff --git a/test/functional/projects_controller_test.rb b/test/functional/projects_controller_test.rb
index 52c33ddd7..b6ac59141 100644
--- a/test/functional/projects_controller_test.rb
+++ b/test/functional/projects_controller_test.rb
@@ -52,7 +52,37 @@ class ProjectsControllerTest < Test::Unit::TestCase
     assert_response :success
     assert_template 'show'
     assert_not_nil assigns(:project)
+  end
+  
+  def test_settings
+    @request.session[:user_id] = 2 # manager
+    get :settings, :id => 1
+    assert_response :success
+    assert_template 'settings'
+  end
+  
+  def test_edit
+    @request.session[:user_id] = 2 # manager
+    post :edit, :id => 1, :project => {:name => 'Test changed name'}
+    assert_redirected_to 'projects/settings/1'
+    project = Project.find(1)
+    assert_equal 'Test changed name', project.name
+  end
+  
+  def test_get_destroy
+    @request.session[:user_id] = 1 # admin
+    get :destroy, :id => 1
+    assert_response :success
+    assert_template 'destroy'
+    assert_not_nil Project.find_by_id(1)
   end
+
+  def test_post_destroy
+    @request.session[:user_id] = 1 # admin
+    post :destroy, :id => 1, :confirm => 1
+    assert_redirected_to 'admin/projects'
+    assert_nil Project.find_by_id(1)
+  end
   
   def test_list_documents
     get :list_documents, :id => 1
@@ -70,7 +100,23 @@ class ProjectsControllerTest < Test::Unit::TestCase
     assert_equal [7, 7], Issue.find_all_by_id([1, 2]).collect {|i| i.priority.id}
     assert_equal 'Bulk editing', Issue.find(1).journals.find(:first, :order => 'created_on DESC').notes
   end
-
+
+  def test_move_issues_to_another_project
+    @request.session[:user_id] = 1
+    post :move_issues, :id => 1, :issue_ids => [1, 2], :new_project_id => 2
+    assert_redirected_to 'projects/1/issues'
+    assert_equal 2, Issue.find(1).project_id
+    assert_equal 2, Issue.find(2).project_id
+  end
+  
+  def test_move_issues_to_another_tracker
+    @request.session[:user_id] = 1
+    post :move_issues, :id => 1, :issue_ids => [1, 2], :new_tracker_id => 3
+    assert_redirected_to 'projects/1/issues'
+    assert_equal 3, Issue.find(1).tracker_id
+    assert_equal 3, Issue.find(2).tracker_id
+  end
+  
   def test_list_files
     get :list_files, :id => 1
     assert_response :success
diff --git a/test/unit/helpers/projects_helper_test.rb b/test/unit/helpers/projects_helper_test.rb
new file mode 100644
index 000000000..d76d92bc9
--- /dev/null
+++ b/test/unit/helpers/projects_helper_test.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.
+
+require File.dirname(__FILE__) + '/../../test_helper'
+
+class ProjectsHelperTest < HelperTestCase
+  include ProjectsHelper
+  include ActionView::Helpers::TextHelper
+  fixtures :projects, :trackers, :issue_statuses, :issues, :enumerations, :users, :issue_categories
+
+  def setup
+    super
+  end
+  
+  if Object.const_defined?(:Magick)
+    def test_gantt_image
+      assert gantt_image(Issue.find(:all, :conditions => "start_date IS NOT NULL AND due_date IS NOT NULL"), Date.today, 6, 2)
+    end
+
+    def test_gantt_image_with_days
+      assert gantt_image(Issue.find(:all, :conditions => "start_date IS NOT NULL AND due_date IS NOT NULL"), Date.today, 3, 4)
+    end
+  else
+    puts "RMagick not installed. Skipping tests !!!"
+    def test_fake; assert true end
+  end
+end

From 86319feef23618f59da13b450a085e40019a43e0 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Fri, 14 Dec 2007 17:33:05 +0000
Subject: [PATCH 067/710] Added ApplicationController#attach_files as a common
 method to attach files in all actions.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@990 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/application.rb          | 13 +++++++++++++
 app/controllers/documents_controller.rb | 10 ++--------
 app/controllers/issues_controller.rb    | 20 ++++----------------
 app/controllers/messages_controller.rb  | 12 +++---------
 app/controllers/projects_controller.rb  | 20 ++++----------------
 app/controllers/wiki_controller.rb      |  6 +-----
 6 files changed, 27 insertions(+), 54 deletions(-)

diff --git a/app/controllers/application.rb b/app/controllers/application.rb
index e186455a3..ad86b6b33 100644
--- a/app/controllers/application.rb
+++ b/app/controllers/application.rb
@@ -144,6 +144,19 @@ class ApplicationController < ActionController::Base
   def accept_key_auth_actions
     self.class.read_inheritable_attribute('accept_key_auth_actions') || []
   end
+  
+  # TODO: move to model
+  def attach_files(obj, files)
+    attachments = []
+    if files && files.is_a?(Array)
+      files.each do |file|
+        next unless file.size > 0
+        a = Attachment.create(:container => obj, :file => file, :author => User.current)
+        attachments << a unless a.new_record?
+      end
+    end
+    attachments
+  end
 
   # qvalues http header parser
   # code taken from webrick
diff --git a/app/controllers/documents_controller.rb b/app/controllers/documents_controller.rb
index 94532b65b..104cca10c 100644
--- a/app/controllers/documents_controller.rb
+++ b/app/controllers/documents_controller.rb
@@ -45,14 +45,8 @@ class DocumentsController < ApplicationController
   end 
   
   def add_attachment
-    # Save the attachments
-    @attachments = []
-    params[:attachments].each { |file|
-      next unless file.size > 0
-      a = Attachment.create(:container => @document, :file => file, :author => User.current)
-      @attachments << a unless a.new_record?
-    } if params[:attachments] and params[:attachments].is_a? Array
-    Mailer.deliver_attachments_added(@attachments) if !@attachments.empty? && Setting.notified_events.include?('document_added')
+    attachments = attach_files(@document, params[:attachments])
+    Mailer.deliver_attachments_added(attachments) if !attachments.empty? && Setting.notified_events.include?('document_added')
     redirect_to :action => 'show', :id => @document
   end
   
diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index 901e1432b..78bcf76a7 100644
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -116,13 +116,8 @@ class IssuesController < ApplicationController
   
   def add_note
     journal = @issue.init_journal(User.current, params[:notes])
-    params[:attachments].each { |file|
-      next unless file.size > 0
-      a = Attachment.create(:container => @issue, :file => file, :author => User.current)
-      journal.details << JournalDetail.new(:property => 'attachment',
-                                           :prop_key => a.id,
-                                           :value => a.filename) unless a.new_record?
-    } if params[:attachments] and params[:attachments].is_a? Array
+    attachments = attach_files(@issue, params[:attachments])
+    attachments.each {|a| journal.details << JournalDetail.new(:property => 'attachment', :prop_key => a.id, :value => a.filename)}
     if journal.save
       flash[:notice] = l(:notice_successful_update)
       Mailer.deliver_issue_edit(journal) if Setting.notified_events.include?('issue_updated')
@@ -140,15 +135,8 @@ class IssuesController < ApplicationController
         journal = @issue.init_journal(User.current, params[:notes])
         @issue.status = @new_status
         if @issue.update_attributes(params[:issue])
-          # Save attachments
-          params[:attachments].each { |file|
-            next unless file.size > 0
-            a = Attachment.create(:container => @issue, :file => file, :author => User.current)            
-            journal.details << JournalDetail.new(:property => 'attachment',
-                                                 :prop_key => a.id,
-                                                 :value => a.filename) unless a.new_record?
-          } if params[:attachments] and params[:attachments].is_a? Array
-        
+          attachments = attach_files(@issue, params[:attachments])
+          attachments.each {|a| journal.details << JournalDetail.new(:property => 'attachment', :prop_key => a.id, :value => a.filename)}
           # Log time
           if current_role.allowed_to?(:log_time)
             @time_entry ||= TimeEntry.new(:project => @project, :issue => @issue, :user => User.current, :spent_on => Date.today)
diff --git a/app/controllers/messages_controller.rb b/app/controllers/messages_controller.rb
index 46c9adadd..8078abf71 100644
--- a/app/controllers/messages_controller.rb
+++ b/app/controllers/messages_controller.rb
@@ -42,9 +42,7 @@ class MessagesController < ApplicationController
       @message.sticky = params[:message]['sticky']
     end
     if request.post? && @message.save
-      params[:attachments].each { |file|
-        Attachment.create(:container => @message, :file => file, :author => User.current) if file.size > 0
-      } if params[:attachments] and params[:attachments].is_a? Array    
+      attach_files(@message, params[:attachments])
       redirect_to :action => 'show', :id => @message
     end
   end
@@ -56,9 +54,7 @@ class MessagesController < ApplicationController
     @reply.board = @board
     @topic.children << @reply
     if !@reply.new_record?
-      params[:attachments].each { |file|
-        Attachment.create(:container => @reply, :file => file, :author => User.current) if file.size > 0
-      } if params[:attachments] and params[:attachments].is_a? Array
+      attach_files(@reply, params[:attachments])
     end
     redirect_to :action => 'show', :id => @topic
   end
@@ -70,9 +66,7 @@ class MessagesController < ApplicationController
       @message.sticky = params[:message]['sticky']
     end
     if request.post? && @message.update_attributes(params[:message])
-      params[:attachments].each { |file|
-        Attachment.create(:container => @message, :file => file, :author => User.current) if file.size > 0
-      } if params[:attachments] and params[:attachments].is_a? Array
+      attach_files(@message, params[:attachments])
       flash[:notice] = l(:notice_successful_update)
       redirect_to :action => 'show', :id => @topic
     end
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index c4d1b53fc..7b1e4ef3d 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -181,10 +181,7 @@ class ProjectsController < ApplicationController
   def add_document
     @document = @project.documents.build(params[:document])    
     if request.post? and @document.save	
-      # Save the attachments
-      params[:attachments].each { |a|
-        Attachment.create(:container => @document, :file => a, :author => User.current) unless a.size == 0
-      } if params[:attachments] and params[:attachments].is_a? Array
+      attach_files(@document, params[:attachments])
       flash[:notice] = l(:notice_successful_create)
       Mailer.deliver_document_added(@document) if Setting.notified_events.include?('document_added')
       redirect_to :action => 'list_documents', :id => @project
@@ -237,10 +234,7 @@ class ProjectsController < ApplicationController
       @custom_values = @project.custom_fields_for_issues(@issue.tracker).collect { |x| CustomValue.new(:custom_field => x, :customized => @issue, :value => params["custom_fields"][x.id.to_s]) }
       @issue.custom_values = @custom_values
       if @issue.save
-        if params[:attachments] && params[:attachments].is_a?(Array)
-          # Save attachments
-          params[:attachments].each {|a| Attachment.create(:container => @issue, :file => a, :author => User.current) unless a.size == 0}
-        end
+        attach_files(@issue, params[:attachments])
         flash[:notice] = l(:notice_successful_create)
         Mailer.deliver_issue_add(@issue) if Setting.notified_events.include?('issue_added')
         redirect_to :controller => 'issues', :action => 'index', :project_id => @project
@@ -345,14 +339,8 @@ class ProjectsController < ApplicationController
   def add_file
     if request.post?
       @version = @project.versions.find_by_id(params[:version_id])
-      # Save the attachments
-      @attachments = []
-      params[:attachments].each { |file|
-        next unless file.size > 0
-        a = Attachment.create(:container => @version, :file => file, :author => User.current)
-        @attachments << a unless a.new_record?
-      } if params[:attachments] and params[:attachments].is_a? Array
-      Mailer.deliver_attachments_added(@attachments) if !@attachments.empty? && Setting.notified_events.include?('file_added')
+      attachments = attach_files(@issue, params[:attachments])
+      Mailer.deliver_attachments_added(attachments) if !attachments.empty? && Setting.notified_events.include?('file_added')
       redirect_to :controller => 'projects', :action => 'list_files', :id => @project
     end
     @versions = @project.versions.sort
diff --git a/app/controllers/wiki_controller.rb b/app/controllers/wiki_controller.rb
index 37a36bf56..2ee22167d 100644
--- a/app/controllers/wiki_controller.rb
+++ b/app/controllers/wiki_controller.rb
@@ -154,11 +154,7 @@ class WikiController < ApplicationController
 
   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 => User.current)
-    } if params[:attachments] and params[:attachments].is_a? Array
+    attach_files(@page, params[:attachments])
     redirect_to :action => 'index', :page => @page.title
   end
 

From 47f399104b9c3062ea27d30146c1873df2efa750 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Fri, 14 Dec 2007 17:46:45 +0000
Subject: [PATCH 068/710] Added a Mercurial test repository with unit and
 functional tests.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@991 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 doc/RUNNING_TESTS                             |   6 +-
 test/fixtures/enabled_modules.yml             |   5 +
 .../repositories/mercurial_repository.tar.gz  | Bin 0 -> 7827 bytes
 .../repositories_mercurial_controller_test.rb | 117 ++++++++++++++++++
 test/unit/repository_mercurial_test.rb        |  55 ++++++++
 5 files changed, 182 insertions(+), 1 deletion(-)
 create mode 100644 test/fixtures/repositories/mercurial_repository.tar.gz
 create mode 100644 test/functional/repositories_mercurial_controller_test.rb
 create mode 100644 test/unit/repository_mercurial_test.rb

diff --git a/doc/RUNNING_TESTS b/doc/RUNNING_TESTS
index eb8787d95..fde24413b 100644
--- a/doc/RUNNING_TESTS
+++ b/doc/RUNNING_TESTS
@@ -14,4 +14,8 @@ gunzip < test/fixtures/repositories/cvs_repository.tar.gz | tar -xv -C tmp/test
 
 Bazaar
 ------
-gunzip < test/fixtures/repositories/bazaar_repository.tar.gz | tar -xv -C tmp/test
\ No newline at end of file
+gunzip < test/fixtures/repositories/bazaar_repository.tar.gz | tar -xv -C tmp/test
+
+Mercurial
+---------
+gunzip < test/fixtures/repositories/mercurial_repository.tar.gz | tar -xv -C tmp/test
diff --git a/test/fixtures/enabled_modules.yml b/test/fixtures/enabled_modules.yml
index 1f05cd9a7..dfc2f0090 100644
--- a/test/fixtures/enabled_modules.yml
+++ b/test/fixtures/enabled_modules.yml
@@ -31,3 +31,8 @@ enabled_modules_008:
   name: boards
   project_id: 1
   id: 8
+enabled_modules_009: 
+  name: repository
+  project_id: 3
+  id: 9
+  
\ No newline at end of file
diff --git a/test/fixtures/repositories/mercurial_repository.tar.gz b/test/fixtures/repositories/mercurial_repository.tar.gz
new file mode 100644
index 0000000000000000000000000000000000000000..1d8ad305732f7a0d7bfbcd52bbeec919da88e3f1
GIT binary patch
literal 7827
zcmV;E9&F(siwFp_o?=G;3vFd`V|8+AVQgP=WpHnEX>@OLc`kHeascdF2{_bS8=sjF
zL$;8V4AHfOnPFzgHe`)b(@l|WFox{2*s?^(UP{WfMTDD_eJk1bN<_(0h$Op^E#GkI
zR?ofH?S6f}=X*ZCdEV#Dod5a%&-<JAyyrdVJ%1Y<!IVs}#9A8>aQ1dYOOhSIMI7*B
z0g;5FP$&ohvJB`q<?0U@6eR&gz)(<0C<FqNKtNFd2;v9p@rNK2Nmv2|LMd^CziNjk
z*pclwLZOX?%^%rc%mV)-$H4d5A4RdhBn$=LwEsrnPwfwdnp$9O@i=QcyqM*`*9Qy=
zMIw=ZVSg0tH~ULUBH$=Viv5w2C@25|{V^2(8vp0^rvL;oBiq=xKt9_WLb8L{6L5|=
zTM~p!w6vvESl}Rb)@G39F#@s1y4aCP|81=|@k8*Z{%>YUpm+ue_XGM^&;Q}bZ|8p`
zbUFTS`u~3(j`!aR;xo*K$PSs$nI@`RSiw=Of7H$v0PxDCl(}jqv2>J@2BV^=d{||*
znp##RA@T*Kn#s}zi^mbgab}hzF?(D5>UAKUs;mYL<vPpibu*kbj)eQ71@#Q&!5owp
zdx&;qf+?km6P9FZfg=!&Ozmt*1UqYM96^j=vVnii{{{Zk{|Pt;vLyjW`~iKe8~<Ub
zZ{t4{2HW)ijQ}OgQzE`23{0e09tZw!tFws>#-IBC%6RxOyTI??{~;vc$j$xVMqnNL
z|BzkaI`cnV0*3s?{wPZO&G~;r0Hl0=!!3#wtyM3rg4XxSfoIbpPGx4%PkGL>{ABAf
z^Z3i#oudWn9)QcBZ0K$|?XVrt{<|68{@&cX^(zdTKHLgP)F=q>x4YXzdfjU;>S9N_
zDFwK$<D71N`^3#~Vn<-<w&JVCyCwvQDcd_2&yGoFb@jy3W^{6<R;o5#g-2hpa*{PT
zz-lg|q|3w{4?5kXe#j$XzNuaZ1&k=FPc;c;xrEiOk@n@XPQ)6*byRJ)AN3Kqc2uJH
z-DoZ^`>!cXEZ}*-kgRO?XMO-cG)0m>b6;f|bNVzuF%qce6TvUG)uO9#_dw;IuUT?8
zC^D8on5i4nizcZu$-EpErDA8PozfX_ettgQ@rW+Pi*Nd(r+>1W#82El^ThIe892Gr
z<T)xPZ18}$Q*KL@;BW{zgga-@KJA?g1Vvy@K<VXXvJa(^nyss4W|{Yx%XAYIX+=D5
zr5aA$mJ;sbG>9GVCg^E~ve1jq4_#ZRaR8u=FV8YNV3EKm2`ZkH2D(|E3ua;(D@2r5
z)C^kX2U->2GB-4RKAxA(?^^ZKvnc-R@JdHym;Kk=1OivM0Y>M+^2WZP9R84}TR+ll
zsW*XTM**rv+basR;E~4aMa(fr9N-*x$gFBIyDpBG)Z9p%kWh8b6P-D+-}4pgB(vKC
zZ_EfhMD-#j`UAg!<foq#9Y4*5inL5Ccb)CSq%a}?vQquwLf|fqM19)V#Y6?2V-sOg
z0U>&m;&Z@SC%FF#l}9UDxlqK5B3o7kv`i)I7CXD>#}|O)3oS!=L?-R@i80JKR4O%B
zs5CA{d()rVDoj%6>fL$&T(?98*8u;~sW~yXC^gPI)5>jy!Tx@9WPXOA84e--`q~%F
z;QOlWp~-qnuL5h>4nFj5^>FBiUpb!K##?sDNn7@@QMv|~!sQ{gYkCFRa-fca+6!5i
zV@|XQF99w{3d$~b4pLpw!H*)BSCyt(E|(SWnr<2wIHWUwu{gFor$mK=)czv>YsE$D
z>z5Vx?M|O(vo=W42Wwrc+6sdPw<Zc5IBGE8kLlGY?wl<e$?G(4lv4IY)b2|zJp;V~
z3Z^>b9V7@tE7@7UdYs(<R6R*`^n-B{>)GDKAx*=bsk>jr_bBU&UB6c65*xs@J8!zp
zjmsgnjBt~`RcXJW*C_8}{xcj))AZN*1dp$<XjoCmn<9Y}p<WfLWftr06)Asz&0#Qz
zmksdxLGl<V(r!W1U(h1LrVuSv{FA8^-5JuNw+@fn0RJ9IJ}({PwCRDH$6IBzv6lt+
z4j3`t!@rt1H9I~k-69;(c!Z%u=5`3Y#HsF3?Z{-GYn1NYQI6D61#HDtJ<p0ct~(J*
zhqHY%0+RJpChwRWi9G5C?ClhG1Z?6vv2Ogg!P;7y<A|hxBMH1-{D;Aj-<<!T5E6*Z
z_`f0eJ^o*#NY+~QTKuPi<f=eN`n|>u_#h-2z}$~MiY0w{yL0rmdTGWoC^P!$Giiq4
zVdqHJfN)8Dz@z?iY^-mn9NaMrBa8FS1zlC?95v@zO+!-i!M-`Fd?lFu*Mqut<Hh1V
zA6RA%ry<*Ilb^uJ0@6I(iLRXSH`>@*@K@M;kAehtl&Fp5O|`#q_ROwtemQ-K+}3{J
zN$ZginQSdqHtqmMAhVy(mfMhOuv&DGOM3d!mV1Rrk<WwxfD{TxiO*zLsddL!z3jVm
za&OS9I#nm+Od2>B@&0RCq9K%^2xXum_QNWVH1W&xc}Y2RZ>b5r@@qm;$~k9Fp2QpJ
zlGQP=eua+?@<Y?f=erx)=G22(Fij~MsZ&~Ir9l1+M$wi*Wc}MhrNtTp7we$uC;cAp
z8CsNhiOk6?Rw<wttf#;OQai}CLA0%NSKM?$FTO*(t(*`$7+XcCZ621^E<f6D&arp@
zi@8LO1XDg9X`#fxbBt^|18vGNzK?b&aiUgsNI-=Zm4E(%=jY&`-5b@W(5h0Y%OK#B
z*4c^90H!?pW&k8oWQZc_>m=R~W;i4k2bGqDO2W+G<`R@|<|YU%7A}p&!ErcK69fv1
zm4KS8<Pd;YR-VnU`s`(Vj^gKXcKWy206+u4e6Y(^+BCy5y}RG&H1q`*05EQ)$X<OG
z72u1&s#K9T+0rVAIq#Jc>qTo-QWsMF)vnPw8c{EEqykD=5j>M_=*j5KNLDt{<PtmA
zUzEm%tfA|fQ&#^l`oJL0$nfrV5i3J3SoX6b#CugTmbL0K=9)g_xN_uZoZIALt=m+&
zxY5P-XDkF?pD^z5AOtG2Lq9|K3Wuto(8<}mwllrr7^!%8oeKoYub346?n9bwk~klT
zWwO|vN$xEZ&s?{u=ksBQU>gH>eLt;jd)Y0^bb}M7`8eM+SW}Dc)!B-^16=~`5LSJ;
zV!)MP3^@M<=g(pI`8J=<?t|=RG0{XzmqAElsYZ48*POZQVasFJx4S`(Au)Bk%wCL0
z#yxu=n@lLDFkh02zJIR+El7K=YkJpY++u-P@@yt2PbZbBIX{gVi%Bi;__=`l`|eTo
z1XVi>JSv(ey}ctJHQ?x$WH9nFH|kk+*I?lp8A)Upz5>dNZv5oyBW<<cSN)E%RZzLV
z*fyiW9)VuKCjLjTPW(5+lCb}F66kN|e<URl5|o7k1cro5N^ItTHUfXg{;Ov;|G1Cu
zu|M*+{0{=Q`Toa-;5+R9`<dN$?giF6|3N^1KmS2Uz?XLfDCFk(&&J^M`X9J;`J8sG
zdTssh$9jxrqPtGcqpiuKN<X#y)^^b8FK>5_e$OyQeA{=q$Hdt9_0$J@I#AOBx}m(3
zfxoEV-)IZwfIvEnz+;uv0D;I^7cg&RK`KLKK!Gdx7PufF60Ax?(+~Ee(NXo&*>?;4
zlE#mQ#{IDz5bZuB5L=u+^jue0x`ILK7jhoZSBhSiFK8!czAyUvcvEMg0$MSGq-LZ>
z;}^2n;mNA2$VfXz=dk#sWNdMMCN@_3Nt^;j{f9*zJU8TNsxCtw8q-|Bqngg`rq|w4
zeJSvC&Vx`l2AbU$P8Bbq6h;s9nh!RMa0dplx@d_deY(EmWl1NWLf-}7)?S}`C=t_%
zSNb0jla6P^Zocl=xg!?v$asu2Mbv#8-be*Vx6q*j{IB9W{D19C|GP5*>-ay#^(DWa
z|KTu6l*Fe0ZwP+(|ApoEIM!;{{6FrU^{uSuJa+fkF9~4}JZ|<W%2@jHcIW8fpATDY
zKgQ;+@vG&&Z8R!+1~vS87Ibu1vNM<q?I+?jEDow;o|(iSq{AFEMJR^f@TYpn6%Ygg
zvlQ+ev+@z9MzN4#`M>lXPh`k<eO-3!Sh~Nx`y!JPO0I**I8)-ARhTzXV7dqU5KTL7
z)>I2}8r?U~t*_=?6xg9O^(?@($4xg?JoZjtQe_f6RY;R}{GPLFsv&Ivi^ea^d%I6b
zu?DGDoMVefe2_kL+T&ds{?_rwOvtxr=Y_}37l^V1(PZsbT9#s)CJs-eN8APX<UY&D
zOF6mocQem3Z>`n7iaC?jcwDA1eb<@F0R%(&4SuaC`fyB^MuTnZ&<U+(GiveMm61Be
z*`=IW+4)I0(R%N;eWYDCtc*z|1K#mK8{jZt7<8hv2>@u}n5G?cyRYtU5t?Ah7qqvY
zFG|In*Mjyv?E!BuG>bFHpN3CGl0{Ux*w%E{(k`DDBh+l^iH0@od4-QS&a;(DH!M{o
zX<@_+7P7~R9uO_sV)i_6e?023l%F|KK6=Qr&1tgF$>>#l+`|M39=W(-HA5p$hv#`=
zP6n|-5m(RO^)6bfh&6k~&A#A)?TWAuroM2uW~<rk)0Y182so#G?#X%0k*l=<8FDC{
z;a!7ht1}qRT5iut@>qC`bM}-E-aMsF^OBbEHMc!+52u-gql5xBcA#$JKY_n9|F0#6
z{%IfoVEs?|vAO==2z-zIKPLvi&J3=*9#}8`kAxz=&i}&^o9};Z6h6oQEjj?eR*tpm
zwfG<FTHeO>=pY@HrDjKz5xr4fsL1%2w>w8aI?-<1uFC9=dhIEN-op=s?=7&TuOXjS
zy~oO4Oj}q2^+ulxJLu5cCsw3iC(yHS7O!#WP%}r3<~dpaj?PGFVt>Q_DNsbuu2edF
z&7E0v*uj0-FEFYv<Dmg(StE{U8yZ_r)YaJxHgeC{%X2P}sxHQPDX0%*=?Y(MAeQAc
zo_3sJssEW{57|nE#&BQ60KmnoF5KT|n!&6)ts^`X!tE1k#PuEs-(H_MflmspElZ+O
zLy8z*cAe~Z^hG7sf_-%hj={@vg4K5*OiSAqv0<3t!za|VWG|@H1Gkr#lxf@)M_(T1
zkjbPTbr@lJDJg2sQ<WeRjkm=Tc%GXUvWMGOH<qY<I=NU4H&r*-o9rh*6fz}*X=8+}
zX>p1gsdIb0V;mF=iXWU7W$BWCEg$`)yuGiSTBhjPy{nGT(6#$dUJfgOie%rueqSxW
z;FpW92<jhQUF8hqKeFy??i+3~@v80I&1>H6Ce3{}y<FP-_Uw?Y13Q3zBKr*cl94Gt
zL&VNj*uI|<g&D6Z*jv%xN;XL}QS0dOe-m0ur!1>#)FzMnkehxb=Hekk^uETbsc|y_
z?O=%|+cYMH>D-H{q2BTyyECsfUJR@>lA6W`2WWA6CIn}=-$(jRj-Ys<Qap@X@#Q=;
z<?=c~mo#PM0>TBs9rQcK6WL5}#vl$ky!BMPo;7zYX2jXU6|^U$E-y8Ug_^uj>URpM
z_Y-C|a;NTGR`~ss<|5Klf?)>?^G=54MGLuhjLwQW@%<_ryi^&EuE;Pd(+;T=&{+T{
zH0c#T4C$Up{>6Uxz4wK>?ddZk2uDp7TPY#>ox5ZuinQ|IR?$edL&%Y3YSVYbdupB<
zF<yI^&>YxpY467<VM}j*GfSYmc?X&&aEq4H&;1>|gWbKv$8pj4k9cFDlY9x}n9OEY
z^EZw;{nK)eGb&T>3(v+)yKue`fBD>yUo*1p>GQ#7&YlvfTpvddr!`-3&EGwYn0I5|
zHB;@nAnuSij#o4zb+?`-bn1^i*xwbRWpk=XIC(~qAC6(sUR0DhsTZOw_=ym%$70&z
zUwW+NRiO>txa)DU>(UTC-gZGQOPpBuak0yNNx{)&XaJA1&rC^_6SzAx*YdhW(Qj@X
z<&b+sZ_OVmI7(TSkF7czXw5SX`qSyqicOPr+Bv@prHc*a*x#i8+AB?sjl0TAN+vD=
z8D2DbIRh_Y;{jAEsRBtVE?@zbq*QQ{i*#ybCAdvGpt90cCAE@z)<tMsV0M~ourEO1
zU+r88SX0Lq4laOTDlSy3J{=bX3d96Mpx{D4RsmUp3RUAxaswBV+?ZUJ6tvdT)>c$n
z&?2IM7VCyB^tsfQ7O`S^PouScaec8amG`W#xQF`un$FxLfK;VE`SAPRcmI!@aOcjP
zIddj+&Y3%Brun7qo;Rb`UMu@@KI_547wM?$zLxlz3Kq-Wwql5uCFq$#_Kl#t&Gi-Y
zg2+ufY6K_c3kNF_9?4H*Q$vGGRb|l!Wn1G*$~K7CjTCR1_d)slso(s)n$<6U_41mK
z^u-zPFVqkT2^k9q%+%YBU%&aC9SMD-GjD0^jveoRX=iXyoofT|`P#$3cIM=r^QuOs
zix)b@f1XSTqa{&0wuWTI3MH>)tm?C(Us*~~acTL;ii8g~Y^i*~FL8mx)ylT=qhBi6
zrOrP#mhExc1DiK2H7uTPOBl^*FbYMta*bA8=oPEvQ`!DARsORJzc5y`tsYo3$o<2Y
zAJ(G%UEzh+Z1~8cWhyYO7EA-PB^kJs;y`PurNn7C<)Owjm{R*{AW1(EQ#v)iz?1zv
zqi&zd{^JTMsl=bw{C7M5=L!6}%>VfUK4brT2krL14|KQtp0TCc?EisU(JG+bUh>*1
z$D4NC?<z0N`K_pP@!axNNwMVFV3+y{H^*)&2_4d0RkWl2M08es<Tgj)-h^)!*B;3|
zcX#)mFWzpukYf;DJQ05FuyKt)Y22{Bep&UUsEkJT$jqe)za%*O+!GbwQ*XT!fe``w
z8;<ffuKn-dE@xz~I(M_p>qc?GS1EH7o41bhe#<z;ciCsr2ZHzS+iX91)~q{vL0DSq
zm5_I?oYZ;c)VN0us#-a_$$t6SVRhFVQ+7Jn-EcivT=SQhGvt^#qox*3@)~CNPh9ip
zS?i0l>*pOjbEs<Pwuaq5Pq-=!eeLA3&oRlx>hF?@uH>!kn{p)Yy#3orWkb{YNf*22
z$E&b1mz-moAdid3tG2lOI@z4Iq5ns}toJ(PcH323*StmK6cqCFHbwF<j}e6*hTUuX
zvf1U6y}9oePh5zf^L%p&-nQ<AJK=6Wheyff(mClDYTFuaP!&hVyfX2tSG|Xy5zH%{
zT=$P9Ws={@K~rE{-C@ONg+q7wH{XAyeyp8m|CA-JGj{W$C+%dPss)oj(zNRLoliY-
zOY}zc=oPP)7f<~(;Ei(kf6X}eaiP&P{iXcfSBBLU2&OlF7rki&`I}1NIKw1p3~AZo
zD4tX}<o>=(mp<Nf^C<5_x7)|p@&t_=7f)}fkSxj%T3<*`syI^YxPdRvJS5y*pv@h(
zc0-vwJTJ54Qq$|9=hZiFPe1o-egJEB`0xYN=R;R>`a0~N=eF<b%2S`(Elm#$%s=wp
z>sz>ydg<kFSKl(EE`8nohks-CSMDo+9b8KBM&GHJQPmv0sCR$i44!~LqyNPkF)qf$
zGO<#O|1V)+-LC%#y2O9^^0+)E{;PM;5&wneey+A;oBnTeh}~H+=ZzaHFQitMuAc77
z8I|{D=i*tRbCLjsYbnt2`>{GSmbv6;c#UFNLa*AxuXgR4sH;-1ICc7rX!`*vYvqI?
z6}KOv8f*JmK8Ch0{aFC7y;i!&S);91$^_xL+`r}>U3n~RYv^0of(s7cUEG;=Zh3Oy
z!2yT3F8%Hb_Ak%h+sE{N1n}`VIdW{k$LgHbi+u=zukNSXPq|+dCm#4nJpHnI%i3cT
zKXHi&cO6uG<i%aN-_I}G%x7nMJ-G3sw(&xBU37EH)R7MkFRYuR-c;?lXY^^eb*g*2
zzPZX@VXxG`^?ktn%O%$*4gMicJwrmAZ63b)RKV~a=(iq1H{(A`B_p4?j_$@kkMGxY
z|F18z{?j|46})9HFI4S3{{Xhrqu=>;_4#?e0e)<!hvI`@;n69bcMS2kQv}a-e#79&
zc<lH`BcIbVhX6d?{(ltzE%4{_nepEn=x%3<4YvLNqaq};P+WCS@Bg>Ai;%=@U@`mu
zdl`=$|IZrm*9A|t{>MZ6|M~s`CjPTm@TC6l7^KfuM|b+4&qL=w36S#V^SLPg*PqMv
zW%Pe<;NAGR2)5Hm<f5^oB4?uQl!M?k&=GCdc&~i80e*Q?Ve_a^4USO+sRANGiL<nr
zk^}sJ5+i^wmk!?y^yLLYKi-QAdwX?gA$q6oKt;udIh^X>-|<DR<C{Lnd<;-Wrf69#
z=OO5_JNeJ04`5=yG-0fe#j0K7`~XAKxIytTqA)XyWipux3(H$tTHvfMV$1_{6p0;`
z7?;EfzIs{?Zvvub3PrhRm#h-Lz~VYK_A{CNkB60>!GHQ;#kkGbK>kU*ZBz0x=Yp{%
zZ2>P|UNq<W_W9)X6ZhAj!<BY}H<q5bf&>s17B_Qu$fD)XMf%SlPa6L=BmS&)bhrM`
zr{n+p{Gk8GhgJaje||h>|9`LG5#!$lUG(_(@EL^Gv^b9${{oPKsj@j14FHEf&o|J|
z*P;Pj2SguawQB%7hk-o)s+}7bu-Y|%(+zalh3w*&vi_g}`m&G)s4hsXuP$k7YSLF{
z>g)6LdcA?gGZaV-27|GHWh{?2)@K@x#+F2v7HvpNO=62759*56nvm9-=+@R&Q)+>!
zJkQirW73zH^yMafjmc1GGL)DM<t9V5skH{G7jt!?xt?Wif`2Y%!#K0i(`+=FTSCk&
z(dL#^b4#n)RAV;nF`JsqCcW8YFq>eC$!yk}%?7jCXg0T+%_cJg20adF>(+T;=-nnV
zdC!}h=L}Yo$-xck37y5_OWW4ik5D^DdcL=Kyz{r)GgsakKOpkjODjIRIj-NtJ9qt(
zPqQ!f3I6Ksx}tIC;|DBR;D=)q_WKOEAGjmBG2ChVc&9~np?#<LxGfcq5em00D_CF4
z8t&z=rqWU5ymG4ll%elb_BmfYurOw-lSka#hF^xy@55r(><MKjk5D0<`TyiHJktJK
z=Jq{SNB8f4I<5b}xd5F1@%fDX?-e{@p@r?#@sQ9049EyAr6D9)6fOhVxJHY-0qe^d
zpw($99Qp(g6_G&?Qi`GM6bZCy9R7o;WB`}T2`PcAq&kp8Q0b7e7E|E>^#CAL6t0nD
zQk=tfilPva91THHxC%Z2@j5D<RB@OW$~}iij{j#3`0j$Ic>g2d`b|OSzw!K;^WS>~
zPwf95dIj6v{Lf$D-=Y6~1@!(;9&`S0uV4aH`Lb97s$U<V){rPH5hyVgoc}A)@!wif
zPUT=4ob5CLgpz8VhDb}NfJdk&n)C^L=$Rjg#xa#od^({Z)M^~WV5&5j9hDHJL;Ve@
zrfD!GQsr_Dj<=Hx0y;7aNHG=Spxv?nf<iW8GO0lXl%$N1>rh&jN(QY1I)@zE2c;H}
za{4ABE*V7NDqI5%PJEU`K}bOiA;nc%nqv&sjuN%$(DF!hbct}pLz0yT5KcnE^t?6*
z;LsMqI&7BB7g4ZQW2Na0NDc77D8#u2kZM%U6SAuV3TWlpi*iuON43AR0fpuaQBEhJ
z$f$Hk6E-r3P$+<ewuJI5g*PGrGlRKNqR83FA|Q-Q0ds|kiNZKhN)T;2N%$0<(@v8j
zlxhV5DZ_?oFcqbP%p(f1VTqxUu!t}uDke&lf|?K>C5j76N&?}t6M+!K3ll|Ap~*4A
zL=c~x7(Y8Hi~~Rtj@Y85_;?uuIV7eep&Vs6g%JvEd&^T`*J>eq3K>YpvT@kOQk=*}
z_8)o-YTcjgJ_V^tv$zOUCrJhYLJm|U<xRT=IPxw2(6Oj^N8fsbD3z4s4g7d87pBTo
zK;b7*Fh8UbPRJqsa0N+fyg>-5rBL=*AyiPlJRaAFH-*dd2FXc64swX3bYSmXt6B_g
z*NR{&5UQc{rF3;2>1-!pJuV-(OE4|&juIp|6dNv<6AJX33A7%xELM<d1gttxPN-yJ
z>rjNZuqJ7y?H+y;*_c#^$e>Gx%b{qMWHv6g>S~k<fb|AU1IbXWaiE6Rz|m}Z7HoMa
z<2+o@!}{%M$)&-yY7#O6g)1XLKIB-5QTdi<09bB0>6B6d@?c(ia0XI%E(NAd2kuq@
zSy_{D++jPcVt|h+O%@K8bRm_YZ71Xrn5BmOhI@j%d^J==`2c-FcGU{#7mDdh-L2e0
z%GUqHuv0TVY>jJA_FQ7C3eraZ&|hpPT96cO6JlqfTe3fG47WvSRF+0%X<(L0fkOf`
z8BT{ZXLwjymx(1hch85r1XgFskJ#y25h1fx6Kqq|(>gk{6YsDxX%=qd2uW1T=knXz
lPJcXav%`P^0|pEjFkrxd0RsjM7%=EX{0^uzbfy4!001CPd#eBd

literal 0
HcmV?d00001

diff --git a/test/functional/repositories_mercurial_controller_test.rb b/test/functional/repositories_mercurial_controller_test.rb
new file mode 100644
index 000000000..db0029017
--- /dev/null
+++ b/test/functional/repositories_mercurial_controller_test.rb
@@ -0,0 +1,117 @@
+# 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 File.dirname(__FILE__) + '/../test_helper'
+require 'repositories_controller'
+
+# Re-raise errors caught by the controller.
+class RepositoriesController; def rescue_action(e) raise e end; end
+
+class RepositoriesMercurialControllerTest < Test::Unit::TestCase
+  fixtures :projects, :users, :roles, :members, :repositories, :enabled_modules
+
+  # No '..' in the repository path
+  REPOSITORY_PATH = RAILS_ROOT.gsub(%r{config\/\.\.}, '') + '/tmp/test/mercurial_repository'
+
+  def setup
+    @controller = RepositoriesController.new
+    @request    = ActionController::TestRequest.new
+    @response   = ActionController::TestResponse.new
+    User.current = nil
+    Repository::Mercurial.create(:project => Project.find(3), :url => REPOSITORY_PATH)
+  end
+  
+  def test_show
+    get :show, :id => 3
+    assert_response :success
+    assert_template 'show'
+    assert_not_nil assigns(:entries)
+    assert_not_nil assigns(:changesets)
+  end
+  
+  def test_browse_root
+    get :browse, :id => 3
+    assert_response :success
+    assert_template 'browse'
+    assert_not_nil assigns(:entries)
+    assert_equal 3, assigns(:entries).size
+    assert assigns(:entries).detect {|e| e.name == 'images' && e.kind == 'dir'}
+    assert assigns(:entries).detect {|e| e.name == 'sources' && e.kind == 'dir'}
+    assert assigns(:entries).detect {|e| e.name == 'README' && e.kind == 'file'}
+  end
+  
+  def test_browse_directory
+    get :browse, :id => 3, :path => ['images']
+    assert_response :success
+    assert_template 'browse'
+    assert_not_nil assigns(:entries)
+    assert_equal 2, assigns(:entries).size
+    entry = assigns(:entries).detect {|e| e.name == 'edit.png'}
+    assert_not_nil entry
+    assert_equal 'file', entry.kind
+    assert_equal 'images/edit.png', entry.path
+  end
+  
+  def test_changes
+    get :changes, :id => 3, :path => ['images', 'edit.png']
+    assert_response :success
+    assert_template 'changes'
+    assert_tag :tag => 'h2', :content => 'edit.png'
+  end
+  
+  def test_entry_show
+    get :entry, :id => 3, :path => ['sources', 'watchers_controller.rb']
+    assert_response :success
+    assert_template 'entry'
+    # Line 19
+    assert_tag :tag => 'th',
+               :content => /10/,
+               :attributes => { :class => /line-num/ },
+               :sibling => { :tag => 'td', :content => /WITHOUT ANY WARRANTY/ }
+  end
+  
+  def test_entry_download
+    get :entry, :id => 3, :path => ['sources', 'watchers_controller.rb'], :format => 'raw'
+    assert_response :success
+    # File content
+    assert @response.body.include?('WITHOUT ANY WARRANTY')
+  end
+
+  def test_diff
+    # Full diff of changeset 4
+    get :diff, :id => 3, :rev => 4
+    assert_response :success
+    assert_template 'diff'
+    # Line 22 removed
+    assert_tag :tag => 'th',
+               :content => /22/,
+               :sibling => { :tag => 'td', 
+                             :attributes => { :class => /diff_out/ },
+                             :content => /def remove/ }
+  end
+  
+  def test_annotate
+    get :annotate, :id => 3, :path => ['sources', 'watchers_controller.rb']
+    assert_response :success
+    assert_template 'annotate'
+    # Line 23, revision 4
+    assert_tag :tag => 'th', :content => /23/,
+               :sibling => { :tag => 'td', :child => { :tag => 'a', :content => /4/ } },
+               :sibling => { :tag => 'td', :content => /jsmith/ },
+               :sibling => { :tag => 'td', :content => /watcher =/ }
+  end
+end
diff --git a/test/unit/repository_mercurial_test.rb b/test/unit/repository_mercurial_test.rb
new file mode 100644
index 000000000..e6cfdf9b2
--- /dev/null
+++ b/test/unit/repository_mercurial_test.rb
@@ -0,0 +1,55 @@
+# 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 File.dirname(__FILE__) + '/../test_helper'
+
+class RepositoryMercurialTest < Test::Unit::TestCase
+  fixtures :projects
+  
+  # No '..' in the repository path
+  REPOSITORY_PATH = RAILS_ROOT.gsub(%r{config\/\.\.}, '') + '/tmp/test/mercurial_repository'
+  
+  def setup
+    @project = Project.find(1)
+    assert @repository = Repository::Mercurial.create(:project => @project, :url => REPOSITORY_PATH)
+  end
+  
+  if File.directory?(REPOSITORY_PATH)  
+    def test_fetch_changesets_from_scratch
+      @repository.fetch_changesets
+      @repository.reload
+      
+      assert_equal 6, @repository.changesets.count
+      assert_equal 11, @repository.changes.count
+      assert_equal "Initial import.\nThe repository contains 3 files.", @repository.changesets.find_by_revision(0).comments
+    end
+    
+    def test_fetch_changesets_incremental
+      @repository.fetch_changesets
+      # Remove changesets with revision > 2
+      @repository.changesets.find(:all, :conditions => 'revision > 2').each(&:destroy)
+      @repository.reload
+      assert_equal 3, @repository.changesets.count
+      
+      @repository.fetch_changesets
+      assert_equal 6, @repository.changesets.count
+    end
+  else
+    puts "Mercurial test repository NOT FOUND. Skipping unit tests !!!"
+    def test_fake; assert true end
+  end
+end

From e69631f26c46efe50a0faa800ccd47f33535fd8e Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Fri, 14 Dec 2007 17:47:30 +0000
Subject: [PATCH 069/710] Fixed: missing body closing tag in repository
 annotate and entry views.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@992 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/repositories/annotate.rhtml | 2 +-
 app/views/repositories/entry.rhtml    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/repositories/annotate.rhtml b/app/views/repositories/annotate.rhtml
index b8f481ae5..9a3fc834b 100644
--- a/app/views/repositories/annotate.rhtml
+++ b/app/views/repositories/annotate.rhtml
@@ -17,7 +17,7 @@
     </tr>
     <% line_num += 1 %>
     <% end %>
-  <tbody>
+  </tbody>
 </table>
 </div>
 
diff --git a/app/views/repositories/entry.rhtml b/app/views/repositories/entry.rhtml
index 9927601d7..41565a232 100644
--- a/app/views/repositories/entry.rhtml
+++ b/app/views/repositories/entry.rhtml
@@ -11,7 +11,7 @@
     </tr>
     <% line_num += 1 %>
     <% end %>
-  <tbody>
+  </tbody>
 </table>
 </div>
 

From 38b185f1dc4d296eb49c94a3ccff7496b1367c84 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Fri, 14 Dec 2007 17:48:11 +0000
Subject: [PATCH 070/710] Fixed: empty lines when displaying repository files
 with Windows style eol.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@993 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/repositories_controller.rb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb
index dfd5d0a6f..ef332eb37 100644
--- a/app/controllers/repositories_controller.rb
+++ b/app/controllers/repositories_controller.rb
@@ -92,6 +92,9 @@ class RepositoriesController < ApplicationController
     show_error and return unless @content
     if 'raw' == params[:format]      
       send_data @content, :filename => @path.split('/').last
+    else
+      # Prevent empty lines when displaying a file with Windows style eol
+      @content.gsub!("\r\n", "\n")
     end
   end
   

From 58610ec52af2249c4c5eebf35e11cd827a7966ab Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Fri, 14 Dec 2007 18:54:55 +0000
Subject: [PATCH 071/710] Search engine: issue custom fields can now be
 searched. Each issue custom field (excepting numeric, date and boolean
 fields) can be marked as "Searchable" (default to false).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@994 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/models/custom_field.rb                    |  2 ++
 app/views/custom_fields/_form.rhtml           | 17 ++++++++++----
 .../086_add_custom_fields_searchable.rb       |  9 ++++++++
 lang/bg.yml                                   |  1 +
 lang/cs.yml                                   |  1 +
 lang/de.yml                                   |  1 +
 lang/en.yml                                   |  1 +
 lang/es.yml                                   |  1 +
 lang/fr.yml                                   |  1 +
 lang/he.yml                                   |  1 +
 lang/it.yml                                   |  1 +
 lang/ja.yml                                   |  1 +
 lang/ko.yml                                   |  1 +
 lang/nl.yml                                   |  1 +
 lang/pl.yml                                   |  1 +
 lang/pt-br.yml                                |  1 +
 lang/pt.yml                                   |  1 +
 lang/ro.yml                                   |  1 +
 lang/ru.yml                                   |  1 +
 lang/sr.yml                                   |  1 +
 lang/sv.yml                                   |  1 +
 lang/zh-tw.yml                                |  1 +
 lang/zh.yml                                   |  1 +
 test/fixtures/custom_fields.yml               |  5 ++--
 test/fixtures/custom_values.yml               |  9 +++++++-
 test/functional/search_controller_test.rb     | 15 ++++++++++--
 .../lib/acts_as_searchable.rb                 | 23 +++++++++++++++++--
 27 files changed, 89 insertions(+), 11 deletions(-)
 create mode 100644 db/migrate/086_add_custom_fields_searchable.rb

diff --git a/app/models/custom_field.rb b/app/models/custom_field.rb
index c3b5f2a9f..e1fd8666d 100644
--- a/app/models/custom_field.rb
+++ b/app/models/custom_field.rb
@@ -43,6 +43,8 @@ class CustomField < ActiveRecord::Base
   def before_validation
     # remove empty values
     self.possible_values = self.possible_values.collect{|v| v unless v.empty?}.compact
+    # make sure these fields are not searchable
+    self.searchable = false if %w(int float date bool).include?(field_format)
   end
   
   def validate
diff --git a/app/views/custom_fields/_form.rhtml b/app/views/custom_fields/_form.rhtml
index 013be9b70..915daab32 100644
--- a/app/views/custom_fields/_form.rhtml
+++ b/app/views/custom_fields/_form.rhtml
@@ -7,21 +7,32 @@ function toggle_custom_field_format() {
   p_length = $("custom_field_min_length");
   p_regexp = $("custom_field_regexp");
   p_values = $("custom_field_possible_values");
+  p_searchable = $("custom_field_searchable");
   switch (format.value) {
     case "list":
       Element.hide(p_length.parentNode);
       Element.hide(p_regexp.parentNode);
+      Element.show(p_searchable.parentNode);
       Element.show(p_values);
       break;
     case "date":
     case "bool":
       Element.hide(p_length.parentNode);
       Element.hide(p_regexp.parentNode);
+      Element.hide(p_searchable.parentNode);
+      Element.hide(p_values);
+      break;
+    case "float":
+    case "int":
+      Element.show(p_length.parentNode);
+      Element.show(p_regexp.parentNode);
+      Element.hide(p_searchable.parentNode);
       Element.hide(p_values);
       break;
     default:
       Element.show(p_length.parentNode);
       Element.show(p_regexp.parentNode);
+      Element.show(p_searchable.parentNode);
       Element.hide(p_values);
       break;
   }
@@ -47,7 +58,6 @@ function deleteValueField(e) {
 //]]>
 </script>
 
-<!--[form:custom_field]-->
 <div class="box">
 <p><%= f.text_field :name, :required => true %></p>
 <p><%= f.select :field_format, custom_field_formats_for_select, {}, :onchange => "toggle_custom_field_format();" %></p>
@@ -59,11 +69,8 @@ function deleteValueField(e) {
 <% (@custom_field.possible_values.to_a + [""]).each do |value| %>
 <span><%= text_field_tag 'custom_field[possible_values][]', value, :size => 30 %> <%= image_to_function "delete.png", "deleteValueField(this);return false" %><br /></span>
 <% end %>
-
 </p>
 </div>
-<%= javascript_tag "toggle_custom_field_format();" %>
-<!--[eoform:custom_field]-->
 
 <div class="box">
 <% case @custom_field.type.to_s
@@ -78,6 +85,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>
+    <p><%= f.check_box :searchable %></p>
     
 <% when "UserCustomField" %>
     <p><%= f.check_box :is_required %></p>
@@ -87,3 +95,4 @@ when "IssueCustomField" %>
 
 <% end %>
 </div>
+<%= javascript_tag "toggle_custom_field_format();" %>
diff --git a/db/migrate/086_add_custom_fields_searchable.rb b/db/migrate/086_add_custom_fields_searchable.rb
new file mode 100644
index 000000000..53158d14e
--- /dev/null
+++ b/db/migrate/086_add_custom_fields_searchable.rb
@@ -0,0 +1,9 @@
+class AddCustomFieldsSearchable < ActiveRecord::Migration
+  def self.up
+    add_column :custom_fields, :searchable, :boolean, :default => false
+  end
+
+  def self.down
+    remove_column :custom_fields, :searchable
+  end
+end
diff --git a/lang/bg.yml b/lang/bg.yml
index 590952681..d9bcd6c7c 100644
--- a/lang/bg.yml
+++ b/lang/bg.yml
@@ -549,3 +549,4 @@ text_caracters_minimum: Must be at least %d characters long.
 setting_bcc_recipients: Blind carbon copy recipients (bcc)
 button_annotate: Annotate
 label_issues_by: Issues by %s
+field_searchable: Searchable
diff --git a/lang/cs.yml b/lang/cs.yml
index 816f9b92e..fe29defe6 100644
--- a/lang/cs.yml
+++ b/lang/cs.yml
@@ -549,3 +549,4 @@ text_caracters_minimum: Must be at least %d characters long.
 setting_bcc_recipients: Blind carbon copy recipients (bcc)
 button_annotate: Annotate
 label_issues_by: Issues by %s
+field_searchable: Searchable
diff --git a/lang/de.yml b/lang/de.yml
index 046ed9994..c9cdc0c12 100644
--- a/lang/de.yml
+++ b/lang/de.yml
@@ -549,3 +549,4 @@ text_caracters_minimum: Muss mindestens %d Zeichen lang sein.
 setting_bcc_recipients: Blind carbon copy recipients (bcc)
 button_annotate: Annotate
 label_issues_by: Issues by %s
+field_searchable: Searchable
diff --git a/lang/en.yml b/lang/en.yml
index 104e7fe6e..116935f73 100644
--- a/lang/en.yml
+++ b/lang/en.yml
@@ -170,6 +170,7 @@ field_redirect_existing_links: Redirect existing links
 field_estimated_hours: Estimated time
 field_column_names: Columns
 field_time_zone: Time zone
+field_searchable: Searchable
 
 setting_app_title: Application title
 setting_app_subtitle: Application subtitle
diff --git a/lang/es.yml b/lang/es.yml
index d806d066e..50c652f2c 100644
--- a/lang/es.yml
+++ b/lang/es.yml
@@ -552,3 +552,4 @@ setting_time_format: Formato de hora
 setting_bcc_recipients: Blind carbon copy recipients (bcc)
 button_annotate: Annotate
 label_issues_by: Issues by %s
+field_searchable: Searchable
diff --git a/lang/fr.yml b/lang/fr.yml
index 36ccc463f..d6ad5da56 100644
--- a/lang/fr.yml
+++ b/lang/fr.yml
@@ -170,6 +170,7 @@ field_redirect_existing_links: Rediriger les liens existants
 field_estimated_hours: Temps estimé
 field_column_names: Colonnes
 field_time_zone: Fuseau horaire
+field_searchable: Utilisé pour les recherches
 
 setting_app_title: Titre de l'application
 setting_app_subtitle: Sous-titre de l'application
diff --git a/lang/he.yml b/lang/he.yml
index 6be1a4c77..0ed57e527 100644
--- a/lang/he.yml
+++ b/lang/he.yml
@@ -549,3 +549,4 @@ text_caracters_minimum: Must be at least %d characters long.
 setting_bcc_recipients: Blind carbon copy recipients (bcc)
 button_annotate: Annotate
 label_issues_by: Issues by %s
+field_searchable: Searchable
diff --git a/lang/it.yml b/lang/it.yml
index 8a3e954f4..d266f797e 100644
--- a/lang/it.yml
+++ b/lang/it.yml
@@ -549,3 +549,4 @@ text_caracters_minimum: Must be at least %d characters long.
 setting_bcc_recipients: Blind carbon copy recipients (bcc)
 button_annotate: Annotate
 label_issues_by: Issues by %s
+field_searchable: Searchable
diff --git a/lang/ja.yml b/lang/ja.yml
index 1ecfb1ae9..bfe120cfe 100644
--- a/lang/ja.yml
+++ b/lang/ja.yml
@@ -550,3 +550,4 @@ text_caracters_minimum: Must be at least %d characters long.
 setting_bcc_recipients: Blind carbon copy recipients (bcc)
 button_annotate: Annotate
 label_issues_by: Issues by %s
+field_searchable: Searchable
diff --git a/lang/ko.yml b/lang/ko.yml
index ef081e622..76debf345 100644
--- a/lang/ko.yml
+++ b/lang/ko.yml
@@ -549,3 +549,4 @@ text_caracters_minimum: Must be at least %d characters long.
 setting_bcc_recipients: Blind carbon copy recipients (bcc)
 button_annotate: Annotate
 label_issues_by: Issues by %s
+field_searchable: Searchable
diff --git a/lang/nl.yml b/lang/nl.yml
index 24a343eb3..a8b5cc64a 100644
--- a/lang/nl.yml
+++ b/lang/nl.yml
@@ -550,3 +550,4 @@ text_caracters_minimum: Must be at least %d characters long.
 setting_bcc_recipients: Blind carbon copy recipients (bcc)
 button_annotate: Annotate
 label_issues_by: Issues by %s
+field_searchable: Searchable
diff --git a/lang/pl.yml b/lang/pl.yml
index 222c7ea9d..5fa50ec51 100644
--- a/lang/pl.yml
+++ b/lang/pl.yml
@@ -549,3 +549,4 @@ text_caracters_minimum: Musi być nie krótsze niż %d znaków.
 setting_bcc_recipients: Odbiorcy kopii tajnej (kt/bcc)
 button_annotate: Adnotuj
 label_issues_by: Zagadnienia wprowadzone przez %s
+field_searchable: Searchable
diff --git a/lang/pt-br.yml b/lang/pt-br.yml
index 8c903edd4..ed31915dd 100644
--- a/lang/pt-br.yml
+++ b/lang/pt-br.yml
@@ -549,3 +549,4 @@ text_caracters_minimum: Must be at least %d characters long.
 setting_bcc_recipients: Blind carbon copy recipients (bcc)
 button_annotate: Annotate
 label_issues_by: Issues by %s
+field_searchable: Searchable
diff --git a/lang/pt.yml b/lang/pt.yml
index 10de07b5f..72ba4d2b0 100644
--- a/lang/pt.yml
+++ b/lang/pt.yml
@@ -549,3 +549,4 @@ text_caracters_minimum: Must be at least %d characters long.
 setting_bcc_recipients: Blind carbon copy recipients (bcc)
 button_annotate: Annotate
 label_issues_by: Issues by %s
+field_searchable: Searchable
diff --git a/lang/ro.yml b/lang/ro.yml
index f7d3acd56..6f1eb7810 100644
--- a/lang/ro.yml
+++ b/lang/ro.yml
@@ -549,3 +549,4 @@ text_caracters_minimum: Must be at least %d characters long.
 setting_bcc_recipients: Blind carbon copy recipients (bcc)
 button_annotate: Annotate
 label_issues_by: Issues by %s
+field_searchable: Searchable
diff --git a/lang/ru.yml b/lang/ru.yml
index cad357c0c..c7697ae1a 100644
--- a/lang/ru.yml
+++ b/lang/ru.yml
@@ -549,3 +549,4 @@ text_caracters_minimum: Must be at least %d characters long.
 setting_bcc_recipients: Blind carbon copy recipients (bcc)
 button_annotate: Annotate
 label_issues_by: Issues by %s
+field_searchable: Searchable
diff --git a/lang/sr.yml b/lang/sr.yml
index f9008d890..b5e9ecfe3 100644
--- a/lang/sr.yml
+++ b/lang/sr.yml
@@ -550,3 +550,4 @@ text_caracters_minimum: Must be at least %d characters long.
 setting_bcc_recipients: Blind carbon copy recipients (bcc)
 button_annotate: Annotate
 label_issues_by: Issues by %s
+field_searchable: Searchable
diff --git a/lang/sv.yml b/lang/sv.yml
index a4f55a17a..d789a2a37 100644
--- a/lang/sv.yml
+++ b/lang/sv.yml
@@ -550,3 +550,4 @@ text_caracters_minimum: Must be at least %d characters long.
 setting_bcc_recipients: Blind carbon copy recipients (bcc)
 button_annotate: Annotate
 label_issues_by: Issues by %s
+field_searchable: Searchable
diff --git a/lang/zh-tw.yml b/lang/zh-tw.yml
index af0fd3ed4..4d730c1a9 100644
--- a/lang/zh-tw.yml
+++ b/lang/zh-tw.yml
@@ -549,3 +549,4 @@ default_activity_development: 開發
 enumeration_issue_priorities: 項目重要性
 enumeration_doc_categories: 文件分類
 enumeration_activities: 活動 (time tracking)
+field_searchable: Searchable
diff --git a/lang/zh.yml b/lang/zh.yml
index de4ae1ece..6876daa17 100644
--- a/lang/zh.yml
+++ b/lang/zh.yml
@@ -552,3 +552,4 @@ text_caracters_minimum: Must be at least %d characters long.
 setting_bcc_recipients: Blind carbon copy recipients (bcc)
 button_annotate: Annotate
 label_issues_by: Issues by %s
+field_searchable: Searchable
diff --git a/test/fixtures/custom_fields.yml b/test/fixtures/custom_fields.yml
index ce7509fe9..e73e6de96 100644
--- a/test/fixtures/custom_fields.yml
+++ b/test/fixtures/custom_fields.yml
@@ -11,16 +11,17 @@ custom_fields_001:
   is_required: false
   field_format: list
 custom_fields_002: 
-  name: Build
+  name: Searchable field
   min_length: 1
   regexp: ""
   is_for_all: true
   type: IssueCustomField
-  max_length: 10
+  max_length: 100
   possible_values: ""
   id: 2
   is_required: false
   field_format: string
+  searchable: true
 custom_fields_003: 
   name: Development status
   min_length: 0
diff --git a/test/fixtures/custom_values.yml b/test/fixtures/custom_values.yml
index b71227971..572142889 100644
--- a/test/fixtures/custom_values.yml
+++ b/test/fixtures/custom_values.yml
@@ -46,4 +46,11 @@ custom_values_008:
   custom_field_id: 1
   customized_id: 3
   id: 11
-  value: "MySQL"
\ No newline at end of file
+  value: "MySQL"
+custom_values_009: 
+  customized_type: Issue
+  custom_field_id: 2
+  customized_id: 3
+  id: 12
+  value: "this is a stringforcustomfield search"
+  
\ No newline at end of file
diff --git a/test/functional/search_controller_test.rb b/test/functional/search_controller_test.rb
index 5e3673a4e..330cd0de0 100644
--- a/test/functional/search_controller_test.rb
+++ b/test/functional/search_controller_test.rb
@@ -5,7 +5,7 @@ require 'search_controller'
 class SearchController; def rescue_action(e) raise e end; end
 
 class SearchControllerTest < Test::Unit::TestCase
-  fixtures :projects, :issues
+  fixtures :projects, :issues, :custom_fields, :custom_values
   
   def setup
     @controller = SearchController.new
@@ -25,7 +25,9 @@ class SearchControllerTest < Test::Unit::TestCase
     assert assigns(:results).include?(Project.find(1))
   end
   
-  def test_search_in_project
+  def test_search_without_searchable_custom_fields
+    CustomField.update_all "searchable = #{ActiveRecord::Base.connection.quoted_false}"
+    
     get :index, :id => 1
     assert_response :success
     assert_template 'index'
@@ -36,6 +38,15 @@ class SearchControllerTest < Test::Unit::TestCase
     assert_template 'index'
   end
   
+  def test_search_with_searchable_custom_fields
+    get :index, :id => 1, :q => "stringforcustomfield"
+    assert_response :success
+    results = assigns(:results)
+    assert_not_nil results
+    assert_equal 1, results.size
+    assert results.include?(Issue.find(3))
+  end
+  
   def test_quick_jump_to_issue
     # issue of a public project
     get :index, :q => "3"
diff --git a/vendor/plugins/acts_as_searchable/lib/acts_as_searchable.rb b/vendor/plugins/acts_as_searchable/lib/acts_as_searchable.rb
index e2a323abb..1dd88978c 100644
--- a/vendor/plugins/acts_as_searchable/lib/acts_as_searchable.rb
+++ b/vendor/plugins/acts_as_searchable/lib/acts_as_searchable.rb
@@ -49,6 +49,9 @@ module Redmine
             raise 'No date column defined defined.'
           end
           
+          # Should we search custom fields on this model ?
+          searchable_options[:search_custom_fields] = !reflect_on_association(:custom_values).nil?
+          
           send :include, Redmine::Acts::Searchable::InstanceMethods
         end
       end
@@ -67,11 +70,27 @@ module Redmine
             columns = searchable_options[:columns]
             columns.slice!(1..-1) if options[:titles_only]
             
-            sql = ([ '(' + columns.collect {|column| "(LOWER(#{column}) LIKE ?)"}.join(' OR ') + ')' ] * tokens.size).join(options[:all_words] ? ' AND ' : ' OR ')
+            token_clauses = columns.collect {|column| "(LOWER(#{column}) LIKE ?)"}
+            
+            if !options[:titles_only] && searchable_options[:search_custom_fields]
+              searchable_custom_field_ids = CustomField.find(:all,
+                                                             :select => 'id',
+                                                             :conditions => { :type => "#{self.name}CustomField",
+                                                                              :searchable => true }).collect(&:id)
+              if searchable_custom_field_ids.any?
+                custom_field_sql = "#{table_name}.id IN (SELECT customized_id FROM #{CustomValue.table_name}" +
+                  " WHERE customized_type='#{self.name}' AND customized_id=#{table_name}.id AND LOWER(value) LIKE ?" +
+                  " AND #{CustomValue.table_name}.custom_field_id IN (#{searchable_custom_field_ids.join(',')}))"
+                token_clauses << custom_field_sql
+              end
+            end
+            
+            sql = ([token_clauses.join(' OR ')] * tokens.size).join(options[:all_words] ? ' AND ' : ' OR ')
+            
             if options[:offset]
               sql = "(#{sql}) AND (#{searchable_options[:date_column]} " + (options[:before] ? '<' : '>') + "'#{connection.quoted_date(options[:offset])}')"
             end
-            find_options[:conditions] = [sql, * (tokens * columns.size).sort]
+            find_options[:conditions] = [sql, * (tokens * token_clauses.size).sort]
             
             results = with_scope(:find => {:conditions => ["#{searchable_options[:project_key]} = ?", project.id]}) do
               find(:all, find_options)

From d1a3fbea4087bdf5bb06b2bf231a2fe9bda65201 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Fri, 14 Dec 2007 21:31:30 +0000
Subject: [PATCH 072/710] Fixed Trac importer error with Rails 2.0: readonly?
 is defined by ActiveRecord.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@995 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 lib/tasks/migrate_from_trac.rake | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/lib/tasks/migrate_from_trac.rake b/lib/tasks/migrate_from_trac.rake
index 37514df01..828027b87 100644
--- a/lib/tasks/migrate_from_trac.rake
+++ b/lib/tasks/migrate_from_trac.rake
@@ -145,6 +145,11 @@ namespace :redmine do
       
       class TracWikiPage < ActiveRecord::Base
         set_table_name :wiki  
+        
+        def self.columns
+          # Hides readonly Trac field to prevent clash with AR readonly? method (Rails 2.0)
+          super.select {|column| column.name.to_s != 'readonly'}
+        end
       end
       
       class TracPermission < ActiveRecord::Base

From 777edc13c1378810371631c3c897c11f314db7c1 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Fri, 14 Dec 2007 21:47:57 +0000
Subject: [PATCH 073/710] Fixed: can not save numeric, date and boolean custom
 fields (broken by r994).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@996 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/models/custom_field.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/models/custom_field.rb b/app/models/custom_field.rb
index e1fd8666d..5a134c4ec 100644
--- a/app/models/custom_field.rb
+++ b/app/models/custom_field.rb
@@ -45,6 +45,7 @@ class CustomField < ActiveRecord::Base
     self.possible_values = self.possible_values.collect{|v| v unless v.empty?}.compact
     # make sure these fields are not searchable
     self.searchable = false if %w(int float date bool).include?(field_format)
+    true
   end
   
   def validate

From 963b1283c2881b0b9fae4c5b2154f835dd4761c6 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Fri, 14 Dec 2007 21:49:23 +0000
Subject: [PATCH 074/710] Fixed Bazaar test repository path.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@997 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 test/unit/repository_bazaar_test.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/unit/repository_bazaar_test.rb b/test/unit/repository_bazaar_test.rb
index 6b21607bc..15fcc8672 100644
--- a/test/unit/repository_bazaar_test.rb
+++ b/test/unit/repository_bazaar_test.rb
@@ -22,7 +22,8 @@ class RepositoryBazaarTest < Test::Unit::TestCase
   
   # No '..' in the repository path
   REPOSITORY_PATH = RAILS_ROOT.gsub(%r{config\/\.\.}, '') + '/tmp/test/bazaar_repository'
-  
+  REPOSITORY_PATH.gsub!(/\/+/, '/')
+
   def setup
     @project = Project.find(1)
     assert @repository = Repository::Bazaar.create(:project => @project, :url => "file:///#{REPOSITORY_PATH}")

From 27d6334afaceb95a4fdad4a3691cf22429a8e64e Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Fri, 14 Dec 2007 22:00:03 +0000
Subject: [PATCH 075/710] Fixed: Unable to create a wiki (Rails 2.0
 compatibility).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@998 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/wikis_controller.rb      |  2 +-
 test/fixtures/enabled_modules.yml        |  4 +++
 test/functional/wikis_controller_test.rb | 43 ++++++++++++++++++++++++
 3 files changed, 48 insertions(+), 1 deletion(-)
 create mode 100644 test/functional/wikis_controller_test.rb

diff --git a/app/controllers/wikis_controller.rb b/app/controllers/wikis_controller.rb
index 146aaac8a..a222570ef 100644
--- a/app/controllers/wikis_controller.rb
+++ b/app/controllers/wikis_controller.rb
@@ -23,7 +23,7 @@ class WikisController < ApplicationController
   def edit
     @wiki = @project.wiki || Wiki.new(:project => @project)
     @wiki.attributes = params[:wiki]
-    @wiki.save if @request.post?
+    @wiki.save if request.post?
     render(:update) {|page| page.replace_html "tab-content-wiki", :partial => 'projects/settings/wiki'}
   end
 
diff --git a/test/fixtures/enabled_modules.yml b/test/fixtures/enabled_modules.yml
index dfc2f0090..8d1565534 100644
--- a/test/fixtures/enabled_modules.yml
+++ b/test/fixtures/enabled_modules.yml
@@ -35,4 +35,8 @@ enabled_modules_009:
   name: repository
   project_id: 3
   id: 9
+enabled_modules_010: 
+  name: wiki
+  project_id: 3
+  id: 10
   
\ No newline at end of file
diff --git a/test/functional/wikis_controller_test.rb b/test/functional/wikis_controller_test.rb
new file mode 100644
index 000000000..a343fdaaf
--- /dev/null
+++ b/test/functional/wikis_controller_test.rb
@@ -0,0 +1,43 @@
+# 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 File.dirname(__FILE__) + '/../test_helper'
+require 'wikis_controller'
+
+# Re-raise errors caught by the controller.
+class WikisController; def rescue_action(e) raise e end; end
+
+class WikisControllerTest < Test::Unit::TestCase
+  fixtures :projects, :users, :roles, :members, :enabled_modules, :wikis
+  
+  def setup
+    @controller = WikisController.new
+    @request    = ActionController::TestRequest.new
+    @response   = ActionController::TestResponse.new
+    User.current = nil
+  end
+  
+  def test_create_wiki
+    @request.session[:user_id] = 1
+    assert_nil Project.find(3).wiki
+    post :edit, :id => 3, :wiki => { :start_page => 'Start page' }
+    assert_response :success
+    wiki = Project.find(3).wiki
+    assert_not_nil wiki
+    assert_equal 'Start page', wiki.start_page
+  end
+end

From 361c50c1f410ce575631bfb59cfdcdf5353d331b Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sat, 15 Dec 2007 11:57:06 +0000
Subject: [PATCH 076/710] Added some functional tests (wiki).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@999 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 test/fixtures/roles.yml                  |   2 +-
 test/fixtures/wiki_content_versions.yml  |  14 ++-
 test/fixtures/wiki_contents.yml          |  12 ++
 test/fixtures/wiki_pages.yml             |   6 +
 test/functional/wiki_controller_test.rb  | 145 +++++++++++++++++++++++
 test/functional/wikis_controller_test.rb |  15 ++-
 6 files changed, 191 insertions(+), 3 deletions(-)
 create mode 100644 test/functional/wiki_controller_test.rb

diff --git a/test/fixtures/roles.yml b/test/fixtures/roles.yml
index 70490286f..a089a98f9 100644
--- a/test/fixtures/roles.yml
+++ b/test/fixtures/roles.yml
@@ -39,7 +39,6 @@ roles_005:
     - :view_time_entries
     - :view_documents
     - :view_wiki_pages
-    - :edit_wiki_pages
     - :view_files
     - :browse_repository
     - :view_changesets
@@ -75,6 +74,7 @@ roles_001:
     - :view_wiki_pages
     - :edit_wiki_pages
     - :delete_wiki_pages
+    - :rename_wiki_pages
     - :add_messages
     - :edit_messages
     - :delete_messages
diff --git a/test/fixtures/wiki_content_versions.yml b/test/fixtures/wiki_content_versions.yml
index c433fc5dd..547030ccf 100644
--- a/test/fixtures/wiki_content_versions.yml
+++ b/test/fixtures/wiki_content_versions.yml
@@ -37,4 +37,16 @@ wiki_content_versions_003:
   data: |-
     h1. CookBook documentation
     Some updated [[documentation]] here...
-
+wiki_content_versions_004: 
+  data: |-
+    h1. Another page
+    
+    This is a link to a ticket: #2
+  updated_on: 2007-03-08 00:18:07 +01:00
+  page_id: 2
+  wiki_content_id: 2
+  id: 4
+  version: 1
+  author_id: 1
+  comments: 
+  
diff --git a/test/fixtures/wiki_contents.yml b/test/fixtures/wiki_contents.yml
index 1f4ffc36d..a230b9c08 100644
--- a/test/fixtures/wiki_contents.yml
+++ b/test/fixtures/wiki_contents.yml
@@ -10,3 +10,15 @@ wiki_contents_001:
   version: 3
   author_id: 1
   comments: Gzip compression activated
+wiki_contents_002: 
+  text: |-
+    h1. Another page
+    
+    This is a link to a ticket: #2
+  updated_on: 2007-03-08 00:18:07 +01:00
+  page_id: 2
+  id: 2
+  version: 1
+  author_id: 1
+  comments: 
+  
\ No newline at end of file
diff --git a/test/fixtures/wiki_pages.yml b/test/fixtures/wiki_pages.yml
index d488add26..ca9d6f5dc 100644
--- a/test/fixtures/wiki_pages.yml
+++ b/test/fixtures/wiki_pages.yml
@@ -4,3 +4,9 @@ wiki_pages_001:
   title: CookBook_documentation
   id: 1
   wiki_id: 1
+wiki_pages_002: 
+  created_on: 2007-03-08 00:18:07 +01:00
+  title: Another_page
+  id: 2
+  wiki_id: 1
+  
\ No newline at end of file
diff --git a/test/functional/wiki_controller_test.rb b/test/functional/wiki_controller_test.rb
new file mode 100644
index 000000000..6ee5ab276
--- /dev/null
+++ b/test/functional/wiki_controller_test.rb
@@ -0,0 +1,145 @@
+# 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 File.dirname(__FILE__) + '/../test_helper'
+require 'wiki_controller'
+
+# Re-raise errors caught by the controller.
+class WikiController; def rescue_action(e) raise e end; end
+
+class WikiControllerTest < Test::Unit::TestCase
+  fixtures :projects, :users, :roles, :members, :enabled_modules, :wikis, :wiki_pages, :wiki_contents, :wiki_content_versions
+  
+  def setup
+    @controller = WikiController.new
+    @request    = ActionController::TestRequest.new
+    @response   = ActionController::TestResponse.new
+    User.current = nil
+  end
+  
+  def test_show_start_page
+    get :index, :id => 1
+    assert_response :success
+    assert_template 'show'
+    assert_tag :tag => 'h1', :content => /CookBook documentation/
+  end
+  
+  def test_show_page_with_name
+    get :index, :id => 1, :page => 'Another_page'
+    assert_response :success
+    assert_template 'show'
+    assert_tag :tag => 'h1', :content => /Another page/
+  end
+  
+  def test_show_unexistent_page_without_edit_right
+    get :index, :id => 1, :page => 'Unexistent page'
+    assert_response 404
+  end
+  
+  def test_show_unexistent_page_with_edit_right
+    @request.session[:user_id] = 2
+    get :index, :id => 1, :page => 'Unexistent page'
+    assert_response :success
+    assert_template 'edit'
+  end
+  
+  def test_create_page
+    @request.session[:user_id] = 2
+    post :edit, :id => 1,
+                :page => 'New page',
+                :content => {:comments => 'Created the page',
+                             :text => "h1. New page\n\nThis is a new page",
+                             :version => 0}
+    assert_redirected_to 'wiki/1/New_page'
+    page = Project.find(1).wiki.find_page('New page')
+    assert !page.new_record?
+    assert_not_nil page.content
+    assert_equal 'Created the page', page.content.comments
+  end
+  
+  def test_preview
+    @request.session[:user_id] = 2
+    xhr :post, :preview, :id => 1, :page => 'CookBook_documentation',
+                                   :content => { :comments => '',
+                                                 :text => 'this is a *previewed text*',
+                                                 :version => 3 }
+    assert_response :success
+    assert_template 'common/_preview'
+    assert_tag :tag => 'strong', :content => /previewed text/
+  end
+  
+  def test_history
+    get :history, :id => 1, :page => 'CookBook_documentation'
+    assert_response :success
+    assert_template 'history'
+    assert_not_nil assigns(:versions)
+    assert_equal 3, assigns(:versions).size
+  end
+  
+  def test_diff
+    get :diff, :id => 1, :page => 'CookBook_documentation', :version => 2, :version_from => 1
+    assert_response :success
+    assert_template 'diff'
+    assert_tag :tag => 'span', :attributes => { :class => 'diff_in'},
+                               :content => /updated/
+  end
+  
+  def test_rename_with_redirect
+    @request.session[:user_id] = 2
+    post :rename, :id => 1, :page => 'Another_page',
+                            :wiki_page => { :title => 'Another renamed page',
+                                            :redirect_existing_links => 1 }
+    assert_redirected_to 'wiki/1/Another_renamed_page'
+    wiki = Project.find(1).wiki
+    # Check redirects
+    assert_not_nil wiki.find_page('Another page')
+    assert_nil wiki.find_page('Another page', :with_redirect => false)
+  end
+
+  def test_rename_without_redirect
+    @request.session[:user_id] = 2
+    post :rename, :id => 1, :page => 'Another_page',
+                            :wiki_page => { :title => 'Another renamed page',
+                                            :redirect_existing_links => "0" }
+    assert_redirected_to 'wiki/1/Another_renamed_page'
+    wiki = Project.find(1).wiki
+    # Check that there's no redirects
+    assert_nil wiki.find_page('Another page')
+  end
+  
+  def test_destroy
+    @request.session[:user_id] = 2
+    post :destroy, :id => 1, :page => 'CookBook_documentation'
+    assert_redirected_to 'wiki/1/Page_index/special'
+  end
+  
+  def test_page_index
+    get :special, :id => 1, :page => 'Page_index'
+    assert_response :success
+    assert_template 'special_page_index'
+    pages = assigns(:pages)
+    assert_not_nil pages
+    assert_equal 2, pages.size
+    assert_tag :tag => 'a', :attributes => { :href => '/wiki/1/CookBook_documentation' },
+                            :content => /CookBook documentation/
+  end
+  
+  def test_not_found
+    get :index, :id => 999
+    assert_response 404
+  end
+end
diff --git a/test/functional/wikis_controller_test.rb b/test/functional/wikis_controller_test.rb
index a343fdaaf..93ad7e32d 100644
--- a/test/functional/wikis_controller_test.rb
+++ b/test/functional/wikis_controller_test.rb
@@ -31,7 +31,7 @@ class WikisControllerTest < Test::Unit::TestCase
     User.current = nil
   end
   
-  def test_create_wiki
+  def test_create
     @request.session[:user_id] = 1
     assert_nil Project.find(3).wiki
     post :edit, :id => 3, :wiki => { :start_page => 'Start page' }
@@ -40,4 +40,17 @@ class WikisControllerTest < Test::Unit::TestCase
     assert_not_nil wiki
     assert_equal 'Start page', wiki.start_page
   end
+  
+  def test_destroy
+    @request.session[:user_id] = 1
+    post :destroy, :id => 1, :confirm => 1
+    assert_redirected_to 'projects/settings/1'
+    assert_nil Project.find(1).wiki
+  end
+  
+  def test_not_found
+    @request.session[:user_id] = 1
+    post :destroy, :id => 999, :confirm => 1
+    assert_response 404
+  end
 end

From 124ef65c1fd2c7174452ef80ebb52d4cdc99e80a Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sat, 15 Dec 2007 11:57:48 +0000
Subject: [PATCH 077/710] Fixed warning: toplevel constant User referenced by
 WikiContent::User

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1000 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/models/wiki_content.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/models/wiki_content.rb b/app/models/wiki_content.rb
index 4b60a4373..d0a48467b 100644
--- a/app/models/wiki_content.rb
+++ b/app/models/wiki_content.rb
@@ -25,8 +25,8 @@ class WikiContent < ActiveRecord::Base
   
   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'
+    belongs_to :page, :class_name => '::WikiPage', :foreign_key => 'page_id'
+    belongs_to :author, :class_name => '::User', :foreign_key => 'author_id'
     attr_protected :data
 
     acts_as_event :title => Proc.new {|o| "#{l(:label_wiki_edit)}: #{o.page.title} (##{o.version})"},

From ea35fff5bf4dde17fe67320118a9b73da31a81c2 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sat, 15 Dec 2007 12:14:40 +0000
Subject: [PATCH 078/710] SCM adapters: moved Errno::ENOENT exception rescuing
 to the abstract adapter.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1001 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 lib/redmine/scm/adapters/abstract_adapter.rb   | 12 +++++++++---
 lib/redmine/scm/adapters/bazaar_adapter.rb     | 14 ++------------
 lib/redmine/scm/adapters/cvs_adapter.rb        | 10 ----------
 lib/redmine/scm/adapters/darcs_adapter.rb      |  8 +-------
 lib/redmine/scm/adapters/mercurial_adapter.rb  | 13 +------------
 lib/redmine/scm/adapters/subversion_adapter.rb | 12 +-----------
 6 files changed, 14 insertions(+), 55 deletions(-)

diff --git a/lib/redmine/scm/adapters/abstract_adapter.rb b/lib/redmine/scm/adapters/abstract_adapter.rb
index 720a4e9d9..c93fc6350 100644
--- a/lib/redmine/scm/adapters/abstract_adapter.rb
+++ b/lib/redmine/scm/adapters/abstract_adapter.rb
@@ -112,9 +112,15 @@ module Redmine
       
         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?
+          begin
+            IO.popen(cmd, "r+") do |io|
+              io.close_write
+              block.call(io) if block_given?
+            end
+          rescue Errno::ENOENT => e
+            # The command failed, log it and re-raise
+            log.error("SCM command failed: #{cmd}\n  with: #{e.message}")
+            raise CommandFailed
           end
         end  
       end
diff --git a/lib/redmine/scm/adapters/bazaar_adapter.rb b/lib/redmine/scm/adapters/bazaar_adapter.rb
index 4d7afeacc..11a44b7cf 100644
--- a/lib/redmine/scm/adapters/bazaar_adapter.rb
+++ b/lib/redmine/scm/adapters/bazaar_adapter.rb
@@ -40,7 +40,7 @@ module Redmine
           end
           return nil if $? && $?.exitstatus != 0
           info
-        rescue Errno::ENOENT => e
+        rescue CommandFailed
           return nil
         end
         
@@ -81,8 +81,6 @@ module Redmine
           return nil if $? && $?.exitstatus != 0
           logger.debug("Found #{entries.size} entries in the repository for #{target(path)}") if logger && logger.debug?
           entries.sort_by_name
-        rescue Errno::ENOENT => e
-          raise CommandFailed
         end
     
         def revisions(path=nil, identifier_from=nil, identifier_to=nil, options={})
@@ -144,8 +142,6 @@ module Redmine
           end
           return nil if $? && $?.exitstatus != 0
           revisions
-        rescue Errno::ENOENT => e
-          raise CommandFailed    
         end
         
         def diff(path, identifier_from, identifier_to=nil, type="inline")
@@ -163,9 +159,7 @@ module Redmine
             end
           end
           #return nil if $? && $?.exitstatus != 0
-          DiffTableList.new diff, type    
-        rescue Errno::ENOENT => e
-          raise CommandFailed    
+          DiffTableList.new diff, type   
         end
         
         def cat(path, identifier=nil)
@@ -179,8 +173,6 @@ module Redmine
           end
           return nil if $? && $?.exitstatus != 0
           cat
-        rescue Errno::ENOENT => e
-          raise CommandFailed    
         end
         
         def annotate(path, identifier=nil)
@@ -198,8 +190,6 @@ module Redmine
           end
           return nil if $? && $?.exitstatus != 0
           blame
-        rescue Errno::ENOENT => e
-          raise CommandFailed
         end
       end
     end
diff --git a/lib/redmine/scm/adapters/cvs_adapter.rb b/lib/redmine/scm/adapters/cvs_adapter.rb
index 5c6c1775b..73dc9b6c4 100644
--- a/lib/redmine/scm/adapters/cvs_adapter.rb
+++ b/lib/redmine/scm/adapters/cvs_adapter.rb
@@ -103,8 +103,6 @@ module Redmine
           end
           return nil if $? && $?.exitstatus != 0
           entries.sort_by_name
-        rescue Errno::ENOENT => e
-          raise CommandFailed    
         end  
 
         STARTLOG="----------------------------"
@@ -234,8 +232,6 @@ module Redmine
               end 
             end
           end
-        rescue Errno::ENOENT => e
-          raise CommandFailed    
         end  
         
         def diff(path, identifier_from, identifier_to=nil, type="inline")
@@ -250,8 +246,6 @@ module Redmine
           end
           return nil if $? && $?.exitstatus != 0
           DiffTableList.new diff, type
-        rescue Errno::ENOENT => e
-          raise CommandFailed    
         end  
         
         def cat(path, identifier=nil)
@@ -265,8 +259,6 @@ module Redmine
           end
           return nil if $? && $?.exitstatus != 0
           cat
-        rescue Errno::ENOENT => e
-          raise CommandFailed    
         end  
 
         def annotate(path, identifier=nil)
@@ -283,8 +275,6 @@ module Redmine
           end
           return nil if $? && $?.exitstatus != 0
           blame
-        rescue Errno::ENOENT => e
-          raise CommandFailed    
         end
          
         private
diff --git a/lib/redmine/scm/adapters/darcs_adapter.rb b/lib/redmine/scm/adapters/darcs_adapter.rb
index 34b36202b..2955b26dc 100644
--- a/lib/redmine/scm/adapters/darcs_adapter.rb
+++ b/lib/redmine/scm/adapters/darcs_adapter.rb
@@ -70,8 +70,6 @@ module Redmine
           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={})
@@ -99,8 +97,6 @@ module Redmine
           end
           return nil if $? && $?.exitstatus != 0
           revisions
-        rescue Errno::ENOENT => e
-          raise CommandFailed    
         end
         
         def diff(path, identifier_from, identifier_to=nil, type="inline")
@@ -117,8 +113,6 @@ module Redmine
           end
           return nil if $? && $?.exitstatus != 0
           DiffTableList.new diff, type    
-        rescue Errno::ENOENT => e
-          raise CommandFailed    
         end
         
         private
@@ -154,7 +148,7 @@ module Redmine
             end
           end
           paths
-        rescue Errno::ENOENT => e
+        rescue CommandFailed
           paths
         end
       end
diff --git a/lib/redmine/scm/adapters/mercurial_adapter.rb b/lib/redmine/scm/adapters/mercurial_adapter.rb
index 3cbf01f91..1b9cab47c 100644
--- a/lib/redmine/scm/adapters/mercurial_adapter.rb
+++ b/lib/redmine/scm/adapters/mercurial_adapter.rb
@@ -36,7 +36,7 @@ module Redmine
                            :lastrev => revisions(nil,nil,nil,{:limit => 1}).last
                          })
           info
-        rescue Errno::ENOENT => e
+        rescue CommandFailed
           return nil
         end
         
@@ -58,8 +58,6 @@ module Redmine
           end
           return nil if $? && $?.exitstatus != 0
           entries.sort_by_name
-        rescue Errno::ENOENT => e
-          raise CommandFailed
         end
   
         def entry(path=nil, identifier=nil)
@@ -119,8 +117,6 @@ module Redmine
           end
           return nil if $? && $?.exitstatus != 0
           revisions
-        rescue Errno::ENOENT => e
-          raise CommandFailed
         end
         
         def diff(path, identifier_from, identifier_to=nil, type="inline")
@@ -140,9 +136,6 @@ module Redmine
           end
           return nil if $? && $?.exitstatus != 0
           DiffTableList.new diff, type
-    
-        rescue Errno::ENOENT => e
-          raise CommandFailed
         end
         
         def cat(path, identifier=nil)
@@ -154,8 +147,6 @@ module Redmine
           end
           return nil if $? && $?.exitstatus != 0
           cat
-        rescue Errno::ENOENT => e
-          raise CommandFailed
         end
         
         def annotate(path, identifier=nil)
@@ -173,8 +164,6 @@ module Redmine
           end
           return nil if $? && $?.exitstatus != 0
           blame
-        rescue Errno::ENOENT => e
-          raise CommandFailed
         end
       end
     end
diff --git a/lib/redmine/scm/adapters/subversion_adapter.rb b/lib/redmine/scm/adapters/subversion_adapter.rb
index d55b8712e..f698f4a62 100644
--- a/lib/redmine/scm/adapters/subversion_adapter.rb
+++ b/lib/redmine/scm/adapters/subversion_adapter.rb
@@ -47,7 +47,7 @@ module Redmine
           end
           return nil if $? && $?.exitstatus != 0
           info
-        rescue Errno::ENOENT => e
+        rescue CommandFailed
           return nil
         end
         
@@ -91,8 +91,6 @@ module Redmine
           return nil if $? && $?.exitstatus != 0
           logger.debug("Found #{entries.size} entries in the repository for #{target(path)}") if logger && logger.debug?
           entries.sort_by_name
-        rescue Errno::ENOENT => e
-          raise CommandFailed
         end
     
         def revisions(path=nil, identifier_from=nil, identifier_to=nil, options={})
@@ -130,8 +128,6 @@ module Redmine
           end
           return nil if $? && $?.exitstatus != 0
           revisions
-        rescue Errno::ENOENT => e
-          raise CommandFailed    
         end
         
         def diff(path, identifier_from, identifier_to=nil, type="inline")
@@ -154,8 +150,6 @@ module Redmine
           end
           return nil if $? && $?.exitstatus != 0
           DiffTableList.new diff, type    
-        rescue Errno::ENOENT => e
-          raise CommandFailed    
         end
         
         def cat(path, identifier=nil)
@@ -169,8 +163,6 @@ module Redmine
           end
           return nil if $? && $?.exitstatus != 0
           cat
-        rescue Errno::ENOENT => e
-          raise CommandFailed    
         end
         
         def annotate(path, identifier=nil)
@@ -186,8 +178,6 @@ module Redmine
           end
           return nil if $? && $?.exitstatus != 0
           blame
-        rescue Errno::ENOENT => e
-          raise CommandFailed
         end
         
         private

From 1af9c47a274386beb6f8d2d663cc09c3e798a4d7 Mon Sep 17 00:00:00 2001
From: Nicolas Chuche <nicolas.chuche@barna.be>
Date: Sat, 15 Dec 2007 12:23:39 +0000
Subject: [PATCH 079/710] bug when using apache authentication method

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1002 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 extra/svn/reposman.rb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/extra/svn/reposman.rb b/extra/svn/reposman.rb
index 729970406..0b476cdc4 100755
--- a/extra/svn/reposman.rb
+++ b/extra/svn/reposman.rb
@@ -78,6 +78,7 @@ $quiet        = false
 $redmine_host = ''
 $repos_base   = ''
 $svn_owner    = 'root'
+$use_groupid  = true
 $svn_url      = false
 $test         = false
 
@@ -92,7 +93,7 @@ begin
     case opt
     when '--svn-dir';        $repos_base   = arg.dup
     when '--redmine-host';   $redmine_host = arg.dup
-    when '--owner';          $svn_owner    = arg.dup
+    when '--owner';          $svn_owner    = arg.dup; $use_groupid = false;
     when '--url';            $svn_url      = arg.dup
     when '--verbose';        $verbose += 1
     when '--test';           $test = true
@@ -144,7 +145,7 @@ def set_owner_and_rights(project, repos_path, &block)
   if RUBY_PLATFORM =~ /mswin/
     yield if block_given?
   else
-    uid, gid = Etc.getpwnam($svn_owner).uid, Etc.getgrnam(project.identifier).gid
+    uid, gid = Etc.getpwnam($svn_owner).uid, ($use_groupid ? Etc.getgrnam(project.identifier).gid : 0)
     right = project.is_public ? 0775 : 0770
     yield if block_given?
     Find.find(repos_path) do |f|

From 2bcd448dda6aee13e71350a886942888fcd05a4f Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 16 Dec 2007 13:33:15 +0000
Subject: [PATCH 080/710] Updated Japanese translation (Satoru Kurashiki).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1003 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 lang/ja.yml | 80 ++++++++++++++++++++++++++---------------------------
 1 file changed, 40 insertions(+), 40 deletions(-)

diff --git a/lang/ja.yml b/lang/ja.yml
index bfe120cfe..4206f3db6 100644
--- a/lang/ja.yml
+++ b/lang/ja.yml
@@ -72,13 +72,13 @@ notice_locking_conflict: 別のユーザがデータを更新しています。
 notice_scm_error: リポジトリに、エントリ/リビジョンが存在しません。
 notice_not_authorized: このページにアクセスするには認証が必要です。
 notice_email_sent: %s宛にメールを送信しました。
-notice_email_error: メール送信中にエラーが発生しました (%s)
+notice_email_error: メール送信中にエラーが発生しました(%s)
 notice_feeds_access_key_reseted: RSSアクセスキーを初期化しました。
 
-mail_subject_lost_password: redMineパスワード
+mail_subject_lost_password: Redmineパスワード
 mail_body_lost_password: 'パスワードを変更するには、以下のリンクをたどってください:'
-mail_subject_register: redMineアカウントが有効になりました
-mail_body_register: 'Redmine アカウントをアクティブにするには、以下のリンクをたどってください:'
+mail_subject_register: Redmineアカウントが有効になりました
+mail_body_register: 'Redmineアカウントをアクティブにするには、以下のリンクをたどってください:'
 
 gui_validation_error: 1件のエラー
 gui_validation_error_plural: %d件のエラー
@@ -159,8 +159,8 @@ field_identifier: 識別子
 field_is_filter: フィルタとして使う
 field_issue_to_id: 関連する問題
 field_delay: 遅延
-field_assignable: Issues can be assigned to this role
-field_redirect_existing_links: Redirect existing links
+field_assignable: 問題はこのロールに割り当てることができます
+field_redirect_existing_links: 既存のリンクをリダイレクトする
 field_estimated_hours: 予定工数
 
 setting_app_title: アプリケーションのタイトル
@@ -410,18 +410,18 @@ label_message_last: 最新のメッセージ
 label_message_new: 新しいメッセージ
 label_reply_plural: 返答
 label_send_information: アカウント情報をユーザに送信
-label_year: Year
-label_month: Month
-label_week: Week
-label_date_from: From
-label_date_to: To
+label_year: 年
+label_month: 月
+label_week: 週
+label_date_from: から
+label_date_to: まで
 label_language_based: 既定の言語の設定に従う
-label_sort_by: Sort by %s
+label_sort_by: %sで並び替え
 label_send_test_email: テストメールを送信
-label_feeds_access_key_created_on: RSS access key created %s ago
-label_module_plural: Modules
-label_added_time_by: Added by %s %s ago
-label_updated_time: Updated %s ago
+label_feeds_access_key_created_on: RSSアクセスキーは%s前に作成されました
+label_module_plural: モジュール
+label_added_time_by: %sが%s前に追加しました
+label_updated_time: %s前に更新されました
 label_jump_to_a_project: プロジェクトへ移動...
 
 button_login: ログイン
@@ -454,8 +454,8 @@ button_unwatch: ウォッチをやめる
 button_reply: 返答
 button_archive: 書庫に保存
 button_unarchive: 書庫から戻す
-button_reset: Reset
-button_rename: Rename
+button_reset: リセット
+button_rename: 名前変更
 
 status_active: 有効
 status_registered: 登録
@@ -482,10 +482,10 @@ text_comma_separated: (カンマで区切った)複数の値が使えます
 text_issues_ref_in_commit_messages: コミットメッセージ内で問題の参照/修正
 text_issue_added: 問題 %s が報告されました。
 text_issue_updated: 問題 %s が更新されました。
-text_wiki_destroy_confirmation: Are you sure you want to delete this wiki and all its content ?
-text_issue_category_destroy_question: Some issues (%d) are assigned to this category. What do you want to do ?
-text_issue_category_destroy_assignments: Remove category assignments
-text_issue_category_reassign_to: Reassing issues to this category
+text_wiki_destroy_confirmation: 本当にこのwikiとその内容の全てを削除しますか？
+text_issue_category_destroy_question: このカテゴリに割り当て済みの問題(%d)があります。何をしようとしていますか？
+text_issue_category_destroy_assignments: カテゴリの割り当てを削除する
+text_issue_category_reassign_to: 問題をこのカテゴリに再割り当てする
 
 default_role_manager: 管理者
 default_role_developper: 開発者
@@ -512,8 +512,8 @@ default_activity_development: 開発作業
 enumeration_issue_priorities: 問題の優先度
 enumeration_doc_categories: 文書カテゴリ
 enumeration_activities: 作業分類 (時間トラッキング)
-label_file_plural: Files
-label_changeset_plural: Changesets
+label_file_plural: ファイル
+label_changeset_plural: チェンジセット
 field_column_names: 項目
 label_default_columns: 既定の項目
 setting_issue_list_default_columns: 問題の一覧で表示する項目
@@ -534,20 +534,20 @@ label_user_mail_option_none: "ウォッチまたは関係している問題の
 setting_emails_footer: メールのフッタ
 label_float: 小数
 button_copy: コピー
-mail_body_account_information_external: You can use your "%s" account to log into Redmine.
-mail_body_account_information: Your Redmine account information
-setting_protocol: Protocol
-label_user_mail_no_self_notified: "I don't want to be notified of changes that I make myself"
-setting_time_format: Time format
-label_registration_activation_by_email: account activation by email
-mail_subject_account_activation_request: Redmine account activation request
-mail_body_account_activation_request: 'A new user (%s) has registered. His account his pending your approval:'
-label_registration_automatic_activation: automatic account activation
-label_registration_manual_activation: manual account activation
-notice_account_pending: "Your account was created and is now pending administrator approval."
-field_time_zone: Time zone
-text_caracters_minimum: Must be at least %d characters long.
-setting_bcc_recipients: Blind carbon copy recipients (bcc)
-button_annotate: Annotate
-label_issues_by: Issues by %s
+mail_body_account_information_external: 「%s」アカウントを使ってRedmineにログインできます。
+mail_body_account_information: Redmineアカウント情報
+setting_protocol: プロトコル
+label_user_mail_no_self_notified: 自分自身による変更の通知は不要です
+setting_time_format: 時刻の形式
+label_registration_activation_by_email: メールでアカウントを有効化
+mail_subject_account_activation_request: Redminアカウントの有効化要求
+mail_body_account_activation_request: 新しいユーザ(%s)が登録しています。このアカウントはあなたの承認待ちです：
+label_registration_automatic_activation: 自動でアカウントを有効化
+label_registration_manual_activation: 手動でアカウントを有効化
+notice_account_pending: アカウントは作成済みで、管理者の承認待ちです。
+field_time_zone: タイムゾーン
+text_caracters_minimum: 最低%d文字の長さが必要です
+setting_bcc_recipients: ブラインドカーボンコピーで受信(bcc)
+button_annotate: 注釈
+label_issues_by: %s別の問題
 field_searchable: Searchable

From b4eafd9ea8132534f75e3065c3d36345610e907a Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 16 Dec 2007 14:03:26 +0000
Subject: [PATCH 081/710] Changes for 0.6.2 release.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1004 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 doc/CHANGELOG          | 22 ++++++++++++++++++++--
 lib/redmine/version.rb |  2 +-
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/doc/CHANGELOG b/doc/CHANGELOG
index f5614f6f9..051105a04 100644
--- a/doc/CHANGELOG
+++ b/doc/CHANGELOG
@@ -5,6 +5,24 @@ Copyright (C) 2006-2007  Jean-Philippe Lang
 http://www.redmine.org/
 
 
+== 2007-12-16 v0.6.2
+
+* Search engine: issue custom fields can now be searched
+* News comments are now textilized
+* Updated Japanese translation (Satoru Kurashiki)
+* Updated Chinese translation (Shortie Lo)
+* Fixed Rails 2.0 compatibility bugs:
+  * Unable to create a wiki
+  * Gantt and calendar error
+  * Trac importer error (readonly? is defined by ActiveRecord)
+* Fixed: 'assigned to me' filter broken
+* Fixed: crash when validation fails on issue edition with no custom fields
+* Fixed: reposman "can't find group" error
+* Fixed: 'LDAP account password is too long' error when leaving the field empty on creation
+* Fixed: empty lines when displaying repository files with Windows style eol
+* Fixed: missing body closing tag in repository annotate and entry views
+
+
 == 2007-12-10 v0.6.1
 
 * Rails 2.0 compatibility
@@ -26,7 +44,7 @@ http://www.redmine.org/
 * Diff style (inline or side by side) automatically saved as a user preference
 * Added issues status changes on the activity view (by Cyril Mougel)
 * Added forums topics on the activity view (disabled by default)
-* Added an option on 'My account' for users who don�t want to be notified of changes that they make
+* Added an option on 'My account' for users who don't want to be notified of changes that they make
 * Trac importer now supports mysql and postgresql databases
 * Trac importer improvements (by Mat Trudel)
 * 'fixed version' field can now be displayed on the issue list
@@ -61,7 +79,7 @@ http://www.redmine.org/
 * Fixed: admin should be able to move issues to any project
 * Fixed: adding an attachment is not possible when changing the status of an issue
 * Fixed: No mime-types in documents/files downloading
-* Fixed: error when sorting the messages if there�s only one board for the project
+* Fixed: error when sorting the messages if there's only one board for the project
 * Fixed: 'me' doesn't appear in the drop down filters on a project issue list.
 
 == 2007-11-04 v0.6.0
diff --git a/lib/redmine/version.rb b/lib/redmine/version.rb
index dd0f4f82c..b109d098e 100644
--- a/lib/redmine/version.rb
+++ b/lib/redmine/version.rb
@@ -4,7 +4,7 @@ module Redmine
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 6
-    TINY  = 1
+    TINY  = 2
 
     def self.revision
       revision = nil

From 524cd689cf8743c389aab6a767a09383891dc5c6 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Mon, 17 Dec 2007 21:00:56 +0000
Subject: [PATCH 082/710] Project identifier is now used in URLs (instead of
 project id). URLs with a project id will still be recognized.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1007 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/models/project.rb                          | 14 ++++++++++++++
 test/fixtures/projects.yml                     |  2 +-
 test/functional/issues_controller_test.rb      |  2 +-
 test/functional/projects_controller_test.rb    | 18 +++++++++++++-----
 .../functional/repositories_controller_test.rb |  4 ++--
 test/functional/versions_controller_test.rb    |  4 ++--
 test/functional/wiki_controller_test.rb        | 12 ++++++------
 test/functional/wikis_controller_test.rb       |  2 +-
 test/integration/issues_test.rb                |  2 +-
 9 files changed, 41 insertions(+), 19 deletions(-)

diff --git a/app/models/project.rb b/app/models/project.rb
index 84eeefee4..60a7a84a4 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -111,6 +111,20 @@ class Project < ActiveRecord::Base
     end
   end
   
+  def self.find(*args)
+    if args.first && args.first.is_a?(String) && !args.first.match(/^\d*$/)
+      project = find_by_identifier(*args)
+      raise ActiveRecord::RecordNotFound, "Couldn't find Project with identifier=#{args.first}" if project.nil?
+      project
+    else
+      super
+    end
+  end
+ 
+  def to_param
+    identifier
+  end
+  
   def active?
     self.status == STATUS_ACTIVE
   end
diff --git a/test/fixtures/projects.yml b/test/fixtures/projects.yml
index d3758c9e3..ad5cf4aa2 100644
--- a/test/fixtures/projects.yml
+++ b/test/fixtures/projects.yml
@@ -41,5 +41,5 @@ projects_004:
   description: eCookbook Subproject 2
   homepage: ""
   is_public: true
-  identifier: subproject1
+  identifier: subproject2
   parent_id: 1
diff --git a/test/functional/issues_controller_test.rb b/test/functional/issues_controller_test.rb
index 638362dbe..ebcf78f24 100644
--- a/test/functional/issues_controller_test.rb
+++ b/test/functional/issues_controller_test.rb
@@ -144,7 +144,7 @@ class IssuesControllerTest < Test::Unit::TestCase
   def test_destroy
     @request.session[:user_id] = 2
     post :destroy, :id => 1
-    assert_redirected_to 'projects/1/issues'
+    assert_redirected_to 'projects/ecookbook/issues'
     assert_nil Issue.find_by_id(1)
   end
 
diff --git a/test/functional/projects_controller_test.rb b/test/functional/projects_controller_test.rb
index b6ac59141..556d5d407 100644
--- a/test/functional/projects_controller_test.rb
+++ b/test/functional/projects_controller_test.rb
@@ -47,12 +47,20 @@ class ProjectsControllerTest < Test::Unit::TestCase
     assert assigns(:project_tree)[Project.find(1)].include?(Project.find(3))
   end
   
-  def test_show
+  def test_show_by_id
     get :show, :id => 1
     assert_response :success
     assert_template 'show'
     assert_not_nil assigns(:project)
   end
+
+  def test_show_by_identifier
+    get :show, :id => 'ecookbook'
+    assert_response :success
+    assert_template 'show'
+    assert_not_nil assigns(:project)
+    assert_equal Project.find_by_identifier('ecookbook'), assigns(:project)
+  end
   
   def test_settings
     @request.session[:user_id] = 2 # manager
@@ -64,7 +72,7 @@ class ProjectsControllerTest < Test::Unit::TestCase
   def test_edit
     @request.session[:user_id] = 2 # manager
     post :edit, :id => 1, :project => {:name => 'Test changed name'}
-    assert_redirected_to 'projects/settings/1'
+    assert_redirected_to 'projects/settings/ecookbook'
     project = Project.find(1)
     assert_equal 'Test changed name', project.name
   end
@@ -104,7 +112,7 @@ class ProjectsControllerTest < Test::Unit::TestCase
   def test_move_issues_to_another_project
     @request.session[:user_id] = 1
     post :move_issues, :id => 1, :issue_ids => [1, 2], :new_project_id => 2
-    assert_redirected_to 'projects/1/issues'
+    assert_redirected_to 'projects/ecookbook/issues'
     assert_equal 2, Issue.find(1).project_id
     assert_equal 2, Issue.find(2).project_id
   end
@@ -112,7 +120,7 @@ class ProjectsControllerTest < Test::Unit::TestCase
   def test_move_issues_to_another_tracker
     @request.session[:user_id] = 1
     post :move_issues, :id => 1, :issue_ids => [1, 2], :new_tracker_id => 3
-    assert_redirected_to 'projects/1/issues'
+    assert_redirected_to 'projects/ecookbook/issues'
     assert_equal 3, Issue.find(1).tracker_id
     assert_equal 3, Issue.find(2).tracker_id
   end
@@ -242,7 +250,7 @@ class ProjectsControllerTest < Test::Unit::TestCase
     assert_response :success
     assert_template 'add_issue'
     post :add_issue, :id => 1, :issue => {:tracker_id => 1, :subject => 'This is the test_add_issue issue', :description => 'This is the description', :priority_id => 5}
-    assert_redirected_to 'projects/1/issues'
+    assert_redirected_to 'projects/ecookbook/issues'
     assert Issue.find_by_subject('This is the test_add_issue issue')
   end
   
diff --git a/test/functional/repositories_controller_test.rb b/test/functional/repositories_controller_test.rb
index 2f0459505..47455dc55 100644
--- a/test/functional/repositories_controller_test.rb
+++ b/test/functional/repositories_controller_test.rb
@@ -43,10 +43,10 @@ class RepositoriesControllerTest < Test::Unit::TestCase
     assert_response :success
     assert_template 'revision'
     assert_no_tag :tag => "div", :attributes => { :class => "contextual" },
-      :child => { :tag => "a", :attributes => { :href => '/repositories/revision/1?rev=0'}
+      :child => { :tag => "a", :attributes => { :href => '/repositories/revision/ecookbook?rev=0'}
     }
     assert_tag :tag => "div", :attributes => { :class => "contextual" },
-        :child => { :tag => "a", :attributes => { :href => '/repositories/revision/1?rev=2'}
+        :child => { :tag => "a", :attributes => { :href => '/repositories/revision/ecookbook?rev=2'}
     }
   end
 
diff --git a/test/functional/versions_controller_test.rb b/test/functional/versions_controller_test.rb
index 17ebd3518..3477c5edd 100644
--- a/test/functional/versions_controller_test.rb
+++ b/test/functional/versions_controller_test.rb
@@ -52,7 +52,7 @@ class VersionsControllerTest < Test::Unit::TestCase
     post :edit, :id => 2, 
                 :version => { :name => 'New version name', 
                               :effective_date => Date.today.strftime("%Y-%m-%d")}
-    assert_redirected_to 'projects/settings/1'
+    assert_redirected_to 'projects/settings/ecookbook'
     version = Version.find(2)
     assert_equal 'New version name', version.name
     assert_equal Date.today, version.effective_date
@@ -61,7 +61,7 @@ class VersionsControllerTest < Test::Unit::TestCase
   def test_destroy
     @request.session[:user_id] = 2
     post :destroy, :id => 2
-    assert_redirected_to 'projects/settings/1'
+    assert_redirected_to 'projects/settings/ecookbook'
     assert_nil Version.find_by_id(2)
   end
   
diff --git a/test/functional/wiki_controller_test.rb b/test/functional/wiki_controller_test.rb
index 6ee5ab276..043b0e805 100644
--- a/test/functional/wiki_controller_test.rb
+++ b/test/functional/wiki_controller_test.rb
@@ -64,7 +64,7 @@ class WikiControllerTest < Test::Unit::TestCase
                 :content => {:comments => 'Created the page',
                              :text => "h1. New page\n\nThis is a new page",
                              :version => 0}
-    assert_redirected_to 'wiki/1/New_page'
+    assert_redirected_to 'wiki/ecookbook/New_page'
     page = Project.find(1).wiki.find_page('New page')
     assert !page.new_record?
     assert_not_nil page.content
@@ -103,7 +103,7 @@ class WikiControllerTest < Test::Unit::TestCase
     post :rename, :id => 1, :page => 'Another_page',
                             :wiki_page => { :title => 'Another renamed page',
                                             :redirect_existing_links => 1 }
-    assert_redirected_to 'wiki/1/Another_renamed_page'
+    assert_redirected_to 'wiki/ecookbook/Another_renamed_page'
     wiki = Project.find(1).wiki
     # Check redirects
     assert_not_nil wiki.find_page('Another page')
@@ -115,7 +115,7 @@ class WikiControllerTest < Test::Unit::TestCase
     post :rename, :id => 1, :page => 'Another_page',
                             :wiki_page => { :title => 'Another renamed page',
                                             :redirect_existing_links => "0" }
-    assert_redirected_to 'wiki/1/Another_renamed_page'
+    assert_redirected_to 'wiki/ecookbook/Another_renamed_page'
     wiki = Project.find(1).wiki
     # Check that there's no redirects
     assert_nil wiki.find_page('Another page')
@@ -124,17 +124,17 @@ class WikiControllerTest < Test::Unit::TestCase
   def test_destroy
     @request.session[:user_id] = 2
     post :destroy, :id => 1, :page => 'CookBook_documentation'
-    assert_redirected_to 'wiki/1/Page_index/special'
+    assert_redirected_to 'wiki/ecookbook/Page_index/special'
   end
   
   def test_page_index
-    get :special, :id => 1, :page => 'Page_index'
+    get :special, :id => 'ecookbook', :page => 'Page_index'
     assert_response :success
     assert_template 'special_page_index'
     pages = assigns(:pages)
     assert_not_nil pages
     assert_equal 2, pages.size
-    assert_tag :tag => 'a', :attributes => { :href => '/wiki/1/CookBook_documentation' },
+    assert_tag :tag => 'a', :attributes => { :href => '/wiki/ecookbook/CookBook_documentation' },
                             :content => /CookBook documentation/
   end
   
diff --git a/test/functional/wikis_controller_test.rb b/test/functional/wikis_controller_test.rb
index 93ad7e32d..3e51314a5 100644
--- a/test/functional/wikis_controller_test.rb
+++ b/test/functional/wikis_controller_test.rb
@@ -44,7 +44,7 @@ class WikisControllerTest < Test::Unit::TestCase
   def test_destroy
     @request.session[:user_id] = 1
     post :destroy, :id => 1, :confirm => 1
-    assert_redirected_to 'projects/settings/1'
+    assert_redirected_to 'projects/settings/ecookbook'
     assert_nil Project.find(1).wiki
   end
   
diff --git a/test/integration/issues_test.rb b/test/integration/issues_test.rb
index eac407b1b..702fbc026 100644
--- a/test/integration/issues_test.rb
+++ b/test/integration/issues_test.rb
@@ -24,7 +24,7 @@ class IssuesTest < ActionController::IntegrationTest
     assert_kind_of Issue, issue
 
     # check redirection
-    assert_redirected_to "projects/1/issues"
+    assert_redirected_to "projects/ecookbook/issues"
     follow_redirect!
     assert assigns(:issues).include?(issue)
 

From 8e00f57a886ae529ae308a17bfc9a363056754bf Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Tue, 18 Dec 2007 18:50:41 +0000
Subject: [PATCH 083/710] Moved ProjectsController#list_documents and
 add_document to DocumentsController#index and new.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1011 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/documents_controller.rb       | 42 ++++++++++--
 app/controllers/projects_controller.rb        | 28 --------
 .../index.rhtml}                              |  4 +-
 .../new.rhtml}                                |  2 +-
 config/routes.rb                              |  1 +
 lib/redmine.rb                                |  6 +-
 test/functional/documents_controller_test.rb  | 64 +++++++++++++++++++
 test/functional/projects_controller_test.rb   |  7 --
 8 files changed, 109 insertions(+), 45 deletions(-)
 rename app/views/{projects/list_documents.rhtml => documents/index.rhtml} (87%)
 rename app/views/{projects/add_document.rhtml => documents/new.rhtml} (61%)
 create mode 100644 test/functional/documents_controller_test.rb

diff --git a/app/controllers/documents_controller.rb b/app/controllers/documents_controller.rb
index 104cca10c..b37a8371a 100644
--- a/app/controllers/documents_controller.rb
+++ b/app/controllers/documents_controller.rb
@@ -17,12 +17,40 @@
 
 class DocumentsController < ApplicationController
   layout 'base'
-  before_filter :find_project, :authorize
-
+  before_filter :find_project, :only => [:index, :new]
+  before_filter :find_document, :except => [:index, :new]
+  before_filter :authorize
+  
+  def index
+    @sort_by = %w(category date title author).include?(params[:sort_by]) ? params[:sort_by] : 'category'
+    documents = @project.documents.find :all, :include => [:attachments, :category]
+    case @sort_by
+    when 'date'
+      @grouped = documents.group_by {|d| d.created_on.to_date }
+    when 'title'
+      @grouped = documents.group_by {|d| d.title.first.upcase}
+    when 'author'
+      @grouped = documents.select{|d| d.attachments.any?}.group_by {|d| d.attachments.last.author}
+    else
+      @grouped = documents.group_by(&:category)
+    end
+    render :layout => false if request.xhr?
+  end
+  
   def show
     @attachments = @document.attachments.find(:all, :order => "created_on DESC")
   end
 
+  def new
+    @document = @project.documents.build(params[:document])    
+    if request.post? and @document.save	
+      attach_files(@document, params[:attachments])
+      flash[:notice] = l(:notice_successful_create)
+      Mailer.deliver_document_added(@document) if Setting.notified_events.include?('document_added')
+      redirect_to :action => 'index', :project_id => @project
+    end
+  end
+  
   def edit
     @categories = Enumeration::get_values('DCAT')
     if request.post? and @document.update_attributes(params[:document])
@@ -33,7 +61,7 @@ class DocumentsController < ApplicationController
 
   def destroy
     @document.destroy
-    redirect_to :controller => 'projects', :action => 'list_documents', :id => @project
+    redirect_to :controller => 'documents', :action => 'index', :project_id => @project
   end
 
   def download
@@ -57,9 +85,15 @@ class DocumentsController < ApplicationController
 
 private
   def find_project
+    @project = Project.find(params[:project_id])
+  rescue ActiveRecord::RecordNotFound
+    render_404
+  end
+
+  def find_document
     @document = Document.find(params[:id])
     @project = @document.project
   rescue ActiveRecord::RecordNotFound
     render_404
-  end  
+  end
 end
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 7b1e4ef3d..84203a34d 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -177,34 +177,6 @@ class ProjectsController < ApplicationController
   	end
   end
 
-  # Add a new document to @project
-  def add_document
-    @document = @project.documents.build(params[:document])    
-    if request.post? and @document.save	
-      attach_files(@document, params[:attachments])
-      flash[:notice] = l(:notice_successful_create)
-      Mailer.deliver_document_added(@document) if Setting.notified_events.include?('document_added')
-      redirect_to :action => 'list_documents', :id => @project
-    end
-  end
-  
-  # Show documents list of @project
-  def list_documents
-    @sort_by = %w(category date title author).include?(params[:sort_by]) ? params[:sort_by] : 'category'
-    documents = @project.documents.find :all, :include => [:attachments, :category]
-    case @sort_by
-    when 'date'
-      @grouped = documents.group_by {|d| d.created_on.to_date }
-    when 'title'
-      @grouped = documents.group_by {|d| d.title.first.upcase}
-    when 'author'
-      @grouped = documents.select{|d| d.attachments.any?}.group_by {|d| d.attachments.last.author}
-    else
-      @grouped = documents.group_by(&:category)
-    end
-    render :layout => false if request.xhr?
-  end
-
   # Add a new issue to @project
   # The new issue will be created from an existing one if copy_from parameter is given
   def add_issue
diff --git a/app/views/projects/list_documents.rhtml b/app/views/documents/index.rhtml
similarity index 87%
rename from app/views/projects/list_documents.rhtml
rename to app/views/documents/index.rhtml
index 6829b9bf5..a7cefb733 100644
--- a/app/views/projects/list_documents.rhtml
+++ b/app/views/documents/index.rhtml
@@ -1,13 +1,13 @@
 <div class="contextual">
 <%= link_to_if_authorized l(:label_document_new),
-                          {:controller => 'projects', :action => 'add_document', :id => @project},
+                          {:controller => 'documents', :action => 'new', :project_id => @project},
                           :class => 'icon icon-add',
                           :onclick => 'Element.show("add-document"); return false;' %>
 </div>
 
 <div id="add-document" style="display:none;">
 <h2><%=l(:label_document_new)%></h2>
-<% form_tag({:action => 'add_document', :id => @project}, :class => "tabular", :multipart => true) do %>
+<% form_tag({:controller => 'documents', :action => 'new', :project_id => @project}, :class => "tabular", :multipart => true) do %>
 <%= render :partial => 'documents/form' %>
 <div class="box">
 <%= render :partial => 'common/attachments_form'%>
diff --git a/app/views/projects/add_document.rhtml b/app/views/documents/new.rhtml
similarity index 61%
rename from app/views/projects/add_document.rhtml
rename to app/views/documents/new.rhtml
index 6c3fe2c7b..4f728da79 100644
--- a/app/views/projects/add_document.rhtml
+++ b/app/views/documents/new.rhtml
@@ -1,6 +1,6 @@
 <h2><%=l(:label_document_new)%></h2>
 
-<% form_tag( { :action => 'add_document', :id => @project }, :class => "tabular", :multipart => true) do %>
+<% form_tag({:controller => 'documents', :action => 'new', :project_id => @project}, :class => "tabular", :multipart => true) do %>
 <%= render :partial => 'documents/form' %>
 
 <div class="box">
diff --git a/config/routes.rb b/config/routes.rb
index 5048da2f5..febb5e247 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -16,6 +16,7 @@ ActionController::Routing::Routes.draw do |map|
   map.connect 'issues/:issue_id/relations/:action/:id', :controller => 'issue_relations'
   map.connect 'projects/:project_id/issues/:action', :controller => 'issues'
   map.connect 'projects/:project_id/news/:action', :controller => 'news'
+  map.connect 'projects/:project_id/documents/:action', :controller => 'documents'
   map.connect 'projects/:project_id/boards/:action/:id', :controller => 'boards'
   map.connect 'boards/:board_id/topics/:action/:id', :controller => 'messages'
 
diff --git a/lib/redmine.rb b/lib/redmine.rb
index 1f1053438..921e16b30 100644
--- a/lib/redmine.rb
+++ b/lib/redmine.rb
@@ -58,8 +58,8 @@ Redmine::AccessControl.map do |map|
   end
 
   map.project_module :documents do |map|
-    map.permission :manage_documents, {:projects => :add_document, :documents => [:edit, :destroy, :add_attachment, :destroy_attachment]}, :require => :loggedin
-    map.permission :view_documents, :projects => :list_documents, :documents => [:show, :download]
+    map.permission :manage_documents, {:documents => [:new, :edit, :destroy, :add_attachment, :destroy_attachment]}, :require => :loggedin
+    map.permission :view_documents, :documents => [:index, :show, :download]
   end
   
   map.project_module :files do |map|
@@ -97,7 +97,7 @@ Redmine::MenuManager.map :project_menu do |menu|
   menu.push :label_roadmap, :controller => 'projects', :action => 'roadmap'
   menu.push :label_issue_plural, { :controller => 'issues', :action => 'index' }, :param => :project_id
   menu.push :label_news_plural, { :controller => 'news', :action => 'index' }, :param => :project_id
-  menu.push :label_document_plural, :controller => 'projects', :action => 'list_documents'
+  menu.push :label_document_plural, { :controller => 'documents', :action => 'index' }, :param => :project_id
   menu.push :label_wiki, { :controller => 'wiki', :action => 'index', :page => nil }, :if => Proc.new { |p| p.wiki && !p.wiki.new_record? }
   menu.push :label_board_plural, { :controller => 'boards', :action => 'index', :id => nil }, :param => :project_id, :if => Proc.new { |p| p.boards.any? }
   menu.push :label_attachment_plural, :controller => 'projects', :action => 'list_files'
diff --git a/test/functional/documents_controller_test.rb b/test/functional/documents_controller_test.rb
new file mode 100644
index 000000000..7ba308ec5
--- /dev/null
+++ b/test/functional/documents_controller_test.rb
@@ -0,0 +1,64 @@
+# 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 File.dirname(__FILE__) + '/../test_helper'
+require 'documents_controller'
+
+# Re-raise errors caught by the controller.
+class DocumentsController; def rescue_action(e) raise e end; end
+
+class DocumentsControllerTest < Test::Unit::TestCase
+  fixtures :projects, :users, :roles, :members, :enabled_modules, :documents, :enumerations
+  
+  def setup
+    @controller = DocumentsController.new
+    @request    = ActionController::TestRequest.new
+    @response   = ActionController::TestResponse.new
+    User.current = nil
+  end
+
+  def test_index
+    get :index, :project_id => 'ecookbook'
+    assert_response :success
+    assert_template 'index'
+    assert_not_nil assigns(:grouped)
+  end
+  
+  def test_new_with_one_attachment
+    @request.session[:user_id] = 2
+    post :new, :project_id => 'ecookbook',
+               :document => { :title => 'DocumentsControllerTest#test_post_new',
+                              :description => 'This is a new document',
+                              :category_id => 2},
+               :attachments => [ ActionController::TestUploadedFile.new(Test::Unit::TestCase.fixture_path + '/files/testfile.txt', 'text/plain') ]
+               
+    assert_redirected_to 'projects/ecookbook/documents'
+    
+    document = Document.find_by_title('DocumentsControllerTest#test_post_new')
+    assert_not_nil document
+    assert_equal Enumeration.find(2), document.category
+    assert_equal 1, document.attachments.size
+    assert_equal 'testfile.txt', document.attachments.first.filename
+  end
+  
+  def test_destroy
+    @request.session[:user_id] = 2
+    post :destroy, :id => 1
+    assert_redirected_to 'projects/ecookbook/documents'
+    assert_nil Document.find_by_id(1)
+  end
+end
diff --git a/test/functional/projects_controller_test.rb b/test/functional/projects_controller_test.rb
index 556d5d407..896f59074 100644
--- a/test/functional/projects_controller_test.rb
+++ b/test/functional/projects_controller_test.rb
@@ -92,13 +92,6 @@ class ProjectsControllerTest < Test::Unit::TestCase
     assert_nil Project.find_by_id(1)
   end
   
-  def test_list_documents
-    get :list_documents, :id => 1
-    assert_response :success
-    assert_template 'list_documents'
-    assert_not_nil assigns(:grouped)
-  end
-  
   def test_bulk_edit_issues
     @request.session[:user_id] = 2
     # update issues priority

From 4a2efa9252baebcdaa03587c674fec20ed2214ad Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Tue, 18 Dec 2007 19:07:54 +0000
Subject: [PATCH 084/710] Ported r1009 from 0.6-stable branch.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1013 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/projects_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 84203a34d..a58eef719 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -311,7 +311,7 @@ class ProjectsController < ApplicationController
   def add_file
     if request.post?
       @version = @project.versions.find_by_id(params[:version_id])
-      attachments = attach_files(@issue, params[:attachments])
+      attachments = attach_files(@version, params[:attachments])
       Mailer.deliver_attachments_added(attachments) if !attachments.empty? && Setting.notified_events.include?('file_added')
       redirect_to :controller => 'projects', :action => 'list_files', :id => @project
     end

From e219af1fbd96a069b46443202fef9fab1a51bd38 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Wed, 19 Dec 2007 20:11:44 +0000
Subject: [PATCH 085/710] Ignore empty diffs.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1014 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 lib/redmine/scm/adapters/abstract_adapter.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/redmine/scm/adapters/abstract_adapter.rb b/lib/redmine/scm/adapters/abstract_adapter.rb
index c93fc6350..138d7e647 100644
--- a/lib/redmine/scm/adapters/abstract_adapter.rb
+++ b/lib/redmine/scm/adapters/abstract_adapter.rb
@@ -237,7 +237,8 @@ module Redmine
                 end
                 a = diff_table.add_line line
             end
-            self << diff_table
+            self << diff_table unless diff_table.empty?
+            self
         end
       end
     

From 49bdf62243dccb6398bdac78b0eff9f1138b28fa Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Wed, 19 Dec 2007 20:19:48 +0000
Subject: [PATCH 086/710] Add autoscroll div for each file diff.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1015 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/repositories/diff.rhtml  | 6 +++---
 public/stylesheets/application.css | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/views/repositories/diff.rhtml b/app/views/repositories/diff.rhtml
index c1c33a495..de6cdc50c 100644
--- a/app/views/repositories/diff.rhtml
+++ b/app/views/repositories/diff.rhtml
@@ -11,9 +11,9 @@
   <%= select_tag 'type', options_for_select([[l(:label_diff_inline), "inline"], [l(:label_diff_side_by_side), "sbs"]], @diff_type), :onchange => "if (this.value != '') {this.form.submit()}" %></p>
 <% end %>
 
-<div class="autoscroll">
 <% cache(@cache_key) do %>
 <% @diff.each do |table_file| %>
+<div class="autoscroll">
 <% if @diff_type == 'sbs' %>
     <table class="filecontent CodeRay">
       <thead>
@@ -84,9 +84,9 @@
       </tbody>
     </table>
 <% end %>
-<% end %>
-<% end %>
 </div>
+<% end %>
+<% end %>
 
 <% content_for :header_tags do %>
 <%= stylesheet_link_tag "scm" %>
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 8aa63d886..aa4b29712 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -123,7 +123,7 @@ hr { width: 100%; height: 1px; background: #ccc; border: 0;}
 textarea.wiki-edit { width: 99%; }
 li p {margin-top: 0;}
 div.issue {background:#ffffdd; padding:6px; margin-bottom:6px;border: 1px solid #d7d7d7;}
-.autoscroll {overflow-x: auto; padding:1px; width:100%;}
+.autoscroll {overflow-x: auto; padding:1px; width:100%; margin-bottom: 1.2em;}
 #user_firstname, #user_lastname, #user_mail, #my_account_form select { width: 90%; }
 
 /***** Tabular forms ******/

From bf3b2ec973a962bf7123e04ba54bc14238aefc9a Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Wed, 19 Dec 2007 20:23:03 +0000
Subject: [PATCH 087/710] Change status select box default to current status
 (Rocco Stanzione).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1016 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/issues/show.rhtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/issues/show.rhtml b/app/views/issues/show.rhtml
index 6e4f22574..37e1d4abd 100644
--- a/app/views/issues/show.rhtml
+++ b/app/views/issues/show.rhtml
@@ -83,7 +83,7 @@ end %>
   <% form_tag({:controller => 'issues', :action => 'change_status', :id => @issue}) do %>
   <p><%=l(:label_change_status)%> :
   <select name="new_status_id">
-  <%= options_from_collection_for_select @status_options, "id", "name" %>
+  <%= options_from_collection_for_select @status_options, "id", "name", @issue.status_id %>
   </select>
   <%= submit_tag l(:button_change) %></p>
   <% end %>

From 5f871e965746d6c3e3642d74a321516d13aa66dc Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Wed, 19 Dec 2007 21:06:06 +0000
Subject: [PATCH 088/710] Fixed: Textile image with style attribute cause
 internal server error. Also added tests for inline images with attributes and
 moved auto_link and auto_mailto rules after textile rules.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1017 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/helpers/application_helper.rb            | 10 +++++-----
 lib/redmine/wiki_formatting.rb               |  3 ++-
 test/unit/helpers/application_helper_test.rb | 12 +++++++++---
 3 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 8deed9000..a3509b99a 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -165,16 +165,16 @@ module ApplicationHelper
     # 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
+      text = text.gsub(/!((\<|\=|\>)?(\([^\)]+\))?(\[[^\]]+\])?(\{[^\}]+\})?)(\S+\.(gif|jpg|jpeg|png))!/) do |m|
+        style = $1
+        filename = $6
         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 => 'download', :id => found.id
-          "!#{align}#{image_url}!"
+          "!#{style}#{image_url}!"
         else
-          "!#{align}#{filename}!"
+          "!#{style}#{filename}!"
         end
       end
     end
diff --git a/lib/redmine/wiki_formatting.rb b/lib/redmine/wiki_formatting.rb
index 4aebe9a96..f7fa803a6 100644
--- a/lib/redmine/wiki_formatting.rb
+++ b/lib/redmine/wiki_formatting.rb
@@ -25,7 +25,8 @@ module Redmine
   
     class TextileFormatter < RedCloth
       
-      RULES = [:inline_auto_link, :inline_auto_mailto, :textile, :inline_toc, :inline_macros]
+      # auto_link rule after textile rules so that it doesn't break !image_url! tags
+      RULES = [:textile, :inline_auto_link, :inline_auto_mailto, :inline_toc, :inline_macros]
       
       def initialize(*args)
         super
diff --git a/test/unit/helpers/application_helper_test.rb b/test/unit/helpers/application_helper_test.rb
index 06446d15e..2af6c5599 100644
--- a/test/unit/helpers/application_helper_test.rb
+++ b/test/unit/helpers/application_helper_test.rb
@@ -44,12 +44,18 @@ class ApplicationHelperTest < HelperTestCase
       textilizable('test@foo.bar')
   end
   
-  def test_textile_tags
+  def test_inline_images
     to_test = {
-      # inline images
       '!http://foo.bar/image.jpg!' => '<img src="http://foo.bar/image.jpg" alt="" />',
       'floating !>http://foo.bar/image.jpg!' => 'floating <div style="float:right"><img src="http://foo.bar/image.jpg" alt="" /></div>',
-      # textile links
+      'with class !(some-class)http://foo.bar/image.jpg!' => 'with class <img src="http://foo.bar/image.jpg" class="some-class" alt="" />',
+      'with style !{width:100px;height100px}http://foo.bar/image.jpg!' => 'with style <img src="http://foo.bar/image.jpg" style="width:100px;height100px;" alt="" />',
+    }
+    to_test.each { |text, result| assert_equal "<p>#{result}</p>", textilizable(text) }
+  end
+  
+  def test_textile_external_links
+    to_test = {
       'This is a "link":http://foo.bar' => 'This is a <a href="http://foo.bar" class="external">link</a>',
       'This is an intern "link":/foo/bar' => 'This is an intern <a href="/foo/bar">link</a>',
       '"link (Link title)":http://foo.bar' => '<a href="http://foo.bar" title="Link title" class="external">link</a>'

From a45622585279603ff5b336c78019812a7bef3d37 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Wed, 19 Dec 2007 22:09:31 +0000
Subject: [PATCH 089/710] Add email notification to IssuesController#edit.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1018 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/issues_controller.rb      |  3 ++-
 test/functional/issues_controller_test.rb | 16 ++++++++++++++--
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index 78bcf76a7..f202e9bba 100644
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -96,7 +96,7 @@ class IssuesController < ApplicationController
       @custom_values = @project.custom_fields_for_issues(@issue.tracker).collect { |x| @issue.custom_values.find_by_custom_field_id(x.id) || CustomValue.new(:custom_field => x, :customized => @issue) }
     else
       begin
-        @issue.init_journal(User.current)
+        journal = @issue.init_journal(User.current)
         # Retrieve custom fields and values
         if params["custom_fields"]
           @custom_values = @project.custom_fields_for_issues(@issue.tracker).collect { |x| CustomValue.new(:custom_field => x, :customized => @issue, :value => params["custom_fields"][x.id.to_s]) }
@@ -105,6 +105,7 @@ class IssuesController < ApplicationController
         @issue.attributes = params[:issue]
         if @issue.save
           flash[:notice] = l(:notice_successful_update)
+          Mailer.deliver_issue_edit(journal) if Setting.notified_events.include?('issue_updated')
           redirect_to(params[:back_to] || {:action => 'show', :id => @issue})
         end
       rescue ActiveRecord::StaleObjectError
diff --git a/test/functional/issues_controller_test.rb b/test/functional/issues_controller_test.rb
index ebcf78f24..06d2f1029 100644
--- a/test/functional/issues_controller_test.rb
+++ b/test/functional/issues_controller_test.rb
@@ -112,9 +112,21 @@ class IssuesControllerTest < Test::Unit::TestCase
 
   def test_post_edit
     @request.session[:user_id] = 2
-    post :edit, :id => 1, :issue => {:subject => 'Modified subject'}
+    ActionMailer::Base.deliveries.clear
+    
+    issue = Issue.find(1)
+    old_subject = issue.subject
+    new_subject = 'Subject modified by IssuesControllerTest#test_post_edit'
+    
+    post :edit, :id => 1, :issue => {:subject => new_subject}
     assert_redirected_to 'issues/show/1'
-    assert_equal 'Modified subject', Issue.find(1).subject
+    issue.reload
+    assert_equal new_subject, issue.subject
+    
+    mail = ActionMailer::Base.deliveries.last
+    assert_kind_of TMail::Mail, mail
+    assert mail.subject.starts_with?("[#{issue.project.name} - #{issue.tracker.name} ##{issue.id}]")
+    assert mail.body.include?("Subject changed from #{old_subject} to #{new_subject}")
   end
   
   def test_post_change_status

From 3d5381b24bb488e4e9edd5a9eec2ba8be4de5c63 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Wed, 19 Dec 2007 22:14:03 +0000
Subject: [PATCH 090/710] Do not run Mercurial functional tests if the test
 repository is not set up.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1019 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 .../repositories_mercurial_controller_test.rb | 159 +++++++++---------
 1 file changed, 82 insertions(+), 77 deletions(-)

diff --git a/test/functional/repositories_mercurial_controller_test.rb b/test/functional/repositories_mercurial_controller_test.rb
index db0029017..736e38c83 100644
--- a/test/functional/repositories_mercurial_controller_test.rb
+++ b/test/functional/repositories_mercurial_controller_test.rb
@@ -35,83 +35,88 @@ class RepositoriesMercurialControllerTest < Test::Unit::TestCase
     Repository::Mercurial.create(:project => Project.find(3), :url => REPOSITORY_PATH)
   end
   
-  def test_show
-    get :show, :id => 3
-    assert_response :success
-    assert_template 'show'
-    assert_not_nil assigns(:entries)
-    assert_not_nil assigns(:changesets)
-  end
+  if File.directory?(REPOSITORY_PATH)
+    def test_show
+      get :show, :id => 3
+      assert_response :success
+      assert_template 'show'
+      assert_not_nil assigns(:entries)
+      assert_not_nil assigns(:changesets)
+    end
+    
+    def test_browse_root
+      get :browse, :id => 3
+      assert_response :success
+      assert_template 'browse'
+      assert_not_nil assigns(:entries)
+      assert_equal 3, assigns(:entries).size
+      assert assigns(:entries).detect {|e| e.name == 'images' && e.kind == 'dir'}
+      assert assigns(:entries).detect {|e| e.name == 'sources' && e.kind == 'dir'}
+      assert assigns(:entries).detect {|e| e.name == 'README' && e.kind == 'file'}
+    end
+    
+    def test_browse_directory
+      get :browse, :id => 3, :path => ['images']
+      assert_response :success
+      assert_template 'browse'
+      assert_not_nil assigns(:entries)
+      assert_equal 2, assigns(:entries).size
+      entry = assigns(:entries).detect {|e| e.name == 'edit.png'}
+      assert_not_nil entry
+      assert_equal 'file', entry.kind
+      assert_equal 'images/edit.png', entry.path
+    end
+    
+    def test_changes
+      get :changes, :id => 3, :path => ['images', 'edit.png']
+      assert_response :success
+      assert_template 'changes'
+      assert_tag :tag => 'h2', :content => 'edit.png'
+    end
+    
+    def test_entry_show
+      get :entry, :id => 3, :path => ['sources', 'watchers_controller.rb']
+      assert_response :success
+      assert_template 'entry'
+      # Line 19
+      assert_tag :tag => 'th',
+                 :content => /10/,
+                 :attributes => { :class => /line-num/ },
+                 :sibling => { :tag => 'td', :content => /WITHOUT ANY WARRANTY/ }
+    end
+    
+    def test_entry_download
+      get :entry, :id => 3, :path => ['sources', 'watchers_controller.rb'], :format => 'raw'
+      assert_response :success
+      # File content
+      assert @response.body.include?('WITHOUT ANY WARRANTY')
+    end
   
-  def test_browse_root
-    get :browse, :id => 3
-    assert_response :success
-    assert_template 'browse'
-    assert_not_nil assigns(:entries)
-    assert_equal 3, assigns(:entries).size
-    assert assigns(:entries).detect {|e| e.name == 'images' && e.kind == 'dir'}
-    assert assigns(:entries).detect {|e| e.name == 'sources' && e.kind == 'dir'}
-    assert assigns(:entries).detect {|e| e.name == 'README' && e.kind == 'file'}
-  end
-  
-  def test_browse_directory
-    get :browse, :id => 3, :path => ['images']
-    assert_response :success
-    assert_template 'browse'
-    assert_not_nil assigns(:entries)
-    assert_equal 2, assigns(:entries).size
-    entry = assigns(:entries).detect {|e| e.name == 'edit.png'}
-    assert_not_nil entry
-    assert_equal 'file', entry.kind
-    assert_equal 'images/edit.png', entry.path
-  end
-  
-  def test_changes
-    get :changes, :id => 3, :path => ['images', 'edit.png']
-    assert_response :success
-    assert_template 'changes'
-    assert_tag :tag => 'h2', :content => 'edit.png'
-  end
-  
-  def test_entry_show
-    get :entry, :id => 3, :path => ['sources', 'watchers_controller.rb']
-    assert_response :success
-    assert_template 'entry'
-    # Line 19
-    assert_tag :tag => 'th',
-               :content => /10/,
-               :attributes => { :class => /line-num/ },
-               :sibling => { :tag => 'td', :content => /WITHOUT ANY WARRANTY/ }
-  end
-  
-  def test_entry_download
-    get :entry, :id => 3, :path => ['sources', 'watchers_controller.rb'], :format => 'raw'
-    assert_response :success
-    # File content
-    assert @response.body.include?('WITHOUT ANY WARRANTY')
-  end
-
-  def test_diff
-    # Full diff of changeset 4
-    get :diff, :id => 3, :rev => 4
-    assert_response :success
-    assert_template 'diff'
-    # Line 22 removed
-    assert_tag :tag => 'th',
-               :content => /22/,
-               :sibling => { :tag => 'td', 
-                             :attributes => { :class => /diff_out/ },
-                             :content => /def remove/ }
-  end
-  
-  def test_annotate
-    get :annotate, :id => 3, :path => ['sources', 'watchers_controller.rb']
-    assert_response :success
-    assert_template 'annotate'
-    # Line 23, revision 4
-    assert_tag :tag => 'th', :content => /23/,
-               :sibling => { :tag => 'td', :child => { :tag => 'a', :content => /4/ } },
-               :sibling => { :tag => 'td', :content => /jsmith/ },
-               :sibling => { :tag => 'td', :content => /watcher =/ }
+    def test_diff
+      # Full diff of changeset 4
+      get :diff, :id => 3, :rev => 4
+      assert_response :success
+      assert_template 'diff'
+      # Line 22 removed
+      assert_tag :tag => 'th',
+                 :content => /22/,
+                 :sibling => { :tag => 'td', 
+                               :attributes => { :class => /diff_out/ },
+                               :content => /def remove/ }
+    end
+    
+    def test_annotate
+      get :annotate, :id => 3, :path => ['sources', 'watchers_controller.rb']
+      assert_response :success
+      assert_template 'annotate'
+      # Line 23, revision 4
+      assert_tag :tag => 'th', :content => /23/,
+                 :sibling => { :tag => 'td', :child => { :tag => 'a', :content => /4/ } },
+                 :sibling => { :tag => 'td', :content => /jsmith/ },
+                 :sibling => { :tag => 'td', :content => /watcher =/ }
+    end
+  else
+    puts "Mercurial test repository NOT FOUND. Skipping functional tests !!!"
+    def test_fake; assert true end
   end
 end

From 31c6ebb31046470d41a625195662dfccdff116c4 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Thu, 20 Dec 2007 19:10:24 +0000
Subject: [PATCH 091/710] Added wiki annotate view. It's accessible for each
 version from the page history view. Slight style change: pre-wrap added on
 file/diff contents.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1020 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/wiki_controller.rb      |  5 +++
 app/models/wiki_content.rb              |  8 +++++
 app/models/wiki_page.rb                 | 45 +++++++++++++++++++++++++
 app/views/wiki/annotate.rhtml           | 32 ++++++++++++++++++
 app/views/wiki/history.rhtml            |  2 ++
 lib/redmine.rb                          |  2 +-
 public/stylesheets/scm.css              |  6 ++++
 test/fixtures/wiki_content_versions.yml |  2 +-
 test/functional/wiki_controller_test.rb | 14 ++++++++
 9 files changed, 114 insertions(+), 2 deletions(-)
 create mode 100644 app/views/wiki/annotate.rhtml

diff --git a/app/controllers/wiki_controller.rb b/app/controllers/wiki_controller.rb
index 2ee22167d..bc4b7b451 100644
--- a/app/controllers/wiki_controller.rb
+++ b/app/controllers/wiki_controller.rb
@@ -114,6 +114,11 @@ class WikiController < ApplicationController
     render_404 unless @diff
   end
   
+  def annotate
+    @page = @wiki.find_page(params[:page])
+    @annotate = @page.annotate(params[:version])
+  end
+  
   # remove a wiki page and its history
   def destroy
     @page = @wiki.find_page(params[:page])
diff --git a/app/models/wiki_content.rb b/app/models/wiki_content.rb
index d0a48467b..c307beb1d 100644
--- a/app/models/wiki_content.rb
+++ b/app/models/wiki_content.rb
@@ -60,6 +60,14 @@ class WikiContent < ActiveRecord::Base
         data
       end      
     end
+    
+    # Returns the previous version or nil
+    def previous
+      @previous ||= WikiContent::Version.find(:first, 
+                                              :order => 'version DESC',
+                                              :include => :author,
+                                              :conditions => ["wiki_content_id = ? AND version < ?", wiki_content_id, version])
+    end
   end
   
 end
diff --git a/app/models/wiki_page.rb b/app/models/wiki_page.rb
index cbca4fd68..8ce71cb80 100644
--- a/app/models/wiki_page.rb
+++ b/app/models/wiki_page.rb
@@ -16,6 +16,7 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 require 'diff'
+require 'enumerator'
 
 class WikiPage < ActiveRecord::Base
   belongs_to :wiki
@@ -87,6 +88,12 @@ class WikiPage < ActiveRecord::Base
     (content_to && content_from) ? WikiDiff.new(content_to, content_from) : nil
   end
   
+  def annotate(version=nil)
+    version = version ? version.to_i : self.content.version
+    c = content.versions.find_by_version(version)
+    c ? WikiAnnotate.new(c) : nil
+  end
+  
   def self.pretty_title(str)
     (str && str.is_a?(String)) ? str.tr('_', ' ') : str
   end
@@ -113,3 +120,41 @@ class WikiDiff
     @diff = words_from.diff @words
   end
 end
+
+class WikiAnnotate
+  attr_reader :lines, :content
+  
+  def initialize(content)
+    @content = content
+    current = content
+    current_lines = current.text.split(/\r?\n/)
+    @lines = current_lines.collect {|t| [nil, nil, t]}
+    positions = []
+    current_lines.size.times {|i| positions << i}
+    while (current.previous)
+      d = current.previous.text.split(/\r?\n/).diff(current.text.split(/\r?\n/)).diffs.flatten
+      d.each_slice(3) do |s|
+        sign, line = s[0], s[1]
+        if sign == '+' && positions[line] && positions[line] != -1
+          if @lines[positions[line]][0].nil?
+            @lines[positions[line]][0] = current.version
+            @lines[positions[line]][1] = current.author
+          end
+        end
+      end
+      d.each_slice(3) do |s|
+        sign, line = s[0], s[1]
+        if sign == '-'
+          positions.insert(line, -1)
+        else
+          positions[line] = nil
+        end
+      end
+      positions.compact!
+      # Stop if every line is annotated
+      break unless @lines.detect { |line| line[0].nil? }
+      current = current.previous
+    end
+    @lines.each { |line| line[0] ||= current.version }
+  end
+end
diff --git a/app/views/wiki/annotate.rhtml b/app/views/wiki/annotate.rhtml
new file mode 100644
index 000000000..1c683404b
--- /dev/null
+++ b/app/views/wiki/annotate.rhtml
@@ -0,0 +1,32 @@
+<div class="contextual">
+<%= link_to(l(:button_edit), {:action => 'edit', :page => @page.title}, :class => 'icon icon-edit') %>
+<%= link_to(l(:label_history), {:action => 'history', :page => @page.title}, :class => 'icon icon-history') %>
+</div>
+
+<h2><%= @page.pretty_title %></h2>
+
+<p>
+<%= l(:label_version) %> <%= link_to @annotate.content.version, :action => 'index', :page => @page.title, :version => @annotate.content.version %>
+<em>(<%= @annotate.content.author ? @annotate.content.author.name : "anonyme" %>, <%= format_time(@annotate.content.updated_on) %>)</em>
+</p>
+
+<% colors = Hash.new {|k,v| k[v] = (k.size % 12) } %>
+
+<table class="filecontent annotate CodeRay ">
+<tbody>
+<% line_num = 1 %>
+<% @annotate.lines.each do |line| -%>
+<tr class="bloc-<%= colors[line[0]] %>">
+    <th class="line-num"><%= line_num %></th>
+    <td class="revision"><%= link_to line[0], :controller => 'wiki', :action => 'index', :id => @project, :page => @page.title, :version => line[0] %></td>
+    <td class="author"><%= h(line[1]) %></td>
+    <td class="line-code"><pre><%= line[2] %></pre></td>
+</tr>
+<% line_num += 1 %>
+<% end -%>
+</tbody>
+</table>
+
+<% content_for :header_tags do %>
+<%= stylesheet_link_tag 'scm' %>
+<% end %>
diff --git a/app/views/wiki/history.rhtml b/app/views/wiki/history.rhtml
index b2a467752..fc77e7fb5 100644
--- a/app/views/wiki/history.rhtml
+++ b/app/views/wiki/history.rhtml
@@ -11,6 +11,7 @@
     <th><%= l(:field_updated_on) %></th>
     <th><%= l(:field_author) %></th>
     <th><%= l(:field_comments) %></th>
+    <th></th>
 </tr></thead>
 <tbody>
 <% show_diff = @versions.size > 1 %>
@@ -23,6 +24,7 @@
     <td align="center"><%= format_time(ver.updated_on) %></td>
     <td><em><%= ver.author ? ver.author.name : "anonyme" %></em></td>
     <td><%=h ver.comments %></td>
+    <td align="center"><%= link_to l(:button_annotate), :action => 'annotate', :page => @page.title, :version => ver.version %></td>
 </tr>
 <% line_num += 1 %>
 <% end %>
diff --git a/lib/redmine.rb b/lib/redmine.rb
index 921e16b30..9b29257bd 100644
--- a/lib/redmine.rb
+++ b/lib/redmine.rb
@@ -71,7 +71,7 @@ Redmine::AccessControl.map do |map|
     map.permission :manage_wiki, {:wikis => [:edit, :destroy]}, :require => :member
     map.permission :rename_wiki_pages, {:wiki => :rename}, :require => :member
     map.permission :delete_wiki_pages, {:wiki => :destroy}, :require => :member
-    map.permission :view_wiki_pages, :wiki => [:index, :history, :diff, :special]
+    map.permission :view_wiki_pages, :wiki => [:index, :history, :diff, :annotate, :special]
     map.permission :edit_wiki_pages, :wiki => [:edit, :preview, :add_attachment, :destroy_attachment]
   end
     
diff --git a/public/stylesheets/scm.css b/public/stylesheets/scm.css
index c3dc307d6..66847af8c 100644
--- a/public/stylesheets/scm.css
+++ b/public/stylesheets/scm.css
@@ -10,6 +10,11 @@ table.filecontent th.line-num {
 	width: 2%;
 	padding-right: 3px;
 }
+table.filecontent td.line-code pre {
+    white-space: pre-wrap; /* CSS2.1 compliant */
+    white-space: -moz-pre-wrap; /* Mozilla-based browsers */
+    white-space: -o-pre-wrap; /* Opera 7+ */
+}
 
 /* 12 different colors for the annonate view */
 table.annotate tr.bloc-0 {background: #FFFFBF;}
@@ -40,6 +45,7 @@ table.annotate td.author {
     padding-right: 1em;
     width: 3%;
     background: inherit;
+    font-size: 90%;
 }
 
 table.annotate td.line-code { background-color: #fafafa; }
diff --git a/test/fixtures/wiki_content_versions.yml b/test/fixtures/wiki_content_versions.yml
index 547030ccf..260149060 100644
--- a/test/fixtures/wiki_content_versions.yml
+++ b/test/fixtures/wiki_content_versions.yml
@@ -4,7 +4,7 @@ wiki_content_versions_001:
   page_id: 1
   id: 1
   version: 1
-  author_id: 1
+  author_id: 2
   comments: Page creation
   wiki_content_id: 1
   compression: ""
diff --git a/test/functional/wiki_controller_test.rb b/test/functional/wiki_controller_test.rb
index 043b0e805..0418a02b6 100644
--- a/test/functional/wiki_controller_test.rb
+++ b/test/functional/wiki_controller_test.rb
@@ -98,6 +98,20 @@ class WikiControllerTest < Test::Unit::TestCase
                                :content => /updated/
   end
   
+  def test_annotate
+    get :annotate, :id => 1, :page =>  'CookBook_documentation', :version => 2
+    assert_response :success
+    assert_template 'annotate'
+    # Line 1
+    assert_tag :tag => 'tr', :child => { :tag => 'th', :attributes => {:class => 'line-num'}, :content => '1' },
+                             :child => { :tag => 'td', :attributes => {:class => 'author'}, :content => /John Smith/ },
+                             :child => { :tag => 'td', :content => /h1\. CookBook documentation/ }
+    # Line 2
+    assert_tag :tag => 'tr', :child => { :tag => 'th', :attributes => {:class => 'line-num'}, :content => '2' },
+                             :child => { :tag => 'td', :attributes => {:class => 'author'}, :content => /redMine Admin/ },
+                             :child => { :tag => 'td', :content => /Some updated \[\[documentation\]\] here/ }
+  end
+  
   def test_rename_with_redirect
     @request.session[:user_id] = 2
     post :rename, :id => 1, :page => 'Another_page',

From 9595029709812efc712559f0339939c7c16e8137 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Thu, 20 Dec 2007 19:44:16 +0000
Subject: [PATCH 092/710] Trunk version changed to 0.6.devel

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1021 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 lib/redmine/version.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/redmine/version.rb b/lib/redmine/version.rb
index b109d098e..87611811f 100644
--- a/lib/redmine/version.rb
+++ b/lib/redmine/version.rb
@@ -4,7 +4,7 @@ module Redmine
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 6
-    TINY  = 2
+    TINY  = 'devel'
 
     def self.revision
       revision = nil

From bb8d360188b69fe66e20a969d5dbe6b86b1a0795 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Fri, 21 Dec 2007 18:01:02 +0000
Subject: [PATCH 093/710] Set doctype to transitional. Fixed a few non matching
 tags in views.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1022 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/layouts/_project_selector.rhtml | 4 ++--
 app/views/layouts/base.rhtml              | 4 ++--
 app/views/news/_news.rhtml                | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/views/layouts/_project_selector.rhtml b/app/views/layouts/_project_selector.rhtml
index ce2f15e03..7a2803534 100644
--- a/app/views/layouts/_project_selector.rhtml
+++ b/app/views/layouts/_project_selector.rhtml
@@ -1,7 +1,7 @@
 <% user_projects_by_root = User.current.projects.find(:all, :include => :parent).group_by(&:root) %>
 <select onchange="if (this.value != '') { window.location = this.value; }">
-<option selected><%= l(:label_jump_to_a_project) %></option>
-<option disabled>---</option>
+<option selected="selected"><%= l(:label_jump_to_a_project) %></option>
+<option disabled="disabled">---</option>
 <% user_projects_by_root.keys.sort.each do |root| %>
     <%= content_tag('option', h(root.name), :value => url_for(:controller => 'projects', :action => 'show', :id => root)) %>
     <% user_projects_by_root[root].sort.each do |project| %>
diff --git a/app/views/layouts/base.rhtml b/app/views/layouts/base.rhtml
index df7b2daf9..c98f2b45b 100644
--- a/app/views/layouts/base.rhtml
+++ b/app/views/layouts/base.rhtml
@@ -1,4 +1,4 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
 <head>
 <title><%=h html_title %></title>
@@ -73,7 +73,7 @@
 <div id="ajax-indicator" style="display:none;"><span><%= l(:label_loading) %></span></div>
 	
 <div id="footer">
-    Powered by <%= link_to Redmine::Info.app_name, Redmine::Info.url %> <%= Redmine::VERSION %> &copy 2006-2007 Jean-Philippe Lang
+    Powered by <%= link_to Redmine::Info.app_name, Redmine::Info.url %> <%= Redmine::VERSION %> &copy; 2006-2007 Jean-Philippe Lang
 </div>
 </body>
 </html>
diff --git a/app/views/news/_news.rhtml b/app/views/news/_news.rhtml
index e48b81ac3..e26d2c4a7 100644
--- a/app/views/news/_news.rhtml
+++ b/app/views/news/_news.rhtml
@@ -1,6 +1,6 @@
 <p><%= link_to(h(news.project.name), :controller => 'projects', :action => 'show', :id => news.project) + ': ' unless @project %>
 <%= link_to h(news.title), :controller => 'news', :action => 'show', :id => news %>
-<%= "(#{news.comments_count} #{lwr(:label_comment, news.comments_count).downcase})" if news.comments_count > 0 %></span>
+<%= "(#{news.comments_count} #{lwr(:label_comment, news.comments_count).downcase})" if news.comments_count > 0 %>
 <br />
 <% unless news.summary.blank? %><span class="summary"><%=h news.summary %></span><br /><% end %>
-<span class="author"><%= authoring news.created_on, news.author %></p>
+<span class="author"><%= authoring news.created_on, news.author %></span></p>

From 3ff95e403134eae1ceadce65fa3b11ceedb9e12d Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sat, 22 Dec 2007 12:47:23 +0000
Subject: [PATCH 094/710] Fixed 'export to' links positioning on wiki page.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1023 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/wiki/show.rhtml | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/app/views/wiki/show.rhtml b/app/views/wiki/show.rhtml
index 8def56072..d23491711 100644
--- a/app/views/wiki/show.rhtml
+++ b/app/views/wiki/show.rhtml
@@ -24,12 +24,6 @@
 
 <%= link_to_attachments @page.attachments, :delete_url => (authorize_for('wiki', 'destroy_attachment') ? {:controller => 'wiki', :action => 'destroy_attachment', :page => @page.title} : nil) %>
 
-<div class="contextual">
-<%= l(:label_export_to) %>
-<%= link_to 'HTML', {:page => @page.title, :export => 'html', :version => @content.version}, :class => 'icon icon-html' %>,
-<%= link_to 'TXT', {:page => @page.title, :export => 'txt', :version => @content.version}, :class => 'icon icon-txt' %>
-</div>
-
 <% if authorize_for('wiki', 'add_attachment') %>
 <p><%= toggle_link l(:label_attachment_new), "add_attachment_form" %></p>
 <% form_tag({ :controller => 'wiki', :action => 'add_attachment', :page => @page.title }, :multipart => true, :class => "tabular", :id => "add_attachment_form", :style => "display:none;") do %>
@@ -38,6 +32,13 @@
 <% end %>
 <% end %>
 
+<div class="contextual">
+<%= l(:label_export_to) %>
+<%= link_to 'HTML', {:page => @page.title, :export => 'html', :version => @content.version}, :class => 'icon icon-html' %>,
+<%= link_to 'TXT', {:page => @page.title, :export => 'txt', :version => @content.version}, :class => 'icon icon-txt' %>
+</div>
+&nbsp;
+
 <% content_for :header_tags do %>
   <%= stylesheet_link_tag 'scm' %>
 <% end %>

From 7f3c5169400f23563bc9667e209e64a5ce756619 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Fri, 28 Dec 2007 21:58:33 +0000
Subject: [PATCH 095/710] Fixed: context submenus on the issue list don't show
 up with IE6.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1024 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 public/stylesheets/context_menu.css | 2 +-
 public/stylesheets/csshover.htc     | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/public/stylesheets/context_menu.css b/public/stylesheets/context_menu.css
index 69acf7b73..f68b33fe1 100644
--- a/public/stylesheets/context_menu.css
+++ b/public/stylesheets/context_menu.css
@@ -24,7 +24,7 @@
 }
 #context-menu li.folder ul {
 	position:absolute;
-	left:128px; /* IE */
+	left:168px; /* IE6 */
 	top:-2px;
 }
 #context-menu li.folder>ul { left:148px; }
diff --git a/public/stylesheets/csshover.htc b/public/stylesheets/csshover.htc
index 3ba936ac3..5b58bf0f4 100644
--- a/public/stylesheets/csshover.htc
+++ b/public/stylesheets/csshover.htc
@@ -117,4 +117,6 @@ function getElementsBySelect(rule) {
 		
 		return nodes;
 	}
+
+window.parseStylesheets = parseStylesheets;
 </script>
\ No newline at end of file

From 7eec539222731f5b3fca40d6dbaae8f00f01feba Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sat, 29 Dec 2007 10:43:33 +0000
Subject: [PATCH 096/710] =?UTF-8?q?Fixed=20r1024:=20context=20submenus=20o?=
 =?UTF-8?q?n=20the=20issue=20list=20don=E2=80=99t=20show=20up=20with=20IE6?=
 =?UTF-8?q?.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1025 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 public/javascripts/context_menu.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/public/javascripts/context_menu.js b/public/javascripts/context_menu.js
index 2e8108616..11754cde8 100644
--- a/public/javascripts/context_menu.js
+++ b/public/javascripts/context_menu.js
@@ -39,6 +39,9 @@ ContextMenu.prototype = {
 		this.selection = tr;
 		var id = tr.id.substring(6, tr.id.length);
 		/* TODO: do not hard code path */
-		new Ajax.Updater({success:'context-menu'}, '../../issues/context_menu/' + id, {asynchronous:true, evalScripts:true, onComplete:function(request){Effect.Appear('context-menu', {duration: 0.20})}})		
+		new Ajax.Updater({success:'context-menu'}, '../../issues/context_menu/' + id, {asynchronous:true, evalScripts:true, onComplete:function(request){
+		  Effect.Appear('context-menu', {duration: 0.20});
+		  if (window.parseStylesheets) { window.parseStylesheets(); }
+		}})		
 	}
 }

From 9a1b46fe42873c5fa4c8bb9cf6755eed9e8315db Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sat, 29 Dec 2007 11:36:30 +0000
Subject: [PATCH 097/710] New setting added to specify how many objects should
 be displayed on most paginated lists. Default is: 25, 50, 100 (users can
 choose one of these values). If one value only is entered in this setting
 (eg. 25), the 'per page' links are not displayed (prior behaviour).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1026 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/admin_controller.rb        |  2 +-
 app/controllers/application.rb             | 15 +++++++++++
 app/controllers/boards_controller.rb       |  2 +-
 app/controllers/issues_controller.rb       |  2 +-
 app/controllers/repositories_controller.rb |  2 +-
 app/controllers/users_controller.rb        |  2 +-
 app/controllers/wiki_controller.rb         |  2 +-
 app/helpers/application_helper.rb          | 30 ++++++++++++++++------
 app/models/setting.rb                      |  5 ++++
 app/views/admin/projects.rhtml             |  3 +--
 app/views/auth_sources/list.rhtml          |  2 +-
 app/views/boards/show.rhtml                |  3 +--
 app/views/issue_statuses/list.rhtml        |  2 +-
 app/views/issues/index.rhtml               |  3 +--
 app/views/news/index.rhtml                 |  2 +-
 app/views/repositories/revision.rhtml      |  3 +--
 app/views/repositories/revisions.rhtml     |  3 +--
 app/views/roles/list.rhtml                 |  2 +-
 app/views/settings/edit.rhtml              |  3 +++
 app/views/trackers/list.rhtml              |  2 +-
 app/views/users/list.rhtml                 |  4 +--
 app/views/wiki/history.rhtml               |  3 +--
 config/settings.yml                        |  2 ++
 lang/bg.yml                                |  2 ++
 lang/cs.yml                                |  2 ++
 lang/de.yml                                |  2 ++
 lang/en.yml                                |  2 ++
 lang/es.yml                                |  2 ++
 lang/fr.yml                                |  2 ++
 lang/he.yml                                |  2 ++
 lang/it.yml                                |  2 ++
 lang/ja.yml                                |  2 ++
 lang/ko.yml                                |  2 ++
 lang/nl.yml                                |  2 ++
 lang/pl.yml                                |  2 ++
 lang/pt-br.yml                             |  2 ++
 lang/pt.yml                                |  2 ++
 lang/ro.yml                                |  2 ++
 lang/ru.yml                                |  2 ++
 lang/sr.yml                                |  2 ++
 lang/sv.yml                                |  2 ++
 lang/zh-tw.yml                             |  2 ++
 lang/zh.yml                                |  2 ++
 public/stylesheets/application.css         |  3 +++
 44 files changed, 108 insertions(+), 34 deletions(-)

diff --git a/app/controllers/admin_controller.rb b/app/controllers/admin_controller.rb
index 5ad3d696b..0f8eb32a5 100644
--- a/app/controllers/admin_controller.rb
+++ b/app/controllers/admin_controller.rb
@@ -35,7 +35,7 @@ class AdminController < ApplicationController
     
     @project_count = Project.count(:conditions => conditions)
     @project_pages = Paginator.new self, @project_count,
-								25,
+								per_page_option,
 								params['page']								
     @projects = Project.find :all, :order => sort_clause,
                         :conditions => conditions,
diff --git a/app/controllers/application.rb b/app/controllers/application.rb
index ad86b6b33..607ac091b 100644
--- a/app/controllers/application.rb
+++ b/app/controllers/application.rb
@@ -158,6 +158,21 @@ class ApplicationController < ActionController::Base
     attachments
   end
 
+  # Returns the number of objects that should be displayed
+  # on the paginated list
+  def per_page_option
+    per_page = nil
+    if params[:per_page] && Setting.per_page_options_array.include?(params[:per_page].to_s.to_i)
+      per_page = params[:per_page].to_s.to_i
+      session[:per_page] = per_page
+    elsif session[:per_page]
+      per_page = session[:per_page]
+    else
+      per_page = Setting.per_page_options_array.first || 25
+    end
+    per_page
+  end
+
   # qvalues http header parser
   # code taken from webrick
   def parse_qvalues(value)
diff --git a/app/controllers/boards_controller.rb b/app/controllers/boards_controller.rb
index 200792370..5bf4499bd 100644
--- a/app/controllers/boards_controller.rb
+++ b/app/controllers/boards_controller.rb
@@ -40,7 +40,7 @@ class BoardsController < ApplicationController
     sort_update	
       
     @topic_count = @board.topics.count
-    @topic_pages = Paginator.new self, @topic_count, 25, params['page']
+    @topic_pages = Paginator.new self, @topic_count, per_page_option, params['page']
     @topics =  @board.topics.find :all, :order => "#{Message.table_name}.sticky DESC, #{sort_clause}",
                                   :include => [:author, {:last_reply => :author}],
                                   :limit  =>  @topic_pages.items_per_page,
diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index f202e9bba..be854f98e 100644
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -45,7 +45,7 @@ class IssuesController < ApplicationController
     sort_update
     retrieve_query
     if @query.valid?
-      limit = %w(pdf csv).include?(params[:format]) ? Setting.issues_export_limit.to_i : 25
+      limit = %w(pdf csv).include?(params[:format]) ? Setting.issues_export_limit.to_i : per_page_option
       @issue_count = Issue.count(:include => [:status, :project], :conditions => @query.statement)
       @issue_pages = Paginator.new self, @issue_count, limit, params['page']
       @issues = Issue.find :all, :order => sort_clause,
diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb
index ef332eb37..f8b1eae81 100644
--- a/app/controllers/repositories_controller.rb
+++ b/app/controllers/repositories_controller.rb
@@ -75,7 +75,7 @@ class RepositoriesController < ApplicationController
   def revisions
     @changeset_count = @repository.changesets.count
     @changeset_pages = Paginator.new self, @changeset_count,
-								      25,
+								      per_page_option,
 								      params['page']								
     @changesets = @repository.changesets.find(:all,
 						:limit  =>  @changeset_pages.items_per_page,
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 3f3adb57d..f67d1ae53 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -39,7 +39,7 @@ class UsersController < ApplicationController
     
     @user_count = User.count(:conditions => conditions)
     @user_pages = Paginator.new self, @user_count,
-								15,
+								per_page_option,
 								params['page']								
     @users =  User.find :all,:order => sort_clause,
                         :conditions => conditions,
diff --git a/app/controllers/wiki_controller.rb b/app/controllers/wiki_controller.rb
index bc4b7b451..53c5ec53b 100644
--- a/app/controllers/wiki_controller.rb
+++ b/app/controllers/wiki_controller.rb
@@ -97,7 +97,7 @@ class WikiController < ApplicationController
     @page = @wiki.find_page(params[:page])
     
     @version_count = @page.content.versions.count
-    @version_pages = Paginator.new self, @version_count, 25, params['p']
+    @version_pages = Paginator.new self, @version_count, per_page_option, params['p']
     # don't load text    
     @versions = @page.content.versions.find :all, 
                                             :select => "id, author_id, comments, updated_on, version",
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index a3509b99a..e510f881f 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -103,26 +103,40 @@ module ApplicationHelper
     l(:actionview_datehelper_select_month_names).split(',')[month-1]
   end
 
-  def pagination_links_full(paginator, options={}, html_options={})
+  def pagination_links_full(paginator, count=nil, options={})
     page_param = options.delete(:page_param) || :page
-  
+    url_param = params.dup
+    
     html = ''    
     html << link_to_remote(('&#171; ' + l(:label_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
+                            {:update => "content", :url => url_param.merge(page_param => paginator.current.previous)},
+                            {:href => url_for(:params => url_param.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_param => n)}, :update => 'content'},
-                      {:href => url_for(:params => options.merge(page_param => n))})
+                      {:url => {:params => url_param.merge(page_param => n)}, :update => 'content'},
+                      {:href => url_for(:params => url_param.merge(page_param => n))})
     end || '')
     
     html << ' ' + link_to_remote((l(:label_next) + ' &#187;'), 
-                                 {: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
+                                 {:update => "content", :url => url_param.merge(page_param => paginator.current.next)},
+                                 {:href => url_for(:params => url_param.merge(page_param => paginator.current.next))}) if paginator.current.next
+    
+    unless count.nil?
+      html << [" (#{paginator.current.first_item}-#{paginator.current.last_item}/#{count})", per_page_links(paginator.items_per_page)].compact.join(' | ')
+    end
+    
     html  
   end
   
+  def per_page_links(selected=nil)
+    links = Setting.per_page_options_array.collect do |n|
+      n == selected ? n : link_to_remote(n, {:update => "content", :url => params.dup.merge(:per_page => n)}, 
+                                            {:href => url_for(params.dup.merge(:per_page => n))})
+    end
+    links.size > 1 ? l(:label_display_per_page, links.join(', ')) : nil
+  end
+  
   def set_html_title(text)
     @html_header_title = text
   end
diff --git a/app/models/setting.rb b/app/models/setting.rb
index 4d4cf0045..46b6d76ce 100644
--- a/app/models/setting.rb
+++ b/app/models/setting.rb
@@ -95,6 +95,11 @@ class Setting < ActiveRecord::Base
     class_eval src, __FILE__, __LINE__
   end
   
+  # Helper that returns an array based on per_page_options setting
+  def self.per_page_options_array
+    per_page_options.split(%r{[\s,]}).collect(&:to_i).select {|n| n > 0}.sort
+  end
+  
   # Checks if settings have changed since the values were read
   # and clears the cache hash if it's the case
   # Called once per request
diff --git a/app/views/admin/projects.rhtml b/app/views/admin/projects.rhtml
index e9d5e8537..295cfd101 100644
--- a/app/views/admin/projects.rhtml
+++ b/app/views/admin/projects.rhtml
@@ -45,7 +45,6 @@
   </tbody>
 </table>
 
-<p><%= pagination_links_full @project_pages, :status => @status %>
-[ <%= @project_pages.current.first_item %> - <%= @project_pages.current.last_item %> / <%= @project_count %> ]</p>
+<p class="pagination"><%= pagination_links_full @project_pages, @project_count %></p>
 
 <% set_html_title l(:label_project_plural) -%>
diff --git a/app/views/auth_sources/list.rhtml b/app/views/auth_sources/list.rhtml
index f486f45b7..6836e6c67 100644
--- a/app/views/auth_sources/list.rhtml
+++ b/app/views/auth_sources/list.rhtml
@@ -25,4 +25,4 @@
   </tbody>
 </table>
 
-<%= pagination_links_full @auth_source_pages %>
+<p class="pagination"><%= pagination_links_full @auth_source_pages %></p>
diff --git a/app/views/boards/show.rhtml b/app/views/boards/show.rhtml
index 8bcf960b2..01db0854c 100644
--- a/app/views/boards/show.rhtml
+++ b/app/views/boards/show.rhtml
@@ -43,8 +43,7 @@
   <% end %>
   </tbody>
 </table>
-<p><%= pagination_links_full @topic_pages %>
-[ <%= @topic_pages.current.first_item %> - <%= @topic_pages.current.last_item %> / <%= @topic_count %> ]</p>
+<p class="pagination"><%= pagination_links_full @topic_pages, @topic_count %></p>
 <% else %>
 <p class="nodata"><%= l(:label_no_data) %></p>
 <% end %>
diff --git a/app/views/issue_statuses/list.rhtml b/app/views/issue_statuses/list.rhtml
index 05506f3c7..a45f5d4d0 100644
--- a/app/views/issue_statuses/list.rhtml
+++ b/app/views/issue_statuses/list.rhtml
@@ -32,6 +32,6 @@
   </tbody>
 </table>
 
-<%= pagination_links_full @issue_status_pages %>
+<p class="pagination"><%= pagination_links_full @issue_status_pages %></p>
 
 <% set_html_title(l(:label_issue_status_plural)) -%>
diff --git a/app/views/issues/index.rhtml b/app/views/issues/index.rhtml
index de0fd4add..c298b9bcc 100644
--- a/app/views/issues/index.rhtml
+++ b/app/views/issues/index.rhtml
@@ -48,8 +48,7 @@
 <%= link_to 'CSV', {:format => 'csv'}, :class => 'icon icon-csv' %>,
 <%= link_to 'PDF', {:format => 'pdf'}, :class => 'icon icon-pdf' %>
 </div>
-<p><%= pagination_links_full @issue_pages %>
-[ <%= @issue_pages.current.first_item %> - <%= @issue_pages.current.last_item %> / <%= @issue_count %> ]</p>
+<p class="pagination"><%= pagination_links_full @issue_pages, @issue_count %></p>
 <% end %>
 <% end %>
 <% end %>
diff --git a/app/views/news/index.rhtml b/app/views/news/index.rhtml
index 0b677d241..354467229 100644
--- a/app/views/news/index.rhtml
+++ b/app/views/news/index.rhtml
@@ -27,7 +27,7 @@
     <%= textilizable(news.description) %>
 <% end %>
 <% end %>
-<%= pagination_links_full @news_pages %>
+<p class="pagination"><%= pagination_links_full @news_pages %></p>
 
 <% content_for :header_tags do %>
   <%= auto_discovery_link_tag(:atom, params.merge({:format => 'atom', :page => nil, :key => User.current.rss_key})) %>
diff --git a/app/views/repositories/revision.rhtml b/app/views/repositories/revision.rhtml
index d87dfa955..265070e37 100644
--- a/app/views/repositories/revision.rhtml
+++ b/app/views/repositories/revision.rhtml
@@ -56,8 +56,7 @@
 <% end %>
 </tbody>
 </table>
-<p><%= pagination_links_full @changes_pages, :rev => @changeset.revision %>
-[ <%= @changes_pages.current.first_item %> - <%= @changes_pages.current.last_item %> / <%= @changes_count %> ]</p>
+<p class="pagination"><%= pagination_links_full @changes_pages %></p>
 
 <% content_for :header_tags do %>
 <%= stylesheet_link_tag "scm" %>
diff --git a/app/views/repositories/revisions.rhtml b/app/views/repositories/revisions.rhtml
index 4483a482c..99c3f7afd 100644
--- a/app/views/repositories/revisions.rhtml
+++ b/app/views/repositories/revisions.rhtml
@@ -9,8 +9,7 @@
 
 <%= render :partial => 'revisions', :locals => {:project => @project, :path => '', :revisions => @changesets, :entry => nil }%>
 
-<p><%= pagination_links_full @changeset_pages %>
-[ <%= @changeset_pages.current.first_item %> - <%= @changeset_pages.current.last_item %> / <%= @changeset_count %> ]</p>
+<p class="pagination"><%= pagination_links_full @changeset_pages,@changeset_count %></p>
 
 <% content_for :header_tags do %>
 <%= stylesheet_link_tag "scm" %>
diff --git a/app/views/roles/list.rhtml b/app/views/roles/list.rhtml
index 02bb20f5e..fabc5edcd 100644
--- a/app/views/roles/list.rhtml
+++ b/app/views/roles/list.rhtml
@@ -29,7 +29,7 @@
   </tbody>
 </table>
 
-<p><%= pagination_links_full @role_pages %></p>
+<p class="pagination"><%= pagination_links_full @role_pages %></p>
 
 <p><%= link_to l(:label_permissions_report), :action => 'report' %></p>
 
diff --git a/app/views/settings/edit.rhtml b/app/views/settings/edit.rhtml
index 758045f05..b1db0e7ad 100644
--- a/app/views/settings/edit.rhtml
+++ b/app/views/settings/edit.rhtml
@@ -27,6 +27,9 @@
 <p><label><%= l(:setting_attachment_max_size) %></label>
 <%= text_field_tag 'settings[attachment_max_size]', Setting.attachment_max_size, :size => 6 %> KB</p>
 
+<p><label><%= l(:setting_per_page_options) %></label>
+<%= text_field_tag 'settings[per_page_options]', Setting.per_page_options_array.join(', '), :size => 20 %><br /><em><%= l(:text_comma_separated) %></em></p>
+
 <p><label><%= l(:setting_issues_export_limit) %></label>
 <%= text_field_tag 'settings[issues_export_limit]', Setting.issues_export_limit, :size => 6 %></p>
 
diff --git a/app/views/trackers/list.rhtml b/app/views/trackers/list.rhtml
index d339bdba0..447507210 100644
--- a/app/views/trackers/list.rhtml
+++ b/app/views/trackers/list.rhtml
@@ -30,6 +30,6 @@
   </tbody>
 </table>
 
-<%= pagination_links_full @tracker_pages %>
+<p class="pagination"><%= pagination_links_full @tracker_pages %></p>
 
 <% set_html_title(l(:label_tracker_plural)) -%>
diff --git a/app/views/users/list.rhtml b/app/views/users/list.rhtml
index 3f879d7a6..fbac1e8e9 100644
--- a/app/views/users/list.rhtml
+++ b/app/views/users/list.rhtml
@@ -55,8 +55,6 @@
   </tbody>
 </table>
 
-<p><%= pagination_links_full @user_pages, :status => @status %>
-[ <%= @user_pages.current.first_item %> - <%= @user_pages.current.last_item %> / <%= @user_count %> ]
-</p>
+<p class="pagination"><%= pagination_links_full @user_pages, @user_count %></p>
 
 <% set_html_title(l(:label_user_plural)) -%>
diff --git a/app/views/wiki/history.rhtml b/app/views/wiki/history.rhtml
index fc77e7fb5..6462e9fdd 100644
--- a/app/views/wiki/history.rhtml
+++ b/app/views/wiki/history.rhtml
@@ -31,6 +31,5 @@
 </tbody>
 </table>
 <%= submit_tag l(:label_view_diff), :class => 'small' %>
-<%= pagination_links_full @version_pages, :page_param => :p %>
-[ <%= @version_pages.current.first_item %> - <%= @version_pages.current.last_item %> / <%= @version_count %> ]
+<span class="pagination"><%= pagination_links_full @version_pages, @version_count, :page_param => :p %></span>
 <% end %>
diff --git a/config/settings.yml b/config/settings.yml
index 9f6671f0d..1360b5501 100644
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -37,6 +37,8 @@ attachment_max_size:
 issues_export_limit:
   format: int
   default: 500
+per_page_options:
+  default: '25,50,100'
 mail_from:
   default: redmine@somenet.foo
 bcc_recipients:
diff --git a/lang/bg.yml b/lang/bg.yml
index d9bcd6c7c..635ead5a5 100644
--- a/lang/bg.yml
+++ b/lang/bg.yml
@@ -550,3 +550,5 @@ setting_bcc_recipients: Blind carbon copy recipients (bcc)
 button_annotate: Annotate
 label_issues_by: Issues by %s
 field_searchable: Searchable
+label_display_per_page: 'Per page: %s'
+setting_per_page_options: Objects per page options
diff --git a/lang/cs.yml b/lang/cs.yml
index fe29defe6..89cc177b5 100644
--- a/lang/cs.yml
+++ b/lang/cs.yml
@@ -550,3 +550,5 @@ setting_bcc_recipients: Blind carbon copy recipients (bcc)
 button_annotate: Annotate
 label_issues_by: Issues by %s
 field_searchable: Searchable
+label_display_per_page: 'Per page: %s'
+setting_per_page_options: Objects per page options
diff --git a/lang/de.yml b/lang/de.yml
index c9cdc0c12..faa992933 100644
--- a/lang/de.yml
+++ b/lang/de.yml
@@ -550,3 +550,5 @@ setting_bcc_recipients: Blind carbon copy recipients (bcc)
 button_annotate: Annotate
 label_issues_by: Issues by %s
 field_searchable: Searchable
+label_display_per_page: 'Per page: %s'
+setting_per_page_options: Objects per page options
diff --git a/lang/en.yml b/lang/en.yml
index 116935f73..36c060d36 100644
--- a/lang/en.yml
+++ b/lang/en.yml
@@ -198,6 +198,7 @@ setting_issue_list_default_columns: Default columns displayed on the issue list
 setting_repositories_encodings: Repositories encodings
 setting_emails_footer: Emails footer
 setting_protocol: Protocol
+setting_per_page_options: Objects per page options
 
 label_user: User
 label_user_plural: Users
@@ -456,6 +457,7 @@ label_user_mail_no_self_notified: "I don't want to be notified of changes that I
 label_registration_activation_by_email: account activation by email
 label_registration_manual_activation: manual account activation
 label_registration_automatic_activation: automatic account activation
+label_display_per_page: 'Per page: %s'
 
 button_login: Login
 button_submit: Submit
diff --git a/lang/es.yml b/lang/es.yml
index 50c652f2c..6ec8db0f1 100644
--- a/lang/es.yml
+++ b/lang/es.yml
@@ -553,3 +553,5 @@ setting_bcc_recipients: Blind carbon copy recipients (bcc)
 button_annotate: Annotate
 label_issues_by: Issues by %s
 field_searchable: Searchable
+label_display_per_page: 'Per page: %s'
+setting_per_page_options: Objects per page options
diff --git a/lang/fr.yml b/lang/fr.yml
index d6ad5da56..c13500e03 100644
--- a/lang/fr.yml
+++ b/lang/fr.yml
@@ -198,6 +198,7 @@ setting_issue_list_default_columns: Colonnes affichées par défaut sur la liste
 setting_repositories_encodings: Encodages des dépôts
 setting_emails_footer: Pied-de-page des emails
 setting_protocol: Protocole
+setting_per_page_options: Options d'objets affichés par page
 
 label_user: Utilisateur
 label_user_plural: Utilisateurs
@@ -456,6 +457,7 @@ label_user_mail_no_self_notified: "Je ne veux pas être notifié des changements
 label_registration_activation_by_email: activation du compte par email
 label_registration_manual_activation: activation manuelle du compte
 label_registration_automatic_activation: activation automatique du compte
+label_display_per_page: 'Par page: %s'
 
 button_login: Connexion
 button_submit: Soumettre
diff --git a/lang/he.yml b/lang/he.yml
index 0ed57e527..09070bd82 100644
--- a/lang/he.yml
+++ b/lang/he.yml
@@ -550,3 +550,5 @@ setting_bcc_recipients: Blind carbon copy recipients (bcc)
 button_annotate: Annotate
 label_issues_by: Issues by %s
 field_searchable: Searchable
+label_display_per_page: 'Per page: %s'
+setting_per_page_options: Objects per page options
diff --git a/lang/it.yml b/lang/it.yml
index d266f797e..8c87a8b34 100644
--- a/lang/it.yml
+++ b/lang/it.yml
@@ -550,3 +550,5 @@ setting_bcc_recipients: Blind carbon copy recipients (bcc)
 button_annotate: Annotate
 label_issues_by: Issues by %s
 field_searchable: Searchable
+label_display_per_page: 'Per page: %s'
+setting_per_page_options: Objects per page options
diff --git a/lang/ja.yml b/lang/ja.yml
index 4206f3db6..150c62283 100644
--- a/lang/ja.yml
+++ b/lang/ja.yml
@@ -551,3 +551,5 @@ setting_bcc_recipients: ブラインドカーボンコピーで受信(bcc)
 button_annotate: 注釈
 label_issues_by: %s別の問題
 field_searchable: Searchable
+label_display_per_page: 'Per page: %s'
+setting_per_page_options: Objects per page options
diff --git a/lang/ko.yml b/lang/ko.yml
index 76debf345..001ddd395 100644
--- a/lang/ko.yml
+++ b/lang/ko.yml
@@ -550,3 +550,5 @@ setting_bcc_recipients: Blind carbon copy recipients (bcc)
 button_annotate: Annotate
 label_issues_by: Issues by %s
 field_searchable: Searchable
+label_display_per_page: 'Per page: %s'
+setting_per_page_options: Objects per page options
diff --git a/lang/nl.yml b/lang/nl.yml
index a8b5cc64a..0c8085ba1 100644
--- a/lang/nl.yml
+++ b/lang/nl.yml
@@ -551,3 +551,5 @@ setting_bcc_recipients: Blind carbon copy recipients (bcc)
 button_annotate: Annotate
 label_issues_by: Issues by %s
 field_searchable: Searchable
+label_display_per_page: 'Per page: %s'
+setting_per_page_options: Objects per page options
diff --git a/lang/pl.yml b/lang/pl.yml
index 5fa50ec51..c086cce63 100644
--- a/lang/pl.yml
+++ b/lang/pl.yml
@@ -550,3 +550,5 @@ setting_bcc_recipients: Odbiorcy kopii tajnej (kt/bcc)
 button_annotate: Adnotuj
 label_issues_by: Zagadnienia wprowadzone przez %s
 field_searchable: Searchable
+label_display_per_page: 'Per page: %s'
+setting_per_page_options: Objects per page options
diff --git a/lang/pt-br.yml b/lang/pt-br.yml
index ed31915dd..564ee4b0a 100644
--- a/lang/pt-br.yml
+++ b/lang/pt-br.yml
@@ -550,3 +550,5 @@ setting_bcc_recipients: Blind carbon copy recipients (bcc)
 button_annotate: Annotate
 label_issues_by: Issues by %s
 field_searchable: Searchable
+label_display_per_page: 'Per page: %s'
+setting_per_page_options: Objects per page options
diff --git a/lang/pt.yml b/lang/pt.yml
index 72ba4d2b0..aaab55a51 100644
--- a/lang/pt.yml
+++ b/lang/pt.yml
@@ -550,3 +550,5 @@ setting_bcc_recipients: Blind carbon copy recipients (bcc)
 button_annotate: Annotate
 label_issues_by: Issues by %s
 field_searchable: Searchable
+label_display_per_page: 'Per page: %s'
+setting_per_page_options: Objects per page options
diff --git a/lang/ro.yml b/lang/ro.yml
index 6f1eb7810..6fdce2081 100644
--- a/lang/ro.yml
+++ b/lang/ro.yml
@@ -550,3 +550,5 @@ setting_bcc_recipients: Blind carbon copy recipients (bcc)
 button_annotate: Annotate
 label_issues_by: Issues by %s
 field_searchable: Searchable
+label_display_per_page: 'Per page: %s'
+setting_per_page_options: Objects per page options
diff --git a/lang/ru.yml b/lang/ru.yml
index c7697ae1a..1be4615bb 100644
--- a/lang/ru.yml
+++ b/lang/ru.yml
@@ -550,3 +550,5 @@ setting_bcc_recipients: Blind carbon copy recipients (bcc)
 button_annotate: Annotate
 label_issues_by: Issues by %s
 field_searchable: Searchable
+label_display_per_page: 'Per page: %s'
+setting_per_page_options: Objects per page options
diff --git a/lang/sr.yml b/lang/sr.yml
index b5e9ecfe3..a4bed33ea 100644
--- a/lang/sr.yml
+++ b/lang/sr.yml
@@ -551,3 +551,5 @@ setting_bcc_recipients: Blind carbon copy recipients (bcc)
 button_annotate: Annotate
 label_issues_by: Issues by %s
 field_searchable: Searchable
+label_display_per_page: 'Per page: %s'
+setting_per_page_options: Objects per page options
diff --git a/lang/sv.yml b/lang/sv.yml
index d789a2a37..fd84f2a58 100644
--- a/lang/sv.yml
+++ b/lang/sv.yml
@@ -551,3 +551,5 @@ setting_bcc_recipients: Blind carbon copy recipients (bcc)
 button_annotate: Annotate
 label_issues_by: Issues by %s
 field_searchable: Searchable
+label_display_per_page: 'Per page: %s'
+setting_per_page_options: Objects per page options
diff --git a/lang/zh-tw.yml b/lang/zh-tw.yml
index 4d730c1a9..6bc341cba 100644
--- a/lang/zh-tw.yml
+++ b/lang/zh-tw.yml
@@ -550,3 +550,5 @@ enumeration_issue_priorities: 項目重要性
 enumeration_doc_categories: 文件分類
 enumeration_activities: 活動 (time tracking)
 field_searchable: Searchable
+label_display_per_page: 'Per page: %s'
+setting_per_page_options: Objects per page options
diff --git a/lang/zh.yml b/lang/zh.yml
index 6876daa17..31e8b239b 100644
--- a/lang/zh.yml
+++ b/lang/zh.yml
@@ -553,3 +553,5 @@ setting_bcc_recipients: Blind carbon copy recipients (bcc)
 button_annotate: Annotate
 label_issues_by: Issues by %s
 field_searchable: Searchable
+label_display_per_page: 'Per page: %s'
+setting_per_page_options: Objects per page options
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index aa4b29712..37bddbc05 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -126,6 +126,9 @@ div.issue {background:#ffffdd; padding:6px; margin-bottom:6px;border: 1px solid
 .autoscroll {overflow-x: auto; padding:1px; width:100%; margin-bottom: 1.2em;}
 #user_firstname, #user_lastname, #user_mail, #my_account_form select { width: 90%; }
 
+.pagination {font-size: 90%}
+p.pagination {margin-top:8px;}
+
 /***** Tabular forms ******/
 .tabular p{
 margin: 0;

From 5bc7dc77e24a947a005625971c42d20d6bdf8e5b Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 30 Dec 2007 10:46:09 +0000
Subject: [PATCH 098/710] Do not store query object in session but id or
 filters only. This allows to use Rails 2.0 cookie based sessions.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1027 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/issues_controller.rb | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index be854f98e..39a1e2d13 100644
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -216,9 +216,9 @@ private
   def retrieve_query
     if params[:query_id]
       @query = Query.find(params[:query_id], :conditions => {:project_id => (@project ? @project.id : nil)})
-      session[:query] = @query
+      session[:query] = {:id => @query.id, :project_id => @query.project_id}
     else
-      if params[:set_filter] or !session[:query] or session[:query].project != @project
+      if params[:set_filter] || session[:query].nil? || session[:query][:project_id] != (@project ? @project.id : nil)
         # Give it a name, required to be valid
         @query = Query.new(:name => "_")
         @query.project = @project
@@ -231,9 +231,10 @@ private
             @query.add_short_filter(field, params[field]) if params[field]
           end
         end
-        session[:query] = @query
+        session[:query] = {:project_id => @query.project_id, :filters => @query.filters}
       else
-        @query = session[:query]
+        @query = Query.find_by_id(session[:query][:id]) if session[:query][:id]
+        @query ||= Query.new(:name => "_", :project => @project, :filters => session[:query][:filters])
       end
     end
   end

From 66420fe4b7ece872c992a91e935a79258482068b Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 30 Dec 2007 10:48:11 +0000
Subject: [PATCH 099/710] TabularFormBuilder moved out of application_helper.rb

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1028 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/helpers/application_helper.rb | 35 ---------------------
 lib/tabular_form_builder.rb       | 51 +++++++++++++++++++++++++++++++
 2 files changed, 51 insertions(+), 35 deletions(-)
 create mode 100644 lib/tabular_form_builder.rb

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index e510f881f..7f412e730 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -384,38 +384,3 @@ module ApplicationHelper
     (@has_content && @has_content[name]) || false
   end
 end
-
-class TabularFormBuilder < ActionView::Helpers::FormBuilder
-  include GLoc
-  
-  def initialize(object_name, object, template, options, proc)
-    set_language_if_valid options.delete(:lang)
-    @object_name, @object, @template, @options, @proc = object_name, object, template, options, proc        
-  end      
-      
-  (field_helpers - %w(radio_button hidden_field) + %w(date_select)).each do |selector|
-    src = <<-END_SRC
-    def #{selector}(field, options = {}) 
-      return super if options.delete :no_label
-      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))
-      label + super
-    end
-    END_SRC
-    class_eval src, __FILE__, __LINE__
-  end
-  
-  def select(field, choices, options = {}, html_options = {}) 
-    label_text = l(("field_"+field.to_s.gsub(/\_id$/, "")).to_sym) + (options.delete(:required) ? @template.content_tag("span", " *", :class => "required"): "")
-    label = @template.content_tag("label", label_text, 
-                  :class => (@object && @object.errors[field] ? "error" : nil), 
-                  :for => (@object_name.to_s + "_" + field.to_s))
-    label + super
-  end
-
-end
-
diff --git a/lib/tabular_form_builder.rb b/lib/tabular_form_builder.rb
new file mode 100644
index 000000000..5b331fe3f
--- /dev/null
+++ b/lib/tabular_form_builder.rb
@@ -0,0 +1,51 @@
+# 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 'action_view/helpers/form_helper'
+
+class TabularFormBuilder < ActionView::Helpers::FormBuilder
+  include GLoc
+  
+  def initialize(object_name, object, template, options, proc)
+    set_language_if_valid options.delete(:lang)
+    @object_name, @object, @template, @options, @proc = object_name, object, template, options, proc        
+  end      
+      
+  (field_helpers - %w(radio_button hidden_field) + %w(date_select)).each do |selector|
+    src = <<-END_SRC
+    def #{selector}(field, options = {}) 
+      return super if options.delete :no_label
+      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))
+      label + super
+    end
+    END_SRC
+    class_eval src, __FILE__, __LINE__
+  end
+  
+  def select(field, choices, options = {}, html_options = {}) 
+    label_text = l(("field_"+field.to_s.gsub(/\_id$/, "")).to_sym) + (options.delete(:required) ? @template.content_tag("span", " *", :class => "required"): "")
+    label = @template.content_tag("label", label_text, 
+                  :class => (@object && @object.errors[field] ? "error" : nil), 
+                  :for => (@object_name.to_s + "_" + field.to_s))
+    label + super
+  end
+end

From 9072753489d59bc02948b4a0ba20ff417e98c966 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 30 Dec 2007 10:51:34 +0000
Subject: [PATCH 100/710] Moved current user management to a dedicated method
 for modularity.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1029 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/application.rb | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/app/controllers/application.rb b/app/controllers/application.rb
index 607ac091b..306ebc03c 100644
--- a/app/controllers/application.rb
+++ b/app/controllers/application.rb
@@ -28,18 +28,23 @@ class ApplicationController < ActionController::Base
   end
   
   def user_setup
+    # Check the settings cache for each request
     Setting.check_cache
+    # Find the current user
+    User.current = find_current_user
+  end
+  
+  # Returns the current user or nil if no user is logged in
+  def find_current_user
     if session[:user_id]
       # existing session
-      User.current = User.find(session[:user_id])
+      (User.find_active(session[:user_id]) rescue nil)
     elsif cookies[:autologin] && Setting.autologin?
       # auto-login feature
-      User.current = User.find_by_autologin_key(cookies[:autologin])
+      User.find_by_autologin_key(cookies[:autologin])
     elsif params[:key] && accept_key_auth_actions.include?(params[:action])
       # RSS key authentication
-      User.current = User.find_by_rss_key(params[:key])
-    else
-      User.current = User.anonymous
+      User.find_by_rss_key(params[:key])
     end
   end
   

From 97f0da0b1a6f1d55e5c87558a0cbaa847cedba20 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 30 Dec 2007 11:44:46 +0000
Subject: [PATCH 101/710] Moved login and logout links to ApplicationHelper
 methods for easier customization.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1030 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/helpers/application_helper.rb | 8 ++++++++
 app/views/layouts/base.rhtml      | 4 ++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 7f412e730..2c6a1ba49 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -31,6 +31,14 @@ module ApplicationHelper
   def link_to_if_authorized(name, options = {}, html_options = nil, *parameters_for_method_reference)
     link_to(name, options, html_options, *parameters_for_method_reference) if authorize_for(options[:controller] || params[:controller], options[:action])
   end
+  
+  def link_to_signin
+    link_to l(:label_login), { :controller => 'account', :action => 'login' }, :class => 'signin'
+  end
+  
+  def link_to_signout
+    link_to l(:label_logout), { :controller => 'account', :action => 'logout' }, :class => 'logout'
+  end
 
   # Display a link to user's account page
   def link_to_user(user)
diff --git a/app/views/layouts/base.rhtml b/app/views/layouts/base.rhtml
index c98f2b45b..5f85c78f8 100644
--- a/app/views/layouts/base.rhtml
+++ b/app/views/layouts/base.rhtml
@@ -23,9 +23,9 @@
         <% if User.current.logged? %>
             <%=l(:label_logged_as)%> <%= User.current.login %> -
             <%= link_to l(:label_my_account), { :controller => 'my', :action => 'account' }, :class => 'myaccount' %>
-            <%= link_to l(:label_logout), { :controller => 'account', :action => 'logout' }, :class => 'logout' %>
+            <%= link_to_signout %>
         <% else %>
-            <%= link_to l(:label_login), { :controller => 'account', :action => 'login' }, :class => 'signin' %>
+            <%= link_to_signin %>
             <%= link_to(l(:label_register), { :controller => 'account',:action => 'register' }, :class => 'register') if Setting.self_registration? %>
         <% end %>
     </div>

From 636579b17ddd4b775b060cdb0ac3a94db5e4cb2b Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Mon, 31 Dec 2007 12:37:32 +0000
Subject: [PATCH 102/710] Fix query management broken by r1027.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1031 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/models/query.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/query.rb b/app/models/query.rb
index ded8be770..61a559d16 100644
--- a/app/models/query.rb
+++ b/app/models/query.rb
@@ -53,7 +53,7 @@ class Query < ActiveRecord::Base
   serialize :filters
   serialize :column_names
   
-  attr_protected :project, :user
+  attr_protected :project_id, :user_id
   
   validates_presence_of :name, :on => :save
   validates_length_of :name, :maximum => 255

From 3e0acc0b7e1fda93d8bdd9df7b7c8c9551fad864 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Wed, 2 Jan 2008 22:41:53 +0000
Subject: [PATCH 103/710] Slight improvements to the browser views.
 ApplicationHelper#set_html_title replaced by html_title with arguments and
 can be called several times in views to append elements to the title.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1032 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/helpers/application_helper.rb             | 21 ++++++++++---------
 app/helpers/repositories_helper.rb            |  2 +-
 app/views/admin/index.rhtml                   |  2 +-
 app/views/admin/info.rhtml                    |  2 +-
 app/views/admin/mail_options.rhtml            |  2 +-
 app/views/admin/projects.rhtml                |  2 +-
 app/views/common/403.rhtml                    |  2 +-
 app/views/common/404.rhtml                    |  2 +-
 app/views/custom_fields/list.rhtml            |  2 +-
 app/views/documents/index.rhtml               |  2 +-
 app/views/documents/show.rhtml                |  2 +-
 app/views/enumerations/list.rhtml             |  2 +-
 app/views/issue_statuses/list.rhtml           |  2 +-
 app/views/issues/index.rhtml                  |  6 +++---
 app/views/issues/show.rhtml                   |  2 +-
 app/views/my/account.rhtml                    |  2 +-
 app/views/my/page.rhtml                       |  2 +-
 app/views/news/index.rhtml                    |  2 +-
 app/views/news/show.rhtml                     |  2 +-
 app/views/projects/activity.rhtml             |  2 +-
 app/views/projects/calendar.rhtml             |  2 +-
 app/views/projects/gantt.rhtml                |  2 +-
 app/views/projects/list.rhtml                 |  2 +-
 app/views/projects/list_files.rhtml           |  2 +-
 app/views/projects/roadmap.rhtml              |  2 +-
 app/views/projects/settings.rhtml             |  2 +-
 app/views/projects/show.rhtml                 |  2 +-
 app/views/repositories/_dir_list.rhtml        |  4 ++--
 .../repositories/_dir_list_content.rhtml      | 14 ++++++-------
 app/views/repositories/_navigation.rhtml      |  2 ++
 app/views/repositories/_revisions.rhtml       | 12 +++++------
 app/views/repositories/annotate.rhtml         |  2 ++
 app/views/repositories/browse.rhtml           |  2 +-
 app/views/repositories/changes.rhtml          |  2 +-
 app/views/repositories/diff.rhtml             |  2 ++
 app/views/repositories/revision.rhtml         |  2 +-
 app/views/repositories/revisions.rhtml        |  2 +-
 app/views/repositories/show.rhtml             |  2 +-
 app/views/repositories/stats.rhtml            |  4 +++-
 app/views/roles/list.rhtml                    |  2 +-
 app/views/roles/workflow.rhtml                |  2 +-
 app/views/search/index.rhtml                  |  2 +-
 app/views/settings/edit.rhtml                 |  2 +-
 app/views/trackers/list.rhtml                 |  2 +-
 app/views/users/list.rhtml                    |  2 +-
 app/views/versions/show.rhtml                 |  2 +-
 app/views/wiki/edit.rhtml                     |  2 +-
 app/views/wiki/show.rhtml                     |  2 +-
 lang/bg.yml                                   |  1 +
 lang/cs.yml                                   |  1 +
 lang/de.yml                                   |  1 +
 lang/en.yml                                   |  1 +
 lang/es.yml                                   |  1 +
 lang/fr.yml                                   |  1 +
 lang/he.yml                                   |  1 +
 lang/it.yml                                   |  1 +
 lang/ja.yml                                   |  1 +
 lang/ko.yml                                   |  1 +
 lang/nl.yml                                   |  1 +
 lang/pl.yml                                   |  1 +
 lang/pt-br.yml                                |  1 +
 lang/pt.yml                                   |  1 +
 lang/ro.yml                                   |  1 +
 lang/ru.yml                                   |  1 +
 lang/sr.yml                                   |  1 +
 lang/sv.yml                                   |  1 +
 lang/zh-tw.yml                                |  1 +
 lang/zh.yml                                   |  1 +
 public/stylesheets/application.css            | 10 +++++++++
 69 files changed, 107 insertions(+), 68 deletions(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 2c6a1ba49..e3ac2498f 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -145,16 +145,17 @@ module ApplicationHelper
     links.size > 1 ? l(:label_display_per_page, links.join(', ')) : nil
   end
   
-  def set_html_title(text)
-    @html_header_title = text
-  end
-  
-  def html_title
-    title = []
-    title << @project.name if @project
-    title << @html_header_title
-    title << Setting.app_title
-    title.compact.join(' - ')
+  def html_title(*args)
+    if args.empty?
+      title = []
+      title << @project.name if @project
+      title += @html_title if @html_title
+      title << Setting.app_title
+      title.compact.join(' - ')
+    else
+      @html_title ||= []
+      @html_title += args
+    end
   end
   
   ACCESSKEYS = {:edit => 'e',
diff --git a/app/helpers/repositories_helper.rb b/app/helpers/repositories_helper.rb
index d2d04604d..d7d7f4349 100644
--- a/app/helpers/repositories_helper.rb
+++ b/app/helpers/repositories_helper.rb
@@ -55,7 +55,7 @@ module RepositoriesHelper
   
   def with_leading_slash(path)
     path ||= ''
-    path.starts_with?("/") ? "/#{path}" : path
+    path.starts_with?('/') ? path : "/#{path}"
   end
 
   def subversion_field_tags(form, repository)
diff --git a/app/views/admin/index.rhtml b/app/views/admin/index.rhtml
index 933e288a0..1c6cbdee5 100644
--- a/app/views/admin/index.rhtml
+++ b/app/views/admin/index.rhtml
@@ -44,4 +44,4 @@
 <%= link_to l(:label_information_plural), :controller => 'admin', :action => 'info' %>
 </p>
 
-<% set_html_title l(:label_administration) -%>
+<% html_title(l(:label_administration)) -%>
diff --git a/app/views/admin/info.rhtml b/app/views/admin/info.rhtml
index 4d442f5ad..15ab94851 100644
--- a/app/views/admin/info.rhtml
+++ b/app/views/admin/info.rhtml
@@ -24,4 +24,4 @@
 </table>
 <% end %>
 
-<% set_html_title(l(:label_information_plural)) -%>
+<% html_title(l(:label_information_plural)) -%>
diff --git a/app/views/admin/mail_options.rhtml b/app/views/admin/mail_options.rhtml
index a4b923873..698933b9b 100644
--- a/app/views/admin/mail_options.rhtml
+++ b/app/views/admin/mail_options.rhtml
@@ -30,4 +30,4 @@
 <%= submit_tag l(:button_save) %>
 <% end %>
 
-<% set_html_title(l(:field_mail_notification)) -%>
+<% html_title(l(:field_mail_notification)) -%>
diff --git a/app/views/admin/projects.rhtml b/app/views/admin/projects.rhtml
index 295cfd101..3a759ecaa 100644
--- a/app/views/admin/projects.rhtml
+++ b/app/views/admin/projects.rhtml
@@ -47,4 +47,4 @@
 
 <p class="pagination"><%= pagination_links_full @project_pages, @project_count %></p>
 
-<% set_html_title l(:label_project_plural) -%>
+<% html_title(l(:label_project_plural)) -%>
diff --git a/app/views/common/403.rhtml b/app/views/common/403.rhtml
index d2d03f811..d1173a186 100644
--- a/app/views/common/403.rhtml
+++ b/app/views/common/403.rhtml
@@ -3,4 +3,4 @@
 <p><%= l(:notice_not_authorized) %></p>
 <p><a href="javascript:history.back()">Back</a></p>
 
-<% set_html_title '403' %>
+<% html_title '403' %>
diff --git a/app/views/common/404.rhtml b/app/views/common/404.rhtml
index 080b04842..753e716c6 100644
--- a/app/views/common/404.rhtml
+++ b/app/views/common/404.rhtml
@@ -3,4 +3,4 @@
 <p><%= l(:notice_file_not_found) %></p>
 <p><a href="javascript:history.back()">Back</a></p>
 
-<% set_html_title '404' %>
+<% html_title '404' %>
diff --git a/app/views/custom_fields/list.rhtml b/app/views/custom_fields/list.rhtml
index bbdfeffb4..4fd381a17 100644
--- a/app/views/custom_fields/list.rhtml
+++ b/app/views/custom_fields/list.rhtml
@@ -52,4 +52,4 @@
 
 <%= javascript_tag "showTab('#{@tab}');" %>
 
-<% set_html_title(l(:label_custom_field_plural)) -%>
+<% html_title(l(:label_custom_field_plural)) -%>
diff --git a/app/views/documents/index.rhtml b/app/views/documents/index.rhtml
index a7cefb733..ff58c2b2f 100644
--- a/app/views/documents/index.rhtml
+++ b/app/views/documents/index.rhtml
@@ -36,4 +36,4 @@
     <% end %>
 <% end %>
 
-<% set_html_title l(:label_document_plural) -%>
+<% html_title(l(:label_document_plural)) -%>
diff --git a/app/views/documents/show.rhtml b/app/views/documents/show.rhtml
index 8f53f1abe..599ac389b 100644
--- a/app/views/documents/show.rhtml
+++ b/app/views/documents/show.rhtml
@@ -35,4 +35,4 @@
   <% end %> 
 <% end %>
 
-<% set_html_title h(@document.title) -%>
+<% html_title @document.title -%>
diff --git a/app/views/enumerations/list.rhtml b/app/views/enumerations/list.rhtml
index 2e069f392..9de9bf37c 100644
--- a/app/views/enumerations/list.rhtml
+++ b/app/views/enumerations/list.rhtml
@@ -25,4 +25,4 @@
 <p><%= link_to l(:label_enumeration_new), { :action => 'new', :opt => option } %></p>
 <% end %>
 
-<% set_html_title(l(:label_enumerations)) -%>
+<% html_title(l(:label_enumerations)) -%>
diff --git a/app/views/issue_statuses/list.rhtml b/app/views/issue_statuses/list.rhtml
index a45f5d4d0..e35911813 100644
--- a/app/views/issue_statuses/list.rhtml
+++ b/app/views/issue_statuses/list.rhtml
@@ -34,4 +34,4 @@
 
 <p class="pagination"><%= pagination_links_full @issue_status_pages %></p>
 
-<% set_html_title(l(:label_issue_status_plural)) -%>
+<% html_title(l(:label_issue_status_plural)) -%>
diff --git a/app/views/issues/index.rhtml b/app/views/issues/index.rhtml
index c298b9bcc..48697c505 100644
--- a/app/views/issues/index.rhtml
+++ b/app/views/issues/index.rhtml
@@ -1,6 +1,6 @@
 <% if @query.new_record? %>
     <h2><%=l(:label_issue_plural)%></h2>
-    <% set_html_title l(:label_issue_plural) %>
+    <% html_title(l(:label_issue_plural)) %>
     
     <% form_tag({ :controller => 'queries', :action => 'new' }, :id => 'query_form') do %>
     <%= hidden_field_tag('project_id', @project.id) if @project %>
@@ -32,9 +32,9 @@
     <% end %>
     </div>
     
-    <h2><%= @query.name %></h2>
+    <h2><%=h @query.name %></h2>
     <div id="query_form"></div>
-    <% set_html_title @query.name %>
+    <% html_title @query.name %>
 <% end %>
 <%= error_messages_for 'query' %>
 <% if @query.valid? %>
diff --git a/app/views/issues/show.rhtml b/app/views/issues/show.rhtml
index 37e1d4abd..006efa3d5 100644
--- a/app/views/issues/show.rhtml
+++ b/app/views/issues/show.rhtml
@@ -116,7 +116,7 @@ end %>
 </div>
 &nbsp;
 
-<% set_html_title "#{@issue.tracker.name} ##{@issue.id}: #{@issue.subject}" %>
+<% html_title "#{@issue.tracker.name} ##{@issue.id}: #{@issue.subject}" %>
 
 <% content_for :sidebar do %>
     <%= render :partial => 'issues/sidebar' %>
diff --git a/app/views/my/account.rhtml b/app/views/my/account.rhtml
index fe2e5625b..77568836d 100644
--- a/app/views/my/account.rhtml
+++ b/app/views/my/account.rhtml
@@ -45,4 +45,4 @@
 <%= render :partial => 'sidebar' %>
 <% end %>
 
-<% set_html_title l(:label_my_account) -%>
+<% html_title(l(:label_my_account)) -%>
diff --git a/app/views/my/page.rhtml b/app/views/my/page.rhtml
index db292da37..26ee44fcc 100644
--- a/app/views/my/page.rhtml
+++ b/app/views/my/page.rhtml
@@ -39,4 +39,4 @@
 <div id="context-menu" style="display: none;"></div>
 <%= javascript_tag 'new ContextMenu({})' %>
 
-<% set_html_title l(:label_my_page) -%>
+<% html_title(l(:label_my_page)) -%>
diff --git a/app/views/news/index.rhtml b/app/views/news/index.rhtml
index 354467229..b958c475e 100644
--- a/app/views/news/index.rhtml
+++ b/app/views/news/index.rhtml
@@ -33,4 +33,4 @@
   <%= auto_discovery_link_tag(:atom, params.merge({:format => 'atom', :page => nil, :key => User.current.rss_key})) %>
 <% end %>
 
-<% set_html_title l(:label_news_plural) -%>
+<% html_title(l(:label_news_plural)) -%>
diff --git a/app/views/news/show.rhtml b/app/views/news/show.rhtml
index 2b71c48ad..e0cd09990 100644
--- a/app/views/news/show.rhtml
+++ b/app/views/news/show.rhtml
@@ -43,4 +43,4 @@
 <% end %>
 <% end %>
 
-<% set_html_title(h(@news.title)) -%>
+<% html_title @news.title -%>
diff --git a/app/views/projects/activity.rhtml b/app/views/projects/activity.rhtml
index d22443bc0..41a8ae100 100644
--- a/app/views/projects/activity.rhtml
+++ b/app/views/projects/activity.rhtml
@@ -40,4 +40,4 @@
 <% end %>
 <% end %>
 
-<% set_html_title l(:label_activity) -%>
+<% html_title(l(:label_activity)) -%>
diff --git a/app/views/projects/calendar.rhtml b/app/views/projects/calendar.rhtml
index 39f171626..171e82345 100644
--- a/app/views/projects/calendar.rhtml
+++ b/app/views/projects/calendar.rhtml
@@ -39,4 +39,4 @@
     <% end %>
 <% end %>
 
-<% set_html_title l(:label_calendar) -%>
+<% html_title(l(:label_calendar)) -%>
diff --git a/app/views/projects/gantt.rhtml b/app/views/projects/gantt.rhtml
index 395514b61..0e252aeae 100644
--- a/app/views/projects/gantt.rhtml
+++ b/app/views/projects/gantt.rhtml
@@ -246,4 +246,4 @@ if Date.today >= @date_from and Date.today <= @date_to %>
     <% end %>
 <% end %>
 
-<% set_html_title l(:label_gantt) -%>
+<% html_title(l(:label_gantt)) -%>
diff --git a/app/views/projects/list.rhtml b/app/views/projects/list.rhtml
index c7630c0a2..a18f63e43 100644
--- a/app/views/projects/list.rhtml
+++ b/app/views/projects/list.rhtml
@@ -17,4 +17,4 @@
 </div>
 <% end %>
 
-<% set_html_title l(:label_project_plural) -%>
+<% html_title(l(:label_project_plural)) -%>
diff --git a/app/views/projects/list_files.rhtml b/app/views/projects/list_files.rhtml
index b9f688509..9b297de59 100644
--- a/app/views/projects/list_files.rhtml
+++ b/app/views/projects/list_files.rhtml
@@ -43,4 +43,4 @@
   </tbody>
 </table>
 
-<% set_html_title l(:label_attachment_plural) -%>
+<% html_title(l(:label_attachment_plural)) -%>
diff --git a/app/views/projects/roadmap.rhtml b/app/views/projects/roadmap.rhtml
index daf7639fc..4dc94b8c6 100644
--- a/app/views/projects/roadmap.rhtml
+++ b/app/views/projects/roadmap.rhtml
@@ -47,4 +47,4 @@
 <% end %>
 <% end %>
 
-<% set_html_title l(:label_roadmap) %>
+<% html_title(l(:label_roadmap)) %>
diff --git a/app/views/projects/settings.rhtml b/app/views/projects/settings.rhtml
index 37a469df1..5516623a3 100644
--- a/app/views/projects/settings.rhtml
+++ b/app/views/projects/settings.rhtml
@@ -15,4 +15,4 @@
 <%= tab = params[:tab] ? h(params[:tab]) : project_settings_tabs.first[:name]
 javascript_tag "showTab('#{tab}');" %>
 
-<% set_html_title l(:label_settings) -%>
+<% html_title(l(:label_settings)) -%>
diff --git a/app/views/projects/show.rhtml b/app/views/projects/show.rhtml
index ecde32bde..2b930e01e 100644
--- a/app/views/projects/show.rhtml
+++ b/app/views/projects/show.rhtml
@@ -82,4 +82,4 @@
 <%= auto_discovery_link_tag(:atom, {:action => 'activity', :id => @project, :format => 'atom', :key => User.current.rss_key}) %>
 <% end %>
 
-<% set_html_title l(:label_overview) -%>
+<% html_title(l(:label_overview)) -%>
diff --git a/app/views/repositories/_dir_list.rhtml b/app/views/repositories/_dir_list.rhtml
index 1ed623ae8..5590652f5 100644
--- a/app/views/repositories/_dir_list.rhtml
+++ b/app/views/repositories/_dir_list.rhtml
@@ -1,10 +1,10 @@
-<table class="list" id="browser">
+<table class="list entries" id="browser">
 <thead>
 <tr id="root">
 <th><%= l(:field_name) %></th>
 <th><%= l(:field_filesize) %></th>
 <th><%= l(:label_revision) %></th>
-<th><%= l(:label_date) %></th>
+<th><%= l(:label_age) %></th>
 <th><%= l(:field_author) %></th>
 <th><%= l(:field_comments) %></th>
 </tr>
diff --git a/app/views/repositories/_dir_list_content.rhtml b/app/views/repositories/_dir_list_content.rhtml
index 0d84da387..352575259 100644
--- a/app/views/repositories/_dir_list_content.rhtml
+++ b/app/views/repositories/_dir_list_content.rhtml
@@ -1,8 +1,8 @@
 <% @entries.each do |entry| %>
 <% tr_id = Digest::MD5.hexdigest(entry.path)
    depth = params[:depth].to_i %>
-<tr id="<%= tr_id %>" class="<%= params[:parent_id] %>">
-<td>
+<tr id="<%= tr_id %>" class="<%= params[:parent_id] %> entry">
+<td class="filename">
 <%= if entry.is_dir?
   link_to_remote h(entry.name),
                  {:url => {:action => 'browse', :id => @project, :path => entry.path, :rev => @rev, :depth => (depth + 1), :parent_id => tr_id},
@@ -22,11 +22,11 @@ else
           :style => "margin-left: #{18 * depth}px;"
 end %>
 </td>
-<td align="right"><%= (entry.size ? number_to_human_size(entry.size) : "?") unless entry.is_dir? %></td>
-<td align="right"><%= link_to(entry.lastrev.name, :action => 'revision', :id => @project, :rev => entry.lastrev.identifier) if entry.lastrev && entry.lastrev.identifier %></td>
-<td align="center"><%= format_time(entry.lastrev.time) if entry.lastrev %></td>
-<td align="center"><em><%=h(entry.lastrev.author) if entry.lastrev %></em></td>
+<td class="size"><%= (entry.size ? number_to_human_size(entry.size) : "?") unless entry.is_dir? %></td>
+<td class="revision"><%= link_to(entry.lastrev.name, :action => 'revision', :id => @project, :rev => entry.lastrev.identifier) if entry.lastrev && entry.lastrev.identifier %></td>
+<td class="age"><%= distance_of_time_in_words(entry.lastrev.time, Time.now) if entry.lastrev && entry.lastrev.time %></td>
+<td class="author"><%=h(entry.lastrev.author) if entry.lastrev %></td>
 <% changeset = @project.repository.changesets.find_by_revision(entry.lastrev.identifier) if entry.lastrev %>
-<td><%=h truncate(changeset.comments, 50) unless changeset.nil? %></td>
+<td class="comments"><%=h truncate(changeset.comments, 50) unless changeset.nil? %></td>
 </tr>
 <% end %>
diff --git a/app/views/repositories/_navigation.rhtml b/app/views/repositories/_navigation.rhtml
index 9f40e0abd..b7ac989bc 100644
--- a/app/views/repositories/_navigation.rhtml
+++ b/app/views/repositories/_navigation.rhtml
@@ -17,3 +17,5 @@ dirs.each do |dir|
 <% end %>
 
 <%= "@ #{revision}" if revision %>
+
+<% html_title(with_leading_slash(path)) -%>
diff --git a/app/views/repositories/_revisions.rhtml b/app/views/repositories/_revisions.rhtml
index d1ef83576..ea722329f 100644
--- a/app/views/repositories/_revisions.rhtml
+++ b/app/views/repositories/_revisions.rhtml
@@ -1,5 +1,5 @@
 <% form_tag({:controller => 'repositories', :action => 'diff', :id => @project, :path => path}, :method => :get) do %>
-<table class="list">
+<table class="list changesets">
 <thead><tr>
 <th>#</th>
 <th></th>
@@ -12,17 +12,17 @@
 <% show_diff = entry && entry.is_file? && revisions.size > 1 %>
 <% line_num = 1 %>
 <% revisions.each do |changeset| %>
-<tr class="<%= cycle 'odd', 'even' %>">
+<tr class="changeset <%= cycle 'odd', 'even' %>">
 <td class="id"><%= link_to changeset.revision, :action => 'revision', :id => project, :rev => changeset.revision %></td>
 <td class="checkbox"><%= radio_button_tag('rev', changeset.revision, (line_num==1), :id => "cb-#{line_num}", :onclick => "$('cbto-#{line_num+1}').checked=true;") if show_diff && (line_num < revisions.size) %></td>
 <td class="checkbox"><%= radio_button_tag('rev_to', changeset.revision, (line_num==2), :id => "cbto-#{line_num}", :onclick => "if ($('cb-#{line_num}').checked==true) {$('cb-#{line_num-1}').checked=true;}") if show_diff && (line_num > 1) %></td>
-<td align="center" style="width:15%"><%= format_time(changeset.committed_on) %></td>
-<td align="center" style="width:15%"><em><%=h changeset.committer %></em></td>
-<td align="left"><%= textilizable(changeset.comments) %></td>
+<td class="committed_on"><%= format_time(changeset.committed_on) %></td>
+<td class="author"><%=h changeset.committer %></td>
+<td class="comments"><%= textilizable(changeset.comments) %></td>
 </tr>
 <% line_num += 1 %>
 <% end %>
 </tbody>
 </table>
-<%= submit_tag(l(:label_view_diff), :class => 'small', :name => nil) if show_diff %>
+<%= submit_tag(l(:label_view_diff), :name => nil) if show_diff %>
 <% end %>
diff --git a/app/views/repositories/annotate.rhtml b/app/views/repositories/annotate.rhtml
index 9a3fc834b..3aa884104 100644
--- a/app/views/repositories/annotate.rhtml
+++ b/app/views/repositories/annotate.rhtml
@@ -21,6 +21,8 @@
 </table>
 </div>
 
+<% html_title(l(:button_annotate)) -%>
+
 <% content_for :header_tags do %>
 <%= stylesheet_link_tag 'scm' %>
 <% end %>
diff --git a/app/views/repositories/browse.rhtml b/app/views/repositories/browse.rhtml
index 0ba24fd86..868388f11 100644
--- a/app/views/repositories/browse.rhtml
+++ b/app/views/repositories/browse.rhtml
@@ -10,4 +10,4 @@
 
 <% content_for :header_tags do %>
 <%= stylesheet_link_tag "scm" %>
-<% end %>
\ No newline at end of file
+<% end %>
diff --git a/app/views/repositories/changes.rhtml b/app/views/repositories/changes.rhtml
index 218459128..55842a28b 100644
--- a/app/views/repositories/changes.rhtml
+++ b/app/views/repositories/changes.rhtml
@@ -17,4 +17,4 @@
 
 <%= render :partial => 'revisions', :locals => {:project => @project, :path => @path, :revisions => @changesets, :entry => @entry }%>
 
-<% set_html_title(h(@entry.name)) -%>
+<% html_title(l(:label_change_plural)) -%>
diff --git a/app/views/repositories/diff.rhtml b/app/views/repositories/diff.rhtml
index de6cdc50c..88c5f17a0 100644
--- a/app/views/repositories/diff.rhtml
+++ b/app/views/repositories/diff.rhtml
@@ -88,6 +88,8 @@
 <% end %>
 <% end %>
 
+<% html_title(with_leading_slash(@path), 'Diff') -%>
+
 <% content_for :header_tags do %>
 <%= stylesheet_link_tag "scm" %>
 <% end %>
diff --git a/app/views/repositories/revision.rhtml b/app/views/repositories/revision.rhtml
index 265070e37..80cfdf2b7 100644
--- a/app/views/repositories/revision.rhtml
+++ b/app/views/repositories/revision.rhtml
@@ -62,4 +62,4 @@
 <%= stylesheet_link_tag "scm" %>
 <% end %>
 
-<% set_html_title("#{l(:label_revision)} #{@changeset.revision}") -%>
+<% html_title("#{l(:label_revision)} #{@changeset.revision}") -%>
diff --git a/app/views/repositories/revisions.rhtml b/app/views/repositories/revisions.rhtml
index 99c3f7afd..ac5919dd6 100644
--- a/app/views/repositories/revisions.rhtml
+++ b/app/views/repositories/revisions.rhtml
@@ -16,4 +16,4 @@
 <%= auto_discovery_link_tag(:atom, params.merge({:format => 'atom', :page => nil, :key => User.current.rss_key})) %>
 <% end %>
 
-<% set_html_title l(:label_revision_plural) -%>
+<% html_title(l(:label_revision_plural)) -%>
diff --git a/app/views/repositories/show.rhtml b/app/views/repositories/show.rhtml
index 9fb45514d..469ac063e 100644
--- a/app/views/repositories/show.rhtml
+++ b/app/views/repositories/show.rhtml
@@ -22,4 +22,4 @@
 <%= stylesheet_link_tag "scm" %>
 <% end %>
 
-<% set_html_title l(:label_repository) -%>
+<% html_title(l(:label_repository)) -%>
diff --git a/app/views/repositories/stats.rhtml b/app/views/repositories/stats.rhtml
index 7a9423f8c..76ce892d5 100644
--- a/app/views/repositories/stats.rhtml
+++ b/app/views/repositories/stats.rhtml
@@ -8,4 +8,6 @@
 </td></tr>
 </table>
 <br />
-<p><%= link_to l(:button_back), :action => 'show', :id => @project %></p>
\ No newline at end of file
+<p><%= link_to l(:button_back), :action => 'show', :id => @project %></p>
+
+<% html_title(l(:label_repository), l(:label_statistics)) -%>
diff --git a/app/views/roles/list.rhtml b/app/views/roles/list.rhtml
index fabc5edcd..202fdf41c 100644
--- a/app/views/roles/list.rhtml
+++ b/app/views/roles/list.rhtml
@@ -33,4 +33,4 @@
 
 <p><%= link_to l(:label_permissions_report), :action => 'report' %></p>
 
-<% set_html_title(l(:label_role_plural)) -%>
+<% html_title(l(:label_role_plural)) -%>
diff --git a/app/views/roles/workflow.rhtml b/app/views/roles/workflow.rhtml
index 02f1b48a2..0f08b0d22 100644
--- a/app/views/roles/workflow.rhtml
+++ b/app/views/roles/workflow.rhtml
@@ -55,4 +55,4 @@
 
 <% end %>
 
-<% set_html_title(l(:label_workflow)) -%>
+<% html_title(l(:label_workflow)) -%>
diff --git a/app/views/search/index.rhtml b/app/views/search/index.rhtml
index 9f156cbe1..29c604a21 100644
--- a/app/views/search/index.rhtml
+++ b/app/views/search/index.rhtml
@@ -42,4 +42,4 @@
 <% end %>
 </center></p>
 
-<% set_html_title(l(:label_search)) -%>
+<% html_title(l(:label_search)) -%>
diff --git a/app/views/settings/edit.rhtml b/app/views/settings/edit.rhtml
index b1db0e7ad..b1762a0e3 100644
--- a/app/views/settings/edit.rhtml
+++ b/app/views/settings/edit.rhtml
@@ -102,4 +102,4 @@
 <%= submit_tag l(:button_save) %>
 <% end %>
 
-<% set_html_title(l(:label_settings)) -%>
+<% html_title(l(:label_settings)) -%>
diff --git a/app/views/trackers/list.rhtml b/app/views/trackers/list.rhtml
index 447507210..9ccfda386 100644
--- a/app/views/trackers/list.rhtml
+++ b/app/views/trackers/list.rhtml
@@ -32,4 +32,4 @@
 
 <p class="pagination"><%= pagination_links_full @tracker_pages %></p>
 
-<% set_html_title(l(:label_tracker_plural)) -%>
+<% html_title(l(:label_tracker_plural)) -%>
diff --git a/app/views/users/list.rhtml b/app/views/users/list.rhtml
index fbac1e8e9..50054c989 100644
--- a/app/views/users/list.rhtml
+++ b/app/views/users/list.rhtml
@@ -57,4 +57,4 @@
 
 <p class="pagination"><%= pagination_links_full @user_pages, @user_count %></p>
 
-<% set_html_title(l(:label_user_plural)) -%>
+<% html_title(l(:label_user_plural)) -%>
diff --git a/app/views/versions/show.rhtml b/app/views/versions/show.rhtml
index a7c4f2b37..1c2a0be44 100644
--- a/app/views/versions/show.rhtml
+++ b/app/views/versions/show.rhtml
@@ -11,4 +11,4 @@
 <%= render :partial => 'versions/overview', :locals => {:version => @version} %>
 <%= render(:partial => "wiki/content", :locals => {:content => @version.wiki_page.content}) if @version.wiki_page %>
 
-<% set_html_title h(@version.name) %>
+<% html_title @version.name %>
diff --git a/app/views/wiki/edit.rhtml b/app/views/wiki/edit.rhtml
index 94581104f..32acbfff6 100644
--- a/app/views/wiki/edit.rhtml
+++ b/app/views/wiki/edit.rhtml
@@ -28,4 +28,4 @@
   <%= stylesheet_link_tag 'scm' %>
 <% end %>
 
-<% set_html_title @page.pretty_title %>
+<% html_title @page.pretty_title %>
diff --git a/app/views/wiki/show.rhtml b/app/views/wiki/show.rhtml
index d23491711..6f1df124b 100644
--- a/app/views/wiki/show.rhtml
+++ b/app/views/wiki/show.rhtml
@@ -47,4 +47,4 @@
   <%= render :partial => 'sidebar' %>
 <% end %>
 
-<% set_html_title @page.pretty_title %>
+<% html_title @page.pretty_title %>
diff --git a/lang/bg.yml b/lang/bg.yml
index 635ead5a5..916e89268 100644
--- a/lang/bg.yml
+++ b/lang/bg.yml
@@ -552,3 +552,4 @@ label_issues_by: Issues by %s
 field_searchable: Searchable
 label_display_per_page: 'Per page: %s'
 setting_per_page_options: Objects per page options
+label_age: Age
diff --git a/lang/cs.yml b/lang/cs.yml
index 89cc177b5..db2055f6c 100644
--- a/lang/cs.yml
+++ b/lang/cs.yml
@@ -552,3 +552,4 @@ label_issues_by: Issues by %s
 field_searchable: Searchable
 label_display_per_page: 'Per page: %s'
 setting_per_page_options: Objects per page options
+label_age: Age
diff --git a/lang/de.yml b/lang/de.yml
index faa992933..2d4a95c2d 100644
--- a/lang/de.yml
+++ b/lang/de.yml
@@ -552,3 +552,4 @@ label_issues_by: Issues by %s
 field_searchable: Searchable
 label_display_per_page: 'Per page: %s'
 setting_per_page_options: Objects per page options
+label_age: Age
diff --git a/lang/en.yml b/lang/en.yml
index 36c060d36..2419b05db 100644
--- a/lang/en.yml
+++ b/lang/en.yml
@@ -458,6 +458,7 @@ label_registration_activation_by_email: account activation by email
 label_registration_manual_activation: manual account activation
 label_registration_automatic_activation: automatic account activation
 label_display_per_page: 'Per page: %s'
+label_age: Age
 
 button_login: Login
 button_submit: Submit
diff --git a/lang/es.yml b/lang/es.yml
index 6ec8db0f1..717d4014d 100644
--- a/lang/es.yml
+++ b/lang/es.yml
@@ -555,3 +555,4 @@ label_issues_by: Issues by %s
 field_searchable: Searchable
 label_display_per_page: 'Per page: %s'
 setting_per_page_options: Objects per page options
+label_age: Age
diff --git a/lang/fr.yml b/lang/fr.yml
index c13500e03..394865a21 100644
--- a/lang/fr.yml
+++ b/lang/fr.yml
@@ -458,6 +458,7 @@ label_registration_activation_by_email: activation du compte par email
 label_registration_manual_activation: activation manuelle du compte
 label_registration_automatic_activation: activation automatique du compte
 label_display_per_page: 'Par page: %s'
+label_age: Age
 
 button_login: Connexion
 button_submit: Soumettre
diff --git a/lang/he.yml b/lang/he.yml
index 09070bd82..322b10b7c 100644
--- a/lang/he.yml
+++ b/lang/he.yml
@@ -552,3 +552,4 @@ label_issues_by: Issues by %s
 field_searchable: Searchable
 label_display_per_page: 'Per page: %s'
 setting_per_page_options: Objects per page options
+label_age: Age
diff --git a/lang/it.yml b/lang/it.yml
index 8c87a8b34..561215f78 100644
--- a/lang/it.yml
+++ b/lang/it.yml
@@ -552,3 +552,4 @@ label_issues_by: Issues by %s
 field_searchable: Searchable
 label_display_per_page: 'Per page: %s'
 setting_per_page_options: Objects per page options
+label_age: Age
diff --git a/lang/ja.yml b/lang/ja.yml
index 150c62283..eb30edb26 100644
--- a/lang/ja.yml
+++ b/lang/ja.yml
@@ -553,3 +553,4 @@ label_issues_by: %s別の問題
 field_searchable: Searchable
 label_display_per_page: 'Per page: %s'
 setting_per_page_options: Objects per page options
+label_age: Age
diff --git a/lang/ko.yml b/lang/ko.yml
index 001ddd395..d0e03b364 100644
--- a/lang/ko.yml
+++ b/lang/ko.yml
@@ -552,3 +552,4 @@ label_issues_by: Issues by %s
 field_searchable: Searchable
 label_display_per_page: 'Per page: %s'
 setting_per_page_options: Objects per page options
+label_age: Age
diff --git a/lang/nl.yml b/lang/nl.yml
index 0c8085ba1..74eff69ea 100644
--- a/lang/nl.yml
+++ b/lang/nl.yml
@@ -553,3 +553,4 @@ label_issues_by: Issues by %s
 field_searchable: Searchable
 label_display_per_page: 'Per page: %s'
 setting_per_page_options: Objects per page options
+label_age: Age
diff --git a/lang/pl.yml b/lang/pl.yml
index c086cce63..f1513ac92 100644
--- a/lang/pl.yml
+++ b/lang/pl.yml
@@ -552,3 +552,4 @@ label_issues_by: Zagadnienia wprowadzone przez %s
 field_searchable: Searchable
 label_display_per_page: 'Per page: %s'
 setting_per_page_options: Objects per page options
+label_age: Age
diff --git a/lang/pt-br.yml b/lang/pt-br.yml
index 564ee4b0a..33719d11b 100644
--- a/lang/pt-br.yml
+++ b/lang/pt-br.yml
@@ -552,3 +552,4 @@ label_issues_by: Issues by %s
 field_searchable: Searchable
 label_display_per_page: 'Per page: %s'
 setting_per_page_options: Objects per page options
+label_age: Age
diff --git a/lang/pt.yml b/lang/pt.yml
index aaab55a51..c042589e3 100644
--- a/lang/pt.yml
+++ b/lang/pt.yml
@@ -552,3 +552,4 @@ label_issues_by: Issues by %s
 field_searchable: Searchable
 label_display_per_page: 'Per page: %s'
 setting_per_page_options: Objects per page options
+label_age: Age
diff --git a/lang/ro.yml b/lang/ro.yml
index 6fdce2081..e615472ad 100644
--- a/lang/ro.yml
+++ b/lang/ro.yml
@@ -552,3 +552,4 @@ label_issues_by: Issues by %s
 field_searchable: Searchable
 label_display_per_page: 'Per page: %s'
 setting_per_page_options: Objects per page options
+label_age: Age
diff --git a/lang/ru.yml b/lang/ru.yml
index 1be4615bb..d40379788 100644
--- a/lang/ru.yml
+++ b/lang/ru.yml
@@ -552,3 +552,4 @@ label_issues_by: Issues by %s
 field_searchable: Searchable
 label_display_per_page: 'Per page: %s'
 setting_per_page_options: Objects per page options
+label_age: Age
diff --git a/lang/sr.yml b/lang/sr.yml
index a4bed33ea..6e571d6e1 100644
--- a/lang/sr.yml
+++ b/lang/sr.yml
@@ -553,3 +553,4 @@ label_issues_by: Issues by %s
 field_searchable: Searchable
 label_display_per_page: 'Per page: %s'
 setting_per_page_options: Objects per page options
+label_age: Age
diff --git a/lang/sv.yml b/lang/sv.yml
index fd84f2a58..dd4117115 100644
--- a/lang/sv.yml
+++ b/lang/sv.yml
@@ -553,3 +553,4 @@ label_issues_by: Issues by %s
 field_searchable: Searchable
 label_display_per_page: 'Per page: %s'
 setting_per_page_options: Objects per page options
+label_age: Age
diff --git a/lang/zh-tw.yml b/lang/zh-tw.yml
index 6bc341cba..889f86a1c 100644
--- a/lang/zh-tw.yml
+++ b/lang/zh-tw.yml
@@ -552,3 +552,4 @@ enumeration_activities: 活動 (time tracking)
 field_searchable: Searchable
 label_display_per_page: 'Per page: %s'
 setting_per_page_options: Objects per page options
+label_age: Age
diff --git a/lang/zh.yml b/lang/zh.yml
index 31e8b239b..c758f5490 100644
--- a/lang/zh.yml
+++ b/lang/zh.yml
@@ -555,3 +555,4 @@ label_issues_by: Issues by %s
 field_searchable: Searchable
 label_display_per_page: 'Per page: %s'
 setting_per_page_options: Objects per page options
+label_age: Age
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 37bddbc05..eaef2ae87 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -77,6 +77,16 @@ tr.issue td.subject, tr.issue td.category { white-space: normal; }
 tr.issue td.subject { text-align: left; }
 tr.issue td.done_ratio table.progress { margin-left:auto; margin-right: auto;}
 
+tr.entry { border: 1px solid #f8f8f8; }
+tr.entry td { white-space: nowrap; }
+tr.entry td.filename { width: 30%; }
+tr.entry td.size { text-align: right; font-size: 90%; }
+tr.entry td.revision, tr.entry td.author { text-align: center; }
+tr.entry td.age { text-align: right; }
+
+tr.changeset td.author { text-align: center; width: 15%; }
+tr.changeset td.committed_on { text-align: center; width: 15%; }
+
 tr.message { height: 2.6em; }
 tr.message td.last_message { font-size: 80%; }
 tr.message.locked td.subject a { background-image: url(../images/locked.png); }

From b21e85b6dc1c2751abcf380fa2cefd0758e7a870 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Thu, 3 Jan 2008 18:10:52 +0000
Subject: [PATCH 104/710] =?UTF-8?q?Updated=20Spanish=20translation=20(Gume?=
 =?UTF-8?q?r=20Coronel=20P=C3=A9rez).?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1033 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 lang/es.yml | 58 ++++++++++++++++++++++++++---------------------------
 1 file changed, 29 insertions(+), 29 deletions(-)

diff --git a/lang/es.yml b/lang/es.yml
index 717d4014d..b7aaf1b39 100644
--- a/lang/es.yml
+++ b/lang/es.yml
@@ -53,7 +53,7 @@ general_pdf_encoding: ISO-8859-15
 general_day_names: Lunes,Martes,Miércoles,Jueves,Viernes,Sábado,Domingo
 general_first_day_of_week: '1'
 
-notice_account_updated: Cuenta creada correctamente.
+notice_account_updated: Cuenta actualizada correctamente.
 notice_account_invalid_creditentials: Usuario o contraseña inválido.
 notice_account_password_updated: Contraseña modificada correctamente.
 notice_account_wrong_password: Contraseña incorrecta.
@@ -112,7 +112,7 @@ field_subject: Tema
 field_due_date: Fecha fin
 field_assigned_to: Asignado a
 field_priority: Prioridad
-field_fixed_version: Versión corregida
+field_fixed_version: Versión
 field_user: Usuario
 field_role: Perfil
 field_homepage: Sitio web
@@ -134,7 +134,7 @@ field_type: Tipo
 field_host: Anfitrión
 field_port: Puerto
 field_account: Cuenta
-field_base_dn: Base DN
+field_base_dn: DN base
 field_attr_login: Cualidad del identificador
 field_attr_firstname: Cualidad del nombre
 field_attr_lastname: Cualidad del apellido
@@ -170,7 +170,7 @@ setting_text_formatting: Formato de texto
 setting_wiki_compression: Compresión del historial de Wiki
 setting_feeds_limit: Límite de contenido para sindicación
 setting_autofetch_changesets: Autorellenar los commits del repositorio
-setting_sys_api_enabled: Enable WS for repository management
+setting_sys_api_enabled: Habilitar WS para la gestión del repositorio
 setting_commit_ref_keywords: Palabras clave para la referencia
 setting_commit_fix_keywords: Palabras clave para la corrección
 setting_autologin: Conexión automática 
@@ -236,10 +236,10 @@ label_activity: Actividad
 label_new: Nuevo
 label_logged_as: Conectado como
 label_environment: Entorno
-label_authentication: Autentificación
-label_auth_source: Modo de la autentificación
-label_auth_source_new: Nuevo modo de la autentificación
-label_auth_source_plural: Modos de la autentificación
+label_authentication: Autenticación
+label_auth_source: Modo de autenticación
+label_auth_source_new: Nuevo modo de autenticación
+label_auth_source_plural: Modos de autenticación
 label_subproject_plural: Proyectos secundarios
 label_min_max_length: Longitud mín - máx
 label_list: Lista
@@ -340,7 +340,7 @@ label_sort_higher: Subir
 label_sort_lower: Bajar
 label_sort_lowest: Último
 label_roadmap: Roadmap
-label_roadmap_due_in: Realizado en 
+label_roadmap_due_in: Finaliza en 
 label_roadmap_no_issues: No hay peticiones para esta versión
 label_search: Búsqueda
 label_result: %d resultado
@@ -366,7 +366,7 @@ label_statistics: Estadísticas
 label_commits_per_month: Commits por mes
 label_commits_per_author: Commits por autor
 label_view_diff: Ver diferencias
-label_diff_inline: inline
+label_diff_inline: en línea
 label_diff_side_by_side: cara a cara
 label_options: Opciones
 label_copy_workflow_from: Copiar workflow desde
@@ -377,12 +377,12 @@ label_applied_status: Aplicar estado
 label_loading: Cargando...
 label_relation_new: Nueva relación
 label_relation_delete: Eliminar relación
-label_relates_to: relacionado a
-label_duplicates: duplicados
-label_blocks: bloques
+label_relates_to: relacionada con
+label_duplicates: duplicada de
+label_blocks: bloquea a
 label_blocked_by: bloqueado por
-label_precedes: anteriores
-label_follows: siguientes
+label_precedes: anterior a
+label_follows: posterior a 
 label_end_to_start: fin a principio
 label_end_to_end: fin a fin
 label_start_to_start: principio a principio
@@ -390,7 +390,7 @@ label_start_to_end: principio a fin
 label_stay_logged_in: Recordar conexión 
 label_disabled: deshabilitado
 label_show_completed_versions: Muestra las versiones completas
-label_me: me
+label_me: yo mismo 
 label_board: Foro
 label_board_new: Nuevo foro
 label_board_plural: Foros
@@ -399,7 +399,7 @@ label_message_plural: Mensajes
 label_message_last: Último mensaje
 label_message_new: Nuevo mensaje
 label_reply_plural: Respuestas
-label_send_information: Enviada información de la cuenta al usuario
+label_send_information: Enviar información de la cuenta al usuario
 label_year: Año
 label_month: Mes
 label_week: Semana
@@ -414,7 +414,7 @@ button_check_all: Seleccionar todo
 button_uncheck_all: No seleccionar nada
 button_delete: Borrar
 button_create: Crear
-button_test: Testar
+button_test: Probar
 button_edit: Modificar
 button_add: Añadir
 button_change: Cambiar
@@ -475,7 +475,7 @@ default_issue_status_feedback: Comentarios
 default_issue_status_closed: Cerrada
 default_issue_status_rejected: Rechazada
 default_doc_category_user: Documentación de usuario
-default_doc_category_tech: Documentación tecnica
+default_doc_category_tech: Documentación técnica
 default_priority_low: Baja
 default_priority_normal: Normal
 default_priority_high: Alta
@@ -515,14 +515,14 @@ notice_email_error: Ha ocurrido un error mientras enviando el correo (%s)
 label_updated_time: Actualizado hace %s
 text_issue_category_destroy_assignments: Dejar las peticiones sin categoría
 label_send_test_email: Enviar un correo de prueba
-button_reset: Reset
+button_reset: Reestablecer
 label_added_time_by: Añadido por %s hace %s
 field_estimated_hours: Tiempo estimado
 label_changeset_plural: Cambios
 setting_repositories_encodings: Codificaciones del repositorio
 notice_no_issue_selected: "Ninguna petición seleccionada. Por favor, compruebe la petición que quiere modificar"
-label_bulk_edit_selected_issues: Bulk edit selected issues
-label_no_change_option: (No change)
+label_bulk_edit_selected_issues: Editar las peticiones seleccionadas
+label_no_change_option: (Sin cambios)
 notice_failed_to_save_issues: "Imposible salvar %s peticion(es) en %d seleccionado: %s."
 label_theme: Tema
 label_default: Por defecto
@@ -549,10 +549,10 @@ label_registration_automatic_activation: activación automática de cuenta
 label_registration_manual_activation: activación manual de cuenta
 notice_account_pending: "Su cuenta ha sido creada y está pendiende de la aprobación por parte de administrador"
 setting_time_format: Formato de hora
-setting_bcc_recipients: Blind carbon copy recipients (bcc)
-button_annotate: Annotate
-label_issues_by: Issues by %s
-field_searchable: Searchable
-label_display_per_page: 'Per page: %s'
-setting_per_page_options: Objects per page options
-label_age: Age
+setting_bcc_recipients: Ocultar las copias de carbon (bcc)
+button_annotate: Anotar
+label_issues_by: Peticiones por %s
+field_searchable: Incluir en las búsquedas 
+label_display_per_page: 'Por página: %s'
+setting_per_page_options: Objetos por página
+label_age: Edad

From 832c7eaaa5af2e13c52b1c264b9849f958394d2e Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Thu, 3 Jan 2008 18:28:14 +0000
Subject: [PATCH 105/710] Fixed: undefined local variable or method 'log' in
 CvsAdapter when a cvs command fails.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1034 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 lib/redmine/scm/adapters/abstract_adapter.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/redmine/scm/adapters/abstract_adapter.rb b/lib/redmine/scm/adapters/abstract_adapter.rb
index 138d7e647..633637ab4 100644
--- a/lib/redmine/scm/adapters/abstract_adapter.rb
+++ b/lib/redmine/scm/adapters/abstract_adapter.rb
@@ -119,7 +119,7 @@ module Redmine
             end
           rescue Errno::ENOENT => e
             # The command failed, log it and re-raise
-            log.error("SCM command failed: #{cmd}\n  with: #{e.message}")
+            logger.error("SCM command failed: #{cmd}\n  with: #{e.message}")
             raise CommandFailed
           end
         end  

From bd85c0cbb1a0c217da862be31e5ee30fa6716e40 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Fri, 4 Jan 2008 17:55:08 +0000
Subject: [PATCH 106/710] Fixed: table of content not rendered properly when
 used in an issue or document description.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1035 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/documents/show.rhtml | 2 ++
 app/views/issues/show.rhtml    | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/app/views/documents/show.rhtml b/app/views/documents/show.rhtml
index 599ac389b..3014387bd 100644
--- a/app/views/documents/show.rhtml
+++ b/app/views/documents/show.rhtml
@@ -7,7 +7,9 @@
 
 <p><em><%=h @document.category.name %><br />
 <%= format_date @document.created_on %></em></p>
+<div class="wiki">
 <%= textilizable @document.description, :attachments => @document.attachments %>
+</div>
 <br />
 
 <h3><%= l(:label_attachment_plural) %></h3>
diff --git a/app/views/issues/show.rhtml b/app/views/issues/show.rhtml
index 006efa3d5..91b638216 100644
--- a/app/views/issues/show.rhtml
+++ b/app/views/issues/show.rhtml
@@ -64,7 +64,9 @@ end %>
 <% end %>
 
 <p><strong><%=l(:field_description)%></strong></p>
+<div class="wiki">
 <%= textilizable @issue, :description, :attachments => @issue.attachments %>
+</div>
 
 <% if @issue.attachments.any? %>
 <%= link_to_attachments @issue.attachments, :delete_url => (authorize_for('issues', 'destroy_attachment') ? {:controller => 'issues', :action => 'destroy_attachment', :id => @issue} : nil) %>

From 860ff9345fdd170a04201374150334d23d55634c Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Fri, 4 Jan 2008 18:02:34 +0000
Subject: [PATCH 107/710] Fixed: private projects name are displayed on
 account/show even if the current user doesn't have access to these private
 projects.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1036 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/account_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/account_controller.rb b/app/controllers/account_controller.rb
index a1cbf5ffd..40debb1f6 100644
--- a/app/controllers/account_controller.rb
+++ b/app/controllers/account_controller.rb
@@ -30,7 +30,7 @@ class AccountController < ApplicationController
     
     # 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? || (User.current.role_for_project(membership.project))
+      membership.project.is_public? || (User.current.member_of?(membership.project))
     end
   rescue ActiveRecord::RecordNotFound
     render_404

From 6ae87d7c4c1070680720973dc912b96d438ad3fe Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Fri, 4 Jan 2008 18:27:05 +0000
Subject: [PATCH 108/710] Moved redmine:load_default_data code to a module so
 that it can be called from the application.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1037 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 lib/redmine/default_data/loader.rb | 171 ++++++++++++++++++++++++++
 lib/tasks/load_default_data.rake   | 185 ++++-------------------------
 2 files changed, 194 insertions(+), 162 deletions(-)
 create mode 100644 lib/redmine/default_data/loader.rb

diff --git a/lib/redmine/default_data/loader.rb b/lib/redmine/default_data/loader.rb
new file mode 100644
index 000000000..105219104
--- /dev/null
+++ b/lib/redmine/default_data/loader.rb
@@ -0,0 +1,171 @@
+# 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 Redmine
+  module DefaultData
+    class DataAlreadyLoaded < Exception; end
+
+    module Loader
+      include GLoc
+    
+      class << self
+        # Returns true if no data is already loaded in the database
+        # otherwise false
+        def no_data?
+          !Role.find(:first, :conditions => {:builtin => 0}) &&
+            !Tracker.find(:first) &&
+            !IssueStatus.find(:first) &&
+            !Enumeration.find(:first)
+        end
+        
+        # Loads the default data
+        # Raises a RecordNotSaved exception if something goes wrong
+        def load(lang=nil)
+          raise DataAlreadyLoaded.new("Some configuration data is already loaded.") unless no_data?
+          set_language_if_valid(lang)
+          
+          # Roles
+          manager = Role.create! :name => l(:default_role_manager), 
+                                 :position => 1
+          manager.permissions = manager.setable_permissions.collect {|p| p.name}
+          manager.save!
+          
+          developper = Role.create! :name => l(:default_role_developper), 
+                                    :position => 2, 
+                                    :permissions => [:manage_versions, 
+                                                    :manage_categories,
+                                                    :add_issues,
+                                                    :edit_issues,
+                                                    :manage_issue_relations,
+                                                    :add_issue_notes,
+                                                    :change_issue_status,
+                                                    :save_queries,
+                                                    :view_gantt,
+                                                    :view_calendar,
+                                                    :log_time,
+                                                    :view_time_entries,
+                                                    :comment_news,
+                                                    :view_documents,
+                                                    :view_wiki_pages,
+                                                    :edit_wiki_pages,
+                                                    :delete_wiki_pages,
+                                                    :add_messages,
+                                                    :view_files,
+                                                    :manage_files,
+                                                    :browse_repository,
+                                                    :view_changesets]
+          
+          reporter = Role.create! :name => l(:default_role_reporter),
+                                  :position => 3,
+                                  :permissions => [:add_issues,
+                                                  :add_issue_notes,
+                                                  :change_issue_status,
+                                                  :save_queries,
+                                                  :view_gantt,
+                                                  :view_calendar,
+                                                  :log_time,
+                                                  :view_time_entries,
+                                                  :comment_news,
+                                                  :view_documents,
+                                                  :view_wiki_pages,
+                                                  :add_messages,
+                                                  :view_files,
+                                                  :browse_repository,
+                                                  :view_changesets]
+                      
+          Role.non_member.update_attribute :permissions, [:add_issues,
+                                                          :add_issue_notes,
+                                                          :change_issue_status,
+                                                          :save_queries,
+                                                          :view_gantt,
+                                                          :view_calendar,
+                                                          :view_time_entries,
+                                                          :comment_news,
+                                                          :view_documents,
+                                                          :view_wiki_pages,
+                                                          :add_messages,
+                                                          :view_files,
+                                                          :browse_repository,
+                                                          :view_changesets]
+        
+          Role.anonymous.update_attribute :permissions, [:view_gantt,
+                                                         :view_calendar,
+                                                         :view_time_entries,
+                                                         :view_documents,
+                                                         :view_wiki_pages,
+                                                         :view_files,
+                                                         :browse_repository,
+                                                         :view_changesets]
+                                                           
+          # Trackers
+          Tracker.create!(:name => l(:default_tracker_bug),     :is_in_chlog => true,  :is_in_roadmap => false, :position => 1)
+          Tracker.create!(:name => l(:default_tracker_feature), :is_in_chlog => true,  :is_in_roadmap => true,  :position => 2)
+          Tracker.create!(:name => l(:default_tracker_support), :is_in_chlog => false, :is_in_roadmap => false, :position => 3)
+          
+          # Issue statuses
+          new       = IssueStatus.create!(:name => l(:default_issue_status_new), :is_closed => false, :is_default => true, :position => 1)
+          assigned  = IssueStatus.create!(:name => l(:default_issue_status_assigned), :is_closed => false, :is_default => false, :position => 2)
+          resolved  = IssueStatus.create!(:name => l(:default_issue_status_resolved), :is_closed => false, :is_default => false, :position => 3)
+          feedback  = IssueStatus.create!(:name => l(:default_issue_status_feedback), :is_closed => false, :is_default => false, :position => 4)
+          closed    = IssueStatus.create!(:name => l(:default_issue_status_closed), :is_closed => true, :is_default => false, :position => 5)
+          rejected  = IssueStatus.create!(:name => l(:default_issue_status_rejected), :is_closed => true, :is_default => false, :position => 6)
+          
+          # Workflow
+          Tracker.find(:all).each { |t|
+            IssueStatus.find(:all).each { |os|
+              IssueStatus.find(:all).each { |ns|
+                Workflow.create!(:tracker_id => t.id, :role_id => manager.id, :old_status_id => os.id, :new_status_id => ns.id) unless os == ns
+              }        
+            }      
+          }
+          
+          Tracker.find(:all).each { |t|
+            [new, assigned, resolved, feedback].each { |os|
+              [assigned, resolved, feedback, closed].each { |ns|
+                Workflow.create!(:tracker_id => t.id, :role_id => developper.id, :old_status_id => os.id, :new_status_id => ns.id) unless os == ns
+              }        
+            }      
+          }
+          
+          Tracker.find(:all).each { |t|
+            [new, assigned, resolved, feedback].each { |os|
+              [closed].each { |ns|
+                Workflow.create!(:tracker_id => t.id, :role_id => reporter.id, :old_status_id => os.id, :new_status_id => ns.id) unless os == ns
+              }        
+            }
+            Workflow.create!(:tracker_id => t.id, :role_id => reporter.id, :old_status_id => resolved.id, :new_status_id => feedback.id)
+          }
+        
+          # Enumerations
+          Enumeration.create!(:opt => "DCAT", :name => l(:default_doc_category_user), :position => 1)
+          Enumeration.create!(:opt => "DCAT", :name => l(:default_doc_category_tech), :position => 2)
+        
+          Enumeration.create!(:opt => "IPRI", :name => l(:default_priority_low), :position => 1)
+          Enumeration.create!(:opt => "IPRI", :name => l(:default_priority_normal), :position => 2, :is_default => true)
+          Enumeration.create!(:opt => "IPRI", :name => l(:default_priority_high), :position => 3)
+          Enumeration.create!(:opt => "IPRI", :name => l(:default_priority_urgent), :position => 4)
+          Enumeration.create!(:opt => "IPRI", :name => l(:default_priority_immediate), :position => 5)
+        
+          Enumeration.create!(:opt => "ACTI", :name => l(:default_activity_design), :position => 1)
+          Enumeration.create!(:opt => "ACTI", :name => l(:default_activity_development), :position => 2)
+          
+          true
+        end
+      end
+    end
+  end
+end
diff --git a/lib/tasks/load_default_data.rake b/lib/tasks/load_default_data.rake
index 8e89d4ecd..6ddd1fb97 100644
--- a/lib/tasks/load_default_data.rake
+++ b/lib/tasks/load_default_data.rake
@@ -1,168 +1,29 @@
 desc 'Load Redmine default configuration data'
 
 namespace :redmine do
-task :load_default_data => :environment do
-  include GLoc
-  set_language_if_valid('en')
-  puts
-  
-  while true
-    print "Select language: "
-    print GLoc.valid_languages.sort {|x,y| x.to_s <=> y.to_s }.join(", ")
-    print " [#{GLoc.current_language}] "
-    lang = STDIN.gets.chomp!
-    break if lang.empty?
-    break if set_language_if_valid(lang)
-    puts "Unknown language!"
-  end
+  task :load_default_data => :environment do
+    include GLoc
+    set_language_if_valid('en')
+    puts
     
-  puts "===================================="
-  
-begin
-  # check that no data already exists
-  if Role.find(:first, :conditions => {:builtin => 0})
-    raise "Some roles are already defined."
-  end
-  if Tracker.find(:first)
-    raise "Some trackers are already defined."
-  end
-  if IssueStatus.find(:first)
-    raise "Some statuses are already defined."
-  end
-  if Enumeration.find(:first)
-    raise "Some enumerations are already defined."
-  end
+    while true
+      print "Select language: "
+      print GLoc.valid_languages.sort {|x,y| x.to_s <=> y.to_s }.join(", ")
+      print " [#{GLoc.current_language}] "
+      lang = STDIN.gets.chomp!
+      break if lang.empty?
+      break if set_language_if_valid(lang)
+      puts "Unknown language!"
+    end
     
-  puts "Loading default configuration data for language: #{current_language}"
- 
-  # roles
-  manager = Role.create :name => l(:default_role_manager), 
-                        :position => 1
-  manager.permissions = manager.setable_permissions.collect {|p| p.name}
-  manager.save
-  
-  developper = Role.create :name => l(:default_role_developper), 
-                           :position => 2, 
-                           :permissions => [:manage_versions, 
-                                            :manage_categories,
-                                            :add_issues,
-                                            :edit_issues,
-                                            :manage_issue_relations,
-                                            :add_issue_notes,
-                                            :change_issue_status,
-                                            :save_queries,
-                                            :view_gantt,
-                                            :view_calendar,
-                                            :log_time,
-                                            :view_time_entries,
-                                            :comment_news,
-                                            :view_documents,
-                                            :view_wiki_pages,
-                                            :edit_wiki_pages,
-                                            :delete_wiki_pages,
-                                            :add_messages,
-                                            :view_files,
-                                            :manage_files,
-                                            :browse_repository,
-                                            :view_changesets]
-  
-  reporter = Role.create :name => l(:default_role_reporter),
-                         :position => 3,
-                         :permissions => [:add_issues,
-                                          :add_issue_notes,
-                                          :change_issue_status,
-                                          :save_queries,
-                                          :view_gantt,
-                                          :view_calendar,
-                                          :log_time,
-                                          :view_time_entries,
-                                          :comment_news,
-                                          :view_documents,
-                                          :view_wiki_pages,
-                                          :add_messages,
-                                          :view_files,
-                                          :browse_repository,
-                                          :view_changesets]
-              
-  Role.non_member.update_attribute :permissions, [:add_issues,
-                                                  :add_issue_notes,
-                                                  :change_issue_status,
-                                                  :save_queries,
-                                                  :view_gantt,
-                                                  :view_calendar,
-                                                  :view_time_entries,
-                                                  :comment_news,
-                                                  :view_documents,
-                                                  :view_wiki_pages,
-                                                  :add_messages,
-                                                  :view_files,
-                                                  :browse_repository,
-                                                  :view_changesets]
-
-  Role.anonymous.update_attribute :permissions, [:view_gantt,
-                                                 :view_calendar,
-                                                 :view_time_entries,
-                                                 :view_documents,
-                                                 :view_wiki_pages,
-                                                 :view_files,
-                                                 :browse_repository,
-                                                 :view_changesets]
-                                                   
-  # trackers
-  Tracker.create(:name => l(:default_tracker_bug), :is_in_chlog => true, :is_in_roadmap => false, :position => 1)
-  Tracker.create(:name => l(:default_tracker_feature), :is_in_chlog => true, :is_in_roadmap => true, :position => 2)
-  Tracker.create(:name => l(:default_tracker_support), :is_in_chlog => false, :is_in_roadmap => false, :position => 3)
-  
-  # issue statuses
-  new       = IssueStatus.create(:name => l(:default_issue_status_new), :is_closed => false, :is_default => true, :position => 1)
-  assigned  = IssueStatus.create(:name => l(:default_issue_status_assigned), :is_closed => false, :is_default => false, :position => 2)
-  resolved  = IssueStatus.create(:name => l(:default_issue_status_resolved), :is_closed => false, :is_default => false, :position => 3)
-  feedback  = IssueStatus.create(:name => l(:default_issue_status_feedback), :is_closed => false, :is_default => false, :position => 4)
-  closed    = IssueStatus.create(:name => l(:default_issue_status_closed), :is_closed => true, :is_default => false, :position => 5)
-  rejected  = IssueStatus.create(:name => l(:default_issue_status_rejected), :is_closed => true, :is_default => false, :position => 6)
-  
-  # workflow
-  Tracker.find(:all).each { |t|
-    IssueStatus.find(:all).each { |os|
-      IssueStatus.find(:all).each { |ns|
-        Workflow.create(:tracker_id => t.id, :role_id => manager.id, :old_status_id => os.id, :new_status_id => ns.id) unless os == ns
-      }        
-    }      
-  }
-  
-  Tracker.find(:all).each { |t|
-    [new, assigned, resolved, feedback].each { |os|
-      [assigned, resolved, feedback, closed].each { |ns|
-        Workflow.create(:tracker_id => t.id, :role_id => developper.id, :old_status_id => os.id, :new_status_id => ns.id) unless os == ns
-      }        
-    }      
-  }
-  
-  Tracker.find(:all).each { |t|
-    [new, assigned, resolved, feedback].each { |os|
-      [closed].each { |ns|
-        Workflow.create(:tracker_id => t.id, :role_id => reporter.id, :old_status_id => os.id, :new_status_id => ns.id) unless os == ns
-      }        
-    }
-    Workflow.create(:tracker_id => t.id, :role_id => reporter.id, :old_status_id => resolved.id, :new_status_id => feedback.id)
-  }
-
-  # enumerations
-  Enumeration.create(:opt => "DCAT", :name => l(:default_doc_category_user), :position => 1)
-  Enumeration.create(:opt => "DCAT", :name => l(:default_doc_category_tech), :position => 2)
-
-  Enumeration.create(:opt => "IPRI", :name => l(:default_priority_low), :position => 1)
-  Enumeration.create(:opt => "IPRI", :name => l(:default_priority_normal), :position => 2, :is_default => true)
-  Enumeration.create(:opt => "IPRI", :name => l(:default_priority_high), :position => 3)
-  Enumeration.create(:opt => "IPRI", :name => l(:default_priority_urgent), :position => 4)
-  Enumeration.create(:opt => "IPRI", :name => l(:default_priority_immediate), :position => 5)
-
-  Enumeration.create(:opt => "ACTI", :name => l(:default_activity_design), :position => 1)
-  Enumeration.create(:opt => "ACTI", :name => l(:default_activity_development), :position => 2)
- 
-rescue => error
-  puts "Error: " + error
-  puts "Default configuration data can't be loaded."
-end
-end
+    puts "===================================="
+    
+    begin
+      Redmine::DefaultData::Loader.load(current_language)
+      puts "Default configuration data loaded."
+    rescue => error
+      puts "Error: " + error
+      puts "Default configuration data was not loaded."
+    end
+  end
 end

From 4024f4ac39ea77099dcb64fdf979794fbe65014d Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Fri, 4 Jan 2008 19:07:16 +0000
Subject: [PATCH 109/710] Updated Serbian translation (Dragan Matic).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1038 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 lang/sr.yml | 62 ++++++++++++++++++++++++++---------------------------
 1 file changed, 31 insertions(+), 31 deletions(-)

diff --git a/lang/sr.yml b/lang/sr.yml
index 6e571d6e1..ad2769fc1 100644
--- a/lang/sr.yml
+++ b/lang/sr.yml
@@ -1,7 +1,7 @@
 _gloc_rule_default: '|n| n==1 ? "" : "_plural" '
 
 actionview_datehelper_select_day_prefix:
-actionview_datehelper_select_month_names: Januar,Februar,Mart,April,Maj,Jue,Jul,Avgust,Septembar,Oktobar,Novembar,Decembar
+actionview_datehelper_select_month_names: Januar,Februar,Mart,April,Maj,Jun,Jul,Avgust,Septembar,Oktobar,Novembar,Decembar
 actionview_datehelper_select_month_names_abbr: Jan,Feb,Mar,Apr,Maj,Jun,Jul,Avg,Sep,Okt,Nov,Dec
 actionview_datehelper_select_month_prefix:
 actionview_datehelper_select_year_prefix:
@@ -19,7 +19,7 @@ actionview_datehelper_time_in_words_second_less_than: manje od sekunde
 actionview_datehelper_time_in_words_second_less_than_plural: manje od %d sekundi
 actionview_instancetag_blank_option: Molim izaberite
 
-activerecord_error_inclusion: nije ukljucen u listu
+activerecord_error_inclusion: nije uključen u listu
 activerecord_error_exclusion: je rezervisan
 activerecord_error_invalid: je pogrešan
 activerecord_error_confirmation: Ne slaže se sa potvrdom
@@ -29,7 +29,7 @@ activerecord_error_blank: ne sme biti prazno
 activerecord_error_too_long: je suvise dugačko
 activerecord_error_too_short: je suvise kratko
 activerecord_error_wrong_length: je pogrešne dužine
-activerecord_error_taken: je vež zauzeto
+activerecord_error_taken: je već zauzeto
 activerecord_error_not_a_number: nije broj
 activerecord_error_not_a_date: nije datum
 activerecord_error_greater_than_start_date: mora biti veći od početnog datuma
@@ -59,7 +59,7 @@ notice_account_password_updated: Lozinka je uspešno izmenjena.
 notice_account_wrong_password: Pogrešna lozinka
 notice_account_register_done: Nalog je uspešno kreiran. Da bi ste aktivirali vaš nalog kliknite na link koji vam je poslat. 
 notice_account_unknown_email: Nepoznati korisnik.
-notice_can_t_change_password: Ovaj nalog koristi eksterni izvor autentifikacije. Ne mogu da promenim šifru.
+notice_can_t_change_password: Ovaj nalog koristi eksterni izvor prijavljivanja. Ne mogu da promenim šifru.
 notice_account_lost_email_sent: Email sa uputstvima o izboru nove šifre je poslat na vašu adresu.
 notice_account_activated: Vaš nalog je aktiviran. Možete se ulogovati.
 notice_successful_create: Uspešna kreacija.
@@ -68,7 +68,7 @@ notice_successful_delete: Uspešno brisanje.
 notice_successful_connection: Uspešna konekcija.
 notice_file_not_found: Stranica kojoj pokušavate da pristupite ne postoji ili je uklonjena.
 notice_locking_conflict: Podaci su izmenjeni od strane drugog korisnika.
-notice_scm_error: Unos i/ili revizija ne postoji u repository-ju.
+notice_scm_error: Unos i/ili revizija ne postoji u spremištu.
 notice_not_authorized: Niste ovlašćeni da pristupite ovoj stranici.
 notice_email_sent: Email je poslat %s
 notice_email_error: Došlo je do greške pri slanju maila (%s)
@@ -149,7 +149,7 @@ field_attr_mail: Atribut email-a
 field_onthefly: Kreacija naloga "On-the-fly"
 field_start_date: Start
 field_done_ratio: %% Završeno
-field_auth_source: Vrsta autentifikacije
+field_auth_source: Vrsta prijavljivanja
 field_hide_mail: Sakrij moju email adresu
 field_comments: Komentar
 field_url: URL
@@ -171,7 +171,7 @@ setting_app_title: Naziv aplikacije
 setting_app_subtitle: Podnaslov aplikacije
 setting_welcome_text: Tekst dobrodošlice
 setting_default_language: Podrazumevani jezik
-setting_login_required: Autentifikacija obavezna
+setting_login_required: Prijavljivanje obaveyno
 setting_self_registration: Samoregistracija je dozvoljena
 setting_attachment_max_size: Maksimalna velicina Attachment-a
 setting_issues_export_limit: Max broj kartica u exportu
@@ -181,14 +181,14 @@ setting_text_formatting: Formatiranje teksta
 setting_wiki_compression: Kompresija wiki history-a
 setting_feeds_limit: Feed content limit
 setting_autofetch_changesets: Autofetch commits
-setting_sys_api_enabled: Ukljuci WS za menadžment repository-ja
+setting_sys_api_enabled: Ukljuci WS za menadžment spremišta
 setting_commit_ref_keywords: Referentne ključne reči
 setting_commit_fix_keywords: Fiksne ključne reči
 setting_autologin: Autologin
 setting_date_format: Format datuma
 setting_cross_project_issue_relations: Dozvoli relacije kartica između različitih projekata
 setting_issue_list_default_columns: Podrazumevana kolona se prikazuje na listi kartica
-setting_repositories_encodings: Kodna stranica repository-ja
+setting_repositories_encodings: Kodna stranica spremišta
 setting_emails_footer: Zaglavlje emaila
 
 label_user: Korisnik
@@ -249,12 +249,12 @@ label_last_updates_plural: %d poslednje izmenjene
 label_registered_on: Registrovano
 label_activity: Aktivnost
 label_new: Novo
-label_logged_as: Logged as
+label_logged_as: Prijavljen kao
 label_environment: Environment
-label_authentication: Autentifikacija
-label_auth_source: Način autentifikacije
-label_auth_source_new: Novi način autentifikacije
-label_auth_source_plural: Načini autentifikacije
+label_authentication: Prijavljivanje
+label_auth_source: Način prijavljivanja
+label_auth_source_new: Novi način prijavljivanja
+label_auth_source_plural: Načini prijavljivanja
 label_subproject_plural: Podprojekti
 label_min_max_length: Min - Max velicina
 label_list: Liste
@@ -339,7 +339,7 @@ label_ago: pre dana
 label_contains: Sadrži
 label_not_contains: ne sadrži
 label_day_plural: dana
-label_repository: Repository
+label_repository: Spremište
 label_browse: Pregled
 label_modification: %d izmena
 label_modification_plural: %d izmena
@@ -520,7 +520,7 @@ default_issue_status_assigned: Dodeljeno
 default_issue_status_resolved: Rešeno
 default_issue_status_feedback: Povratna informacija
 default_issue_status_closed: Zatvoreno
-default_issue_status_rejected: Odbaceno
+default_issue_status_rejected: Odbačeno
 default_doc_category_user: Korisnička dokumentacija
 default_doc_category_tech: Tehnička dokumentacija
 default_priority_low: Nizak
@@ -537,20 +537,20 @@ enumeration_activities: Aktivnosti (praćenje vremena))
 label_float: Float
 button_copy: Copy
 setting_protocol: Protocol
-label_user_mail_no_self_notified: "I don't want to be notified of changes that I make myself"
-setting_time_format: Time format
-label_registration_activation_by_email: account activation by email
-mail_subject_account_activation_request: Redmine account activation request
-mail_body_account_activation_request: 'A new user (%s) has registered. His account his pending your approval:'
-label_registration_automatic_activation: automatic account activation
-label_registration_manual_activation: manual account activation
-notice_account_pending: "Your account was created and is now pending administrator approval."
-field_time_zone: Time zone
-text_caracters_minimum: Must be at least %d characters long.
-setting_bcc_recipients: Blind carbon copy recipients (bcc)
+label_user_mail_no_self_notified: "Ne želim da budem obaveštavan o izmenama koje sam pravim"
+setting_time_format: Format vremena
+label_registration_activation_by_email: aktivacija naloga putem email-a
+mail_subject_account_activation_request: Redmine zahtev za aktivacijom naloga
+mail_body_account_activation_request: 'Novi korisnik (%s) se registrovao. Njegov nalog čeka vaše odobrenje:'
+label_registration_automatic_activation: automatska aktivacija naloga
+label_registration_manual_activation: ručna aktivacija naloga
+notice_account_pending: "Vaš nalog je kreiran i čeka odobrenje administratora."
+field_time_zone: Vremenska zona
+text_caracters_minimum: Mora biti minimum %d karaktera dugačka.
+setting_bcc_recipients: "Blind carbon copy" primaoci (bcc)
 button_annotate: Annotate
-label_issues_by: Issues by %s
+label_issues_by: Kartice od %s
 field_searchable: Searchable
-label_display_per_page: 'Per page: %s'
-setting_per_page_options: Objects per page options
-label_age: Age
+label_display_per_page: 'Po stranici: %s'
+setting_per_page_options: Objekata po stranici opcija
+label_age: Starost

From 8d9b04865bac785d12b0aac43fe0c62488c39fec Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Fri, 4 Jan 2008 20:03:31 +0000
Subject: [PATCH 110/710] Fixed Serbian lang file.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1039 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 lang/sr.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lang/sr.yml b/lang/sr.yml
index ad2769fc1..18e97d444 100644
--- a/lang/sr.yml
+++ b/lang/sr.yml
@@ -547,7 +547,7 @@ label_registration_manual_activation: ručna aktivacija naloga
 notice_account_pending: "Vaš nalog je kreiran i čeka odobrenje administratora."
 field_time_zone: Vremenska zona
 text_caracters_minimum: Mora biti minimum %d karaktera dugačka.
-setting_bcc_recipients: "Blind carbon copy" primaoci (bcc)
+setting_bcc_recipients: '"Blind carbon copy" primaoci (bcc)'
 button_annotate: Annotate
 label_issues_by: Kartice od %s
 field_searchable: Searchable

From c9fd7513edd0f594227fc681dcd654e41bd118e6 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sat, 5 Jan 2008 11:33:49 +0000
Subject: [PATCH 111/710] Default configuration data can now be loaded from the
 administration screen. A message is automatically displayed on this screen if
 roles, trackers,... have not been configured yet. The rake task is still
 available and the data loading code is wrapped in a transaction.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1040 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/admin_controller.rb      |  17 +-
 app/views/admin/_no_data.rhtml           |   8 +
 app/views/admin/index.rhtml              |   2 +
 doc/INSTALL                              |  14 +-
 lang/bg.yml                              |   4 +
 lang/cs.yml                              |   4 +
 lang/de.yml                              |   4 +
 lang/en.yml                              |   5 +
 lang/es.yml                              |   4 +
 lang/fr.yml                              |   7 +-
 lang/he.yml                              |   4 +
 lang/it.yml                              |   4 +
 lang/ja.yml                              |   4 +
 lang/ko.yml                              |   4 +
 lang/nl.yml                              |   4 +
 lang/pl.yml                              |   4 +
 lang/pt-br.yml                           |   4 +
 lang/pt.yml                              |   4 +
 lang/ro.yml                              |   4 +
 lang/ru.yml                              |   4 +
 lang/sr.yml                              |   4 +
 lang/sv.yml                              |   4 +
 lang/zh-tw.yml                           |   4 +
 lang/zh.yml                              |   4 +
 lib/redmine/default_data/loader.rb       | 217 ++++++++++++-----------
 test/functional/admin_controller_test.rb |  28 ++-
 26 files changed, 249 insertions(+), 121 deletions(-)
 create mode 100644 app/views/admin/_no_data.rhtml

diff --git a/app/controllers/admin_controller.rb b/app/controllers/admin_controller.rb
index 0f8eb32a5..9e6a22822 100644
--- a/app/controllers/admin_controller.rb
+++ b/app/controllers/admin_controller.rb
@@ -22,7 +22,8 @@ class AdminController < ApplicationController
   helper :sort
   include SortHelper	
 
-  def index	
+  def index
+    @no_configuration_data = Redmine::DefaultData::Loader::no_data?
   end
 	
   def projects
@@ -56,6 +57,20 @@ class AdminController < ApplicationController
     end
   end
   
+  # Loads the default configuration
+  # (roles, trackers, statuses, workflow, enumerations)
+  def default_configuration
+    if request.post?
+      begin
+        Redmine::DefaultData::Loader::load(params[:lang])
+        flash[:notice] = l(:notice_default_data_loaded)
+      rescue Exception => e
+        flash[:error] = l(:error_can_t_load_default_data, e.message)
+      end
+    end
+    redirect_to :action => 'index'
+  end
+  
   def test_email
     raise_delivery_errors = ActionMailer::Base.raise_delivery_errors
     # Force ActionMailer to raise delivery errors so we can catch it
diff --git a/app/views/admin/_no_data.rhtml b/app/views/admin/_no_data.rhtml
new file mode 100644
index 000000000..5d52dc059
--- /dev/null
+++ b/app/views/admin/_no_data.rhtml
@@ -0,0 +1,8 @@
+<div class="nodata">
+<% form_tag({:action => 'default_configuration'}) do %>
+    <%= simple_format(l(:text_no_configuration_data)) %>
+    <p><%= l(:field_language) %>:
+    <%= select_tag 'lang', options_for_select(lang_options_for_select(false), current_language.to_s) %>
+    <%= submit_tag l(:text_load_default_configuration) %></p>
+<% end %>
+</div>
diff --git a/app/views/admin/index.rhtml b/app/views/admin/index.rhtml
index 1c6cbdee5..2291c5415 100644
--- a/app/views/admin/index.rhtml
+++ b/app/views/admin/index.rhtml
@@ -1,5 +1,7 @@
 <h2><%=l(:label_administration)%></h2>
 
+<%= render :partial => 'no_data' if @no_configuration_data %>
+
 <p class="icon22 icon22-projects">
 <%= link_to l(:label_project_plural), :controller => 'admin', :action => 'projects' %> |
 <%= link_to l(:label_new), :controller => 'projects', :action => 'add' %>
diff --git a/doc/INSTALL b/doc/INSTALL
index 5eb4d5c68..035e97cab 100644
--- a/doc/INSTALL
+++ b/doc/INSTALL
@@ -33,24 +33,18 @@ Supported databases:
    rake db:migrate RAILS_ENV="production"
    It will create tables and an administrator account.
 
-5. Insert default configuration data in the database:
-   rake redmine:load_default_data RAILS_ENV="production"
-   It will load default roles, trackers, statuses, workflows and enumerations.
-   This step is optional but *highly recommended*
-
-6. Test the installation by running WEBrick web server:
+5. Test the installation by running WEBrick web server:
    ruby script/server -e production   
   
    Once WEBrick has started, point your browser to http://localhost:3000/
    You should now see the application welcome page
 
-7. Use default administrator account to log in:
+6. Use default administrator account to log in:
    login: admin
    password: admin
    
-8. You can go to "Admin -> Settings" to modify application settings.
-
-9. Setup Apache or Lighttpd with fastcgi for best performance.
+7. Go to "Administration" to load the default configuration data (roles, 
+   trackers, statuses, workflow) and adjust application settings
 
 
 == SMTP server Configuration
diff --git a/lang/bg.yml b/lang/bg.yml
index 916e89268..eeb6ef80b 100644
--- a/lang/bg.yml
+++ b/lang/bg.yml
@@ -553,3 +553,7 @@ field_searchable: Searchable
 label_display_per_page: 'Per page: %s'
 setting_per_page_options: Objects per page options
 label_age: Age
+notice_default_data_loaded: Default configuration successfully loaded.
+text_load_default_configuration: Load the default configuration
+text_no_configuration_data: "Roles, trackers, issue statuses and workflow have not been configured yet.\nIt is highly recommended to load the default configuration. You will be able to modify it once loaded."
+error_can_t_load_default_data: "Default configuration could not be loaded: %s"
diff --git a/lang/cs.yml b/lang/cs.yml
index db2055f6c..e99fe061b 100644
--- a/lang/cs.yml
+++ b/lang/cs.yml
@@ -553,3 +553,7 @@ field_searchable: Searchable
 label_display_per_page: 'Per page: %s'
 setting_per_page_options: Objects per page options
 label_age: Age
+notice_default_data_loaded: Default configuration successfully loaded.
+text_load_default_configuration: Load the default configuration
+text_no_configuration_data: "Roles, trackers, issue statuses and workflow have not been configured yet.\nIt is highly recommended to load the default configuration. You will be able to modify it once loaded."
+error_can_t_load_default_data: "Default configuration could not be loaded: %s"
diff --git a/lang/de.yml b/lang/de.yml
index 2d4a95c2d..cd4e222ae 100644
--- a/lang/de.yml
+++ b/lang/de.yml
@@ -553,3 +553,7 @@ field_searchable: Searchable
 label_display_per_page: 'Per page: %s'
 setting_per_page_options: Objects per page options
 label_age: Age
+notice_default_data_loaded: Default configuration successfully loaded.
+text_load_default_configuration: Load the default configuration
+text_no_configuration_data: "Roles, trackers, issue statuses and workflow have not been configured yet.\nIt is highly recommended to load the default configuration. You will be able to modify it once loaded."
+error_can_t_load_default_data: "Default configuration could not be loaded: %s"
diff --git a/lang/en.yml b/lang/en.yml
index 2419b05db..7a1a2622f 100644
--- a/lang/en.yml
+++ b/lang/en.yml
@@ -76,6 +76,9 @@ notice_feeds_access_key_reseted: Your RSS access key was reseted.
 notice_failed_to_save_issues: "Failed to save %d issue(s) on %d selected: %s."
 notice_no_issue_selected: "No issue is selected! Please, check the issues you want to edit."
 notice_account_pending: "Your account was created and is now pending administrator approval."
+notice_default_data_loaded: Default configuration successfully loaded.
+
+error_can_t_load_default_data: "Default configuration could not be loaded: %s"
 
 mail_subject_lost_password: Your Redmine password
 mail_body_lost_password: 'To change your Redmine password, click on the following link:'
@@ -527,6 +530,8 @@ text_issue_category_destroy_question: Some issues (%d) are assigned to this cate
 text_issue_category_destroy_assignments: Remove category assignments
 text_issue_category_reassign_to: Reassign issues to this category
 text_user_mail_option: "For unselected projects, you will only receive notifications about things you watch or you're involved in (eg. issues you're the author or assignee)."
+text_no_configuration_data: "Roles, trackers, issue statuses and workflow have not been configured yet.\nIt is highly recommended to load the default configuration. You will be able to modify it once loaded."
+text_load_default_configuration: Load the default configuration
 
 default_role_manager: Manager
 default_role_developper: Developer
diff --git a/lang/es.yml b/lang/es.yml
index b7aaf1b39..bae295586 100644
--- a/lang/es.yml
+++ b/lang/es.yml
@@ -556,3 +556,7 @@ field_searchable: Incluir en las búsquedas
 label_display_per_page: 'Por página: %s'
 setting_per_page_options: Objetos por página
 label_age: Edad
+notice_default_data_loaded: Default configuration successfully loaded.
+text_load_default_configuration: Load the default configuration
+text_no_configuration_data: "Roles, trackers, issue statuses and workflow have not been configured yet.\nIt is highly recommended to load the default configuration. You will be able to modify it once loaded."
+error_can_t_load_default_data: "Default configuration could not be loaded: %s"
diff --git a/lang/fr.yml b/lang/fr.yml
index 394865a21..d47feceb2 100644
--- a/lang/fr.yml
+++ b/lang/fr.yml
@@ -72,10 +72,13 @@ notice_scm_error: "L'entrée et/ou la révision demandée n'existe pas dans le d
 notice_not_authorized: "Vous n'êtes pas autorisés à accéder à cette page."
 notice_email_sent: "Un email a été envoyé à %s"
 notice_email_error: "Erreur lors de l'envoi de l'email (%s)"
-notice_feeds_access_key_reseted: Votre clé d'accès aux flux RSS a été réinitialisée.
+notice_feeds_access_key_reseted: "Votre clé d'accès aux flux RSS a été réinitialisée."
 notice_failed_to_save_issues: "%d demande(s) sur les %d sélectionnées n'ont pas pu être mise(s) à jour: %s."
 notice_no_issue_selected: "Aucune demande sélectionnée ! Cochez les demandes que vous voulez mettre à jour."
 notice_account_pending: "Votre compte a été créé et attend l'approbation de l'administrateur."
+notice_default_data_loaded: Paramétrage par défaut chargé avec succès.
+
+error_can_t_load_default_data: "Une erreur s'est produite lors du chargement du paramétrage: %s"
 
 mail_subject_lost_password: Votre mot de passe redMine
 mail_body_lost_password: 'Pour changer votre mot de passe Redmine, cliquez sur le lien suivant:'
@@ -527,6 +530,8 @@ text_issue_category_destroy_question: Des demandes (%d) sont affectées à cette
 text_issue_category_destroy_assignments: N'affecter les demandes à aucune autre catégorie
 text_issue_category_reassign_to: Réaffecter les demandes à cette catégorie
 text_user_mail_option: "Pour les projets non sélectionnés, vous recevrez seulement des notifications pour ce que vous surveillez ou à quoi vous participez (exemple: demandes dont vous êtes l'auteur ou la personne assignée)."
+text_no_configuration_data: "Les rôles, trackers, statuts et le workflow ne sont pas encore paramétrés.\nIl est vivement recommandé de charger le paramétrage par defaut. Vous pourrez le modifier une fois chargé."
+text_load_default_configuration: Charger le paramétrage par défaut
 
 default_role_manager: Manager
 default_role_developper: Développeur
diff --git a/lang/he.yml b/lang/he.yml
index 322b10b7c..e2277dc3d 100644
--- a/lang/he.yml
+++ b/lang/he.yml
@@ -553,3 +553,7 @@ field_searchable: Searchable
 label_display_per_page: 'Per page: %s'
 setting_per_page_options: Objects per page options
 label_age: Age
+notice_default_data_loaded: Default configuration successfully loaded.
+text_load_default_configuration: Load the default configuration
+text_no_configuration_data: "Roles, trackers, issue statuses and workflow have not been configured yet.\nIt is highly recommended to load the default configuration. You will be able to modify it once loaded."
+error_can_t_load_default_data: "Default configuration could not be loaded: %s"
diff --git a/lang/it.yml b/lang/it.yml
index 561215f78..709f41774 100644
--- a/lang/it.yml
+++ b/lang/it.yml
@@ -553,3 +553,7 @@ field_searchable: Searchable
 label_display_per_page: 'Per page: %s'
 setting_per_page_options: Objects per page options
 label_age: Age
+notice_default_data_loaded: Default configuration successfully loaded.
+text_load_default_configuration: Load the default configuration
+text_no_configuration_data: "Roles, trackers, issue statuses and workflow have not been configured yet.\nIt is highly recommended to load the default configuration. You will be able to modify it once loaded."
+error_can_t_load_default_data: "Default configuration could not be loaded: %s"
diff --git a/lang/ja.yml b/lang/ja.yml
index eb30edb26..286fb5971 100644
--- a/lang/ja.yml
+++ b/lang/ja.yml
@@ -554,3 +554,7 @@ field_searchable: Searchable
 label_display_per_page: 'Per page: %s'
 setting_per_page_options: Objects per page options
 label_age: Age
+notice_default_data_loaded: Default configuration successfully loaded.
+text_load_default_configuration: Load the default configuration
+text_no_configuration_data: "Roles, trackers, issue statuses and workflow have not been configured yet.\nIt is highly recommended to load the default configuration. You will be able to modify it once loaded."
+error_can_t_load_default_data: "Default configuration could not be loaded: %s"
diff --git a/lang/ko.yml b/lang/ko.yml
index d0e03b364..52c9b5431 100644
--- a/lang/ko.yml
+++ b/lang/ko.yml
@@ -553,3 +553,7 @@ field_searchable: Searchable
 label_display_per_page: 'Per page: %s'
 setting_per_page_options: Objects per page options
 label_age: Age
+notice_default_data_loaded: Default configuration successfully loaded.
+text_load_default_configuration: Load the default configuration
+text_no_configuration_data: "Roles, trackers, issue statuses and workflow have not been configured yet.\nIt is highly recommended to load the default configuration. You will be able to modify it once loaded."
+error_can_t_load_default_data: "Default configuration could not be loaded: %s"
diff --git a/lang/nl.yml b/lang/nl.yml
index 74eff69ea..43e1704a4 100644
--- a/lang/nl.yml
+++ b/lang/nl.yml
@@ -554,3 +554,7 @@ field_searchable: Searchable
 label_display_per_page: 'Per page: %s'
 setting_per_page_options: Objects per page options
 label_age: Age
+notice_default_data_loaded: Default configuration successfully loaded.
+text_load_default_configuration: Load the default configuration
+text_no_configuration_data: "Roles, trackers, issue statuses and workflow have not been configured yet.\nIt is highly recommended to load the default configuration. You will be able to modify it once loaded."
+error_can_t_load_default_data: "Default configuration could not be loaded: %s"
diff --git a/lang/pl.yml b/lang/pl.yml
index f1513ac92..77ae6bb66 100644
--- a/lang/pl.yml
+++ b/lang/pl.yml
@@ -553,3 +553,7 @@ field_searchable: Searchable
 label_display_per_page: 'Per page: %s'
 setting_per_page_options: Objects per page options
 label_age: Age
+notice_default_data_loaded: Default configuration successfully loaded.
+text_load_default_configuration: Load the default configuration
+text_no_configuration_data: "Roles, trackers, issue statuses and workflow have not been configured yet.\nIt is highly recommended to load the default configuration. You will be able to modify it once loaded."
+error_can_t_load_default_data: "Default configuration could not be loaded: %s"
diff --git a/lang/pt-br.yml b/lang/pt-br.yml
index 33719d11b..55e8b3fae 100644
--- a/lang/pt-br.yml
+++ b/lang/pt-br.yml
@@ -553,3 +553,7 @@ field_searchable: Searchable
 label_display_per_page: 'Per page: %s'
 setting_per_page_options: Objects per page options
 label_age: Age
+notice_default_data_loaded: Default configuration successfully loaded.
+text_load_default_configuration: Load the default configuration
+text_no_configuration_data: "Roles, trackers, issue statuses and workflow have not been configured yet.\nIt is highly recommended to load the default configuration. You will be able to modify it once loaded."
+error_can_t_load_default_data: "Default configuration could not be loaded: %s"
diff --git a/lang/pt.yml b/lang/pt.yml
index c042589e3..0a5661997 100644
--- a/lang/pt.yml
+++ b/lang/pt.yml
@@ -553,3 +553,7 @@ field_searchable: Searchable
 label_display_per_page: 'Per page: %s'
 setting_per_page_options: Objects per page options
 label_age: Age
+notice_default_data_loaded: Default configuration successfully loaded.
+text_load_default_configuration: Load the default configuration
+text_no_configuration_data: "Roles, trackers, issue statuses and workflow have not been configured yet.\nIt is highly recommended to load the default configuration. You will be able to modify it once loaded."
+error_can_t_load_default_data: "Default configuration could not be loaded: %s"
diff --git a/lang/ro.yml b/lang/ro.yml
index e615472ad..1381adba9 100644
--- a/lang/ro.yml
+++ b/lang/ro.yml
@@ -553,3 +553,7 @@ field_searchable: Searchable
 label_display_per_page: 'Per page: %s'
 setting_per_page_options: Objects per page options
 label_age: Age
+notice_default_data_loaded: Default configuration successfully loaded.
+text_load_default_configuration: Load the default configuration
+text_no_configuration_data: "Roles, trackers, issue statuses and workflow have not been configured yet.\nIt is highly recommended to load the default configuration. You will be able to modify it once loaded."
+error_can_t_load_default_data: "Default configuration could not be loaded: %s"
diff --git a/lang/ru.yml b/lang/ru.yml
index d40379788..b293dc309 100644
--- a/lang/ru.yml
+++ b/lang/ru.yml
@@ -553,3 +553,7 @@ field_searchable: Searchable
 label_display_per_page: 'Per page: %s'
 setting_per_page_options: Objects per page options
 label_age: Age
+notice_default_data_loaded: Default configuration successfully loaded.
+text_load_default_configuration: Load the default configuration
+text_no_configuration_data: "Roles, trackers, issue statuses and workflow have not been configured yet.\nIt is highly recommended to load the default configuration. You will be able to modify it once loaded."
+error_can_t_load_default_data: "Default configuration could not be loaded: %s"
diff --git a/lang/sr.yml b/lang/sr.yml
index 18e97d444..c842ec438 100644
--- a/lang/sr.yml
+++ b/lang/sr.yml
@@ -554,3 +554,7 @@ field_searchable: Searchable
 label_display_per_page: 'Po stranici: %s'
 setting_per_page_options: Objekata po stranici opcija
 label_age: Starost
+notice_default_data_loaded: Default configuration successfully loaded.
+text_load_default_configuration: Load the default configuration
+text_no_configuration_data: "Roles, trackers, issue statuses and workflow have not been configured yet.\nIt is highly recommended to load the default configuration. You will be able to modify it once loaded."
+error_can_t_load_default_data: "Default configuration could not be loaded: %s"
diff --git a/lang/sv.yml b/lang/sv.yml
index dd4117115..85fb19bcb 100644
--- a/lang/sv.yml
+++ b/lang/sv.yml
@@ -554,3 +554,7 @@ field_searchable: Searchable
 label_display_per_page: 'Per page: %s'
 setting_per_page_options: Objects per page options
 label_age: Age
+notice_default_data_loaded: Default configuration successfully loaded.
+text_load_default_configuration: Load the default configuration
+text_no_configuration_data: "Roles, trackers, issue statuses and workflow have not been configured yet.\nIt is highly recommended to load the default configuration. You will be able to modify it once loaded."
+error_can_t_load_default_data: "Default configuration could not be loaded: %s"
diff --git a/lang/zh-tw.yml b/lang/zh-tw.yml
index 889f86a1c..719a2e868 100644
--- a/lang/zh-tw.yml
+++ b/lang/zh-tw.yml
@@ -553,3 +553,7 @@ field_searchable: Searchable
 label_display_per_page: 'Per page: %s'
 setting_per_page_options: Objects per page options
 label_age: Age
+notice_default_data_loaded: Default configuration successfully loaded.
+text_load_default_configuration: Load the default configuration
+text_no_configuration_data: "Roles, trackers, issue statuses and workflow have not been configured yet.\nIt is highly recommended to load the default configuration. You will be able to modify it once loaded."
+error_can_t_load_default_data: "Default configuration could not be loaded: %s"
diff --git a/lang/zh.yml b/lang/zh.yml
index c758f5490..05134751f 100644
--- a/lang/zh.yml
+++ b/lang/zh.yml
@@ -556,3 +556,7 @@ field_searchable: Searchable
 label_display_per_page: 'Per page: %s'
 setting_per_page_options: Objects per page options
 label_age: Age
+notice_default_data_loaded: Default configuration successfully loaded.
+text_load_default_configuration: Load the default configuration
+text_no_configuration_data: "Roles, trackers, issue statuses and workflow have not been configured yet.\nIt is highly recommended to load the default configuration. You will be able to modify it once loaded."
+error_can_t_load_default_data: "Default configuration could not be loaded: %s"
diff --git a/lib/redmine/default_data/loader.rb b/lib/redmine/default_data/loader.rb
index 105219104..0abb5572a 100644
--- a/lib/redmine/default_data/loader.rb
+++ b/lib/redmine/default_data/loader.rb
@@ -38,19 +38,41 @@ module Redmine
           raise DataAlreadyLoaded.new("Some configuration data is already loaded.") unless no_data?
           set_language_if_valid(lang)
           
-          # Roles
-          manager = Role.create! :name => l(:default_role_manager), 
-                                 :position => 1
-          manager.permissions = manager.setable_permissions.collect {|p| p.name}
-          manager.save!
-          
-          developper = Role.create! :name => l(:default_role_developper), 
-                                    :position => 2, 
-                                    :permissions => [:manage_versions, 
-                                                    :manage_categories,
-                                                    :add_issues,
-                                                    :edit_issues,
-                                                    :manage_issue_relations,
+          Role.transaction do
+            # Roles
+            manager = Role.create! :name => l(:default_role_manager), 
+                                   :position => 1
+            manager.permissions = manager.setable_permissions.collect {|p| p.name}
+            manager.save!
+            
+            developper = Role.create! :name => l(:default_role_developper), 
+                                      :position => 2, 
+                                      :permissions => [:manage_versions, 
+                                                      :manage_categories,
+                                                      :add_issues,
+                                                      :edit_issues,
+                                                      :manage_issue_relations,
+                                                      :add_issue_notes,
+                                                      :change_issue_status,
+                                                      :save_queries,
+                                                      :view_gantt,
+                                                      :view_calendar,
+                                                      :log_time,
+                                                      :view_time_entries,
+                                                      :comment_news,
+                                                      :view_documents,
+                                                      :view_wiki_pages,
+                                                      :edit_wiki_pages,
+                                                      :delete_wiki_pages,
+                                                      :add_messages,
+                                                      :view_files,
+                                                      :manage_files,
+                                                      :browse_repository,
+                                                      :view_changesets]
+            
+            reporter = Role.create! :name => l(:default_role_reporter),
+                                    :position => 3,
+                                    :permissions => [:add_issues,
                                                     :add_issue_notes,
                                                     :change_issue_status,
                                                     :save_queries,
@@ -61,108 +83,87 @@ module Redmine
                                                     :comment_news,
                                                     :view_documents,
                                                     :view_wiki_pages,
-                                                    :edit_wiki_pages,
-                                                    :delete_wiki_pages,
                                                     :add_messages,
                                                     :view_files,
-                                                    :manage_files,
                                                     :browse_repository,
                                                     :view_changesets]
+                        
+            Role.non_member.update_attribute :permissions, [:add_issues,
+                                                            :add_issue_notes,
+                                                            :change_issue_status,
+                                                            :save_queries,
+                                                            :view_gantt,
+                                                            :view_calendar,
+                                                            :view_time_entries,
+                                                            :comment_news,
+                                                            :view_documents,
+                                                            :view_wiki_pages,
+                                                            :add_messages,
+                                                            :view_files,
+                                                            :browse_repository,
+                                                            :view_changesets]
           
-          reporter = Role.create! :name => l(:default_role_reporter),
-                                  :position => 3,
-                                  :permissions => [:add_issues,
-                                                  :add_issue_notes,
-                                                  :change_issue_status,
-                                                  :save_queries,
-                                                  :view_gantt,
-                                                  :view_calendar,
-                                                  :log_time,
-                                                  :view_time_entries,
-                                                  :comment_news,
-                                                  :view_documents,
-                                                  :view_wiki_pages,
-                                                  :add_messages,
-                                                  :view_files,
-                                                  :browse_repository,
-                                                  :view_changesets]
-                      
-          Role.non_member.update_attribute :permissions, [:add_issues,
-                                                          :add_issue_notes,
-                                                          :change_issue_status,
-                                                          :save_queries,
-                                                          :view_gantt,
-                                                          :view_calendar,
-                                                          :view_time_entries,
-                                                          :comment_news,
-                                                          :view_documents,
-                                                          :view_wiki_pages,
-                                                          :add_messages,
-                                                          :view_files,
-                                                          :browse_repository,
-                                                          :view_changesets]
-        
-          Role.anonymous.update_attribute :permissions, [:view_gantt,
-                                                         :view_calendar,
-                                                         :view_time_entries,
-                                                         :view_documents,
-                                                         :view_wiki_pages,
-                                                         :view_files,
-                                                         :browse_repository,
-                                                         :view_changesets]
-                                                           
-          # Trackers
-          Tracker.create!(:name => l(:default_tracker_bug),     :is_in_chlog => true,  :is_in_roadmap => false, :position => 1)
-          Tracker.create!(:name => l(:default_tracker_feature), :is_in_chlog => true,  :is_in_roadmap => true,  :position => 2)
-          Tracker.create!(:name => l(:default_tracker_support), :is_in_chlog => false, :is_in_roadmap => false, :position => 3)
-          
-          # Issue statuses
-          new       = IssueStatus.create!(:name => l(:default_issue_status_new), :is_closed => false, :is_default => true, :position => 1)
-          assigned  = IssueStatus.create!(:name => l(:default_issue_status_assigned), :is_closed => false, :is_default => false, :position => 2)
-          resolved  = IssueStatus.create!(:name => l(:default_issue_status_resolved), :is_closed => false, :is_default => false, :position => 3)
-          feedback  = IssueStatus.create!(:name => l(:default_issue_status_feedback), :is_closed => false, :is_default => false, :position => 4)
-          closed    = IssueStatus.create!(:name => l(:default_issue_status_closed), :is_closed => true, :is_default => false, :position => 5)
-          rejected  = IssueStatus.create!(:name => l(:default_issue_status_rejected), :is_closed => true, :is_default => false, :position => 6)
-          
-          # Workflow
-          Tracker.find(:all).each { |t|
-            IssueStatus.find(:all).each { |os|
-              IssueStatus.find(:all).each { |ns|
-                Workflow.create!(:tracker_id => t.id, :role_id => manager.id, :old_status_id => os.id, :new_status_id => ns.id) unless os == ns
-              }        
-            }      
-          }
-          
-          Tracker.find(:all).each { |t|
-            [new, assigned, resolved, feedback].each { |os|
-              [assigned, resolved, feedback, closed].each { |ns|
-                Workflow.create!(:tracker_id => t.id, :role_id => developper.id, :old_status_id => os.id, :new_status_id => ns.id) unless os == ns
-              }        
-            }      
-          }
-          
-          Tracker.find(:all).each { |t|
-            [new, assigned, resolved, feedback].each { |os|
-              [closed].each { |ns|
-                Workflow.create!(:tracker_id => t.id, :role_id => reporter.id, :old_status_id => os.id, :new_status_id => ns.id) unless os == ns
-              }        
+            Role.anonymous.update_attribute :permissions, [:view_gantt,
+                                                           :view_calendar,
+                                                           :view_time_entries,
+                                                           :view_documents,
+                                                           :view_wiki_pages,
+                                                           :view_files,
+                                                           :browse_repository,
+                                                           :view_changesets]
+                                                             
+            # Trackers
+            Tracker.create!(:name => l(:default_tracker_bug),     :is_in_chlog => true,  :is_in_roadmap => false, :position => 1)
+            Tracker.create!(:name => l(:default_tracker_feature), :is_in_chlog => true,  :is_in_roadmap => true,  :position => 2)
+            Tracker.create!(:name => l(:default_tracker_support), :is_in_chlog => false, :is_in_roadmap => false, :position => 3)
+            
+            # Issue statuses
+            new       = IssueStatus.create!(:name => l(:default_issue_status_new), :is_closed => false, :is_default => true, :position => 1)
+            assigned  = IssueStatus.create!(:name => l(:default_issue_status_assigned), :is_closed => false, :is_default => false, :position => 2)
+            resolved  = IssueStatus.create!(:name => l(:default_issue_status_resolved), :is_closed => false, :is_default => false, :position => 3)
+            feedback  = IssueStatus.create!(:name => l(:default_issue_status_feedback), :is_closed => false, :is_default => false, :position => 4)
+            closed    = IssueStatus.create!(:name => l(:default_issue_status_closed), :is_closed => true, :is_default => false, :position => 5)
+            rejected  = IssueStatus.create!(:name => l(:default_issue_status_rejected), :is_closed => true, :is_default => false, :position => 6)
+            
+            # Workflow
+            Tracker.find(:all).each { |t|
+              IssueStatus.find(:all).each { |os|
+                IssueStatus.find(:all).each { |ns|
+                  Workflow.create!(:tracker_id => t.id, :role_id => manager.id, :old_status_id => os.id, :new_status_id => ns.id) unless os == ns
+                }        
+              }      
+            }
+            
+            Tracker.find(:all).each { |t|
+              [new, assigned, resolved, feedback].each { |os|
+                [assigned, resolved, feedback, closed].each { |ns|
+                  Workflow.create!(:tracker_id => t.id, :role_id => developper.id, :old_status_id => os.id, :new_status_id => ns.id) unless os == ns
+                }        
+              }      
+            }
+            
+            Tracker.find(:all).each { |t|
+              [new, assigned, resolved, feedback].each { |os|
+                [closed].each { |ns|
+                  Workflow.create!(:tracker_id => t.id, :role_id => reporter.id, :old_status_id => os.id, :new_status_id => ns.id) unless os == ns
+                }        
+              }
+              Workflow.create!(:tracker_id => t.id, :role_id => reporter.id, :old_status_id => resolved.id, :new_status_id => feedback.id)
             }
-            Workflow.create!(:tracker_id => t.id, :role_id => reporter.id, :old_status_id => resolved.id, :new_status_id => feedback.id)
-          }
-        
-          # Enumerations
-          Enumeration.create!(:opt => "DCAT", :name => l(:default_doc_category_user), :position => 1)
-          Enumeration.create!(:opt => "DCAT", :name => l(:default_doc_category_tech), :position => 2)
-        
-          Enumeration.create!(:opt => "IPRI", :name => l(:default_priority_low), :position => 1)
-          Enumeration.create!(:opt => "IPRI", :name => l(:default_priority_normal), :position => 2, :is_default => true)
-          Enumeration.create!(:opt => "IPRI", :name => l(:default_priority_high), :position => 3)
-          Enumeration.create!(:opt => "IPRI", :name => l(:default_priority_urgent), :position => 4)
-          Enumeration.create!(:opt => "IPRI", :name => l(:default_priority_immediate), :position => 5)
-        
-          Enumeration.create!(:opt => "ACTI", :name => l(:default_activity_design), :position => 1)
-          Enumeration.create!(:opt => "ACTI", :name => l(:default_activity_development), :position => 2)
           
+            # Enumerations
+            Enumeration.create!(:opt => "DCAT", :name => l(:default_doc_category_user), :position => 1)
+            Enumeration.create!(:opt => "DCAT", :name => l(:default_doc_category_tech), :position => 2)
+          
+            Enumeration.create!(:opt => "IPRI", :name => l(:default_priority_low), :position => 1)
+            Enumeration.create!(:opt => "IPRI", :name => l(:default_priority_normal), :position => 2, :is_default => true)
+            Enumeration.create!(:opt => "IPRI", :name => l(:default_priority_high), :position => 3)
+            Enumeration.create!(:opt => "IPRI", :name => l(:default_priority_urgent), :position => 4)
+            Enumeration.create!(:opt => "IPRI", :name => l(:default_priority_immediate), :position => 5)
+          
+            Enumeration.create!(:opt => "ACTI", :name => l(:default_activity_design), :position => 1)
+            Enumeration.create!(:opt => "ACTI", :name => l(:default_activity_development), :position => 2)
+          end
           true
         end
       end
diff --git a/test/functional/admin_controller_test.rb b/test/functional/admin_controller_test.rb
index d49fe2dda..742c1f6bb 100644
--- a/test/functional/admin_controller_test.rb
+++ b/test/functional/admin_controller_test.rb
@@ -22,7 +22,7 @@ require 'admin_controller'
 class AdminController; def rescue_action(e) raise e end; end
 
 class AdminControllerTest < Test::Unit::TestCase
-  fixtures :projects, :users
+  fixtures :projects, :users, :roles
   
   def setup
     @controller = AdminController.new
@@ -32,6 +32,25 @@ class AdminControllerTest < Test::Unit::TestCase
     @request.session[:user_id] = 1 # admin
   end
   
+  def test_index
+    get :index
+    assert_no_tag :tag => 'div',
+                  :attributes => { :class => /nodata/ }
+  end
+  
+  def test_index_with_no_configuration_data
+    delete_configuration_data
+    get :index
+    assert_tag :tag => 'div',
+               :attributes => { :class => /nodata/ }
+  end
+  
+  def test_load_default_configuration_data
+    delete_configuration_data
+    post :default_configuration, :lang => 'fr'
+    assert IssueStatus.find_by_name('Nouveau')
+  end
+  
   def test_get_mail_options
     get :mail_options
     assert_response :success
@@ -58,4 +77,11 @@ class AdminControllerTest < Test::Unit::TestCase
     assert_response :success
     assert_template 'info'
   end
+  
+  def delete_configuration_data
+    Role.delete_all('builtin = 0')
+    Tracker.delete_all
+    IssueStatus.delete_all
+    Enumeration.delete_all
+  end
 end

From 4a729036bf0a92b8da4481d1313512c5b885770a Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 6 Jan 2008 13:09:23 +0000
Subject: [PATCH 112/710] Prevent 'has already been taken' error messages for
 user login and email if these fields are left empty.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1042 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/models/user.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/models/user.rb b/app/models/user.rb
index 737a8cc8e..906420ed4 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -38,7 +38,8 @@ class User < ActiveRecord::Base
   attr_protected :login, :admin, :password, :password_confirmation, :hashed_password
 	
   validates_presence_of :login, :firstname, :lastname, :mail, :if => Proc.new { |user| !user.is_a?(AnonymousUser) }
-  validates_uniqueness_of :login, :mail	
+  validates_uniqueness_of :login, :if => Proc.new { |user| !user.login.blank? }
+  validates_uniqueness_of :mail, :if => Proc.new { |user| !user.mail.blank? }
   # Login must contain lettres, numbers, underscores only
   validates_format_of :login, :with => /^[a-z0-9_\-@\.]*$/i
   validates_length_of :login, :maximum => 30

From 976a31e941e61542075866563e4c0740106c5d70 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 6 Jan 2008 17:06:14 +0000
Subject: [PATCH 113/710] Merged IssuesController change_status and add_note
 actions. The 'Change status' specific form removed and now accessible from
 issue/show view with no additional request (click on 'Update' to show the
 form). The 'Change issue status' permission is removed. To change the status,
 the user just needs to have either 'Edit' or 'Add note' permissions and some
 workflow transitions allowed.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1043 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/issues_controller.rb        |  74 ++++++------
 app/controllers/projects_controller.rb      |   8 +-
 app/models/issue.rb                         |   7 ++
 app/models/issue_status.rb                  |   4 +
 app/views/issues/_bulk_edit_form.rhtml      |   2 +-
 app/views/issues/_update.rhtml              |  42 +++++++
 app/views/issues/change_status.rhtml        |  38 ------
 app/views/issues/context_menu.rhtml         |  12 +-
 app/views/issues/show.rhtml                 |  30 ++---
 app/views/issues/update.rhtml               |   4 +
 lang/bg.yml                                 |   2 +
 lang/cs.yml                                 |   2 +
 lang/de.yml                                 |   2 +
 lang/en.yml                                 |   2 +
 lang/es.yml                                 |   2 +
 lang/fr.yml                                 |   2 +
 lang/he.yml                                 |   2 +
 lang/it.yml                                 |   2 +
 lang/ja.yml                                 |   2 +
 lang/ko.yml                                 |   2 +
 lang/nl.yml                                 |   2 +
 lang/pl.yml                                 |   2 +
 lang/pt-br.yml                              |   2 +
 lang/pt.yml                                 |   2 +
 lang/ro.yml                                 |   2 +
 lang/ru.yml                                 |   2 +
 lang/sr.yml                                 |   2 +
 lang/sv.yml                                 |   2 +
 lang/zh-tw.yml                              |   2 +
 lang/zh.yml                                 |   2 +
 lib/redmine.rb                              |   5 +-
 lib/redmine/default_data/loader.rb          |   3 -
 test/fixtures/enumerations.yml              |   9 ++
 test/fixtures/roles.yml                     |   5 +-
 test/fixtures/users.yml                     |  23 ++++
 test/functional/issues_controller_test.rb   | 122 ++++++++++++++++++--
 test/integration/issues_test.rb             |   4 +-
 test/test_helper.rb                         |   6 +-
 vendor/plugins/gloc-1.1.0/lib/gloc-rails.rb |  21 ++++
 39 files changed, 326 insertions(+), 133 deletions(-)
 create mode 100644 app/views/issues/_update.rhtml
 delete mode 100644 app/views/issues/change_status.rhtml
 create mode 100644 app/views/issues/update.rhtml

diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index 39a1e2d13..11112289e 100644
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -21,7 +21,7 @@ class IssuesController < ApplicationController
   before_filter :find_optional_project, :only => [:index, :changes]
   accept_key_auth :index, :changes
   
-  cache_sweeper :issue_sweeper, :only => [ :edit, :change_status, :destroy ]
+  cache_sweeper :issue_sweeper, :only => [ :edit, :update, :destroy ]
 
   helper :projects
   include ProjectsHelper   
@@ -82,7 +82,8 @@ class IssuesController < ApplicationController
   def show
     @custom_values = @issue.custom_values.find(:all, :include => :custom_field, :order => "#{CustomField.table_name}.position")
     @journals = @issue.journals.find(:all, :include => [:user, :details], :order => "#{Journal.table_name}.created_on ASC")
-    @status_options = @issue.status.find_new_statuses_allowed_to(User.current.role_for_project(@project), @issue.tracker)
+    @status_options = @issue.new_statuses_allowed_to(User.current)
+    @activities = Enumeration::get_values('ACTI')
     respond_to do |format|
       format.html { render :template => 'issues/show.rhtml' }
       format.pdf  { send_data(render(:template => 'issues/show.rfpdf', :layout => false), :type => 'application/pdf', :filename => "#{@project.identifier}-#{@issue.id}.pdf") }
@@ -115,47 +116,42 @@ class IssuesController < ApplicationController
     end		
   end
   
-  def add_note
+  # Attributes that can be updated on workflow transition
+  # TODO: make it configurable (at least per role)
+  UPDATABLE_ATTRS_ON_TRANSITION = %w(status_id assigned_to_id fixed_version_id done_ratio) unless const_defined?(:UPDATABLE_ATTRS_ON_TRANSITION)
+  
+  def update
+    @status_options = @issue.new_statuses_allowed_to(User.current)
+    @activities = Enumeration::get_values('ACTI')
     journal = @issue.init_journal(User.current, params[:notes])
-    attachments = attach_files(@issue, params[:attachments])
-    attachments.each {|a| journal.details << JournalDetail.new(:property => 'attachment', :prop_key => a.id, :value => a.filename)}
-    if journal.save
-      flash[:notice] = l(:notice_successful_update)
-      Mailer.deliver_issue_edit(journal) if Setting.notified_events.include?('issue_updated')
-      redirect_to :action => 'show', :id => @issue
-      return
+    # User can change issue attributes only if a workflow transition is allowed
+    if !@status_options.empty? && params[:issue]
+      attrs = params[:issue].dup
+      attrs.delete_if {|k,v| !UPDATABLE_ATTRS_ON_TRANSITION.include?(k) }
+      attrs.delete(:status_id) unless @status_options.detect {|s| s.id.to_s == attrs[:status_id].to_s}
+      @issue.attributes = attrs
     end
-    show
-  end
-
-  def change_status
-    @status_options = @issue.status.find_new_statuses_allowed_to(User.current.role_for_project(@project), @issue.tracker)
-    @new_status = IssueStatus.find(params[:new_status_id])
-    if params[:confirm]
-      begin
-        journal = @issue.init_journal(User.current, params[:notes])
-        @issue.status = @new_status
-        if @issue.update_attributes(params[:issue])
-          attachments = attach_files(@issue, params[:attachments])
-          attachments.each {|a| journal.details << JournalDetail.new(:property => 'attachment', :prop_key => a.id, :value => a.filename)}
-          # Log time
-          if current_role.allowed_to?(:log_time)
-            @time_entry ||= TimeEntry.new(:project => @project, :issue => @issue, :user => User.current, :spent_on => Date.today)
-            @time_entry.attributes = params[:time_entry]
-            @time_entry.save
-          end
-          
+    if request.post?
+      attachments = attach_files(@issue, params[:attachments])
+      attachments.each {|a| journal.details << JournalDetail.new(:property => 'attachment', :prop_key => a.id, :value => a.filename)}
+      if @issue.save
+        # Log spend time
+        if current_role.allowed_to?(:log_time)
+          @time_entry = TimeEntry.new(:project => @project, :issue => @issue, :user => User.current, :spent_on => Date.today)
+          @time_entry.attributes = params[:time_entry]
+          @time_entry.save
+        end
+        if !journal.new_record?
+          # Only send notification if something was actually changed
           flash[:notice] = l(:notice_successful_update)
           Mailer.deliver_issue_edit(journal) if Setting.notified_events.include?('issue_updated')
-          redirect_to :action => 'show', :id => @issue
         end
-      rescue ActiveRecord::StaleObjectError
-        # Optimistic locking exception
-        flash[:error] = l(:notice_locking_conflict)
+        redirect_to(params[:back_to] || {:action => 'show', :id => @issue})
       end
-    end    
-    @assignable_to = @project.members.find(:all, :include => :user).collect{ |m| m.user }
-    @activities = Enumeration::get_values('ACTI')
+    end
+  rescue ActiveRecord::StaleObjectError
+    # Optimistic locking exception
+    flash.now[:error] = l(:notice_locking_conflict)
   end
 
   def destroy
@@ -177,11 +173,11 @@ class IssuesController < ApplicationController
   def context_menu
     @priorities = Enumeration.get_values('IPRI').reverse
     @statuses = IssueStatus.find(:all, :order => 'position')
-    @allowed_statuses = @issue.status.find_new_statuses_allowed_to(User.current.role_for_project(@project), @issue.tracker)
+    @allowed_statuses = @issue.new_statuses_allowed_to(User.current)
     @assignables = @issue.assignable_users
     @assignables << @issue.assigned_to if @issue.assigned_to && !@assignables.include?(@issue.assigned_to)
     @can = {:edit => User.current.allowed_to?(:edit_issues, @project),
-            :change_status => User.current.allowed_to?(:change_issue_status, @project),
+            :assign => (@allowed_statuses.any? || User.current.allowed_to?(:edit_issues, @project)),
             :add => User.current.allowed_to?(:add_issues, @project),
             :move => User.current.allowed_to?(:move_issues, @project),
             :copy => (@project.trackers.include?(@issue.tracker) && User.current.allowed_to?(:add_issues, @project)),
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index a58eef719..2ae742dfa 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -252,11 +252,9 @@ class ProjectsController < ApplicationController
       redirect_to :controller => 'issues', :action => 'index', :project_id => @project
       return
     end
-    if current_role && User.current.allowed_to?(:change_issue_status, @project)
-      # Find potential statuses the user could be allowed to switch issues to
-      @available_statuses = Workflow.find(:all, :include => :new_status,
-                                                :conditions => {:role_id => current_role.id}).collect(&:new_status).compact.uniq
-    end
+    # Find potential statuses the user could be allowed to switch issues to
+    @available_statuses = Workflow.find(:all, :include => :new_status,
+                                              :conditions => {:role_id => current_role.id}).collect(&:new_status).compact.uniq
     render :update do |page|
       page.hide 'query_form'
       page.replace_html  'bulk-edit', :partial => 'issues/bulk_edit_form'
diff --git a/app/models/issue.rb b/app/models/issue.rb
index f7b01ea6a..419c6cdc7 100644
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -180,6 +180,13 @@ class Issue < ActiveRecord::Base
     project.assignable_users
   end
   
+  # Returns an array of status that user is able to apply
+  def new_statuses_allowed_to(user)
+    statuses = status.find_new_statuses_allowed_to(user.role_for_project(project), tracker)
+    statuses << status unless statuses.empty?
+    statuses.uniq.sort
+  end
+  
   # Returns the mail adresses of users that should be notified for the issue
   def recipients
     recipients = project.recipients
diff --git a/app/models/issue_status.rb b/app/models/issue_status.rb
index a5d228405..ddff9c005 100644
--- a/app/models/issue_status.rb
+++ b/app/models/issue_status.rb
@@ -56,6 +56,10 @@ class IssueStatus < ActiveRecord::Base
       false
   end
 
+  def <=>(status)
+    position <=> status.position
+  end
+  
   def to_s; name end
 
 private
diff --git a/app/views/issues/_bulk_edit_form.rhtml b/app/views/issues/_bulk_edit_form.rhtml
index bc3f62e6d..e9e1cef86 100644
--- a/app/views/issues/_bulk_edit_form.rhtml
+++ b/app/views/issues/_bulk_edit_form.rhtml
@@ -2,7 +2,7 @@
 <fieldset class="box"><legend><%= l(:label_bulk_edit_selected_issues) %></legend>
 
 <p>
-<% if @available_statuses %>
+<% if @available_statuses.any? %>
 <label><%= l(:field_status) %>: 
 <%= select_tag('status_id', "<option value=\"\">#{l(:label_no_change_option)}</option>" + options_from_collection_for_select(@available_statuses, :id, :name)) %></label>
 <% end %>
diff --git a/app/views/issues/_update.rhtml b/app/views/issues/_update.rhtml
new file mode 100644
index 000000000..3cf593806
--- /dev/null
+++ b/app/views/issues/_update.rhtml
@@ -0,0 +1,42 @@
+<% labelled_tabular_form_for(:issue, @issue, :url => {:action => 'update', :id => @issue}, :html => {:multipart => true}) do |f| %>
+
+<div class="box">
+<% unless @status_options.empty? %>
+<%= f.hidden_field :lock_version %>
+<fieldset><legend><%= l(:label_change_properties) %></legend>
+    <div class="splitcontentleft">
+    <p><%= f.select :status_id, (@status_options.collect {|p| [p.name, p.id]}), :required => true %></p>
+    <p><%= f.select :assigned_to_id, (@issue.assignable_users.collect {|m| [m.name, m.id]}), :include_blank => true %></p>
+    </div>
+    <div class="splitcontentright">
+    <p><%= f.select :done_ratio, ((0..10).to_a.collect {|r| ["#{r*10} %", r*10] }) %></p>
+    <p><%= f.select :fixed_version_id, (@project.versions.sort.collect {|v| [v.name, v.id]}), { :include_blank => true } %></p>
+    </div>
+</fieldset>
+<% end%>
+<% if authorize_for('timelog', 'edit') %>
+<fieldset><legend><%= l(:button_log_time) %></legend>
+    <% fields_for :time_entry, @time_entry, { :builder => TabularFormBuilder, :lang => current_language} do |time_entry| %>
+    <div class="splitcontentleft">
+    <p><%= time_entry.text_field :hours, :size => 6, :label => :label_spent_time %> <%= l(:field_hours) %></p>
+    </div>
+    <div class="splitcontentright">
+    <p><%= time_entry.text_field :comments, :size => 40 %></p>
+    <p><%= time_entry.select :activity_id, (@activities.collect {|p| [p.name, p.id]}) %></p>
+    </div>
+    <% end %>
+</fieldset>
+<% end %>
+
+<fieldset><legend><%= l(:field_notes) %></legend>
+<%= text_area_tag 'notes', @notes, :cols => 60, :rows => 10, :class => 'wiki-edit' %>
+<%= wikitoolbar_for 'notes' %>
+
+<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>
+</fieldset>
+</div>
+
+<%= submit_tag l(:button_submit) %>
+<% end %>
diff --git a/app/views/issues/change_status.rhtml b/app/views/issues/change_status.rhtml
deleted file mode 100644
index a1e294556..000000000
--- a/app/views/issues/change_status.rhtml
+++ /dev/null
@@ -1,38 +0,0 @@
-<h2><%=l(:label_issue)%> #<%= @issue.id %>: <%=h @issue.subject %></h2>
-
-<%= error_messages_for 'issue' %>
-<% labelled_tabular_form_for(:issue, @issue, :url => {:action => 'change_status', :id => @issue}, :html => {:multipart => true}) do |f| %>
-
-<%= hidden_field_tag 'confirm', 1 %>
-<%= hidden_field_tag 'new_status_id', @new_status.id %>
-<%= 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.assignable_users.collect {|m| [m.name, m.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.sort.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>
-
-<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>
-</div>
-
-<%= submit_tag l(:button_save) %>
-<% end %>
diff --git a/app/views/issues/context_menu.rhtml b/app/views/issues/context_menu.rhtml
index 3af49fb04..0f11bb943 100644
--- a/app/views/issues/context_menu.rhtml
+++ b/app/views/issues/context_menu.rhtml
@@ -6,8 +6,8 @@
 		<a href="#" class="submenu" onclick="return false;"><%= l(:field_status) %></a>
 		<ul>
 		<% @statuses.each do |s| %>
-		    <li><%= context_menu_link s.name, {:controller => 'issues', :action => 'change_status', :id => @issue, :new_status_id => s},
-		                              :selected => (s == @issue.status), :disabled => !(@can[:change_status] && @allowed_statuses.include?(s)) %></li>
+		    <li><%= context_menu_link s.name, {:controller => 'issues', :action => 'update', :id => @issue, :issue => {:status_id => s}},
+		                              :selected => (s == @issue.status), :disabled => !(@allowed_statuses.include?(s)) %></li>
 		<% end %>
 		</ul>
 	</li>
@@ -24,11 +24,11 @@
 		<a href="#" class="submenu"><%= l(:field_assigned_to) %></a>
 		<ul>
 		<% @assignables.each do |u| %>
-		    <li><%= context_menu_link u.name, {:controller => 'issues', :action => 'edit', :id => @issue, 'issue[assigned_to_id]' => u, :back_to => back_to}, :method => :post,
-		                              :selected => (u == @issue.assigned_to), :disabled => !(@can[:edit] || @can[:change_status]) %></li>
+		    <li><%= context_menu_link u.name, {:controller => 'issues', :action => 'update', :id => @issue, :issue => {:assigned_to_id => u}, :back_to => back_to}, :method => :post,
+		                              :selected => (u == @issue.assigned_to), :disabled => !@can[:assign] %></li>
 		<% end %>
-		    <li><%= context_menu_link l(:label_nobody), {:controller => 'issues', :action => 'edit', :id => @issue, 'issue[assigned_to_id]' => '', :back_to => back_to}, :method => :post,
-		                              :selected => @issue.assigned_to.nil?, :disabled => !(@can[:edit] || @can[:change_status]) %></li>
+		    <li><%= context_menu_link l(:label_nobody), {:controller => 'issues', :action => 'update', :id => @issue, :issue => {:assigned_to_id => nil}, :back_to => back_to}, :method => :post,
+		                              :selected => @issue.assigned_to.nil?, :disabled => !@can[:assign] %></li>
 		</ul>
 	</li>
 	<li><%= context_menu_link l(:button_copy), {:controller => 'projects', :action => 'add_issue', :id => @project, :copy_from => @issue},
diff --git a/app/views/issues/show.rhtml b/app/views/issues/show.rhtml
index 91b638216..8cd44424c 100644
--- a/app/views/issues/show.rhtml
+++ b/app/views/issues/show.rhtml
@@ -1,5 +1,5 @@
 <div class="contextual">
-<%= show_and_goto_link(l(:label_add_note), 'add-note', :class => 'icon icon-note') if authorize_for('issues', 'add_note') %>
+<%= show_and_goto_link(l(:button_update), 'update', :class => 'icon icon-note') if authorize_for('issues', 'update') %>
 <%= link_to_if_authorized l(:button_edit), {:controller => 'issues', :action => 'edit', :id => @issue}, :class => 'icon icon-edit', :accesskey => accesskey(:edit) %>
 <%= link_to_if_authorized l(:button_log_time), {:controller => 'timelog', :action => 'edit', :issue_id => @issue}, :class => 'icon icon-time' %>
 <%= watcher_tag(@issue, User.current) %>
@@ -81,16 +81,6 @@ end %>
 
 </div>
 
-<% if authorize_for('issues', 'change_status') and @status_options and !@status_options.empty? %>
-  <% form_tag({:controller => 'issues', :action => 'change_status', :id => @issue}) do %>
-  <p><%=l(:label_change_status)%> :
-  <select name="new_status_id">
-  <%= options_from_collection_for_select @status_options, "id", "name", @issue.status_id %>
-  </select>
-  <%= submit_tag l(:button_change) %></p>
-  <% end %>
-<% end %>
-
 <% if @journals.any? %>
 <div id="history">
 <h3><%=l(:label_history)%></h3>
@@ -98,18 +88,12 @@ end %>
 </div>
 <% end %>
 
-<% if authorize_for('issues', 'add_note') %>
-  <a name="add-note-anchor"></a>
-  <div id="add-note" class="box" style="display:none;">
-  <h3><%= l(:label_add_note) %></h3>
-  <% form_tag({:controller => 'issues', :action => 'add_note', :id => @issue}, :class => "tabular", :multipart => true) do %>
-  <p><label for="notes"><%=l(:field_notes)%></label>
-    <%= text_area_tag 'notes', '', :cols => 60, :rows => 10, :class => 'wiki-edit'  %></p>
-    <%= wikitoolbar_for 'notes' %>
-    <%= render :partial => 'attachments/form' %>
-  <%= submit_tag l(:button_add) %>
-  <%= toggle_link l(:button_cancel), 'add-note' %>
-  <% end %>  
+<% if authorize_for('issues', 'update') %>
+  <a name="update-anchor"></a>
+  <div id="update" style="display:none;">
+  <h3><%= l(:button_update) %></h3>
+  <%= render :partial => 'update' %>
+  <%= toggle_link l(:button_cancel), 'update' %>
   </div>
 <% end %>
 
diff --git a/app/views/issues/update.rhtml b/app/views/issues/update.rhtml
new file mode 100644
index 000000000..44e72da87
--- /dev/null
+++ b/app/views/issues/update.rhtml
@@ -0,0 +1,4 @@
+<h2><%= @issue.tracker.name %> #<%= @issue.id %>: <%=h @issue.subject %></h2>
+
+<%= error_messages_for 'issue' %>
+<%= render :partial => 'update' %>
diff --git a/lang/bg.yml b/lang/bg.yml
index eeb6ef80b..57e7fd22d 100644
--- a/lang/bg.yml
+++ b/lang/bg.yml
@@ -557,3 +557,5 @@ notice_default_data_loaded: Default configuration successfully loaded.
 text_load_default_configuration: Load the default configuration
 text_no_configuration_data: "Roles, trackers, issue statuses and workflow have not been configured yet.\nIt is highly recommended to load the default configuration. You will be able to modify it once loaded."
 error_can_t_load_default_data: "Default configuration could not be loaded: %s"
+button_update: Update
+label_change_properties: Change properties
diff --git a/lang/cs.yml b/lang/cs.yml
index e99fe061b..5cbf1133d 100644
--- a/lang/cs.yml
+++ b/lang/cs.yml
@@ -557,3 +557,5 @@ notice_default_data_loaded: Default configuration successfully loaded.
 text_load_default_configuration: Load the default configuration
 text_no_configuration_data: "Roles, trackers, issue statuses and workflow have not been configured yet.\nIt is highly recommended to load the default configuration. You will be able to modify it once loaded."
 error_can_t_load_default_data: "Default configuration could not be loaded: %s"
+button_update: Update
+label_change_properties: Change properties
diff --git a/lang/de.yml b/lang/de.yml
index cd4e222ae..ba3dcda5b 100644
--- a/lang/de.yml
+++ b/lang/de.yml
@@ -557,3 +557,5 @@ notice_default_data_loaded: Default configuration successfully loaded.
 text_load_default_configuration: Load the default configuration
 text_no_configuration_data: "Roles, trackers, issue statuses and workflow have not been configured yet.\nIt is highly recommended to load the default configuration. You will be able to modify it once loaded."
 error_can_t_load_default_data: "Default configuration could not be loaded: %s"
+button_update: Update
+label_change_properties: Change properties
diff --git a/lang/en.yml b/lang/en.yml
index 7a1a2622f..eae61d7bf 100644
--- a/lang/en.yml
+++ b/lang/en.yml
@@ -462,6 +462,7 @@ label_registration_manual_activation: manual account activation
 label_registration_automatic_activation: automatic account activation
 label_display_per_page: 'Per page: %s'
 label_age: Age
+label_change_properties: Change properties
 
 button_login: Login
 button_submit: Submit
@@ -498,6 +499,7 @@ button_rename: Rename
 button_change_password: Change password
 button_copy: Copy
 button_annotate: Annotate
+button_update: Update
 
 status_active: active
 status_registered: registered
diff --git a/lang/es.yml b/lang/es.yml
index bae295586..1a3af0f5c 100644
--- a/lang/es.yml
+++ b/lang/es.yml
@@ -560,3 +560,5 @@ notice_default_data_loaded: Default configuration successfully loaded.
 text_load_default_configuration: Load the default configuration
 text_no_configuration_data: "Roles, trackers, issue statuses and workflow have not been configured yet.\nIt is highly recommended to load the default configuration. You will be able to modify it once loaded."
 error_can_t_load_default_data: "Default configuration could not be loaded: %s"
+button_update: Update
+label_change_properties: Change properties
diff --git a/lang/fr.yml b/lang/fr.yml
index d47feceb2..ff2bf792f 100644
--- a/lang/fr.yml
+++ b/lang/fr.yml
@@ -462,6 +462,7 @@ label_registration_manual_activation: activation manuelle du compte
 label_registration_automatic_activation: activation automatique du compte
 label_display_per_page: 'Par page: %s'
 label_age: Age
+label_change_properties: Changer les propriétés
 
 button_login: Connexion
 button_submit: Soumettre
@@ -498,6 +499,7 @@ button_rename: Renommer
 button_change_password: Changer de mot de passe
 button_copy: Copier
 button_annotate: Annoter
+button_update: Mettre à jour
 
 status_active: actif
 status_registered: enregistré
diff --git a/lang/he.yml b/lang/he.yml
index e2277dc3d..d110ee8bf 100644
--- a/lang/he.yml
+++ b/lang/he.yml
@@ -557,3 +557,5 @@ notice_default_data_loaded: Default configuration successfully loaded.
 text_load_default_configuration: Load the default configuration
 text_no_configuration_data: "Roles, trackers, issue statuses and workflow have not been configured yet.\nIt is highly recommended to load the default configuration. You will be able to modify it once loaded."
 error_can_t_load_default_data: "Default configuration could not be loaded: %s"
+button_update: Update
+label_change_properties: Change properties
diff --git a/lang/it.yml b/lang/it.yml
index 709f41774..bb9440ffd 100644
--- a/lang/it.yml
+++ b/lang/it.yml
@@ -557,3 +557,5 @@ notice_default_data_loaded: Default configuration successfully loaded.
 text_load_default_configuration: Load the default configuration
 text_no_configuration_data: "Roles, trackers, issue statuses and workflow have not been configured yet.\nIt is highly recommended to load the default configuration. You will be able to modify it once loaded."
 error_can_t_load_default_data: "Default configuration could not be loaded: %s"
+button_update: Update
+label_change_properties: Change properties
diff --git a/lang/ja.yml b/lang/ja.yml
index 286fb5971..e4c13b34c 100644
--- a/lang/ja.yml
+++ b/lang/ja.yml
@@ -558,3 +558,5 @@ notice_default_data_loaded: Default configuration successfully loaded.
 text_load_default_configuration: Load the default configuration
 text_no_configuration_data: "Roles, trackers, issue statuses and workflow have not been configured yet.\nIt is highly recommended to load the default configuration. You will be able to modify it once loaded."
 error_can_t_load_default_data: "Default configuration could not be loaded: %s"
+button_update: Update
+label_change_properties: Change properties
diff --git a/lang/ko.yml b/lang/ko.yml
index 52c9b5431..790598b8d 100644
--- a/lang/ko.yml
+++ b/lang/ko.yml
@@ -557,3 +557,5 @@ notice_default_data_loaded: Default configuration successfully loaded.
 text_load_default_configuration: Load the default configuration
 text_no_configuration_data: "Roles, trackers, issue statuses and workflow have not been configured yet.\nIt is highly recommended to load the default configuration. You will be able to modify it once loaded."
 error_can_t_load_default_data: "Default configuration could not be loaded: %s"
+button_update: Update
+label_change_properties: Change properties
diff --git a/lang/nl.yml b/lang/nl.yml
index 43e1704a4..2e18a6b7c 100644
--- a/lang/nl.yml
+++ b/lang/nl.yml
@@ -558,3 +558,5 @@ notice_default_data_loaded: Default configuration successfully loaded.
 text_load_default_configuration: Load the default configuration
 text_no_configuration_data: "Roles, trackers, issue statuses and workflow have not been configured yet.\nIt is highly recommended to load the default configuration. You will be able to modify it once loaded."
 error_can_t_load_default_data: "Default configuration could not be loaded: %s"
+button_update: Update
+label_change_properties: Change properties
diff --git a/lang/pl.yml b/lang/pl.yml
index 77ae6bb66..0ee0e3792 100644
--- a/lang/pl.yml
+++ b/lang/pl.yml
@@ -557,3 +557,5 @@ notice_default_data_loaded: Default configuration successfully loaded.
 text_load_default_configuration: Load the default configuration
 text_no_configuration_data: "Roles, trackers, issue statuses and workflow have not been configured yet.\nIt is highly recommended to load the default configuration. You will be able to modify it once loaded."
 error_can_t_load_default_data: "Default configuration could not be loaded: %s"
+button_update: Update
+label_change_properties: Change properties
diff --git a/lang/pt-br.yml b/lang/pt-br.yml
index 55e8b3fae..21d21b793 100644
--- a/lang/pt-br.yml
+++ b/lang/pt-br.yml
@@ -557,3 +557,5 @@ notice_default_data_loaded: Default configuration successfully loaded.
 text_load_default_configuration: Load the default configuration
 text_no_configuration_data: "Roles, trackers, issue statuses and workflow have not been configured yet.\nIt is highly recommended to load the default configuration. You will be able to modify it once loaded."
 error_can_t_load_default_data: "Default configuration could not be loaded: %s"
+button_update: Update
+label_change_properties: Change properties
diff --git a/lang/pt.yml b/lang/pt.yml
index 0a5661997..c7f05f8c8 100644
--- a/lang/pt.yml
+++ b/lang/pt.yml
@@ -557,3 +557,5 @@ notice_default_data_loaded: Default configuration successfully loaded.
 text_load_default_configuration: Load the default configuration
 text_no_configuration_data: "Roles, trackers, issue statuses and workflow have not been configured yet.\nIt is highly recommended to load the default configuration. You will be able to modify it once loaded."
 error_can_t_load_default_data: "Default configuration could not be loaded: %s"
+button_update: Update
+label_change_properties: Change properties
diff --git a/lang/ro.yml b/lang/ro.yml
index 1381adba9..6ebc3b0e5 100644
--- a/lang/ro.yml
+++ b/lang/ro.yml
@@ -557,3 +557,5 @@ notice_default_data_loaded: Default configuration successfully loaded.
 text_load_default_configuration: Load the default configuration
 text_no_configuration_data: "Roles, trackers, issue statuses and workflow have not been configured yet.\nIt is highly recommended to load the default configuration. You will be able to modify it once loaded."
 error_can_t_load_default_data: "Default configuration could not be loaded: %s"
+button_update: Update
+label_change_properties: Change properties
diff --git a/lang/ru.yml b/lang/ru.yml
index b293dc309..569e96884 100644
--- a/lang/ru.yml
+++ b/lang/ru.yml
@@ -557,3 +557,5 @@ notice_default_data_loaded: Default configuration successfully loaded.
 text_load_default_configuration: Load the default configuration
 text_no_configuration_data: "Roles, trackers, issue statuses and workflow have not been configured yet.\nIt is highly recommended to load the default configuration. You will be able to modify it once loaded."
 error_can_t_load_default_data: "Default configuration could not be loaded: %s"
+button_update: Update
+label_change_properties: Change properties
diff --git a/lang/sr.yml b/lang/sr.yml
index c842ec438..1d4f52539 100644
--- a/lang/sr.yml
+++ b/lang/sr.yml
@@ -558,3 +558,5 @@ notice_default_data_loaded: Default configuration successfully loaded.
 text_load_default_configuration: Load the default configuration
 text_no_configuration_data: "Roles, trackers, issue statuses and workflow have not been configured yet.\nIt is highly recommended to load the default configuration. You will be able to modify it once loaded."
 error_can_t_load_default_data: "Default configuration could not be loaded: %s"
+button_update: Update
+label_change_properties: Change properties
diff --git a/lang/sv.yml b/lang/sv.yml
index 85fb19bcb..75f297c20 100644
--- a/lang/sv.yml
+++ b/lang/sv.yml
@@ -558,3 +558,5 @@ notice_default_data_loaded: Default configuration successfully loaded.
 text_load_default_configuration: Load the default configuration
 text_no_configuration_data: "Roles, trackers, issue statuses and workflow have not been configured yet.\nIt is highly recommended to load the default configuration. You will be able to modify it once loaded."
 error_can_t_load_default_data: "Default configuration could not be loaded: %s"
+button_update: Update
+label_change_properties: Change properties
diff --git a/lang/zh-tw.yml b/lang/zh-tw.yml
index 719a2e868..5bf47d943 100644
--- a/lang/zh-tw.yml
+++ b/lang/zh-tw.yml
@@ -557,3 +557,5 @@ notice_default_data_loaded: Default configuration successfully loaded.
 text_load_default_configuration: Load the default configuration
 text_no_configuration_data: "Roles, trackers, issue statuses and workflow have not been configured yet.\nIt is highly recommended to load the default configuration. You will be able to modify it once loaded."
 error_can_t_load_default_data: "Default configuration could not be loaded: %s"
+button_update: Update
+label_change_properties: Change properties
diff --git a/lang/zh.yml b/lang/zh.yml
index 05134751f..16f4c7195 100644
--- a/lang/zh.yml
+++ b/lang/zh.yml
@@ -560,3 +560,5 @@ notice_default_data_loaded: Default configuration successfully loaded.
 text_load_default_configuration: Load the default configuration
 text_no_configuration_data: "Roles, trackers, issue statuses and workflow have not been configured yet.\nIt is highly recommended to load the default configuration. You will be able to modify it once loaded."
 error_can_t_load_default_data: "Default configuration could not be loaded: %s"
+button_update: Update
+label_change_properties: Change properties
diff --git a/lib/redmine.rb b/lib/redmine.rb
index 9b29257bd..2dca9ed50 100644
--- a/lib/redmine.rb
+++ b/lib/redmine.rb
@@ -32,10 +32,9 @@ Redmine::AccessControl.map do |map|
                                   :reports => :issue_report}, :public => true                    
     map.permission :add_issues, {:projects => :add_issue}
     map.permission :edit_issues, {:projects => :bulk_edit_issues,
-                                  :issues => [:edit, :destroy_attachment]}
+                                  :issues => [:edit, :update, :destroy_attachment]}
     map.permission :manage_issue_relations, {:issue_relations => [:new, :destroy]}
-    map.permission :add_issue_notes, {:issues => :add_note}
-    map.permission :change_issue_status, {:issues => :change_status}, :require => :loggedin
+    map.permission :add_issue_notes, {:issues => :update}
     map.permission :move_issues, {:projects => :move_issues}, :require => :loggedin
     map.permission :delete_issues, {:issues => :destroy}, :require => :member
     # Queries
diff --git a/lib/redmine/default_data/loader.rb b/lib/redmine/default_data/loader.rb
index 0abb5572a..11bd2a0b4 100644
--- a/lib/redmine/default_data/loader.rb
+++ b/lib/redmine/default_data/loader.rb
@@ -53,7 +53,6 @@ module Redmine
                                                       :edit_issues,
                                                       :manage_issue_relations,
                                                       :add_issue_notes,
-                                                      :change_issue_status,
                                                       :save_queries,
                                                       :view_gantt,
                                                       :view_calendar,
@@ -74,7 +73,6 @@ module Redmine
                                     :position => 3,
                                     :permissions => [:add_issues,
                                                     :add_issue_notes,
-                                                    :change_issue_status,
                                                     :save_queries,
                                                     :view_gantt,
                                                     :view_calendar,
@@ -90,7 +88,6 @@ module Redmine
                         
             Role.non_member.update_attribute :permissions, [:add_issues,
                                                             :add_issue_notes,
-                                                            :change_issue_status,
                                                             :save_queries,
                                                             :view_gantt,
                                                             :view_calendar,
diff --git a/test/fixtures/enumerations.yml b/test/fixtures/enumerations.yml
index eeef99b5b..c90a997ee 100644
--- a/test/fixtures/enumerations.yml
+++ b/test/fixtures/enumerations.yml
@@ -31,3 +31,12 @@ enumerations_008:
   name: Immediate
   id: 8
   opt: IPRI
+enumerations_009: 
+  name: Design
+  id: 9
+  opt: ACTI
+enumerations_010: 
+  name: Development
+  id: 10
+  opt: ACTI
+  
\ No newline at end of file
diff --git a/test/fixtures/roles.yml b/test/fixtures/roles.yml
index a089a98f9..c4d417a09 100644
--- a/test/fixtures/roles.yml
+++ b/test/fixtures/roles.yml
@@ -9,7 +9,6 @@ roles_004:
     - :edit_issues
     - :manage_issue_relations
     - :add_issue_notes
-    - :change_issue_status
     - :move_issues
     - :save_queries
     - :view_gantt
@@ -34,6 +33,7 @@ roles_005:
   builtin: 2
   permissions: |
     --- 
+    - :add_issue_notes
     - :view_gantt
     - :view_calendar
     - :view_time_entries
@@ -58,7 +58,6 @@ roles_001:
     - :edit_issues
     - :manage_issue_relations
     - :add_issue_notes
-    - :change_issue_status
     - :move_issues
     - :delete_issues
     - :manage_public_queries
@@ -99,7 +98,6 @@ roles_002:
     - :edit_issues
     - :manage_issue_relations
     - :add_issue_notes
-    - :change_issue_status
     - :move_issues
     - :delete_issues
     - :manage_public_queries
@@ -137,7 +135,6 @@ roles_003:
     - :edit_issues
     - :manage_issue_relations
     - :add_issue_notes
-    - :change_issue_status
     - :move_issues
     - :delete_issues
     - :manage_public_queries
diff --git a/test/fixtures/users.yml b/test/fixtures/users.yml
index df7123879..de3553173 100644
--- a/test/fixtures/users.yml
+++ b/test/fixtures/users.yml
@@ -14,6 +14,7 @@ users_004:
   auth_source_id: 
   mail_notification: true
   login: rhill
+  type: User
 users_001: 
   created_on: 2006-07-19 19:12:21 +02:00
   status: 1
@@ -29,6 +30,7 @@ users_001:
   auth_source_id: 
   mail_notification: true
   login: admin
+  type: User
 users_002: 
   created_on: 2006-07-19 19:32:09 +02:00
   status: 1
@@ -44,6 +46,7 @@ users_002:
   auth_source_id: 
   mail_notification: true
   login: jsmith
+  type: User
 users_003: 
   created_on: 2006-07-19 19:33:19 +02:00
   status: 1
@@ -59,6 +62,7 @@ users_003:
   auth_source_id: 
   mail_notification: true
   login: dlopper
+  type: User
 users_005: 
   id: 5
   created_on: 2006-07-19 19:33:19 +02:00
@@ -75,3 +79,22 @@ users_005:
   auth_source_id: 
   mail_notification: true
   login: dlopper2
+  type: User
+users_006: 
+  id: 6
+  created_on: 2006-07-19 19:33:19 +02:00
+  status: 1
+  last_login_on: 
+  language: ''
+  hashed_password: 1
+  updated_on: 2006-07-19 19:33:19 +02:00
+  admin: false
+  mail: ''
+  lastname: Anonymous
+  firstname: ''
+  auth_source_id: 
+  mail_notification: false
+  login: ''
+  type: AnonymousUser
+
+  
\ No newline at end of file
diff --git a/test/functional/issues_controller_test.rb b/test/functional/issues_controller_test.rb
index 06d2f1029..d60e32200 100644
--- a/test/functional/issues_controller_test.rb
+++ b/test/functional/issues_controller_test.rb
@@ -32,7 +32,8 @@ class IssuesControllerTest < Test::Unit::TestCase
            :issue_categories,
            :enabled_modules,
            :enumerations,
-           :attachments
+           :attachments,
+           :workflows
   
   def setup
     @controller = IssuesController.new
@@ -94,13 +95,37 @@ class IssuesControllerTest < Test::Unit::TestCase
     assert_equal 'application/atom+xml', @response.content_type
   end
   
-  def test_show
+  def test_show_by_anonymous
     get :show, :id => 1
     assert_response :success
     assert_template 'show.rhtml'
     assert_not_nil assigns(:issue)
+    assert_equal Issue.find(1), assigns(:issue)
+    
+    # anonymous role is allowed to add a note
+    assert_tag :tag => 'form',
+               :descendant => { :tag => 'fieldset',
+                                :child => { :tag => 'legend', 
+                                            :content => /Notes/ } }
   end
   
+  def test_show_by_manager
+    @request.session[:user_id] = 2
+    get :show, :id => 1
+    assert_response :success
+    
+    assert_tag :tag => 'form',
+               :descendant => { :tag => 'fieldset',
+                                :child => { :tag => 'legend', 
+                                            :content => /Change properties/ } },
+               :descendant => { :tag => 'fieldset',
+                                :child => { :tag => 'legend', 
+                                            :content => /Log time/ } },
+               :descendant => { :tag => 'fieldset',
+                                :child => { :tag => 'legend', 
+                                            :content => /Notes/ } }
+  end
+
   def test_get_edit
     @request.session[:user_id] = 2
     get :edit, :id => 1
@@ -129,21 +154,100 @@ class IssuesControllerTest < Test::Unit::TestCase
     assert mail.body.include?("Subject changed from #{old_subject} to #{new_subject}")
   end
   
-  def test_post_change_status
+  def test_get_update
+    @request.session[:user_id] = 2
+    get :update, :id => 1
+    assert_response :success
+    assert_template 'update'
+  end
+  
+  def test_update_with_status_and_assignee_change
     issue = Issue.find(1)
     assert_equal 1, issue.status_id
     @request.session[:user_id] = 2
-    post :change_status, :id => 1,
-                         :new_status_id => 2,
-                         :issue => { :assigned_to_id => 3 },
-                         :notes => 'Assigned to dlopper',
-                         :confirm => 1
+    post :update,
+         :id => 1,
+         :issue => { :status_id => 2, :assigned_to_id => 3 },
+         :notes => 'Assigned to dlopper'
     assert_redirected_to 'issues/show/1'
     issue.reload
     assert_equal 2, issue.status_id
-    j = issue.journals.find(:first, :order => 'created_on DESC')
+    j = issue.journals.find(:first, :order => 'id DESC')
     assert_equal 'Assigned to dlopper', j.notes
     assert_equal 2, j.details.size
+    
+    mail = ActionMailer::Base.deliveries.last
+    assert mail.body.include?("Status changed from New to Assigned")
+  end
+  
+  def test_update_with_note_only
+    notes = 'Note added by IssuesControllerTest#test_update_with_note_only'
+    # anonymous user
+    post :update,
+         :id => 1,
+         :notes => notes
+    assert_redirected_to 'issues/show/1'
+    j = Issue.find(1).journals.find(:first, :order => 'id DESC')
+    assert_equal notes, j.notes
+    assert_equal 0, j.details.size
+    assert_equal User.anonymous, j.user
+    
+    mail = ActionMailer::Base.deliveries.last
+    assert mail.body.include?(notes)
+  end
+  
+  def test_update_with_note_and_spent_time
+    @request.session[:user_id] = 2
+    spent_hours_before = Issue.find(1).spent_hours
+    post :update,
+         :id => 1,
+         :notes => '2.5 hours added',
+         :time_entry => { :hours => '2.5', :comments => '', :activity_id => Enumeration.get_values('ACTI').first }
+    assert_redirected_to 'issues/show/1'
+    
+    issue = Issue.find(1)
+    
+    j = issue.journals.find(:first, :order => 'id DESC')
+    assert_equal '2.5 hours added', j.notes
+    assert_equal 0, j.details.size
+    
+    t = issue.time_entries.find(:first, :order => 'id DESC')
+    assert_not_nil t
+    assert_equal 2.5, t.hours
+    assert_equal spent_hours_before + 2.5, issue.spent_hours
+  end
+  
+  def test_update_with_attachment_only
+    # anonymous user
+    post :update,
+         :id => 1,
+         :notes => '',
+         :attachments => [ test_uploaded_file('testfile.txt', 'text/plain') ]
+    assert_redirected_to 'issues/show/1'
+    j = Issue.find(1).journals.find(:first, :order => 'id DESC')
+    assert j.notes.blank?
+    assert_equal 1, j.details.size
+    assert_equal 'testfile.txt', j.details.first.value
+    assert_equal User.anonymous, j.user
+    
+    mail = ActionMailer::Base.deliveries.last
+    assert mail.body.include?('testfile.txt')
+  end
+  
+  def test_update_with_no_change
+    issue = Issue.find(1)
+    issue.journals.clear
+    ActionMailer::Base.deliveries.clear
+    
+    post :update,
+         :id => 1,
+         :notes => ''
+    assert_redirected_to 'issues/show/1'
+    
+    issue.reload
+    assert issue.journals.empty?
+    # No email should be sent
+    assert ActionMailer::Base.deliveries.empty?
   end
   
   def test_context_menu
diff --git a/test/integration/issues_test.rb b/test/integration/issues_test.rb
index 702fbc026..a9d3f9c74 100644
--- a/test/integration/issues_test.rb
+++ b/test/integration/issues_test.rb
@@ -38,7 +38,9 @@ class IssuesTest < ActionController::IntegrationTest
   def test_issue_attachements
     log_user('jsmith', 'jsmith')
 
-    post "issues/add_note/1", { :notes => 'Some notes', 'attachments[]' => ActionController::TestUploadedFile.new(Test::Unit::TestCase.fixture_path + '/files/testfile.txt', 'text/plain') }
+    post 'issues/update/1',
+         :notes => 'Some notes',
+         :attachments => ([] << ActionController::TestUploadedFile.new(Test::Unit::TestCase.fixture_path + '/files/testfile.txt', 'text/plain'))
     assert_redirected_to "issues/show/1"
     
     # make sure attachment was saved
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 542d4ce72..7c81c3607 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -53,6 +53,10 @@ class Test::Unit::TestCase
     assert_redirected_to "my/page"
     assert_equal login, User.find(session[:user_id]).login
   end
+  
+  def test_uploaded_file(name, mime)
+    ActionController::TestUploadedFile.new(Test::Unit::TestCase.fixture_path + "/files/#{name}", mime)
+  end
 end
 
 
@@ -70,4 +74,4 @@ class String
   def read
     self.to_s
   end
-end
\ No newline at end of file
+end
diff --git a/vendor/plugins/gloc-1.1.0/lib/gloc-rails.rb b/vendor/plugins/gloc-1.1.0/lib/gloc-rails.rb
index 8f201bcb8..aa65991b0 100644
--- a/vendor/plugins/gloc-1.1.0/lib/gloc-rails.rb
+++ b/vendor/plugins/gloc-1.1.0/lib/gloc-rails.rb
@@ -155,6 +155,27 @@ module ActiveRecord #:nodoc:
 #    end
 #  end
   
+  class Errors
+    include GLoc
+    
+    def full_messages
+      full_messages = []
+
+      @errors.each_key do |attr|
+        @errors[attr].each do |msg|
+          next if msg.nil?
+
+          if attr == "base"
+            full_messages << (msg.is_a?(Symbol) ? l(msg) : msg)
+          else
+            full_messages << @base.class.human_attribute_name(attr) + " " + (msg.is_a?(Symbol) ? l(msg) : msg)
+          end
+        end
+      end
+      full_messages
+    end
+  end
+  
   module Validations #:nodoc:
     module ClassMethods
       # The default Rails version of this function creates an error message and then

From 3d920c13b49e40e3ce3e18e60314a9a43f558cd9 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 6 Jan 2008 17:28:20 +0000
Subject: [PATCH 114/710] wrapper div added to the layout.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1044 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/layouts/base.rhtml       | 2 ++
 public/stylesheets/application.css | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/app/views/layouts/base.rhtml b/app/views/layouts/base.rhtml
index 5f85c78f8..bdaddcb3b 100644
--- a/app/views/layouts/base.rhtml
+++ b/app/views/layouts/base.rhtml
@@ -18,6 +18,7 @@
 <!-- page specific tags --><%= yield :header_tags %>
 </head>
 <body>
+<div id="wrapper">
 <div id="top-menu">
     <div id="account">
         <% if User.current.logged? %>
@@ -75,5 +76,6 @@
 <div id="footer">
     Powered by <%= link_to Redmine::Info.app_name, Redmine::Info.url %> <%= Redmine::VERSION %> &copy; 2006-2007 Jean-Philippe Lang
 </div>
+</div>
 </body>
 </html>
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index eaef2ae87..2fca6d63c 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -7,6 +7,8 @@ h3, .wiki h2 {font-size: 16px;padding: 2px 10px 1px 0px;margin: 0 0 10px 0; bord
 h4, .wiki h3 {font-size: 12px;padding: 2px 10px 1px 0px;margin-bottom: 5px; border-bottom: 1px dotted #bbbbbb; color: #444;}
 
 /***** Layout *****/
+#wrapper {background: white;}
+
 #top-menu {background: #2C4056;color: #fff;height:1.5em; padding: 2px 6px 0px 6px;}
 #top-menu a {color: #fff; padding-right: 4px;}
 #account {float:right;}

From 78d9ae9754578cda4b72d7b28a4f707534c15c49 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 6 Jan 2008 17:33:41 +0000
Subject: [PATCH 115/710] Fixed: crash when fetching Mercurial changesets if
 changeset[:files] is nil (same fix as r921).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1045 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 lib/redmine/scm/adapters/mercurial_adapter.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/redmine/scm/adapters/mercurial_adapter.rb b/lib/redmine/scm/adapters/mercurial_adapter.rb
index 1b9cab47c..3c905fc0f 100644
--- a/lib/redmine/scm/adapters/mercurial_adapter.rb
+++ b/lib/redmine/scm/adapters/mercurial_adapter.rb
@@ -112,7 +112,7 @@ module Redmine
                                        :author => changeset[:user],
                                        :time => Time.parse(changeset[:date]),
                                        :message => changeset[:description],
-                                       :paths => changeset[:files].split.collect{|path| {:action => 'X', :path => "/#{path}"}}
+                                       :paths => changeset[:files].to_s.split.collect{|path| {:action => 'X', :path => "/#{path}"}}
             })
           end
           return nil if $? && $?.exitstatus != 0

From a80dbc49b1670877aca09b11101d4a5b40ea58c2 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 6 Jan 2008 20:24:26 +0000
Subject: [PATCH 116/710] Admin settings screen split to tabs. Email
 notification options moved to this view as a tab and LDAP list is accessible
 from the 'Authentication' tab.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1046 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/admin_controller.rb           |  13 +-
 app/controllers/settings_controller.rb        |  13 +-
 app/helpers/settings_helper.rb                |   8 ++
 app/views/admin/index.rhtml                   |   8 --
 app/views/settings/_authentication.rhtml      |  27 +++++
 app/views/settings/_general.rhtml             |  46 ++++++++
 app/views/settings/_issues.rhtml              |  20 ++++
 .../_notifications.rhtml}                     |  19 ++-
 app/views/settings/_repositories.rhtml        |  26 ++++
 app/views/settings/edit.rhtml                 | 111 ++----------------
 lang/bg.yml                                   |   2 +
 lang/cs.yml                                   |   2 +
 lang/de.yml                                   |   2 +
 lang/en.yml                                   |   2 +
 lang/es.yml                                   |   2 +
 lang/fr.yml                                   |   2 +
 lang/he.yml                                   |   2 +
 lang/it.yml                                   |   2 +
 lang/ja.yml                                   |   2 +
 lang/ko.yml                                   |   2 +
 lang/nl.yml                                   |   2 +
 lang/pl.yml                                   |   2 +
 lang/pt-br.yml                                |   2 +
 lang/pt.yml                                   |   2 +
 lang/ro.yml                                   |   2 +
 lang/ru.yml                                   |   2 +
 lang/sr.yml                                   |   2 +
 lang/sv.yml                                   |   2 +
 lang/zh-tw.yml                                |   2 +
 lang/zh.yml                                   |   2 +
 test/functional/admin_controller_test.rb      |  14 +--
 test/functional/settings_controller_test.rb   |  53 +++++++++
 32 files changed, 252 insertions(+), 146 deletions(-)
 create mode 100644 app/views/settings/_authentication.rhtml
 create mode 100644 app/views/settings/_general.rhtml
 create mode 100644 app/views/settings/_issues.rhtml
 rename app/views/{admin/mail_options.rhtml => settings/_notifications.rhtml} (72%)
 create mode 100644 app/views/settings/_repositories.rhtml
 create mode 100644 test/functional/settings_controller_test.rb

diff --git a/app/controllers/admin_controller.rb b/app/controllers/admin_controller.rb
index 9e6a22822..e002f3a27 100644
--- a/app/controllers/admin_controller.rb
+++ b/app/controllers/admin_controller.rb
@@ -45,17 +45,6 @@ class AdminController < ApplicationController
 
     render :action => "projects", :layout => false if request.xhr?
   end
-
-  def mail_options
-    @notifiables = %w(issue_added issue_updated news_added document_added file_added message_posted)
-    if request.post?
-      settings = (params[:settings] || {}).dup.symbolize_keys
-      settings[:notified_events] ||= []
-      settings.each { |name, value| Setting[name] = value }
-      flash[:notice] = l(:notice_successful_update)
-      redirect_to :controller => 'admin', :action => 'mail_options'
-    end
-  end
   
   # Loads the default configuration
   # (roles, trackers, statuses, workflow, enumerations)
@@ -82,7 +71,7 @@ class AdminController < ApplicationController
       flash[:error] = l(:notice_email_error, e.message)
     end
     ActionMailer::Base.raise_delivery_errors = raise_delivery_errors
-    redirect_to :action => 'mail_options'
+    redirect_to :controller => 'settings', :action => 'edit', :tab => 'notifications'
   end
   
   def info
diff --git a/app/controllers/settings_controller.rb b/app/controllers/settings_controller.rb
index 09af63176..c5fae2a16 100644
--- a/app/controllers/settings_controller.rb
+++ b/app/controllers/settings_controller.rb
@@ -25,9 +25,16 @@ class SettingsController < ApplicationController
   end
 
   def edit
-    if request.post? and params[:settings] and params[:settings].is_a? Hash
-      params[:settings].each { |name, value| Setting[name] = value }
-      redirect_to :action => 'edit' and return
+    @notifiables = %w(issue_added issue_updated news_added document_added file_added message_posted)
+    if request.post? && params[:settings] && params[:settings].is_a?(Hash)
+      settings = (params[:settings] || {}).dup.symbolize_keys
+      settings.each do |name, value|
+        # remove blank values in array settings
+        value.delete_if {|v| v.blank? } if value.is_a?(Array)
+        Setting[name] = value
+      end
+      flash[:notice] = l(:notice_successful_update)
+      redirect_to :action => 'edit', :tab => params[:tab]
     end
   end
   
diff --git a/app/helpers/settings_helper.rb b/app/helpers/settings_helper.rb
index f53314c40..f4ec5a7a7 100644
--- a/app/helpers/settings_helper.rb
+++ b/app/helpers/settings_helper.rb
@@ -16,4 +16,12 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 module SettingsHelper
+  def administration_settings_tabs
+    tabs = [{:name => 'general', :partial => 'settings/general', :label => :label_general},
+            {:name => 'authentication', :partial => 'settings/authentication', :label => :label_authentication},
+            {:name => 'issues', :partial => 'settings/issues', :label => :label_issue_tracking},
+            {:name => 'notifications', :partial => 'settings/notifications', :label => l(:field_mail_notification)},
+            {:name => 'repositories', :partial => 'settings/repositories', :label => :label_repository_plural}
+            ]
+  end
 end
diff --git a/app/views/admin/index.rhtml b/app/views/admin/index.rhtml
index 2291c5415..18bee34cb 100644
--- a/app/views/admin/index.rhtml
+++ b/app/views/admin/index.rhtml
@@ -30,14 +30,6 @@
 <%= link_to l(:label_enumerations), :controller => 'enumerations' %>
 </p>
 
-<p class="icon22 icon22-notifications">
-<%= link_to l(:field_mail_notification), :controller => 'admin', :action => 'mail_options' %>
-</p>
-
-<p class="icon22 icon22-authent">
-<%= link_to l(:label_authentication), :controller => 'auth_sources' %>
-</p>
-
 <p class="icon22 icon22-settings">
 <%= link_to l(:label_settings), :controller => 'settings' %>
 </p>
diff --git a/app/views/settings/_authentication.rhtml b/app/views/settings/_authentication.rhtml
new file mode 100644
index 000000000..a8fa63f0d
--- /dev/null
+++ b/app/views/settings/_authentication.rhtml
@@ -0,0 +1,27 @@
+<% form_tag({:action => 'edit', :tab => 'authentication'}) do %>
+
+<div class="box tabular settings">
+<p><label><%= l(:setting_login_required) %></label>
+<%= check_box_tag 'settings[login_required]', 1, Setting.login_required? %><%= hidden_field_tag 'settings[login_required]', 0 %></p>
+
+<p><label><%= l(:setting_autologin) %></label>
+<%= select_tag 'settings[autologin]', options_for_select( [[l(:label_disabled), "0"]] + [1, 7, 30, 365].collect{|days| [lwr(:actionview_datehelper_time_in_words_day, days), days.to_s]}, Setting.autologin) %></p>
+
+<p><label><%= l(:setting_self_registration) %></label>
+<%= select_tag 'settings[self_registration]',
+      options_for_select( [[l(:label_disabled), "0"],
+                           [l(:label_registration_activation_by_email), "1"],
+                           [l(:label_registration_manual_activation), "2"],
+                           [l(:label_registration_automatic_activation), "3"]
+                          ], Setting.self_registration ) %></p>
+
+<p><label><%= l(:label_password_lost) %></label>
+<%= check_box_tag 'settings[lost_password]', 1, Setting.lost_password? %><%= hidden_field_tag 'settings[lost_password]', 0 %></p>
+</div>
+
+<div style="float:right;">
+    <%= link_to 'Manage LDAP authentication...', :controller => 'auth_sources', :action => 'list' %>
+</div>
+
+<%= submit_tag l(:button_save) %>
+<% end %>
diff --git a/app/views/settings/_general.rhtml b/app/views/settings/_general.rhtml
new file mode 100644
index 000000000..514e62b59
--- /dev/null
+++ b/app/views/settings/_general.rhtml
@@ -0,0 +1,46 @@
+<% form_tag({:action => 'edit'}) do %>
+
+<div class="box tabular settings">
+<p><label><%= l(:setting_app_title) %></label>
+<%= text_field_tag 'settings[app_title]', Setting.app_title, :size => 30 %></p>
+
+<p><label><%= l(:setting_welcome_text) %></label>
+<%= text_area_tag 'settings[welcome_text]', Setting.welcome_text, :cols => 60, :rows => 5, :class => 'wiki-edit' %></p>
+<%= wikitoolbar_for 'settings[welcome_text]' %>
+
+<p><label><%= l(:label_theme) %></label>
+<%= select_tag 'settings[ui_theme]', options_for_select( ([[l(:label_default), '']] + Redmine::Themes.themes.collect {|t| [t.name, t.id]}), Setting.ui_theme) %></p>
+
+<p><label><%= l(:setting_default_language) %></label>
+<%= select_tag 'settings[default_language]', options_for_select( lang_options_for_select(false), Setting.default_language) %></p>
+
+<p><label><%= l(:setting_date_format) %></label>
+<%= select_tag 'settings[date_format]', options_for_select( [[l(:label_language_based), '']] + Setting::DATE_FORMATS.collect {|f| [Date.today.strftime(f), f]}, Setting.date_format) %></p>
+
+<p><label><%= l(:setting_time_format) %></label>
+<%= select_tag 'settings[time_format]', options_for_select( [[l(:label_language_based), '']] + Setting::TIME_FORMATS.collect {|f| [Time.now.strftime(f), f]}, Setting.time_format) %></p>
+
+<p><label><%= l(:setting_attachment_max_size) %></label>
+<%= text_field_tag 'settings[attachment_max_size]', Setting.attachment_max_size, :size => 6 %> KB</p>
+
+<p><label><%= l(:setting_per_page_options) %></label>
+<%= text_field_tag 'settings[per_page_options]', Setting.per_page_options_array.join(', '), :size => 20 %><br /><em><%= l(:text_comma_separated) %></em></p>
+
+<p><label><%= l(:setting_host_name) %></label>
+<%= text_field_tag 'settings[host_name]', Setting.host_name, :size => 60 %></p>
+
+<p><label><%= l(:setting_protocol) %></label>
+<%= select_tag 'settings[protocol]', options_for_select(['http', 'https'], Setting.protocol) %></p>
+
+<p><label><%= l(:setting_text_formatting) %></label>
+<%= select_tag 'settings[text_formatting]', options_for_select([[l(:label_none), "0"], ["textile", "textile"]], Setting.text_formatting) %></p>
+
+<p><label><%= l(:setting_wiki_compression) %></label>
+<%= select_tag 'settings[wiki_compression]', options_for_select( [[l(:label_none), 0], ["gzip", "gzip"]], Setting.wiki_compression) %></p>
+
+<p><label><%= l(:setting_feeds_limit) %></label>
+<%= text_field_tag 'settings[feeds_limit]', Setting.feeds_limit, :size => 6 %></p>
+</div>
+
+<%= submit_tag l(:button_save) %>
+<% end %>
diff --git a/app/views/settings/_issues.rhtml b/app/views/settings/_issues.rhtml
new file mode 100644
index 000000000..36c604fd9
--- /dev/null
+++ b/app/views/settings/_issues.rhtml
@@ -0,0 +1,20 @@
+<% form_tag({:action => 'edit', :tab => 'issues'}) do %>
+
+<div class="box tabular settings">
+<p><label><%= l(:setting_cross_project_issue_relations) %></label>
+<%= check_box_tag 'settings[cross_project_issue_relations]', 1, Setting.cross_project_issue_relations? %><%= hidden_field_tag 'settings[cross_project_issue_relations]', 0 %></p>
+
+<p><label><%= l(:setting_issues_export_limit) %></label>
+<%= text_field_tag 'settings[issues_export_limit]', Setting.issues_export_limit, :size => 6 %></p>
+</div>
+
+<fieldset class="box"><legend><%= l(:setting_issue_list_default_columns) %></legend>
+<%= hidden_field_tag 'settings[issue_list_default_columns][]', '' %>
+<p><% Query.new.available_columns.each do |column| %>
+  <label><%= check_box_tag 'settings[issue_list_default_columns][]', column.name, Setting.issue_list_default_columns.include?(column.name.to_s) %>
+  <%= column.caption %></label>
+<% end %></p>
+</fieldset>
+
+<%= submit_tag l(:button_save) %>
+<% end %>
diff --git a/app/views/admin/mail_options.rhtml b/app/views/settings/_notifications.rhtml
similarity index 72%
rename from app/views/admin/mail_options.rhtml
rename to app/views/settings/_notifications.rhtml
index 698933b9b..ca04352f4 100644
--- a/app/views/admin/mail_options.rhtml
+++ b/app/views/settings/_notifications.rhtml
@@ -1,25 +1,20 @@
-<div class="contextual">
-<%= link_to l(:label_send_test_email), :action => 'test_email' %>
-</div>
+<% form_tag({:action => 'edit', :tab => 'notifications'}) do %>
 
-<h2><%=l(:field_mail_notification)%></h2>
-
-<% form_tag({:action => 'mail_options'}, :id => 'mail-options-form') do %>
-
-<fieldset class="box tabular settings"><legend><%=l(:label_settings)%></legend>
+<div class="box tabular settings">
 <p><label><%= l(:setting_mail_from) %></label>
 <%= text_field_tag 'settings[mail_from]', Setting.mail_from, :size => 60 %></p>
 
 <p><label><%= l(:setting_bcc_recipients) %></label>
 <%= check_box_tag 'settings[bcc_recipients]', 1, Setting.bcc_recipients? %>
 <%= hidden_field_tag 'settings[bcc_recipients]', 0 %></p>
-</fieldset>
+</div>
 
 <fieldset class="box"><legend><%=l(:text_select_mail_notifications)%></legend>
 <% @notifiables.each do |notifiable| %>
   <label><%= check_box_tag 'settings[notified_events][]', notifiable, Setting.notified_events.include?(notifiable) %>
   <%= notifiable.humanize %></label><br />
 <% end %>
+<%= hidden_field_tag 'settings[notified_events][]', '' %>
 <p><%= check_all_links('mail-options-form') %></p>
 </fieldset>
 
@@ -27,7 +22,9 @@
 <%= text_area_tag 'settings[emails_footer]', Setting.emails_footer, :class => 'wiki-edit', :rows => 5 %>
 </fieldset>
 
+<div style="float:right;">
+<%= link_to l(:label_send_test_email), :controller => 'admin', :action => 'test_email' %>
+</div>
+
 <%= submit_tag l(:button_save) %>
 <% end %>
-
-<% html_title(l(:field_mail_notification)) -%>
diff --git a/app/views/settings/_repositories.rhtml b/app/views/settings/_repositories.rhtml
new file mode 100644
index 000000000..59b3b51de
--- /dev/null
+++ b/app/views/settings/_repositories.rhtml
@@ -0,0 +1,26 @@
+<% form_tag({:action => 'edit', :tab => 'repositories'}) do %>
+
+<div class="box tabular settings">
+<p><label><%= l(:setting_autofetch_changesets) %></label>
+<%= check_box_tag 'settings[autofetch_changesets]', 1, Setting.autofetch_changesets? %><%= hidden_field_tag 'settings[autofetch_changesets]', 0 %></p>
+
+<p><label><%= l(:setting_sys_api_enabled) %></label>
+<%= check_box_tag 'settings[sys_api_enabled]', 1, Setting.sys_api_enabled? %><%= hidden_field_tag 'settings[sys_api_enabled]', 0 %></p>
+
+<p><label><%= l(:setting_repositories_encodings) %></label>
+<%= text_field_tag 'settings[repositories_encodings]', Setting.repositories_encodings, :size => 60 %><br /><em><%= l(:text_comma_separated) %></em></p>
+</div>
+
+<fieldset class="box tabular settings"><legend><%= l(:text_issues_ref_in_commit_messages) %></legend>
+<p><label><%= l(:setting_commit_ref_keywords) %></label>
+<%= text_field_tag 'settings[commit_ref_keywords]', Setting.commit_ref_keywords, :size => 30 %><br /><em><%= l(:text_comma_separated) %></em></p>
+
+<p><label><%= l(:setting_commit_fix_keywords) %></label>
+<%= text_field_tag 'settings[commit_fix_keywords]', Setting.commit_fix_keywords, :size => 30 %>
+&nbsp;<%= l(:label_applied_status) %>: <%= select_tag 'settings[commit_fix_status_id]', options_for_select( [["", 0]] + IssueStatus.find(:all).collect{|status| [status.name, status.id.to_s]}, Setting.commit_fix_status_id) %>
+&nbsp;<%= l(:field_done_ratio) %>: <%= select_tag 'settings[commit_fix_done_ratio]', options_for_select( [[l(:label_no_change_option), '']] + ((0..10).to_a.collect {|r| ["#{r*10} %", "#{r*10}"] }), Setting.commit_fix_done_ratio) %>
+<br /><em><%= l(:text_comma_separated) %></em></p>
+</fieldset>
+
+<%= submit_tag l(:button_save) %>
+<% end %>
diff --git a/app/views/settings/edit.rhtml b/app/views/settings/edit.rhtml
index b1762a0e3..c7b47b6d0 100644
--- a/app/views/settings/edit.rhtml
+++ b/app/views/settings/edit.rhtml
@@ -1,105 +1,18 @@
 <h2><%= l(:label_settings) %></h2>
 
-<% form_tag({:action => 'edit'}) do %>
-<div class="box tabular settings">
-<p><label><%= l(:setting_app_title) %></label>
-<%= text_field_tag 'settings[app_title]', Setting.app_title, :size => 30 %></p>
-
-<p><label><%= l(:setting_app_subtitle) %></label>
-<%= text_field_tag 'settings[app_subtitle]', Setting.app_subtitle, :size => 60 %></p>
-
-<p><label><%= l(:setting_welcome_text) %></label>
-<%= text_area_tag 'settings[welcome_text]', Setting.welcome_text, :cols => 60, :rows => 5, :class => 'wiki-edit' %></p>
-<%= wikitoolbar_for 'settings[welcome_text]' %>
-
-<p><label><%= l(:label_theme) %></label>
-<%= select_tag 'settings[ui_theme]', options_for_select( ([[l(:label_default), '']] + Redmine::Themes.themes.collect {|t| [t.name, t.id]}), Setting.ui_theme) %></p>
-
-<p><label><%= l(:setting_default_language) %></label>
-<%= select_tag 'settings[default_language]', options_for_select( lang_options_for_select(false), Setting.default_language) %></p>
-
-<p><label><%= l(:setting_date_format) %></label>
-<%= select_tag 'settings[date_format]', options_for_select( [[l(:label_language_based), '']] + Setting::DATE_FORMATS.collect {|f| [Date.today.strftime(f), f]}, Setting.date_format) %></p>
-
-<p><label><%= l(:setting_time_format) %></label>
-<%= select_tag 'settings[time_format]', options_for_select( [[l(:label_language_based), '']] + Setting::TIME_FORMATS.collect {|f| [Time.now.strftime(f), f]}, Setting.time_format) %></p>
-
-<p><label><%= l(:setting_attachment_max_size) %></label>
-<%= text_field_tag 'settings[attachment_max_size]', Setting.attachment_max_size, :size => 6 %> KB</p>
-
-<p><label><%= l(:setting_per_page_options) %></label>
-<%= text_field_tag 'settings[per_page_options]', Setting.per_page_options_array.join(', '), :size => 20 %><br /><em><%= l(:text_comma_separated) %></em></p>
-
-<p><label><%= l(:setting_issues_export_limit) %></label>
-<%= text_field_tag 'settings[issues_export_limit]', Setting.issues_export_limit, :size => 6 %></p>
-
-<p><label><%= l(:setting_cross_project_issue_relations) %></label>
-<%= check_box_tag 'settings[cross_project_issue_relations]', 1, Setting.cross_project_issue_relations? %><%= hidden_field_tag 'settings[cross_project_issue_relations]', 0 %></p>
-
-<p><label><%= l(:setting_host_name) %></label>
-<%= text_field_tag 'settings[host_name]', Setting.host_name, :size => 60 %></p>
-
-<p><label><%= l(:setting_protocol) %></label>
-<%= select_tag 'settings[protocol]', options_for_select(['http', 'https'], Setting.protocol) %></p>
-
-<p><label><%= l(:setting_text_formatting) %></label>
-<%= select_tag 'settings[text_formatting]', options_for_select([[l(:label_none), "0"], ["textile", "textile"]], Setting.text_formatting) %></p>
-
-<p><label><%= l(:setting_wiki_compression) %></label>
-<%= select_tag 'settings[wiki_compression]', options_for_select( [[l(:label_none), 0], ["gzip", "gzip"]], Setting.wiki_compression) %></p>
-
-<p><label><%= l(:setting_feeds_limit) %></label>
-<%= text_field_tag 'settings[feeds_limit]', Setting.feeds_limit, :size => 6 %></p>
-
-<p><label><%= l(:setting_autofetch_changesets) %></label>
-<%= check_box_tag 'settings[autofetch_changesets]', 1, Setting.autofetch_changesets? %><%= hidden_field_tag 'settings[autofetch_changesets]', 0 %></p>
-
-<p><label><%= l(:setting_sys_api_enabled) %></label>
-<%= check_box_tag 'settings[sys_api_enabled]', 1, Setting.sys_api_enabled? %><%= hidden_field_tag 'settings[sys_api_enabled]', 0 %></p>
-
-<p><label><%= l(:setting_repositories_encodings) %></label>
-<%= text_field_tag 'settings[repositories_encodings]', Setting.repositories_encodings, :size => 60 %><br /><em><%= l(:text_comma_separated) %></em></p>
+<div class="tabs">
+    <ul>
+    <% administration_settings_tabs.each do |tab| -%>
+        <li><%= link_to l(tab[:label]), {}, :id => "tab-#{tab[:name]}", :onclick => "showTab('#{tab[:name]}'); this.blur(); return false;" %></li>
+    <% end -%>
+    </ul>
 </div>
 
-<fieldset class="box"><legend><%= l(:setting_issue_list_default_columns) %></legend>
-<%= hidden_field_tag 'settings[issue_list_default_columns][]', '' %>
-<p><% Query.new.available_columns.each do |column| %>
-  <label><%= check_box_tag 'settings[issue_list_default_columns][]', column.name, Setting.issue_list_default_columns.include?(column.name.to_s) %>
-  <%= column.caption %></label>
-<% end %></p>
-</fieldset>
-
-<fieldset class="box tabular"><legend><%= l(:label_authentication) %></legend>
-<p><label><%= l(:setting_login_required) %></label>
-<%= check_box_tag 'settings[login_required]', 1, Setting.login_required? %><%= hidden_field_tag 'settings[login_required]', 0 %></p>
-
-<p><label><%= l(:setting_autologin) %></label>
-<%= select_tag 'settings[autologin]', options_for_select( [[l(:label_disabled), "0"]] + [1, 7, 30, 365].collect{|days| [lwr(:actionview_datehelper_time_in_words_day, days), days.to_s]}, Setting.autologin) %></p>
-
-<p><label><%= l(:setting_self_registration) %></label>
-<%= select_tag 'settings[self_registration]',
-      options_for_select( [[l(:label_disabled), "0"],
-                           [l(:label_registration_activation_by_email), "1"],
-                           [l(:label_registration_manual_activation), "2"],
-                           [l(:label_registration_automatic_activation), "3"]
-                          ], Setting.self_registration ) %></p>
-
-<p><label><%= l(:label_password_lost) %></label>
-<%= check_box_tag 'settings[lost_password]', 1, Setting.lost_password? %><%= hidden_field_tag 'settings[lost_password]', 0 %></p>
-</fieldset>
-
-<fieldset class="box tabular"><legend><%= l(:text_issues_ref_in_commit_messages) %></legend>
-<p><label><%= l(:setting_commit_ref_keywords) %></label>
-<%= text_field_tag 'settings[commit_ref_keywords]', Setting.commit_ref_keywords, :size => 30 %><br /><em><%= l(:text_comma_separated) %></em></p>
-
-<p><label><%= l(:setting_commit_fix_keywords) %></label>
-<%= text_field_tag 'settings[commit_fix_keywords]', Setting.commit_fix_keywords, :size => 30 %>
-&nbsp;<%= l(:label_applied_status) %>: <%= select_tag 'settings[commit_fix_status_id]', options_for_select( [["", 0]] + IssueStatus.find(:all).collect{|status| [status.name, status.id.to_s]}, Setting.commit_fix_status_id) %>
-&nbsp;<%= l(:field_done_ratio) %>: <%= select_tag 'settings[commit_fix_done_ratio]', options_for_select( [[l(:label_no_change_option), '']] + ((0..10).to_a.collect {|r| ["#{r*10} %", "#{r*10}"] }), Setting.commit_fix_done_ratio) %>
-<br /><em><%= l(:text_comma_separated) %></em></p>
-</fieldset>
-
-<%= submit_tag l(:button_save) %>
+<% administration_settings_tabs.each do |tab| %>
+    <%= content_tag('div', render(:partial => tab[:partial]), :id => "tab-content-#{tab[:name]}", :class => 'tab-content') %>
 <% end %>
 
-<% html_title(l(:label_settings)) -%>
+<%= tab = params[:tab] ? h(params[:tab]) : administration_settings_tabs.first[:name]
+javascript_tag "showTab('#{tab}');" %>
+
+<% html_title(l(:label_settings), l(:label_administration)) -%>
diff --git a/lang/bg.yml b/lang/bg.yml
index 57e7fd22d..ae5630ecf 100644
--- a/lang/bg.yml
+++ b/lang/bg.yml
@@ -559,3 +559,5 @@ text_no_configuration_data: "Roles, trackers, issue statuses and workflow have n
 error_can_t_load_default_data: "Default configuration could not be loaded: %s"
 button_update: Update
 label_change_properties: Change properties
+label_general: General
+label_repository_plural: Repositories
diff --git a/lang/cs.yml b/lang/cs.yml
index 5cbf1133d..813dade3f 100644
--- a/lang/cs.yml
+++ b/lang/cs.yml
@@ -559,3 +559,5 @@ text_no_configuration_data: "Roles, trackers, issue statuses and workflow have n
 error_can_t_load_default_data: "Default configuration could not be loaded: %s"
 button_update: Update
 label_change_properties: Change properties
+label_general: General
+label_repository_plural: Repositories
diff --git a/lang/de.yml b/lang/de.yml
index ba3dcda5b..660289768 100644
--- a/lang/de.yml
+++ b/lang/de.yml
@@ -559,3 +559,5 @@ text_no_configuration_data: "Roles, trackers, issue statuses and workflow have n
 error_can_t_load_default_data: "Default configuration could not be loaded: %s"
 button_update: Update
 label_change_properties: Change properties
+label_general: General
+label_repository_plural: Repositories
diff --git a/lang/en.yml b/lang/en.yml
index eae61d7bf..eec7702b7 100644
--- a/lang/en.yml
+++ b/lang/en.yml
@@ -353,6 +353,7 @@ label_contains: contains
 label_not_contains: doesn't contain
 label_day_plural: days
 label_repository: Repository
+label_repository_plural: Repositories
 label_browse: Browse
 label_modification: %d change
 label_modification_plural: %d changes
@@ -463,6 +464,7 @@ label_registration_automatic_activation: automatic account activation
 label_display_per_page: 'Per page: %s'
 label_age: Age
 label_change_properties: Change properties
+label_general: General
 
 button_login: Login
 button_submit: Submit
diff --git a/lang/es.yml b/lang/es.yml
index 1a3af0f5c..37821e129 100644
--- a/lang/es.yml
+++ b/lang/es.yml
@@ -562,3 +562,5 @@ text_no_configuration_data: "Roles, trackers, issue statuses and workflow have n
 error_can_t_load_default_data: "Default configuration could not be loaded: %s"
 button_update: Update
 label_change_properties: Change properties
+label_general: General
+label_repository_plural: Repositories
diff --git a/lang/fr.yml b/lang/fr.yml
index ff2bf792f..841f132d4 100644
--- a/lang/fr.yml
+++ b/lang/fr.yml
@@ -353,6 +353,7 @@ label_contains: contient
 label_not_contains: ne contient pas
 label_day_plural: jours
 label_repository: Dépôt
+label_repository_plural: Dépôts
 label_browse: Parcourir
 label_modification: %d modification
 label_modification_plural: %d modifications
@@ -463,6 +464,7 @@ label_registration_automatic_activation: activation automatique du compte
 label_display_per_page: 'Par page: %s'
 label_age: Age
 label_change_properties: Changer les propriétés
+label_general: Général
 
 button_login: Connexion
 button_submit: Soumettre
diff --git a/lang/he.yml b/lang/he.yml
index d110ee8bf..666675e75 100644
--- a/lang/he.yml
+++ b/lang/he.yml
@@ -559,3 +559,5 @@ text_no_configuration_data: "Roles, trackers, issue statuses and workflow have n
 error_can_t_load_default_data: "Default configuration could not be loaded: %s"
 button_update: Update
 label_change_properties: Change properties
+label_general: General
+label_repository_plural: Repositories
diff --git a/lang/it.yml b/lang/it.yml
index bb9440ffd..24e39955a 100644
--- a/lang/it.yml
+++ b/lang/it.yml
@@ -559,3 +559,5 @@ text_no_configuration_data: "Roles, trackers, issue statuses and workflow have n
 error_can_t_load_default_data: "Default configuration could not be loaded: %s"
 button_update: Update
 label_change_properties: Change properties
+label_general: General
+label_repository_plural: Repositories
diff --git a/lang/ja.yml b/lang/ja.yml
index e4c13b34c..d68013296 100644
--- a/lang/ja.yml
+++ b/lang/ja.yml
@@ -560,3 +560,5 @@ text_no_configuration_data: "Roles, trackers, issue statuses and workflow have n
 error_can_t_load_default_data: "Default configuration could not be loaded: %s"
 button_update: Update
 label_change_properties: Change properties
+label_general: General
+label_repository_plural: Repositories
diff --git a/lang/ko.yml b/lang/ko.yml
index 790598b8d..aad58d188 100644
--- a/lang/ko.yml
+++ b/lang/ko.yml
@@ -559,3 +559,5 @@ text_no_configuration_data: "Roles, trackers, issue statuses and workflow have n
 error_can_t_load_default_data: "Default configuration could not be loaded: %s"
 button_update: Update
 label_change_properties: Change properties
+label_general: General
+label_repository_plural: Repositories
diff --git a/lang/nl.yml b/lang/nl.yml
index 2e18a6b7c..44633e4b4 100644
--- a/lang/nl.yml
+++ b/lang/nl.yml
@@ -560,3 +560,5 @@ text_no_configuration_data: "Roles, trackers, issue statuses and workflow have n
 error_can_t_load_default_data: "Default configuration could not be loaded: %s"
 button_update: Update
 label_change_properties: Change properties
+label_general: General
+label_repository_plural: Repositories
diff --git a/lang/pl.yml b/lang/pl.yml
index 0ee0e3792..511bbe81a 100644
--- a/lang/pl.yml
+++ b/lang/pl.yml
@@ -559,3 +559,5 @@ text_no_configuration_data: "Roles, trackers, issue statuses and workflow have n
 error_can_t_load_default_data: "Default configuration could not be loaded: %s"
 button_update: Update
 label_change_properties: Change properties
+label_general: General
+label_repository_plural: Repositories
diff --git a/lang/pt-br.yml b/lang/pt-br.yml
index 21d21b793..684b51daa 100644
--- a/lang/pt-br.yml
+++ b/lang/pt-br.yml
@@ -559,3 +559,5 @@ text_no_configuration_data: "Roles, trackers, issue statuses and workflow have n
 error_can_t_load_default_data: "Default configuration could not be loaded: %s"
 button_update: Update
 label_change_properties: Change properties
+label_general: General
+label_repository_plural: Repositories
diff --git a/lang/pt.yml b/lang/pt.yml
index c7f05f8c8..0ce2d3471 100644
--- a/lang/pt.yml
+++ b/lang/pt.yml
@@ -559,3 +559,5 @@ text_no_configuration_data: "Roles, trackers, issue statuses and workflow have n
 error_can_t_load_default_data: "Default configuration could not be loaded: %s"
 button_update: Update
 label_change_properties: Change properties
+label_general: General
+label_repository_plural: Repositories
diff --git a/lang/ro.yml b/lang/ro.yml
index 6ebc3b0e5..95e0ea318 100644
--- a/lang/ro.yml
+++ b/lang/ro.yml
@@ -559,3 +559,5 @@ text_no_configuration_data: "Roles, trackers, issue statuses and workflow have n
 error_can_t_load_default_data: "Default configuration could not be loaded: %s"
 button_update: Update
 label_change_properties: Change properties
+label_general: General
+label_repository_plural: Repositories
diff --git a/lang/ru.yml b/lang/ru.yml
index 569e96884..fba18462e 100644
--- a/lang/ru.yml
+++ b/lang/ru.yml
@@ -559,3 +559,5 @@ text_no_configuration_data: "Roles, trackers, issue statuses and workflow have n
 error_can_t_load_default_data: "Default configuration could not be loaded: %s"
 button_update: Update
 label_change_properties: Change properties
+label_general: General
+label_repository_plural: Repositories
diff --git a/lang/sr.yml b/lang/sr.yml
index 1d4f52539..ece6cf6e2 100644
--- a/lang/sr.yml
+++ b/lang/sr.yml
@@ -560,3 +560,5 @@ text_no_configuration_data: "Roles, trackers, issue statuses and workflow have n
 error_can_t_load_default_data: "Default configuration could not be loaded: %s"
 button_update: Update
 label_change_properties: Change properties
+label_general: General
+label_repository_plural: Repositories
diff --git a/lang/sv.yml b/lang/sv.yml
index 75f297c20..cf1e760f9 100644
--- a/lang/sv.yml
+++ b/lang/sv.yml
@@ -560,3 +560,5 @@ text_no_configuration_data: "Roles, trackers, issue statuses and workflow have n
 error_can_t_load_default_data: "Default configuration could not be loaded: %s"
 button_update: Update
 label_change_properties: Change properties
+label_general: General
+label_repository_plural: Repositories
diff --git a/lang/zh-tw.yml b/lang/zh-tw.yml
index 5bf47d943..97b31225b 100644
--- a/lang/zh-tw.yml
+++ b/lang/zh-tw.yml
@@ -559,3 +559,5 @@ text_no_configuration_data: "Roles, trackers, issue statuses and workflow have n
 error_can_t_load_default_data: "Default configuration could not be loaded: %s"
 button_update: Update
 label_change_properties: Change properties
+label_general: General
+label_repository_plural: Repositories
diff --git a/lang/zh.yml b/lang/zh.yml
index 16f4c7195..2d537b250 100644
--- a/lang/zh.yml
+++ b/lang/zh.yml
@@ -562,3 +562,5 @@ text_no_configuration_data: "Roles, trackers, issue statuses and workflow have n
 error_can_t_load_default_data: "Default configuration could not be loaded: %s"
 button_update: Update
 label_change_properties: Change properties
+label_general: General
+label_repository_plural: Repositories
diff --git a/test/functional/admin_controller_test.rb b/test/functional/admin_controller_test.rb
index 742c1f6bb..05205b399 100644
--- a/test/functional/admin_controller_test.rb
+++ b/test/functional/admin_controller_test.rb
@@ -51,21 +51,9 @@ class AdminControllerTest < Test::Unit::TestCase
     assert IssueStatus.find_by_name('Nouveau')
   end
   
-  def test_get_mail_options
-    get :mail_options
-    assert_response :success
-    assert_template 'mail_options'
-  end
-  
-  def test_post_mail_options
-    post :mail_options, :settings => {'mail_from' => 'functional@test.foo'}
-    assert_redirected_to 'admin/mail_options'
-    assert_equal 'functional@test.foo', Setting.mail_from
-  end
-  
   def test_test_email
     get :test_email
-    assert_redirected_to 'admin/mail_options'
+    assert_redirected_to 'settings/edit'
     mail = ActionMailer::Base.deliveries.last
     assert_kind_of TMail::Mail, mail
     user = User.find(1)
diff --git a/test/functional/settings_controller_test.rb b/test/functional/settings_controller_test.rb
new file mode 100644
index 000000000..0e919a741
--- /dev/null
+++ b/test/functional/settings_controller_test.rb
@@ -0,0 +1,53 @@
+# 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 File.dirname(__FILE__) + '/../test_helper'
+require 'settings_controller'
+
+# Re-raise errors caught by the controller.
+class SettingsController; def rescue_action(e) raise e end; end
+
+class SettingsControllerTest < Test::Unit::TestCase
+  fixtures :users
+  
+  def setup
+    @controller = SettingsController.new
+    @request    = ActionController::TestRequest.new
+    @response   = ActionController::TestResponse.new
+    User.current = nil
+    @request.session[:user_id] = 1 # admin
+  end
+  
+  def test_get_edit
+    get :edit
+    assert_response :success
+    assert_template 'edit'
+  end
+  
+  def test_post_edit_notifications
+    post :edit, :settings => {:mail_from => 'functional@test.foo',
+                              :bcc_recipients  => '0',
+                              :notified_events => %w(issue_added issue_updated news_added),
+                              :emails_footer => 'Test footer'
+                              }
+    assert_redirected_to 'settings/edit'
+    assert_equal 'functional@test.foo', Setting.mail_from
+    assert !Setting.bcc_recipients?
+    assert_equal %w(issue_added issue_updated news_added), Setting.notified_events
+    assert_equal 'Test footer', Setting.emails_footer
+  end
+end

From b2b56adbfa6668f99de623651ca671d6021cbcf2 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Mon, 7 Jan 2008 20:14:50 +0000
Subject: [PATCH 117/710] Fixed: Themes are not applied with Rails 2.0

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1047 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 lib/redmine/themes.rb | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lib/redmine/themes.rb b/lib/redmine/themes.rb
index a7cf940b8..d0c90e3a9 100644
--- a/lib/redmine/themes.rb
+++ b/lib/redmine/themes.rb
@@ -69,4 +69,8 @@ module ApplicationHelper
     super((@current_theme && @current_theme.stylesheets.include?(source)) ?
       "/themes/#{@current_theme.dir}/stylesheets/#{source}" : source)
   end
+  
+  def path_to_stylesheet(source)
+    stylesheet_path source
+  end
 end

From 84cdc8f2bc932777d992e42b2273da75512b2093 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Thu, 10 Jan 2008 18:34:14 +0000
Subject: [PATCH 118/710] Translations:
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Finnish added (Antti Perkiömäki)
* Traditional Chinese updated (Shortie Lo)
* Russian updated
* Polish updated (Mariusz Olejnik)
* Korean updated (Hans Yoon)
* Japanese calendar fix (Nobuhiro Imai)

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1051 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 lang/fi.yml                                   | 568 ++++++++++++++++++
 lang/ko.yml                                   | 358 +++++------
 lang/pl.yml                                   |  24 +-
 lang/ru.yml                                   |  37 +-
 lang/zh-tw.yml                                | 109 ++--
 .../javascripts/calendar/lang/calendar-fi.js  | 127 ++++
 .../javascripts/calendar/lang/calendar-ja.js  |   6 +-
 7 files changed, 962 insertions(+), 267 deletions(-)
 create mode 100644 lang/fi.yml
 create mode 100644 public/javascripts/calendar/lang/calendar-fi.js

diff --git a/lang/fi.yml b/lang/fi.yml
new file mode 100644
index 000000000..4aee95bb9
--- /dev/null
+++ b/lang/fi.yml
@@ -0,0 +1,568 @@
+_gloc_rule_default: '|n| n==1 ? "" : "_plural" '
+
+actionview_datehelper_select_day_prefix:
+actionview_datehelper_select_month_names: Tammikuu,Helmikuu,Maaliskuu,Huhtikuu,Toukokuu,Kesäkuu,Heinäkuu,Elokuu,Syyskuu,Lokakuu,Marraskuu,Joulukuu
+actionview_datehelper_select_month_names_abbr: Tammi,Helmi,Maalis,Huhti,Touko,Kesä,Heinä,Elo,Syys,Loka,Marras,Joulu
+actionview_datehelper_select_month_prefix:
+actionview_datehelper_select_year_prefix:
+actionview_datehelper_time_in_words_day: 1 päivä
+actionview_datehelper_time_in_words_day_plural: %d päivää
+actionview_datehelper_time_in_words_hour_about: noin tunti
+actionview_datehelper_time_in_words_hour_about_plural: noin %d tuntia
+actionview_datehelper_time_in_words_hour_about_single: noin tunnin
+actionview_datehelper_time_in_words_minute: 1 minuutti
+actionview_datehelper_time_in_words_minute_half: puoli minuuttia
+actionview_datehelper_time_in_words_minute_less_than: vähemmän kuin minuuttia
+actionview_datehelper_time_in_words_minute_plural: %d minuuttia
+actionview_datehelper_time_in_words_minute_single: 1 minuutti
+actionview_datehelper_time_in_words_second_less_than: vähemmän kuin sekuntin
+actionview_datehelper_time_in_words_second_less_than_plural: vähemmän kuin %d sekunttia
+actionview_instancetag_blank_option: Valitse, ole hyvä
+
+activerecord_error_inclusion: ei ole listalla
+activerecord_error_exclusion: on varattu
+activerecord_error_invalid: ei ole kelpaava
+activerecord_error_confirmation: ei vastaa vahvistusta
+activerecord_error_accepted: tulee hyväksyä
+activerecord_error_empty: ei voi olla tyhjä
+activerecord_error_blank: ei voi olla tyhjä
+activerecord_error_too_long: on liian pitkä
+activerecord_error_too_short: on liian lyhyt
+activerecord_error_wrong_length: on väärän pituinen
+activerecord_error_taken: on jo varattu
+activerecord_error_not_a_number: ei ole numero
+activerecord_error_not_a_date: ei ole oikea päivä
+activerecord_error_greater_than_start_date: tulee olla aloituspäivän jälkeinen
+activerecord_error_not_same_project: ei kuulu samaan projektiin
+activerecord_error_circular_dependency: Tämä suhde loisi kiertävän suhteen.
+
+general_fmt_age: %d v.
+general_fmt_age_plural: %d vuotta
+general_fmt_date: %%d.%%m.%%Y
+general_fmt_datetime: %%d.%%m.%%Y %%I:%%M %%p
+general_fmt_datetime_short: %%b %%d, %%I:%%M %%p
+general_fmt_time: %%I:%%M %%p
+general_text_No: 'Ei'
+general_text_Yes: 'Kyllä'
+general_text_no: 'ei'
+general_text_yes: 'kyllä'
+general_lang_name: 'Finnish (Suomi)'
+general_csv_separator: ','
+general_csv_encoding: ISO-8859-1
+general_pdf_encoding: ISO-8859-1
+general_day_names: Maanantai,Tiistai,Keskiviikko,Torstai,Perjantai,Lauantai,Sunnuntai
+general_first_day_of_week: '1'
+
+notice_account_updated: Tilin päivitys onnistui.
+notice_account_invalid_creditentials: Väärä käyttäjä tai salasana
+notice_account_password_updated: Salasanan päivitys onnistui.
+notice_account_wrong_password: Väärä salasana
+notice_account_register_done: Tilin luonti onnistui. Aktivoidaksesi tilin seuraa linkkiä joka välitettiin sähköpostiisi.
+notice_account_unknown_email: Tuntematon käyttäjä.
+notice_can_t_change_password: Tämä tili käyttää ulkoista autentikointi järjestelmää. Mahdotonta muuttaa salasanaa.
+notice_account_lost_email_sent: Sinulle on lähetetty sähköposti jossa on ohje miten vaihdat salasanasi.
+notice_account_activated: Tilisi on nyt aktivoitu, voit kirjautua sisälle.
+notice_successful_create: Luonti onnistui.
+notice_successful_update: Päivitys onnistui.
+notice_successful_delete: Poisto onnistui.
+notice_successful_connection: Yhteyden muodostus onnistui.
+notice_file_not_found: Hakemaasi sivua ei löytynyt tai se on poistettu.
+notice_locking_conflict: Toinen käyttäjä on päivittänyt tiedot.
+notice_scm_error: Syötettä ja/tai versiota ei löydy säiliöstä.
+notice_not_authorized: Sinulla ei ole oikeutta näyttää tätä sivua.
+notice_email_sent: Sähköposti on lähetty osoitteeseen %s
+notice_email_error: Sähköpostilähetyksessä tapahtui virhe (%s)
+notice_feeds_access_key_reseted: RSS pääsy avaimesi on nollaantunut.
+notice_failed_to_save_issues: "%d Tapahtum(an/ien) tallennus epäonnistui %d valitut: %s."
+notice_no_issue_selected: "Tapahtumia ei ole valittu! Valitse tapahtumat joita haluat muokata."
+notice_account_pending: "Tilisi on luotu ja odottaa ylläpitäjän hyväksyntää."
+notice_default_data_loaded: Vakio asetusten palautus onnistui.
+
+error_can_t_load_default_data: "Vakio asetuksia ei voitu ladata: %s"
+
+mail_subject_lost_password: Sinun Redmine salasanasi
+mail_body_lost_password: 'Vaihtaaksesi Redmine salasanasi, paina seuraavaa linkkiä:'
+mail_subject_register: Redmine tilin aktivointi
+mail_body_register: 'Aktivoidaksesi Redmine tilisi, paina seuraavaa linkkiä:'
+mail_body_account_information_external: Voit nyt käyttää "%s" tiliäsi kirjautuaksesi Redmine järjestelmään.
+mail_body_account_information: Sinun Redmine tilin tiedot
+mail_subject_account_activation_request: Redmine tilin aktivointi pyyntö
+mail_body_account_activation_request: 'Uusi käyttäjä (%s) on rekisteröitynyt. Hänen tili odottaa hyväksyntääsi:'
+
+gui_validation_error: 1 virhe
+gui_validation_error_plural: %d virhettä
+
+field_name: Nimi
+field_description: Kuvaus
+field_summary: Yhteenveto
+field_is_required: Vaaditaan
+field_firstname: Etu nimi
+field_lastname: Suku nimi
+field_mail: Sähköposti
+field_filename: Tiedosto
+field_filesize: Koko
+field_downloads: Latausta
+field_author: Tekijä
+field_created_on: Luotu
+field_updated_on: Päivitetty
+field_field_format: Muoto
+field_is_for_all: Kaikille projekteille
+field_possible_values: Mahdolliset arvot
+field_regexp: Säännönmukainen ilmentymä (reg exp)
+field_min_length: Minimi pituus
+field_max_length: Maksimi pituus
+field_value: Arvo
+field_category: Luokka
+field_title: Otsikko
+field_project: Projekti
+field_issue: Tapahtuma
+field_status: Tila
+field_notes: Muistiinpanot
+field_is_closed: Tapahtuma suljettu
+field_is_default: Vakio arvo
+field_tracker: Tiketti
+field_subject: Aihe
+field_due_date: Määräaika
+field_assigned_to: Nimetty
+field_priority: Prioriteetti
+field_fixed_version: Määrätty versio
+field_user: Käyttäjä
+field_role: Rooli
+field_homepage: Kotisivu
+field_is_public: Julkinen
+field_parent: Alaprojekti
+field_is_in_chlog: Tapahtumat näytetään muutoslokissa
+field_is_in_roadmap: Tapahtumat näytetään roadmap näkymässä
+field_login: Kirjautuminen
+field_mail_notification: Sähköposti muistutukset
+field_admin: Ylläpitäjä
+field_last_login_on: Viimeinen yhteys
+field_language: Kieli
+field_effective_date: Päivä
+field_password: Salasana
+field_new_password: Uusi salasana
+field_password_confirmation: Vahvistus
+field_version: Versio
+field_type: Tyyppi
+field_host: Isäntä
+field_port: Portti
+field_account: Tili
+field_base_dn: Base DN
+field_attr_login: Kirjautumis määre
+field_attr_firstname: Etuminen määre
+field_attr_lastname: Sukunimen määre
+field_attr_mail: Sähköpostin määre
+field_onthefly: Automaattinen käyttäjien luonti
+field_start_date: Alku
+field_done_ratio: %% Tehty
+field_auth_source: Autentikointi muoto
+field_hide_mail: Piiloita sähköpostiosoitteeni
+field_comments: Kommentti
+field_url: URL
+field_start_page: Aloitus sivu
+field_subproject: Alaprojekti
+field_hours: Tuntia
+field_activity: Aktiviteetti
+field_spent_on: Päivä
+field_identifier: Tunniste
+field_is_filter: Käytetään suodattimena
+field_issue_to_id: Liittyvä tapahtuma
+field_delay: Viive
+field_assignable: Tapahtumia voidaan nimetä tälle roolille
+field_redirect_existing_links: Uudelleenohjaa olemassa olevat linkit
+field_estimated_hours: Arvioitu aika
+field_column_names: Saraketta
+field_time_zone: Aikavyöhyke
+field_searchable: Haettava
+
+setting_app_title: Ohjelman otsikko
+setting_app_subtitle: Ohjelman alaotsikko
+setting_welcome_text: Tervetulo teksti
+setting_default_language: Vakio kieli
+setting_login_required: Pakollinen autentikointi
+setting_self_registration: Tee-Se-Itse rekisteröinti
+setting_attachment_max_size: Liitteen maksimi koko
+setting_issues_export_limit: Tapahtumien vienti rajoite
+setting_mail_from: Lähettäjän sähköpostiosoite
+setting_bcc_recipients: Blind carbon copy vastaanottajat (bcc)
+setting_host_name: Isännän nimi
+setting_text_formatting: Tekstin muotoilu
+setting_wiki_compression: Wiki historian pakkaus
+setting_feeds_limit: Syötteen sisällön raja
+setting_autofetch_changesets: Automaatisen haun souritukset
+setting_sys_api_enabled: Salli WS säiliön hallintaan
+setting_commit_ref_keywords: Viittaavat hakusanat
+setting_commit_fix_keywords: Korjaavat hakusanat
+setting_autologin: Automaatinen kirjautuminen
+setting_date_format: Päivän muoto
+setting_time_format: Ajan muoto
+setting_cross_project_issue_relations: Salli projektien väliset tapahtuminen suhteet
+setting_issue_list_default_columns: Vakio sarakkeiden näyttö tapahtuma listauksessa
+setting_repositories_encodings: Säiliön koodaus
+setting_emails_footer: Sähköpostin alatunniste
+setting_protocol: Protokolla
+setting_per_page_options: Sivun objektien määrän asetukset
+
+label_user: Käyttäjä
+label_user_plural: Käyttäjiä
+label_user_new: Uusi käyttäjä
+label_project: Projekti
+label_project_new: Uusi projekti
+label_project_plural: Projektit
+label_project_all: Kaikki projektit
+label_project_latest: Uusimmat projektit
+label_issue: Tapahtuma
+label_issue_new: Uusi tapahtuma
+label_issue_plural: Tapahtumat
+label_issue_view_all: Näytä kaikki tapahtumat
+label_issues_by: Tapahtumat %s
+label_document: Dokumentti
+label_document_new: Uusi dokumentti
+label_document_plural: Dokumentit
+label_role: Rooli
+label_role_plural: Roolit
+label_role_new: Uusi rooli
+label_role_and_permissions: Roolit ja oikeudet
+label_member: Jäsen
+label_member_new: Uusi jäsen
+label_member_plural: Jäsenet
+label_tracker: Tiketti
+label_tracker_plural: Tiketit
+label_tracker_new: Uusi tiketti
+label_workflow: Työnkulku
+label_issue_status: Tapahtuman tila
+label_issue_status_plural: Tapahtumien tilat
+label_issue_status_new: Uusi tila
+label_issue_category: Tapahtuma luokka
+label_issue_category_plural: Tapahtuma luokat
+label_issue_category_new: Uusi luokka
+label_custom_field: Räätälöity kenttä
+label_custom_field_plural: Räätälöidyt kentät
+label_custom_field_new: Uusi räätälöity kenttä
+label_enumerations: Lista
+label_enumeration_new: Uusi arvo
+label_information: Tieto
+label_information_plural: Tiedot
+label_please_login: Kirjaudu ole hyvä
+label_register: Rekisteröidy
+label_password_lost: Hukattu salasana
+label_home: Koti
+label_my_page: Minun sivu
+label_my_account: Minun tili
+label_my_projects: Minun projektit
+label_administration: Ylläpito
+label_login: Kirjaudu sisään
+label_logout: Kirjaudu ulos
+label_help: Apua
+label_reported_issues: Raportoidut tapahtumat
+label_assigned_to_me_issues: Minulle nimetyt tapahtumat
+label_last_login: Viimeinen yhteys
+label_last_updates: Viimeinen päivitys
+label_last_updates_plural: %d päivitetty viimeksi
+label_registered_on: Rekisteröity
+label_activity: Aktiviteetti
+label_new: Uusi
+label_logged_as: Kirjauduttu nimellä
+label_environment: Ympäristö
+label_authentication: Autentikointi
+label_auth_source: Autentikointi tapa
+label_auth_source_new: Uusi autentikointi tapa
+label_auth_source_plural: Autentikointi tavat
+label_subproject_plural: Alaprojektit
+label_min_max_length: Min - Max pituudet
+label_list: Lista
+label_date: Päivä
+label_integer: Kokonaisluku
+label_float: Liukuluku
+label_boolean: Totuusarvomuuttuja
+label_string: Merkkijono
+label_text: Pitkä merkkijono
+label_attribute: Määre
+label_attribute_plural: Määreet
+label_download: %d Lataus
+label_download_plural: %d Lataukset
+label_no_data: Ei tietoa näytettäväksi
+label_change_status: Muutos tila
+label_history: Historia
+label_attachment: Tiedosto
+label_attachment_new: Uusi tiedosto
+label_attachment_delete: Poista tiedosto
+label_attachment_plural: Tiedostot
+label_report: Raportti
+label_report_plural: Raportit
+label_news: Uutinen
+label_news_new: Lisää uutinen
+label_news_plural: Uutiset
+label_news_latest: Viimeisimmät uutiset
+label_news_view_all: Näytä kaikki uutiset
+label_change_log: Muutosloki
+label_settings: Asetukset
+label_overview: Yleiskatsaus
+label_version: Versio
+label_version_new: Uusi versio
+label_version_plural: Versiot
+label_confirmation: Vahvistus
+label_export_to: Vie
+label_read: Lukee...
+label_public_projects: Julkiset projektit
+label_open_issues: avoin
+label_open_issues_plural: avointa
+label_closed_issues: suljettu
+label_closed_issues_plural: suljettua
+label_total: Yhteensä
+label_permissions: Oikeudet
+label_current_status: Nykyinen tila
+label_new_statuses_allowed: Uudet tilat sallittu
+label_all: kaikki
+label_none: ei mitään
+label_nobody: ei kukaan
+label_next: Seuraava
+label_previous: Edellinen
+label_used_by: Käytetty
+label_details: Yksityiskohdat
+label_add_note: Lisää muistiinpano
+label_per_page: Per sivu
+label_calendar: Kalenteri
+label_months_from: kuukauden päässä
+label_gantt: Gantt
+label_internal: Sisäinen
+label_last_changes: viimeiset %d muutokset
+label_change_view_all: Näytä kaikki muutokset
+label_personalize_page: Personoi tämä sivu
+label_comment: Kommentti
+label_comment_plural: Kommentit
+label_comment_add: Lisää kommentti
+label_comment_added: Kommentti lisätty
+label_comment_delete: Poista kommentti
+label_query: Räätälöity haku
+label_query_plural: Räätälöidyt haut
+label_query_new: Uusi haku
+label_filter_add: Lisää suodatin
+label_filter_plural: Suodattimet
+label_equals: yhtä kuin
+label_not_equals: epäsuuri kuin
+label_in_less_than: pienempi kuin
+label_in_more_than: suurempi kuin
+label_in:
+label_today: tänään
+label_this_week: tämä viikko
+label_less_than_ago: vähemmän kuin päivää sitten
+label_more_than_ago: enemän kuin päivää sitten
+label_ago: päiviä sitten
+label_contains: sisältää
+label_not_contains: ei sisällä
+label_day_plural: päivät
+label_repository: Säiliö
+label_repository_plural: Säiliötä
+label_browse: Selata
+label_modification: %d muutos
+label_modification_plural: %d muutettu
+label_revision: Versio
+label_revision_plural: Versiot
+label_added: lisätty
+label_modified: muokattu
+label_deleted: poistettu
+label_latest_revision: Viimeisin versio
+label_latest_revision_plural: Viimeisimmät versiot
+label_view_revisions: Näytä versiot
+label_max_size: Maksimi koko
+label_on:
+label_sort_highest: Siirrä ylimmäiseksi
+label_sort_higher: Siirrä ylös
+label_sort_lower: Siirrä alas
+label_sort_lowest: Siirrä alimmaiseksi
+label_roadmap: Roadmap
+label_roadmap_due_in: Määräaika
+label_roadmap_overdue: %s myöhässä
+label_roadmap_no_issues: Ei tapahtumia tälle versiolle
+label_search: Haku
+label_result_plural: Tulokset
+label_all_words: kaikki sanat
+label_wiki: Wiki
+label_wiki_edit: Wiki muokkaus
+label_wiki_edit_plural: Wiki muokkaukset
+label_wiki_page: Wiki sivu
+label_wiki_page_plural: Wiki sivut
+label_index_by_title: Hakemisto otsikoittain
+label_index_by_date: Hakemisto päivittäin
+label_current_version: Nykyinen versio
+label_preview: Esikatselu
+label_feed_plural: Syötteet
+label_changes_details: Kaikkien muutosten yksityiskohdat
+label_issue_tracking: Tapahtumien seuranta
+label_spent_time: Käytetty aika
+label_f_hour: %.2f tunti
+label_f_hour_plural: %.2f tuntia
+label_time_tracking: Ajan seuranta
+label_change_plural: Muutokset
+label_statistics: Tilastot
+label_commits_per_month: Tapahtumaa per kuukausi
+label_commits_per_author: Tapahtumaa per tekijä
+label_view_diff: Näytä erot
+label_diff_inline: sisällössä
+label_diff_side_by_side: vierekkäin
+label_options: Valinnat
+label_copy_workflow_from: Kopioi työnkulku
+label_permissions_report: Oikeuksien raportti
+label_watched_issues: Seurattavat tapahtumat
+label_related_issues: Liittyvät tapahtumat
+label_applied_status: Lisätty tila
+label_loading: Lataa...
+label_relation_new: Uusi suhde
+label_relation_delete: Poista suhde
+label_relates_to: liittyy
+label_duplicates: kaksoiskappale
+label_blocks: estää
+label_blocked_by: estetty
+label_precedes: edeltää
+label_follows: seuraa
+label_end_to_start: loppu alkuun
+label_end_to_end: loppu loppuun
+label_start_to_start: alku alkuun
+label_start_to_end: alku loppuun
+label_stay_logged_in: Pysy kirjautuneena
+label_disabled: poistettu käytöstä
+label_show_completed_versions: Näytä valmiit versiot
+label_me: minä
+label_board: Keskustelupalsta
+label_board_new: Uusi keskustelupalsta
+label_board_plural: Keskustelupalstat
+label_topic_plural: Aiheet
+label_message_plural: Viestit
+label_message_last: Viimeisin viesti
+label_message_new: Uusi viesti
+label_reply_plural: Vastaukset
+label_send_information: Lähetä tilin tiedot käyttäjälle
+label_year: Vuosi
+label_month: Kuukausi
+label_week: Viikko
+label_date_from:
+label_date_to:
+label_language_based: Pohjautuen käyttäjän kieleen
+label_sort_by: Lajittele %s
+label_send_test_email: Lähetä testi sähköposti
+label_feeds_access_key_created_on: RSS pääsy avain luotiin %s sitten
+label_module_plural: Moduulit
+label_added_time_by: Lisännyt %s %s sitten
+label_updated_time: Päivitetty %s sitten
+label_jump_to_a_project: Siirry projektiin...
+label_file_plural: Tiedostot
+label_changeset_plural: Muutosryhmät
+label_default_columns: Vakio sarakkeet
+label_no_change_option: (Ei muutosta)
+label_bulk_edit_selected_issues: Perusmuotoile valitut tapahtumat
+label_theme: Teema
+label_default: Vakio
+label_search_titles_only: Haek vain otsikot
+label_user_mail_option_all: "Kaikista tapahtumista kaikissa projekteistani"
+label_user_mail_option_selected: "Kaikista tapahtumista vain valitsemistani projekteista..."
+label_user_mail_option_none: "Vain tapahtumista joita valvon tai olen mukana"
+label_user_mail_no_self_notified: "En halua muistutusta muutoksista joita itse teen"
+label_registration_activation_by_email: tilin aktivointi sähköpostitse
+label_registration_manual_activation: manuaalinen tilin aktivointi
+label_registration_automatic_activation: automaattinen tilin aktivointi
+label_display_per_page: 'Per sivu: %s'
+label_age: Ikä
+label_change_properties: Vaihda asetuksia
+label_general: Yleinen
+label_date_to: To
+label_date_from: From
+label_in: in
+label_on: 'on'
+
+button_login: Kirjaudu
+button_submit: Lähetä
+button_save: Tallenna
+button_check_all: Valitse kaikki
+button_uncheck_all: Poista valinnat
+button_delete: Poista
+button_create: Luo
+button_test: Testaa
+button_edit: Muokkaa
+button_add: Lisää
+button_change: Muuta
+button_apply: Ota käyttöön
+button_clear: Tyhjää
+button_lock: Lukitse
+button_unlock: Vapauta
+button_download: Lataa
+button_list: Lista
+button_view: Näytä
+button_move: Siirrä
+button_back: Takaisin
+button_cancel: Peruuta
+button_activate: Aktivoi
+button_sort: Järjestä
+button_log_time: Seuraa aikaa
+button_rollback: Siirry takaisin tähän versioon
+button_watch: Vahdi
+button_unwatch: Älä vahdi
+button_reply: Vastaa
+button_archive: Arkistoi
+button_unarchive: Palauta
+button_reset: Nollaus
+button_rename: Uudelleen nimeä
+button_change_password: Vaihda salasana
+button_copy: Kopioi
+button_annotate: Lisää selitys
+button_update: Päivitä
+
+status_active: aktiivinen
+status_registered: rekisteröity
+status_locked: lukittu
+
+text_select_mail_notifications: Valitse tapahtumat joista tulisi lähettää sähköpostimuistutus.
+text_regexp_info: esim. ^[A-Z0-9]+$
+text_min_max_length_info: 0 tarkoitta, ei rajoitusta
+text_project_destroy_confirmation: Oletko varma että haluat poistaa tämän projektin ja kaikki siihen kuuluvat tiedot?
+text_workflow_edit: Valitse rooli ja tiketti muokataksesi työnkulkua
+text_are_you_sure: Oletko varma?
+text_journal_changed: %s muutettu arvoksi %s
+text_journal_set_to: muutettu %s
+text_journal_deleted: poistettu
+text_tip_task_begin_day: tehtävä joka alkaa tänä päivänä
+text_tip_task_end_day: tehtävä joka loppuu tänä päivänä
+text_tip_task_begin_end_day: tehtävä joka alkaa ja loppuu tänä päivänä
+text_project_identifier_info: 'Pienet kirjaimet (a-z), numerot ja viivat ovat sallittu.<br />Tallentamisen jälkeen tunnistetta ei voi muuttaa.'
+text_caracters_maximum: %d merkkiä enintään.
+text_caracters_minimum: Täytyy olla vähintään %d merkkiä pitkä.
+text_length_between: Pituus välillä %d ja %d merkkiä.
+text_tracker_no_workflow: Ei työnkulkua määritelty tälle tiketille
+text_unallowed_characters: Kiellettyjä merkkejä
+text_comma_separated: Useat arvot sallittu (pilkku eroteltuna).
+text_issues_ref_in_commit_messages: Liitän ja korjaan ongelmia syötetyssä viestissä
+text_issue_added: Tapahtuma %s on kirjattu.
+text_issue_updated: Tapahtuma %s on päivitetty.
+text_wiki_destroy_confirmation: Oletko varma että haluat poistaa tämän wiki:n ja kaikki sen sisältämän tiedon?
+text_issue_category_destroy_question: Jotkut tapahtumat (%d) ovat nimetty tälle luokalle. Mitä haluat tehdä?
+text_issue_category_destroy_assignments: Poista luokan tehtävät
+text_issue_category_reassign_to: Vaihda tapahtuma tähän luokkaan
+text_user_mail_option: "Valitesemattomille projekteille, saat vain muistutuksen asioista joita vahdit tai olet mukana (esim. tapahtumat joissa olet tekijä tai nimettynä)."
+text_no_configuration_data: "Rooleja, tikettejä, tapahtumien tiloja ja työnkulkua ei vielä olla määritelty.\nOn erittäin suotavaa ladata vakioasetukset. Voit muuttaa sitä latauksen jälkeen."
+text_load_default_configuration: Lataa vakioasetukset
+
+default_role_manager: Päälikkö
+default_role_developper: Kehittäjä
+default_role_reporter: Tarkastelija
+default_tracker_bug: Ohjelmointivirhe
+default_tracker_feature: Ominaisuus
+default_tracker_support: Tuki
+default_issue_status_new: Uusi
+default_issue_status_assigned: Nimetty
+default_issue_status_resolved: Hyväksytty
+default_issue_status_feedback: Palaute
+default_issue_status_closed: Suljettu
+default_issue_status_rejected: Hylätty
+default_doc_category_user: Käyttäjä dokumentaatio
+default_doc_category_tech: Tekninen dokumentaatio
+default_priority_low: Matala
+default_priority_normal: Normaali
+default_priority_high: Korkea
+default_priority_urgent: Kiireellinen
+default_priority_immediate: Valitön
+default_activity_design: Suunnittelu
+default_activity_development: Kehitys
+
+enumeration_issue_priorities: Tapahtuman prioriteetit
+enumeration_doc_categories: Dokumentin luokat
+enumeration_activities: Aktiviteetit (ajan seuranta)
diff --git a/lang/ko.yml b/lang/ko.yml
index aad58d188..75a4bef4c 100644
--- a/lang/ko.yml
+++ b/lang/ko.yml
@@ -19,22 +19,22 @@ actionview_datehelper_time_in_words_second_less_than: 1초 이내
 actionview_datehelper_time_in_words_second_less_than_plural: %d 초 이전
 actionview_instancetag_blank_option: 선택하세요
 
-activerecord_error_inclusion: is not included in the list
-activerecord_error_exclusion: is reserved
-activerecord_error_invalid: is invalid
-activerecord_error_confirmation: doesn't match confirmation
+activerecord_error_inclusion: 은(는) 목록에 포함되어 있지 않습니다.
+activerecord_error_exclusion: 은(는) 예약되어 있습니다.
+activerecord_error_invalid: 은(는) 유효하지 않습니다.
+activerecord_error_confirmation: 는 제약조건(confirmation)에 맞지 않습니다.
 activerecord_error_accepted: must be accepted
-activerecord_error_empty: can't be empty
-activerecord_error_blank: can't be blank
-activerecord_error_too_long: is too long
-activerecord_error_too_short: is too short
-activerecord_error_wrong_length: is the wrong length
-activerecord_error_taken: has already been taken
-activerecord_error_not_a_number: is not a number
-activerecord_error_not_a_date: is not a valid date
-activerecord_error_greater_than_start_date: must be greater than start date
-activerecord_error_not_same_project: doesn't belong to the same project
-activerecord_error_circular_dependency: This relation would create a circular dependency
+activerecord_error_empty: 는 길이가 0일 수가 없습니다.
+activerecord_error_blank: 는 빈 값이어서는 안됩니다.
+activerecord_error_too_long: 는 너무 깁니다.
+activerecord_error_too_short: 는 너무 짧습니다.
+activerecord_error_wrong_length: 는 잘못된 길이입니다.
+activerecord_error_taken: 가 이미 값을 가지고 있습니다. 
+activerecord_error_not_a_number: 는 숫자가 아닙니다.
+activerecord_error_not_a_date: 는 잘못된 날짜 값입니다.
+activerecord_error_greater_than_start_date: 는 시작날짜보다 커야 합니다.
+activerecord_error_not_same_project: 는 같은 프로젝트에 속해 있지 않습니다.
+activerecord_error_circular_dependency: 이 관계는 순환 의존관계를 만들 수있습니다.
 
 general_fmt_age: %d 년
 general_fmt_age_plural: %d 년
@@ -49,7 +49,7 @@ general_text_yes: '예'
 general_lang_name: 'Korean (한국어)'
 general_csv_separator: ','
 general_csv_encoding: CP949
-general_pdf_encoding: UHC
+general_pdf_encoding: CP949
 general_day_names: 월요일,화요일,수요일,목요일,금요일,토요일,일요일
 general_first_day_of_week: '7'
 
@@ -71,10 +71,10 @@ notice_locking_conflict: 다른 사용자에 의해서 데이터가 변경되었
 notice_scm_error: 소스 저장소에 해당 내용이 존재하지 않습니다.
 notice_not_authorized: 이 페이지에 접근할 권한이 없습니다.
 notice_email_sent: %s 님에게 Email이 발송되었습니다.
-notice_email_error: Email을 전송하는 과정에 오류가 발생했습니다. (%s)
+notice_email_error: 메일을 전송하는 과정에 오류가 발생했습니다. (%s)
 notice_feeds_access_key_reseted: RSS에 접근가능한 열쇠(key)가 생성되었습니다.
 notice_failed_to_save_issues: "Failed to save %d issue(s) on %d selected: %s."
-notice_no_issue_selected: "문제가 선택되지 않았습니다. 수정하기 원하는 문제를 선택하세요"
+notice_no_issue_selected: "티켓이 선택되지 않았습니다. 수정하기 원하는 티켓을 선택하세요"
 
 mail_subject_lost_password: 당신의 비밀번호
 mail_body_lost_password: '비밀번호를 변경하기 위해서 링크를 이용하세요'
@@ -88,9 +88,9 @@ field_name: 이름
 field_description: 설명
 field_summary: 요약
 field_is_required: 필수
-field_firstname: 성
-field_lastname: 이름
-field_mail: Email
+field_firstname: 이름
+field_lastname: 성
+field_mail: 메일
 field_filename: 파일
 field_filesize: 크기
 field_downloads: 다운로드
@@ -107,24 +107,24 @@ field_value: 값
 field_category: 카테고리
 field_title: 제목
 field_project: 프로젝트
-field_issue: 문제
+field_issue: 티켓
 field_status: 상태
 field_notes: 노트
-field_is_closed: 완료된 문제
+field_is_closed: 완료된 티켓
 field_is_default: 기본값
 field_tracker: 구분
 field_subject: 제목
 field_due_date: 완료 기한
 field_assigned_to: 담당자
-field_priority: 심각도
-field_fixed_version: 고쳐진 버전
+field_priority: 우선순위
+field_fixed_version: 마일스톤
 field_user: 유저
 field_role: 역할
 field_homepage: 홈페이지
 field_is_public: 공개
 field_parent: 상위 프로젝트
-field_is_in_chlog: 변화목록(changelog)에서 보여지는 문제들
-field_is_in_roadmap: 로드맵에서 보여지는 문제들
+field_is_in_chlog: 변경이력(changelog)에서 보여지는 티켓들
+field_is_in_roadmap: 로드맵에서 보여지는 티켓들
 field_login: 로그인
 field_mail_notification: 메일 알림
 field_admin: 관리자
@@ -136,58 +136,58 @@ field_new_password: 신규 비밀번호
 field_password_confirmation: 비밀번호 확인
 field_version: 버전
 field_type: 타입
-field_host: Host
-field_port: Port
+field_host: 호스트
+field_port: 포트
 field_account: 계정
 field_base_dn: Base DN
-field_attr_login: Login attribute
-field_attr_firstname: Firstname attribute
-field_attr_lastname: Lastname attribute
-field_attr_mail: Email attribute
+field_attr_login: 로그인 속성
+field_attr_firstname: 이름 속성
+field_attr_lastname: 성 속성
+field_attr_mail: 메일 속성
 field_onthefly: On-the-fly user creation
 field_start_date: 시작시간
 field_done_ratio: 완료 %%
 field_auth_source: 인증 방법
-field_hide_mail: 내 Email주소 숨기기 
+field_hide_mail: 내 메일 주소 숨기기 
 field_comments: 코멘트
 field_url: URL
 field_start_page: 시작 페이지
 field_subproject: 서브 프로젝트
 field_hours: 시간
-field_activity: Activity
-field_spent_on: Date
+field_activity: 작업종류
+field_spent_on: 작업시간
 field_identifier: 식별자
-field_is_filter: Used as a filter
-field_issue_to_id: 연관된 문제
+field_is_filter: 필터로 사용됨
+field_issue_to_id: 연관된 티켓
 field_delay: 지연
-field_assignable: 이 역할에 할당될수 있는 문제
+field_assignable: 이 역할에 할당될수 있는 티켓
 field_redirect_existing_links: Redirect existing links
 field_estimated_hours: 추정시간
 field_column_names: 컬럼
 
-setting_app_title: Application title
-setting_app_subtitle: Application subtitle
-setting_welcome_text: Welcome text
-setting_default_language: Default language
-setting_login_required: Authent. required
+setting_app_title: 레드마인 제목
+setting_app_subtitle: 레드마인 부제목
+setting_welcome_text: 환영 메시지
+setting_default_language: 기본 언어
+setting_login_required: 인증이 필요함.
 setting_self_registration: Self-registration
-setting_attachment_max_size: Attachment max. size
+setting_attachment_max_size: 최대 첨부파일 크기
 setting_issues_export_limit: Issues export limit
 setting_mail_from: Emission mail address
-setting_host_name: Host name
-setting_text_formatting: Text formatting
-setting_wiki_compression: Wiki history compression
+setting_host_name: 호스트 이름 
+setting_text_formatting: 텍스트 형식
+setting_wiki_compression: 위키 기록(history) 압축
 setting_feeds_limit: Feed content limit
 setting_autofetch_changesets: Autofetch commits
 setting_sys_api_enabled: Enable WS for repository management
-setting_commit_ref_keywords: Referencing keywords
-setting_commit_fix_keywords: Fixing keywords
-setting_autologin: Autologin
-setting_date_format: Date format
-setting_cross_project_issue_relations: Allow cross-project issue relations
-setting_issue_list_default_columns: Default columns displayed on the issue list
-setting_repositories_encodings: Repositories encodings
-setting_emails_footer: Emails footer
+setting_commit_ref_keywords: 티켓 참조에 사용할 키워드들
+setting_commit_fix_keywords: 티켓 해결에 사용할 키워드들 
+setting_autologin: 자동 로그인
+setting_date_format: 날짜 형식
+setting_cross_project_issue_relations: 프로젝트 간에 이슈에 관련을 맺는 것을 허용
+setting_issue_list_default_columns: 티켓 목록에 보여줄 기본 컬럼들 
+setting_repositories_encodings:  저장소 인코딩
+setting_emails_footer: 메일 꼬리
 
 label_user: 사용자
 label_user_plural: 사용자관리
@@ -197,10 +197,10 @@ label_project_new: 신규 프로젝트
 label_project_plural: 프로젝트
 label_project_all: 모든 프로젝트
 label_project_latest: 최근 프로젝트
-label_issue: 문제 보기
-label_issue_new: 새로운 문제
-label_issue_plural: 문제 보기
-label_issue_view_all: 모든 문제 보기
+label_issue: 티켓 보기
+label_issue_new: 새 티켓만들기
+label_issue_plural: 티켓 보기
+label_issue_view_all: 모든 티켓 보기
 label_document: 문서
 label_document_new: 새로운 문서
 label_document_plural: 문서
@@ -211,13 +211,13 @@ label_role_and_permissions: 권한관리
 label_member: 담당자
 label_member_new: 새로운 담당자
 label_member_plural: 담당자
-label_tracker: 문제 유형
-label_tracker_plural: 문제 유형
-label_tracker_new: 새로운 문제 유형
+label_tracker: 티켓 유형
+label_tracker_plural: 티켓 유형
+label_tracker_new: 새로운 티켓 유형
 label_workflow: 워크플로(Workflow)
-label_issue_status: 문제 상태
-label_issue_status_plural: 문제 상태
-label_issue_status_new: 새로운 문제 상태
+label_issue_status: 티켓 상태
+label_issue_status_plural: 티켓 상태
+label_issue_status_new: 새로운 티켓 상태
 label_issue_category: 카테고리
 label_issue_category_plural: 카테고리
 label_issue_category_new: 새 카테고리
@@ -230,7 +230,7 @@ label_information: 정보
 label_information_plural: 정보
 label_please_login: 로그인하세요.
 label_register: 등록
-label_password_lost: Lost password
+label_password_lost: 비밀번호 찾기
 label_home: 초기화면
 label_my_page: 내페이지
 label_my_account: 내계정
@@ -239,8 +239,8 @@ label_administration: 관리자
 label_login: 로그인
 label_logout: 로그아웃
 label_help: 도움말
-label_reported_issues: 보고된 문제
-label_assigned_to_me_issues: 나에게 할당된 문제
+label_reported_issues: 보고된 티켓
+label_assigned_to_me_issues: 나에게 할당된 티켓
 label_last_login: 최종 접속
 label_last_updates: 최종 변경 내역
 label_last_updates_plural: 최종변경 %d 
@@ -257,11 +257,11 @@ label_subproject_plural: 서브 프로젝트
 label_min_max_length: 최소 - 최대 길이
 label_list: 리스트
 label_date: 날짜
-label_integer: Integer
-label_float: Float
-label_boolean: Boolean
-label_string: Text
-label_text: Long text
+label_integer: 정수
+label_float: 부동상수
+label_boolean: 부울린
+label_string: 문자열
+label_text: 텍스트
 label_attribute: 속성
 label_attribute_plural: 속성
 label_download: %d 다운로드
@@ -292,25 +292,25 @@ label_read: 읽기...
 label_public_projects: 공개된 프로젝트
 label_open_issues: 진행중
 label_open_issues_plural: 진행중
-label_closed_issues: 해결됨
-label_closed_issues_plural: 해결됨
+label_closed_issues: 완료됨
+label_closed_issues_plural: 완료됨
 label_total: Total
 label_permissions: 허가권한
-label_current_status: 문제 상태
-label_new_statuses_allowed: 허용되는 문제 상태
+label_current_status: 티켓 상태
+label_new_statuses_allowed: 허용되는 티켓 상태
 label_all: 모두
 label_none: 없음
 label_next: 다음
 label_previous: 이전
 label_used_by: 사용됨
 label_details: 상세
-label_add_note: 문제노트 추가
+label_add_note: 티켓노트 추가
 label_per_page: 페이지별
 label_calendar: 달력
 label_months_from: 개월 동안 | 다음부터 
 label_gantt: Gantt 챠트
 label_internal: Internal
-label_last_changes: last %d changes
+label_last_changes: 지난 변경사항 %d 건
 label_change_view_all: 모든 변경 내역 보기
 label_personalize_page: 입맛대로 구성하기(Drag & Drop)
 label_comment: 댓글
@@ -318,9 +318,9 @@ label_comment_plural: 댓글
 label_comment_add: 댓글 추가
 label_comment_added: 댓글이 추가되었습니다.
 label_comment_delete: 댓글 삭제
-label_query: 커스텀 쿼리(custom query)
-label_query_plural: 커스텀 쿼리
-label_query_new: 새로운 커스텀 쿼리
+label_query: 사용자 검색조건
+label_query_plural: 사용자 검색조건
+label_query_new: 새로운 사용자 검색조건
 label_filter_add: 필터 추가
 label_filter_plural: 필터
 label_equals: 이다
@@ -357,7 +357,7 @@ label_sort_lowest: 최하단으로
 label_roadmap: 로드맵
 label_roadmap_due_in: 기한 
 label_roadmap_overdue: %s 지연
-label_roadmap_no_issues: 이버전에 해당하는 문제 없음
+label_roadmap_no_issues: 이버전에 해당하는 티켓 없음
 label_search: 검색
 label_result_plural: 결과
 label_all_words: 모든 단어
@@ -372,39 +372,39 @@ label_current_version: 현재 버전
 label_preview: 미리보기
 label_feed_plural: 피드(Feeds)
 label_changes_details: 모든 상세 변경 내역
-label_issue_tracking: 문제 추적
+label_issue_tracking: 티켓 추적
 label_spent_time: 작업 시간
 label_f_hour: %.2f 시간
 label_f_hour_plural: %.2f 시간
-label_time_tracking: Time tracking
-label_change_plural: Changes
+label_time_tracking: 시간추적
+label_change_plural: 변경사항들
 label_statistics: 통계
-label_commits_per_month: 월별 commit 내역
-label_commits_per_author: 아이디별 commit 내역
+label_commits_per_month: 월별 커밋 내역
+label_commits_per_author: 아이디별 커밋 내역
 label_view_diff: diff 보기
-label_diff_inline: inline
-label_diff_side_by_side: side by side
+label_diff_inline: 한줄로
+label_diff_side_by_side: 두줄로
 label_options: Options
 label_copy_workflow_from: Copy workflow from
-label_permissions_report: Permissions report
-label_watched_issues: 감시중인 문제
-label_related_issues: 연결된 문제
+label_permissions_report: 권한 보고서
+label_watched_issues: 감시중인 티켓
+label_related_issues: 연결된 티켓
 label_applied_status: Applied status
-label_loading: Loading...
+label_loading: 읽는 중...
 label_relation_new: New relation
 label_relation_delete: Delete relation
-label_relates_to: related to
-label_duplicates: duplicates
-label_blocks: blocks
-label_blocked_by: blocked by
-label_precedes: precedes
-label_follows: follows
+label_relates_to: 다음 티켓과 관련되어 있음
+label_duplicates: 다음 티켓과 중복됨.
+label_blocks: 다음 티켓을 해결을 막고 있음.
+label_blocked_by: 막고 있는 티켓
+label_precedes: 다음 티켓보다 앞서서 처리해야 함.
+label_follows: 선처리티켓
 label_end_to_start: end to start
 label_end_to_end: end to end
 label_start_to_start: start to start
 label_start_to_end: start to end
 label_stay_logged_in: 로그인 유지
-label_disabled: disabled
+label_disabled: 비활성화
 label_show_completed_versions: 완료된 버전 보기
 label_me: 나
 label_board: 게시판
@@ -419,27 +419,27 @@ label_send_information: 사용자에게 계정정보를 보냄
 label_year: 년
 label_month: 월
 label_week: 주
-label_date_from: From
-label_date_to: To
+label_date_from: 에서
+label_date_to: (으)로
 label_language_based: Language based
-label_sort_by: Sort by %s
-label_send_test_email: Send a test email
+label_sort_by: 정렬방법(%s)
+label_send_test_email: 테스트 메일 보내기
 label_feeds_access_key_created_on: RSS access key created %s ago
-label_module_plural: Modules
-label_added_time_by: Added by %s %s ago
-label_updated_time: Updated %s ago
-label_jump_to_a_project: Jump to a project...
-label_file_plural: Files
-label_changeset_plural: Changesets
-label_default_columns: Default columns
-label_no_change_option: (No change)
-label_bulk_edit_selected_issues: Bulk edit selected issues
-label_theme: Theme
-label_default: Default
-label_search_titles_only: Search titles only
-label_user_mail_option_all: "For any event on all my projects"
-label_user_mail_option_selected: "For any event on the selected projects only..."
-label_user_mail_option_none: "Only for things I watch or I'm involved in"
+label_module_plural: 모듈
+label_added_time_by: %s이(가) %s 전에 추가함
+label_updated_time: %s 전에 수정됨
+label_jump_to_a_project: 다른 프로젝트로 이동하기
+label_file_plural: 파일
+label_changeset_plural: 변경사항
+label_default_columns: 기본 컬럼
+label_no_change_option: (수정 안함)
+label_bulk_edit_selected_issues: 선택된 티켓들을 한꺼번에 수정하기
+label_theme: 테마
+label_default: 기본
+label_search_titles_only: 제목에서만 찾기
+label_user_mail_option_all: "내가 속한 프로젝트로들부터 모든 메일 받기"
+label_user_mail_option_selected: "선택한 프로젝트들로부터 모든 메일 받기.."
+label_user_mail_option_none: "내가 속하거나 감시 중인 사항에 대해서만"
 
 button_login: 로그인
 button_submit: 확인
@@ -449,7 +449,7 @@ button_uncheck_all: 선택해제
 button_delete: 삭제
 button_create: 완료
 button_test: 테스트
-button_edit: 수정
+button_edit: 편집
 button_add: 추가
 button_change: 변경
 button_apply: 적용
@@ -478,14 +478,14 @@ status_active: 사용중
 status_registered: 등록대기
 status_locked: 잠김
 
-text_select_mail_notifications: 메일통지가 필요한 작업을 선택하세요.
+text_select_mail_notifications: 알림메일이 필요한 작업을 선택하세요.
 text_regexp_info: 예) ^[A-Z0-9]+$
 text_min_max_length_info: 0 는 제한이 없음을 의미함
 text_project_destroy_confirmation: 이 프로젝트를 삭제하고 모든 데이터를 지우시겠습니까?
-text_workflow_edit: 워크플로를 수정하기 위해서 역할과 문제유형을 선택하세요.
+text_workflow_edit: 워크플로를 수정하기 위해서 역할과 티켓유형을 선택하세요.
 text_are_you_sure: 계속 진행 하시겠습니까?
-text_journal_changed: 변경됨 from %s to %s
-text_journal_set_to: set to %s
+text_journal_changed: %s에서 %s(으)로 변경
+text_journal_set_to:  %s로 설정
 text_journal_deleted: 삭제됨
 text_tip_task_begin_day: 오늘 시작하는 업무(task)
 text_tip_task_end_day: 오늘 종료하는 업무(task)
@@ -493,71 +493,71 @@ text_tip_task_begin_end_day: 오늘 시작하고 종료하는 업무(task)
 text_project_identifier_info: '영문 소문자 (a-z), 및 숫자 대쉬(-) 가능.<br />저장된후에는 식별자 변경 불가능.'
 text_caracters_maximum: 최대 %d 글자 가능.
 text_length_between: %d 에서 %d 글자
-text_tracker_no_workflow: No workflow defined for this tracker
-text_unallowed_characters: Unallowed characters
-text_comma_separated: Multiple values allowed (comma separated).
-text_issues_ref_in_commit_messages: Referencing and fixing issues in commit messages
-text_issue_added: Issue %s has been reported.
-text_issue_updated: Issue %s has been updated.
-text_wiki_destroy_confirmation: Are you sure you want to delete this wiki and all its content ?
-text_issue_category_destroy_question: Some issues (%d) are assigned to this category. What do you want to do ?
-text_issue_category_destroy_assignments: Remove category assignments
-text_issue_category_reassign_to: Reassign issues to this category
-text_user_mail_option: "For unselected projects, you will only receive notifications about things you watch or you're involved in (eg. issues you're the author or assignee)."
+text_tracker_no_workflow: 이 추적타입(tracker)에 워크플로우가 정의되지 않았습니다.
+text_unallowed_characters: 허용되지 않는 문자열
+text_comma_separated: 복수의 값들이 허용됩니다.(구분자 ,)
+text_issues_ref_in_commit_messages: 커밋메시지에서 티켓을 참조하거나 해결하기
+text_issue_added: 티켓[%s]이 보고되었습니다.
+text_issue_updated: 티켓[%s]이 수정되었습니다.
+text_wiki_destroy_confirmation: 이 위키와 모든 내용을 지우시겠습니까?
+text_issue_category_destroy_question: 일부 티켓들(%d개)이 이 카테고리에 할당되어 있습니다. 어떻게 하시겠습니까?
+text_issue_category_destroy_assignments: 카테고리 할당 지우기
+text_issue_category_reassign_to: 티켓을 이 카테고리에 다시 할당하기
+text_user_mail_option: "선택하지 않은 프로젝트에서도, 모니터링 중이거나 속해있는 사항(티켓을 발행했거나 할당된 경우)이 있으면 알림메일을 받게 됩니다."
 
-default_role_manager: Manager
-default_role_developper: Developer
-default_role_reporter: Reporter
+default_role_manager: 관리자
+default_role_developper: 개발자
+default_role_reporter: 보고자
 default_tracker_bug: 버그
 default_tracker_feature: 새기능
-default_tracker_support: 유지보수
-default_issue_status_new: 새로운문제
-default_issue_status_assigned: 문제확인
-default_issue_status_resolved: 문제수정
+default_tracker_support: 지원
+default_issue_status_new: 신규
+default_issue_status_assigned: 확인
+default_issue_status_resolved: 해결
 default_issue_status_feedback: 피드백
-default_issue_status_closed: 문제해결
-default_issue_status_rejected: 재수정요청
+default_issue_status_closed: 완료
+default_issue_status_rejected: 재처리
 default_doc_category_user: 사용자 문서
 default_doc_category_tech: 기술 문서
-default_priority_low: 사소
+default_priority_low: 낮음
 default_priority_normal: 보통
-default_priority_high: 심각
+default_priority_high: 높음
 default_priority_urgent: 긴급
-default_priority_immediate: 지금즉시
-default_activity_design: Design
-default_activity_development: Development
+default_priority_immediate: 즉시
+default_activity_design: 설계
+default_activity_development: 개발
 
-enumeration_issue_priorities: Issue priorities
-enumeration_doc_categories: Document categories
-enumeration_activities: Activities (time tracking)
-button_copy: Copy
-mail_body_account_information_external: You can use your "%s" account to log into Redmine.
-button_change_password: Change password
+enumeration_issue_priorities: 티켓 우선순위
+enumeration_doc_categories: 문서 카테고리
+enumeration_activities: 진행활동(시간 추적)
+button_copy: 복사
+mail_body_account_information_external: 레드마인에 로그인할 때 "%s" 계정을 사용하실 수 있습니다.
+button_change_password: 비밀번호 변경
 label_nobody: nobody
-setting_protocol: Protocol
-mail_body_account_information: Your Redmine account information
-label_user_mail_no_self_notified: "I don't want to be notified of changes that I make myself"
-setting_time_format: Time format
-label_registration_activation_by_email: account activation by email
-mail_subject_account_activation_request: Redmine account activation request
-mail_body_account_activation_request: 'A new user (%s) has registered. His account his pending your approval:'
-label_registration_automatic_activation: automatic account activation
-label_registration_manual_activation: manual account activation
-notice_account_pending: "Your account was created and is now pending administrator approval."
-field_time_zone: Time zone
-text_caracters_minimum: Must be at least %d characters long.
-setting_bcc_recipients: Blind carbon copy recipients (bcc)
+setting_protocol: 프로토콜
+mail_body_account_information: Redmine 계정 정보
+label_user_mail_no_self_notified: "내가 만든 변경사항들에 대해서는 알림메일을 받지 않습니다."
+setting_time_format: 시간 형식
+label_registration_activation_by_email: 메일로 계정을 활성화하기
+mail_subject_account_activation_request: 레드마인 계정 활성화 요청
+mail_body_account_activation_request: '새 계정(%s)이 등록되었습니다. 관리자님의 승인을 기다리고 있습니다.:'
+label_registration_automatic_activation: 자동 계정 활성화
+label_registration_manual_activation: 수동 계정 활성화
+notice_account_pending: "계정이 만들어 졌습니다. 관리자의 승인이 있을 때까지 기다려야 합니다."
+field_time_zone: 타임존
+text_caracters_minimum: 최소한 %d 글자 이상이어야 합니다.
+setting_bcc_recipients: 참조자들을 bcc로 숨기기
 button_annotate: Annotate
 label_issues_by: Issues by %s
-field_searchable: Searchable
+field_searchable: 검색가능
 label_display_per_page: 'Per page: %s'
 setting_per_page_options: Objects per page options
 label_age: Age
-notice_default_data_loaded: Default configuration successfully loaded.
-text_load_default_configuration: Load the default configuration
-text_no_configuration_data: "Roles, trackers, issue statuses and workflow have not been configured yet.\nIt is highly recommended to load the default configuration. You will be able to modify it once loaded."
-error_can_t_load_default_data: "Default configuration could not be loaded: %s"
-button_update: Update
-label_change_properties: Change properties
-label_general: General
-label_repository_plural: Repositories
+notice_default_data_loaded: 기본 설정을 성공적으로 로드하였습니다.
+text_load_default_configuration: 기본 설정을 로딩하기
+text_no_configuration_data: "역할, 티켓타입, 티켓 상태들과 워크플로가 아직 설정되지 않았습니다.\n기본 설정을 로딩하는 것을 권장합니다. 로드된 후에 수정할 수 있습니다."
+error_can_t_load_default_data: "기본 설정을 로드할 수 없습니다.: %s"
+button_update: 변경사항기록
+label_change_properties: 속성 변경
+label_general: 일반
+label_repository_plural: 저장소들
diff --git a/lang/pl.yml b/lang/pl.yml
index 511bbe81a..3353333b8 100644
--- a/lang/pl.yml
+++ b/lang/pl.yml
@@ -549,15 +549,15 @@ text_caracters_minimum: Musi być nie krótsze niż %d znaków.
 setting_bcc_recipients: Odbiorcy kopii tajnej (kt/bcc)
 button_annotate: Adnotuj
 label_issues_by: Zagadnienia wprowadzone przez %s
-field_searchable: Searchable
-label_display_per_page: 'Per page: %s'
-setting_per_page_options: Objects per page options
-label_age: Age
-notice_default_data_loaded: Default configuration successfully loaded.
-text_load_default_configuration: Load the default configuration
-text_no_configuration_data: "Roles, trackers, issue statuses and workflow have not been configured yet.\nIt is highly recommended to load the default configuration. You will be able to modify it once loaded."
-error_can_t_load_default_data: "Default configuration could not be loaded: %s"
-button_update: Update
-label_change_properties: Change properties
-label_general: General
-label_repository_plural: Repositories
+field_searchable: Przeszukiwalne
+label_display_per_page: 'Na stronę: %s'
+setting_per_page_options: Opcje ilości obiektów na stronie
+label_age: Wiek
+notice_default_data_loaded: Domyślna konfiguracja została pomyślnie załadowana.
+text_load_default_configuration: Załaduj domyślną konfigurację
+text_no_configuration_data: "Role użytkowników, typy zagadnień, statusy zagadnień oraz przepływ pracy nie zostały jeszcze skonfigurowane.\nJest wysoce rekomendowane by załadować domyślną konfigurację. Po załadowaniu będzie możliwość edycji tych danych."
+error_can_t_load_default_data: "Domyślna konfiguracja nie może być załadowana: %s"
+button_update: Uaktualnij
+label_change_properties: Zmień właściwości
+label_general: Ogólne
+label_repository_plural: Repozytoria
diff --git a/lang/ru.yml b/lang/ru.yml
index fba18462e..131b5c77c 100644
--- a/lang/ru.yml
+++ b/lang/ru.yml
@@ -180,13 +180,13 @@ setting_host_name: Имя компьютера
 setting_text_formatting: Форматирование текста
 setting_wiki_compression: Сжатие истории Wiki
 setting_feeds_limit: Ограничения вводимого содержания
-setting_autofetch_changesets: Autofetch коммиты
+setting_autofetch_changesets: Автоматически следить за коммитами
 setting_sys_api_enabled: Разрешить WS для управления репозиторием
 setting_commit_ref_keywords: Ключевые слова для поиска
 setting_commit_fix_keywords: Назначение ключевых слов
 setting_autologin: Автоматический вход
 setting_date_format: Формат даты
-setting_time_format: Time format
+setting_time_format: Формат времени 
 setting_cross_project_issue_relations: Разрешить пересечение задач по проектам
 setting_issue_list_default_columns: Колонки, отображаемые в списке задач по умолчанию
 setting_repositories_encodings: Кодировки репозитория
@@ -534,7 +534,6 @@ default_priority_urgent: Срочный
 default_priority_immediate: Немедленный
 default_activity_design: Проектирование
 default_activity_development: Разработка
-
 enumeration_issue_priorities: Приоритеты задач
 enumeration_doc_categories: Категории документов
 enumeration_activities: Действия (учет времени)
@@ -545,19 +544,19 @@ label_registration_automatic_activation: автоматическая актив
 label_registration_manual_activation: активировать аккаунты вручную
 notice_account_pending: "Ваш аккаунт уже создан и ожидает подтверждения администратора."
 field_time_zone: Часовой пояс
-text_caracters_minimum: Must be at least %d characters long.
-setting_bcc_recipients: Blind carbon copy recipients (bcc)
-button_annotate: Annotate
-label_issues_by: Issues by %s
-field_searchable: Searchable
-label_display_per_page: 'Per page: %s'
-setting_per_page_options: Objects per page options
-label_age: Age
-notice_default_data_loaded: Default configuration successfully loaded.
-text_load_default_configuration: Load the default configuration
-text_no_configuration_data: "Roles, trackers, issue statuses and workflow have not been configured yet.\nIt is highly recommended to load the default configuration. You will be able to modify it once loaded."
-error_can_t_load_default_data: "Default configuration could not be loaded: %s"
-button_update: Update
-label_change_properties: Change properties
-label_general: General
-label_repository_plural: Repositories
+text_caracters_minimum: Должно быть не менее %d знаков.
+setting_bcc_recipients: Использовать скрытые списки (bcc)
+button_annotate: Авторство
+label_issues_by: Сортировать по %s
+field_searchable: Доступно для поиска 
+label_display_per_page: 'На страницу: %s'
+setting_per_page_options: Кол-во строк на страницу
+label_age: Возраст 
+notice_default_data_loaded: Была загружена конфигурация по-умолчанию.
+text_load_default_configuration: Загрузить конфигурацию по-умолчанию
+text_no_configuration_data: "Роли, трекеры, статусы задач и оперативный план не были сконфигурированны.\nНастоятельно рекомендуется загрузить конфигурацию по-умолчанию. Вы сможете её изменить потом."
+error_can_t_load_default_data: "Конфигурация по умолчанию не была загружена: %s"
+button_update: Обновить
+label_change_properties: Изменить свойства
+label_general: Общее
+label_repository_plural: Репозитории
diff --git a/lang/zh-tw.yml b/lang/zh-tw.yml
index 97b31225b..b0c258bcf 100644
--- a/lang/zh-tw.yml
+++ b/lang/zh-tw.yml
@@ -19,22 +19,22 @@ actionview_datehelper_time_in_words_second_less_than: 小於 1 秒
 actionview_datehelper_time_in_words_second_less_than_plural: 小於 %d 秒
 actionview_instancetag_blank_option: 請選擇
 
-activerecord_error_inclusion: is not included in the list
-activerecord_error_exclusion: is reserved
-activerecord_error_invalid: is invalid
-activerecord_error_confirmation: doesn't match confirmation
-activerecord_error_accepted: must be accepted
+activerecord_error_inclusion: 必須被包含
+activerecord_error_exclusion: 必須被排除
+activerecord_error_invalid: 不正確
+activerecord_error_confirmation: 與確認欄位不相符
+activerecord_error_accepted: 必須被接受
 activerecord_error_empty: 不可為空值
 activerecord_error_blank: 不可為空白
 activerecord_error_too_long: 長度過長
 activerecord_error_too_short: 長度太短
-activerecord_error_wrong_length: is the wrong length
-activerecord_error_taken: has already been taken
+activerecord_error_wrong_length: 長度不正確
+activerecord_error_taken: 已經被使用
 activerecord_error_not_a_number: is not a number
-activerecord_error_not_a_date: is not a valid date
-activerecord_error_greater_than_start_date: must be greater than start date
-activerecord_error_not_same_project: doesn't belong to the same project
-activerecord_error_circular_dependency: This relation would create a circular dependency
+activerecord_error_not_a_date: 日期格式不正確
+activerecord_error_greater_than_start_date: 必須在起始日期之後
+activerecord_error_not_same_project: 不屬於同一個專案
+activerecord_error_circular_dependency: 這個關聯會導致環狀相依
 
 general_fmt_age: %d 年
 general_fmt_age_plural: %d yrs
@@ -46,7 +46,7 @@ general_text_No: 'No'
 general_text_Yes: 'Yes'
 general_text_no: 'no'
 general_text_yes: 'yes'
-general_lang_name: 'Chinese (繁體中文)'
+general_lang_name: 'Traditional Chinese (繁體中文)'
 general_csv_separator: ','
 general_csv_encoding: Big5
 general_pdf_encoding: Big5
@@ -68,23 +68,26 @@ notice_successful_delete: 刪除成功
 notice_successful_connection: Successful connection.
 notice_file_not_found: The page you were trying to access doesn't exist or has been removed.
 notice_locking_conflict: Data have been updated by another user.
-notice_scm_error: Entry and/or revision doesn't exist in the repository.
-notice_not_authorized: You are not authorized to access this page.
-notice_email_sent: An email was sent to %s
-notice_email_error: An error occurred while sending mail (%s)
-notice_feeds_access_key_reseted: Your RSS access key was reseted.
+notice_scm_error: SCM 儲存庫中找不到這個專案或版本。
+notice_not_authorized: 你未被授權存取此頁面。
+notice_email_sent: 郵件已經成功寄送至以下收件者： %s
+notice_email_error: 寄送郵件的過程中發生錯誤 (%s)
+notice_feeds_access_key_reseted: 您的 RSS 存取鍵已被重新設定。
 notice_failed_to_save_issues: "Failed to save %d issue(s) on %d selected: %s."
 notice_no_issue_selected: "No issue is selected! Please, check the issues you want to edit."
-notice_account_pending: "Your account was created and is now pending administrator approval."
+notice_account_pending: "您的帳號已經建立，正在等待管理員的審核。"
+notice_default_data_loaded: Default configuration successfully loaded.
 
-mail_subject_lost_password: Your Redmine password
-mail_body_lost_password: 'To change your Redmine password, click on the following link:'
-mail_subject_register: Redmine account activation
-mail_body_register: 'To activate your Redmine account, click on the following link:'
-mail_body_account_information_external: You can use your "%s" account to log into Redmine.
-mail_body_account_information: Your Redmine account information
-mail_subject_account_activation_request: Redmine account activation request
-mail_body_account_activation_request: 'A new user (%s) has registered. His account his pending your approval:'
+error_can_t_load_default_data: "Default configuration could not be loaded: %s"
+
+mail_subject_lost_password: 您的 Redmine 網站密碼
+mail_body_lost_password: '欲變更您的 Redmine 網站密碼, 請點選以下鏈結:'
+mail_subject_register: 啟用您的 Redmine 帳號
+mail_body_register: '欲啟用您的 Redmine 帳號, 請點選以下鏈結:'
+mail_body_account_information_external: 您可以使用 "%s" 帳號登入 Redmine 網站。
+mail_body_account_information: 您的 Redmine 帳號資訊
+mail_subject_account_activation_request: Redmine 帳號啟用需求通知
+mail_body_account_activation_request: '有位新用戶 (%s) 已經完成註冊，正等候您的審核：'
 
 gui_validation_error: 1 個錯誤
 gui_validation_error_plural: %d 個錯誤
@@ -170,6 +173,7 @@ field_redirect_existing_links: Redirect existing links
 field_estimated_hours: 預估工時
 field_column_names: Columns
 field_time_zone: 時區
+field_searchable: 可用做搜尋條件
 
 setting_app_title: 標題
 setting_app_subtitle: 副標題
@@ -192,11 +196,12 @@ setting_commit_fix_keywords: Fixing keywords
 setting_autologin: 自動登入
 setting_date_format: 日期格式
 setting_time_format: 時間格式
-setting_cross_project_issue_relations: Allow cross-project issue relations
+setting_cross_project_issue_relations: 允許關聯至其它專案的項目
 setting_issue_list_default_columns: 預設顯示於項目清單的欄位
 setting_repositories_encodings: Repositories encodings
 setting_emails_footer: 電子郵件附帶說明
 setting_protocol: 協定
+setting_per_page_options: 每頁顯示個數選項
 
 label_user: 用戶
 label_user_plural: 用戶清單
@@ -210,7 +215,7 @@ label_issue: 項目
 label_issue_new: 建立新的項目
 label_issue_plural: 項目清單
 label_issue_view_all: 檢視所有項目
-label_issues_by: Issues by %s
+label_issues_by: 項目按 %s 分組顯示
 label_document: 文件
 label_document_new: 建立新的文件
 label_document_plural: 文件
@@ -311,8 +316,8 @@ label_new_statuses_allowed: New statuses allowed
 label_all: 全部
 label_none: 空值
 label_nobody: nobody
-label_next: Next
-label_previous: Previous
+label_next: 下一頁
+label_previous: 上一頁
 label_used_by: Used by
 label_details: 明細
 label_add_note: 加入一個新筆記
@@ -348,6 +353,7 @@ label_contains: 包含
 label_not_contains: 不包含
 label_day_plural: 天
 label_repository: 版本控管
+label_repository_plural: 版本控管
 label_browse: 瀏覽
 label_modification: %d 變更
 label_modification_plural: %d 變更
@@ -437,17 +443,17 @@ label_sort_by: 按 %s 排序
 label_send_test_email: 寄送測試郵件
 label_feeds_access_key_created_on: RSS 存取鍵建立於 %s 之前
 label_module_plural: 模組
-label_added_time_by: Added by %s %s ago
-label_updated_time: Updated %s ago
+label_added_time_by: 是由 %s 於 %s 前加入
+label_updated_time: 於 %s 前更新
 label_jump_to_a_project: 選擇欲前往的專案...
 label_file_plural: 檔案清單
-label_changeset_plural: Changesets
+label_changeset_plural: 變更集清單
 label_default_columns: 預設欄位清單
-label_no_change_option: (No change)
-label_bulk_edit_selected_issues: Bulk edit selected issues
+label_no_change_option: (維持不變)
+label_bulk_edit_selected_issues: 編輯選定的項目
 label_theme: 畫面主題
-label_default: Default
-label_search_titles_only: Search titles only
+label_default: 預設
+label_search_titles_only: 僅搜尋標題
 label_user_mail_option_all: "提醒與我的專案有關的所有事件"
 label_user_mail_option_selected: "只停醒我所選擇專案中的事件..."
 label_user_mail_option_none: "只提醒我觀察中或參與中的事件"
@@ -455,6 +461,10 @@ label_user_mail_no_self_notified: "不提醒我自己所做的變更"
 label_registration_activation_by_email: 透過電子郵件啟用帳戶
 label_registration_manual_activation: 手動啟用帳戶
 label_registration_automatic_activation: 自動啟用帳戶
+label_display_per_page: '每頁顯示: %s 個'
+label_age: Age
+label_change_properties: Change properties
+label_general: 一般
 
 button_login: 登入
 button_submit: 送出
@@ -491,6 +501,7 @@ button_rename: 重新命名
 button_change_password: 變更密碼
 button_copy: 複製
 button_annotate: 加注
+button_update: 更新
 
 status_active: 活動中
 status_registered: 註冊完成
@@ -509,12 +520,12 @@ text_tip_task_begin_day: task beginning this day
 text_tip_task_end_day: task ending this day
 text_tip_task_begin_end_day: task beginning and ending this day
 text_project_identifier_info: '只允許小寫英文字母（a-z）、阿拉伯數字與連字符號（-）。<br />儲存後，代碼不可再被更改。'
-text_caracters_maximum: %d characters maximum.
-text_caracters_minimum: Must be at least %d characters long.
-text_length_between: Length between %d and %d characters.
+text_caracters_maximum: 最多 %d 個字元.
+text_caracters_minimum: 長度必須大於 %d 個字元.
+text_length_between: 長度必須介於 %d 至 %d 個字元之間.
 text_tracker_no_workflow: No workflow defined for this tracker
 text_unallowed_characters: Unallowed characters
-text_comma_separated: Multiple values allowed (comma separated).
+text_comma_separated: 可輸入多個值 (以逗號分隔).
 text_issues_ref_in_commit_messages: Referencing and fixing issues in commit messages
 text_issue_added: 已通報 %s 個項目
 text_issue_updated: 已更新 %s 個項目
@@ -523,6 +534,8 @@ text_issue_category_destroy_question: Some issues (%d) are assigned to this cate
 text_issue_category_destroy_assignments: Remove category assignments
 text_issue_category_reassign_to: Reassign issues to this category
 text_user_mail_option: "For unselected projects, you will only receive notifications about things you watch or you're involved in (eg. issues you're the author or assignee)."
+text_no_configuration_data: "Roles, trackers, issue statuses and workflow have not been configured yet.\nIt is highly recommended to load the default configuration. You will be able to modify it once loaded."
+text_load_default_configuration: Load the default configuration
 
 default_role_manager: 管理人員
 default_role_developper: 開發人員
@@ -533,7 +546,7 @@ default_tracker_support: 支援
 default_issue_status_new: 新建立
 default_issue_status_assigned: 已指派
 default_issue_status_resolved: 已解決
-default_issue_status_feedback: 回應
+default_issue_status_feedback: 已回應
 default_issue_status_closed: 已結束
 default_issue_status_rejected: 已拒絕
 default_doc_category_user: 使用手冊
@@ -549,15 +562,3 @@ default_activity_development: 開發
 enumeration_issue_priorities: 項目重要性
 enumeration_doc_categories: 文件分類
 enumeration_activities: 活動 (time tracking)
-field_searchable: Searchable
-label_display_per_page: 'Per page: %s'
-setting_per_page_options: Objects per page options
-label_age: Age
-notice_default_data_loaded: Default configuration successfully loaded.
-text_load_default_configuration: Load the default configuration
-text_no_configuration_data: "Roles, trackers, issue statuses and workflow have not been configured yet.\nIt is highly recommended to load the default configuration. You will be able to modify it once loaded."
-error_can_t_load_default_data: "Default configuration could not be loaded: %s"
-button_update: Update
-label_change_properties: Change properties
-label_general: General
-label_repository_plural: Repositories
diff --git a/public/javascripts/calendar/lang/calendar-fi.js b/public/javascripts/calendar/lang/calendar-fi.js
new file mode 100644
index 000000000..5b4ece30f
--- /dev/null
+++ b/public/javascripts/calendar/lang/calendar-fi.js
@@ -0,0 +1,127 @@
+// ** I18N
+
+// Calendar FI language
+// Author: Antti Perkiömäki <antti.perkiomaki@gmail.com>
+// Encoding: any
+// Distributed under the same terms as the calendar itself.
+
+// For translators: please use UTF-8 if possible.  We strongly believe that
+// Unicode is the answer to a real internationalized world.  Also please
+// include your contact information in the header, as can be seen above.
+
+// full day names
+Calendar._DN = new Array
+("Sunnuntai",
+ "Maanantai",
+ "Tiistai",
+ "Keskiviikko",
+ "Torstai",
+ "Perjantai",
+ "Lauantai",
+ "Sunnuntai");
+
+// Please note that the following array of short day names (and the same goes
+// for short month names, _SMN) isn't absolutely necessary.  We give it here
+// for exemplification on how one can customize the short day names, but if
+// they are simply the first N letters of the full name you can simply say:
+//
+//   Calendar._SDN_len = N; // short day name length
+//   Calendar._SMN_len = N; // short month name length
+//
+// If N = 3 then this is not needed either since we assume a value of 3 if not
+// present, to be compatible with translation files that were written before
+// this feature.
+
+// short day names
+Calendar._SDN = new Array
+("Su",
+ "Ma",
+ "Ti",
+ "Ke",
+ "To",
+ "Pe",
+ "La",
+ "Su");
+
+// First day of the week. "0" means display Sunday first, "1" means display
+// Monday first, etc.
+Calendar._FD = 1;
+
+// full month names
+Calendar._MN = new Array
+("Tammikuu",
+ "Helmikuu",
+ "Maaliskuu",
+ "Huhtikuu",
+ "Toukokuu",
+ "Kesäkuu",
+ "Heinäkuu",
+ "Elokuu",
+ "Syyskuu",
+ "Lokakuu",
+ "Marraskuu",
+ "Joulukuu");
+
+// short month names
+Calendar._SMN = new Array
+("Tammi",
+ "Helmi",
+ "Maalis",
+ "Huhti",
+ "Touko",
+ "Kesä",
+ "Heinä",
+ "Elo",
+ "Syys",
+ "Loka",
+ "Marras",
+ "Dec");
+
+// tooltips
+Calendar._TT = {};
+Calendar._TT["INFO"] = "Tietoa kalenterista";
+
+Calendar._TT["ABOUT"] =
+"DHTML Date/Time Selector\n" +
+"(c) dynarch.com 2002-2005 / Tekijä: Mihai Bazon\n" + // don't translate this this ;-)
+"Viimeisin versio: http://www.dynarch.com/projects/calendar/\n" +
+"Jaettu GNU LGPL alaisena. Katso lisätiedot http://gnu.org/licenses/lgpl.html" +
+"\n\n" +
+"Päivä valitsin:\n" +
+"- Käytä \xab, \xbb painikkeita valitaksesi vuoden\n" +
+"- Käytä " + String.fromCharCode(0x2039) + ", " + String.fromCharCode(0x203a) + " painikkeita valitaksesi kuukauden\n" +
+"- Pidä alhaalla hiiren painiketta missä tahansa yllämainituissa painikkeissa valitaksesi nopeammin.";
+Calendar._TT["ABOUT_TIME"] = "\n\n" +
+"Ajan valinta:\n" +
+"- Paina mitä tahansa ajan osaa kasvattaaksesi sitä\n" +
+"- tai Vaihtonäppäin-paina laskeaksesi sitä\n" +
+"- tai paina ja raahaa valitaksesi nopeammin.";
+
+Calendar._TT["PREV_YEAR"] = "Edellinen vuosi (valikko tulee painaessa)";
+Calendar._TT["PREV_MONTH"] = "Edellinen kuukausi (valikko tulee painaessa)";
+Calendar._TT["GO_TODAY"] = "Siirry Tänään";
+Calendar._TT["NEXT_MONTH"] = "Seuraava kuukausi (valikko tulee painaessa)";
+Calendar._TT["NEXT_YEAR"] = "Seuraava vuosi (valikko tulee painaessa)";
+Calendar._TT["SEL_DATE"] = "Valitse päivä";
+Calendar._TT["DRAG_TO_MOVE"] = "Rahaa siirtääksesi";
+Calendar._TT["PART_TODAY"] = " (tänään)";
+
+// the following is to inform that "%s" is to be the first day of week
+// %s will be replaced with the day name.
+Calendar._TT["DAY_FIRST"] = "Näytä %s ensin";
+
+// This may be locale-dependent.  It specifies the week-end days, as an array
+// of comma-separated numbers.  The numbers are from 0 to 6: 0 means Sunday, 1
+// means Monday, etc.
+Calendar._TT["WEEKEND"] = "6,0";
+
+Calendar._TT["CLOSE"] = "Sulje";
+Calendar._TT["TODAY"] = "Tänään";
+Calendar._TT["TIME_PART"] = "(Vaihtonäppäin-)Paina tai raahaa vaihtaaksesi arvoa";
+
+// date formats
+Calendar._TT["DEF_DATE_FORMAT"] = "%Y-%m-%d";
+Calendar._TT["TT_DATE_FORMAT"] = "%a, %b %e";
+
+Calendar._TT["WK"] = "vko";
+Calendar._TT["TIME"] = "Aika:";
diff --git a/public/javascripts/calendar/lang/calendar-ja.js b/public/javascripts/calendar/lang/calendar-ja.js
index 24bde0f30..1bcc8c38c 100644
--- a/public/javascripts/calendar/lang/calendar-ja.js
+++ b/public/javascripts/calendar/lang/calendar-ja.js
@@ -58,10 +58,10 @@ Calendar._TT["ABOUT_TIME"] = "\n\n" +
 "- or click and drag for faster selection.";
 
 Calendar._TT["PREV_YEAR"] = "前年 (長押しでメニュー表示)";
-Calendar._TT["PREV_MONTH"] = "翌年 (長押しでメニュー表示)";
+Calendar._TT["PREV_MONTH"] = "前月 (長押しでメニュー表示)";
 Calendar._TT["GO_TODAY"] = "今日の日付を選択";
-Calendar._TT["NEXT_MONTH"] = "前月 (長押しでメニュー表示)";
-Calendar._TT["NEXT_YEAR"] = "翌月 (長押しでメニュー表示)";
+Calendar._TT["NEXT_MONTH"] = "翌月 (長押しでメニュー表示)";
+Calendar._TT["NEXT_YEAR"] = "翌年 (長押しでメニュー表示)";
 Calendar._TT["SEL_DATE"] = "日付を選択してください";
 Calendar._TT["DRAG_TO_MOVE"] = "ドラッグで移動";
 Calendar._TT["PART_TODAY"] = " (今日)";

From a39f655a7c86fab775e725505f262692ced2c2ca Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Thu, 10 Jan 2008 19:20:36 +0000
Subject: [PATCH 119/710] Added details by assignees on issue summary view
 (Hans Yoon).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1052 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/reports_controller.rb | 25 ++++++++++++++++++++++++-
 app/views/reports/issue_report.rhtml  | 11 +++++++----
 2 files changed, 31 insertions(+), 5 deletions(-)

diff --git a/app/controllers/reports_controller.rb b/app/controllers/reports_controller.rb
index e18e117a6..e33fe8412 100644
--- a/app/controllers/reports_controller.rb
+++ b/app/controllers/reports_controller.rb
@@ -47,6 +47,12 @@ class ReportsController < ApplicationController
       @data = issues_by_category
       @report_title = l(:field_category)
       render :template => "reports/issue_report_details"   
+    when "assigned_to"
+      @field = "assigned_to_id"
+      @rows = @project.members.collect { |m| m.user }
+      @data = issues_by_assigned_to
+      @report_title = l(:field_assigned_to)
+      render :template => "reports/issue_report_details"
     when "author"
       @field = "author_id"
       @rows = @project.members.collect { |m| m.user }
@@ -64,12 +70,14 @@ class ReportsController < ApplicationController
       @versions = @project.versions.sort
       @priorities = Enumeration::get_values('IPRI')
       @categories = @project.issue_categories
+      @assignees = @project.members.collect { |m| m.user }
       @authors = @project.members.collect { |m| m.user }
       @subprojects = @project.active_children
       issues_by_tracker
       issues_by_version
       issues_by_priority
       issues_by_category
+      issues_by_assigned_to
       issues_by_author
       issues_by_subproject
       
@@ -180,7 +188,22 @@ private
                                                   and i.project_id=#{@project.id}
                                                 group by s.id, s.is_closed, c.id")	
   end
-	
+  
+  def issues_by_assigned_to
+    @issues_by_assigned_to ||= 
+      ActiveRecord::Base.connection.select_all("select    s.id as status_id, 
+                                                  s.is_closed as closed, 
+                                                  a.id as assigned_to_id,
+                                                  count(i.id) as total 
+                                                from 
+                                                  #{Issue.table_name} i, #{IssueStatus.table_name} s, #{User.table_name} a
+                                                where 
+                                                  i.status_id=s.id 
+                                                  and i.assigned_to_id=a.id
+                                                  and i.project_id=#{@project.id}
+                                                group by s.id, s.is_closed, a.id")
+  end
+  
   def issues_by_author
     @issues_by_author ||= 
       ActiveRecord::Base.connection.select_all("select    s.id as status_id, 
diff --git a/app/views/reports/issue_report.rhtml b/app/views/reports/issue_report.rhtml
index 0eaba58dc..1ed16ea3b 100644
--- a/app/views/reports/issue_report.rhtml
+++ b/app/views/reports/issue_report.rhtml
@@ -4,8 +4,11 @@
 <h3><%=l(:field_tracker)%>&nbsp;&nbsp;<%= link_to image_tag('zoom_in.png'), :detail => 'tracker' %></h3>
 <%= render :partial => 'simple', :locals => { :data => @issues_by_tracker, :field_name => "tracker_id", :rows => @trackers } %>
 <br />
-<h3><%=l(:field_version)%>&nbsp;&nbsp;<%= link_to image_tag('zoom_in.png'), :detail => 'version' %></h3>
-<%= render :partial => 'simple', :locals => { :data => @issues_by_version, :field_name => "fixed_version_id", :rows => @versions } %>
+<h3><%=l(:field_priority)%>&nbsp;&nbsp;<%= link_to image_tag('zoom_in.png'), :detail => 'priority' %></h3>
+<%= render :partial => 'simple', :locals => { :data => @issues_by_priority, :field_name => "priority_id", :rows => @priorities } %>
+<br />
+<h3><%=l(:field_assigned_to)%>&nbsp;&nbsp;<%= link_to image_tag('zoom_in.png'), :detail => 'assigned_to' %></h3>
+<%= render :partial => 'simple', :locals => { :data => @issues_by_assigned_to, :field_name => "assigned_to_id", :rows => @assignees } %>
 <br />
 <h3><%=l(:field_author)%>&nbsp;&nbsp;<%= link_to image_tag('zoom_in.png'), :detail => 'author' %></h3>
 <%= render :partial => 'simple', :locals => { :data => @issues_by_author, :field_name => "author_id", :rows => @authors } %>
@@ -13,8 +16,8 @@
 </div>
 
 <div class="splitcontentright">
-<h3><%=l(:field_priority)%>&nbsp;&nbsp;<%= link_to image_tag('zoom_in.png'), :detail => 'priority' %></h3>
-<%= render :partial => 'simple', :locals => { :data => @issues_by_priority, :field_name => "priority_id", :rows => @priorities } %>
+<h3><%=l(:field_version)%>&nbsp;&nbsp;<%= link_to image_tag('zoom_in.png'), :detail => 'version' %></h3>
+<%= render :partial => 'simple', :locals => { :data => @issues_by_version, :field_name => "fixed_version_id", :rows => @versions } %>
 <br />
 <% if @project.children.any? %>
 <h3><%=l(:field_subproject)%>&nbsp;&nbsp;<%= link_to image_tag('zoom_in.png'), :detail => 'subproject' %></h3>

From 941f9bf3dd3bfbbb575cd5f56d52a52fdf173eba Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Thu, 10 Jan 2008 22:42:41 +0000
Subject: [PATCH 120/710] Non-ascii attachement filename fix for IE.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1053 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/application.rb            | 5 +++++
 app/controllers/attachments_controller.rb | 2 +-
 app/controllers/documents_controller.rb   | 3 ++-
 app/controllers/versions_controller.rb    | 3 ++-
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/app/controllers/application.rb b/app/controllers/application.rb
index 306ebc03c..25cf205f4 100644
--- a/app/controllers/application.rb
+++ b/app/controllers/application.rb
@@ -196,4 +196,9 @@ class ApplicationController < ActionController::Base
     end
     return tmp
   end
+  
+  # Returns a string that can be used as filename value in Content-Disposition header
+  def filename_for_content_disposition(name)
+    request.env['HTTP_USER_AGENT'] =~ %r{MSIE} ? ERB::Util.url_encode(name) : name
+  end
 end
diff --git a/app/controllers/attachments_controller.rb b/app/controllers/attachments_controller.rb
index 0913de529..4e87e5442 100644
--- a/app/controllers/attachments_controller.rb
+++ b/app/controllers/attachments_controller.rb
@@ -21,7 +21,7 @@ class AttachmentsController < ApplicationController
 
   def download
     # images are sent inline
-    send_file @attachment.diskfile, :filename => @attachment.filename, 
+    send_file @attachment.diskfile, :filename => filename_for_content_disposition(@attachment.filename),
                                     :type => @attachment.content_type, 
                                     :disposition => (@attachment.image? ? 'inline' : 'attachment')
   rescue
diff --git a/app/controllers/documents_controller.rb b/app/controllers/documents_controller.rb
index b37a8371a..93f25c495 100644
--- a/app/controllers/documents_controller.rb
+++ b/app/controllers/documents_controller.rb
@@ -67,7 +67,8 @@ class DocumentsController < ApplicationController
   def download
     @attachment = @document.attachments.find(params[:attachment_id])
     @attachment.increment_download
-    send_file @attachment.diskfile, :filename => @attachment.filename, :type => @attachment.content_type
+    send_file @attachment.diskfile, :filename => filename_for_content_disposition(@attachment.filename),
+                                    :type => @attachment.content_type
   rescue
     render_404
   end 
diff --git a/app/controllers/versions_controller.rb b/app/controllers/versions_controller.rb
index 1365c97e8..df1be2869 100644
--- a/app/controllers/versions_controller.rb
+++ b/app/controllers/versions_controller.rb
@@ -42,7 +42,8 @@ class VersionsController < ApplicationController
   def download
     @attachment = @version.attachments.find(params[:attachment_id])
     @attachment.increment_download
-    send_file @attachment.diskfile, :filename => @attachment.filename, :type => @attachment.content_type
+    send_file @attachment.diskfile, :filename => filename_for_content_disposition(@attachment.filename),
+                                    :type => @attachment.content_type
   rescue
     render_404
   end 

From 64eaf328eae17f9ced062e0e3ecc0a97df7eea8e Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sat, 12 Jan 2008 14:54:26 +0000
Subject: [PATCH 121/710] Fixed: wrong url for wiki syntax pop-up when Redmine
 urls are prefixed.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1058 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/wiki/edit.rhtml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/wiki/edit.rhtml b/app/views/wiki/edit.rhtml
index 32acbfff6..10276264f 100644
--- a/app/views/wiki/edit.rhtml
+++ b/app/views/wiki/edit.rhtml
@@ -5,8 +5,8 @@
 <%= error_messages_for 'content' %>
 <div class="contextual">
 <%= l(:setting_text_formatting) %>:
-<%= link_to l(:label_help), '/help/wiki_syntax.html',
-                            :onclick => "window.open('#{ url_for '/help/wiki_syntax.html' }', '', 'resizable=yes, location=no, width=300, height=640, menubar=no, status=no, scrollbars=yes'); return false;" %>
+<%= link_to l(:label_help), compute_public_path('wiki_syntax', 'help', 'html'),
+                            :onclick => "window.open('#{ compute_public_path('wiki_syntax', 'help', 'html') }', '', 'resizable=yes, location=no, width=300, height=640, menubar=no, status=no, scrollbars=yes'); return false;" %>
 </div>
 <p><%= f.text_area :text, :cols => 100, :rows => 25, :class => 'wiki-edit', :accesskey => accesskey(:edit) %></p>
 <p><label><%= l(:field_comments) %></label><br /><%= f.text_field :comments, :size => 120 %></p>

From df30e18a8cfcec42c660acb0a8567489f60c8941 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sat, 12 Jan 2008 16:26:37 +0000
Subject: [PATCH 122/710] Added missing wiki div on news/index and news/show.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1059 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/news/index.rhtml | 2 ++
 app/views/news/show.rhtml  | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/app/views/news/index.rhtml b/app/views/news/index.rhtml
index b958c475e..c6bb9ad5a 100644
--- a/app/views/news/index.rhtml
+++ b/app/views/news/index.rhtml
@@ -24,7 +24,9 @@
     <%= link_to h(news.title), :controller => 'news', :action => 'show', :id => news %>
     <%= "(#{news.comments_count} #{lwr(:label_comment, news.comments_count).downcase})" if news.comments_count > 0 %></h3>
     <p class="author"><%= authoring news.created_on, news.author %></p>
+    <div class="wiki">
     <%= textilizable(news.description) %>
+    </div>
 <% end %>
 <% end %>
 <p class="pagination"><%= pagination_links_full @news_pages %></p>
diff --git a/app/views/news/show.rhtml b/app/views/news/show.rhtml
index e0cd09990..bff737f40 100644
--- a/app/views/news/show.rhtml
+++ b/app/views/news/show.rhtml
@@ -19,7 +19,9 @@
 
 <p><em><% unless @news.summary.empty? %><%=h @news.summary %><br /><% end %>
 <span class="author"><%= authoring @news.created_on, @news.author %></span></em></p>
+<div class="wiki">
 <%= textilizable(@news.description) %>
+</div>
 <br />
 
 <div id="comments" style="margin-bottom:16px;">

From 8b710cf9de899eb31fb6759f72606d5d3ae4bffc Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 13 Jan 2008 18:33:55 +0000
Subject: [PATCH 123/710] Do not show sticky and locked checkboxes when
 replying to a message.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1062 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/messages/_form.rhtml | 3 ++-
 app/views/messages/show.rhtml  | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/views/messages/_form.rhtml b/app/views/messages/_form.rhtml
index c2f7fb569..aa0355070 100644
--- a/app/views/messages/_form.rhtml
+++ b/app/views/messages/_form.rhtml
@@ -1,11 +1,12 @@
 <%= error_messages_for 'message' %>
+<% replying ||= false %>
 
 <div class="box">
 <!--[form:message]-->
 <p><label><%= l(:field_subject) %></label><br />
 <%= f.text_field :subject, :required => true, :size => 120 %>
 
-<% if User.current.allowed_to?(:edit_messages, @project) %>
+<% if !replying && User.current.allowed_to?(:edit_messages, @project) %>
     <label><%= f.check_box :sticky %> Sticky</label>
     <label><%= f.check_box :locked %> Locked</label>
 <% end %>
diff --git a/app/views/messages/show.rhtml b/app/views/messages/show.rhtml
index bb7e2b7f3..7d4c9989e 100644
--- a/app/views/messages/show.rhtml
+++ b/app/views/messages/show.rhtml
@@ -32,7 +32,7 @@
 <p><%= toggle_link l(:button_reply), "reply", :focus => 'message_content' %></p>
 <div id="reply" style="display:none;">
 <% form_for :reply, @reply, :url => {:action => 'reply', :id => @topic}, :html => {:multipart => true} do |f| %>
-    <%= render :partial => 'form', :locals => {:f => f} %>
+    <%= render :partial => 'form', :locals => {:f => f, :replying => true} %>
     <%= submit_tag l(:button_submit) %>
 <% end %>
 </div>

From 4e1e5985a1a6763d5413ccd0524213d8cd3dc4a7 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 13 Jan 2008 18:39:37 +0000
Subject: [PATCH 124/710] Wiki toolbar improvements (mainly for Firefox).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1063 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 public/images/jstoolbar/bt_h1.png      | Bin 0 -> 995 bytes
 public/images/jstoolbar/bt_h2.png      | Bin 0 -> 994 bytes
 public/images/jstoolbar/bt_h3.png      | Bin 0 -> 993 bytes
 public/images/jstoolbar/bt_heading.png | Bin 415 -> 0 bytes
 public/images/jstoolbar/bt_img.png     | Bin 0 -> 566 bytes
 public/images/jstoolbar/bt_pre.png     | Bin 0 -> 224 bytes
 public/javascripts/jstoolbar.js        | 161 ++++++++++++++++---------
 public/stylesheets/jstoolbar.css       |  16 ++-
 8 files changed, 121 insertions(+), 56 deletions(-)
 create mode 100644 public/images/jstoolbar/bt_h1.png
 create mode 100644 public/images/jstoolbar/bt_h2.png
 create mode 100644 public/images/jstoolbar/bt_h3.png
 delete mode 100644 public/images/jstoolbar/bt_heading.png
 create mode 100644 public/images/jstoolbar/bt_img.png
 create mode 100644 public/images/jstoolbar/bt_pre.png

diff --git a/public/images/jstoolbar/bt_h1.png b/public/images/jstoolbar/bt_h1.png
new file mode 100644
index 0000000000000000000000000000000000000000..01f3eec0da09b79d6f034e68cfd31179826f7f17
GIT binary patch
literal 995
zcmeAS@N?(olHy`uVBq!ia0vp^A|TAc3?z4jzqJQa`X#OrCC){ui6xo&c?uz!xv2~(
znYnrjhQ<n6iFsvu3PuJ777B*uR;CtKMwSZN28IR(C%7WDfLhs0Jbhi+Z!q!-idffw
zGTI3g;w<opEM{Qf`T)X=PHRkN00mjn9eo`c7&i8E|4C$JU|?nl@Ck7Rihuw9{r@N!
z4S^9E0_Www$pZ6$wx^3@NX4z>gd<E69>OUMOd?Xt6_lB;h-mn#I!Y+$cyQk~WcB0_
cNMe#?U^&QWnY-YWH&7dcr>mdKI;Vst0GR|Z`2YX_

literal 0
HcmV?d00001

diff --git a/public/images/jstoolbar/bt_h2.png b/public/images/jstoolbar/bt_h2.png
new file mode 100644
index 0000000000000000000000000000000000000000..36b15048e67810f070655de8d1c67fa7d2d3b04a
GIT binary patch
literal 994
zcmeAS@N?(olHy`uVBq!ia0vp^A|TAc3?z4jzqJQa`X#OrCC){ui6xo&c?uz!xv2~(
znYnrjhQ<n6iFsvu3PuJ777B*uR;HF#CT0rS28IR(;_tnyfLhs0Jbhi+Z!q!-il}FQ
z&ie)w;w<opEM{Qf`T)X=PHRkN00mjn9eo`c7&i8E|4C$JU|?nl@Ck7Rihuw9{r@N!
z4S^9E0_Www$pZ6$mZytjNX4z>gd<E68EPjOSU9-mD=0HFbGhzP5D`%HSm-*VNu^?P
b#{y;sVLe9YlT}%<KwS);u6{1-oD!M<TN5))

literal 0
HcmV?d00001

diff --git a/public/images/jstoolbar/bt_h3.png b/public/images/jstoolbar/bt_h3.png
new file mode 100644
index 0000000000000000000000000000000000000000..029d648e54ebdbaa7c246c76493247dbcfe94c25
GIT binary patch
literal 993
zcmeAS@N?(olHy`uVBq!ia0vp^A|TAc3?z4jzqJQa`X#OrCC){ui6xo&c?uz!xv2~(
znYnrjhQ<n6iFsvu3PuJ777B(IRt5%E28IgS28IR(e+)D?1GTc3c>21s-(chw)Z}tG
zQe_Ji;w<opEM{Qf`T)X=PHRkN00mjn9eo`c7&i8E|4C$JU|?nl@Ck7Rihuw9{r@N!
z4S^9E0_Www$pZ6$rl*TzNX4z>gd<E6Y;hA9IRr%P9NpMNxb`cE2q=2&nK`3L#bVwJ
a21W)sGe&ROS<)szO$?r{elF{r5}E+@I53j{

literal 0
HcmV?d00001

diff --git a/public/images/jstoolbar/bt_heading.png b/public/images/jstoolbar/bt_heading.png
deleted file mode 100644
index a143f23a7aa4afb87cf3f96b0533b2e11e5aea2b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 415
zcmeAS@N?(olHy`uVBq!ia0vp^A|TAc1SFYWcSQjyy%N`m66d1S#FEVXJcW?V+*F2?
z%v?PMLqmn!#G+yaBLf3-1w$h%V>2rgGX-q}Lj!}t>8refI@wD+eO=kFGjnqrD?XQe
zm<bf(EbxddW?<m@0K$w;YfNSU1zFM^eH|GXHuiJ>Nn{1`zj(ShhE&`-8e+)RVjy7C
zZ_<>Yn34FB|4(~w!pm+Q-I}%umoE9$H1l6L<>ZlE$joi&bM3K6-|eKEb5rJ=<$IyA
zRIdDS<?NrvpDg;;y;i!fc)fJ(=SYh;ho+@^PD;67u6V@6H&G%kAa53%kI0D?{!6Ed
zzTV{)*s^$&&cs0Gz!-y5xwp@Ke)GF7G<4qcg>0YR-q^Cl=KR6)o8DZ$)#LeVpZcEH
zR$GF+vKntE&wjE<qrkK;Ics|^cM}6g!R(q1Ue+o6C#uRSHkX~?yJvh`u|xVXW1?-f
z_GITTHqH$K$Bh5ZH1Xw>Y&#gh=H$Mkc-My2ANS8c$bC9M+pTD)Q#H{444$rjF6*2U
Fng9-Op=SU9

diff --git a/public/images/jstoolbar/bt_img.png b/public/images/jstoolbar/bt_img.png
new file mode 100644
index 0000000000000000000000000000000000000000..91c9a8a87caa26e20c36a13412c39b7ba9bda2fc
GIT binary patch
literal 566
zcmV-60?GY}P)<h;3K|Lk000e1NJLTq000yK000yS0ssI20_%!e0000lbVXQnLvm$d
zbZKvHAXI5>WdLMpZ7v`&GazbVZgwspGB7YWATc;PFfckWF(4~2F)%RvFe$SD000Mc
zNliru*Z~a@HZeGroreGb010qNS#tmY3h)2`3h)6!tTdPa000DMK}|sb0I`n?{9y$E
z00D|gL_t(|+QpN-PQx%1g>A=95NQYqk<tl-5Fi8yCM4K+0A@xW2(j@1tnADz42(!f
zpl(%LMg6B~BNE54jgyu_+e~HX9jue%d_Kvw4TB&6vlg0}oGXk+>f!O(?ISJ#=OC7e
z6HCkiQGx*yNev(aaC&_T5BB#a;ehKExdq@~Z?Yg39j}^^OfW(?$$`lN)7;SXL!JTa
z7-4Lr@BI=}E5MM+Oc-iJ9|OkZ@PP^~1IC(y4THRH=bwo7rJSOB5wbHScvNSsW|&71
zqA1RSncy31cRTsI3gMC}=VbH#y>y$v9kOaUT~B`EE3|+!V2aD@)?24f84vuhnQRr0
zRxI@+pv!vYYC|WciEb#m1mJjTt600+{AhYbpSGn;x}pXslT(Bs@e%Kpmu=H=a&bm-
z+jrf@ix4~k(~c@3rAP%;{nB!+O09LiYiE77C*t^!#w92`3FHr)&ZQ&P!J-WuJ3m7H
zb++N?K6{>*rVVSL2U7!wG1m9}CCe%l3X|{*HNX4(4Q#Z$hI?fv$p8QV07*qoM6N<$
Eg0*1dWdHyG

literal 0
HcmV?d00001

diff --git a/public/images/jstoolbar/bt_pre.png b/public/images/jstoolbar/bt_pre.png
new file mode 100644
index 0000000000000000000000000000000000000000..df3f917d0eebb3d8ddcb46a2eee079aae81b2a20
GIT binary patch
literal 224
zcmeAS@N?(olHy`uVBq!ia0vp^A|TAj3?#R^_xk}Uu@cva66d1S#FEVXJcW?V+*Aew
zLwy4aeFKxKVg@Ck3ic9DUsv`UjJ!O|R+1gtW&wpb3p^r=85p=efH0%e8j~47L6&q!
zUq=Rpjs4tz5?O(Kwg8_HS0Mf7)x86$CHsIZrjj7P;QtIyw;Ol?dAgo1jv*Ddl7IaF
z&&;e>6S2JE;hHCGZJVb#<OCilxbcbkaHTYJ+h>QJpKp9+V7RJk_(rq0_#jXtgQu&X
J%Q~loCIFC%L`nbv

literal 0
HcmV?d00001

diff --git a/public/javascripts/jstoolbar.js b/public/javascripts/jstoolbar.js
index fd4611e2d..b94a4ed80 100644
--- a/public/javascripts/jstoolbar.js
+++ b/public/javascripts/jstoolbar.js
@@ -228,6 +228,58 @@ jsToolBar.prototype = {
 		this.encloseSelection(stag,etag);
 	},
 	
+	encloseLineSelection: function(prefix, suffix, fn) {
+		this.textarea.focus();
+		
+		prefix = prefix || '';
+		suffix = suffix || '';
+		
+		var start, end, sel, scrollPos, subst, res;
+		
+		if (typeof(document["selection"]) != "undefined") {
+			sel = document.selection.createRange().text;
+		} else if (typeof(this.textarea["setSelectionRange"]) != "undefined") {
+			start = this.textarea.selectionStart;
+			end = this.textarea.selectionEnd;
+			scrollPos = this.textarea.scrollTop;
+			// go to the start of the line
+			start = this.textarea.value.substring(0, start).replace(/[^\r\n]*$/g,'').length;
+			// go to the end of the line
+            end = this.textarea.value.length - this.textarea.value.substring(end, this.textarea.value.length).replace(/^[^\r\n]*/, '').length;
+			sel = this.textarea.value.substring(start, end);
+		}
+		
+		if (sel.match(/ $/)) { // exclude ending space char, if any
+			sel = sel.substring(0, sel.length - 1);
+			suffix = suffix + " ";
+		}
+		
+		if (typeof(fn) == 'function') {
+			res = (sel) ? fn.call(this,sel) : fn('');
+		} else {
+			res = (sel) ? sel : '';
+		}
+		
+		subst = prefix + res + suffix;
+		
+		if (typeof(document["selection"]) != "undefined") {
+			document.selection.createRange().text = subst;
+			var range = this.textarea.createTextRange();
+			range.collapse(false);
+			range.move('character', -suffix.length);
+			range.select();
+		} else if (typeof(this.textarea["setSelectionRange"]) != "undefined") {
+			this.textarea.value = this.textarea.value.substring(0, start) + subst +
+			this.textarea.value.substring(end);
+			if (sel) {
+				this.textarea.setSelectionRange(start + subst.length, start + subst.length);
+			} else {
+				this.textarea.setSelectionRange(start + prefix.length, start + prefix.length);
+			}
+			this.textarea.scrollTop = scrollPos;
+		}
+	},
+	
 	encloseSelection: function(prefix, suffix, fn) {
 		this.textarea.focus();
 		
@@ -370,28 +422,43 @@ jsToolBar.prototype.elements.code = {
 // spacer
 jsToolBar.prototype.elements.space1 = {type: 'space'}
 
-// heading
-jsToolBar.prototype.elements.heading = {
+// headings
+jsToolBar.prototype.elements.h1 = {
 	type: 'button',
-	title: 'Heading',
+	title: 'Heading 1',
 	fn: {
-		wiki: function() {
-			this.encloseSelection('','',function(str) {
-				str = str.replace(/\r/g,'');
-				return 'h2. '+str.replace(/\n/g,"\n* ");
-			});
+		wiki: function() { 
+		  this.encloseLineSelection('h1. ', '',function(str) {
+		    str = str.replace(/^h\d+\.\s+/, '')
+		    return str;
+		  });
+		}
+	}
+}
+jsToolBar.prototype.elements.h2 = {
+	type: 'button',
+	title: 'Heading 2',
+	fn: {
+		wiki: function() { 
+		  this.encloseLineSelection('h2. ', '',function(str) {
+		    str = str.replace(/^h\d+\.\s+/, '')
+		    return str;
+		  });
+		}
+	}
+}
+jsToolBar.prototype.elements.h3 = {
+	type: 'button',
+	title: 'Heading 3',
+	fn: {
+		wiki: function() { 
+		  this.encloseLineSelection('h3. ', '',function(str) {
+		    str = str.replace(/^h\d+\.\s+/, '')
+		    return str;
+		  });
 		}
 	}
 }
-
-// br
-//jsToolBar.prototype.elements.br = {
-//	type: 'button',
-//	title: 'Line break',
-//	fn: {
-//		wiki: function() { this.encloseSelection("%%%\n",'') }
-//	}
-//}
 
 // spacer
 jsToolBar.prototype.elements.space2 = {type: 'space'}
@@ -402,9 +469,9 @@ jsToolBar.prototype.elements.ul = {
 	title: 'Unordered list',
 	fn: {
 		wiki: function() {
-			this.encloseSelection('','',function(str) {
+			this.encloseLineSelection('','',function(str) {
 				str = str.replace(/\r/g,'');
-				return '* '+str.replace(/\n/g,"\n* ");
+				return str.replace(/(\n|^)[#-]?\s*/g,"$1* ");
 			});
 		}
 	}
@@ -416,53 +483,39 @@ jsToolBar.prototype.elements.ol = {
 	title: 'Ordered list',
 	fn: {
 		wiki: function() {
-			this.encloseSelection('','',function(str) {
+			this.encloseLineSelection('','',function(str) {
 				str = str.replace(/\r/g,'');
-				return '# '+str.replace(/\n/g,"\n# ");
+				return str.replace(/(\n|^)[*-]?\s*/g,"$1# ");
 			});
 		}
 	}
 }
 
+// pre
+jsToolBar.prototype.elements.pre = {
+	type: 'button',
+	title: 'Preformatted text',
+	fn: {
+		wiki: function() { this.encloseLineSelection('<pre>\n', '\n</pre>') }
+	}
+}
+
 // spacer
 jsToolBar.prototype.elements.space3 = {type: 'space'}
 
-// link
-/*
+// wiki page
 jsToolBar.prototype.elements.link = {
 	type: 'button',
-	title: 'Link',
-	fn: {},
-	href_prompt: 'Please give page URL:',
-	hreflang_prompt: 'Language of this page:',
-	default_hreflang: '',
-	prompt: function(href,hreflang) {
-		href = href || '';
-		hreflang = hreflang || this.elements.link.default_hreflang;
-		
-		href = window.prompt(this.elements.link.href_prompt,href);
-		if (!href) { return false; }
-		
-		hreflang = ""
-		
-		return { href: this.stripBaseURL(href), hreflang: hreflang };
-	}
-}
-
-jsToolBar.prototype.elements.link.fn.wiki = function() {
-	var link = this.elements.link.prompt.call(this);
-	if (link) {
-		var stag = '"';
-		var etag = '":'+link.href;
-		this.encloseSelection(stag,etag);
-	}
-};
-*/
-// link or wiki page
-jsToolBar.prototype.elements.link = {
-	type: 'button',
-	title: 'Link',
+	title: 'Wiki Page Link',
 	fn: {
 		wiki: function() { this.encloseSelection("[[", "]]") }
 	}
 }
+// image
+jsToolBar.prototype.elements.img = {
+	type: 'button',
+	title: 'Inline image',
+	fn: {
+		wiki: function() { this.encloseSelection("!", "!") }
+	}
+}
diff --git a/public/stylesheets/jstoolbar.css b/public/stylesheets/jstoolbar.css
index 62976e537..df5d2a633 100644
--- a/public/stylesheets/jstoolbar.css
+++ b/public/stylesheets/jstoolbar.css
@@ -67,8 +67,14 @@
 .jstb_br {
 	background-image: url(../images/jstoolbar/bt_br.png);
 }
-.jstb_heading {
-	background-image: url(../images/jstoolbar/bt_heading.png);
+.jstb_h1 {
+	background-image: url(../images/jstoolbar/bt_h1.png);
+}
+.jstb_h2 {
+	background-image: url(../images/jstoolbar/bt_h2.png);
+}
+.jstb_h3 {
+	background-image: url(../images/jstoolbar/bt_h3.png);
 }
 .jstb_ul {
 	background-image: url(../images/jstoolbar/bt_ul.png);
@@ -76,6 +82,12 @@
 .jstb_ol {
 	background-image: url(../images/jstoolbar/bt_ol.png);
 }
+.jstb_pre {
+	background-image: url(../images/jstoolbar/bt_pre.png);
+}
 .jstb_link {
 	background-image: url(../images/jstoolbar/bt_link.png);
 }
+.jstb_img {
+	background-image: url(../images/jstoolbar/bt_img.png);
+}

From 702b521b453ac5abfe9ae6336ff129cbd83f1eca Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Tue, 15 Jan 2008 18:12:12 +0000
Subject: [PATCH 125/710] Redmine links can be used to link to documents,
 versions and attachments. For now, attachments of the current object can be
 referenced only (if you're on an issue, it's possible reference attachments
 of this issue only).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1064 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/helpers/application_helper.rb            | 118 +++++++++++++------
 lib/redcloth.rb                              |  12 +-
 test/fixtures/wiki_contents.yml              |  12 +-
 test/fixtures/wiki_pages.yml                 |   5 +
 test/fixtures/wikis.yml                      |   6 +
 test/unit/helpers/application_helper_test.rb |  44 ++++++-
 6 files changed, 153 insertions(+), 44 deletions(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index e3ac2498f..b34b5b502 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -220,8 +220,9 @@ module ApplicationHelper
     
     project = options[:project] || @project
     
-    # turn wiki links into html links
-    # example:
+    # Wiki links
+    # 
+    # Examples:
     #   [[mypage]]
     #   [[mypage|mytext]]
     # wiki links can refer other project wikis, using project name or identifier:
@@ -229,47 +230,94 @@ module ApplicationHelper
     #   [[project:|mytext]]
     #   [[project:mypage]]
     #   [[project:mypage|mytext]]
-    text = text.gsub(/\[\[([^\]\|]+)(\|([^\]\|]+))?\]\]/) do |m|
+    text = text.gsub(/(!)?(\[\[([^\]\|]+)(\|([^\]\|]+))?\]\])/) do |m|
       link_project = project
-      page = $1
-      title = $3
-      if page =~ /^([^\:]+)\:(.*)$/
-        link_project = Project.find_by_name($1) || Project.find_by_identifier($1)
-        page = title || $2
-        title = $1 if page.blank?
-      end
-      
-      if link_project && link_project.wiki
-        # check if page exists
-        wiki_page = link_project.wiki.find_page(page)
-        link_to((title || page), format_wiki_link.call(link_project, Wiki.titleize(page)),
-                                 :class => ('wiki-page' + (wiki_page ? '' : ' new')))
+      esc, all, page, title = $1, $2, $3, $5
+      if esc.nil?
+        if page =~ /^([^\:]+)\:(.*)$/
+          link_project = Project.find_by_name($1) || Project.find_by_identifier($1)
+          page = $2
+          title ||= $1 if page.blank?
+        end
+        
+        if link_project && link_project.wiki
+          # check if page exists
+          wiki_page = link_project.wiki.find_page(page)
+          link_to((title || page), format_wiki_link.call(link_project, Wiki.titleize(page)),
+                                   :class => ('wiki-page' + (wiki_page ? '' : ' new')))
+        else
+          # project or wiki doesn't exist
+          title || page
+        end
       else
-        # project or wiki doesn't exist
-        title || page
+        all
       end
     end
 
-    # turn issue and revision ids into links
-    # example:
-    #   #52 -> <a href="/issues/show/52">#52</a>
-    #   r52 -> <a href="/repositories/revision/6?rev=52">r52</a> (project.id is 6)
-    text = text.gsub(%r{([\s\(,-^])(#|r)(\d+)(?=[[:punct:]]|\s|<|$)}) do |m|
-      leading, otype, oid = $1, $2, $3
+    # Redmine links
+    # 
+    # Examples:
+    #   Issues:
+    #     #52 -> Link to issue #52
+    #   Changesets:
+    #     r52 -> Link to revision 52
+    #   Documents:
+    #     document#17 -> Link to document with id 17
+    #     document:Greetings -> Link to the document with title "Greetings"
+    #     document:"Some document" -> Link to the document with title "Some document"
+    #   Versions:
+    #     version#3 -> Link to version with id 3
+    #     version:1.0.0 -> Link to version named "1.0.0"
+    #     version:"1.0 beta 2" -> Link to version named "1.0 beta 2"
+    #   Attachments:
+    #     attachment:file.zip -> Link to the attachment of the current object named file.zip
+    text = text.gsub(%r{([\s\(,-^])(!)?(attachment|document|version)?((#|r)(\d+)|(:)([^"][^\s<>]+|"[^"]+"))(?=[[:punct:]]|\s|<|$)}) do |m|
+      leading, esc, prefix, sep, oid = $1, $2, $3, $5 || $7, $6 || $8
       link = nil
-      if otype == 'r'
-        if project && (changeset = project.changesets.find_by_revision(oid))
-          link = link_to("r#{oid}", {:controller => 'repositories', :action => 'revision', :id => project.id, :rev => oid}, :class => 'changeset',
-                                    :title => truncate(changeset.comments, 100))
-        end
-      else
-        if issue = Issue.find_by_id(oid.to_i, :include => [:project, :status], :conditions => Project.visible_by(User.current))        
-          link = link_to("##{oid}", {:controller => 'issues', :action => 'show', :id => oid}, :class => 'issue',
-                                    :title => "#{truncate(issue.subject, 100)} (#{issue.status.name})")
-          link = content_tag('del', link) if issue.closed?
+      if esc.nil?
+        if prefix.nil? && sep == 'r'
+          if project && (changeset = project.changesets.find_by_revision(oid))
+            link = link_to("r#{oid}", {:controller => 'repositories', :action => 'revision', :id => project.id, :rev => oid}, :class => 'changeset',
+                                      :title => truncate(changeset.comments, 100))
+          end
+        elsif sep == '#'
+          oid = oid.to_i
+          case prefix
+          when nil
+            if issue = Issue.find_by_id(oid, :include => [:project, :status], :conditions => Project.visible_by(User.current))        
+              link = link_to("##{oid}", {:controller => 'issues', :action => 'show', :id => oid}, :class => 'issue',
+                                        :title => "#{truncate(issue.subject, 100)} (#{issue.status.name})")
+              link = content_tag('del', link) if issue.closed?
+            end
+          when 'document'
+            if document = Document.find_by_id(oid, :include => [:project], :conditions => Project.visible_by(User.current))
+              link = link_to h(document.title), {:controller => 'documents', :action => 'show', :id => document}, :class => 'document'
+            end
+          when 'version'
+            if version = Version.find_by_id(oid, :include => [:project], :conditions => Project.visible_by(User.current))
+              link = link_to h(version.name), {:controller => 'versions', :action => 'show', :id => version}, :class => 'version'
+            end
+          end
+        elsif sep == ':'
+          # removes the double quotes if any
+          name = oid.gsub(%r{^"(.*)"$}, "\\1")
+          case prefix
+          when 'document'
+            if project && document = project.documents.find_by_title(name)
+              link = link_to h(document.title), {:controller => 'documents', :action => 'show', :id => document}, :class => 'document'
+            end
+          when 'version'
+            if project && version = project.versions.find_by_name(name)
+              link = link_to h(version.name), {:controller => 'versions', :action => 'show', :id => version}, :class => 'version'
+            end
+          when 'attachment'
+            if attachments && attachment = attachments.detect {|a| a.filename == name }
+              link = link_to h(attachment.filename), {:controller => 'attachments', :action => 'download', :id => attachment}, :class => 'attachment'
+            end
+          end
         end
       end
-      leading + (link || "#{otype}#{oid}")
+      leading + (link || "#{prefix}#{sep}#{oid}")
     end
     
     text
diff --git a/lib/redcloth.rb b/lib/redcloth.rb
index ae70db747..904701c9e 100644
--- a/lib/redcloth.rb
+++ b/lib/redcloth.rb
@@ -395,15 +395,15 @@ class RedCloth < String
     # Elements to handle
     GLYPHS = [
     #   [ /([^\s\[{(>])?\'([dmst]\b|ll\b|ve\b|\s|:|$)/, '\1&#8217;\2' ], # single closing
-        [ /([^\s\[{(>#{PUNCT_Q}][#{PUNCT_Q}]*)\'/, '\1&#8217;' ], # single closing
-        [ /\'(?=[#{PUNCT_Q}]*(s\b|[\s#{PUNCT_NOQ}]))/, '&#8217;' ], # single closing
-        [ /\'/, '&#8216;' ], # single opening
+    #   [ /([^\s\[{(>#{PUNCT_Q}][#{PUNCT_Q}]*)\'/, '\1&#8217;' ], # single closing
+    #   [ /\'(?=[#{PUNCT_Q}]*(s\b|[\s#{PUNCT_NOQ}]))/, '&#8217;' ], # single closing
+    #   [ /\'/, '&#8216;' ], # single opening
         [ /</, '&lt;' ], # less-than
         [ />/, '&gt;' ], # greater-than
     #   [ /([^\s\[{(])?"(\s|:|$)/, '\1&#8221;\2' ], # double closing
-        [ /([^\s\[{(>#{PUNCT_Q}][#{PUNCT_Q}]*)"/, '\1&#8221;' ], # double closing
-        [ /"(?=[#{PUNCT_Q}]*[\s#{PUNCT_NOQ}])/, '&#8221;' ], # double closing
-        [ /"/, '&#8220;' ], # double opening
+    #   [ /([^\s\[{(>#{PUNCT_Q}][#{PUNCT_Q}]*)"/, '\1&#8221;' ], # double closing
+    #   [ /"(?=[#{PUNCT_Q}]*[\s#{PUNCT_NOQ}])/, '&#8221;' ], # double closing
+    #   [ /"/, '&#8220;' ], # double opening
         [ /\b( )?\.{3}/, '\1&#8230;' ], # ellipsis
         [ /\b([A-Z][A-Z0-9]{2,})\b(?:[(]([^)]*)[)])/, '<acronym title="\2">\1</acronym>' ], # 3+ uppercase acronym
         [ /(^|[^"][>\s])([A-Z][A-Z0-9 ]+[A-Z0-9])([^<A-Za-z0-9]|$)/, '\1<span class="caps">\2</span>\3', :no_span_caps ], # 3+ uppercase caps
diff --git a/test/fixtures/wiki_contents.yml b/test/fixtures/wiki_contents.yml
index a230b9c08..6937dbd14 100644
--- a/test/fixtures/wiki_contents.yml
+++ b/test/fixtures/wiki_contents.yml
@@ -21,4 +21,14 @@ wiki_contents_002:
   version: 1
   author_id: 1
   comments: 
-  
\ No newline at end of file
+wiki_contents_003: 
+  text: |-
+    h1. Start page
+    
+    E-commerce web site start page
+  updated_on: 2007-03-08 00:18:07 +01:00
+  page_id: 3
+  id: 3
+  version: 1
+  author_id: 1
+  comments: 
diff --git a/test/fixtures/wiki_pages.yml b/test/fixtures/wiki_pages.yml
index ca9d6f5dc..ee260291d 100644
--- a/test/fixtures/wiki_pages.yml
+++ b/test/fixtures/wiki_pages.yml
@@ -9,4 +9,9 @@ wiki_pages_002:
   title: Another_page
   id: 2
   wiki_id: 1
+wiki_pages_003: 
+  created_on: 2007-03-08 00:18:07 +01:00
+  title: Start_page
+  id: 3
+  wiki_id: 2
   
\ No newline at end of file
diff --git a/test/fixtures/wikis.yml b/test/fixtures/wikis.yml
index ff7b4a1ae..dd1c55cea 100644
--- a/test/fixtures/wikis.yml
+++ b/test/fixtures/wikis.yml
@@ -4,3 +4,9 @@ wikis_001:
   start_page: CookBook documentation
   project_id: 1
   id: 1
+wikis_002: 
+  status: 1
+  start_page: Start page
+  project_id: 2
+  id: 2
+  
\ No newline at end of file
diff --git a/test/unit/helpers/application_helper_test.rb b/test/unit/helpers/application_helper_test.rb
index 2af6c5599..33509cfc0 100644
--- a/test/unit/helpers/application_helper_test.rb
+++ b/test/unit/helpers/application_helper_test.rb
@@ -20,7 +20,7 @@ require File.dirname(__FILE__) + '/../../test_helper'
 class ApplicationHelperTest < HelperTestCase
   include ApplicationHelper
   include ActionView::Helpers::TextHelper
-  fixtures :projects, :repositories, :changesets, :trackers, :issue_statuses, :issues
+  fixtures :projects, :repositories, :changesets, :trackers, :issue_statuses, :issues, :documents, :versions, :wikis, :wiki_pages, :wiki_contents
 
   def setup
     super
@@ -66,12 +66,52 @@ class ApplicationHelperTest < HelperTestCase
   def test_redmine_links
     issue_link = link_to('#3', {:controller => 'issues', :action => 'show', :id => 3}, 
                                :class => 'issue', :title => 'Error 281 when updating a recipe (New)')
+    
     changeset_link = link_to('r1', {:controller => 'repositories', :action => 'revision', :id => 1, :rev => 1},
                                    :class => 'changeset', :title => 'My very first commit')
     
+    document_link = link_to('Test document', {:controller => 'documents', :action => 'show', :id => 1},
+                                             :class => 'document')
+    
+    version_link = link_to('1.0', {:controller => 'versions', :action => 'show', :id => 2},
+                                  :class => 'version')
+    
     to_test = {
       '#3, #3 and #3.' => "#{issue_link}, #{issue_link} and #{issue_link}.",
-      'r1' => changeset_link
+      'r1' => changeset_link,
+      'document#1' => document_link,
+      'document:"Test document"' => document_link,
+      'version#2' => version_link,
+      'version:1.0' => version_link,
+      'version:"1.0"' => version_link,
+      # escaping
+      '!#3.' => '#3.',
+      '!r1' => 'r1',
+      '!document#1' => 'document#1',
+      '!document:"Test document"' => 'document:"Test document"',
+      '!version#2' => 'version#2',
+      '!version:1.0' => 'version:1.0',
+      '!version:"1.0"' => 'version:"1.0"',
+    }
+    @project = Project.find(1)
+    to_test.each { |text, result| assert_equal "<p>#{result}</p>", textilizable(text) }
+  end
+  
+  def test_wiki_links
+    to_test = {
+      '[[CookBook documentation]]' => '<a href="/wiki/ecookbook/CookBook_documentation" class="wiki-page">CookBook documentation</a>',
+      '[[Another page|Page]]' => '<a href="/wiki/ecookbook/Another_page" class="wiki-page">Page</a>',
+      # page that doesn't exist
+      '[[Unknown page]]' => '<a href="/wiki/ecookbook/Unknown_page" class="wiki-page new">Unknown page</a>',
+      '[[Unknown page|404]]' => '<a href="/wiki/ecookbook/Unknown_page" class="wiki-page new">404</a>',
+      # link to another project wiki
+      '[[onlinestore:]]' => '<a href="/wiki/onlinestore/" class="wiki-page">onlinestore</a>',
+      '[[onlinestore:|Wiki]]' => '<a href="/wiki/onlinestore/" class="wiki-page">Wiki</a>',
+      '[[onlinestore:Start page]]' => '<a href="/wiki/onlinestore/Start_page" class="wiki-page">Start page</a>',
+      '[[onlinestore:Start page|Text]]' => '<a href="/wiki/onlinestore/Start_page" class="wiki-page">Text</a>',
+      '[[onlinestore:Unknown page]]' => '<a href="/wiki/onlinestore/Unknown_page" class="wiki-page new">Unknown page</a>',
+      # escaping
+      '![[Another page|Page]]' => '[[Another page|Page]]',
     }
     @project = Project.find(1)
     to_test.each { |text, result| assert_equal "<p>#{result}</p>", textilizable(text) }

From 35c17355fbc66a55c40f846282f955b849da1f10 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Tue, 15 Jan 2008 18:18:49 +0000
Subject: [PATCH 126/710] Fixed: issue filters may be lost when paginating
 after r1026.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1065 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/helpers/application_helper.rb | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index b34b5b502..111709ce4 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -114,6 +114,8 @@ module ApplicationHelper
   def pagination_links_full(paginator, count=nil, options={})
     page_param = options.delete(:page_param) || :page
     url_param = params.dup
+    # don't reuse params if filters are present
+    url_param.clear if url_param.has_key?(:set_filter)
     
     html = ''    
     html << link_to_remote(('&#171; ' + l(:label_previous)), 
@@ -138,9 +140,12 @@ module ApplicationHelper
   end
   
   def per_page_links(selected=nil)
+    url_param = params.dup
+    url_param.clear if url_param.has_key?(:set_filter)
+    
     links = Setting.per_page_options_array.collect do |n|
       n == selected ? n : link_to_remote(n, {:update => "content", :url => params.dup.merge(:per_page => n)}, 
-                                            {:href => url_for(params.dup.merge(:per_page => n))})
+                                            {:href => url_for(url_param.merge(:per_page => n))})
     end
     links.size > 1 ? l(:label_display_per_page, links.join(', ')) : nil
   end

From bf3066d6986e814538bb2ec59ba9b916a7b7f6ba Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Tue, 15 Jan 2008 18:30:21 +0000
Subject: [PATCH 127/710] Fixed: Date custom fields not displayed as specified
 in application settings.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1066 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/helpers/custom_fields_helper.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/helpers/custom_fields_helper.rb b/app/helpers/custom_fields_helper.rb
index b1b176107..25389ca63 100644
--- a/app/helpers/custom_fields_helper.rb
+++ b/app/helpers/custom_fields_helper.rb
@@ -62,7 +62,7 @@ module CustomFieldsHelper
     return "" unless value && !value.empty?
     case field_format
     when "date"
-      begin; l_date(value.to_date); rescue; value end
+      begin; format_date(value.to_date); rescue; value end
     when "bool"
       l_YesNo(value == "1")
     else

From 8a39862b1937e9ab4dc547aff26cf8bfa6107267 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Tue, 15 Jan 2008 18:31:45 +0000
Subject: [PATCH 128/710] Fixed: issue queries can not use custom fields marked
 as 'for all projects' in a project context.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1067 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/models/query.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/query.rb b/app/models/query.rb
index 61a559d16..09dc0d581 100644
--- a/app/models/query.rb
+++ b/app/models/query.rb
@@ -223,7 +223,7 @@ class Query < ActiveRecord::Base
     return @available_columns if @available_columns
     @available_columns = Query.available_columns
     @available_columns += (project ? 
-                            project.custom_fields :
+                            project.all_custom_fields :
                             IssueCustomField.find(:all, :conditions => {:is_for_all => true})
                            ).collect {|cf| QueryCustomFieldColumn.new(cf) }      
   end

From e2281106149cfc31d90950af28d123a2ba0ff403 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Tue, 15 Jan 2008 19:03:17 +0000
Subject: [PATCH 129/710] Lithuanian translation added (Sergej Jegorov).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1068 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 lang/lt.yml                                   | 564 ++++++++++++++++++
 .../javascripts/calendar/lang/calendar-lt.js  | 127 ++++
 2 files changed, 691 insertions(+)
 create mode 100644 lang/lt.yml
 create mode 100644 public/javascripts/calendar/lang/calendar-lt.js

diff --git a/lang/lt.yml b/lang/lt.yml
new file mode 100644
index 000000000..8cf573d10
--- /dev/null
+++ b/lang/lt.yml
@@ -0,0 +1,564 @@
+_gloc_rule_default: '|n| n==1 ? "" : "_plural" '
+ 
+actionview_datehelper_select_day_prefix: 
+actionview_datehelper_select_month_names: sausis,vasaris,kovas,balandis,gegužė,birželis,liepa,rugpjūtis,rugsėjis,spalis,lapkritis,gruodis
+actionview_datehelper_select_month_names_abbr: sausis,vasaris,kovas,balandis,gegužė,birželis,liepa,rugpjūtis,rugsėjis,spalis,lapkritis,gruodis
+actionview_datehelper_select_month_prefix: 
+actionview_datehelper_select_year_prefix: 
+actionview_datehelper_time_in_words_day: 1 diena 
+actionview_datehelper_time_in_words_day_plural: %d dienos 
+actionview_datehelper_time_in_words_hour_about: apytiksliai valanda 
+actionview_datehelper_time_in_words_hour_about_plural: apie %d valandas 
+actionview_datehelper_time_in_words_hour_about_single: apytiksliai valanda 
+actionview_datehelper_time_in_words_minute: 1 minutė 
+actionview_datehelper_time_in_words_minute_half: pusė minutės 
+actionview_datehelper_time_in_words_minute_less_than: mažiau kaip minutė 
+actionview_datehelper_time_in_words_minute_plural: %d minutės 
+actionview_datehelper_time_in_words_minute_single: 1 minutė 
+actionview_datehelper_time_in_words_second_less_than: mažiau kaip sekundė 
+actionview_datehelper_time_in_words_second_less_than_plural: mažiau, negu %d sekundės 
+actionview_instancetag_blank_option: prašom išrinkti 
+ 
+activerecord_error_inclusion: nėra įtrauktas į sąrašą 
+activerecord_error_exclusion: yra rezervuota(as) 
+activerecord_error_invalid: yra negaliojanti(is)
+activerecord_error_confirmation: neatitinka patvirtinimo 
+activerecord_error_accepted: turi būti priimtas 
+activerecord_error_empty: negali būti tuščiu 
+activerecord_error_blank: negali būti tuščiu 
+activerecord_error_too_long: yra per ilgas 
+activerecord_error_too_short: yra per trumpas 
+activerecord_error_wrong_length: neteisingas ilgis 
+activerecord_error_taken: buvo jau paimtas 
+activerecord_error_not_a_number: nėra skaičius 
+activerecord_error_not_a_date: data nėra galiojanti  
+activerecord_error_greater_than_start_date: turi būti didesnė negu pradžios data 
+activerecord_error_not_same_project: nepriklauso tam pačiam projektui 
+activerecord_error_circular_dependency: Šis ryšys sukurtų ciklinę priklausomybę 
+ 
+general_fmt_age: %d m.
+general_fmt_age_plural: %d metų(ai)
+general_fmt_date: %%Y-%%m-%%d
+general_fmt_datetime: %%Y-%%m-%%d %%I:%%M %%p
+general_fmt_datetime_short: %%b %%d, %%I:%%M %%p
+general_fmt_time: %%I:%%M %%p
+general_text_No: 'Ne'
+general_text_Yes: 'Taip'
+general_text_no: 'ne'
+general_text_yes: 'taip'
+general_lang_name: 'Lithuanian (lietuvių)'
+general_csv_separator: ','
+general_csv_encoding: UTF-8
+general_pdf_encoding: UTF-8
+general_day_names: pirmadienis,antradienis,trečiadienis,ketvirtadienis,penktadienis,šeštadienis,sekmadienis
+general_first_day_of_week: '1'
+ 
+notice_account_updated: Paskyra buvo sėkmingai atnaujinta. 
+notice_account_invalid_creditentials: Negaliojantis vartotojo vardas ar slaptažodis
+notice_account_password_updated: Slaptažodis buvo sėkmingai atnaujintas. 
+notice_account_wrong_password: Neteisingas slaptažodis 
+notice_account_register_done: Paskyra buvo sėkmingai sukurta. Kad aktyvintumėte savo paskyrą, paspauskite sąsają, kuri jums buvo siųsta elektroniniu paštu. 
+notice_account_unknown_email: Nežinomas vartotojas. 
+notice_can_t_change_password: Šis pranešimas naudoja išorinį autentiškumo nustatymo šaltinį. Neįmanoma pakeisti slaptažodį. 
+notice_account_lost_email_sent: Į Jūsų pašą išsiūstas laiškas su naujo slaptažodžio pasirinkimo instrukcija. 
+notice_account_activated: Jūsų paskyra aktyvuota. Galite prisijungti.
+notice_successful_create: Sėkmingas sukūrimas. 
+notice_successful_update: Sėkmingas atnaujinimas. 
+notice_successful_delete: Sėkmingas panaikinimas. 
+notice_successful_connection: Sėkmingas susijungimas. 
+notice_file_not_found: Puslapis, į kurį ketinate įeiti, neegzistuoja arba pašalintas. 
+notice_locking_conflict: Duomenys atnaujinti kito vartotojo. 
+notice_scm_error: Duomenys ir/ar pakeitimai saugykloje(repozitorojoje) neegzistuoja.
+notice_not_authorized: Jūs neturite teisių gauti prieigą prie šio puslapio. 
+notice_email_sent: Laiškas išsiųstas %s
+notice_email_error: Laiško siųntimo metu įvyko klaida (%s)
+notice_feeds_access_key_reseted: Jūsų RSS raktas buvo atnaujintas.
+notice_failed_to_save_issues: "Nepavyko išsaugoti %d problemos(ų) iš %d pasirinkto: %s."
+notice_no_issue_selected: "Nepasirinkta nė viena problema! Prašom pažymėti problemą, kurią norite redaguoti."
+notice_account_pending: "Jūsų paskyra buvo sukūrta ir dabar laukiama administratoriaus patvirtinimo."
+ 
+mail_subject_lost_password: Jūsų Redmine slaptažodis
+mail_body_lost_password: 'Norėdami pakeisti Redmine slaptažodį, spauskite nuorodą:'
+mail_subject_register: 'Redmine paskyros aktyvavymas'
+mail_body_register: 'Norėdami aktyvuoti Redmine paskyrą, spauskite nuorodą:'
+mail_body_account_information_external: Jūs galite naudoti Jūsų "%s" paskyrą, norėdami prisijungti prie Redmine.
+mail_body_account_information: Informacija apie Jūsų Redmine paskyrą
+mail_subject_account_activation_request: Redmine paskyros aktyvavimo prašymas
+mail_body_account_activation_request: 'Užsiregistravo naujas vartotojas (%s). Jo paskyra laukia jūsų patvirtinimo:'
+ 
+gui_validation_error: 1 klaida
+gui_validation_error_plural: %d klaidų(os)
+ 
+field_name: Pavadinimas
+field_description: Aprašas
+field_summary: Santrauka
+field_is_required: Reikalaujama
+field_firstname: Vardas
+field_lastname: Pavardė
+field_mail: Email
+field_filename: Byla
+field_filesize: Dydis
+field_downloads: Atsiuntimai
+field_author: Autorius
+field_created_on: Sukūrta
+field_updated_on: Atnaujinta
+field_field_format: Formatas
+field_is_for_all: Visiems laukasms
+field_possible_values: Galimos reikšmės
+field_regexp: Pastovi išraiška
+field_min_length: Minimalus ilgis
+field_max_length: Maksimalus ilgis 
+field_value: Vertė 
+field_category: Kategorija 
+field_title: Pavadinimas 
+field_project: Projektas 
+field_issue: Svarstoma problema 
+field_status: Būsena 
+field_notes: Pastabos 
+field_is_closed: Svarstoma problema uždaryta 
+field_is_default: Numatytoji vertė 
+field_tracker: Pėdsekys 
+field_subject: Dalykas 
+field_due_date: Mokėjimo terminas 
+field_assigned_to: Paskirtas 
+field_priority: Prioritetas 
+field_fixed_version: Pastovi versija
+field_user: Vartotojas 
+field_role: Vaidmuo 
+field_homepage: Pagrindinis puslapis 
+field_is_public: Viešas 
+field_parent: Yra subprojektas
+field_is_in_chlog: Svarstomos problemos rodomos pokyčių žurnale 
+field_is_in_roadmap: Svarstomos problemos rodomos veiklos grafike 
+field_login: Registracijos vardas 
+field_mail_notification: Elektroninio pašto pranešimai 
+field_admin: Administratorius 
+field_last_login_on: Paskutinis ryšys 
+field_language: Kalba 
+field_effective_date: Data 
+field_password: Slaptažodis
+field_new_password: Naujas slaptažodis
+field_password_confirmation: Patvirtinimas 
+field_version: Versija
+field_type: Tipas 
+field_host: Pagrindinis kompiuteris 
+field_port: Jungtis 
+field_account: Paskyra 
+field_base_dn: Bazinis skiriamasis vardas 
+field_attr_login: Registracijos vardo požymis 
+field_attr_firstname: Vardo priskiria 
+field_attr_lastname: Pavardės priskiria 
+field_attr_mail: Elektroninio pašto požymis 
+field_onthefly: Vartotojų sukūrimas paskubomis 
+field_start_date: Pradėti 
+field_done_ratio: %% Atlikta 
+field_auth_source: Autentiškumo nustatymo būdas 
+field_hide_mail: Paslėpkite mano elektroninio pašto adresą 
+field_comments: Komentaras
+field_url: URL 
+field_start_page: Pradžios puslapis
+field_subproject: Subprojektas 
+field_hours: Valandos 
+field_activity: Veikla 
+field_spent_on: Data 
+field_identifier: Identifikuotojas 
+field_is_filter: Panaudotas kaip filtras 
+field_issue_to_id: Susijusi svarstoma problema 
+field_delay: Užlaikymas 
+field_assignable: Svarstomos problemos gali būti paskirtos šiam vaidmeniui 
+field_redirect_existing_links: Peradresuokite egzistuojančias sąsajas 
+field_estimated_hours: Apskaičiuotas laikas 
+field_column_names: Skiltys 
+field_time_zone: Laiko juosta 
+field_searchable: Randamas 
+ 
+setting_app_title: Programos pavadinimas 
+setting_app_subtitle: Programos paantraštė 
+setting_welcome_text: Pasveikinimas 
+setting_default_language: Numatytoji kalba 
+setting_login_required: Reikalingas autentiškumo nustatymas  
+setting_self_registration: Saviregistracija 
+setting_attachment_max_size: Priedo maks. dydis 
+setting_issues_export_limit pagal dydį: Svarstomų problemų eksportavimo riba 
+setting_mail_from: Emisijos elektroninio pašto adresas 
+setting_bcc_recipients: Akli tikslios kopijos gavėjai (bcc)
+setting_host_name: Pagrindinio kompiuterio vardas
+setting_text_formatting: Teksto apipavidalinimas 
+setting_wiki_compression: Wiki istorijos suspaudimas 
+setting_feeds_limit: Perdavimo turinio riba 
+setting_autofetch_changesets: Automatinis pakeitimų siuntimas
+setting_sys_api_enabled: Įgalinkite WS sandėlio vadybai 
+setting_commit_ref_keywords: Nurodymo reikšminiai žodžiai
+setting_commit_fix_keywords: Fiksavimo reikšminiai žodžiai
+setting_autologin: Autoregistracija
+setting_date_format: Datos formatas 
+setting_time_format: Laiko formatas 
+setting_cross_project_issue_relations: Leisti tarprojektinius svarstomos problemos ryšius
+setting_issue_list_default_columns: Numatytosios skiltys svarstomos problemos sąraše
+setting_repositories_encodings: Saugyklos encodingas
+setting_emails_footer: elektroninio pašto puslapinė poraštė
+setting_protocol: Protokolas
+ 
+label_user: Vartotojas
+label_user_plural: Vartotojai 
+label_user_new: Naujas vartotojas 
+label_project: Projektas 
+label_project_new: Naujas projektas 
+label_project_plural: Projektai 
+label_project_all: Visi Projektai 
+label_project_latest: Paskutiniai projektai 
+label_issue: Svarstoma problema 
+label_issue_new: Nauja svarstoma problema 
+label_issue_plural: Svarstomos problemos 
+label_issue_view_all: Peržiūrėti visas svarstomas problemas
+label_issues_by: Svarstomos problemos pagal %s 
+label_document: Dokumentas
+label_document_new: Naujas dokumentas
+label_document_plural: Dokumentai 
+label_role: Vaidmuo 
+label_role_plural: Vaidmenys 
+label_role_new: Naujas vaidmuo 
+label_role_and_permissions: Vaidmenys ir leidimai 
+label_member: Narys 
+label_member_new: Naujas narys 
+label_member_plural: Nariai 
+label_tracker: Pėdsekys 
+label_tracker_plural: Pėdsekiai 
+label_tracker_new: Naujas pėdsekys 
+label_workflow: Darbų eiga 
+label_issue_status: Svarstomos problemos padėtis 
+label_issue_status_plural: Svarstomos problemos padėtys 
+label_issue_status_new: Nauja padėtis 
+label_issue_category: Svarstomos problemos kategorija 
+label_issue_category_plural: Svarstomos problemos kategorijos 
+label_issue_category_new: Nauja kategorija 
+label_custom_field: Kliento laukas 
+label_custom_field_plural: Kliento laukai 
+label_custom_field_new: Naujas kliento laukas 
+label_enumerations: Išvardinimai 
+label_enumeration_new: Nauja vertė 
+label_information: Informacija 
+label_information_plural: Informacija 
+label_please_login: Prašom prisijungti 
+label_register: Užsiregistruoti 
+label_password_lost: Prarastas slaptažodis
+label_home: Pagrindinis 
+label_my_page: Mano puslapis
+label_my_account: Mano pranešimas 
+label_my_projects: Mano projektai 
+label_administration: Administracija 
+label_login: Prisijungti 
+label_logout: Atsijungti 
+label_help: Pagalba 
+label_reported_issues: Praneštos svarstomos problemos 
+label_assigned_to_me_issues: Svarstomos problemos, paskirtos man 
+label_last_login: Paskutinis ryšys 
+label_last_updates: Paskutinis atnaujinimas
+label_last_updates_plural: %d paskutinis atnaujinimas 
+label_registered_on: Užregistruota 
+label_activity: Veikla 
+label_new: Naujas 
+label_logged_as: Prisijungęs kaip 
+label_environment: Aplinka 
+label_authentication: Autentiškumo nustatymas 
+label_auth_source: Autentiškumo nustatymo būdas 
+label_auth_source_new: Naujas autentiškumo nustatymo būdas 
+label_auth_source_plural: Autentiškumo nustatymo būdai 
+label_subproject_plural: Subprojektai 
+label_min_max_length: Min - Maks ilgis 
+label_list: Sąrašas 
+label_date: Data 
+label_integer: Sveikasis skaičius 
+label_float: Float 
+label_boolean: Boolean 
+label_string: Tekstas 
+label_text: Ilgas tekstas 
+label_attribute: Požymis 
+label_attribute_plural: Požymiai 
+label_download: %d Persiuntimas 
+label_download_plural: %d Persiuntimai 
+label_no_data: Nėra ką atvaizduoti 
+label_change_status: Pakeitimo padėtis 
+label_history: Istorija 
+label_attachment: Rinkmena
+label_attachment_new: Nauja rinkmena
+label_attachment_delete: Pašalinkite rinkmeną
+label_attachment_plural: Rinkmenos 
+label_report: Ataskaita
+label_report_plural: Ataskaitos 
+label_news: Žinia 
+label_news_new: Pridėkite žinią 
+label_news_plural: Žinios 
+label_news_latest: Paskutinės naujienos 
+label_news_view_all: Peržiūrėti visas žinias 
+label_change_log: Pakeitimų žurnalas 
+label_settings: Nustatymai 
+label_overview: Apžvalga 
+label_version: Versija
+label_version_new: Nauja versija
+label_version_plural: Versijos 
+label_confirmation: Patvirtinimas 
+label_export_to: Eksportuoti į 
+label_read: Skaitykite... 
+label_public_projects: Vieši projektai 
+label_open_issues: atidarytas 
+label_open_issues_plural: atidaryti
+label_closed_issues: uždarytas 
+label_closed_issues_plural: uždaryti
+label_total: Bendra suma 
+label_permissions: Leidimai 
+label_current_status: Einamoji padėtis 
+label_new_statuses_allowed: Naujos padėtys galimos 
+label_all: visi 
+label_none: niekas 
+label_nobody: niekas 
+label_next: Kitas 
+label_previous: Ankstesnis 
+label_used_by: Naudotas 
+label_details: Detalės 
+label_add_note: Pridėkite pastabą 
+label_per_page: Per puslapį
+label_calendar: Kalendorius 
+label_months_from: mėnesiai nuo 
+label_gantt: Gantt 
+label_internal: Vidinis 
+label_last_changes: paskutiniai %d, pokyčiai 
+label_change_view_all: Peržiūrėti visus pakeitimus 
+label_personalize_page: Suasmeninti šį puslapį
+label_comment: Komentaras
+label_comment_plural: Komentarai 
+label_comment_add: Pridėkite komentarą
+label_comment_added: Komentaras pridėtas 
+label_comment_delete: Pašalinkite komentarus 
+label_query: Užklausa
+label_query_plural: Užklausos 
+label_query_new: Nauja užklausa 
+label_filter_add: Pridėti filtrą 
+label_filter_plural: Filtrai 
+label_equals: yra 
+label_not_equals: nėra 
+label_in_less_than: mažiau negu 
+label_in_more_than: daugiau negu 
+label_in: in
+label_today: šiandien 
+label_this_week: šią savaitę 
+label_less_than_ago: mažiau negu dienomis prieš 
+label_more_than_ago: daugiau negu dienomis prieš 
+label_ago: dienomis prieš 
+label_contains: turi savyje 
+label_not_contains: neturi savyje 
+label_day_plural: dienos 
+label_repository: Saugykla 
+label_browse: Naršyti
+label_modification: %d pakeitimas 
+label_modification_plural: %d pakeitimai 
+label_revision: Revizija 
+label_revision_plural: Revizijos 
+label_added: pridėtas 
+label_modified: pakeistas 
+label_deleted: pašalintas 
+label_latest_revision: Paskutinė revizija
+label_latest_revision_plural: Paskutinės revizijos 
+label_view_revisions: Pežiūrėti revizijas 
+label_max_size: Maksimalus dydis 
+label_on: 'ant' 
+label_sort_highest: Perkelti į viršūnę 
+label_sort_higher: Perkelti į viršų 
+label_sort_lower: Perkelti žemyn 
+label_sort_lowest: Perkelti į apačią 
+label_roadmap: Veiklos grafikas 
+label_roadmap_due_in: Baigiama 
+label_roadmap_overdue: %s vėluojama 
+label_roadmap_no_issues: Jokios svarstomos problemos šiai versijai
+label_search: Ieškoti 
+label_result_plural: Rezultatai 
+label_all_words: Visi žodžiai 
+label_wiki: Wiki 
+label_wiki_edit: Wiki redakcija 
+label_wiki_edit_plural: Wiki redakcijos 
+label_wiki_page: Wiki puslapis
+label_wiki_page_plural: Wiki puslapiai 
+label_index_by_title: Indeksas prie pavadinimo 
+label_index_by_date: Indeksas prie datos 
+label_current_version: Einamoji versija
+label_preview: Peržiūra 
+label_feed_plural: Įeitys(Feeds)
+label_changes_details: Visų pakeitimų detalės 
+label_issue_tracking: Svarstomų problemų sekimas 
+label_spent_time: Sugaištas laikas 
+label_f_hour: %.2f valanda 
+label_f_hour_plural: %.2f valandų 
+label_time_tracking: Laiko sekimas 
+label_change_plural: Pakeitimai 
+label_statistics: Statistika 
+label_commits_per_month: Paveda(commit) per mėnesį 
+label_commits_per_author: Autoriaus pavedos(commit) 
+label_view_diff: Skirtumų peržiūra 
+label_diff_inline: įterptas 
+label_diff_side_by_side: šalia 
+label_options: Pasirinkimai
+label_copy_workflow_from: Kopijuoti darbų eiga iš 
+label_permissions_report: Leidimų pranešimas 
+label_watched_issues: Stebėtos svarstomos problemos 
+label_related_issues: Susijusios svarstomos problemos 
+label_applied_status: Taikomoji padėtis 
+label_loading: Kraunama... 
+label_relation_new: Naujas ryšys 
+label_relation_delete: Pašalinkite ryšį 
+label_relates_to: susietas su 
+label_duplicates: dublikatai 
+label_blocks: blokai 
+label_blocked_by: blokuotas 
+label_precedes: įvyksta pirma 
+label_follows: seka 
+label_end_to_start: užbaigti, kad pradėti
+label_end_to_end: užbaigti, kad pabaigti 
+label_start_to_start: pradėkite pradėti 
+label_start_to_end: pradėkite užbaigti 
+label_stay_logged_in: Likti prisijungus 
+label_disabled: išjungta(as) 
+label_show_completed_versions: Parodyti užbaigtas versijas 
+label_me: aš 
+label_board: Forumas 
+label_board_new: Naujas forumas 
+label_board_plural: Forumai 
+label_topic_plural: Temos 
+label_message_plural: Pranešimai 
+label_message_last: Paskutinis pranešimas
+label_message_new: Naujas pranešimas
+label_reply_plural: Atsakymai 
+label_send_information: Nusiųsti paskyros informaciją vartotojui 
+label_year: Metai 
+label_month: Mėnuo 
+label_week: Savaitė 
+label_date_from: Nuo 
+label_date_to: Iki 
+label_language_based: Pagrįsta vartotojo kalba 
+label_sort_by: Rūšiuoti pagal %s 
+label_send_test_email: Nusiųsti bandomąjį elektroninį laišką 
+label_feeds_access_key_created_on: RSS prieigos raktas sukūrtas prieš %s 
+label_module_plural: Moduliai 
+label_added_time_by: Pridėjo %s prieš %s
+label_updated_time: Atnaujinta prieš %s  
+label_jump_to_a_project: Šuolis į projektą... 
+label_file_plural: Bylos 
+label_changeset_plural: Changesets 
+label_default_columns: Numatytosios skiltys 
+label_no_change_option: (Jokio pakeitimo) 
+label_bulk_edit_selected_issues: Masinis pasirinktų svarstomųjų problemų(issues) redagavimas 
+label_theme: Tema 
+label_default: Numatyta(as) 
+label_search_titles_only: Ieškoti pavadinimų tiktai 
+label_user_mail_option_all: "Bet kokiam įvykiui visuose mano projektuose" 
+label_user_mail_option_selected: "Bet kokiam įvykiui tiktai pasirinktuose projektuose ..." 
+label_user_mail_option_none: "Tiktai dalykai kuriuos aš stebiu ar aš esu įtrauktas į" 
+label_user_mail_no_self_notified: "Nenoriu būti informuotas apie pakeitimus, kuriuos pats atlieku"
+label_registration_activation_by_email: "paskyros aktyvacija per e-paštą"
+label_registration_manual_activation: "rankinė paskyros aktyvacija"
+label_registration_automatic_activation: "automatinė paskyros aktyvacija"
+ 
+button_login: Registruotis 
+button_submit: Pateikti 
+button_save: Išsaugoti 
+button_check_all: Žymėti visus
+button_uncheck_all: Atžymėti visus
+button_delete: Trinti 
+button_create: Sukurti 
+button_test: Testas 
+button_edit: Redaguoti 
+button_add: Pridėti 
+button_change: Keisti 
+button_apply: Pritaikyti
+button_clear: Išvalyti 
+button_lock: Rakinti 
+button_unlock: Atrakinti 
+button_download: Atsisiųsti 
+button_list: Sąrašas 
+button_view: Žiūrėti 
+button_move: Perkelti 
+button_back: Atgal 
+button_cancel: Atšaukti 
+button_activate: Aktyvinti 
+button_sort: Rūšiuoti
+button_log_time: Log laikas 
+button_rollback: Grįžti į šią versiją
+button_watch: Stebėti 
+button_unwatch: Nestebėti
+button_reply: Atsakyti 
+button_archive: Archyvuoti
+button_unarchive: Išpakuoti 
+button_reset: Reset 
+button_rename: Pervadinti 
+button_change_password: Pakeisti slaptažodį
+button_copy: Kopijuoti 
+button_annotate: Rašyti pastabą 
+ 
+status_active: aktyvus 
+status_registered: užregistruotas 
+status_locked: užrakintas 
+ 
+text_select_mail_notifications: Išrinkite veiksmus, apie kuriuos būtų pranešta elektroniniu pasštu. 
+text_regexp_info: pvz. ^[A-Z0-9]+$ 
+text_min_max_length_info: 0 reiškia jokių apribojimų
+text_project_destroy_confirmation: Ar esate įsitikinęs, kad jūs norite pašalinti šį projektą ir visus susijusius duomenis? 
+text_workflow_edit: Išrinkite vaidmenį ir pėdsekį, kad redaguotumėte darbų eigą 
+text_are_you_sure: Ar esate įsitikinęs? 
+text_journal_changed: pakeistas iš %s į %s 
+text_journal_set_to: nustatyta į %s 
+text_journal_deleted: ištrintas 
+text_tip_task_begin_day: užduotis, prasidedanti šią dieną 
+text_tip_task_end_day: užduotis, pasibaigianti šią dieną 
+text_tip_task_begin_end_day: užduoties prasidedanti ir pasibaigianti šią dieną 
+text_project_identifier_info: 'Mažosios raidės (a-z), skaičiai ir brūkšniai galimi.<br/>Išsaugojus, identifikuotojas negali būti keičiamas.' 
+text_caracters_maximum: %d simbolių maksimumas. 
+text_caracters_minimum: Turi būti mažiausiai %d simbolių ilgio. 
+text_length_between: Ilgis tarp %d ir %d simbolių. 
+text_tracker_no_workflow: Jokia darbų eiga neapibrėžta šiam pėdsekiui 
+text_unallowed_characters: Neleistini simboliai 
+text_comma_separated: Leistinos kelios reikšmės (atskirtos kableliu). 
+text_issues_ref_in_commit_messages: Nurodymas ir fiksavimas svarstomų problemų pavedimų(commit) pranešimuose 
+text_issue_added: Svarstoma problema %s buvo pranešta. 
+text_issue_updated: Svarstoma problema %s buvo atnaujinta. 
+text_wiki_destroy_confirmation: Ar esate įsitikinęs, kad jūs norite pašalinti wiki ir visą jos turinį? 
+text_issue_category_destroy_question: Kai kurios svarstomos problemos (%d) yra paskirtos šiai kategorijai. Ką jūs norite padaryti? 
+text_issue_category_destroy_assignments: Pašalinti kategorijos užduotis 
+text_issue_category_reassign_to: Iš naujo paskirti svarstomas problemas šiai kategorijai 
+text_user_mail_option: "neišrinktiems projektams, jūs tiktai gausite pranešimus apie daiktus, kuriuos jūs stebite, ar jūs esate įtrauktas į (eg. svarstomos problemos, jūs esate autorius ar įgaliotinis)." 
+ 
+default_role_manager: Vadovas 
+default_role_developper: Projektuotojas 
+default_role_reporter: Pranešėjas 
+default_tracker_bug: Klaida 
+default_tracker_feature: Ypatybė 
+default_tracker_support: Palaikymas 
+default_issue_status_new: Nauja
+default_issue_status_assigned: Priskirta 
+default_issue_status_resolved: Išspręsta
+default_issue_status_feedback: Grįžtamasis ryšys 
+default_issue_status_closed: Uždaryta 
+default_issue_status_rejected: Atmesta 
+default_doc_category_user: Vartotojo dokumentacija 
+default_doc_category_tech: Techniniai dokumentacija 
+default_priority_low: Žemas 
+default_priority_normal: Normalus 
+default_priority_high: Aukštas 
+default_priority_urgent: Skubus 
+default_priority_immediate: Neatidėliotinas 
+default_activity_design: Projektavimas
+default_activity_development: Vystymas 
+ 
+enumeration_issue_priorities: Svarstomos problemos prioritetai 
+enumeration_doc_categories: Dokumento kategorijos 
+enumeration_activities: Veiklos (laiko sekimas)
+label_display_per_page: 'Per page: %s'
+setting_per_page_options: Objects per page options
+notice_default_data_loaded: Default configuration successfully loaded.
+label_age: Age
+label_general: General
+button_update: Update
+setting_issues_export_limit: Issues export limit
+label_change_properties: Change properties
+text_load_default_configuration: Load the default configuration
+text_no_configuration_data: "Roles, trackers, issue statuses and workflow have not been configured yet.\nIt is highly recommended to load the default configuration. You will be able to modify it once loaded."
+label_repository_plural: Repositories
+error_can_t_load_default_data: "Default configuration could not be loaded: %s"
diff --git a/public/javascripts/calendar/lang/calendar-lt.js b/public/javascripts/calendar/lang/calendar-lt.js
new file mode 100644
index 000000000..a988a2c2e
--- /dev/null
+++ b/public/javascripts/calendar/lang/calendar-lt.js
@@ -0,0 +1,127 @@
+// ** I18N
+
+// Calendar EN language
+// Author: Mihai Bazon, <mihai_bazon@yahoo.com>
+// Encoding: any
+// Distributed under the same terms as the calendar itself.
+
+// For translators: please use UTF-8 if possible.  We strongly believe that
+// Unicode is the answer to a real internationalized world.  Also please
+// include your contact information in the header, as can be seen above.
+
+// full day names
+Calendar._DN = new Array
+("Sekmadienis",
+ "Pirmadienis",
+ "Antradienis",
+ "Trečiadienis",
+ "Ketvirtadienis",
+ "Penktadienis",
+ "Šeštadienis",
+ "Sekmadienis");
+
+// Please note that the following array of short day names (and the same goes
+// for short month names, _SMN) isn't absolutely necessary.  We give it here
+// for exemplification on how one can customize the short day names, but if
+// they are simply the first N letters of the full name you can simply say:
+//
+//   Calendar._SDN_len = N; // short day name length
+//   Calendar._SMN_len = N; // short month name length
+//
+// If N = 3 then this is not needed either since we assume a value of 3 if not
+// present, to be compatible with translation files that were written before
+// this feature.
+
+// short day names
+Calendar._SDN = new Array
+("Sek",
+ "Pir",
+ "Ant",
+ "Tre",
+ "Ket",
+ "Pen",
+ "Šeš",
+ "Sek");
+
+// First day of the week. "0" means display Sunday first, "1" means display
+// Monday first, etc.
+Calendar._FD = 0;
+
+// full month names
+Calendar._MN = new Array
+("Sausis",
+ "Vasaris",
+ "Kovas",
+ "Balandis",
+ "Gegužė",
+ "Birželis",
+ "Liepa",
+ "Rudpjūtis",
+ "Rugsėjis",
+ "Spalis",
+ "Lapkritis",
+ "Gruodis");
+
+// short month names
+Calendar._SMN = new Array
+("Sau",
+ "Vas",
+ "Kov",
+ "Bal",
+ "May",
+ "Brž",
+ "Lie",
+ "Rgs",
+ "Rgj",
+ "Spl",
+ "Lap",
+ "Grd");
+
+// tooltips
+Calendar._TT = {};
+Calendar._TT["INFO"] = "Apie kalendorių";
+
+Calendar._TT["ABOUT"] =
+"DHTML Date/Time Selector\n" +
+"(c) dynarch.com 2002-2005 / Author: Mihai Bazon\n" + // don't translate this this ;-)
+"For latest version visit: http://www.dynarch.com/projects/calendar/\n" +
+"Distributed under GNU LGPL.  See http://gnu.org/licenses/lgpl.html for details." +
+"\n\n" +
+"Datos pasirinkimas:\n" +
+"- Naudoti \xab, \xbb mygtukus norint pasirinkti metus\n" +
+"- Naudoti " + String.fromCharCode(0x2039) + ", " + String.fromCharCode(0x203a) + " mygtukus norint pasirinkti mėnesį\n" +
+"- PAlaikykite nuspaudę bet kurį nygtuką norėdami iškviesti greitąjį meniu.";
+Calendar._TT["ABOUT_TIME"] = "\n\n" +
+"Datos pasirinkimas:\n" +
+"- Paspaudus ant valandos ar minutės, jų reikšmės padidėja\n" +
+"- arba Shift-paspaudimas norint sumažinti reikšmę\n" +
+"- arba paspauskite ir tempkite norint greičiau keisti reikšmę.";
+
+Calendar._TT["PREV_YEAR"] = "Ankst. metai (laikyti, norint iškviesti meniu)";
+Calendar._TT["PREV_MONTH"] = "Ankst. mėnuo (laikyti, norint iškviesti meniu)";
+Calendar._TT["GO_TODAY"] = "Šiandien";
+Calendar._TT["NEXT_MONTH"] = "Kitas mėnuo (laikyti, norint iškviesti meniu)";
+Calendar._TT["NEXT_YEAR"] = "Kiti metai (laikyti, norint iškviesti meniu)";
+Calendar._TT["SEL_DATE"] = "Pasirinkti datą";
+Calendar._TT["DRAG_TO_MOVE"] = "Perkelkite pėlyte";
+Calendar._TT["PART_TODAY"] = " (šiandien)";
+
+// the following is to inform that "%s" is to be the first day of week
+// %s will be replaced with the day name.
+Calendar._TT["DAY_FIRST"] = "Rodyti %s pirmiau";
+
+// This may be locale-dependent.  It specifies the week-end days, as an array
+// of comma-separated numbers.  The numbers are from 0 to 6: 0 means Sunday, 1
+// means Monday, etc.
+Calendar._TT["WEEKEND"] = "0,6";
+
+Calendar._TT["CLOSE"] = "Uždaryti";
+Calendar._TT["TODAY"] = "Šiandien";
+Calendar._TT["TIME_PART"] = "(Shift-)Spausti ar tempti, norint pakeisti reikšmę";
+
+// date formats
+Calendar._TT["DEF_DATE_FORMAT"] = "%Y-%m-%d";
+Calendar._TT["TT_DATE_FORMAT"] = "%a, %b %e";
+
+Calendar._TT["WK"] = "sav";
+Calendar._TT["TIME"] = "Laikas:";

From ad25d15d6cee6ec7c4aff197473e6b6284f85754 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Tue, 15 Jan 2008 20:40:59 +0000
Subject: [PATCH 130/710] Fixed error on migration 85 with Oracle (index name
 can not be more than 30 characters long).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1069 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 .../085_add_role_tracker_old_status_index_to_workflows.rb     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/db/migrate/085_add_role_tracker_old_status_index_to_workflows.rb b/db/migrate/085_add_role_tracker_old_status_index_to_workflows.rb
index 523cf091b..a59135be0 100644
--- a/db/migrate/085_add_role_tracker_old_status_index_to_workflows.rb
+++ b/db/migrate/085_add_role_tracker_old_status_index_to_workflows.rb
@@ -1,9 +1,9 @@
 class AddRoleTrackerOldStatusIndexToWorkflows < ActiveRecord::Migration
   def self.up
-    add_index :workflows, [:role_id, :tracker_id, :old_status_id], :name => :workflows_role_tracker_old_status
+    add_index :workflows, [:role_id, :tracker_id, :old_status_id], :name => :wkfs_role_tracker_old_status
   end
 
   def self.down
-    remove_index :workflows, :name => :workflows_role_tracker_old_status
+    remove_index(:workflows, :name => :wkfs_role_tracker_old_status); rescue
   end
 end

From 18066ba8bf68da4b00b7e740e6c67f8d8b1e0093 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Wed, 16 Jan 2008 20:45:13 +0000
Subject: [PATCH 131/710] Added a couple of mime types so that corresponding
 files can be viewed in the browser. Added a simple (and not perfect) CodeRay
 scanner for php.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1070 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 lib/redmine/mime_type.rb                      |   7 +-
 .../lib/coderay/helpers/file_type.rb          |   4 +
 .../lib/coderay/scanners/php.rb               | 165 ++++++++++++++++++
 3 files changed, 175 insertions(+), 1 deletion(-)
 create mode 100644 vendor/plugins/coderay-0.7.6.227/lib/coderay/scanners/php.rb

diff --git a/lib/redmine/mime_type.rb b/lib/redmine/mime_type.rb
index e041c731f..c9db93956 100644
--- a/lib/redmine/mime_type.rb
+++ b/lib/redmine/mime_type.rb
@@ -19,13 +19,18 @@ module Redmine
   module MimeType
 
     MIME_TYPES = {
-      'text/plain' => 'txt',
+      'text/plain' => 'txt,tpl,properties',
       'text/css' => 'css',
       'text/html' => 'html,htm,xhtml',
       'text/x-c' => 'c,cpp,h',
+      'text/x-java' => 'java',
       'text/x-javascript' => 'js',
       'text/x-html-template' => 'rhtml',
+      'text/x-perl' => 'pl,pm',
+      'text/x-php' => 'php,php3,php4,php5',
+      'text/x-python' => 'py',
       'text/x-ruby' => 'rb,rbw,ruby,rake',
+      'text/x-sh' => 'sh',
       'text/xml' => 'xml',
       'text/yaml' => 'yml,yaml',
       'image/gif' => 'gif',
diff --git a/vendor/plugins/coderay-0.7.6.227/lib/coderay/helpers/file_type.rb b/vendor/plugins/coderay-0.7.6.227/lib/coderay/helpers/file_type.rb
index 41b6c2ef2..5177a9353 100644
--- a/vendor/plugins/coderay-0.7.6.227/lib/coderay/helpers/file_type.rb
+++ b/vendor/plugins/coderay-0.7.6.227/lib/coderay/helpers/file_type.rb
@@ -88,6 +88,10 @@ module FileType
     'xml' => :xml,
     'htm' => :html,
     'html' => :html,
+    'php' => :php,
+    'php3' => :php,
+    'php4' => :php,
+    'php5' => :php,
     'xhtml' => :xhtml,
     'raydebug' => :debug,
     'rhtml' => :rhtml,
diff --git a/vendor/plugins/coderay-0.7.6.227/lib/coderay/scanners/php.rb b/vendor/plugins/coderay-0.7.6.227/lib/coderay/scanners/php.rb
new file mode 100644
index 000000000..0249e0ef4
--- /dev/null
+++ b/vendor/plugins/coderay-0.7.6.227/lib/coderay/scanners/php.rb
@@ -0,0 +1,165 @@
+module CodeRay module Scanners
+	
+	class PHP < Scanner
+
+		register_for :php
+		
+		RESERVED_WORDS = [
+          'and', 'or', 'xor', '__FILE__', 'exception', '__LINE__', 'array', 'as', 'break', 'case',
+          'class', 'const', 'continue', 'declare', 'default',
+          'die', 'do', 'echo', 'else', 'elseif',
+          'empty', 'enddeclare', 'endfor', 'endforeach', 'endif',
+          'endswitch', 'endwhile', 'eval', 'exit', 'extends',
+          'for', 'foreach', 'function', 'global', 'if',
+          'include', 'include_once', 'isset', 'list', 'new',
+          'print', 'require', 'require_once', 'return', 'static',
+          'switch', 'unset', 'use', 'var', 'while',
+          '__FUNCTION__', '__CLASS__', '__METHOD__', 'final', 'php_user_filter',
+          'interface', 'implements', 'extends', 'public', 'private',
+          'protected', 'abstract', 'clone', 'try', 'catch',
+          'throw', 'cfunction', 'old_function' 
+		]
+
+		PREDEFINED_CONSTANTS = [
+			'null', '$this', 'true', 'false'
+		]
+
+		IDENT_KIND = WordList.new(:ident).
+			add(RESERVED_WORDS, :reserved).
+			add(PREDEFINED_CONSTANTS, :pre_constant)
+
+		ESCAPE = / [\$\wrbfnrtv\n\\\/'"] | x[a-fA-F0-9]{1,2} | [0-7]{1,3} /x
+		UNICODE_ESCAPE =  / u[a-fA-F0-9]{4} | U[a-fA-F0-9]{8} /x
+
+		def scan_tokens tokens, options
+
+			state = :waiting_php
+			string_type = nil
+			regexp_allowed = true
+
+			until eos?
+
+				kind = :error
+				match = nil
+
+				if state == :initial
+					
+					if scan(/ \s+ | \\\n /x)
+						kind = :space
+						
+				    elsif scan(/\?>/)
+    				    kind = :char
+    				    state = :waiting_php
+						
+					elsif scan(%r{ (//|\#) [^\n\\]* (?: \\. [^\n\\]* )* | /\* (?: .*? \*/ | .* ) }mx)
+						kind = :comment
+						regexp_allowed = false
+
+					elsif match = scan(/ \# \s* if \s* 0 /x)
+						match << scan_until(/ ^\# (?:elif|else|endif) .*? $ | \z /xm) unless eos?
+						kind = :comment
+						regexp_allowed = false
+
+				  elsif regexp_allowed and scan(/\//)
+				    tokens << [:open, :regexp]
+				    state = :regex
+						kind = :delimiter
+						
+					elsif scan(/ [-+*\/=<>?:;,!&^|()\[\]{}~%] | \.(?!\d) /x)
+						kind = :operator
+						regexp_allowed=true
+						
+					elsif match = scan(/ [$@A-Za-z_][A-Za-z_0-9]* /x)
+						kind = IDENT_KIND[match]
+						regexp_allowed=false
+						
+					elsif match = scan(/["']/)
+						tokens << [:open, :string]
+                        string_type = matched
+						state = :string
+						kind = :delimiter
+				
+					elsif scan(/0[xX][0-9A-Fa-f]+/)
+						kind = :hex
+						regexp_allowed=false
+						
+					elsif scan(/(?:0[0-7]+)(?![89.eEfF])/)
+						kind = :oct
+						regexp_allowed=false
+						
+					elsif scan(/(?:\d+)(?![.eEfF])/)
+						kind = :integer
+						regexp_allowed=false
+						
+					elsif scan(/\d[fF]?|\d*\.\d+(?:[eE][+-]?\d+)?[fF]?|\d+[eE][+-]?\d+[fF]?/)
+						kind = :float
+						regexp_allowed=false
+
+					else
+						getch
+					end
+					
+				elsif state == :regex
+					if scan(/[^\\\/]+/)
+						kind = :content
+				  elsif scan(/\\\/|\\/)
+						kind = :content
+				  elsif scan(/\//)
+					  tokens << [matched, :delimiter]
+				    tokens << [:close, :regexp]
+				    state = :initial
+				    next
+				  else
+				    getch
+				    kind = :content
+					end
+				  
+				elsif state == :string
+					if scan(/[^\\"']+/)
+						kind = :content
+					elsif scan(/["']/)
+						if string_type==matched
+						  tokens << [matched, :delimiter]
+						  tokens << [:close, :string]
+						  state = :initial
+						  string_type=nil
+						  next
+						else
+						  kind = :content
+						end
+					elsif scan(/ \\ (?: \S ) /mox)
+						kind = :char
+					elsif scan(/ \\ | $ /x)
+						kind = :error
+						state = :initial
+					else
+						raise "else case \" reached; %p not handled." % peek(1), tokens
+					end		
+						
+				elsif state == :waiting_php
+                  if scan(/<\?php/m)
+				    kind = :char
+				    state = :initial
+				  elsif scan(/[^<]+/)
+				    kind = :comment
+                  else
+                    kind = :comment
+                    getch
+				  end
+				else
+					raise 'else-case reached', tokens
+					
+				end
+				
+				match ||= matched
+        
+				tokens << [match, kind]
+				
+			end
+		  tokens
+			
+		end
+
+	end
+
+end end
\ No newline at end of file

From 049051103b02efdef64f4119959d95d23d45e392 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Wed, 16 Jan 2008 21:27:48 +0000
Subject: [PATCH 132/710] On the calendar, the gantt and in the Tracker filter
 on the issue list, only active trackers of the project (and its sub projects)
 can be selected.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1071 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/projects_controller.rb      |  4 ++--
 app/models/project.rb                       |  9 +++++++++
 app/models/query.rb                         |  5 ++++-
 app/models/tracker.rb                       |  1 +
 test/fixtures/projects_trackers.yml         |  6 ------
 test/fixtures/trackers.yml                  |  3 +++
 test/functional/projects_controller_test.rb |  6 +++---
 test/unit/project_test.rb                   | 16 +++++++++++++++-
 8 files changed, 37 insertions(+), 13 deletions(-)

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 2ae742dfa..6add8585b 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -418,7 +418,7 @@ class ProjectsController < ApplicationController
   end
   
   def calendar
-    @trackers = Tracker.find(:all, :order => 'position')
+    @trackers = @project.rolled_up_trackers
     retrieve_selected_tracker_ids(@trackers)
     
     if params[:year] and params[:year].to_i > 1900
@@ -445,7 +445,7 @@ class ProjectsController < ApplicationController
   end  
 
   def gantt
-    @trackers = Tracker.find(:all, :order => 'position')
+    @trackers = @project.rolled_up_trackers
     retrieve_selected_tracker_ids(@trackers)
     
     if params[:year] and params[:year].to_i >0
diff --git a/app/models/project.rb b/app/models/project.rb
index 60a7a84a4..0e7f8284c 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -146,6 +146,15 @@ class Project < ActiveRecord::Base
     children.select {|child| child.active?}
   end
   
+  # Returns an array of the trackers used by the project and its sub projects
+  def rolled_up_trackers
+    @rolled_up_trackers ||=
+      Tracker.find(:all, :include => :projects,
+                         :select => "DISTINCT #{Tracker.table_name}.*",
+                         :conditions => ["#{Project.table_name}.id = ? OR #{Project.table_name}.parent_id = ?", id, id],
+                         :order => "#{Tracker.table_name}.position")
+  end
+  
   # Deletes all project's members
   def delete_all_members
     Member.delete_all(['project_id = ?', id])
diff --git a/app/models/query.rb b/app/models/query.rb
index 09dc0d581..3a1b5a19e 100644
--- a/app/models/query.rb
+++ b/app/models/query.rb
@@ -132,8 +132,11 @@ class Query < ActiveRecord::Base
   
   def available_filters
     return @available_filters if @available_filters
+    
+    trackers = project.nil? ? Tracker.find(:all, :order => 'position') : project.rolled_up_trackers
+    
     @available_filters = { "status_id" => { :type => :list_status, :order => 1, :values => IssueStatus.find(:all, :order => 'position').collect{|s| [s.name, s.id.to_s] } },       
-                           "tracker_id" => { :type => :list, :order => 2, :values => Tracker.find(:all, :order => 'position').collect{|s| [s.name, s.id.to_s] } },                                                                                                                
+                           "tracker_id" => { :type => :list, :order => 2, :values => trackers.collect{|s| [s.name, s.id.to_s] } },                                                                                                                
                            "priority_id" => { :type => :list, :order => 3, :values => Enumeration.find(:all, :conditions => ['opt=?','IPRI']).collect{|s| [s.name, s.id.to_s] } },
                            "subject" => { :type => :text, :order => 8 },  
                            "created_on" => { :type => :date_past, :order => 9 },                        
diff --git a/app/models/tracker.rb b/app/models/tracker.rb
index 8d8647747..07253a227 100644
--- a/app/models/tracker.rb
+++ b/app/models/tracker.rb
@@ -19,6 +19,7 @@ class Tracker < ActiveRecord::Base
   before_destroy :check_integrity  
   has_many :issues
   has_many :workflows, :dependent => :delete_all
+  has_and_belongs_to_many :projects
   has_and_belongs_to_many :custom_fields, :class_name => 'IssueCustomField', :join_table => "#{table_name_prefix}custom_fields_trackers#{table_name_suffix}", :association_foreign_key => 'custom_field_id'
   acts_as_list
 
diff --git a/test/fixtures/projects_trackers.yml b/test/fixtures/projects_trackers.yml
index cfca5b228..8eb7d85ab 100644
--- a/test/fixtures/projects_trackers.yml
+++ b/test/fixtures/projects_trackers.yml
@@ -14,9 +14,6 @@ projects_trackers_002:
 projects_trackers_014: 
   project_id: 5
   tracker_id: 2
-projects_trackers_003: 
-  project_id: 1
-  tracker_id: 3
 projects_trackers_015: 
   project_id: 5
   tracker_id: 3
@@ -29,9 +26,6 @@ projects_trackers_005:
 projects_trackers_006: 
   project_id: 2
   tracker_id: 3
-projects_trackers_007: 
-  project_id: 3
-  tracker_id: 1
 projects_trackers_008: 
   project_id: 3
   tracker_id: 2
diff --git a/test/fixtures/trackers.yml b/test/fixtures/trackers.yml
index d4ea34ac8..2643e8d1a 100644
--- a/test/fixtures/trackers.yml
+++ b/test/fixtures/trackers.yml
@@ -3,11 +3,14 @@ trackers_001:
   name: Bug
   id: 1
   is_in_chlog: true
+  position: 1
 trackers_002: 
   name: Feature request
   id: 2
   is_in_chlog: true
+  position: 2
 trackers_003: 
   name: Support request
   id: 3
   is_in_chlog: false
+  position: 3
diff --git a/test/functional/projects_controller_test.rb b/test/functional/projects_controller_test.rb
index 896f59074..f19aa7748 100644
--- a/test/functional/projects_controller_test.rb
+++ b/test/functional/projects_controller_test.rb
@@ -112,10 +112,10 @@ class ProjectsControllerTest < Test::Unit::TestCase
   
   def test_move_issues_to_another_tracker
     @request.session[:user_id] = 1
-    post :move_issues, :id => 1, :issue_ids => [1, 2], :new_tracker_id => 3
+    post :move_issues, :id => 1, :issue_ids => [1, 2], :new_tracker_id => 2
     assert_redirected_to 'projects/ecookbook/issues'
-    assert_equal 3, Issue.find(1).tracker_id
-    assert_equal 3, Issue.find(2).tracker_id
+    assert_equal 2, Issue.find(1).tracker_id
+    assert_equal 2, Issue.find(2).tracker_id
   end
   
   def test_list_files
diff --git a/test/unit/project_test.rb b/test/unit/project_test.rb
index 62ba2b02d..b05b7b09f 100644
--- a/test/unit/project_test.rb
+++ b/test/unit/project_test.rb
@@ -18,7 +18,7 @@
 require File.dirname(__FILE__) + '/../test_helper'
 
 class ProjectTest < Test::Unit::TestCase
-  fixtures :projects, :issues, :issue_statuses, :journals, :journal_details, :users, :members, :roles
+  fixtures :projects, :issues, :issue_statuses, :journals, :journal_details, :users, :members, :roles, :projects_trackers, :trackers
 
   def setup
     @ecookbook = Project.find(1)
@@ -112,6 +112,20 @@ class ProjectTest < Test::Unit::TestCase
     sub.parent = Project.find(2)
     assert !sub.save
   end
+  
+  def test_rolled_up_trackers
+    parent = Project.find(1)
+    child = parent.children.find(3)
+  
+    assert_equal [1, 2], parent.tracker_ids
+    assert_equal [2, 3], child.tracker_ids
+    
+    assert_kind_of Tracker, parent.rolled_up_trackers.first
+    assert_equal Tracker.find(1), parent.rolled_up_trackers.first
+    
+    assert_equal [1, 2, 3], parent.rolled_up_trackers.collect(&:id)
+    assert_equal [2, 3], child.rolled_up_trackers.collect(&:id)
+  end
 
   def test_issues_status_changes
     journals = @ecookbook.issues_status_changes 3.days.ago.to_date, Date.today

From 061977d77d8ab05ab3be9ec165ffbdc94bb68bf0 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Thu, 17 Jan 2008 17:40:45 +0000
Subject: [PATCH 133/710] Fixed: typo in en.yml

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1072 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 lang/en.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lang/en.yml b/lang/en.yml
index eec7702b7..7d3912760 100644
--- a/lang/en.yml
+++ b/lang/en.yml
@@ -87,7 +87,7 @@ mail_body_register: 'To activate your Redmine account, click on the following li
 mail_body_account_information_external: You can use your "%s" account to log into Redmine.
 mail_body_account_information: Your Redmine account information
 mail_subject_account_activation_request: Redmine account activation request
-mail_body_account_activation_request: 'A new user (%s) has registered. His account his pending your approval:'
+mail_body_account_activation_request: 'A new user (%s) has registered. His account is pending your approval:'
 
 gui_validation_error: 1 error
 gui_validation_error_plural: %d errors

From 1c5a9b17735a52d8e3c6e022b988cf1a7e3fb2e6 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Thu, 17 Jan 2008 17:43:54 +0000
Subject: [PATCH 134/710] Prettier tabs for settings views.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1073 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 public/stylesheets/application.css            | 33 +++++++++++++------
 .../alternate/stylesheets/application.css     |  2 +-
 .../classic/stylesheets/application.css       |  1 +
 3 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 2fca6d63c..fa76948d2 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -285,9 +285,10 @@ p.progress-info {clear: left; font-style: italic; font-size: 80%;}
 div#status_by { float:right; width:380px; margin-left: 16px; margin-bottom: 16px; }
 
 /***** Tabs *****/
-#content .tabs{height: 2.6em;}
-#content .tabs ul{margin:0;}
-#content .tabs ul li{
+#content .tabs {height: 2.6em; border-bottom: 1px solid #bbbbbb; margin-bottom:1.2em; position:relative;}
+#content .tabs ul {margin:0; position:absolute; bottom:-2px; padding-left:1em;}
+#content .tabs>ul { bottom:-1px; } /* others */
+#content .tabs ul li {
 float:left;
 list-style-type:none;
 white-space:nowrap;
@@ -298,18 +299,30 @@ background:#fff;
 display:block;
 font-size: 0.9em;
 text-decoration:none;
-line-height:1em;
-padding:4px;
-border: 1px solid #c0c0c0;
+line-height:1.3em;
+padding:4px 6px 4px 6px;
+border: 1px solid #ccc;
+border-bottom: 1px solid #bbbbbb;
+background-color: #eeeeee;
+color:#777;
+font-weight:bold;
 }
 
-#content .tabs ul li a.selected, #content .tabs ul li a:hover{
-background-color: #507AAA;
-border: 1px solid #507AAA;
-color: #fff;
+#content .tabs ul li a:hover {
+background-color: #ffffdd;
 text-decoration:none;
 }
 
+#content .tabs ul li a.selected {
+background-color: #fff;
+border: 1px solid #bbbbbb;
+border-bottom: 1px solid #fff;
+}
+
+#content .tabs ul li a.selected:hover {
+background-color: #fff;
+}
+
 /***** Diff *****/
 .diff_out { background: #fcc; }
 .diff_in { background: #cfc; }
diff --git a/public/themes/alternate/stylesheets/application.css b/public/themes/alternate/stylesheets/application.css
index af787ae71..06d38b96f 100644
--- a/public/themes/alternate/stylesheets/application.css
+++ b/public/themes/alternate/stylesheets/application.css
@@ -1,6 +1,6 @@
 @import url(../../../stylesheets/application.css);
 
-body { background-color:#EEEEEE; }
+body, #wrapper { background-color:#EEEEEE; }
 #header, #top-menu { margin: 0px 10px 0px 11px; }
 #main { background: #EEEEEE; margin: 8px 10px 0px 10px; }
 #content { background: #fff; border-right: 1px solid #bbb; border-bottom: 1px solid #bbb; border-left: 1px solid #d7d7d7; border-top: 1px solid #d7d7d7; }
diff --git a/public/themes/classic/stylesheets/application.css b/public/themes/classic/stylesheets/application.css
index 6bb148210..11654cc88 100644
--- a/public/themes/classic/stylesheets/application.css
+++ b/public/themes/classic/stylesheets/application.css
@@ -19,6 +19,7 @@ body{ color:#303030; background:#e8eaec; }
 #main a { font-weight: bold; color: #467aa7;}
 #main a:hover { color: #2a5a8a; text-decoration: underline; }
 #content { background: #fff; }
+#content .tabs ul { bottom:-1px; }
 
 h2, h3, h4, .wiki h1, .wiki h2, .wiki h3 { border-bottom: 0px; color:#606060; font-family: Trebuchet MS,Georgia,"Times New Roman",serif; }
 h2, .wiki h1 { letter-spacing:-1px; }

From 32b9bf0ef265355cdb4e10559cfce250af03a30f Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Thu, 17 Jan 2008 18:39:17 +0000
Subject: [PATCH 135/710] Added i18n support to the jstoolbar (only english and
 french are actually translated). Translations can be found in
 public/javascripts/jstoolbar/lang/

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1074 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/helpers/application_helper.rb                |  4 +++-
 public/javascripts/{ => jstoolbar}/jstoolbar.js  | 16 ++++++++++------
 .../javascripts/jstoolbar/lang/jstoolbar-bg.js   | 15 +++++++++++++++
 .../javascripts/jstoolbar/lang/jstoolbar-cs.js   | 15 +++++++++++++++
 .../javascripts/jstoolbar/lang/jstoolbar-de.js   | 15 +++++++++++++++
 .../javascripts/jstoolbar/lang/jstoolbar-en.js   | 15 +++++++++++++++
 .../javascripts/jstoolbar/lang/jstoolbar-es.js   | 15 +++++++++++++++
 .../javascripts/jstoolbar/lang/jstoolbar-fi.js   | 15 +++++++++++++++
 .../javascripts/jstoolbar/lang/jstoolbar-fr.js   | 15 +++++++++++++++
 .../javascripts/jstoolbar/lang/jstoolbar-he.js   | 15 +++++++++++++++
 .../javascripts/jstoolbar/lang/jstoolbar-it.js   | 15 +++++++++++++++
 .../javascripts/jstoolbar/lang/jstoolbar-ja.js   | 15 +++++++++++++++
 .../javascripts/jstoolbar/lang/jstoolbar-ko.js   | 15 +++++++++++++++
 .../javascripts/jstoolbar/lang/jstoolbar-lt.js   | 15 +++++++++++++++
 .../javascripts/jstoolbar/lang/jstoolbar-nl.js   | 15 +++++++++++++++
 .../javascripts/jstoolbar/lang/jstoolbar-pl.js   | 15 +++++++++++++++
 .../jstoolbar/lang/jstoolbar-pt-br.js            | 15 +++++++++++++++
 .../javascripts/jstoolbar/lang/jstoolbar-pt.js   | 15 +++++++++++++++
 .../javascripts/jstoolbar/lang/jstoolbar-ro.js   | 15 +++++++++++++++
 .../javascripts/jstoolbar/lang/jstoolbar-ru.js   | 15 +++++++++++++++
 .../javascripts/jstoolbar/lang/jstoolbar-sr.js   | 15 +++++++++++++++
 .../javascripts/jstoolbar/lang/jstoolbar-sv.js   | 15 +++++++++++++++
 .../jstoolbar/lang/jstoolbar-zh-tw.js            | 15 +++++++++++++++
 .../javascripts/jstoolbar/lang/jstoolbar-zh.js   | 15 +++++++++++++++
 24 files changed, 343 insertions(+), 7 deletions(-)
 rename public/javascripts/{ => jstoolbar}/jstoolbar.js (98%)
 create mode 100644 public/javascripts/jstoolbar/lang/jstoolbar-bg.js
 create mode 100644 public/javascripts/jstoolbar/lang/jstoolbar-cs.js
 create mode 100644 public/javascripts/jstoolbar/lang/jstoolbar-de.js
 create mode 100644 public/javascripts/jstoolbar/lang/jstoolbar-en.js
 create mode 100644 public/javascripts/jstoolbar/lang/jstoolbar-es.js
 create mode 100644 public/javascripts/jstoolbar/lang/jstoolbar-fi.js
 create mode 100644 public/javascripts/jstoolbar/lang/jstoolbar-fr.js
 create mode 100644 public/javascripts/jstoolbar/lang/jstoolbar-he.js
 create mode 100644 public/javascripts/jstoolbar/lang/jstoolbar-it.js
 create mode 100644 public/javascripts/jstoolbar/lang/jstoolbar-ja.js
 create mode 100644 public/javascripts/jstoolbar/lang/jstoolbar-ko.js
 create mode 100644 public/javascripts/jstoolbar/lang/jstoolbar-lt.js
 create mode 100644 public/javascripts/jstoolbar/lang/jstoolbar-nl.js
 create mode 100644 public/javascripts/jstoolbar/lang/jstoolbar-pl.js
 create mode 100644 public/javascripts/jstoolbar/lang/jstoolbar-pt-br.js
 create mode 100644 public/javascripts/jstoolbar/lang/jstoolbar-pt.js
 create mode 100644 public/javascripts/jstoolbar/lang/jstoolbar-ro.js
 create mode 100644 public/javascripts/jstoolbar/lang/jstoolbar-ru.js
 create mode 100644 public/javascripts/jstoolbar/lang/jstoolbar-sr.js
 create mode 100644 public/javascripts/jstoolbar/lang/jstoolbar-sv.js
 create mode 100644 public/javascripts/jstoolbar/lang/jstoolbar-zh-tw.js
 create mode 100644 public/javascripts/jstoolbar/lang/jstoolbar-zh.js

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 111709ce4..f0455f3e4 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -433,7 +433,9 @@ module ApplicationHelper
   
   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();")
+    javascript_include_tag('jstoolbar/jstoolbar') +
+      javascript_include_tag("jstoolbar/lang/jstoolbar-#{current_language}") +
+      javascript_tag("var toolbar = new jsToolBar($('#{field_id}')); toolbar.draw();")
   end
   
   def content_for(name, content = nil, &block)
diff --git a/public/javascripts/jstoolbar.js b/public/javascripts/jstoolbar/jstoolbar.js
similarity index 98%
rename from public/javascripts/jstoolbar.js
rename to public/javascripts/jstoolbar/jstoolbar.js
index b94a4ed80..65f25bac1 100644
--- a/public/javascripts/jstoolbar.js
+++ b/public/javascripts/jstoolbar/jstoolbar.js
@@ -67,7 +67,11 @@ function jsToolBar(textarea) {
 }
 
 function jsButton(title, fn, scope, className) {
-	this.title = title || null;
+    if(typeof jsToolBar.strings == 'undefined') {
+      this.title = title || null;
+    } else {
+      this.title = jsToolBar.strings[title] || title || null;
+    }
 	this.fn = fn || function(){};
 	this.scope = scope || null;
 	this.className = className || null;
@@ -368,7 +372,7 @@ jsToolBar.prototype.resizeDragStop = function(event) {
 // strong
 jsToolBar.prototype.elements.strong = {
 	type: 'button',
-	title: 'Strong emphasis',
+	title: 'Strong',
 	fn: {
 		wiki: function() { this.singleTag('*') }
 	}
@@ -377,7 +381,7 @@ jsToolBar.prototype.elements.strong = {
 // em
 jsToolBar.prototype.elements.em = {
 	type: 'button',
-	title: 'Emphasis',
+	title: 'Italic',
 	fn: {
 		wiki: function() { this.singleTag("_") }
 	}
@@ -386,7 +390,7 @@ jsToolBar.prototype.elements.em = {
 // ins
 jsToolBar.prototype.elements.ins = {
 	type: 'button',
-	title: 'Inserted',
+	title: 'Underline',
 	fn: {
 		wiki: function() { this.singleTag('+') }
 	}
@@ -506,7 +510,7 @@ jsToolBar.prototype.elements.space3 = {type: 'space'}
 // wiki page
 jsToolBar.prototype.elements.link = {
 	type: 'button',
-	title: 'Wiki Page Link',
+	title: 'Wiki link',
 	fn: {
 		wiki: function() { this.encloseSelection("[[", "]]") }
 	}
@@ -514,7 +518,7 @@ jsToolBar.prototype.elements.link = {
 // image
 jsToolBar.prototype.elements.img = {
 	type: 'button',
-	title: 'Inline image',
+	title: 'Image',
 	fn: {
 		wiki: function() { this.encloseSelection("!", "!") }
 	}
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-bg.js b/public/javascripts/jstoolbar/lang/jstoolbar-bg.js
new file mode 100644
index 000000000..72bab0be3
--- /dev/null
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-bg.js
@@ -0,0 +1,15 @@
+jsToolBar.strings = {};
+jsToolBar.strings['Strong'] = 'Strong';
+jsToolBar.strings['Italic'] = 'Italic';
+jsToolBar.strings['Underline'] = 'Underline';
+jsToolBar.strings['Deleted'] = 'Deleted';
+jsToolBar.strings['Inline quote'] = 'Inline quote';
+jsToolBar.strings['Code'] = 'Code';
+jsToolBar.strings['Heading 1'] = 'Heading 1';
+jsToolBar.strings['Heading 2'] = 'Heading 2';
+jsToolBar.strings['Heading 3'] = 'Heading 3';
+jsToolBar.strings['Unordered list'] = 'Unordered list';
+jsToolBar.strings['Ordered list'] = 'Ordered list';
+jsToolBar.strings['Preformatted text'] = 'Preformatted text';
+jsToolBar.strings['Wiki link'] = 'Link to a Wiki page';
+jsToolBar.strings['Image'] = 'Image';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-cs.js b/public/javascripts/jstoolbar/lang/jstoolbar-cs.js
new file mode 100644
index 000000000..72bab0be3
--- /dev/null
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-cs.js
@@ -0,0 +1,15 @@
+jsToolBar.strings = {};
+jsToolBar.strings['Strong'] = 'Strong';
+jsToolBar.strings['Italic'] = 'Italic';
+jsToolBar.strings['Underline'] = 'Underline';
+jsToolBar.strings['Deleted'] = 'Deleted';
+jsToolBar.strings['Inline quote'] = 'Inline quote';
+jsToolBar.strings['Code'] = 'Code';
+jsToolBar.strings['Heading 1'] = 'Heading 1';
+jsToolBar.strings['Heading 2'] = 'Heading 2';
+jsToolBar.strings['Heading 3'] = 'Heading 3';
+jsToolBar.strings['Unordered list'] = 'Unordered list';
+jsToolBar.strings['Ordered list'] = 'Ordered list';
+jsToolBar.strings['Preformatted text'] = 'Preformatted text';
+jsToolBar.strings['Wiki link'] = 'Link to a Wiki page';
+jsToolBar.strings['Image'] = 'Image';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-de.js b/public/javascripts/jstoolbar/lang/jstoolbar-de.js
new file mode 100644
index 000000000..72bab0be3
--- /dev/null
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-de.js
@@ -0,0 +1,15 @@
+jsToolBar.strings = {};
+jsToolBar.strings['Strong'] = 'Strong';
+jsToolBar.strings['Italic'] = 'Italic';
+jsToolBar.strings['Underline'] = 'Underline';
+jsToolBar.strings['Deleted'] = 'Deleted';
+jsToolBar.strings['Inline quote'] = 'Inline quote';
+jsToolBar.strings['Code'] = 'Code';
+jsToolBar.strings['Heading 1'] = 'Heading 1';
+jsToolBar.strings['Heading 2'] = 'Heading 2';
+jsToolBar.strings['Heading 3'] = 'Heading 3';
+jsToolBar.strings['Unordered list'] = 'Unordered list';
+jsToolBar.strings['Ordered list'] = 'Ordered list';
+jsToolBar.strings['Preformatted text'] = 'Preformatted text';
+jsToolBar.strings['Wiki link'] = 'Link to a Wiki page';
+jsToolBar.strings['Image'] = 'Image';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-en.js b/public/javascripts/jstoolbar/lang/jstoolbar-en.js
new file mode 100644
index 000000000..72bab0be3
--- /dev/null
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-en.js
@@ -0,0 +1,15 @@
+jsToolBar.strings = {};
+jsToolBar.strings['Strong'] = 'Strong';
+jsToolBar.strings['Italic'] = 'Italic';
+jsToolBar.strings['Underline'] = 'Underline';
+jsToolBar.strings['Deleted'] = 'Deleted';
+jsToolBar.strings['Inline quote'] = 'Inline quote';
+jsToolBar.strings['Code'] = 'Code';
+jsToolBar.strings['Heading 1'] = 'Heading 1';
+jsToolBar.strings['Heading 2'] = 'Heading 2';
+jsToolBar.strings['Heading 3'] = 'Heading 3';
+jsToolBar.strings['Unordered list'] = 'Unordered list';
+jsToolBar.strings['Ordered list'] = 'Ordered list';
+jsToolBar.strings['Preformatted text'] = 'Preformatted text';
+jsToolBar.strings['Wiki link'] = 'Link to a Wiki page';
+jsToolBar.strings['Image'] = 'Image';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-es.js b/public/javascripts/jstoolbar/lang/jstoolbar-es.js
new file mode 100644
index 000000000..72bab0be3
--- /dev/null
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-es.js
@@ -0,0 +1,15 @@
+jsToolBar.strings = {};
+jsToolBar.strings['Strong'] = 'Strong';
+jsToolBar.strings['Italic'] = 'Italic';
+jsToolBar.strings['Underline'] = 'Underline';
+jsToolBar.strings['Deleted'] = 'Deleted';
+jsToolBar.strings['Inline quote'] = 'Inline quote';
+jsToolBar.strings['Code'] = 'Code';
+jsToolBar.strings['Heading 1'] = 'Heading 1';
+jsToolBar.strings['Heading 2'] = 'Heading 2';
+jsToolBar.strings['Heading 3'] = 'Heading 3';
+jsToolBar.strings['Unordered list'] = 'Unordered list';
+jsToolBar.strings['Ordered list'] = 'Ordered list';
+jsToolBar.strings['Preformatted text'] = 'Preformatted text';
+jsToolBar.strings['Wiki link'] = 'Link to a Wiki page';
+jsToolBar.strings['Image'] = 'Image';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-fi.js b/public/javascripts/jstoolbar/lang/jstoolbar-fi.js
new file mode 100644
index 000000000..72bab0be3
--- /dev/null
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-fi.js
@@ -0,0 +1,15 @@
+jsToolBar.strings = {};
+jsToolBar.strings['Strong'] = 'Strong';
+jsToolBar.strings['Italic'] = 'Italic';
+jsToolBar.strings['Underline'] = 'Underline';
+jsToolBar.strings['Deleted'] = 'Deleted';
+jsToolBar.strings['Inline quote'] = 'Inline quote';
+jsToolBar.strings['Code'] = 'Code';
+jsToolBar.strings['Heading 1'] = 'Heading 1';
+jsToolBar.strings['Heading 2'] = 'Heading 2';
+jsToolBar.strings['Heading 3'] = 'Heading 3';
+jsToolBar.strings['Unordered list'] = 'Unordered list';
+jsToolBar.strings['Ordered list'] = 'Ordered list';
+jsToolBar.strings['Preformatted text'] = 'Preformatted text';
+jsToolBar.strings['Wiki link'] = 'Link to a Wiki page';
+jsToolBar.strings['Image'] = 'Image';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-fr.js b/public/javascripts/jstoolbar/lang/jstoolbar-fr.js
new file mode 100644
index 000000000..402c34d29
--- /dev/null
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-fr.js
@@ -0,0 +1,15 @@
+jsToolBar.strings = {};
+jsToolBar.strings['Strong'] = 'Gras';
+jsToolBar.strings['Italic'] = 'Italique';
+jsToolBar.strings['Underline'] = 'Souligné';
+jsToolBar.strings['Deleted'] = 'Rayé';
+jsToolBar.strings['Inline quote'] = 'Citation';
+jsToolBar.strings['Code'] = 'Code';
+jsToolBar.strings['Heading 1'] = 'Titre niveau 1';
+jsToolBar.strings['Heading 2'] = 'Titre niveau 2';
+jsToolBar.strings['Heading 3'] = 'Titre niveau 3';
+jsToolBar.strings['Unordered list'] = 'Liste à puces';
+jsToolBar.strings['Ordered list'] = 'Liste numérotée';
+jsToolBar.strings['Preformatted text'] = 'Texte préformaté';
+jsToolBar.strings['Wiki link'] = 'Lien vers une page Wiki';
+jsToolBar.strings['Image'] = 'Image';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-he.js b/public/javascripts/jstoolbar/lang/jstoolbar-he.js
new file mode 100644
index 000000000..72bab0be3
--- /dev/null
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-he.js
@@ -0,0 +1,15 @@
+jsToolBar.strings = {};
+jsToolBar.strings['Strong'] = 'Strong';
+jsToolBar.strings['Italic'] = 'Italic';
+jsToolBar.strings['Underline'] = 'Underline';
+jsToolBar.strings['Deleted'] = 'Deleted';
+jsToolBar.strings['Inline quote'] = 'Inline quote';
+jsToolBar.strings['Code'] = 'Code';
+jsToolBar.strings['Heading 1'] = 'Heading 1';
+jsToolBar.strings['Heading 2'] = 'Heading 2';
+jsToolBar.strings['Heading 3'] = 'Heading 3';
+jsToolBar.strings['Unordered list'] = 'Unordered list';
+jsToolBar.strings['Ordered list'] = 'Ordered list';
+jsToolBar.strings['Preformatted text'] = 'Preformatted text';
+jsToolBar.strings['Wiki link'] = 'Link to a Wiki page';
+jsToolBar.strings['Image'] = 'Image';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-it.js b/public/javascripts/jstoolbar/lang/jstoolbar-it.js
new file mode 100644
index 000000000..72bab0be3
--- /dev/null
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-it.js
@@ -0,0 +1,15 @@
+jsToolBar.strings = {};
+jsToolBar.strings['Strong'] = 'Strong';
+jsToolBar.strings['Italic'] = 'Italic';
+jsToolBar.strings['Underline'] = 'Underline';
+jsToolBar.strings['Deleted'] = 'Deleted';
+jsToolBar.strings['Inline quote'] = 'Inline quote';
+jsToolBar.strings['Code'] = 'Code';
+jsToolBar.strings['Heading 1'] = 'Heading 1';
+jsToolBar.strings['Heading 2'] = 'Heading 2';
+jsToolBar.strings['Heading 3'] = 'Heading 3';
+jsToolBar.strings['Unordered list'] = 'Unordered list';
+jsToolBar.strings['Ordered list'] = 'Ordered list';
+jsToolBar.strings['Preformatted text'] = 'Preformatted text';
+jsToolBar.strings['Wiki link'] = 'Link to a Wiki page';
+jsToolBar.strings['Image'] = 'Image';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-ja.js b/public/javascripts/jstoolbar/lang/jstoolbar-ja.js
new file mode 100644
index 000000000..72bab0be3
--- /dev/null
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-ja.js
@@ -0,0 +1,15 @@
+jsToolBar.strings = {};
+jsToolBar.strings['Strong'] = 'Strong';
+jsToolBar.strings['Italic'] = 'Italic';
+jsToolBar.strings['Underline'] = 'Underline';
+jsToolBar.strings['Deleted'] = 'Deleted';
+jsToolBar.strings['Inline quote'] = 'Inline quote';
+jsToolBar.strings['Code'] = 'Code';
+jsToolBar.strings['Heading 1'] = 'Heading 1';
+jsToolBar.strings['Heading 2'] = 'Heading 2';
+jsToolBar.strings['Heading 3'] = 'Heading 3';
+jsToolBar.strings['Unordered list'] = 'Unordered list';
+jsToolBar.strings['Ordered list'] = 'Ordered list';
+jsToolBar.strings['Preformatted text'] = 'Preformatted text';
+jsToolBar.strings['Wiki link'] = 'Link to a Wiki page';
+jsToolBar.strings['Image'] = 'Image';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-ko.js b/public/javascripts/jstoolbar/lang/jstoolbar-ko.js
new file mode 100644
index 000000000..72bab0be3
--- /dev/null
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-ko.js
@@ -0,0 +1,15 @@
+jsToolBar.strings = {};
+jsToolBar.strings['Strong'] = 'Strong';
+jsToolBar.strings['Italic'] = 'Italic';
+jsToolBar.strings['Underline'] = 'Underline';
+jsToolBar.strings['Deleted'] = 'Deleted';
+jsToolBar.strings['Inline quote'] = 'Inline quote';
+jsToolBar.strings['Code'] = 'Code';
+jsToolBar.strings['Heading 1'] = 'Heading 1';
+jsToolBar.strings['Heading 2'] = 'Heading 2';
+jsToolBar.strings['Heading 3'] = 'Heading 3';
+jsToolBar.strings['Unordered list'] = 'Unordered list';
+jsToolBar.strings['Ordered list'] = 'Ordered list';
+jsToolBar.strings['Preformatted text'] = 'Preformatted text';
+jsToolBar.strings['Wiki link'] = 'Link to a Wiki page';
+jsToolBar.strings['Image'] = 'Image';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-lt.js b/public/javascripts/jstoolbar/lang/jstoolbar-lt.js
new file mode 100644
index 000000000..72bab0be3
--- /dev/null
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-lt.js
@@ -0,0 +1,15 @@
+jsToolBar.strings = {};
+jsToolBar.strings['Strong'] = 'Strong';
+jsToolBar.strings['Italic'] = 'Italic';
+jsToolBar.strings['Underline'] = 'Underline';
+jsToolBar.strings['Deleted'] = 'Deleted';
+jsToolBar.strings['Inline quote'] = 'Inline quote';
+jsToolBar.strings['Code'] = 'Code';
+jsToolBar.strings['Heading 1'] = 'Heading 1';
+jsToolBar.strings['Heading 2'] = 'Heading 2';
+jsToolBar.strings['Heading 3'] = 'Heading 3';
+jsToolBar.strings['Unordered list'] = 'Unordered list';
+jsToolBar.strings['Ordered list'] = 'Ordered list';
+jsToolBar.strings['Preformatted text'] = 'Preformatted text';
+jsToolBar.strings['Wiki link'] = 'Link to a Wiki page';
+jsToolBar.strings['Image'] = 'Image';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-nl.js b/public/javascripts/jstoolbar/lang/jstoolbar-nl.js
new file mode 100644
index 000000000..72bab0be3
--- /dev/null
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-nl.js
@@ -0,0 +1,15 @@
+jsToolBar.strings = {};
+jsToolBar.strings['Strong'] = 'Strong';
+jsToolBar.strings['Italic'] = 'Italic';
+jsToolBar.strings['Underline'] = 'Underline';
+jsToolBar.strings['Deleted'] = 'Deleted';
+jsToolBar.strings['Inline quote'] = 'Inline quote';
+jsToolBar.strings['Code'] = 'Code';
+jsToolBar.strings['Heading 1'] = 'Heading 1';
+jsToolBar.strings['Heading 2'] = 'Heading 2';
+jsToolBar.strings['Heading 3'] = 'Heading 3';
+jsToolBar.strings['Unordered list'] = 'Unordered list';
+jsToolBar.strings['Ordered list'] = 'Ordered list';
+jsToolBar.strings['Preformatted text'] = 'Preformatted text';
+jsToolBar.strings['Wiki link'] = 'Link to a Wiki page';
+jsToolBar.strings['Image'] = 'Image';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-pl.js b/public/javascripts/jstoolbar/lang/jstoolbar-pl.js
new file mode 100644
index 000000000..72bab0be3
--- /dev/null
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-pl.js
@@ -0,0 +1,15 @@
+jsToolBar.strings = {};
+jsToolBar.strings['Strong'] = 'Strong';
+jsToolBar.strings['Italic'] = 'Italic';
+jsToolBar.strings['Underline'] = 'Underline';
+jsToolBar.strings['Deleted'] = 'Deleted';
+jsToolBar.strings['Inline quote'] = 'Inline quote';
+jsToolBar.strings['Code'] = 'Code';
+jsToolBar.strings['Heading 1'] = 'Heading 1';
+jsToolBar.strings['Heading 2'] = 'Heading 2';
+jsToolBar.strings['Heading 3'] = 'Heading 3';
+jsToolBar.strings['Unordered list'] = 'Unordered list';
+jsToolBar.strings['Ordered list'] = 'Ordered list';
+jsToolBar.strings['Preformatted text'] = 'Preformatted text';
+jsToolBar.strings['Wiki link'] = 'Link to a Wiki page';
+jsToolBar.strings['Image'] = 'Image';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-pt-br.js b/public/javascripts/jstoolbar/lang/jstoolbar-pt-br.js
new file mode 100644
index 000000000..72bab0be3
--- /dev/null
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-pt-br.js
@@ -0,0 +1,15 @@
+jsToolBar.strings = {};
+jsToolBar.strings['Strong'] = 'Strong';
+jsToolBar.strings['Italic'] = 'Italic';
+jsToolBar.strings['Underline'] = 'Underline';
+jsToolBar.strings['Deleted'] = 'Deleted';
+jsToolBar.strings['Inline quote'] = 'Inline quote';
+jsToolBar.strings['Code'] = 'Code';
+jsToolBar.strings['Heading 1'] = 'Heading 1';
+jsToolBar.strings['Heading 2'] = 'Heading 2';
+jsToolBar.strings['Heading 3'] = 'Heading 3';
+jsToolBar.strings['Unordered list'] = 'Unordered list';
+jsToolBar.strings['Ordered list'] = 'Ordered list';
+jsToolBar.strings['Preformatted text'] = 'Preformatted text';
+jsToolBar.strings['Wiki link'] = 'Link to a Wiki page';
+jsToolBar.strings['Image'] = 'Image';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-pt.js b/public/javascripts/jstoolbar/lang/jstoolbar-pt.js
new file mode 100644
index 000000000..72bab0be3
--- /dev/null
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-pt.js
@@ -0,0 +1,15 @@
+jsToolBar.strings = {};
+jsToolBar.strings['Strong'] = 'Strong';
+jsToolBar.strings['Italic'] = 'Italic';
+jsToolBar.strings['Underline'] = 'Underline';
+jsToolBar.strings['Deleted'] = 'Deleted';
+jsToolBar.strings['Inline quote'] = 'Inline quote';
+jsToolBar.strings['Code'] = 'Code';
+jsToolBar.strings['Heading 1'] = 'Heading 1';
+jsToolBar.strings['Heading 2'] = 'Heading 2';
+jsToolBar.strings['Heading 3'] = 'Heading 3';
+jsToolBar.strings['Unordered list'] = 'Unordered list';
+jsToolBar.strings['Ordered list'] = 'Ordered list';
+jsToolBar.strings['Preformatted text'] = 'Preformatted text';
+jsToolBar.strings['Wiki link'] = 'Link to a Wiki page';
+jsToolBar.strings['Image'] = 'Image';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-ro.js b/public/javascripts/jstoolbar/lang/jstoolbar-ro.js
new file mode 100644
index 000000000..72bab0be3
--- /dev/null
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-ro.js
@@ -0,0 +1,15 @@
+jsToolBar.strings = {};
+jsToolBar.strings['Strong'] = 'Strong';
+jsToolBar.strings['Italic'] = 'Italic';
+jsToolBar.strings['Underline'] = 'Underline';
+jsToolBar.strings['Deleted'] = 'Deleted';
+jsToolBar.strings['Inline quote'] = 'Inline quote';
+jsToolBar.strings['Code'] = 'Code';
+jsToolBar.strings['Heading 1'] = 'Heading 1';
+jsToolBar.strings['Heading 2'] = 'Heading 2';
+jsToolBar.strings['Heading 3'] = 'Heading 3';
+jsToolBar.strings['Unordered list'] = 'Unordered list';
+jsToolBar.strings['Ordered list'] = 'Ordered list';
+jsToolBar.strings['Preformatted text'] = 'Preformatted text';
+jsToolBar.strings['Wiki link'] = 'Link to a Wiki page';
+jsToolBar.strings['Image'] = 'Image';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-ru.js b/public/javascripts/jstoolbar/lang/jstoolbar-ru.js
new file mode 100644
index 000000000..72bab0be3
--- /dev/null
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-ru.js
@@ -0,0 +1,15 @@
+jsToolBar.strings = {};
+jsToolBar.strings['Strong'] = 'Strong';
+jsToolBar.strings['Italic'] = 'Italic';
+jsToolBar.strings['Underline'] = 'Underline';
+jsToolBar.strings['Deleted'] = 'Deleted';
+jsToolBar.strings['Inline quote'] = 'Inline quote';
+jsToolBar.strings['Code'] = 'Code';
+jsToolBar.strings['Heading 1'] = 'Heading 1';
+jsToolBar.strings['Heading 2'] = 'Heading 2';
+jsToolBar.strings['Heading 3'] = 'Heading 3';
+jsToolBar.strings['Unordered list'] = 'Unordered list';
+jsToolBar.strings['Ordered list'] = 'Ordered list';
+jsToolBar.strings['Preformatted text'] = 'Preformatted text';
+jsToolBar.strings['Wiki link'] = 'Link to a Wiki page';
+jsToolBar.strings['Image'] = 'Image';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-sr.js b/public/javascripts/jstoolbar/lang/jstoolbar-sr.js
new file mode 100644
index 000000000..72bab0be3
--- /dev/null
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-sr.js
@@ -0,0 +1,15 @@
+jsToolBar.strings = {};
+jsToolBar.strings['Strong'] = 'Strong';
+jsToolBar.strings['Italic'] = 'Italic';
+jsToolBar.strings['Underline'] = 'Underline';
+jsToolBar.strings['Deleted'] = 'Deleted';
+jsToolBar.strings['Inline quote'] = 'Inline quote';
+jsToolBar.strings['Code'] = 'Code';
+jsToolBar.strings['Heading 1'] = 'Heading 1';
+jsToolBar.strings['Heading 2'] = 'Heading 2';
+jsToolBar.strings['Heading 3'] = 'Heading 3';
+jsToolBar.strings['Unordered list'] = 'Unordered list';
+jsToolBar.strings['Ordered list'] = 'Ordered list';
+jsToolBar.strings['Preformatted text'] = 'Preformatted text';
+jsToolBar.strings['Wiki link'] = 'Link to a Wiki page';
+jsToolBar.strings['Image'] = 'Image';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-sv.js b/public/javascripts/jstoolbar/lang/jstoolbar-sv.js
new file mode 100644
index 000000000..72bab0be3
--- /dev/null
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-sv.js
@@ -0,0 +1,15 @@
+jsToolBar.strings = {};
+jsToolBar.strings['Strong'] = 'Strong';
+jsToolBar.strings['Italic'] = 'Italic';
+jsToolBar.strings['Underline'] = 'Underline';
+jsToolBar.strings['Deleted'] = 'Deleted';
+jsToolBar.strings['Inline quote'] = 'Inline quote';
+jsToolBar.strings['Code'] = 'Code';
+jsToolBar.strings['Heading 1'] = 'Heading 1';
+jsToolBar.strings['Heading 2'] = 'Heading 2';
+jsToolBar.strings['Heading 3'] = 'Heading 3';
+jsToolBar.strings['Unordered list'] = 'Unordered list';
+jsToolBar.strings['Ordered list'] = 'Ordered list';
+jsToolBar.strings['Preformatted text'] = 'Preformatted text';
+jsToolBar.strings['Wiki link'] = 'Link to a Wiki page';
+jsToolBar.strings['Image'] = 'Image';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-zh-tw.js b/public/javascripts/jstoolbar/lang/jstoolbar-zh-tw.js
new file mode 100644
index 000000000..72bab0be3
--- /dev/null
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-zh-tw.js
@@ -0,0 +1,15 @@
+jsToolBar.strings = {};
+jsToolBar.strings['Strong'] = 'Strong';
+jsToolBar.strings['Italic'] = 'Italic';
+jsToolBar.strings['Underline'] = 'Underline';
+jsToolBar.strings['Deleted'] = 'Deleted';
+jsToolBar.strings['Inline quote'] = 'Inline quote';
+jsToolBar.strings['Code'] = 'Code';
+jsToolBar.strings['Heading 1'] = 'Heading 1';
+jsToolBar.strings['Heading 2'] = 'Heading 2';
+jsToolBar.strings['Heading 3'] = 'Heading 3';
+jsToolBar.strings['Unordered list'] = 'Unordered list';
+jsToolBar.strings['Ordered list'] = 'Ordered list';
+jsToolBar.strings['Preformatted text'] = 'Preformatted text';
+jsToolBar.strings['Wiki link'] = 'Link to a Wiki page';
+jsToolBar.strings['Image'] = 'Image';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-zh.js b/public/javascripts/jstoolbar/lang/jstoolbar-zh.js
new file mode 100644
index 000000000..72bab0be3
--- /dev/null
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-zh.js
@@ -0,0 +1,15 @@
+jsToolBar.strings = {};
+jsToolBar.strings['Strong'] = 'Strong';
+jsToolBar.strings['Italic'] = 'Italic';
+jsToolBar.strings['Underline'] = 'Underline';
+jsToolBar.strings['Deleted'] = 'Deleted';
+jsToolBar.strings['Inline quote'] = 'Inline quote';
+jsToolBar.strings['Code'] = 'Code';
+jsToolBar.strings['Heading 1'] = 'Heading 1';
+jsToolBar.strings['Heading 2'] = 'Heading 2';
+jsToolBar.strings['Heading 3'] = 'Heading 3';
+jsToolBar.strings['Unordered list'] = 'Unordered list';
+jsToolBar.strings['Ordered list'] = 'Ordered list';
+jsToolBar.strings['Preformatted text'] = 'Preformatted text';
+jsToolBar.strings['Wiki link'] = 'Link to a Wiki page';
+jsToolBar.strings['Image'] = 'Image';

From 3e031b4243b38c3739936ae143acf21d305cd570 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Thu, 17 Jan 2008 19:58:03 +0000
Subject: [PATCH 136/710] Fixed: locked users should not receive email
 notifications.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1075 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/models/issue.rb                                       | 6 +++---
 app/models/message_observer.rb                            | 2 +-
 vendor/plugins/acts_as_watchable/lib/acts_as_watchable.rb | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/models/issue.rb b/app/models/issue.rb
index 419c6cdc7..a1c46cadf 100644
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -190,9 +190,9 @@ class Issue < ActiveRecord::Base
   # Returns the mail adresses of users that should be notified for the issue
   def recipients
     recipients = project.recipients
-    # Author and assignee are always notified
-    recipients << author.mail if author
-    recipients << assigned_to.mail if assigned_to
+    # Author and assignee are always notified unless they have been locked
+    recipients << author.mail if author && author.active?
+    recipients << assigned_to.mail if assigned_to && assigned_to.active?
     recipients.compact.uniq
   end
   
diff --git a/app/models/message_observer.rb b/app/models/message_observer.rb
index 1c311e25f..c26805c1b 100644
--- a/app/models/message_observer.rb
+++ b/app/models/message_observer.rb
@@ -18,7 +18,7 @@
 class MessageObserver < ActiveRecord::Observer
   def after_create(message)
     # send notification to the authors of the thread
-    recipients = ([message.root] + message.root.children).collect {|m| m.author.mail if m.author}
+    recipients = ([message.root] + message.root.children).collect {|m| m.author.mail if m.author && m.author.active?}
     # send notification to the board watchers
     recipients += message.board.watcher_recipients
     recipients = recipients.compact.uniq
diff --git a/vendor/plugins/acts_as_watchable/lib/acts_as_watchable.rb b/vendor/plugins/acts_as_watchable/lib/acts_as_watchable.rb
index c789017e5..53e4455cf 100644
--- a/vendor/plugins/acts_as_watchable/lib/acts_as_watchable.rb
+++ b/vendor/plugins/acts_as_watchable/lib/acts_as_watchable.rb
@@ -37,7 +37,7 @@ module Redmine
         end
         
         def watcher_recipients
-          self.watchers.collect { |w| w.user.mail }
+          self.watchers.collect { |w| w.user.mail if w.user.active? }.compact
         end
 
         module ClassMethods

From 0faa4568a0ab18277259ad1c89309c3c53fa42de Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sat, 19 Jan 2008 11:53:43 +0000
Subject: [PATCH 137/710] Highlight the current item of the main menu.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1076 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/application.rb                |  3 +
 .../issue_categories_controller.rb            |  1 +
 app/controllers/messages_controller.rb        |  1 +
 app/controllers/projects_controller.rb        |  7 +++
 app/controllers/queries_controller.rb         |  1 +
 app/controllers/reports_controller.rb         |  1 +
 app/controllers/repositories_controller.rb    |  1 +
 app/controllers/timelog_controller.rb         |  3 +-
 app/controllers/versions_controller.rb        |  1 +
 app/controllers/wikis_controller.rb           |  1 +
 app/views/layouts/base.rhtml                  |  8 +--
 lib/redmine.rb                                | 25 ++++----
 lib/redmine/menu_manager.rb                   | 60 ++++++++++++++++++-
 public/stylesheets/application.css            |  2 +-
 14 files changed, 94 insertions(+), 21 deletions(-)

diff --git a/app/controllers/application.rb b/app/controllers/application.rb
index 25cf205f4..66cec7d2a 100644
--- a/app/controllers/application.rb
+++ b/app/controllers/application.rb
@@ -19,6 +19,9 @@ class ApplicationController < ActionController::Base
   before_filter :user_setup, :check_if_login_required, :set_localization
   filter_parameter_logging :password
   
+  include Redmine::MenuManager::MenuController
+  helper Redmine::MenuManager::MenuHelper
+  
   REDMINE_SUPPORTED_SCM.each do |scm|
     require_dependency "repository/#{scm.underscore}"
   end
diff --git a/app/controllers/issue_categories_controller.rb b/app/controllers/issue_categories_controller.rb
index 2c1c6657b..a73935b4f 100644
--- a/app/controllers/issue_categories_controller.rb
+++ b/app/controllers/issue_categories_controller.rb
@@ -17,6 +17,7 @@
 
 class IssueCategoriesController < ApplicationController
   layout 'base'
+  menu_item :settings
   before_filter :find_project, :authorize
   
   verify :method => :post, :only => :destroy
diff --git a/app/controllers/messages_controller.rb b/app/controllers/messages_controller.rb
index 8078abf71..49f4ba77c 100644
--- a/app/controllers/messages_controller.rb
+++ b/app/controllers/messages_controller.rb
@@ -17,6 +17,7 @@
 
 class MessagesController < ApplicationController
   layout 'base'
+  menu_item :boards
   before_filter :find_board, :only => :new
   before_filter :find_message, :except => :new
   before_filter :authorize
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 6add8585b..f38ca828e 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -17,6 +17,13 @@
 
 class ProjectsController < ApplicationController
   layout 'base'
+  menu_item :overview
+  menu_item :activity, :only => :activity
+  menu_item :roadmap, :only => :roadmap
+  menu_item :files, :only => [:list_files, :add_file]
+  menu_item :settings, :only => :settings
+  menu_item :issues, :only => [:add_issue, :bulk_edit_issues, :changelog, :move_issues]
+  
   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 ]
diff --git a/app/controllers/queries_controller.rb b/app/controllers/queries_controller.rb
index 69bad345a..0a762eee0 100644
--- a/app/controllers/queries_controller.rb
+++ b/app/controllers/queries_controller.rb
@@ -17,6 +17,7 @@
 
 class QueriesController < ApplicationController
   layout 'base'
+  menu_item :issues
   before_filter :find_project, :authorize
 
   def index
diff --git a/app/controllers/reports_controller.rb b/app/controllers/reports_controller.rb
index e33fe8412..338059a50 100644
--- a/app/controllers/reports_controller.rb
+++ b/app/controllers/reports_controller.rb
@@ -17,6 +17,7 @@
 
 class ReportsController < ApplicationController
   layout 'base'
+  menu_item :issues
   before_filter :find_project, :authorize
 
   def issue_report
diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb
index f8b1eae81..6c2b088cc 100644
--- a/app/controllers/repositories_controller.rb
+++ b/app/controllers/repositories_controller.rb
@@ -24,6 +24,7 @@ end
 
 class RepositoriesController < ApplicationController
   layout 'base'
+  menu_item :repository
   before_filter :find_repository, :except => :edit
   before_filter :find_project, :only => :edit
   before_filter :authorize
diff --git a/app/controllers/timelog_controller.rb b/app/controllers/timelog_controller.rb
index f90c4527e..39e6d2fd3 100644
--- a/app/controllers/timelog_controller.rb
+++ b/app/controllers/timelog_controller.rb
@@ -16,7 +16,8 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class TimelogController < ApplicationController
-  layout 'base'  
+  layout 'base'
+  menu_item :issues
   before_filter :find_project, :authorize
 
   helper :sort
diff --git a/app/controllers/versions_controller.rb b/app/controllers/versions_controller.rb
index df1be2869..55b3a7fce 100644
--- a/app/controllers/versions_controller.rb
+++ b/app/controllers/versions_controller.rb
@@ -17,6 +17,7 @@
 
 class VersionsController < ApplicationController
   layout 'base'
+  menu_item :roadmap
   before_filter :find_project, :authorize
 
   cache_sweeper :version_sweeper, :only => [ :edit, :destroy ]
diff --git a/app/controllers/wikis_controller.rb b/app/controllers/wikis_controller.rb
index a222570ef..6054abd9a 100644
--- a/app/controllers/wikis_controller.rb
+++ b/app/controllers/wikis_controller.rb
@@ -17,6 +17,7 @@
 
 class WikisController < ApplicationController
   layout 'base'
+  menu_item :settings
   before_filter :find_project, :authorize
   
   # Create or update a project's wiki
diff --git a/app/views/layouts/base.rhtml b/app/views/layouts/base.rhtml
index bdaddcb3b..91c3b2634 100644
--- a/app/views/layouts/base.rhtml
+++ b/app/views/layouts/base.rhtml
@@ -49,13 +49,7 @@
     <h1><%= h(@project ? @project.name : Setting.app_title) %></h1>
     
     <div id="main-menu">
-        <ul>
-            <% Redmine::MenuManager.allowed_items(:project_menu, User.current, @project).each do |item| %>
-            <% unless item.condition && !item.condition.call(@project) %>
-                <li><%= link_to l(item.name), {item.param => @project}.merge(item.url) %></li>
-            <% end %>
-            <% end if @project && !@project.new_record? %>
-        </ul>
+        <%= render_main_menu(@project) %>
     </div>
 </div>
 
diff --git a/lib/redmine.rb b/lib/redmine.rb
index 2dca9ed50..d0e152467 100644
--- a/lib/redmine.rb
+++ b/lib/redmine.rb
@@ -91,15 +91,18 @@ end
 
 # Project menu configuration
 Redmine::MenuManager.map :project_menu do |menu|
-  menu.push :label_overview, :controller => 'projects', :action => 'show'
-  menu.push :label_activity, :controller => 'projects', :action => 'activity'
-  menu.push :label_roadmap, :controller => 'projects', :action => 'roadmap'
-  menu.push :label_issue_plural, { :controller => 'issues', :action => 'index' }, :param => :project_id
-  menu.push :label_news_plural, { :controller => 'news', :action => 'index' }, :param => :project_id
-  menu.push :label_document_plural, { :controller => 'documents', :action => 'index' }, :param => :project_id
-  menu.push :label_wiki, { :controller => 'wiki', :action => 'index', :page => nil }, :if => Proc.new { |p| p.wiki && !p.wiki.new_record? }
-  menu.push :label_board_plural, { :controller => 'boards', :action => 'index', :id => nil }, :param => :project_id, :if => Proc.new { |p| p.boards.any? }
-  menu.push :label_attachment_plural, :controller => 'projects', :action => 'list_files'
-  menu.push :label_repository, { :controller => 'repositories', :action => 'show' }, :if => Proc.new { |p| p.repository && !p.repository.new_record? }
-  menu.push :label_settings, :controller => 'projects', :action => 'settings'
+  menu.push :overview, { :controller => 'projects', :action => 'show' }, :caption => :label_overview
+  menu.push :activity, { :controller => 'projects', :action => 'activity' }, :caption => :label_activity
+  menu.push :roadmap, { :controller => 'projects', :action => 'roadmap' }, :caption => :label_roadmap
+  menu.push :issues, { :controller => 'issues', :action => 'index' }, :param => :project_id, :caption => :label_issue_plural
+  menu.push :news, { :controller => 'news', :action => 'index' }, :param => :project_id, :caption => :label_news_plural
+  menu.push :documents, { :controller => 'documents', :action => 'index' }, :param => :project_id, :caption => :label_document_plural
+  menu.push :wiki, { :controller => 'wiki', :action => 'index', :page => nil }, 
+              :if => Proc.new { |p| p.wiki && !p.wiki.new_record? }, :caption => :label_wiki
+  menu.push :boards, { :controller => 'boards', :action => 'index', :id => nil }, :param => :project_id,
+              :if => Proc.new { |p| p.boards.any? }, :caption => :label_board_plural
+  menu.push :files, { :controller => 'projects', :action => 'list_files' }, :caption => :label_attachment_plural
+  menu.push :repository, { :controller => 'repositories', :action => 'show' },
+              :if => Proc.new { |p| p.repository && !p.repository.new_record? }, :caption => :label_repository
+  menu.push :settings, { :controller => 'projects', :action => 'settings' }, :caption => :label_settings
 end
diff --git a/lib/redmine/menu_manager.rb b/lib/redmine/menu_manager.rb
index d4a46b3e1..c801cb383 100644
--- a/lib/redmine/menu_manager.rb
+++ b/lib/redmine/menu_manager.rb
@@ -17,6 +17,63 @@
 
 module Redmine
   module MenuManager
+    module MenuController
+      def self.included(base)
+        base.extend(ClassMethods)
+      end
+
+      module ClassMethods
+        @@menu_items = Hash.new {|hash, key| hash[key] = {:default => key, :actions => {}}}
+        mattr_accessor :menu_items
+        
+        # Set the menu item name for a controller or specific actions
+        # Examples:
+        #   * menu_item :tickets # => sets the menu name to :tickets for the whole controller
+        #   * menu_item :tickets, :only => :list # => sets the menu name to :tickets for the 'list' action only
+        #   * menu_item :tickets, :only => [:list, :show] # => sets the menu name to :tickets for 2 actions only
+        #   
+        # The default menu item name for a controller is controller_name by default
+        # Eg. the default menu item name for ProjectsController is :projects
+        def menu_item(id, options = {})
+          if actions = options[:only]
+            actions = [] << actions unless actions.is_a?(Array)
+            actions.each {|a| menu_items[controller_name.to_sym][:actions][a.to_sym] = id}
+          else
+            menu_items[controller_name.to_sym][:default] = id
+          end
+        end
+      end
+      
+      def menu_items
+        self.class.menu_items
+      end
+      
+      # Returns the menu item name according to the current action
+      def current_menu_item
+        menu_items[controller_name.to_sym][:actions][action_name.to_sym] ||
+          menu_items[controller_name.to_sym][:default]
+      end
+    end
+    
+    module MenuHelper
+      # Returns the current menu item name
+      def current_menu_item
+        @controller.current_menu_item
+      end
+      
+      # Renders the application main menu as a ul element
+      def render_main_menu(project)
+        links = []
+        Redmine::MenuManager.allowed_items(:project_menu, User.current, project).each do |item|
+          unless item.condition && !item.condition.call(project)
+            links << content_tag('li', 
+                       link_to(l(item.caption), {item.param => project}.merge(item.url),
+                               :class => (current_menu_item == item.name ? 'selected' : nil)))
+          end
+        end if project && !project.new_record?
+        links.empty? ? nil : content_tag('ul', links.join("\n"))
+      end
+    end
     
     class << self
       def map(menu_name)
@@ -48,13 +105,14 @@ module Redmine
     end
     
     class MenuItem
-      attr_reader :name, :url, :param, :condition
+      attr_reader :name, :url, :param, :condition, :caption
       
       def initialize(name, url, options)
         @name = name
         @url = url
         @condition = options[:if]
         @param = options[:param] || :id
+        @caption = options[:caption] || name.to_s.humanize
       end
     end    
   end
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index fa76948d2..d370f1b42 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -34,7 +34,7 @@ h4, .wiki h3 {font-size: 12px;padding: 2px 10px 1px 0px;margin-bottom: 5px; bord
   padding: 4px 4px 4px 4px;
   background: #2C4056;
 }
-#main-menu li a:hover {background:#759FCF;}
+#main-menu li a:hover, #main-menu li a.selected {background:#759FCF;}
 
 #main {background: url(../images/mainbg.png) repeat-x; background-color:#EEEEEE;}
 

From 2a945f794fecfeee156f3bce266e811cb8392530 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sat, 19 Jan 2008 12:29:41 +0000
Subject: [PATCH 138/710] Wiki toolbar Russian and Czech translations (Michael
 Pirogov).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1077 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 .../jstoolbar/lang/jstoolbar-cs.js            | 28 +++++++++----------
 .../jstoolbar/lang/jstoolbar-ru.js            | 28 +++++++++----------
 2 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-cs.js b/public/javascripts/jstoolbar/lang/jstoolbar-cs.js
index 72bab0be3..fa18a871c 100644
--- a/public/javascripts/jstoolbar/lang/jstoolbar-cs.js
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-cs.js
@@ -1,15 +1,15 @@
 jsToolBar.strings = {};
-jsToolBar.strings['Strong'] = 'Strong';
-jsToolBar.strings['Italic'] = 'Italic';
-jsToolBar.strings['Underline'] = 'Underline';
-jsToolBar.strings['Deleted'] = 'Deleted';
-jsToolBar.strings['Inline quote'] = 'Inline quote';
-jsToolBar.strings['Code'] = 'Code';
-jsToolBar.strings['Heading 1'] = 'Heading 1';
-jsToolBar.strings['Heading 2'] = 'Heading 2';
-jsToolBar.strings['Heading 3'] = 'Heading 3';
-jsToolBar.strings['Unordered list'] = 'Unordered list';
-jsToolBar.strings['Ordered list'] = 'Ordered list';
-jsToolBar.strings['Preformatted text'] = 'Preformatted text';
-jsToolBar.strings['Wiki link'] = 'Link to a Wiki page';
-jsToolBar.strings['Image'] = 'Image';
+jsToolBar.strings['Strong'] = 'Tučné';
+jsToolBar.strings['Italic'] = 'Kurzíva';
+jsToolBar.strings['Underline'] = 'Podtržené';
+jsToolBar.strings['Deleted'] = 'Přeškrtnuté ';
+jsToolBar.strings['Inline quote'] = 'Citace';
+jsToolBar.strings['Code'] = 'Zobrazení kódu';
+jsToolBar.strings['Heading 1'] = 'Záhlaví 1';
+jsToolBar.strings['Heading 2'] = 'Záhlaví 2';
+jsToolBar.strings['Heading 3'] = 'Záhlaví 3';
+jsToolBar.strings['Unordered list'] = 'Seznam';
+jsToolBar.strings['Ordered list'] = 'Uspořádaný seznam';
+jsToolBar.strings['Preformatted text'] = 'Předformátovaný text';
+jsToolBar.strings['Wiki link'] = 'Vložit odkaz na Wiki stránku';
+jsToolBar.strings['Image'] = 'Vložit obrázek';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-ru.js b/public/javascripts/jstoolbar/lang/jstoolbar-ru.js
index 72bab0be3..92940f23a 100644
--- a/public/javascripts/jstoolbar/lang/jstoolbar-ru.js
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-ru.js
@@ -1,15 +1,15 @@
 jsToolBar.strings = {};
-jsToolBar.strings['Strong'] = 'Strong';
-jsToolBar.strings['Italic'] = 'Italic';
-jsToolBar.strings['Underline'] = 'Underline';
-jsToolBar.strings['Deleted'] = 'Deleted';
-jsToolBar.strings['Inline quote'] = 'Inline quote';
-jsToolBar.strings['Code'] = 'Code';
-jsToolBar.strings['Heading 1'] = 'Heading 1';
-jsToolBar.strings['Heading 2'] = 'Heading 2';
-jsToolBar.strings['Heading 3'] = 'Heading 3';
-jsToolBar.strings['Unordered list'] = 'Unordered list';
-jsToolBar.strings['Ordered list'] = 'Ordered list';
-jsToolBar.strings['Preformatted text'] = 'Preformatted text';
-jsToolBar.strings['Wiki link'] = 'Link to a Wiki page';
-jsToolBar.strings['Image'] = 'Image';
+jsToolBar.strings['Strong'] = 'Жирный';
+jsToolBar.strings['Italic'] = 'Курсив';
+jsToolBar.strings['Underline'] = 'Подчеркнутый';
+jsToolBar.strings['Deleted'] = 'Зачеркнутый';
+jsToolBar.strings['Inline quote'] = 'Цитата';
+jsToolBar.strings['Code'] = 'Вставка кода';
+jsToolBar.strings['Heading 1'] = 'Заголовок 1';
+jsToolBar.strings['Heading 2'] = 'Заголовок 2';
+jsToolBar.strings['Heading 3'] = 'Заголовок 3';
+jsToolBar.strings['Unordered list'] = 'Маркированный список';
+jsToolBar.strings['Ordered list'] = 'Нумерованный список';
+jsToolBar.strings['Preformatted text'] = 'Заранее форматированный текст';
+jsToolBar.strings['Wiki link'] = 'Ссылка на страницу в Wiki';
+jsToolBar.strings['Image'] = 'Вставка изображения';

From 1535ac122053a428ca29f8887cb10994e467f1ab Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 20 Jan 2008 09:49:25 +0000
Subject: [PATCH 139/710] Fixed: when changing the status of an issue, the
 email subject contains the previous status of the issue.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1078 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/models/mailer.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/models/mailer.rb b/app/models/mailer.rb
index 257f57726..18fbc96b4 100644
--- a/app/models/mailer.rb
+++ b/app/models/mailer.rb
@@ -31,6 +31,7 @@ class Mailer < ActionMailer::Base
 
   def issue_edit(journal)
     issue = journal.journalized
+    issue.reload
     recipients issue.recipients
     # Watchers in cc
     cc(issue.watcher_recipients - @recipients)

From 1b002983c31f0936b38d56d2f3d8731f724fc5ef Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 20 Jan 2008 10:42:16 +0000
Subject: [PATCH 140/710] Display the issue status in the email subject only if
 the status was actually changed.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1079 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/models/journal.rb | 5 +++++
 app/models/mailer.rb  | 7 +++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/app/models/journal.rb b/app/models/journal.rb
index 64483d21d..d02067a9d 100644
--- a/app/models/journal.rb
+++ b/app/models/journal.rb
@@ -44,4 +44,9 @@ class Journal < ActiveRecord::Base
     c = details.detect {|detail| detail.prop_key == 'status_id'}
     (c && c.value) ? IssueStatus.find_by_id(c.value.to_i) : nil
   end
+  
+  def new_value_for(prop)
+    c = details.detect {|detail| detail.prop_key == prop}
+    c ? c.value : nil
+  end
 end
diff --git a/app/models/mailer.rb b/app/models/mailer.rb
index 18fbc96b4..a8566a7a2 100644
--- a/app/models/mailer.rb
+++ b/app/models/mailer.rb
@@ -24,7 +24,7 @@ class Mailer < ActionMailer::Base
   
   def issue_add(issue)    
     recipients issue.recipients    
-    subject "[#{issue.project.name} - #{issue.tracker.name} ##{issue.id}] #{issue.status.name} - #{issue.subject}"
+    subject "[#{issue.project.name} - #{issue.tracker.name} ##{issue.id}] (#{issue.status.name}) #{issue.subject}"
     body :issue => issue,
          :issue_url => url_for(:controller => 'issues', :action => 'show', :id => issue)
   end
@@ -35,7 +35,10 @@ class Mailer < ActionMailer::Base
     recipients issue.recipients
     # Watchers in cc
     cc(issue.watcher_recipients - @recipients)
-    subject "[#{issue.project.name} - #{issue.tracker.name} ##{issue.id}] #{issue.status.name} - #{issue.subject}"
+    s = "[#{issue.project.name} - #{issue.tracker.name} ##{issue.id}] "
+    s << "(#{issue.status.name}) " if journal.new_value_for('status_id')
+    s << issue.subject
+    subject s
     body :issue => issue,
          :journal => journal,
          :issue_url => url_for(:controller => 'issues', :action => 'show', :id => issue)

From 44ac1a0debc802b2ecbaa7cf7f763b373bf0fbb4 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 20 Jan 2008 11:30:57 +0000
Subject: [PATCH 141/710] ProjectsController#add_issue moved to
 IssuesController#new. Tracker can now be changed/selected on the new issue
 form. This action can be invoked without the tracker_id parameter (the first
 enabled tracker will be used by default).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1080 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/issues_controller.rb          | 64 ++++++++++++++++++-
 app/controllers/projects_controller.rb        | 42 +-----------
 app/helpers/projects_helper.rb                |  2 +-
 app/views/issues/_form.rhtml                  |  7 ++
 app/views/issues/_sidebar.rhtml               |  2 +-
 app/views/issues/context_menu.rhtml           |  2 +-
 .../add_issue.rhtml => issues/new.rhtml}      |  2 -
 app/views/issues/show.rhtml                   |  2 +-
 app/views/projects/show.rhtml                 |  2 +-
 lib/redmine.rb                                |  2 +-
 test/functional/issues_controller_test.rb     | 50 +++++++++++++++
 test/functional/projects_controller_test.rb   | 19 ------
 test/integration/issues_test.rb               |  6 +-
 13 files changed, 128 insertions(+), 74 deletions(-)
 rename app/views/{projects/add_issue.rhtml => issues/new.rhtml} (88%)

diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index 11112289e..7a48282c9 100644
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -17,11 +17,13 @@
 
 class IssuesController < ApplicationController
   layout 'base'
-  before_filter :find_project, :authorize, :except => [:index, :changes, :preview]
+  before_filter :find_issue, :except => [:index, :changes, :preview, :new, :update_form]
+  before_filter :find_project, :only => [:new, :update_form]
+  before_filter :authorize, :except => [:index, :changes, :preview, :update_form]
   before_filter :find_optional_project, :only => [:index, :changes]
   accept_key_auth :index, :changes
   
-  cache_sweeper :issue_sweeper, :only => [ :edit, :update, :destroy ]
+  cache_sweeper :issue_sweeper, :only => [ :new, :edit, :update, :destroy ]
 
   helper :projects
   include ProjectsHelper   
@@ -90,6 +92,51 @@ class IssuesController < ApplicationController
     end
   end
 
+  # Add a new issue
+  # The new issue will be created from an existing one if copy_from parameter is given
+  def new
+    @issue = params[:copy_from] ? Issue.new.copy_from(params[:copy_from]) : Issue.new(params[:issue])
+    @issue.project = @project
+    @issue.author = User.current
+    @issue.tracker ||= @project.trackers.find(params[:tracker_id] ? params[:tracker_id] : :first)
+    if @issue.tracker.nil?
+      flash.now[:error] = 'No tracker is associated to this project. Please check the Project settings.'
+      render :nothing => true, :layout => true
+      return
+    end
+    
+    default_status = IssueStatus.default
+    unless default_status
+      flash.now[:error] = 'No default issue status is defined. Please check your configuration (Go to "Administration -> Issue statuses").'
+      render :nothing => true, :layout => true
+      return
+    end    
+    @issue.status = default_status
+    @allowed_statuses = ([default_status] + default_status.find_new_statuses_allowed_to(User.current.role_for_project(@project), @issue.tracker))
+    
+    if request.get? || request.xhr?
+      @issue.start_date ||= Date.today
+      @custom_values = @issue.custom_values.empty? ?
+        @project.custom_fields_for_issues(@issue.tracker).collect { |x| CustomValue.new(:custom_field => x, :customized => @issue) } :
+        @issue.custom_values
+    else
+      requested_status = IssueStatus.find_by_id(params[:issue][:status_id])
+      # Check that the user is allowed to apply the requested status
+      @issue.status = (@allowed_statuses.include? requested_status) ? requested_status : default_status
+      @custom_values = @project.custom_fields_for_issues(@issue.tracker).collect { |x| CustomValue.new(:custom_field => x, :customized => @issue, :value => params["custom_fields"][x.id.to_s]) }
+      @issue.custom_values = @custom_values
+      if @issue.save
+        attach_files(@issue, params[:attachments])
+        flash[:notice] = l(:notice_successful_create)
+        Mailer.deliver_issue_add(@issue) if Setting.notified_events.include?('issue_added')
+        redirect_to :controller => 'issues', :action => 'index', :project_id => @project
+        return
+      end		
+    end	
+    @priorities = Enumeration::get_values('IPRI')
+    render :layout => !request.xhr?
+  end
+  
   def edit
     @priorities = Enumeration::get_values('IPRI')
     @custom_values = []
@@ -185,6 +232,11 @@ class IssuesController < ApplicationController
     render :layout => false
   end
 
+  def update_form
+    @issue = Issue.new(params[:issue])
+    render :action => :new, :layout => false
+  end
+  
   def preview
     issue = Issue.find_by_id(params[:id])
     @attachements = issue.attachments if issue
@@ -193,13 +245,19 @@ class IssuesController < ApplicationController
   end
   
 private
-  def find_project
+  def find_issue
     @issue = Issue.find(params[:id], :include => [:project, :tracker, :status, :author, :priority, :category])
     @project = @issue.project
   rescue ActiveRecord::RecordNotFound
     render_404
   end
   
+  def find_project
+    @project = Project.find(params[:project_id])
+  rescue ActiveRecord::RecordNotFound
+    render_404
+  end
+  
   def find_optional_project
     return true unless params[:project_id]
     @project = Project.find(params[:project_id])
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index f38ca828e..2342e8074 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -22,7 +22,7 @@ class ProjectsController < ApplicationController
   menu_item :roadmap, :only => :roadmap
   menu_item :files, :only => [:list_files, :add_file]
   menu_item :settings, :only => :settings
-  menu_item :issues, :only => [:add_issue, :bulk_edit_issues, :changelog, :move_issues]
+  menu_item :issues, :only => [:bulk_edit_issues, :changelog, :move_issues]
   
   before_filter :find_project, :except => [ :index, :list, :add ]
   before_filter :authorize, :except => [ :index, :list, :add, :archive, :unarchive, :destroy ]
@@ -30,7 +30,6 @@ class ProjectsController < ApplicationController
   accept_key_auth :activity, :calendar
   
   cache_sweeper :project_sweeper, :only => [ :add, :edit, :archive, :unarchive, :destroy ]
-  cache_sweeper :issue_sweeper, :only => [ :add_issue ]
   cache_sweeper :version_sweeper, :only => [ :add_version ]
 
   helper :sort
@@ -184,45 +183,6 @@ class ProjectsController < ApplicationController
   	end
   end
 
-  # Add a new issue to @project
-  # The new issue will be created from an existing one if copy_from parameter is given
-  def add_issue
-    @issue = params[:copy_from] ? Issue.new.copy_from(params[:copy_from]) : Issue.new(params[:issue])
-    @issue.project = @project
-    @issue.author = User.current
-    @issue.tracker ||= @project.trackers.find(params[:tracker_id])
-    
-    default_status = IssueStatus.default
-    unless default_status
-      flash.now[:error] = 'No default issue status is defined. Please check your configuration (Go to "Administration -> Issue statuses").'
-      render :nothing => true, :layout => true
-      return
-    end    
-    @issue.status = default_status
-    @allowed_statuses = ([default_status] + default_status.find_new_statuses_allowed_to(User.current.role_for_project(@project), @issue.tracker))
-    
-    if request.get?
-      @issue.start_date ||= Date.today
-      @custom_values = @issue.custom_values.empty? ?
-        @project.custom_fields_for_issues(@issue.tracker).collect { |x| CustomValue.new(:custom_field => x, :customized => @issue) } :
-        @issue.custom_values
-    else
-      requested_status = IssueStatus.find_by_id(params[:issue][:status_id])
-      # Check that the user is allowed to apply the requested status
-      @issue.status = (@allowed_statuses.include? requested_status) ? requested_status : default_status
-      @custom_values = @project.custom_fields_for_issues(@issue.tracker).collect { |x| CustomValue.new(:custom_field => x, :customized => @issue, :value => params["custom_fields"][x.id.to_s]) }
-      @issue.custom_values = @custom_values
-      if @issue.save
-        attach_files(@issue, params[:attachments])
-        flash[:notice] = l(:notice_successful_create)
-        Mailer.deliver_issue_add(@issue) if Setting.notified_events.include?('issue_added')
-        redirect_to :controller => 'issues', :action => 'index', :project_id => @project
-        return
-      end		
-    end	
-    @priorities = Enumeration::get_values('IPRI')
-  end
-
   # Bulk edit issues
   def bulk_edit_issues
     if request.post?
diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb
index df4b9c334..ee61d88dd 100644
--- a/app/helpers/projects_helper.rb
+++ b/app/helpers/projects_helper.rb
@@ -194,6 +194,6 @@ module ProjectsHelper
     # can't use form tag inside helper
     content_tag('form',
       select_tag('tracker_id', '<option></option>' + options_from_collection_for_select(trackers, 'id', 'name'), :onchange => "if (this.value != '') {this.form.submit()}"),
-      :action => url_for(:controller => 'projects', :action => 'add_issue', :id => @project), :method => 'get')
+      :action => url_for(:controller => 'issues', :action => 'new', :project_id => @project), :method => 'get')
   end
 end
diff --git a/app/views/issues/_form.rhtml b/app/views/issues/_form.rhtml
index 203d1cca3..779846f4d 100644
--- a/app/views/issues/_form.rhtml
+++ b/app/views/issues/_form.rhtml
@@ -1,6 +1,13 @@
 <%= error_messages_for 'issue' %>
 <div class="box">
 
+<% if @issue.new_record? %>
+<p><%= f.select :tracker_id, @project.trackers.collect {|t| [t.name, t.id]}, :required => true %></p>
+<%= observe_field :issue_tracker_id, :url => { :action => :new },
+                                     :update => :content,
+                                     :with => "Form.serialize('issue-form')" %>
+<% end %>
+
 <div class="splitcontentleft">
 <% if @issue.new_record? %>
 <p><%= f.select :status_id, (@allowed_statuses.collect {|p| [p.name, p.id]}), :required => true %></p>
diff --git a/app/views/issues/_sidebar.rhtml b/app/views/issues/_sidebar.rhtml
index e6c63896b..1e1fc87d0 100644
--- a/app/views/issues/_sidebar.rhtml
+++ b/app/views/issues/_sidebar.rhtml
@@ -1,4 +1,4 @@
-<% if authorize_for('projects', 'add_issue') && @project.trackers.any? %>
+<% if authorize_for('issues', 'new') && @project.trackers.any? %>
 <h3><%= l(:label_issue_new) %></h3>
 <%= l(:label_tracker) %>: <%= new_issue_selector %>
 <% end %>
diff --git a/app/views/issues/context_menu.rhtml b/app/views/issues/context_menu.rhtml
index 0f11bb943..9691a7713 100644
--- a/app/views/issues/context_menu.rhtml
+++ b/app/views/issues/context_menu.rhtml
@@ -31,7 +31,7 @@
 		                              :selected => @issue.assigned_to.nil?, :disabled => !@can[:assign] %></li>
 		</ul>
 	</li>
-	<li><%= context_menu_link l(:button_copy), {:controller => 'projects', :action => 'add_issue', :id => @project, :copy_from => @issue},
+	<li><%= context_menu_link l(:button_copy), {:controller => 'issues', :action => 'new', :project_id => @project, :copy_from => @issue},
 	        :class => 'icon-copy', :disabled => !@can[:copy] %></li>
 	<li><%= context_menu_link l(:button_move), {:controller => 'projects', :action => 'move_issues', :id => @project, "issue_ids[]" => @issue.id },
 	                          :class => 'icon-move', :disabled => !@can[:move]  %>
diff --git a/app/views/projects/add_issue.rhtml b/app/views/issues/new.rhtml
similarity index 88%
rename from app/views/projects/add_issue.rhtml
rename to app/views/issues/new.rhtml
index a68922906..4fedc6895 100644
--- a/app/views/projects/add_issue.rhtml
+++ b/app/views/issues/new.rhtml
@@ -1,9 +1,7 @@
 <h2><%=l(:label_issue_new)%>: <%= @issue.tracker %></h2>
 
 <% labelled_tabular_form_for :issue, @issue, 
-                             :url => {:action => 'add_issue'},
                              :html => {:multipart => true, :id => 'issue-form'} do |f| %>
-    <%= f.hidden_field :tracker_id %>
     <%= render :partial => 'issues/form', :locals => {:f => f} %>
     <%= submit_tag l(:button_create) %>
     <%= link_to_remote l(:label_preview), 
diff --git a/app/views/issues/show.rhtml b/app/views/issues/show.rhtml
index 8cd44424c..7208e37be 100644
--- a/app/views/issues/show.rhtml
+++ b/app/views/issues/show.rhtml
@@ -3,7 +3,7 @@
 <%= link_to_if_authorized l(:button_edit), {:controller => 'issues', :action => 'edit', :id => @issue}, :class => 'icon icon-edit', :accesskey => accesskey(:edit) %>
 <%= link_to_if_authorized l(:button_log_time), {:controller => 'timelog', :action => 'edit', :issue_id => @issue}, :class => 'icon icon-time' %>
 <%= watcher_tag(@issue, User.current) %>
-<%= link_to_if_authorized l(:button_copy), {:controller => 'projects', :action => 'add_issue', :id => @project, :copy_from => @issue }, :class => 'icon icon-copy' %>
+<%= link_to_if_authorized l(:button_copy), {:controller => 'issues', :action => 'new', :project_id => @project, :copy_from => @issue }, :class => 'icon icon-copy' %>
 <%= 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>
diff --git a/app/views/projects/show.rhtml b/app/views/projects/show.rhtml
index 2b930e01e..ecaa9750a 100644
--- a/app/views/projects/show.rhtml
+++ b/app/views/projects/show.rhtml
@@ -56,7 +56,7 @@
 </div>
 
 <% content_for :sidebar do %>
-    <% if authorize_for('projects', 'add_issue') && @project.trackers.any? %>
+    <% if authorize_for('issues', 'new') && @project.trackers.any? %>
     <h3><%= l(:label_issue_new) %></h3>
     <%= l(:label_tracker) %>: <%= new_issue_selector %>
     <% end %>
diff --git a/lib/redmine.rb b/lib/redmine.rb
index d0e152467..ea05d6e80 100644
--- a/lib/redmine.rb
+++ b/lib/redmine.rb
@@ -30,7 +30,7 @@ Redmine::AccessControl.map do |map|
                                   :versions => [:show, :status_by],
                                   :queries => :index,
                                   :reports => :issue_report}, :public => true                    
-    map.permission :add_issues, {:projects => :add_issue}
+    map.permission :add_issues, {:issues => :new}
     map.permission :edit_issues, {:projects => :bulk_edit_issues,
                                   :issues => [:edit, :update, :destroy_attachment]}
     map.permission :manage_issue_relations, {:issue_relations => [:new, :destroy]}
diff --git a/test/functional/issues_controller_test.rb b/test/functional/issues_controller_test.rb
index d60e32200..05bfc96e3 100644
--- a/test/functional/issues_controller_test.rb
+++ b/test/functional/issues_controller_test.rb
@@ -29,6 +29,7 @@ class IssuesControllerTest < Test::Unit::TestCase
            :issues,
            :issue_statuses,
            :trackers,
+           :projects_trackers,
            :issue_categories,
            :enabled_modules,
            :enumerations,
@@ -126,6 +127,55 @@ class IssuesControllerTest < Test::Unit::TestCase
                                             :content => /Notes/ } }
   end
 
+  def test_get_new
+    @request.session[:user_id] = 2
+    get :new, :project_id => 1, :tracker_id => 1
+    assert_response :success
+    assert_template 'new'
+  end
+
+  def test_get_new_without_tracker_id
+    @request.session[:user_id] = 2
+    get :new, :project_id => 1
+    assert_response :success
+    assert_template 'new'
+    
+    issue = assigns(:issue)
+    assert_not_nil issue
+    assert_equal Project.find(1).trackers.first, issue.tracker
+  end
+  
+  def test_update_new_form
+    @request.session[:user_id] = 2
+    xhr :post, :new, :project_id => 1,
+                     :issue => {:tracker_id => 2, 
+                                :subject => 'This is the test_new issue',
+                                :description => 'This is the description',
+                                :priority_id => 5}
+    assert_response :success
+    assert_template 'new'
+  end
+  
+  def test_post_new
+    @request.session[:user_id] = 2
+    post :new, :project_id => 1, 
+               :issue => {:tracker_id => 1,
+                          :subject => 'This is the test_new issue',
+                          :description => 'This is the description',
+                          :priority_id => 5}
+    assert_redirected_to 'projects/ecookbook/issues'
+    assert Issue.find_by_subject('This is the test_new issue')
+  end
+  
+  def test_copy_issue
+    @request.session[:user_id] = 2
+    get :new, :project_id => 1, :copy_from => 1
+    assert_template 'new'
+    assert_not_nil assigns(:issue)
+    orig = Issue.find(1)
+    assert_equal orig.subject, assigns(:issue).subject
+  end
+  
   def test_get_edit
     @request.session[:user_id] = 2
     get :edit, :id => 1
diff --git a/test/functional/projects_controller_test.rb b/test/functional/projects_controller_test.rb
index f19aa7748..61047079e 100644
--- a/test/functional/projects_controller_test.rb
+++ b/test/functional/projects_controller_test.rb
@@ -236,23 +236,4 @@ class ProjectsControllerTest < Test::Unit::TestCase
     assert_redirected_to 'admin/projects'
     assert Project.find(1).active?
   end
-  
-  def test_add_issue
-    @request.session[:user_id] = 2
-    get :add_issue, :id => 1, :tracker_id => 1
-    assert_response :success
-    assert_template 'add_issue'
-    post :add_issue, :id => 1, :issue => {:tracker_id => 1, :subject => 'This is the test_add_issue issue', :description => 'This is the description', :priority_id => 5}
-    assert_redirected_to 'projects/ecookbook/issues'
-    assert Issue.find_by_subject('This is the test_add_issue issue')
-  end
-  
-  def test_copy_issue
-    @request.session[:user_id] = 2
-    get :add_issue, :id => 1, :copy_from => 1
-    assert_template 'add_issue'
-    assert_not_nil assigns(:issue)
-    orig = Issue.find(1)
-    assert_equal orig.subject, assigns(:issue).subject
-  end
 end
diff --git a/test/integration/issues_test.rb b/test/integration/issues_test.rb
index a9d3f9c74..81d27c30f 100644
--- a/test/integration/issues_test.rb
+++ b/test/integration/issues_test.rb
@@ -6,11 +6,11 @@ class IssuesTest < ActionController::IntegrationTest
   # create an issue
   def test_add_issue
     log_user('jsmith', 'jsmith')
-    get "projects/add_issue/1", :tracker_id => "1"
+    get 'projects/1/issues/new', :tracker_id => '1'
     assert_response :success
-    assert_template "projects/add_issue"
+    assert_template 'issues/new'
     
-    post "projects/add_issue/1", :tracker_id => "1",
+    post 'projects/1/issues/new', :tracker_id => "1",
                                  :issue => { :start_date => "2006-12-26", 
                                              :priority_id => "3", 
                                              :subject => "new test issue", 

From 16e9ffce0d0e803f02e3660450120602bca8aff5 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 20 Jan 2008 13:07:19 +0000
Subject: [PATCH 142/710] Added a 'New issue' link in the main menu (accesskey
 7). The drop-down lists to add an issue on the project overview and the issue
 list are removed.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1081 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/issues_controller.rb |  2 ++
 app/helpers/application_helper.rb    |  8 +------
 app/helpers/projects_helper.rb       |  8 -------
 app/views/issues/_sidebar.rhtml      |  5 -----
 app/views/projects/show.rhtml        |  5 -----
 lib/redmine.rb                       |  2 ++
 lib/redmine/access_keys.rb           | 31 ++++++++++++++++++++++++++++
 lib/redmine/menu_manager.rb          | 10 +++++++--
 public/stylesheets/application.css   |  2 +-
 9 files changed, 45 insertions(+), 28 deletions(-)
 create mode 100644 lib/redmine/access_keys.rb

diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index 7a48282c9..643a4e0ef 100644
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -17,6 +17,8 @@
 
 class IssuesController < ApplicationController
   layout 'base'
+  menu_item :new_issue, :only => :new
+  
   before_filter :find_issue, :except => [:index, :changes, :preview, :new, :update_form]
   before_filter :find_project, :only => [:new, :update_form]
   before_filter :authorize, :except => [:index, :changes, :preview, :update_form]
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index f0455f3e4..1dfb57ff8 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -162,15 +162,9 @@ module ApplicationHelper
       @html_title += args
     end
   end
-  
-  ACCESSKEYS = {:edit => 'e',
-                :preview => 'r',
-                :quick_search => 'f',
-                :search => '4',
-                }.freeze unless const_defined?(:ACCESSKEYS)
 
   def accesskey(s)
-    ACCESSKEYS[s]
+    Redmine::AccessKeys.key_for s
   end
 
   # Formats text according to system settings.
diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb
index ee61d88dd..883be0ead 100644
--- a/app/helpers/projects_helper.rb
+++ b/app/helpers/projects_helper.rb
@@ -188,12 +188,4 @@ module ProjectsHelper
     gc.draw(imgl)
     imgl
   end if Object.const_defined?(:Magick)
-  
-  def new_issue_selector
-    trackers = @project.trackers
-    # can't use form tag inside helper
-    content_tag('form',
-      select_tag('tracker_id', '<option></option>' + options_from_collection_for_select(trackers, 'id', 'name'), :onchange => "if (this.value != '') {this.form.submit()}"),
-      :action => url_for(:controller => 'issues', :action => 'new', :project_id => @project), :method => 'get')
-  end
 end
diff --git a/app/views/issues/_sidebar.rhtml b/app/views/issues/_sidebar.rhtml
index 1e1fc87d0..4a1b7e9bc 100644
--- a/app/views/issues/_sidebar.rhtml
+++ b/app/views/issues/_sidebar.rhtml
@@ -1,8 +1,3 @@
-<% if authorize_for('issues', 'new') && @project.trackers.any? %>
-<h3><%= l(:label_issue_new) %></h3>
-<%= l(:label_tracker) %>: <%= new_issue_selector %>
-<% end %>
-
 <h3><%= l(:label_issue_plural) %></h3>
 <%= link_to l(:label_issue_view_all), { :controller => 'issues', :action => 'index', :project_id => @project, :set_filter => 1 } %><br />
 <%= link_to l(:field_summary), :controller => 'reports', :action => 'issue_report', :id => @project %><br />
diff --git a/app/views/projects/show.rhtml b/app/views/projects/show.rhtml
index ecaa9750a..eb80bf9fa 100644
--- a/app/views/projects/show.rhtml
+++ b/app/views/projects/show.rhtml
@@ -56,11 +56,6 @@
 </div>
 
 <% content_for :sidebar do %>
-    <% if authorize_for('issues', 'new') && @project.trackers.any? %>
-    <h3><%= l(:label_issue_new) %></h3>
-    <%= l(:label_tracker) %>: <%= new_issue_selector %>
-    <% end %>
-    
     <% planning_links = []
       planning_links << link_to_if_authorized(l(:label_calendar), :action => 'calendar', :id => @project)
       planning_links << link_to_if_authorized(l(:label_gantt), :action => 'gantt', :id => @project)
diff --git a/lib/redmine.rb b/lib/redmine.rb
index ea05d6e80..1aee1767c 100644
--- a/lib/redmine.rb
+++ b/lib/redmine.rb
@@ -95,6 +95,8 @@ Redmine::MenuManager.map :project_menu do |menu|
   menu.push :activity, { :controller => 'projects', :action => 'activity' }, :caption => :label_activity
   menu.push :roadmap, { :controller => 'projects', :action => 'roadmap' }, :caption => :label_roadmap
   menu.push :issues, { :controller => 'issues', :action => 'index' }, :param => :project_id, :caption => :label_issue_plural
+  menu.push :new_issue, { :controller => 'issues', :action => 'new' }, :param => :project_id, :caption => :label_issue_new,
+              :html => { :accesskey => Redmine::AccessKeys.key_for(:new_issue) }
   menu.push :news, { :controller => 'news', :action => 'index' }, :param => :project_id, :caption => :label_news_plural
   menu.push :documents, { :controller => 'documents', :action => 'index' }, :param => :project_id, :caption => :label_document_plural
   menu.push :wiki, { :controller => 'wiki', :action => 'index', :page => nil }, 
diff --git a/lib/redmine/access_keys.rb b/lib/redmine/access_keys.rb
new file mode 100644
index 000000000..96029a6fc
--- /dev/null
+++ b/lib/redmine/access_keys.rb
@@ -0,0 +1,31 @@
+# redMine - project management software
+# Copyright (C) 2006-2008  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 Redmine
+  module AccessKeys
+    ACCESSKEYS = {:edit => 'e',
+                  :preview => 'r',
+                  :quick_search => 'f',
+                  :search => '4',
+                  :new_issue => '7'
+                 }.freeze unless const_defined?(:ACCESSKEYS)
+                 
+    def self.key_for(action)
+      ACCESSKEYS[action]
+    end
+  end
+end
diff --git a/lib/redmine/menu_manager.rb b/lib/redmine/menu_manager.rb
index c801cb383..379028ebc 100644
--- a/lib/redmine/menu_manager.rb
+++ b/lib/redmine/menu_manager.rb
@@ -68,7 +68,7 @@ module Redmine
           unless item.condition && !item.condition.call(project)
             links << content_tag('li', 
                        link_to(l(item.caption), {item.param => project}.merge(item.url),
-                               :class => (current_menu_item == item.name ? 'selected' : nil)))
+                               (current_menu_item == item.name ? item.html_options.merge(:class => 'selected') : item.html_options)))
           end
         end if project && !project.new_record?
         links.empty? ? nil : content_tag('ul', links.join("\n"))
@@ -94,6 +94,11 @@ module Redmine
     end
     
     class Mapper
+      # Adds an item at the end of the menu. Available options:
+      # * param: the parameter name that is used for the project id (default is :id)
+      # * condition: a proc that is called before rendering the item, the item is displayed only if it returns true
+      # * caption: the localized string key that is used as the item label
+      # * html_options: a hash of html options that are passed to link_to
       def push(name, url, options={})
         @items ||= []
         @items << MenuItem.new(name, url, options)
@@ -105,7 +110,7 @@ module Redmine
     end
     
     class MenuItem
-      attr_reader :name, :url, :param, :condition, :caption
+      attr_reader :name, :url, :param, :condition, :caption, :html_options
       
       def initialize(name, url, options)
         @name = name
@@ -113,6 +118,7 @@ module Redmine
         @condition = options[:if]
         @param = options[:param] || :id
         @caption = options[:caption] || name.to_s.humanize
+        @html_options = options[:html] || {}
       end
     end    
   end
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index d370f1b42..5bada6e06 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -17,7 +17,7 @@ h4, .wiki h3 {font-size: 12px;padding: 2px 10px 1px 0px;margin-bottom: 5px; bord
 #header a {color:#f8f8f8;}
 #quick-search {float:right;}
 
-#main-menu {position: absolute;  bottom: 0px;  left:6px;}
+#main-menu {position: absolute;  bottom: 0px;  left:6px; margin-right: -500px;}
 #main-menu ul {margin: 0;  padding: 0;}
 #main-menu li {
   float:left;

From 889bf388be0325d4c38b984a4eaa23db6102938a Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 20 Jan 2008 13:53:45 +0000
Subject: [PATCH 143/710] Fixed: error when removing a project member
 (postgresql and sqlite only).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1082 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/models/member.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/member.rb b/app/models/member.rb
index 39703147d..0d0540690 100644
--- a/app/models/member.rb
+++ b/app/models/member.rb
@@ -33,6 +33,6 @@ class Member < ActiveRecord::Base
   
   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]
+    IssueCategory.update_all "assigned_to_id = NULL", ["project_id = ? AND assigned_to_id = ?", project.id, user.id]
   end
 end

From d79c20c4f28f9b43f1bc105cb590d244c1b322f2 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 20 Jan 2008 14:01:02 +0000
Subject: [PATCH 144/710] Fixed: custom field selection is not saved when
 unchecking them all on project settings

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1083 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/projects_controller.rb      | 1 -
 app/views/projects/_form.rhtml              | 3 ++-
 test/functional/projects_controller_test.rb | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 2342e8074..30e7ef85f 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -113,7 +113,6 @@ class ProjectsController < ApplicationController
   # Edit @project
   def edit
     if request.post?
-      @project.custom_fields = IssueCustomField.find(params[:custom_field_ids]) if params[:custom_field_ids]
       if params[:custom_fields]
         @custom_values = ProjectCustomField.find(:all, :order => "#{CustomField.table_name}.position").collect { |x| CustomValue.new(:custom_field => x, :customized => @project, :value => params["custom_fields"][x.id.to_s]) }
         @project.custom_values = @custom_values
diff --git a/app/views/projects/_form.rhtml b/app/views/projects/_form.rhtml
index e29777af4..e63c929cc 100644
--- a/app/views/projects/_form.rhtml
+++ b/app/views/projects/_form.rhtml
@@ -35,10 +35,11 @@
 <fieldset class="box"><legend><%=l(:label_custom_field_plural)%></legend>
 <% for custom_field in @custom_fields %>
     <label class="floating">
-	<%= check_box_tag "custom_field_ids[]", custom_field.id, ((@project.custom_fields.include? custom_field) or custom_field.is_for_all?), (custom_field.is_for_all? ? {:disabled => "disabled"} : {}) %>
+	<%= check_box_tag 'project[custom_field_ids][]', custom_field.id, ((@project.custom_fields.include? custom_field) or custom_field.is_for_all?), (custom_field.is_for_all? ? {:disabled => "disabled"} : {}) %>
 	<%= custom_field.name %>
 	</label>
 <% end %>
+<%= hidden_field_tag 'project[custom_field_ids][]', '' %>
 </fieldset>
 <% end %>
 <!--[eoform:project]-->
diff --git a/test/functional/projects_controller_test.rb b/test/functional/projects_controller_test.rb
index 61047079e..16eb2906e 100644
--- a/test/functional/projects_controller_test.rb
+++ b/test/functional/projects_controller_test.rb
@@ -71,7 +71,8 @@ class ProjectsControllerTest < Test::Unit::TestCase
   
   def test_edit
     @request.session[:user_id] = 2 # manager
-    post :edit, :id => 1, :project => {:name => 'Test changed name'}
+    post :edit, :id => 1, :project => {:name => 'Test changed name',
+                                       :custom_field_ids => ['']}
     assert_redirected_to 'projects/settings/ecookbook'
     project = Project.find(1)
     assert_equal 'Test changed name', project.name

From 5e2a01656df1b98f82a0565271b6d527d8fefbf4 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 20 Jan 2008 14:24:19 +0000
Subject: [PATCH 145/710] Test environments cleanup.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1084 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 config/database.yml.example                     | 17 +++++------------
 config/environments/test_oracle.rb              | 16 ----------------
 .../{test_sqlserver.rb => test_sqlite3.rb}      |  0
 vendor/plugins/actionwebservice/init.rb         |  2 +-
 4 files changed, 6 insertions(+), 29 deletions(-)
 delete mode 100644 config/environments/test_oracle.rb
 rename config/environments/{test_sqlserver.rb => test_sqlite3.rb} (100%)

diff --git a/config/database.yml.example b/config/database.yml.example
index 2f38d81ef..f72844a07 100644
--- a/config/database.yml.example
+++ b/config/database.yml.example
@@ -29,23 +29,16 @@ test:
 
 test_pgsql:
   adapter: postgresql
-  database: redmine
+  database: redmine_test
   host: localhost
   username: postgres
   password: "postgres"
 
-test_oracle:
-  adapter: oci
-  host: 192.168.0.14
-  username: rails_test
-  password: "rails"
-  
-test_sqlserver:
-  adapter: sqlserver
-  host: localhost,1157
-  database: redmine_test
+test_sqlite3:
+  adapter: sqlite3
+  dbfile: db/test.db
   
 demo:
   adapter: sqlite3
-  dbfile: db/redmine_demo.db
+  dbfile: db/demo.db
   
diff --git a/config/environments/test_oracle.rb b/config/environments/test_oracle.rb
deleted file mode 100644
index 0eb1cd6c1..000000000
--- a/config/environments/test_oracle.rb
+++ /dev/null
@@ -1,16 +0,0 @@
-# Settings specified here will take precedence over those in config/environment.rb
-
-# The test environment is used exclusively to run your application's
-# test suite.  You never need to work with it otherwise.  Remember that
-# your test database is "scratch space" for the test suite and is wiped
-# and recreated between test runs.  Don't rely on the data there!
-config.cache_classes = false
-
-# Log error messages when you accidentally call methods on nil.
-config.whiny_nils    = true
-
-# Show full error reports and disable caching
-config.action_controller.consider_all_requests_local = true
-config.action_controller.perform_caching             = false
-
-config.action_mailer.delivery_method = :test
\ No newline at end of file
diff --git a/config/environments/test_sqlserver.rb b/config/environments/test_sqlite3.rb
similarity index 100%
rename from config/environments/test_sqlserver.rb
rename to config/environments/test_sqlite3.rb
diff --git a/vendor/plugins/actionwebservice/init.rb b/vendor/plugins/actionwebservice/init.rb
index 582f73717..ade118c0f 100644
--- a/vendor/plugins/actionwebservice/init.rb
+++ b/vendor/plugins/actionwebservice/init.rb
@@ -4,4 +4,4 @@ require 'action_web_service'
 Dependencies.load_paths += ["#{RAILS_ROOT}/app/apis"]
   
 # AWS Test helpers
-require 'action_web_service/test_invoke' if ENV['RAILS_ENV'] == 'test'
+require 'action_web_service/test_invoke' if ENV['RAILS_ENV'] && ENV['RAILS_ENV'] =~ /^test/

From b6549d763ae7a4dc9ad2f00c7b9d6becc1e39012 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 20 Jan 2008 15:38:11 +0000
Subject: [PATCH 146/710] Added related changesets messages on issue details
 view.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1085 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/issues/_changesets.rhtml |  8 ++++++++
 app/views/issues/_pdf.rfpdf        | 20 ++++++++++++++++++--
 app/views/issues/show.rhtml        | 13 +++++++------
 lang/bg.yml                        |  1 +
 lang/cs.yml                        |  1 +
 lang/de.yml                        |  1 +
 lang/en.yml                        |  1 +
 lang/es.yml                        |  1 +
 lang/fi.yml                        |  1 +
 lang/fr.yml                        |  1 +
 lang/he.yml                        |  1 +
 lang/it.yml                        |  1 +
 lang/ja.yml                        |  1 +
 lang/ko.yml                        |  1 +
 lang/lt.yml                        |  1 +
 lang/nl.yml                        |  1 +
 lang/pl.yml                        |  1 +
 lang/pt-br.yml                     |  1 +
 lang/pt.yml                        |  1 +
 lang/ro.yml                        |  1 +
 lang/ru.yml                        |  1 +
 lang/sr.yml                        |  1 +
 lang/sv.yml                        |  1 +
 lang/zh-tw.yml                     |  1 +
 lang/zh.yml                        |  1 +
 public/stylesheets/application.css |  5 +++++
 26 files changed, 60 insertions(+), 8 deletions(-)
 create mode 100644 app/views/issues/_changesets.rhtml

diff --git a/app/views/issues/_changesets.rhtml b/app/views/issues/_changesets.rhtml
new file mode 100644
index 000000000..1a4c1a5bd
--- /dev/null
+++ b/app/views/issues/_changesets.rhtml
@@ -0,0 +1,8 @@
+<ul>
+<% changesets.each do |changeset| %>
+    <li class="<%= cycle('odd', 'even') %>"><%= link_to("#{l(:label_revision)} #{changeset.revision}",
+                    :controller => 'repositories', :action => 'revision', :id => @project, :rev => changeset.revision) %><br />
+        <em><%= changeset.committer %>, <%= format_time(changeset.committed_on) %></em>
+    <%= textilizable(changeset, :comments) %></li>
+<% end %>
+</ul>
diff --git a/app/views/issues/_pdf.rfpdf b/app/views/issues/_pdf.rfpdf
index 558399abb..6830506f6 100644
--- a/app/views/issues/_pdf.rfpdf
+++ b/app/views/issues/_pdf.rfpdf
@@ -66,8 +66,24 @@
 	pdf.Line(pdf.GetX, pdf.GetY, 170, pdf.GetY)
 
     pdf.Ln
-
-    pdf.SetFontStyle('B',9)
+    
+    if @issue.changesets.any? && User.current.allowed_to?(:view_changesets, issue.project)
+    	pdf.SetFontStyle('B',9)
+	    pdf.Cell(190,5, l(:label_associated_revisions), "B")
+	    pdf.Ln	
+		for changeset in @issue.changesets
+			pdf.SetFontStyle('B',8)
+		    pdf.Cell(190,5, format_time(changeset.committed_on) + " - " + changeset.committer)
+		    pdf.Ln
+			unless changeset.comments.blank?
+				pdf.SetFontStyle('',8)
+				pdf.MultiCell(190,5, changeset.comments)
+			end		
+			pdf.Ln
+		end
+	end
+	
+	pdf.SetFontStyle('B',9)
     pdf.Cell(190,5, l(:label_history), "B")
     pdf.Ln	
 	for journal in issue.journals.find(:all, :include => [:user, :details], :order => "#{Journal.table_name}.created_on ASC")
diff --git a/app/views/issues/show.rhtml b/app/views/issues/show.rhtml
index 7208e37be..45423a2e0 100644
--- a/app/views/issues/show.rhtml
+++ b/app/views/issues/show.rhtml
@@ -57,12 +57,6 @@ end %>
 </table>
 <hr />
 
-<% 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 %>
-
 <p><strong><%=l(:field_description)%></strong></p>
 <div class="wiki">
 <%= textilizable @issue, :description, :attachments => @issue.attachments %>
@@ -81,6 +75,13 @@ end %>
 
 </div>
 
+<% if @issue.changesets.any? && User.current.allowed_to?(:view_changesets, @project) %>
+<div id="issue-changesets">
+<h3><%=l(:label_associated_revisions)%></h3>
+<%= render :partial => 'changesets', :locals => { :changesets => @issue.changesets} %>
+</div>
+<% end %>
+
 <% if @journals.any? %>
 <div id="history">
 <h3><%=l(:label_history)%></h3>
diff --git a/lang/bg.yml b/lang/bg.yml
index ae5630ecf..7f994acd4 100644
--- a/lang/bg.yml
+++ b/lang/bg.yml
@@ -561,3 +561,4 @@ button_update: Update
 label_change_properties: Change properties
 label_general: General
 label_repository_plural: Repositories
+label_associated_revisions: Associated revisions
diff --git a/lang/cs.yml b/lang/cs.yml
index 813dade3f..6e904c106 100644
--- a/lang/cs.yml
+++ b/lang/cs.yml
@@ -561,3 +561,4 @@ button_update: Update
 label_change_properties: Change properties
 label_general: General
 label_repository_plural: Repositories
+label_associated_revisions: Associated revisions
diff --git a/lang/de.yml b/lang/de.yml
index 660289768..27ca40a3d 100644
--- a/lang/de.yml
+++ b/lang/de.yml
@@ -561,3 +561,4 @@ button_update: Update
 label_change_properties: Change properties
 label_general: General
 label_repository_plural: Repositories
+label_associated_revisions: Associated revisions
diff --git a/lang/en.yml b/lang/en.yml
index 7d3912760..6580d398a 100644
--- a/lang/en.yml
+++ b/lang/en.yml
@@ -359,6 +359,7 @@ label_modification: %d change
 label_modification_plural: %d changes
 label_revision: Revision
 label_revision_plural: Revisions
+label_associated_revisions: Associated revisions
 label_added: added
 label_modified: modified
 label_deleted: deleted
diff --git a/lang/es.yml b/lang/es.yml
index 37821e129..1c6776555 100644
--- a/lang/es.yml
+++ b/lang/es.yml
@@ -564,3 +564,4 @@ button_update: Update
 label_change_properties: Change properties
 label_general: General
 label_repository_plural: Repositories
+label_associated_revisions: Associated revisions
diff --git a/lang/fi.yml b/lang/fi.yml
index 4aee95bb9..7eba540a7 100644
--- a/lang/fi.yml
+++ b/lang/fi.yml
@@ -566,3 +566,4 @@ default_activity_development: Kehitys
 enumeration_issue_priorities: Tapahtuman prioriteetit
 enumeration_doc_categories: Dokumentin luokat
 enumeration_activities: Aktiviteetit (ajan seuranta)
+label_associated_revisions: Associated revisions
diff --git a/lang/fr.yml b/lang/fr.yml
index 841f132d4..ce3817d3c 100644
--- a/lang/fr.yml
+++ b/lang/fr.yml
@@ -359,6 +359,7 @@ label_modification: %d modification
 label_modification_plural: %d modifications
 label_revision: Révision
 label_revision_plural: Révisions
+label_associated_revisions: Révisions associées
 label_added: ajouté
 label_modified: modifié
 label_deleted: supprimé
diff --git a/lang/he.yml b/lang/he.yml
index 666675e75..928c68baa 100644
--- a/lang/he.yml
+++ b/lang/he.yml
@@ -561,3 +561,4 @@ button_update: Update
 label_change_properties: Change properties
 label_general: General
 label_repository_plural: Repositories
+label_associated_revisions: Associated revisions
diff --git a/lang/it.yml b/lang/it.yml
index 24e39955a..a16228149 100644
--- a/lang/it.yml
+++ b/lang/it.yml
@@ -561,3 +561,4 @@ button_update: Update
 label_change_properties: Change properties
 label_general: General
 label_repository_plural: Repositories
+label_associated_revisions: Associated revisions
diff --git a/lang/ja.yml b/lang/ja.yml
index d68013296..56f846947 100644
--- a/lang/ja.yml
+++ b/lang/ja.yml
@@ -562,3 +562,4 @@ button_update: Update
 label_change_properties: Change properties
 label_general: General
 label_repository_plural: Repositories
+label_associated_revisions: Associated revisions
diff --git a/lang/ko.yml b/lang/ko.yml
index 75a4bef4c..7a509478e 100644
--- a/lang/ko.yml
+++ b/lang/ko.yml
@@ -561,3 +561,4 @@ button_update: 변경사항기록
 label_change_properties: 속성 변경
 label_general: 일반
 label_repository_plural: 저장소들
+label_associated_revisions: Associated revisions
diff --git a/lang/lt.yml b/lang/lt.yml
index 8cf573d10..8455260f1 100644
--- a/lang/lt.yml
+++ b/lang/lt.yml
@@ -562,3 +562,4 @@ text_load_default_configuration: Load the default configuration
 text_no_configuration_data: "Roles, trackers, issue statuses and workflow have not been configured yet.\nIt is highly recommended to load the default configuration. You will be able to modify it once loaded."
 label_repository_plural: Repositories
 error_can_t_load_default_data: "Default configuration could not be loaded: %s"
+label_associated_revisions: Associated revisions
diff --git a/lang/nl.yml b/lang/nl.yml
index 44633e4b4..92e5a5971 100644
--- a/lang/nl.yml
+++ b/lang/nl.yml
@@ -562,3 +562,4 @@ button_update: Update
 label_change_properties: Change properties
 label_general: General
 label_repository_plural: Repositories
+label_associated_revisions: Associated revisions
diff --git a/lang/pl.yml b/lang/pl.yml
index 3353333b8..548917a36 100644
--- a/lang/pl.yml
+++ b/lang/pl.yml
@@ -561,3 +561,4 @@ button_update: Uaktualnij
 label_change_properties: Zmień właściwości
 label_general: Ogólne
 label_repository_plural: Repozytoria
+label_associated_revisions: Associated revisions
diff --git a/lang/pt-br.yml b/lang/pt-br.yml
index 684b51daa..45e66cd52 100644
--- a/lang/pt-br.yml
+++ b/lang/pt-br.yml
@@ -561,3 +561,4 @@ button_update: Update
 label_change_properties: Change properties
 label_general: General
 label_repository_plural: Repositories
+label_associated_revisions: Associated revisions
diff --git a/lang/pt.yml b/lang/pt.yml
index 0ce2d3471..54b74c47c 100644
--- a/lang/pt.yml
+++ b/lang/pt.yml
@@ -561,3 +561,4 @@ button_update: Update
 label_change_properties: Change properties
 label_general: General
 label_repository_plural: Repositories
+label_associated_revisions: Associated revisions
diff --git a/lang/ro.yml b/lang/ro.yml
index 95e0ea318..c3427d261 100644
--- a/lang/ro.yml
+++ b/lang/ro.yml
@@ -561,3 +561,4 @@ button_update: Update
 label_change_properties: Change properties
 label_general: General
 label_repository_plural: Repositories
+label_associated_revisions: Associated revisions
diff --git a/lang/ru.yml b/lang/ru.yml
index 131b5c77c..7bf47c8fc 100644
--- a/lang/ru.yml
+++ b/lang/ru.yml
@@ -560,3 +560,4 @@ button_update: Обновить
 label_change_properties: Изменить свойства
 label_general: Общее
 label_repository_plural: Репозитории
+label_associated_revisions: Associated revisions
diff --git a/lang/sr.yml b/lang/sr.yml
index ece6cf6e2..6c486a83f 100644
--- a/lang/sr.yml
+++ b/lang/sr.yml
@@ -562,3 +562,4 @@ button_update: Update
 label_change_properties: Change properties
 label_general: General
 label_repository_plural: Repositories
+label_associated_revisions: Associated revisions
diff --git a/lang/sv.yml b/lang/sv.yml
index cf1e760f9..0cb9a2d67 100644
--- a/lang/sv.yml
+++ b/lang/sv.yml
@@ -562,3 +562,4 @@ button_update: Update
 label_change_properties: Change properties
 label_general: General
 label_repository_plural: Repositories
+label_associated_revisions: Associated revisions
diff --git a/lang/zh-tw.yml b/lang/zh-tw.yml
index b0c258bcf..465855b58 100644
--- a/lang/zh-tw.yml
+++ b/lang/zh-tw.yml
@@ -562,3 +562,4 @@ default_activity_development: 開發
 enumeration_issue_priorities: 項目重要性
 enumeration_doc_categories: 文件分類
 enumeration_activities: 活動 (time tracking)
+label_associated_revisions: Associated revisions
diff --git a/lang/zh.yml b/lang/zh.yml
index 2d537b250..c42c60fac 100644
--- a/lang/zh.yml
+++ b/lang/zh.yml
@@ -564,3 +564,4 @@ button_update: Update
 label_change_properties: Change properties
 label_general: General
 label_repository_plural: Repositories
+label_associated_revisions: Associated revisions
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 5bada6e06..ec3ae159d 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -135,6 +135,11 @@ hr { width: 100%; height: 1px; background: #ccc; border: 0;}
 textarea.wiki-edit { width: 99%; }
 li p {margin-top: 0;}
 div.issue {background:#ffffdd; padding:6px; margin-bottom:6px;border: 1px solid #d7d7d7;}
+
+div#issue-changesets {float:right; width:45%; margin-left: 1em; margin-bottom: 1em; background: #fff; padding-left: 1em;}
+div#issue-changesets ul {list-style-position: outside; list-style-type:none; margin: 0;  padding: 0;}
+div#issue-changesets li { padding: 4px; }
+
 .autoscroll {overflow-x: auto; padding:1px; width:100%; margin-bottom: 1.2em;}
 #user_firstname, #user_lastname, #user_mail, #my_account_form select { width: 90%; }
 

From 0b4a02f607a1eefb89bc37b734375fb7d70afc6c Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 20 Jan 2008 17:20:34 +0000
Subject: [PATCH 147/710] Display custom fields in two columns on the issue
 form.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1086 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/helpers/custom_fields_helper.rb        | 2 +-
 app/views/issues/_form.rhtml               | 5 ++---
 app/views/issues/_form_custom_fields.rhtml | 9 +++++++++
 3 files changed, 12 insertions(+), 4 deletions(-)
 create mode 100644 app/views/issues/_form_custom_fields.rhtml

diff --git a/app/helpers/custom_fields_helper.rb b/app/helpers/custom_fields_helper.rb
index 25389ca63..8792c8c6e 100644
--- a/app/helpers/custom_fields_helper.rb
+++ b/app/helpers/custom_fields_helper.rb
@@ -28,7 +28,7 @@ module CustomFieldsHelper
       text_field('custom_value', 'value', :name => field_name, :id => field_id, :size => 10) + 
       calendar_for(field_id)
     when "text"
-      text_area 'custom_value', 'value', :name => field_name, :id => field_id, :cols => 60, :rows => 3
+      text_area 'custom_value', 'value', :name => field_name, :id => field_id, :rows => 3, :style => 'width:99%'
     when "bool"
       check_box 'custom_value', 'value', :name => field_name, :id => field_id
     when "list"
diff --git a/app/views/issues/_form.rhtml b/app/views/issues/_form.rhtml
index 779846f4d..d91effedf 100644
--- a/app/views/issues/_form.rhtml
+++ b/app/views/issues/_form.rhtml
@@ -38,9 +38,8 @@
                    :accesskey => accesskey(:edit),
                    :class => 'wiki-edit' %></p>
 <p><%= f.select :fixed_version_id, (@project.versions.sort.collect {|v| [v.name, v.id]}), { :include_blank => true } %></p>
-<% for @custom_value in @custom_values %>
-	<p><%= custom_field_tag_with_label @custom_value %></p>
-<% end %>
+
+<%= render :partial => 'form_custom_fields', :locals => {:values => @custom_values} %>
 
 <% if @issue.new_record? %>
 <p id="attachments_p"><label for="attachment_file"><%=l(:label_attachment)%>
diff --git a/app/views/issues/_form_custom_fields.rhtml b/app/views/issues/_form_custom_fields.rhtml
new file mode 100644
index 000000000..291b5d4de
--- /dev/null
+++ b/app/views/issues/_form_custom_fields.rhtml
@@ -0,0 +1,9 @@
+<div class="splitcontentleft">
+<% values.each_with_index do |value, i| %>
+	<p><%= custom_field_tag_with_label value %></p>
+    <% if i >= values.size / 2 - 1 %>
+</div><div class="splitcontentright">
+    <% end %>
+<% end %>
+</div>
+<div style="clear:both;"> </div>

From d5b9dedca2298e8b95bbb8ac309ddfe8454a8c76 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 20 Jan 2008 17:36:01 +0000
Subject: [PATCH 148/710] Added tabindex property on wiki toolbar buttons and
 'new category' link.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1087 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/issues/_form.rhtml              | 2 +-
 public/javascripts/jstoolbar/jstoolbar.js | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/views/issues/_form.rhtml b/app/views/issues/_form.rhtml
index d91effedf..0f5e10de9 100644
--- a/app/views/issues/_form.rhtml
+++ b/app/views/issues/_form.rhtml
@@ -21,7 +21,7 @@
 <%= prompt_to_remote(l(:label_issue_category_new),
                      l(:label_issue_category_new), 'category[name]', 
                      {:controller => 'projects', :action => 'add_issue_category', :id => @project},
-                     :class => 'small') if authorize_for('projects', 'add_issue_category') %></p>
+                     :class => 'small', :tabindex => 199) if authorize_for('projects', 'add_issue_category') %></p>
 </div>
 
 <div class="splitcontentright">
diff --git a/public/javascripts/jstoolbar/jstoolbar.js b/public/javascripts/jstoolbar/jstoolbar.js
index 65f25bac1..7941bd135 100644
--- a/public/javascripts/jstoolbar/jstoolbar.js
+++ b/public/javascripts/jstoolbar/jstoolbar.js
@@ -81,6 +81,7 @@ jsButton.prototype.draw = function() {
 	
 	var button = document.createElement('button');
 	button.setAttribute('type','button');
+	button.tabIndex = 200;
 	if (this.className) button.className = this.className;
 	button.title = this.title;
 	var span = document.createElement('span');

From df99d8f30801792560fc955ac36c2801e6aa5ff5 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 20 Jan 2008 18:37:51 +0000
Subject: [PATCH 149/710] Unlimited and optional project description. The
 project list will show truncated descriptions only (the first fews lines).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1088 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/models/project.rb                                | 12 ++++++++++--
 app/views/admin/projects.rhtml                       |  2 +-
 app/views/projects/_form.rhtml                       |  7 +++++--
 app/views/projects/list.rhtml                        |  2 +-
 app/views/welcome/index.rhtml                        |  2 +-
 .../087_change_projects_description_to_text.rb       |  8 ++++++++
 6 files changed, 26 insertions(+), 7 deletions(-)
 create mode 100644 db/migrate/087_change_projects_description_to_text.rb

diff --git a/app/models/project.rb b/app/models/project.rb
index 0e7f8284c..42f2ddfd9 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -52,12 +52,11 @@ class Project < ActiveRecord::Base
 
   attr_protected :status, :enabled_module_names
   
-  validates_presence_of :name, :description, :identifier
+  validates_presence_of :name, :identifier
   validates_uniqueness_of :name, :identifier
   validates_associated :custom_values, :on => :update
   validates_associated :repository, :wiki
   validates_length_of :name, :maximum => 30
-  validates_length_of :description, :maximum => 255
   validates_length_of :homepage, :maximum => 60
   validates_length_of :identifier, :in => 3..20
   validates_format_of :identifier, :with => /^[a-z0-9\-]*$/
@@ -184,6 +183,15 @@ class Project < ActiveRecord::Base
     name.downcase <=> project.name.downcase
   end
   
+  def to_s
+    name
+  end
+  
+  # Returns a short description of the projects (first lines)
+  def short_description(length = 255)
+    description.gsub(/^(.{#{length}}[^\n]*).*$/m, '\1').strip if description
+  end
+  
   def allows_to?(action)
     if action.is_a? Hash
       allowed_actions.include? "#{action[:controller]}/#{action[:action]}"
diff --git a/app/views/admin/projects.rhtml b/app/views/admin/projects.rhtml
index 3a759ecaa..d35c484b5 100644
--- a/app/views/admin/projects.rhtml
+++ b/app/views/admin/projects.rhtml
@@ -27,7 +27,7 @@
 <% for project in @projects %>
   <tr class="<%= cycle("odd", "even") %>">
 	<td><%= project.active? ? link_to(h(project.name), :controller => 'projects', :action => 'settings', :id => project) : h(project.name) %>
-	<td><%= textilizable project.description, :project => project %>
+	<td><%= textilizable project.short_description, :project => project %>
 	<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) %>
diff --git a/app/views/projects/_form.rhtml b/app/views/projects/_form.rhtml
index e63c929cc..a810369d4 100644
--- a/app/views/projects/_form.rhtml
+++ b/app/views/projects/_form.rhtml
@@ -8,8 +8,11 @@
     <p><%= f.select :parent_id, (@root_projects.collect {|p| [p.name, p.id]}), { :include_blank => true } %></p>
 <% end %>
 
-<p><%= f.text_area :description, :required => true, :cols => 60, :rows => 5 %><em><%= l(:text_caracters_maximum, 255) %></em></p>
-<p><%= f.text_field :identifier, :required => true, :disabled => @project.identifier_frozen? %><br /><em><%= l(:text_length_between, 3, 20) %> <%= l(:text_project_identifier_info) unless @project.identifier_frozen? %></em></p>
+<p><%= f.text_area :description, :rows => 5, :class => 'wiki-edit' %></p>
+<p><%= f.text_field :identifier, :required => true, :disabled => @project.identifier_frozen? %>
+<% unless @project.identifier_frozen? %>
+<br /><em><%= l(:text_length_between, 3, 20) %> <%= l(:text_project_identifier_info) %></em>
+<% end %></p>
 <p><%= f.text_field :homepage, :size => 40 %></p>
 <p><%= f.check_box :is_public %></p>
 <%= wikitoolbar_for 'project_description' %>
diff --git a/app/views/projects/list.rhtml b/app/views/projects/list.rhtml
index a18f63e43..15ea06483 100644
--- a/app/views/projects/list.rhtml
+++ b/app/views/projects/list.rhtml
@@ -2,7 +2,7 @@
 
 <% @project_tree.keys.sort.each do |project| %>
 <h3><%= link_to h(project.name), {:action => 'show', :id => project}, :class => (User.current.member_of?(project) ? "icon icon-fav" : "") %></h3>
-<%= textilizable(project.description, :project => project) %>
+<%= textilizable(project.short_description, :project => project) %>
 
 <% if @project_tree[project].any? %>
     <p><%= l(:label_subproject_plural) %>:
diff --git a/app/views/welcome/index.rhtml b/app/views/welcome/index.rhtml
index 2e7ec2c06..d618fa6e1 100644
--- a/app/views/welcome/index.rhtml
+++ b/app/views/welcome/index.rhtml
@@ -18,7 +18,7 @@
 		<% for project in @projects %>
 			<li>
 			<%= link_to project.name, :controller => 'projects', :action => 'show', :id => project %> (<%= format_time(project.created_on) %>)
-			<%= textilizable project.description, :project => project %>
+			<%= textilizable project.short_description, :project => project %>
 			</li>
 		<% end %>
 		</ul>
diff --git a/db/migrate/087_change_projects_description_to_text.rb b/db/migrate/087_change_projects_description_to_text.rb
new file mode 100644
index 000000000..d215840aa
--- /dev/null
+++ b/db/migrate/087_change_projects_description_to_text.rb
@@ -0,0 +1,8 @@
+class ChangeProjectsDescriptionToText < ActiveRecord::Migration
+  def self.up
+    change_column :projects, :description, :text, :default => ''
+  end
+
+  def self.down
+  end
+end

From 59c5d995c339f726f7c6249d543a2b2a2a7bc061 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 20 Jan 2008 19:45:08 +0000
Subject: [PATCH 150/710] Fixed: custom fields empty on issue/edit (broken by
 r1086).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1089 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/issues/_form_custom_fields.rhtml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/views/issues/_form_custom_fields.rhtml b/app/views/issues/_form_custom_fields.rhtml
index 291b5d4de..e5a98e30e 100644
--- a/app/views/issues/_form_custom_fields.rhtml
+++ b/app/views/issues/_form_custom_fields.rhtml
@@ -1,9 +1,11 @@
 <div class="splitcontentleft">
-<% values.each_with_index do |value, i| %>
-	<p><%= custom_field_tag_with_label value %></p>
-    <% if i >= values.size / 2 - 1 %>
+<% i = 1 %>
+<% for @custom_value in values %>
+	<p><%= custom_field_tag_with_label @custom_value %></p>
+    <% if i >= values.size / 2 %>
 </div><div class="splitcontentright">
     <% end %>
+    <% i += 1 %>
 <% end %>
 </div>
 <div style="clear:both;"> </div>

From d6bfb7fa4da4068c3e64f3fce16574de56fd72e9 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 20 Jan 2008 21:29:51 +0000
Subject: [PATCH 151/710] Added default value for custom fields. Fixed
 javascript on custom field form for project and user custom fields.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1090 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/models/custom_field.rb                |  5 +++++
 app/models/custom_value.rb                |  6 ++++++
 app/views/custom_fields/_form.rhtml       | 22 +++++++++++++++++-----
 lang/bg.yml                               |  1 +
 lang/cs.yml                               |  1 +
 lang/de.yml                               |  1 +
 lang/en.yml                               |  1 +
 lang/es.yml                               |  1 +
 lang/fi.yml                               |  1 +
 lang/fr.yml                               |  1 +
 lang/he.yml                               |  1 +
 lang/it.yml                               |  1 +
 lang/ja.yml                               |  1 +
 lang/ko.yml                               |  1 +
 lang/lt.yml                               |  3 ++-
 lang/nl.yml                               |  3 ++-
 lang/pl.yml                               |  1 +
 lang/pt-br.yml                            |  1 +
 lang/pt.yml                               |  1 +
 lang/ro.yml                               |  1 +
 lang/ru.yml                               |  1 +
 lang/sr.yml                               |  1 +
 lang/sv.yml                               |  1 +
 lang/zh-tw.yml                            |  1 +
 lang/zh.yml                               |  1 +
 test/fixtures/custom_fields.yml           |  5 +++++
 test/functional/issues_controller_test.rb | 19 ++++++++++++++++---
 test/integration/issues_test.rb           | 14 ++++++++++++--
 test/unit/custom_value_test.rb            | 11 +++++++++++
 29 files changed, 96 insertions(+), 12 deletions(-)

diff --git a/app/models/custom_field.rb b/app/models/custom_field.rb
index 5a134c4ec..6be081b0b 100644
--- a/app/models/custom_field.rb
+++ b/app/models/custom_field.rb
@@ -53,6 +53,11 @@ class CustomField < ActiveRecord::Base
       errors.add(:possible_values, :activerecord_error_blank) if self.possible_values.nil? || self.possible_values.empty?
       errors.add(:possible_values, :activerecord_error_invalid) unless self.possible_values.is_a? Array
     end
+    
+    # validate default value
+    v = CustomValue.new(:custom_field => self.dup, :value => default_value, :customized => nil)
+    v.custom_field.is_required = false
+    errors.add(:default_value, :activerecord_error_invalid) unless v.valid?
   end
 
   def <=>(field)
diff --git a/app/models/custom_value.rb b/app/models/custom_value.rb
index c3d6b7bb9..94b797bcc 100644
--- a/app/models/custom_value.rb
+++ b/app/models/custom_value.rb
@@ -19,6 +19,12 @@ class CustomValue < ActiveRecord::Base
   belongs_to :custom_field
   belongs_to :customized, :polymorphic => true
 
+  def after_initialize
+    if custom_field && new_record? && (customized_type.blank? || (customized && customized.new_record?))
+      self.value ||= custom_field.default_value
+    end
+  end
+  
 protected
   def validate
     errors.add(:value, :activerecord_error_blank) and return if custom_field.is_required? and value.blank?    
diff --git a/app/views/custom_fields/_form.rhtml b/app/views/custom_fields/_form.rhtml
index 915daab32..5e4eadf21 100644
--- a/app/views/custom_fields/_form.rhtml
+++ b/app/views/custom_fields/_form.rhtml
@@ -8,31 +8,42 @@ function toggle_custom_field_format() {
   p_regexp = $("custom_field_regexp");
   p_values = $("custom_field_possible_values");
   p_searchable = $("custom_field_searchable");
+  p_default = $("custom_field_default_value");
+  
+  p_default.setAttribute('type','text');
+  Element.show(p_default.parentNode);
+  
   switch (format.value) {
     case "list":
       Element.hide(p_length.parentNode);
       Element.hide(p_regexp.parentNode);
-      Element.show(p_searchable.parentNode);
+      if (p_searchable) Element.show(p_searchable.parentNode);
       Element.show(p_values);
       break;
-    case "date":
     case "bool":
+      p_default.setAttribute('type','checkbox');
       Element.hide(p_length.parentNode);
       Element.hide(p_regexp.parentNode);
-      Element.hide(p_searchable.parentNode);
+      if (p_searchable) Element.hide(p_searchable.parentNode);
+      Element.hide(p_values);
+      break;
+    case "date":
+      Element.hide(p_length.parentNode);
+      Element.hide(p_regexp.parentNode);
+      if (p_searchable) Element.hide(p_searchable.parentNode);
       Element.hide(p_values);
       break;
     case "float":
     case "int":
       Element.show(p_length.parentNode);
       Element.show(p_regexp.parentNode);
-      Element.hide(p_searchable.parentNode);
+      if (p_searchable) Element.hide(p_searchable.parentNode);
       Element.hide(p_values);
       break;
     default:
       Element.show(p_length.parentNode);
       Element.show(p_regexp.parentNode);
-      Element.show(p_searchable.parentNode);
+      if (p_searchable) Element.show(p_searchable.parentNode);
       Element.hide(p_values);
       break;
   }
@@ -70,6 +81,7 @@ function deleteValueField(e) {
 <span><%= text_field_tag 'custom_field[possible_values][]', value, :size => 30 %> <%= image_to_function "delete.png", "deleteValueField(this);return false" %><br /></span>
 <% end %>
 </p>
+<p><%= @custom_field.field_format == 'bool' ? f.check_box(:default_value) : f.text_field(:default_value) %></p>
 </div>
 
 <div class="box">
diff --git a/lang/bg.yml b/lang/bg.yml
index 7f994acd4..2c83b966f 100644
--- a/lang/bg.yml
+++ b/lang/bg.yml
@@ -161,6 +161,7 @@ field_delay: Отместване
 field_assignable: Възможно е възлагане на задачи за тази роля
 field_redirect_existing_links: Пренасочване на съществуващи линкове
 field_estimated_hours: Изчислено време
+field_default_value: Статус по подразбиране
 
 setting_app_title: Заглавие
 setting_app_subtitle: Описание
diff --git a/lang/cs.yml b/lang/cs.yml
index 6e904c106..cde58fe17 100644
--- a/lang/cs.yml
+++ b/lang/cs.yml
@@ -159,6 +159,7 @@ field_is_filter: Used as a filter
 field_issue_to_id: Vztažený požadavek
 field_delay: Zpoždění
 field_assignable: Požadavky mohou být přiřazeny této roli
+field_default_value: Výchozí stav
 
 setting_app_title: Titulek aplikace
 setting_app_subtitle: Podtitulek aplikace
diff --git a/lang/de.yml b/lang/de.yml
index 27ca40a3d..a23e9c533 100644
--- a/lang/de.yml
+++ b/lang/de.yml
@@ -161,6 +161,7 @@ field_delay: Pufferzeit
 field_assignable: Tickets können dieser Rolle zugewiesen werden
 field_redirect_existing_links: Existierende Links umleiten
 field_estimated_hours: Geschätzter Aufwand
+field_default_value: Default
 
 setting_app_title: Applikations-Titel
 setting_app_subtitle: Applikations-Untertitel
diff --git a/lang/en.yml b/lang/en.yml
index 6580d398a..dc7b04dd2 100644
--- a/lang/en.yml
+++ b/lang/en.yml
@@ -174,6 +174,7 @@ field_estimated_hours: Estimated time
 field_column_names: Columns
 field_time_zone: Time zone
 field_searchable: Searchable
+field_default_value: Default value
 
 setting_app_title: Application title
 setting_app_subtitle: Application subtitle
diff --git a/lang/es.yml b/lang/es.yml
index 1c6776555..8e9ffaa2f 100644
--- a/lang/es.yml
+++ b/lang/es.yml
@@ -155,6 +155,7 @@ field_identifier: Identificador
 field_is_filter: Usado como filtro
 field_issue_to_id: Petición Relacionada
 field_delay: Retraso
+field_default_value: Estado por defecto
 
 setting_app_title: Título de la aplicación
 setting_app_subtitle: Subtítulo de la aplicación
diff --git a/lang/fi.yml b/lang/fi.yml
index 7eba540a7..497647ad9 100644
--- a/lang/fi.yml
+++ b/lang/fi.yml
@@ -174,6 +174,7 @@ field_estimated_hours: Arvioitu aika
 field_column_names: Saraketta
 field_time_zone: Aikavyöhyke
 field_searchable: Haettava
+field_default_value: Vakio arvo
 
 setting_app_title: Ohjelman otsikko
 setting_app_subtitle: Ohjelman alaotsikko
diff --git a/lang/fr.yml b/lang/fr.yml
index ce3817d3c..854ed5859 100644
--- a/lang/fr.yml
+++ b/lang/fr.yml
@@ -174,6 +174,7 @@ field_estimated_hours: Temps estimé
 field_column_names: Colonnes
 field_time_zone: Fuseau horaire
 field_searchable: Utilisé pour les recherches
+field_default_value: Valeur par défaut
 
 setting_app_title: Titre de l'application
 setting_app_subtitle: Sous-titre de l'application
diff --git a/lang/he.yml b/lang/he.yml
index 928c68baa..3e8ad4160 100644
--- a/lang/he.yml
+++ b/lang/he.yml
@@ -164,6 +164,7 @@ field_assignable: ניתן להקצות נושאים לתפקיד זה
 field_redirect_existing_links: העבר קישורים קיימים
 field_estimated_hours: זמן משוער
 field_column_names: עמודות
+field_default_value: ערך ברירת מחדל
 
 setting_app_title: כותרת ישום
 setting_app_subtitle: תת-כותרת ישום
diff --git a/lang/it.yml b/lang/it.yml
index a16228149..ca4b3391a 100644
--- a/lang/it.yml
+++ b/lang/it.yml
@@ -161,6 +161,7 @@ field_delay: Delay
 field_assignable: Issues can be assigned to this role
 field_redirect_existing_links: Redirect existing links
 field_estimated_hours: Estimated time
+field_default_value: Stato predefinito
 
 setting_app_title: Titolo applicazione
 setting_app_subtitle: Sottotitolo applicazione
diff --git a/lang/ja.yml b/lang/ja.yml
index 56f846947..713af6b46 100644
--- a/lang/ja.yml
+++ b/lang/ja.yml
@@ -162,6 +162,7 @@ field_delay: 遅延
 field_assignable: 問題はこのロールに割り当てることができます
 field_redirect_existing_links: 既存のリンクをリダイレクトする
 field_estimated_hours: 予定工数
+field_default_value: デフォルトのステータス
 
 setting_app_title: アプリケーションのタイトル
 setting_app_subtitle: アプリケーションのサブタイトル
diff --git a/lang/ko.yml b/lang/ko.yml
index 7a509478e..564e67253 100644
--- a/lang/ko.yml
+++ b/lang/ko.yml
@@ -164,6 +164,7 @@ field_assignable: 이 역할에 할당될수 있는 티켓
 field_redirect_existing_links: Redirect existing links
 field_estimated_hours: 추정시간
 field_column_names: 컬럼
+field_default_value: 기본값
 
 setting_app_title: 레드마인 제목
 setting_app_subtitle: 레드마인 부제목
diff --git a/lang/lt.yml b/lang/lt.yml
index 8455260f1..d95da7469 100644
--- a/lang/lt.yml
+++ b/lang/lt.yml
@@ -171,7 +171,8 @@ field_estimated_hours: Apskaičiuotas laikas
 field_column_names: Skiltys 
 field_time_zone: Laiko juosta 
 field_searchable: Randamas 
- 
+field_default_value: Numatytoji vertė 
+
 setting_app_title: Programos pavadinimas 
 setting_app_subtitle: Programos paantraštė 
 setting_welcome_text: Pasveikinimas 
diff --git a/lang/nl.yml b/lang/nl.yml
index 92e5a5971..8d29ab902 100644
--- a/lang/nl.yml
+++ b/lang/nl.yml
@@ -109,7 +109,7 @@ field_issue: Issue
 field_status: Status
 field_notes: Notities
 field_is_closed: Issue gesloten
-field_is_default: Default status
+field_is_default: Default
 field_tracker: Tracker
 field_subject: Onderwerp
 field_due_date: Verwachte datum gereed
@@ -161,6 +161,7 @@ field_delay: Vertraging
 field_assignable: Issues can be assigned to this role
 field_redirect_existing_links: Redirect existing links
 field_estimated_hours: Estimated time
+field_default_value: Default value
 
 setting_app_title: Applicatie titel
 setting_app_subtitle: Applicatie ondertitel
diff --git a/lang/pl.yml b/lang/pl.yml
index 548917a36..69bf5306a 100644
--- a/lang/pl.yml
+++ b/lang/pl.yml
@@ -155,6 +155,7 @@ field_identifier: Identifikator
 field_is_filter: Atrybut filtrowania
 field_issue_to_id: Powiązania zagadnienia
 field_delay: Opóźnienie
+field_default_value: Domyślny
 
 setting_app_title: Tytuł aplikacji
 setting_app_subtitle: Podtytuł aplikacji
diff --git a/lang/pt-br.yml b/lang/pt-br.yml
index 45e66cd52..926c913a0 100644
--- a/lang/pt-br.yml
+++ b/lang/pt-br.yml
@@ -161,6 +161,7 @@ field_delay: Delay
 field_assignable: Issues can be assigned to this role
 field_redirect_existing_links: Redirect existing links
 field_estimated_hours: Estimated time
+field_default_value: Padrao
 
 setting_app_title: Titulo da aplicacao
 setting_app_subtitle: Sub-titulo da aplicacao
diff --git a/lang/pt.yml b/lang/pt.yml
index 54b74c47c..88fd9cf74 100644
--- a/lang/pt.yml
+++ b/lang/pt.yml
@@ -161,6 +161,7 @@ field_delay: Atraso
 field_assignable: Issues can be assigned to this role
 field_redirect_existing_links: Redirect existing links
 field_estimated_hours: Estimated time
+field_default_value: Padrão
 
 setting_app_title: Título da aplicação
 setting_app_subtitle: Sub-título da aplicação
diff --git a/lang/ro.yml b/lang/ro.yml
index c3427d261..2eb17609c 100644
--- a/lang/ro.yml
+++ b/lang/ro.yml
@@ -161,6 +161,7 @@ field_delay: Intarziere
 field_assignable: La acest rol se poate atribui tichete
 field_redirect_existing_links: Redirectare linkuri existente
 field_estimated_hours: Timpul estimat
+field_default_value: Default value
 
 setting_app_title: Titlul aplicatiei
 setting_app_subtitle: Subtitlul aplicatiei
diff --git a/lang/ru.yml b/lang/ru.yml
index 7bf47c8fc..62799bdf8 100644
--- a/lang/ru.yml
+++ b/lang/ru.yml
@@ -166,6 +166,7 @@ field_assignable: Задача может быть назначена этой 
 field_redirect_existing_links: Перенаправить существующие ссылки
 field_estimated_hours: Оцененное время
 field_column_names: Колонки
+field_default_value: Default value
 
 setting_app_title: Название приложения
 setting_app_subtitle: Подзаголовок приложения 
diff --git a/lang/sr.yml b/lang/sr.yml
index 6c486a83f..6d88d34ff 100644
--- a/lang/sr.yml
+++ b/lang/sr.yml
@@ -166,6 +166,7 @@ field_assignable: Kartice mogu biti dodeljene ovoj ulozi
 field_redirect_existing_links: Redirekcija postojećih linkova
 field_estimated_hours: Procenjeno vreme
 field_column_names: Kolone
+field_default_value: Default value
 
 setting_app_title: Naziv aplikacije
 setting_app_subtitle: Podnaslov aplikacije
diff --git a/lang/sv.yml b/lang/sv.yml
index 0cb9a2d67..5f4a01126 100644
--- a/lang/sv.yml
+++ b/lang/sv.yml
@@ -161,6 +161,7 @@ field_delay: Delay
 field_assignable: Issues can be assigned to this role
 field_redirect_existing_links: Redirect existing links
 field_estimated_hours: Estimated time
+field_default_value: Default value
 
 setting_app_title: Applikationstitel
 setting_app_subtitle: Applicationsunderrubrik
diff --git a/lang/zh-tw.yml b/lang/zh-tw.yml
index 465855b58..2a431266e 100644
--- a/lang/zh-tw.yml
+++ b/lang/zh-tw.yml
@@ -174,6 +174,7 @@ field_estimated_hours: 預估工時
 field_column_names: Columns
 field_time_zone: 時區
 field_searchable: 可用做搜尋條件
+field_default_value: Default value
 
 setting_app_title: 標題
 setting_app_subtitle: 副標題
diff --git a/lang/zh.yml b/lang/zh.yml
index c42c60fac..b87a1515d 100644
--- a/lang/zh.yml
+++ b/lang/zh.yml
@@ -164,6 +164,7 @@ field_delay: Delay
 field_assignable: Issues can be assigned to this role
 field_redirect_existing_links: Redirect existing links
 field_estimated_hours: Estimated time
+field_default_value: Default value
 
 setting_app_title: 应用程序标题
 setting_app_subtitle: 应用程序子标题
diff --git a/test/fixtures/custom_fields.yml b/test/fixtures/custom_fields.yml
index e73e6de96..e58d8e3dc 100644
--- a/test/fixtures/custom_fields.yml
+++ b/test/fixtures/custom_fields.yml
@@ -10,6 +10,7 @@ custom_fields_001:
   id: 1
   is_required: false
   field_format: list
+  default_value: ""
 custom_fields_002: 
   name: Searchable field
   min_length: 1
@@ -22,6 +23,7 @@ custom_fields_002:
   is_required: false
   field_format: string
   searchable: true
+  default_value: "Default string"
 custom_fields_003: 
   name: Development status
   min_length: 0
@@ -33,6 +35,7 @@ custom_fields_003:
   id: 3
   is_required: true
   field_format: list
+  default_value: ""
 custom_fields_004: 
   name: Phone number
   min_length: 0
@@ -44,6 +47,7 @@ custom_fields_004:
   id: 4
   is_required: false
   field_format: string
+  default_value: ""
 custom_fields_005: 
   name: Money
   min_length: 0
@@ -55,4 +59,5 @@ custom_fields_005:
   id: 5
   is_required: false
   field_format: float
+  default_value: ""
   
\ No newline at end of file
diff --git a/test/functional/issues_controller_test.rb b/test/functional/issues_controller_test.rb
index 05bfc96e3..f4c99f1ed 100644
--- a/test/functional/issues_controller_test.rb
+++ b/test/functional/issues_controller_test.rb
@@ -34,7 +34,10 @@ class IssuesControllerTest < Test::Unit::TestCase
            :enabled_modules,
            :enumerations,
            :attachments,
-           :workflows
+           :workflows,
+           :custom_fields,
+           :custom_values,
+           :custom_fields_trackers
   
   def setup
     @controller = IssuesController.new
@@ -132,6 +135,9 @@ class IssuesControllerTest < Test::Unit::TestCase
     get :new, :project_id => 1, :tracker_id => 1
     assert_response :success
     assert_template 'new'
+    
+    assert_tag :tag => 'input', :attributes => { :name => 'custom_fields[2]',
+                                                 :value => 'Default string' }
   end
 
   def test_get_new_without_tracker_id
@@ -162,9 +168,16 @@ class IssuesControllerTest < Test::Unit::TestCase
                :issue => {:tracker_id => 1,
                           :subject => 'This is the test_new issue',
                           :description => 'This is the description',
-                          :priority_id => 5}
+                          :priority_id => 5},
+               :custom_fields => {'2' => 'Value for field 2'}
     assert_redirected_to 'projects/ecookbook/issues'
-    assert Issue.find_by_subject('This is the test_new issue')
+    
+    issue = Issue.find_by_subject('This is the test_new issue')
+    assert_not_nil issue
+    assert_equal 2, issue.author_id
+    v = issue.custom_values.find_by_custom_field_id(2)
+    assert_not_nil v
+    assert_equal 'Value for field 2', v.value
   end
   
   def test_copy_issue
diff --git a/test/integration/issues_test.rb b/test/integration/issues_test.rb
index 81d27c30f..7249ed3da 100644
--- a/test/integration/issues_test.rb
+++ b/test/integration/issues_test.rb
@@ -1,7 +1,16 @@
 require "#{File.dirname(__FILE__)}/../test_helper"
 
 class IssuesTest < ActionController::IntegrationTest
-  fixtures :projects, :users, :trackers, :issue_statuses, :issues,  :enumerations
+  fixtures :projects, 
+           :users,
+           :trackers,
+           :projects_trackers,
+           :issue_statuses,
+           :issues,
+           :enumerations,
+           :custom_fields,
+           :custom_values,
+           :custom_fields_trackers
 
   # create an issue
   def test_add_issue
@@ -18,7 +27,8 @@ class IssuesTest < ActionController::IntegrationTest
                                              :description => "new issue", 
                                              :done_ratio => "0",
                                              :due_date => "",
-                                             :assigned_to_id => "" }
+                                             :assigned_to_id => "" },
+                                 :custom_fields => {'2' => 'Value for field 2'}
     # find created issue
     issue = Issue.find_by_subject("new test issue")
     assert_kind_of Issue, issue
diff --git a/test/unit/custom_value_test.rb b/test/unit/custom_value_test.rb
index 24d09fe49..4d488bae2 100644
--- a/test/unit/custom_value_test.rb
+++ b/test/unit/custom_value_test.rb
@@ -31,4 +31,15 @@ class CustomValueTest < Test::Unit::TestCase
     v.value = '6a'
     assert !v.save
   end
+  
+  def test_default_value
+    field = CustomField.find_by_default_value('Default string')
+    assert_not_nil field
+    
+    v = CustomValue.new(:custom_field => field)
+    assert_equal 'Default string', v.value
+
+    v = CustomValue.new(:custom_field => field, :value => 'Not empty')
+    assert_equal 'Not empty', v.value
+  end
 end

From c65ab7c0f2722cee919ee2d516bf75f8a85daa21 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 20 Jan 2008 23:38:55 +0000
Subject: [PATCH 152/710] Missing migration for r1090.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1091 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 db/migrate/088_add_custom_fields_default_value.rb | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 db/migrate/088_add_custom_fields_default_value.rb

diff --git a/db/migrate/088_add_custom_fields_default_value.rb b/db/migrate/088_add_custom_fields_default_value.rb
new file mode 100644
index 000000000..33a39ec6e
--- /dev/null
+++ b/db/migrate/088_add_custom_fields_default_value.rb
@@ -0,0 +1,9 @@
+class AddCustomFieldsDefaultValue < ActiveRecord::Migration
+  def self.up
+    add_column :custom_fields, :default_value, :text
+  end
+
+  def self.down
+    remove_column :custom_fields, :default_value
+  end
+end

From dad5f6d403dcf70e11065da199f05be49ca2bc48 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Mon, 21 Jan 2008 18:52:45 +0000
Subject: [PATCH 153/710] Fixed search with all words (broken in r994).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1092 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 test/fixtures/issues.yml                      |  2 +-
 test/functional/search_controller_test.rb     | 33 ++++++++++++++++++-
 .../lib/acts_as_searchable.rb                 |  2 +-
 3 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/test/fixtures/issues.yml b/test/fixtures/issues.yml
index fc5b48dee..b3c662039 100644
--- a/test/fixtures/issues.yml
+++ b/test/fixtures/issues.yml
@@ -22,7 +22,7 @@ issues_002:
   id: 2
   fixed_version_id: 
   category_id: 
-  description: Ingredients should be classified by categories
+  description: Ingredients of the recipe should be classified by categories
   tracker_id: 2
   assigned_to_id: 3
   author_id: 2
diff --git a/test/functional/search_controller_test.rb b/test/functional/search_controller_test.rb
index 330cd0de0..63f1097d6 100644
--- a/test/functional/search_controller_test.rb
+++ b/test/functional/search_controller_test.rb
@@ -5,7 +5,7 @@ require 'search_controller'
 class SearchController; def rescue_action(e) raise e end; end
 
 class SearchControllerTest < Test::Unit::TestCase
-  fixtures :projects, :issues, :custom_fields, :custom_values
+  fixtures :projects, :enabled_modules, :issues, :custom_fields, :custom_values
   
   def setup
     @controller = SearchController.new
@@ -47,6 +47,37 @@ class SearchControllerTest < Test::Unit::TestCase
     assert results.include?(Issue.find(3))
   end
   
+  def test_search_all_words
+    # 'all words' is on by default
+    get :index, :id => 1, :q => 'recipe updating saving'
+    results = assigns(:results)
+    assert_not_nil results
+    assert_equal 1, results.size
+    assert results.include?(Issue.find(3))
+  end
+  
+  def test_search_one_of_the_words
+    get :index, :id => 1, :q => 'recipe updating saving', :submit => 'Search'
+    results = assigns(:results)
+    assert_not_nil results
+    assert_equal 3, results.size
+    assert results.include?(Issue.find(3))
+  end
+
+  def test_search_titles_only_without_result
+    get :index, :id => 1, :q => 'recipe updating saving', :all_words => '1', :titles_only => '1', :submit => 'Search'
+    results = assigns(:results)
+    assert_not_nil results
+    assert_equal 0, results.size
+  end
+
+  def test_search_titles_only
+    get :index, :id => 1, :q => 'recipe', :titles_only => '1', :submit => 'Search'
+    results = assigns(:results)
+    assert_not_nil results
+    assert_equal 2, results.size
+  end
+  
   def test_quick_jump_to_issue
     # issue of a public project
     get :index, :q => "3"
diff --git a/vendor/plugins/acts_as_searchable/lib/acts_as_searchable.rb b/vendor/plugins/acts_as_searchable/lib/acts_as_searchable.rb
index 1dd88978c..dff76b913 100644
--- a/vendor/plugins/acts_as_searchable/lib/acts_as_searchable.rb
+++ b/vendor/plugins/acts_as_searchable/lib/acts_as_searchable.rb
@@ -85,7 +85,7 @@ module Redmine
               end
             end
             
-            sql = ([token_clauses.join(' OR ')] * tokens.size).join(options[:all_words] ? ' AND ' : ' OR ')
+            sql = (['(' + token_clauses.join(' OR ') + ')'] * tokens.size).join(options[:all_words] ? ' AND ' : ' OR ')
             
             if options[:offset]
               sql = "(#{sql}) AND (#{searchable_options[:date_column]} " + (options[:before] ? '<' : '>') + "'#{connection.quoted_date(options[:offset])}')"

From 97e7432ce6da80dea633cd99e934943925a774b5 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Tue, 22 Jan 2008 17:17:52 +0000
Subject: [PATCH 154/710] Fixed migration 87 (mysql: TEXT column can't have a
 default value).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1093 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 db/migrate/087_change_projects_description_to_text.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/db/migrate/087_change_projects_description_to_text.rb b/db/migrate/087_change_projects_description_to_text.rb
index d215840aa..2829655d1 100644
--- a/db/migrate/087_change_projects_description_to_text.rb
+++ b/db/migrate/087_change_projects_description_to_text.rb
@@ -1,6 +1,6 @@
 class ChangeProjectsDescriptionToText < ActiveRecord::Migration
   def self.up
-    change_column :projects, :description, :text, :default => ''
+    change_column :projects, :description, :text
   end
 
   def self.down

From 91dc13f4b22c45bee5cfd1d783d6544ae79afa04 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Wed, 23 Jan 2008 17:25:11 +0000
Subject: [PATCH 155/710] Show explicit error message when the scm command
 failed (eg. when svn binary is not available).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1094 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/application.rb                |  5 ++++
 app/controllers/repositories_controller.rb    | 23 ++++++++++++++++---
 lang/bg.yml                                   |  4 +++-
 lang/cs.yml                                   |  4 +++-
 lang/de.yml                                   |  4 +++-
 lang/en.yml                                   |  3 ++-
 lang/es.yml                                   |  4 +++-
 lang/fi.yml                                   |  3 ++-
 lang/fr.yml                                   |  2 ++
 lang/he.yml                                   |  4 +++-
 lang/it.yml                                   |  4 +++-
 lang/ja.yml                                   |  4 +++-
 lang/ko.yml                                   |  4 +++-
 lang/lt.yml                                   |  6 +++--
 lang/nl.yml                                   |  4 +++-
 lang/pl.yml                                   |  4 +++-
 lang/pt-br.yml                                |  4 +++-
 lang/pt.yml                                   |  4 +++-
 lang/ro.yml                                   |  4 +++-
 lang/ru.yml                                   |  4 +++-
 lang/sr.yml                                   |  4 +++-
 lang/sv.yml                                   |  4 +++-
 lang/zh-tw.yml                                |  4 +++-
 lang/zh.yml                                   |  4 +++-
 lib/redmine/scm/adapters/abstract_adapter.rb  |  2 +-
 .../scm/adapters/subversion_adapter.rb        |  1 -
 26 files changed, 90 insertions(+), 27 deletions(-)

diff --git a/app/controllers/application.rb b/app/controllers/application.rb
index 66cec7d2a..f4883cf52 100644
--- a/app/controllers/application.rb
+++ b/app/controllers/application.rb
@@ -137,6 +137,11 @@ class ApplicationController < ActionController::Base
     return false
   end
   
+  def render_error(msg)
+    flash.now[:error] = msg
+    render :nothing => true, :layout => !request.xhr?, :status => 500
+  end
+  
   def render_feed(items, options={})    
     @items = items || []
     @items.sort! {|x,y| y.event_datetime <=> x.event_datetime }
diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb
index 6c2b088cc..542eb93ea 100644
--- a/app/controllers/repositories_controller.rb
+++ b/app/controllers/repositories_controller.rb
@@ -56,6 +56,8 @@ class RepositoriesController < ApplicationController
     # latest changesets
     @changesets = @repository.changesets.find(:all, :limit => 10, :order => "committed_on DESC")
     show_error and return unless @entries || @changesets.any?
+  rescue Redmine::Scm::Adapters::CommandFailed => e
+    show_error_command_failed(e.message)
   end
   
   def browse
@@ -65,12 +67,16 @@ class RepositoriesController < ApplicationController
     else
       show_error unless @entries
     end
+  rescue Redmine::Scm::Adapters::CommandFailed => e
+    show_error_command_failed(e.message)
   end
   
   def changes
     @entry = @repository.scm.entry(@path, @rev)
     show_error and return unless @entry
     @changesets = @repository.changesets_for_path(@path)
+  rescue Redmine::Scm::Adapters::CommandFailed => e
+    show_error_command_failed(e.message)
   end
   
   def revisions
@@ -97,11 +103,15 @@ class RepositoriesController < ApplicationController
       # Prevent empty lines when displaying a file with Windows style eol
       @content.gsub!("\r\n", "\n")
     end
+  rescue Redmine::Scm::Adapters::CommandFailed => e
+    show_error_command_failed(e.message)
   end
   
   def annotate
     @annotate = @repository.scm.annotate(@path, @rev)
     show_error and return if @annotate.nil? || @annotate.empty?
+  rescue Redmine::Scm::Adapters::CommandFailed => e
+    show_error_command_failed(e.message)
   end
   
   def revision
@@ -119,6 +129,8 @@ class RepositoriesController < ApplicationController
     end
   rescue ChangesetNotFound
     show_error
+  rescue Redmine::Scm::Adapters::CommandFailed => e
+    show_error_command_failed(e.message)
   end
   
   def diff
@@ -137,6 +149,8 @@ class RepositoriesController < ApplicationController
       @diff = @repository.diff(@path, @rev, @rev_to, @diff_type)
       show_error and return unless @diff
     end
+  rescue Redmine::Scm::Adapters::CommandFailed => e
+    show_error_command_failed(e.message)
   end
   
   def stats  
@@ -176,9 +190,12 @@ private
     render_404
   end
 
-  def show_error
-    flash.now[:error] = l(:notice_scm_error)
-    render :nothing => true, :layout => true
+  def show_error_not_found
+    render_error l(:error_scm_not_found)
+  end
+  
+  def show_error_command_failed(msg)
+    render_error l(:error_scm_command_failed, msg)
   end
   
   def graph_commits_per_month(repository)
diff --git a/lang/bg.yml b/lang/bg.yml
index 2c83b966f..00b20308b 100644
--- a/lang/bg.yml
+++ b/lang/bg.yml
@@ -68,12 +68,14 @@ notice_successful_delete: Успешно изтриване.
 notice_successful_connection: Успешно свързване.
 notice_file_not_found: Несъществуваща или преместена страница.
 notice_locking_conflict: Друг потребител променя тези данни в момента.
-notice_scm_error: Несъществуващ обект в склада.
 notice_not_authorized: Нямате право на достъп до тази страница.
 notice_email_sent: Изпратен e-mail на %s
 notice_email_error: Грешка при изпращане на e-mail (%s)
 notice_feeds_access_key_reseted: Вашия ключ за RSS достъп беше променен.
 
+error_scm_not_found: Несъществуващ обект в склада.
+error_scm_command_failed: "An error occurred when trying to access the repository: %s"
+
 mail_subject_lost_password: Вашата парола
 mail_body_lost_password: 'За да смените паролата си, използвайте следния линк:'
 mail_subject_register: Активация на акаунт
diff --git a/lang/cs.yml b/lang/cs.yml
index cde58fe17..ab159c2c4 100644
--- a/lang/cs.yml
+++ b/lang/cs.yml
@@ -68,12 +68,14 @@ notice_successful_delete: Úspěšné smazání.
 notice_successful_connection: Úspěšné připojení.
 notice_file_not_found: Stránka na kterou se snažíte zobrazit neexistuje nebo byla smazána.
 notice_locking_conflict: Údaje byly změněny jiným uživatelem.
-notice_scm_error: Entry and/or revision doesn't exist in the repository.
 notice_not_authorized: Nemáte dostatečná práva pro zobrazení této stránky.
 notice_email_sent: Na adresu %s byl odeslán email
 notice_email_error: Při odesílání emailu nastala chyba (%s)
 notice_feeds_access_key_reseted: Váš klíč pro přístup k RSS byl resetován.
 
+error_scm_not_found: "Entry and/or revision doesn't exist in the repository."
+error_scm_command_failed: "An error occurred when trying to access the repository: %s"
+
 mail_subject_lost_password: Vaše heslo
 mail_body_lost_password: 'To change your Redmine password, click on the following link:'
 mail_subject_register: aktivace účtu
diff --git a/lang/de.yml b/lang/de.yml
index a23e9c533..0c1ba3575 100644
--- a/lang/de.yml
+++ b/lang/de.yml
@@ -68,12 +68,14 @@ notice_successful_delete: Erfolgreich gelöscht.
 notice_successful_connection: Verbindung erfolgreich.
 notice_file_not_found: Anhang besteht nicht oder ist gelöscht worden.
 notice_locking_conflict: Datum wurde von einem anderen Benutzer geändert.
-notice_scm_error: Eintrag und/oder Revision besteht nicht im Projektarchiv.
 notice_not_authorized: Sie sind nicht berechtigt, auf diese Seite zuzugreifen.
 notice_email_sent: Eine E-Mail wurde an %s gesendet.
 notice_email_error: Beim Senden einer E-Mail ist ein Fehler aufgetreten (%s).
 notice_feeds_access_key_reseted: Ihr RSS-Zugriffsschlüssel wurde zurückgesetzt.
 
+error_scm_not_found: "Eintrag und/oder Revision besteht nicht im Projektarchiv."
+error_scm_command_failed: "An error occurred when trying to access the repository: %s"
+
 mail_subject_lost_password: Ihr Redmine-Kennwort
 mail_body_lost_password: 'Benutzen Sie den folgenden Link, um Ihr Kennwort zu ändern:'
 mail_subject_register: Redmine Kontoaktivierung
diff --git a/lang/en.yml b/lang/en.yml
index dc7b04dd2..32fd9926f 100644
--- a/lang/en.yml
+++ b/lang/en.yml
@@ -68,7 +68,6 @@ notice_successful_delete: Successful deletion.
 notice_successful_connection: Successful connection.
 notice_file_not_found: The page you were trying to access doesn't exist or has been removed.
 notice_locking_conflict: Data have been updated by another user.
-notice_scm_error: Entry and/or revision doesn't exist in the repository.
 notice_not_authorized: You are not authorized to access this page.
 notice_email_sent: An email was sent to %s
 notice_email_error: An error occurred while sending mail (%s)
@@ -79,6 +78,8 @@ notice_account_pending: "Your account was created and is now pending administrat
 notice_default_data_loaded: Default configuration successfully loaded.
 
 error_can_t_load_default_data: "Default configuration could not be loaded: %s"
+error_scm_not_found: "Entry and/or revision doesn't exist in the repository."
+error_scm_command_failed: "An error occurred when trying to access the repository: %s"
 
 mail_subject_lost_password: Your Redmine password
 mail_body_lost_password: 'To change your Redmine password, click on the following link:'
diff --git a/lang/es.yml b/lang/es.yml
index 8e9ffaa2f..ac3b34c19 100644
--- a/lang/es.yml
+++ b/lang/es.yml
@@ -68,9 +68,11 @@ notice_successful_delete: Borrado correcto.
 notice_successful_connection: Conexión correcta.
 notice_file_not_found: La página a la que intentas acceder no existe.
 notice_locking_conflict: Los datos han sido modificados por otro usuario.
-notice_scm_error: La entrada y/o la revisión no existe en el repositorio.
 notice_not_authorized: No tiene autorización para acceder a esta página.
 
+error_scm_not_found: "La entrada y/o la revisión no existe en el repositorio."
+error_scm_command_failed: "An error occurred when trying to access the repository: %s"
+
 mail_subject_lost_password: Tu contraseña del CIYAT - Gestor de Solicitudes
 mail_body_lost_password: 'Para cambiar su contraseña de Redmine, haga click en el siguiente enlace:'
 mail_subject_register: Activación de la cuenta del CIYAT - Gestor de Solicitudes
diff --git a/lang/fi.yml b/lang/fi.yml
index 497647ad9..eeba20c35 100644
--- a/lang/fi.yml
+++ b/lang/fi.yml
@@ -68,7 +68,6 @@ notice_successful_delete: Poisto onnistui.
 notice_successful_connection: Yhteyden muodostus onnistui.
 notice_file_not_found: Hakemaasi sivua ei löytynyt tai se on poistettu.
 notice_locking_conflict: Toinen käyttäjä on päivittänyt tiedot.
-notice_scm_error: Syötettä ja/tai versiota ei löydy säiliöstä.
 notice_not_authorized: Sinulla ei ole oikeutta näyttää tätä sivua.
 notice_email_sent: Sähköposti on lähetty osoitteeseen %s
 notice_email_error: Sähköpostilähetyksessä tapahtui virhe (%s)
@@ -79,6 +78,8 @@ notice_account_pending: "Tilisi on luotu ja odottaa ylläpitäjän hyväksyntä
 notice_default_data_loaded: Vakio asetusten palautus onnistui.
 
 error_can_t_load_default_data: "Vakio asetuksia ei voitu ladata: %s"
+error_scm_not_found: "Syötettä ja/tai versiota ei löydy säiliöstä."
+error_scm_command_failed: "An error occurred when trying to access the repository: %s"
 
 mail_subject_lost_password: Sinun Redmine salasanasi
 mail_body_lost_password: 'Vaihtaaksesi Redmine salasanasi, paina seuraavaa linkkiä:'
diff --git a/lang/fr.yml b/lang/fr.yml
index 854ed5859..be93da9a1 100644
--- a/lang/fr.yml
+++ b/lang/fr.yml
@@ -79,6 +79,8 @@ notice_account_pending: "Votre compte a été créé et attend l'approbation de
 notice_default_data_loaded: Paramétrage par défaut chargé avec succès.
 
 error_can_t_load_default_data: "Une erreur s'est produite lors du chargement du paramétrage: %s"
+error_scm_not_found: "L'entrée et/ou la révision demandée n'existe pas dans le dépôt."
+error_scm_command_failed: "Une erreur s'est produite lors de l'accès au dépôt: %s"
 
 mail_subject_lost_password: Votre mot de passe redMine
 mail_body_lost_password: 'Pour changer votre mot de passe Redmine, cliquez sur le lien suivant:'
diff --git a/lang/he.yml b/lang/he.yml
index 3e8ad4160..ad3331624 100644
--- a/lang/he.yml
+++ b/lang/he.yml
@@ -68,7 +68,6 @@ notice_successful_delete: מחיקה מוצלחת.
 notice_successful_connection: חיבור מוצלח.
 notice_file_not_found: הדף שאת\ה מנסה לגשת אליו אינו קיים או שהוסר.
 notice_locking_conflict: המידע עודכן על ידי משתמש אחר.
-notice_scm_error: כניסה ו\או גירסא אינם קיימים במאגר.
 notice_not_authorized: אינך מורשה לראות דף זה.
 notice_email_sent: דוא"ל נשלח לכתובת %s
 notice_email_error: ארעה שגיאה בעט שליחת הדוא"ל (%s)
@@ -76,6 +75,9 @@ notice_feeds_access_key_reseted: מפתח ה-RSS שלך אופס.
 notice_failed_to_save_issues: "נכשרת בשמירת %d נושא\ים ב %d נבחרו: %s."
 notice_no_issue_selected: "לא נבחר אף נושא! בחר בבקשה את הנושאים שברצונך לערוך."
 
+error_scm_not_found: כניסה ו\או גירסא אינם קיימים במאגר.
+error_scm_command_failed: "An error occurred when trying to access the repository: %s"
+
 mail_subject_lost_password: סיסמת ה-Redmine שלך
 mail_body_lost_password: 'לשינו סיסמת ה-Redmine שלך,לחץ על הקישור הבא:'
 mail_subject_register: הפעלת חשבון Redmine
diff --git a/lang/it.yml b/lang/it.yml
index ca4b3391a..3b3131211 100644
--- a/lang/it.yml
+++ b/lang/it.yml
@@ -68,12 +68,14 @@ notice_successful_delete: Eliminazione effettuata.
 notice_successful_connection: Connessione effettuata.
 notice_file_not_found: La pagina desiderata non esiste o è stata rimossa.
 notice_locking_conflict: Le informazioni sono state modificate da un altro utente.
-notice_scm_error: La risorsa e/o la versione non esistono nel repository.
 notice_not_authorized: You are not authorized to access this page.
 notice_email_sent: An email was sent to %s
 notice_email_error: An error occurred while sending mail (%s)
 notice_feeds_access_key_reseted: Your RSS access key was reseted.
 
+error_scm_not_found: "La risorsa e/o la versione non esistono nel repository."
+error_scm_command_failed: "An error occurred when trying to access the repository: %s"
+
 mail_subject_lost_password: Password redMine
 mail_body_lost_password: 'Per cambiare la password, usate il seguente collegamento:'
 mail_subject_register: Attivazione utenza redMine
diff --git a/lang/ja.yml b/lang/ja.yml
index 713af6b46..08423c824 100644
--- a/lang/ja.yml
+++ b/lang/ja.yml
@@ -69,12 +69,14 @@ notice_successful_delete: 削除しました。
 notice_successful_connection: 接続しました。
 notice_file_not_found: アクセスしようとしたページは存在しないか削除されています。
 notice_locking_conflict: 別のユーザがデータを更新しています。
-notice_scm_error: リポジトリに、エントリ/リビジョンが存在しません。
 notice_not_authorized: このページにアクセスするには認証が必要です。
 notice_email_sent: %s宛にメールを送信しました。
 notice_email_error: メール送信中にエラーが発生しました(%s)
 notice_feeds_access_key_reseted: RSSアクセスキーを初期化しました。
 
+error_scm_not_found: リポジトリに、エントリ/リビジョンが存在しません。
+error_scm_command_failed: "An error occurred when trying to access the repository: %s"
+
 mail_subject_lost_password: Redmineパスワード
 mail_body_lost_password: 'パスワードを変更するには、以下のリンクをたどってください:'
 mail_subject_register: Redmineアカウントが有効になりました
diff --git a/lang/ko.yml b/lang/ko.yml
index 564e67253..0b556840d 100644
--- a/lang/ko.yml
+++ b/lang/ko.yml
@@ -68,7 +68,6 @@ notice_successful_delete: 삭제 성공.
 notice_successful_connection: 연결 성공.
 notice_file_not_found: 요청하신 페이지는 삭제되었거나 옮겨졌습니다.
 notice_locking_conflict: 다른 사용자에 의해서 데이터가 변경되었습니다.
-notice_scm_error: 소스 저장소에 해당 내용이 존재하지 않습니다.
 notice_not_authorized: 이 페이지에 접근할 권한이 없습니다.
 notice_email_sent: %s 님에게 Email이 발송되었습니다.
 notice_email_error: 메일을 전송하는 과정에 오류가 발생했습니다. (%s)
@@ -76,6 +75,9 @@ notice_feeds_access_key_reseted: RSS에 접근가능한 열쇠(key)가 생성되
 notice_failed_to_save_issues: "Failed to save %d issue(s) on %d selected: %s."
 notice_no_issue_selected: "티켓이 선택되지 않았습니다. 수정하기 원하는 티켓을 선택하세요"
 
+error_scm_not_found: 소스 저장소에 해당 내용이 존재하지 않습니다.
+error_scm_command_failed: "An error occurred when trying to access the repository: %s"
+
 mail_subject_lost_password: 당신의 비밀번호
 mail_body_lost_password: '비밀번호를 변경하기 위해서 링크를 이용하세요'
 mail_subject_register: 당신의 계정 활성화
diff --git a/lang/lt.yml b/lang/lt.yml
index d95da7469..5e8273b91 100644
--- a/lang/lt.yml
+++ b/lang/lt.yml
@@ -68,7 +68,6 @@ notice_successful_delete: Sėkmingas panaikinimas.
 notice_successful_connection: Sėkmingas susijungimas. 
 notice_file_not_found: Puslapis, į kurį ketinate įeiti, neegzistuoja arba pašalintas. 
 notice_locking_conflict: Duomenys atnaujinti kito vartotojo. 
-notice_scm_error: Duomenys ir/ar pakeitimai saugykloje(repozitorojoje) neegzistuoja.
 notice_not_authorized: Jūs neturite teisių gauti prieigą prie šio puslapio. 
 notice_email_sent: Laiškas išsiųstas %s
 notice_email_error: Laiško siųntimo metu įvyko klaida (%s)
@@ -76,7 +75,10 @@ notice_feeds_access_key_reseted: Jūsų RSS raktas buvo atnaujintas.
 notice_failed_to_save_issues: "Nepavyko išsaugoti %d problemos(ų) iš %d pasirinkto: %s."
 notice_no_issue_selected: "Nepasirinkta nė viena problema! Prašom pažymėti problemą, kurią norite redaguoti."
 notice_account_pending: "Jūsų paskyra buvo sukūrta ir dabar laukiama administratoriaus patvirtinimo."
- 
+
+error_scm_not_found: "Duomenys ir/ar pakeitimai saugykloje(repozitorojoje) neegzistuoja."
+error_scm_command_failed: "An error occurred when trying to access the repository: %s"
+
 mail_subject_lost_password: Jūsų Redmine slaptažodis
 mail_body_lost_password: 'Norėdami pakeisti Redmine slaptažodį, spauskite nuorodą:'
 mail_subject_register: 'Redmine paskyros aktyvavymas'
diff --git a/lang/nl.yml b/lang/nl.yml
index 8d29ab902..f81247623 100644
--- a/lang/nl.yml
+++ b/lang/nl.yml
@@ -68,12 +68,14 @@ notice_successful_delete: Verwijderen succesvol.
 notice_successful_connection: Verbinding succesvol.
 notice_file_not_found: De pagina die U probeerde te benaderen bestaat niet of is verwijderd.
 notice_locking_conflict: De gegevens zijn gewijzigd door een andere gebruiker.
-notice_scm_error: Deze ingang of revisie bestaat niet in de repository.
 notice_not_authorized: Het is U niet toegestaan om deze pagina te raadplegen.
 notice_email_sent: An email was sent to %s
 notice_email_error: An error occurred while sending mail (%s)
 notice_feeds_access_key_reseted: Your RSS access key was reseted.
 
+error_scm_not_found: "Deze ingang of revisie bestaat niet in de repository."
+error_scm_command_failed: "An error occurred when trying to access the repository: %s"
+
 mail_subject_lost_password: Uw redMine wachtwoord
 mail_body_lost_password: 'Gebruik de volgende link om Uw wachtwoord te wijzigen:'
 mail_subject_register: redMine account activatie
diff --git a/lang/pl.yml b/lang/pl.yml
index 69bf5306a..ec7eec222 100644
--- a/lang/pl.yml
+++ b/lang/pl.yml
@@ -68,9 +68,11 @@ notice_successful_delete: Udane usunięcie.
 notice_successful_connection: Udane nawiązanie połączenia.
 notice_file_not_found: Strona do której próbujesz się dostać nie istnieje lub została usunięta.
 notice_locking_conflict: Dane poprawione przez innego użytkownika.
-notice_scm_error: Wejście i/lub zmiana nie istnieje w repozytorium.
 notice_not_authorized: Nie jesteś autoryzowany by zobaczyć stronę.
 
+error_scm_not_found: "Wejście i/lub zmiana nie istnieje w repozytorium."
+error_scm_command_failed: "An error occurred when trying to access the repository: %s"
+
 mail_subject_lost_password: Twoje hasło do redMine
 mail_body_lost_password: 'W celu zmiany swojego hasła użyj poniższego odnośnika:'
 mail_subject_register: Aktywacja konta w redMine
diff --git a/lang/pt-br.yml b/lang/pt-br.yml
index 926c913a0..629ca2c38 100644
--- a/lang/pt-br.yml
+++ b/lang/pt-br.yml
@@ -68,12 +68,14 @@ notice_successful_delete: Apagado com sucesso.
 notice_successful_connection: Conectado com sucesso.
 notice_file_not_found: A pagina que voce esta tentando acessar nao existe ou foi excluida.
 notice_locking_conflict: Os dados foram atualizados por um outro usuario.
-notice_scm_error: A entrada e/ou a revisao nao existem no repositorio.
 notice_not_authorized: You are not authorized to access this page.
 notice_email_sent: An email was sent to %s
 notice_email_error: An error occurred while sending mail (%s)
 notice_feeds_access_key_reseted: Your RSS access key was reseted.
 
+error_scm_not_found: "A entrada e/ou a revisao nao existem no repositorio."
+error_scm_command_failed: "An error occurred when trying to access the repository: %s"
+
 mail_subject_lost_password: Sua senha do redMine.
 mail_body_lost_password: 'Para mudar sua senha, clique no link abaixo:'
 mail_subject_register: Ativacao de conta do redMine.
diff --git a/lang/pt.yml b/lang/pt.yml
index 88fd9cf74..8add9b6eb 100644
--- a/lang/pt.yml
+++ b/lang/pt.yml
@@ -68,12 +68,14 @@ notice_successful_delete: Apagado com sucesso.
 notice_successful_connection: Conectado com sucesso.
 notice_file_not_found: A página que você está tentando acessar não existe ou foi excluída.
 notice_locking_conflict: Os dados foram atualizados por um outro usuário.
-notice_scm_error: A entrada e/ou a revisão não existem no repositório.
 notice_not_authorized: Você não está autorizado a acessar esta página.
 notice_email_sent: An email was sent to %s
 notice_email_error: An error occurred while sending mail (%s)
 notice_feeds_access_key_reseted: Your RSS access key was reseted.
 
+error_scm_not_found: "A entrada e/ou a revisão não existem no repositório."
+error_scm_command_failed: "An error occurred when trying to access the repository: %s"
+
 mail_subject_lost_password: Sua senha do redMine.
 mail_body_lost_password: 'Para mudar sua senha, clique no link abaixo:'
 mail_subject_register: Ativação de conta do redMine.
diff --git a/lang/ro.yml b/lang/ro.yml
index 2eb17609c..b5413fdd4 100644
--- a/lang/ro.yml
+++ b/lang/ro.yml
@@ -68,12 +68,14 @@ notice_successful_delete: Stergere cu succes.
 notice_successful_connection: Conectare cu succes.
 notice_file_not_found: Pagina dorita nu exista sau nu mai este valabila.
 notice_locking_conflict: Informatiile au fost modificate de un alt utilizator.
-notice_scm_error: Articolul sau reviziunea nu exista in stoc (Repository).
 notice_not_authorized: Nu aveti autorizatia sa accesati aceasta pagina.
 notice_email_sent: Un e-mail a fost trimis la adresa %s
 notice_email_error: Eroare in trimiterea e-mailului (%s)
 notice_feeds_access_key_reseted: Parola de acces RSS a fost resetat.
 
+error_scm_not_found: "Articolul sau reviziunea nu exista in stoc (Repository)."
+error_scm_command_failed: "An error occurred when trying to access the repository: %s"
+
 mail_subject_lost_password: Your Redmine password
 mail_body_lost_password: 'To change your Redmine password, click on the following link:'
 mail_subject_register: Redmine account activation
diff --git a/lang/ru.yml b/lang/ru.yml
index 62799bdf8..020a888b7 100644
--- a/lang/ru.yml
+++ b/lang/ru.yml
@@ -68,7 +68,6 @@ notice_successful_delete: Удаление успешно завершено.
 notice_successful_connection: Подключение успешно установлено.
 notice_file_not_found: Страница, на которую вы пытаетесь зайти, не существует или удалена.
 notice_locking_conflict: Информация обновлена другим пользователем.
-notice_scm_error: Записи и/или исправления нет в репозитории.
 notice_not_authorized: У вас нет прав для посещения данной страницы.
 notice_email_sent: Отправлено письмо %s
 notice_email_error: Во время отправки письма произошла ошибка (%s)
@@ -76,6 +75,9 @@ notice_feeds_access_key_reseted: Ваш ключ доступа RSS был пе
 notice_failed_to_save_issues: "Не удалось сохранить %d пункт(ов)из %d выбранных: %s."
 notice_no_issue_selected: "Не выбрано ни одной задачи! Пожалуйста, отметьте задачи, которые вы хотите отредактировать."
 
+error_scm_not_found: Записи и/или исправления нет в репозитории.
+error_scm_command_failed: "An error occurred when trying to access the repository: %s"
+
 mail_subject_lost_password: Ваш Redmine пароль
 mail_body_lost_password: 'Для изменения Redmine пароля, зайдите по следующей ссылке:'
 mail_subject_register: Активация учетной записи Redmine
diff --git a/lang/sr.yml b/lang/sr.yml
index 6d88d34ff..0c64ee128 100644
--- a/lang/sr.yml
+++ b/lang/sr.yml
@@ -68,7 +68,6 @@ notice_successful_delete: Uspešno brisanje.
 notice_successful_connection: Uspešna konekcija.
 notice_file_not_found: Stranica kojoj pokušavate da pristupite ne postoji ili je uklonjena.
 notice_locking_conflict: Podaci su izmenjeni od strane drugog korisnika.
-notice_scm_error: Unos i/ili revizija ne postoji u spremištu.
 notice_not_authorized: Niste ovlašćeni da pristupite ovoj stranici.
 notice_email_sent: Email je poslat %s
 notice_email_error: Došlo je do greške pri slanju maila (%s)
@@ -76,6 +75,9 @@ notice_feeds_access_key_reseted: Vaš RSS pristup je resetovan.
 notice_failed_to_save_issues: "Neuspešno snimanje %d kartica na %d izabrano: %s."
 notice_no_issue_selected: "Nijedna kartica nije izabrana! Molim, izaberite kartice koje želite za editujete."
 
+error_scm_not_found: "Unos i/ili revizija ne postoji u spremištu."
+error_scm_command_failed: "An error occurred when trying to access the repository: %s"
+
 mail_subject_lost_password: Vaša redMine lozinka
 mail_body_lost_password: 'Da biste izmenili vašu Redmine lozinku, kliknite na sledeći link:'
 mail_subject_register: aktivacija redMine naloga
diff --git a/lang/sv.yml b/lang/sv.yml
index 5f4a01126..ff199aba4 100644
--- a/lang/sv.yml
+++ b/lang/sv.yml
@@ -68,12 +68,14 @@ notice_successful_delete: Lyckad borttagning.
 notice_successful_connection: Lyckad uppkoppling.
 notice_file_not_found: Sidan du försökte komma åt existerar inte eller har blivit borttagen.
 notice_locking_conflict: Data har uppdaterats av en annan användare.
-notice_scm_error: Inlägg och/eller revision finns inte i repositoriet.
 notice_not_authorized: You are not authorized to access this page.
 notice_email_sent: An email was sent to %s
 notice_email_error: An error occurred while sending mail (%s)
 notice_feeds_access_key_reseted: Your RSS access key was reseted.
 
+error_scm_not_found: "Inlägg och/eller revision finns inte i repositoriet."
+error_scm_command_failed: "An error occurred when trying to access the repository: %s"
+
 mail_subject_lost_password: Ditt redMine lösenord
 mail_body_lost_password: 'För att ändra lösenord, följ denna länk:'
 mail_subject_register: redMine kontoaktivering
diff --git a/lang/zh-tw.yml b/lang/zh-tw.yml
index 2a431266e..21d1e9ead 100644
--- a/lang/zh-tw.yml
+++ b/lang/zh-tw.yml
@@ -68,7 +68,6 @@ notice_successful_delete: 刪除成功
 notice_successful_connection: Successful connection.
 notice_file_not_found: The page you were trying to access doesn't exist or has been removed.
 notice_locking_conflict: Data have been updated by another user.
-notice_scm_error: SCM 儲存庫中找不到這個專案或版本。
 notice_not_authorized: 你未被授權存取此頁面。
 notice_email_sent: 郵件已經成功寄送至以下收件者： %s
 notice_email_error: 寄送郵件的過程中發生錯誤 (%s)
@@ -78,6 +77,9 @@ notice_no_issue_selected: "No issue is selected! Please, check the issues you wa
 notice_account_pending: "您的帳號已經建立，正在等待管理員的審核。"
 notice_default_data_loaded: Default configuration successfully loaded.
 
+error_scm_not_found: SCM 儲存庫中找不到這個專案或版本。
+error_scm_command_failed: "An error occurred when trying to access the repository: %s"
+
 error_can_t_load_default_data: "Default configuration could not be loaded: %s"
 
 mail_subject_lost_password: 您的 Redmine 網站密碼
diff --git a/lang/zh.yml b/lang/zh.yml
index b87a1515d..de7ec093e 100644
--- a/lang/zh.yml
+++ b/lang/zh.yml
@@ -71,12 +71,14 @@ notice_successful_delete: 删除成功
 notice_successful_connection: 连接成功
 notice_file_not_found: 您访问的页面不存在或已被删除。
 notice_locking_conflict: 数据已被另一个用户更新
-notice_scm_error: 在版本库中不存在该条目或修订
 notice_not_authorized: You are not authorized to access this page.
 notice_email_sent: An email was sent to %s
 notice_email_error: An error occurred while sending mail (%s)
 notice_feeds_access_key_reseted: Your RSS access key was reseted.
 
+error_scm_not_found: 在版本库中不存在该条目或修订
+error_scm_command_failed: "An error occurred when trying to access the repository: %s"
+
 mail_subject_lost_password: 您的redMine口令
 mail_body_lost_password: 'To change your Redmine password, click on the following link:'
 mail_subject_register: redMine帐户激活
diff --git a/lib/redmine/scm/adapters/abstract_adapter.rb b/lib/redmine/scm/adapters/abstract_adapter.rb
index 633637ab4..5db4964e9 100644
--- a/lib/redmine/scm/adapters/abstract_adapter.rb
+++ b/lib/redmine/scm/adapters/abstract_adapter.rb
@@ -120,7 +120,7 @@ module Redmine
           rescue Errno::ENOENT => e
             # The command failed, log it and re-raise
             logger.error("SCM command failed: #{cmd}\n  with: #{e.message}")
-            raise CommandFailed
+            raise CommandFailed.new(e.message)
           end
         end  
       end
diff --git a/lib/redmine/scm/adapters/subversion_adapter.rb b/lib/redmine/scm/adapters/subversion_adapter.rb
index f698f4a62..5b6bfa97c 100644
--- a/lib/redmine/scm/adapters/subversion_adapter.rb
+++ b/lib/redmine/scm/adapters/subversion_adapter.rb
@@ -66,7 +66,6 @@ module Redmine
           entries = Entries.new
           cmd = "#{SVN_BIN} list --xml #{target(path)}@#{identifier}"
           cmd << credentials_string
-          cmd << " 2>&1"
           shellout(cmd) do |io|
             output = io.read
             begin

From d54ba39e7aced22dd352273ec4af4b345a827363 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Wed, 23 Jan 2008 17:48:48 +0000
Subject: [PATCH 156/710] Fixed: can not lock a topic when creating it.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1095 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/models/message.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/message.rb b/app/models/message.rb
index 038665cce..12b1cd990 100644
--- a/app/models/message.rb
+++ b/app/models/message.rb
@@ -36,7 +36,7 @@ class Message < ActiveRecord::Base
   
   def validate_on_create
     # Can not reply to a locked topic
-    errors.add_to_base 'Topic is locked' if root.locked?
+    errors.add_to_base 'Topic is locked' if root.locked? && self != root
   end
   
   def after_create

From 2d9e669e8541c591b488283416776378b8f69da9 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Wed, 23 Jan 2008 18:21:42 +0000
Subject: [PATCH 157/710] Added preview for issue notes.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1096 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/issues_controller.rb |  2 +-
 app/views/issues/_update.rhtml       | 14 +++++++++++++-
 app/views/issues/show.rhtml          |  1 -
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index 643a4e0ef..fdece9e1a 100644
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -242,7 +242,7 @@ class IssuesController < ApplicationController
   def preview
     issue = Issue.find_by_id(params[:id])
     @attachements = issue.attachments if issue
-    @text = params[:issue][:description]
+    @text = (params[:issue] ? params[:issue][:description] : nil) || params[:notes]
     render :partial => 'common/preview'
   end
   
diff --git a/app/views/issues/_update.rhtml b/app/views/issues/_update.rhtml
index 3cf593806..49d1473d9 100644
--- a/app/views/issues/_update.rhtml
+++ b/app/views/issues/_update.rhtml
@@ -1,4 +1,6 @@
-<% labelled_tabular_form_for(:issue, @issue, :url => {:action => 'update', :id => @issue}, :html => {:multipart => true}) do |f| %>
+<% labelled_tabular_form_for(:issue, @issue, :url => {:action => 'update', :id => @issue},
+                                             :html => {:multipart => true,
+                                                       :id => 'issue-form'}) do |f| %>
 
 <div class="box">
 <% unless @status_options.empty? %>
@@ -39,4 +41,14 @@
 </div>
 
 <%= submit_tag l(:button_submit) %>
+<%= link_to_remote l(:label_preview), 
+                   { :url => { :controller => 'issues', :action => 'preview', :id => @issue },
+                     :method => 'post',
+                     :update => 'preview',
+                     :with => "Form.serialize('issue-form')",
+                     :complete => "window.location.hash='preview'"
+                   }, :accesskey => accesskey(:preview) %> |
+<%= toggle_link l(:button_cancel), 'update' %>
 <% end %>
+
+<div id="preview" class="wiki"></div>
diff --git a/app/views/issues/show.rhtml b/app/views/issues/show.rhtml
index 45423a2e0..d29b1b88f 100644
--- a/app/views/issues/show.rhtml
+++ b/app/views/issues/show.rhtml
@@ -94,7 +94,6 @@ end %>
   <div id="update" style="display:none;">
   <h3><%= l(:button_update) %></h3>
   <%= render :partial => 'update' %>
-  <%= toggle_link l(:button_cancel), 'update' %>
   </div>
 <% end %>
 

From d8ac6d2b79397ef8414b82164849f23cae2df5f1 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Wed, 23 Jan 2008 19:58:11 +0000
Subject: [PATCH 158/710] Issue properties below the description textarea.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1097 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/issues/_form.rhtml               | 19 +++++++++++--------
 app/views/issues/_form_custom_fields.rhtml |  2 +-
 app/views/issues/new.rhtml                 |  2 +-
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/app/views/issues/_form.rhtml b/app/views/issues/_form.rhtml
index 0f5e10de9..d11cea84c 100644
--- a/app/views/issues/_form.rhtml
+++ b/app/views/issues/_form.rhtml
@@ -8,6 +8,13 @@
                                      :with => "Form.serialize('issue-form')" %>
 <% end %>
 
+<p><%= f.text_field :subject, :size => 80, :required => true %></p>
+<p><%= f.text_area :description, :required => true,
+                   :cols => 60,
+                   :rows => (@issue.description.blank? ? 10 : [[10, @issue.description.length / 50].max, 100].min),
+                   :accesskey => accesskey(:edit),
+                   :class => 'wiki-edit' %></p>
+
 <div class="splitcontentleft">
 <% if @issue.new_record? %>
 <p><%= f.select :status_id, (@allowed_statuses.collect {|p| [p.name, p.id]}), :required => true %></p>
@@ -22,6 +29,9 @@
                      l(:label_issue_category_new), 'category[name]', 
                      {:controller => 'projects', :action => 'add_issue_category', :id => @project},
                      :class => 'small', :tabindex => 199) if authorize_for('projects', 'add_issue_category') %></p>
+<%= content_tag('p', f.select(:fixed_version_id, 
+                              (@project.versions.sort.collect {|v| [v.name, v.id]}),
+                              { :include_blank => true })) unless @project.versions.empty? %>
 </div>
 
 <div class="splitcontentright">
@@ -31,14 +41,7 @@
 <p><%= f.select :done_ratio, ((0..10).to_a.collect {|r| ["#{r*10} %", r*10] }) %></p>
 </div>
 
-<p><%= f.text_field :subject, :size => 80, :required => true %></p>
-<p><%= f.text_area :description, :required => true,
-                   :cols => 60,
-                   :rows => (@issue.description.blank? ? 10 : [[10, @issue.description.length / 50].max, 100].min),
-                   :accesskey => accesskey(:edit),
-                   :class => 'wiki-edit' %></p>
-<p><%= f.select :fixed_version_id, (@project.versions.sort.collect {|v| [v.name, v.id]}), { :include_blank => true } %></p>
-
+<div style="clear:both;"> </div>
 <%= render :partial => 'form_custom_fields', :locals => {:values => @custom_values} %>
 
 <% if @issue.new_record? %>
diff --git a/app/views/issues/_form_custom_fields.rhtml b/app/views/issues/_form_custom_fields.rhtml
index e5a98e30e..1268bb1f9 100644
--- a/app/views/issues/_form_custom_fields.rhtml
+++ b/app/views/issues/_form_custom_fields.rhtml
@@ -2,7 +2,7 @@
 <% i = 1 %>
 <% for @custom_value in values %>
 	<p><%= custom_field_tag_with_label @custom_value %></p>
-    <% if i >= values.size / 2 %>
+    <% if i == values.size / 2 %>
 </div><div class="splitcontentright">
     <% end %>
     <% i += 1 %>
diff --git a/app/views/issues/new.rhtml b/app/views/issues/new.rhtml
index 4fedc6895..8ff07f226 100644
--- a/app/views/issues/new.rhtml
+++ b/app/views/issues/new.rhtml
@@ -1,4 +1,4 @@
-<h2><%=l(:label_issue_new)%>: <%= @issue.tracker %></h2>
+<h2><%=l(:label_issue_new)%></h2>
 
 <% labelled_tabular_form_for :issue, @issue, 
                              :html => {:multipart => true, :id => 'issue-form'} do |f| %>

From 2247700f24ae6858ace3de11ea88ec45f43d5dd7 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Wed, 23 Jan 2008 20:07:17 +0000
Subject: [PATCH 159/710] Fixed: Incorrect filtering for unset values when
 using 'is not' filter.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1098 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/models/query.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/query.rb b/app/models/query.rb
index 3a1b5a19e..adfd5f42a 100644
--- a/app/models/query.rb
+++ b/app/models/query.rb
@@ -300,7 +300,7 @@ class Query < ActiveRecord::Base
       when "="
         sql = sql + "#{db_table}.#{db_field} IN (" + v.collect{|val| "'#{connection.quote_string(val)}'"}.join(",") + ")"
       when "!"
-        sql = sql + "#{db_table}.#{db_field} NOT IN (" + v.collect{|val| "'#{connection.quote_string(val)}'"}.join(",") + ")"
+        sql = sql + "(#{db_table}.#{db_field} IS NULL OR #{db_table}.#{db_field} NOT IN (" + v.collect{|val| "'#{connection.quote_string(val)}'"}.join(",") + "))"
       when "!*"
         sql = sql + "#{db_table}.#{db_field} IS NULL"
       when "*"

From b0f3de5c3b75c6e69ff5df31eac9f12c6cce064e Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Wed, 23 Jan 2008 22:19:24 +0000
Subject: [PATCH 160/710] Fixed: PostgreSQL issues_seq_id not updated when
 using Trac importer.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1099 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 lib/tasks/migrate_from_trac.rake | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/lib/tasks/migrate_from_trac.rake b/lib/tasks/migrate_from_trac.rake
index 828027b87..63a719b35 100644
--- a/lib/tasks/migrate_from_trac.rake
+++ b/lib/tasks/migrate_from_trac.rake
@@ -372,6 +372,17 @@ namespace :redmine do
               migrated_custom_values += 1
         	end
         end
+        
+        # update issue id sequence if needed
+        begin
+          case ActiveRecord::Base.connection.adapter_name.downcase
+          when 'mysql'
+            # nothing to do
+          when 'postgresql'
+            sql = "SELECT setval('#{Issue.table_name}_id_seq', (SELECT MAX(id) FROM #{Issue.table_name}))"
+            ActiveRecord::Base.connection.execute(sql)
+          end
+        end
         puts
         
         # Wiki      
@@ -478,7 +489,7 @@ namespace :redmine do
         if !project
           # create the target project
           project = Project.new :name => identifier.humanize,
-                                :description => identifier.humanize
+                                :description => ''
           project.identifier = identifier
           puts "Unable to create a project with identifier '#{identifier}'!" unless project.save
           # enable issues and wiki for the created project

From 7a1e928b8db0cc0a584011973042522cd7b38d4d Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Wed, 23 Jan 2008 22:31:26 +0000
Subject: [PATCH 161/710] Mantis importer: * do not truncate projects
 descriptions * encode attachment filenames to utf8

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1100 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 lib/tasks/migrate_from_mantis.rake | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/lib/tasks/migrate_from_mantis.rake b/lib/tasks/migrate_from_mantis.rake
index 6d8d55e7c..36e7e1514 100644
--- a/lib/tasks/migrate_from_mantis.rake
+++ b/lib/tasks/migrate_from_mantis.rake
@@ -118,10 +118,6 @@ task :migrate_from_mantis => :environment do
         read_attribute(:name)[0..29]
       end
       
-      def description
-        read_attribute(:description).blank? ? read_attribute(:name) : read_attribute(:description)[0..254]
-      end
-      
       def identifier
         read_attribute(:name).underscore[0..19].gsub(/[^a-z0-9\-]/, '-')
       end
@@ -186,7 +182,7 @@ task :migrate_from_mantis => :environment do
       end
       
       def original_filename
-        filename
+        MantisMigrate.encode(filename)
       end
       
       def content_type
@@ -445,7 +441,6 @@ task :migrate_from_mantis => :environment do
       end
     end
     
-  private
     def self.encode(text)
       @ic.iconv text
     rescue

From e13f49d91951a82d9989c2a0f0c4981832f2664f Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Thu, 24 Jan 2008 18:15:38 +0000
Subject: [PATCH 162/710] Prevent unexpected nil in custom value validation.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1101 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/models/custom_value.rb     | 31 ++++++++------
 test/unit/custom_value_test.rb | 74 +++++++++++++++++++++++++++++++++-
 2 files changed, 91 insertions(+), 14 deletions(-)

diff --git a/app/models/custom_value.rb b/app/models/custom_value.rb
index 94b797bcc..98ce6b168 100644
--- a/app/models/custom_value.rb
+++ b/app/models/custom_value.rb
@@ -27,19 +27,24 @@ class CustomValue < ActiveRecord::Base
   
 protected
   def validate
-    errors.add(:value, :activerecord_error_blank) and return if custom_field.is_required? and value.blank?    
-    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
-    when 'int'
-      errors.add(:value, :activerecord_error_not_a_number) unless value.blank? || value =~ /^[+-]?\d+$/	
-    when 'float'
-      begin; !value.blank? && Kernel.Float(value); rescue; errors.add(:value, :activerecord_error_invalid) end
-    when 'date'
-      errors.add(:value, :activerecord_error_not_a_date) unless value =~ /^\d{4}-\d{2}-\d{2}$/ or value.blank?
-    when 'list'
-      errors.add(:value, :activerecord_error_inclusion) unless custom_field.possible_values.include?(value) or value.blank?
+    if value.blank?
+      errors.add(:value, :activerecord_error_blank) if custom_field.is_required? and value.blank?    
+    else
+      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
+      errors.add(:value, :activerecord_error_too_long) if custom_field.max_length > 0 and value.length > custom_field.max_length
+    
+      # Format specific validations
+      case custom_field.field_format
+      when 'int'
+        errors.add(:value, :activerecord_error_not_a_number) unless value =~ /^[+-]?\d+$/	
+      when 'float'
+        begin; Kernel.Float(value); rescue; errors.add(:value, :activerecord_error_invalid) end
+      when 'date'
+        errors.add(:value, :activerecord_error_not_a_date) unless value =~ /^\d{4}-\d{2}-\d{2}$/
+      when 'list'
+        errors.add(:value, :activerecord_error_inclusion) unless custom_field.possible_values.include?(value)
+      end
     end
   end
 end
diff --git a/test/unit/custom_value_test.rb b/test/unit/custom_value_test.rb
index 4d488bae2..11578ae6b 100644
--- a/test/unit/custom_value_test.rb
+++ b/test/unit/custom_value_test.rb
@@ -20,7 +20,79 @@ require File.dirname(__FILE__) + '/../test_helper'
 class CustomValueTest < Test::Unit::TestCase
   fixtures :custom_fields
 
-  def test_float_field
+  def test_string_field_validation_with_blank_value
+    f = CustomField.new(:field_format => 'string')
+    v = CustomValue.new(:custom_field => f)
+    
+    v.value = nil
+    assert v.valid?
+    v.value = ''
+    assert v.valid?
+
+    f.is_required = true
+    v.value = nil
+    assert !v.valid?
+    v.value = ''
+    assert !v.valid?
+  end
+  
+  def test_string_field_validation_with_min_and_max_lengths
+    f = CustomField.new(:field_format => 'string', :min_length => 2, :max_length => 5)
+    v = CustomValue.new(:custom_field => f, :value => '')
+    assert v.valid?
+    v.value = 'a'
+    assert !v.valid?
+    v.value = 'a' * 2
+    assert v.valid?
+    v.value = 'a' * 6
+    assert !v.valid?
+  end
+  
+  def test_string_field_validation_with_regexp
+    f = CustomField.new(:field_format => 'string', :regexp => '^[A-Z0-9]*$')
+    v = CustomValue.new(:custom_field => f, :value => '')
+    assert v.valid?
+    v.value = 'abc'
+    assert !v.valid?
+    v.value = 'ABC'
+    assert v.valid?
+  end
+
+  def test_date_field_validation
+    f = CustomField.new(:field_format => 'date')
+    v = CustomValue.new(:custom_field => f, :value => '')
+    assert v.valid?
+    v.value = 'abc'
+    assert !v.valid?
+    v.value = '1975-07-14'
+    assert v.valid?
+  end
+
+  def test_list_field_validation
+    f = CustomField.new(:field_format => 'list', :possible_values => ['value1', 'value2'])
+    v = CustomValue.new(:custom_field => f, :value => '')
+    assert v.valid?
+    v.value = 'abc'
+    assert !v.valid?
+    v.value = 'value2'
+    assert v.valid?
+  end
+
+  def test_int_field_validation
+    f = CustomField.new(:field_format => 'int')
+    v = CustomValue.new(:custom_field => f, :value => '')
+    assert v.valid?
+    v.value = 'abc'
+    assert !v.valid?
+    v.value = '123'
+    assert v.valid?
+    v.value = '+123'
+    assert v.valid?
+    v.value = '-123'
+    assert v.valid?
+  end
+  
+  def test_float_field_validation
     v = CustomValue.new(:customized => User.find(:first), :custom_field => UserCustomField.find_by_name('Money'))
     v.value = '11.2'
     assert v.save

From 3d5d1a38e3d48e1fda7eee751563cbf8c3b0f00b Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Thu, 24 Jan 2008 18:31:02 +0000
Subject: [PATCH 163/710] =?UTF-8?q?Translations=20updates:=20*=20Russian?=
 =?UTF-8?q?=20(Michael=20Pirogov)=20*=20Finnish=20(Antti=20Perki=C3=B6m?=
 =?UTF-8?q?=C3=A4ki)=20*=20Traditional=20Chinese=20wiki=20toolbar=20(Short?=
 =?UTF-8?q?ie=20Lo)=20*=20German=20wiki=20toolbar=20(Thomas=20L=C3=B6ber)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1102 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 lang/fi.yml                                   |  2 +-
 lang/ru.yml                                   | 97 ++++++++++---------
 .../jstoolbar/lang/jstoolbar-de.js            | 28 +++---
 .../jstoolbar/lang/jstoolbar-zh-tw.js         | 28 +++---
 4 files changed, 79 insertions(+), 76 deletions(-)

diff --git a/lang/fi.yml b/lang/fi.yml
index eeba20c35..d70cf396a 100644
--- a/lang/fi.yml
+++ b/lang/fi.yml
@@ -568,4 +568,4 @@ default_activity_development: Kehitys
 enumeration_issue_priorities: Tapahtuman prioriteetit
 enumeration_doc_categories: Dokumentin luokat
 enumeration_activities: Aktiviteetit (ajan seuranta)
-label_associated_revisions: Associated revisions
+label_associated_revisions: Liittyvät versiot
diff --git a/lang/ru.yml b/lang/ru.yml
index 020a888b7..6636ed56f 100644
--- a/lang/ru.yml
+++ b/lang/ru.yml
@@ -74,8 +74,10 @@ notice_email_error: Во время отправки письма произош
 notice_feeds_access_key_reseted: Ваш ключ доступа RSS был перезапущен.
 notice_failed_to_save_issues: "Не удалось сохранить %d пункт(ов)из %d выбранных: %s."
 notice_no_issue_selected: "Не выбрано ни одной задачи! Пожалуйста, отметьте задачи, которые вы хотите отредактировать."
+notice_account_pending: "Ваша учетная запись уже создан и ожидает подтверждения администратора."
+notice_default_data_loaded: Была загружена конфигурация по-умолчанию.
 
-error_scm_not_found: Записи и/или исправления нет в репозитории.
+error_scm_not_found: Хранилилище не содержит записи и/или исправления.
 error_scm_command_failed: "An error occurred when trying to access the repository: %s"
 
 mail_subject_lost_password: Ваш Redmine пароль
@@ -84,6 +86,9 @@ mail_subject_register: Активация учетной записи Redmine
 mail_body_register: 'Для активации учетной записи Redmine, зайдите по следующей ссылке:'
 mail_body_account_information_external: Вы можете использовать вашу "%s" учетную запись для входа в Redmine.
 mail_body_account_information: Информация по Вашей учетной записи Redmine
+mail_subject_account_activation_request: Запрос на активацию пользователя в системе Redmine
+mail_body_account_activation_request: 'Новый пользователь (%s) зарегистрирован. Учетная запись ожидает вашего утверждения:'
+
 
 gui_validation_error: 1 ошибка
 gui_validation_error_plural: %d ошибки(ок)
@@ -126,7 +131,7 @@ field_user: Пользователь
 field_role: Роль
 field_homepage: Стартовая страница
 field_is_public: Публичный
-field_parent: Подпроект 
+field_parent: Родительский проект 
 field_is_in_chlog: Задачи, отображаемые в журнале изменений
 field_is_in_roadmap: Задачи, отображаемые в оперативном плане
 field_login: Вход
@@ -168,7 +173,9 @@ field_assignable: Задача может быть назначена этой 
 field_redirect_existing_links: Перенаправить существующие ссылки
 field_estimated_hours: Оцененное время
 field_column_names: Колонки
-field_default_value: Default value
+field_default_value: Значение по умолчанию 
+field_time_zone: Часовой пояс
+field_searchable: Доступно для поиска 
 
 setting_app_title: Название приложения
 setting_app_subtitle: Подзаголовок приложения 
@@ -182,9 +189,9 @@ setting_mail_from: email адрес для передачи информации
 setting_host_name: Имя компьютера
 setting_text_formatting: Форматирование текста
 setting_wiki_compression: Сжатие истории Wiki
-setting_feeds_limit: Ограничения вводимого содержания
-setting_autofetch_changesets: Автоматически следить за коммитами
-setting_sys_api_enabled: Разрешить WS для управления репозиторием
+setting_feeds_limit: Ограничение кол-ва заголовков для RSS потока
+setting_autofetch_changesets: Автоматически следить за изменениями хранилища
+setting_sys_api_enabled: Разрешить WS для управления хранилищем
 setting_commit_ref_keywords: Ключевые слова для поиска
 setting_commit_fix_keywords: Назначение ключевых слов
 setting_autologin: Автоматический вход
@@ -192,9 +199,11 @@ setting_date_format: Формат даты
 setting_time_format: Формат времени 
 setting_cross_project_issue_relations: Разрешить пересечение задач по проектам
 setting_issue_list_default_columns: Колонки, отображаемые в списке задач по умолчанию
-setting_repositories_encodings: Кодировки репозитория
+setting_repositories_encodings: Кодировки хранилища
 setting_emails_footer: Подстрочные примечания Emailов
 setting_protocol: Протокол
+setting_bcc_recipients: Использовать скрытые списки (bcc)
+setting_per_page_options: Кол-во строк на страницу
 
 label_user: Пользователь
 label_user_plural: Пользователи
@@ -246,7 +255,7 @@ label_administration: Администрирование
 label_login: Войти
 label_logout: Выйти
 label_help: Помощь
-label_reported_issues: Созданые задачи
+label_reported_issues: Созданные задачи
 label_assigned_to_me_issues: Мои задачи
 label_last_login: Последнее подключение
 label_last_updates: Последнее обновление
@@ -261,7 +270,7 @@ label_auth_source: Режим аутентификации
 label_auth_source_new: Новый режим аутентификации
 label_auth_source_plural: Режимы аутентификации
 label_subproject_plural: Подпроекты
-label_min_max_length: Min - Максимальная длина
+label_min_max_length: Минимальная - Максимальная длина
 label_list: Список
 label_date: Дата
 label_integer: Целый
@@ -333,7 +342,7 @@ label_filter_add: Добавить фильтр
 label_filter_plural: Фильтры
 label_equals: есть
 label_not_equals: нет
-label_in_less_than: менее чем
+label_in_less_than: Менее чем
 label_in_more_than: более чем
 label_in: в
 label_today: сегодня
@@ -344,18 +353,18 @@ label_ago: дней(я) назад
 label_contains: содержит
 label_not_contains: не содержит
 label_day_plural: дней(я)
-label_repository: Репозиторий
+label_repository: Хранилище
 label_browse: Искать
 label_modification: %d изменение
 label_modification_plural: %d изменений
-label_revision: Версия
-label_revision_plural: Версии
+label_revision: Редакция
+label_revision_plural: Редакции
 label_added: добавлено
 label_modified: изменено
 label_deleted: удалено
-label_latest_revision: Последняя версия
-label_latest_revision_plural: Последние версии
-label_view_revisions: Просмотреть версии
+label_latest_revision: Последняя редакция
+label_latest_revision_plural: Последние редакции
+label_view_revisions: Просмотреть редакции
 label_max_size: Максимальный размер
 label_on: 'из'
 label_sort_highest: В начало
@@ -385,12 +394,12 @@ label_spent_time: Затраченное время
 label_f_hour: %.2f час
 label_f_hour_plural: %.2f часов(а)
 label_time_tracking: Учет времени
-label_change_plural: Изменения
+label_change_plural: Правки
 label_statistics: Статистика
-label_commits_per_month: Коммиты на месяц
-label_commits_per_author: Коммиты на пользователя
+label_commits_per_month: Изменений в месяц
+label_commits_per_author: Изменений на пользователя
 label_view_diff: Просмотреть отличия
-label_diff_inline: подключенный
+label_diff_inline: вставкой
 label_diff_side_by_side: рядом
 label_options: Опции
 label_copy_workflow_from: Скопировать последовательность действий из 
@@ -402,7 +411,7 @@ label_loading: Загрузка...
 label_relation_new: Новое отношение
 label_relation_delete: Удалить связь
 label_relates_to: связана с
-label_duplicates: дублицирует
+label_duplicates: дублирует
 label_blocks: блокирует 
 label_blocked_by: заблокировано 
 label_precedes: предшествует
@@ -449,6 +458,16 @@ label_user_mail_option_all: "Для всех событий во всех мои
 label_user_mail_option_selected: "Для всех событий только в выбранном проекте..."
 label_user_mail_option_none: "Только для того, что я просматриваю или в чем я участвую"
 label_user_mail_no_self_notified: "Не извещать об изменениях которые я сделал сам"
+label_registration_activation_by_email: активация учетных записей по email
+label_registration_automatic_activation: автоматическая активация учтеных записей
+label_registration_manual_activation: активировать учетные записи вручную
+label_age: Возраст 
+label_change_properties: Изменить свойства
+label_general: Общее
+label_repository_plural: Хранилища
+label_associated_revisions: Связанные редакции
+label_issues_by: Сортировать по %s
+label_display_per_page: 'На страницу: %s'
 
 button_login: Вход
 button_submit: Принять
@@ -484,13 +503,15 @@ button_reset: Перезапустить
 button_rename: Переименовать
 button_change_password: Изменить пароль
 button_copy: Копировать
+button_annotate: Авторство
+button_update: Обновить
 
 status_active: Активен
 status_registered: Зарегистрирован
 status_locked: Закрыт
 
 text_select_mail_notifications: Выберите действия, на которые будет отсылаться уведомление на электронную почту.
-text_regexp_info: eg. ^[A-Z0-9]+$
+text_regexp_info: напр. ^[A-Z0-9]+$
 text_min_max_length_info: 0 означает отсутствие запретов
 text_project_destroy_confirmation: Вы настаиваете на удалении данного проекта и всей относящейся к нему информации?
 text_workflow_edit: Выберите роль и трекер для редактирования последовательности состояний
@@ -514,12 +535,15 @@ text_wiki_destroy_confirmation: Вы уверены, что хотите уда
 text_issue_category_destroy_question: Несколько задач (%d) назначено в данную категорию. Что вы хотите предпринять?
 text_issue_category_destroy_assignments: Удалить назначения категории
 text_issue_category_reassign_to: Переназначить задачи для данной категории
-text_user_mail_option: "Для невыбранных проектов, вы будете получать уведомления только о том что просматриваете или в чем участвуете (например, вопросы автором которых вы являетесь или которые вам назначенАы)."
+text_user_mail_option: "Для невыбранных проектов, вы будете получать уведомления только о том что просматриваете или в чем участвуете (например, вопросы автором которых вы являетесь или которые вам назначены)."
+text_caracters_minimum: Должно быть не менее %d знаков.
+text_load_default_configuration: Загрузить конфигурацию по-умолчанию
+text_no_configuration_data: "Роли, трекеры, статусы задач и оперативный план не были сконфигурированы.\nНастоятельно рекомендуется загрузить конфигурацию по-умолчанию. Вы сможете её изменить потом."
 
 default_role_manager: Менеджер
 default_role_developper: Разработчик
 default_role_reporter: Генератор отчетов
-default_tracker_bug: Bug Ошибка
+default_tracker_bug: Ошибка
 default_tracker_feature: Характеристика
 default_tracker_support: Поддержка
 default_issue_status_new: Новый
@@ -537,30 +561,9 @@ default_priority_urgent: Срочный
 default_priority_immediate: Немедленный
 default_activity_design: Проектирование
 default_activity_development: Разработка
+
 enumeration_issue_priorities: Приоритеты задач
 enumeration_doc_categories: Категории документов
 enumeration_activities: Действия (учет времени)
-label_registration_activation_by_email: активация аккаунтов по email
-mail_subject_account_activation_request: Запрос на активацию пользователя в системе Redmine
-mail_body_account_activation_request: 'Новый пользователь (%s) зарегистирован. Аккаунт ожидает вашего утверждения:'
-label_registration_automatic_activation: автоматическая активация аккаунтов
-label_registration_manual_activation: активировать аккаунты вручную
-notice_account_pending: "Ваш аккаунт уже создан и ожидает подтверждения администратора."
-field_time_zone: Часовой пояс
-text_caracters_minimum: Должно быть не менее %d знаков.
-setting_bcc_recipients: Использовать скрытые списки (bcc)
-button_annotate: Авторство
-label_issues_by: Сортировать по %s
-field_searchable: Доступно для поиска 
-label_display_per_page: 'На страницу: %s'
-setting_per_page_options: Кол-во строк на страницу
-label_age: Возраст 
-notice_default_data_loaded: Была загружена конфигурация по-умолчанию.
-text_load_default_configuration: Загрузить конфигурацию по-умолчанию
-text_no_configuration_data: "Роли, трекеры, статусы задач и оперативный план не были сконфигурированны.\nНастоятельно рекомендуется загрузить конфигурацию по-умолчанию. Вы сможете её изменить потом."
+
 error_can_t_load_default_data: "Конфигурация по умолчанию не была загружена: %s"
-button_update: Обновить
-label_change_properties: Изменить свойства
-label_general: Общее
-label_repository_plural: Репозитории
-label_associated_revisions: Associated revisions
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-de.js b/public/javascripts/jstoolbar/lang/jstoolbar-de.js
index 72bab0be3..0c7a8799e 100644
--- a/public/javascripts/jstoolbar/lang/jstoolbar-de.js
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-de.js
@@ -1,15 +1,15 @@
 jsToolBar.strings = {};
-jsToolBar.strings['Strong'] = 'Strong';
-jsToolBar.strings['Italic'] = 'Italic';
-jsToolBar.strings['Underline'] = 'Underline';
-jsToolBar.strings['Deleted'] = 'Deleted';
-jsToolBar.strings['Inline quote'] = 'Inline quote';
-jsToolBar.strings['Code'] = 'Code';
-jsToolBar.strings['Heading 1'] = 'Heading 1';
-jsToolBar.strings['Heading 2'] = 'Heading 2';
-jsToolBar.strings['Heading 3'] = 'Heading 3';
-jsToolBar.strings['Unordered list'] = 'Unordered list';
-jsToolBar.strings['Ordered list'] = 'Ordered list';
-jsToolBar.strings['Preformatted text'] = 'Preformatted text';
-jsToolBar.strings['Wiki link'] = 'Link to a Wiki page';
-jsToolBar.strings['Image'] = 'Image';
+jsToolBar.strings['Strong'] = 'Fett';
+jsToolBar.strings['Italic'] = 'Kursiv';
+jsToolBar.strings['Underline'] = 'Unterstrichen';
+jsToolBar.strings['Deleted'] = 'Durchgestrichen';
+jsToolBar.strings['Inline quote'] = 'Inline-Zitat';
+jsToolBar.strings['Code'] = 'Quelltext';
+jsToolBar.strings['Heading 1'] = 'Überschrift 1. Ordnung';
+jsToolBar.strings['Heading 2'] = 'Überschrift 2. Ordnung';
+jsToolBar.strings['Heading 3'] = 'Überschrift 3. Ordnung';
+jsToolBar.strings['Unordered list'] = 'Aufzählungsliste';
+jsToolBar.strings['Ordered list'] = 'Nummerierte Liste';
+jsToolBar.strings['Preformatted text'] = 'Präformatierter Text';
+jsToolBar.strings['Wiki link'] = 'Verweis (Link) zu einer Wiki-Seite';
+jsToolBar.strings['Image'] = 'Grafik';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-zh-tw.js b/public/javascripts/jstoolbar/lang/jstoolbar-zh-tw.js
index 72bab0be3..7e795ec6d 100644
--- a/public/javascripts/jstoolbar/lang/jstoolbar-zh-tw.js
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-zh-tw.js
@@ -1,15 +1,15 @@
 jsToolBar.strings = {};
-jsToolBar.strings['Strong'] = 'Strong';
-jsToolBar.strings['Italic'] = 'Italic';
-jsToolBar.strings['Underline'] = 'Underline';
-jsToolBar.strings['Deleted'] = 'Deleted';
-jsToolBar.strings['Inline quote'] = 'Inline quote';
-jsToolBar.strings['Code'] = 'Code';
-jsToolBar.strings['Heading 1'] = 'Heading 1';
-jsToolBar.strings['Heading 2'] = 'Heading 2';
-jsToolBar.strings['Heading 3'] = 'Heading 3';
-jsToolBar.strings['Unordered list'] = 'Unordered list';
-jsToolBar.strings['Ordered list'] = 'Ordered list';
-jsToolBar.strings['Preformatted text'] = 'Preformatted text';
-jsToolBar.strings['Wiki link'] = 'Link to a Wiki page';
-jsToolBar.strings['Image'] = 'Image';
+jsToolBar.strings['Strong'] = '粗體';
+jsToolBar.strings['Italic'] = '斜體';
+jsToolBar.strings['Underline'] = '底線';
+jsToolBar.strings['Deleted'] = '刪除線';
+jsToolBar.strings['Inline quote'] = '內嵌引文';
+jsToolBar.strings['Code'] = '程式碼';
+jsToolBar.strings['Heading 1'] = '標題 1';
+jsToolBar.strings['Heading 2'] = '標題 2';
+jsToolBar.strings['Heading 3'] = '標題 3';
+jsToolBar.strings['Unordered list'] = '項目清單';
+jsToolBar.strings['Ordered list'] = '編號清單';
+jsToolBar.strings['Preformatted text'] = '格式化文字';
+jsToolBar.strings['Wiki link'] = '連結至 Wiki 頁面';
+jsToolBar.strings['Image'] = '圖片';

From 79f92a675af528ecbe5abcc15b9c98805c9c7315 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Fri, 25 Jan 2008 10:31:06 +0000
Subject: [PATCH 164/710] User display format is now configurable in
 administration settings.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1103 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/settings_controller.rb     |  3 +++
 app/models/member.rb                       |  4 ++++
 app/models/setting.rb                      |  3 ++-
 app/models/user.rb                         | 21 ++++++++++++++++++---
 app/views/projects/settings/_members.rhtml |  4 ++--
 app/views/settings/_general.rhtml          |  3 +++
 config/settings.yml                        |  3 +++
 lang/bg.yml                                |  1 +
 lang/cs.yml                                |  1 +
 lang/de.yml                                |  1 +
 lang/en.yml                                |  1 +
 lang/es.yml                                |  1 +
 lang/fi.yml                                |  1 +
 lang/fr.yml                                |  1 +
 lang/he.yml                                |  1 +
 lang/it.yml                                |  1 +
 lang/ja.yml                                |  1 +
 lang/ko.yml                                |  1 +
 lang/lt.yml                                |  1 +
 lang/nl.yml                                |  1 +
 lang/pl.yml                                |  1 +
 lang/pt-br.yml                             |  1 +
 lang/pt.yml                                |  1 +
 lang/ro.yml                                |  1 +
 lang/ru.yml                                |  1 +
 lang/sr.yml                                |  1 +
 lang/sv.yml                                |  1 +
 lang/zh-tw.yml                             |  1 +
 lang/zh.yml                                |  1 +
 test/unit/user_test.rb                     |  8 ++++++++
 30 files changed, 65 insertions(+), 6 deletions(-)

diff --git a/app/controllers/settings_controller.rb b/app/controllers/settings_controller.rb
index c5fae2a16..c7c8751dd 100644
--- a/app/controllers/settings_controller.rb
+++ b/app/controllers/settings_controller.rb
@@ -35,7 +35,10 @@ class SettingsController < ApplicationController
       end
       flash[:notice] = l(:notice_successful_update)
       redirect_to :action => 'edit', :tab => params[:tab]
+      return
     end
+    @options = {}
+    @options[:user_format] = User::USER_FORMATS.keys.collect {|f| [User.current.name(f), f.to_s] }
   end
   
   def plugin
diff --git a/app/models/member.rb b/app/models/member.rb
index 0d0540690..b4617c229 100644
--- a/app/models/member.rb
+++ b/app/models/member.rb
@@ -31,6 +31,10 @@ class Member < ActiveRecord::Base
     self.user.name
   end
   
+  def <=>(member)
+    role == member.role ? (user <=> member.user) : (role <=> member.role)
+  end
+  
   def before_destroy
     # remove category based auto assignments for this member
     IssueCategory.update_all "assigned_to_id = NULL", ["project_id = ? AND assigned_to_id = ?", project.id, user.id]
diff --git a/app/models/setting.rb b/app/models/setting.rb
index 46b6d76ce..185991d9b 100644
--- a/app/models/setting.rb
+++ b/app/models/setting.rb
@@ -53,12 +53,13 @@ class Setting < ActiveRecord::Base
     v = read_attribute(:value)
     # Unserialize serialized settings
     v = YAML::load(v) if @@available_settings[name]['serialized'] && v.is_a?(String)
+    v = v.to_sym if @@available_settings[name]['format'] == 'symbol' && !v.blank?
     v
   end
   
   def value=(v)
     v = v.to_yaml if v && @@available_settings[name]['serialized']
-    write_attribute(:value, v)
+    write_attribute(:value, v.to_s)
   end
   
   # Returns the value of the setting named name
diff --git a/app/models/user.rb b/app/models/user.rb
index 906420ed4..22d66539d 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -23,6 +23,14 @@ class User < ActiveRecord::Base
   STATUS_ACTIVE     = 1
   STATUS_REGISTERED = 2
   STATUS_LOCKED     = 3
+  
+  USER_FORMATS = {
+    :firstname_lastname => '#{firstname} #{lastname}',
+    :firstname => '#{firstname}',
+    :lastname_firstname => '#{lastname} #{firstname}',
+    :lastname_coma_firstname => '#{lastname}, #{firstname}',
+    :username => '#{login}'
+  }
 
   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
@@ -107,8 +115,9 @@ class User < ActiveRecord::Base
   end
 	
   # Return user's full name for display
-  def name
-    "#{firstname} #{lastname}"
+  def name(formatter = nil)
+    f = USER_FORMATS[formatter || Setting.user_format] || USER_FORMATS[:firstname_lastname]
+    eval '"' + f + '"'
   end
   
   def active?
@@ -164,7 +173,13 @@ class User < ActiveRecord::Base
   end
 
   def <=>(user)
-    user.nil? ? -1 : (lastname == user.lastname ? firstname <=> user.firstname : lastname <=> user.lastname)
+    if user.nil?
+      -1
+    elsif lastname.to_s.downcase == user.lastname.to_s.downcase
+      firstname.to_s.downcase <=> user.firstname.to_s.downcase
+    else
+      lastname.to_s.downcase <=> user.lastname.to_s.downcase
+    end
   end
   
   def to_s
diff --git a/app/views/projects/settings/_members.rhtml b/app/views/projects/settings/_members.rhtml
index 55dfde1ac..ab22ac602 100644
--- a/app/views/projects/settings/_members.rhtml
+++ b/app/views/projects/settings/_members.rhtml
@@ -1,8 +1,8 @@
 <%= error_messages_for 'member' %>
 <% roles = Role.find_all_givable %>
-<% users = User.find_active(:all) - @project.users %>
+<% users = User.find_active(:all).sort - @project.users %>
 <% # members sorted by role position
-   members = @project.members.find(:all, :include => [:role, :user]).sort{|x,y| x.role.position <=> y.role.position} %>
+   members = @project.members.find(:all, :include => [:role, :user]).sort %>
    
 <% if members.any? %>
 <table class="list">
diff --git a/app/views/settings/_general.rhtml b/app/views/settings/_general.rhtml
index 514e62b59..548ebbfac 100644
--- a/app/views/settings/_general.rhtml
+++ b/app/views/settings/_general.rhtml
@@ -20,6 +20,9 @@
 <p><label><%= l(:setting_time_format) %></label>
 <%= select_tag 'settings[time_format]', options_for_select( [[l(:label_language_based), '']] + Setting::TIME_FORMATS.collect {|f| [Time.now.strftime(f), f]}, Setting.time_format) %></p>
 
+<p><label><%= l(:setting_user_format) %></label>
+<%= select_tag 'settings[user_format]', options_for_select( @options[:user_format], Setting.user_format.to_s ) %></p>
+
 <p><label><%= l(:setting_attachment_max_size) %></label>
 <%= text_field_tag 'settings[attachment_max_size]', Setting.attachment_max_size, :size => 6 %> KB</p>
 
diff --git a/config/settings.yml b/config/settings.yml
index 1360b5501..a45ae17ce 100644
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -79,6 +79,9 @@ date_format:
   default: ''
 time_format:
   default: ''
+user_format:
+  default: :firstname_lastname
+  format: symbol
 cross_project_issue_relations:
   default: 0
 notified_events:
diff --git a/lang/bg.yml b/lang/bg.yml
index 00b20308b..7aac092cb 100644
--- a/lang/bg.yml
+++ b/lang/bg.yml
@@ -565,3 +565,4 @@ label_change_properties: Change properties
 label_general: General
 label_repository_plural: Repositories
 label_associated_revisions: Associated revisions
+setting_user_format: Users display format
diff --git a/lang/cs.yml b/lang/cs.yml
index ab159c2c4..d6307babe 100644
--- a/lang/cs.yml
+++ b/lang/cs.yml
@@ -565,3 +565,4 @@ label_change_properties: Change properties
 label_general: General
 label_repository_plural: Repositories
 label_associated_revisions: Associated revisions
+setting_user_format: Users display format
diff --git a/lang/de.yml b/lang/de.yml
index 0c1ba3575..0cdf989bf 100644
--- a/lang/de.yml
+++ b/lang/de.yml
@@ -565,3 +565,4 @@ label_change_properties: Change properties
 label_general: General
 label_repository_plural: Repositories
 label_associated_revisions: Associated revisions
+setting_user_format: Users display format
diff --git a/lang/en.yml b/lang/en.yml
index 32fd9926f..534a4834e 100644
--- a/lang/en.yml
+++ b/lang/en.yml
@@ -204,6 +204,7 @@ setting_repositories_encodings: Repositories encodings
 setting_emails_footer: Emails footer
 setting_protocol: Protocol
 setting_per_page_options: Objects per page options
+setting_user_format: Users display format
 
 label_user: User
 label_user_plural: Users
diff --git a/lang/es.yml b/lang/es.yml
index ac3b34c19..9023f2b6a 100644
--- a/lang/es.yml
+++ b/lang/es.yml
@@ -568,3 +568,4 @@ label_change_properties: Change properties
 label_general: General
 label_repository_plural: Repositories
 label_associated_revisions: Associated revisions
+setting_user_format: Users display format
diff --git a/lang/fi.yml b/lang/fi.yml
index d70cf396a..5dbe5e8a5 100644
--- a/lang/fi.yml
+++ b/lang/fi.yml
@@ -569,3 +569,4 @@ enumeration_issue_priorities: Tapahtuman prioriteetit
 enumeration_doc_categories: Dokumentin luokat
 enumeration_activities: Aktiviteetit (ajan seuranta)
 label_associated_revisions: Liittyvät versiot
+setting_user_format: Users display format
diff --git a/lang/fr.yml b/lang/fr.yml
index be93da9a1..1c1e7b5c2 100644
--- a/lang/fr.yml
+++ b/lang/fr.yml
@@ -205,6 +205,7 @@ setting_repositories_encodings: Encodages des dépôts
 setting_emails_footer: Pied-de-page des emails
 setting_protocol: Protocole
 setting_per_page_options: Options d'objets affichés par page
+setting_user_format: Format d'affichage des utilisateurs
 
 label_user: Utilisateur
 label_user_plural: Utilisateurs
diff --git a/lang/he.yml b/lang/he.yml
index ad3331624..9b274c58d 100644
--- a/lang/he.yml
+++ b/lang/he.yml
@@ -565,3 +565,4 @@ label_change_properties: Change properties
 label_general: General
 label_repository_plural: Repositories
 label_associated_revisions: Associated revisions
+setting_user_format: Users display format
diff --git a/lang/it.yml b/lang/it.yml
index 3b3131211..5f07a2f24 100644
--- a/lang/it.yml
+++ b/lang/it.yml
@@ -565,3 +565,4 @@ label_change_properties: Change properties
 label_general: General
 label_repository_plural: Repositories
 label_associated_revisions: Associated revisions
+setting_user_format: Users display format
diff --git a/lang/ja.yml b/lang/ja.yml
index 08423c824..3266256c2 100644
--- a/lang/ja.yml
+++ b/lang/ja.yml
@@ -566,3 +566,4 @@ label_change_properties: Change properties
 label_general: General
 label_repository_plural: Repositories
 label_associated_revisions: Associated revisions
+setting_user_format: Users display format
diff --git a/lang/ko.yml b/lang/ko.yml
index 0b556840d..7f93fe94a 100644
--- a/lang/ko.yml
+++ b/lang/ko.yml
@@ -565,3 +565,4 @@ label_change_properties: 속성 변경
 label_general: 일반
 label_repository_plural: 저장소들
 label_associated_revisions: Associated revisions
+setting_user_format: Users display format
diff --git a/lang/lt.yml b/lang/lt.yml
index 5e8273b91..51686f9ed 100644
--- a/lang/lt.yml
+++ b/lang/lt.yml
@@ -566,3 +566,4 @@ text_no_configuration_data: "Roles, trackers, issue statuses and workflow have n
 label_repository_plural: Repositories
 error_can_t_load_default_data: "Default configuration could not be loaded: %s"
 label_associated_revisions: Associated revisions
+setting_user_format: Users display format
diff --git a/lang/nl.yml b/lang/nl.yml
index f81247623..dc413b058 100644
--- a/lang/nl.yml
+++ b/lang/nl.yml
@@ -566,3 +566,4 @@ label_change_properties: Change properties
 label_general: General
 label_repository_plural: Repositories
 label_associated_revisions: Associated revisions
+setting_user_format: Users display format
diff --git a/lang/pl.yml b/lang/pl.yml
index ec7eec222..10b5cd029 100644
--- a/lang/pl.yml
+++ b/lang/pl.yml
@@ -565,3 +565,4 @@ label_change_properties: Zmień właściwości
 label_general: Ogólne
 label_repository_plural: Repozytoria
 label_associated_revisions: Associated revisions
+setting_user_format: Users display format
diff --git a/lang/pt-br.yml b/lang/pt-br.yml
index 629ca2c38..b246cfd30 100644
--- a/lang/pt-br.yml
+++ b/lang/pt-br.yml
@@ -565,3 +565,4 @@ label_change_properties: Change properties
 label_general: General
 label_repository_plural: Repositories
 label_associated_revisions: Associated revisions
+setting_user_format: Users display format
diff --git a/lang/pt.yml b/lang/pt.yml
index 8add9b6eb..aa98d15a8 100644
--- a/lang/pt.yml
+++ b/lang/pt.yml
@@ -565,3 +565,4 @@ label_change_properties: Change properties
 label_general: General
 label_repository_plural: Repositories
 label_associated_revisions: Associated revisions
+setting_user_format: Users display format
diff --git a/lang/ro.yml b/lang/ro.yml
index b5413fdd4..d9011c21e 100644
--- a/lang/ro.yml
+++ b/lang/ro.yml
@@ -565,3 +565,4 @@ label_change_properties: Change properties
 label_general: General
 label_repository_plural: Repositories
 label_associated_revisions: Associated revisions
+setting_user_format: Users display format
diff --git a/lang/ru.yml b/lang/ru.yml
index 6636ed56f..61ce06759 100644
--- a/lang/ru.yml
+++ b/lang/ru.yml
@@ -567,3 +567,4 @@ enumeration_doc_categories: Категории документов
 enumeration_activities: Действия (учет времени)
 
 error_can_t_load_default_data: "Конфигурация по умолчанию не была загружена: %s"
+setting_user_format: Users display format
diff --git a/lang/sr.yml b/lang/sr.yml
index 0c64ee128..71503be01 100644
--- a/lang/sr.yml
+++ b/lang/sr.yml
@@ -566,3 +566,4 @@ label_change_properties: Change properties
 label_general: General
 label_repository_plural: Repositories
 label_associated_revisions: Associated revisions
+setting_user_format: Users display format
diff --git a/lang/sv.yml b/lang/sv.yml
index ff199aba4..604590aff 100644
--- a/lang/sv.yml
+++ b/lang/sv.yml
@@ -566,3 +566,4 @@ label_change_properties: Change properties
 label_general: General
 label_repository_plural: Repositories
 label_associated_revisions: Associated revisions
+setting_user_format: Users display format
diff --git a/lang/zh-tw.yml b/lang/zh-tw.yml
index 21d1e9ead..08b9057fa 100644
--- a/lang/zh-tw.yml
+++ b/lang/zh-tw.yml
@@ -566,3 +566,4 @@ enumeration_issue_priorities: 項目重要性
 enumeration_doc_categories: 文件分類
 enumeration_activities: 活動 (time tracking)
 label_associated_revisions: Associated revisions
+setting_user_format: Users display format
diff --git a/lang/zh.yml b/lang/zh.yml
index de7ec093e..469bfb0c5 100644
--- a/lang/zh.yml
+++ b/lang/zh.yml
@@ -568,3 +568,4 @@ label_change_properties: Change properties
 label_general: General
 label_repository_plural: Repositories
 label_associated_revisions: Associated revisions
+setting_user_format: Users display format
diff --git a/test/unit/user_test.rb b/test/unit/user_test.rb
index 9f58d278f..845a34afd 100644
--- a/test/unit/user_test.rb
+++ b/test/unit/user_test.rb
@@ -76,6 +76,14 @@ class UserTest < Test::Unit::TestCase
     assert_equal User.hash_password("hello"), user.hashed_password    
   end
   
+  def test_name_format
+    assert_equal 'Smith, John', @jsmith.name(:lastname_coma_firstname)
+    Setting.user_format = :firstname_lastname
+    assert_equal 'John Smith', @jsmith.name
+    Setting.user_format = :username
+    assert_equal 'jsmith', @jsmith.name
+  end
+  
   def test_lock
     user = User.try_to_login("jsmith", "jsmith")
     assert_equal @jsmith, user

From 4abb82fd7bcdd2cdffdd8778a5d9e2fc6a3857dd Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Fri, 25 Jan 2008 10:55:16 +0000
Subject: [PATCH 165/710] Fixed RepositoriesController: undefined local
 variable or method `show_error' (broken by r1094).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1104 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/repositories_controller.rb         | 14 +++++++-------
 .../repositories_subversion_controller_test.rb     |  6 ++++++
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb
index 542eb93ea..13d3eaa32 100644
--- a/app/controllers/repositories_controller.rb
+++ b/app/controllers/repositories_controller.rb
@@ -55,7 +55,7 @@ class RepositoriesController < ApplicationController
     @entries = @repository.entries('')    
     # latest changesets
     @changesets = @repository.changesets.find(:all, :limit => 10, :order => "committed_on DESC")
-    show_error and return unless @entries || @changesets.any?
+    show_error_not_found unless @entries || @changesets.any?
   rescue Redmine::Scm::Adapters::CommandFailed => e
     show_error_command_failed(e.message)
   end
@@ -65,7 +65,7 @@ class RepositoriesController < ApplicationController
     if request.xhr?
       @entries ? render(:partial => 'dir_list_content') : render(:nothing => true)
     else
-      show_error unless @entries
+      show_error_not_found unless @entries
     end
   rescue Redmine::Scm::Adapters::CommandFailed => e
     show_error_command_failed(e.message)
@@ -73,7 +73,7 @@ class RepositoriesController < ApplicationController
   
   def changes
     @entry = @repository.scm.entry(@path, @rev)
-    show_error and return unless @entry
+    show_error_not_found and return unless @entry
     @changesets = @repository.changesets_for_path(@path)
   rescue Redmine::Scm::Adapters::CommandFailed => e
     show_error_command_failed(e.message)
@@ -96,7 +96,7 @@ class RepositoriesController < ApplicationController
   
   def entry
     @content = @repository.scm.cat(@path, @rev)
-    show_error and return unless @content
+    show_error_not_found and return unless @content
     if 'raw' == params[:format]      
       send_data @content, :filename => @path.split('/').last
     else
@@ -109,7 +109,7 @@ class RepositoriesController < ApplicationController
   
   def annotate
     @annotate = @repository.scm.annotate(@path, @rev)
-    show_error and return if @annotate.nil? || @annotate.empty?
+    show_error_not_found and return if @annotate.nil? || @annotate.empty?
   rescue Redmine::Scm::Adapters::CommandFailed => e
     show_error_command_failed(e.message)
   end
@@ -128,7 +128,7 @@ class RepositoriesController < ApplicationController
       format.js {render :layout => false}
     end
   rescue ChangesetNotFound
-    show_error
+    show_error_not_found
   rescue Redmine::Scm::Adapters::CommandFailed => e
     show_error_command_failed(e.message)
   end
@@ -147,7 +147,7 @@ class RepositoriesController < ApplicationController
     @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, @diff_type)
-      show_error and return unless @diff
+      show_error_not_found unless @diff
     end
   rescue Redmine::Scm::Adapters::CommandFailed => e
     show_error_command_failed(e.message)
diff --git a/test/functional/repositories_subversion_controller_test.rb b/test/functional/repositories_subversion_controller_test.rb
index d7ce45640..ab5ec14ca 100644
--- a/test/functional/repositories_subversion_controller_test.rb
+++ b/test/functional/repositories_subversion_controller_test.rb
@@ -67,6 +67,12 @@ class RepositoriesSubversionControllerTest < Test::Unit::TestCase
       assert_response :success
       assert_template 'entry'
     end
+    
+    def test_entry_not_found
+      get :entry, :id => 1, :path => ['subversion_test', 'zzz.c']
+      assert_tag :tag => 'div', :attributes => { :class => /error/ },
+                                :content => /Entry and\/or revision doesn't exist/
+    end
   
     def test_entry_download
       get :entry, :id => 1, :path => ['subversion_test', 'helloworld.c'], :format => 'raw'

From bea49ae24532284ca4ef9ce72733b78f77e480d5 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sat, 2 Feb 2008 10:50:31 +0000
Subject: [PATCH 166/710] Administrators can edit issue notes.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1105 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/issues_controller.rb        |   1 +
 app/controllers/journals_controller.rb      |  40 +++++++++++++++
 app/helpers/journals_helper.rb              |  37 ++++++++++++++
 app/models/journal.rb                       |   4 ++
 app/views/issues/_history.rhtml             |   2 +-
 app/views/journals/_notes_form.rhtml        |   7 +++
 app/views/journals/edit.rjs                 |   3 ++
 app/views/journals/update.rjs               |   3 ++
 public/images/delete.png                    | Bin 265 -> 1022 bytes
 public/images/edit.png                      | Bin 1340 -> 1343 bytes
 public/stylesheets/application.css          |   3 +-
 test/fixtures/journals.yml                  |   8 +++
 test/functional/journals_controller_test.rb |  51 ++++++++++++++++++++
 13 files changed, 156 insertions(+), 3 deletions(-)
 create mode 100644 app/controllers/journals_controller.rb
 create mode 100644 app/helpers/journals_helper.rb
 create mode 100644 app/views/journals/_notes_form.rhtml
 create mode 100644 app/views/journals/edit.rjs
 create mode 100644 app/views/journals/update.rjs
 create mode 100644 test/functional/journals_controller_test.rb

diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index fdece9e1a..dfee53841 100644
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -27,6 +27,7 @@ class IssuesController < ApplicationController
   
   cache_sweeper :issue_sweeper, :only => [ :new, :edit, :update, :destroy ]
 
+  helper :journals
   helper :projects
   include ProjectsHelper   
   helper :custom_fields
diff --git a/app/controllers/journals_controller.rb b/app/controllers/journals_controller.rb
new file mode 100644
index 000000000..b867b4ae6
--- /dev/null
+++ b/app/controllers/journals_controller.rb
@@ -0,0 +1,40 @@
+# redMine - project management software
+# Copyright (C) 2006-2008  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 JournalsController < ApplicationController
+  layout 'base'
+  before_filter :find_journal
+  
+  def edit
+    if request.post?
+      @journal.update_attributes(:notes => params[:notes]) if params[:notes]
+      respond_to do |format|
+        format.html { redirect_to :controller => 'issues', :action => 'show', :id => @journal.journalized_id }
+        format.js { render :action => 'update' }
+      end
+      return
+    end
+  end
+  
+private
+  def find_journal
+    @journal = Journal.find(params[:id])
+    render_403 and return false unless @journal.editable_by?(User.current)
+  rescue ActiveRecord::RecordNotFound
+    render_404
+  end
+end
diff --git a/app/helpers/journals_helper.rb b/app/helpers/journals_helper.rb
new file mode 100644
index 000000000..c97446448
--- /dev/null
+++ b/app/helpers/journals_helper.rb
@@ -0,0 +1,37 @@
+# redMine - project management software
+# Copyright (C) 2006-2008  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 JournalsHelper
+  def render_notes(journal, options={})
+    content = ''
+    editable = journal.editable_by?(User.current)
+    if editable
+      links = []
+      links << link_to_in_place_notes_editor(image_tag('edit.png'), "journal-#{journal.id}-notes", 
+                                             { :controller => 'journals', :action => 'edit', :id => journal },
+                                                :title => l(:button_edit))
+      content << content_tag('div', links.join(' '), :class => 'contextual')
+    end
+    content << textilizable(journal, :notes)
+    content_tag('div', content, :id => "journal-#{journal.id}-notes", :class => (editable ? 'editable' : nil))
+  end
+  
+  def link_to_in_place_notes_editor(text, field_id, url, options={})
+    onclick = "new Ajax.Request('#{url_for(url)}', {asynchronous:true, evalScripts:true, method:'get'}); return false;"
+    link_to text, '#', options.merge(:onclick => onclick)
+  end
+end
diff --git a/app/models/journal.rb b/app/models/journal.rb
index d02067a9d..df7308435 100644
--- a/app/models/journal.rb
+++ b/app/models/journal.rb
@@ -49,4 +49,8 @@ class Journal < ActiveRecord::Base
     c = details.detect {|detail| detail.prop_key == prop}
     c ? c.value : nil
   end
+  
+  def editable_by?(usr)
+    usr && usr.admin?
+  end
 end
diff --git a/app/views/issues/_history.rhtml b/app/views/issues/_history.rhtml
index bab37b4fd..edfb9b94d 100644
--- a/app/views/issues/_history.rhtml
+++ b/app/views/issues/_history.rhtml
@@ -8,6 +8,6 @@
 	   <li><%= show_detail(detail) %></li>
 	<% end %>
 	</ul>
-  	<%= textilizable(journal.notes) unless journal.notes.blank? %>
+	<%= render_notes(journal) unless journal.notes.blank? %>
   	<% note_id += 1 %>
 <% end %>
diff --git a/app/views/journals/_notes_form.rhtml b/app/views/journals/_notes_form.rhtml
new file mode 100644
index 000000000..9baec03fa
--- /dev/null
+++ b/app/views/journals/_notes_form.rhtml
@@ -0,0 +1,7 @@
+<% form_remote_tag(:url => {}, :html => { :id => "journal-#{@journal.id}-form" }) do %>
+    <%= text_area_tag :notes, @journal.notes, :class => 'wiki-edit', 
+                                              :rows => (@journal.notes.blank? ? 10 : [[10, @journal.notes.length / 50].max, 100].min) %>
+    <p><%= submit_tag l(:button_save) %>
+    <%= link_to l(:button_cancel), '#', :onclick => "Element.remove('journal-#{@journal.id}-form'); " +
+                                                    "Element.show('journal-#{@journal.id}-notes'); return false;" %></p>
+<% end %>
diff --git a/app/views/journals/edit.rjs b/app/views/journals/edit.rjs
new file mode 100644
index 000000000..798cb0f04
--- /dev/null
+++ b/app/views/journals/edit.rjs
@@ -0,0 +1,3 @@
+page.hide "journal-#{@journal.id}-notes"
+page.insert_html :after, "journal-#{@journal.id}-notes",
+                 :partial => 'notes_form'
diff --git a/app/views/journals/update.rjs b/app/views/journals/update.rjs
new file mode 100644
index 000000000..9da0ebeae
--- /dev/null
+++ b/app/views/journals/update.rjs
@@ -0,0 +1,3 @@
+page.replace "journal-#{@journal.id}-notes", render_notes(@journal)
+page.show "journal-#{@journal.id}-notes"
+page.remove "journal-#{@journal.id}-form"
diff --git a/public/images/delete.png b/public/images/delete.png
index 137baa68eac092124487651cd173a02c67f5a940..a1af31d8334a2d5ee776711876b58dd6c9f27581 100644
GIT binary patch
literal 1022
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbL!PKj$oiE~kEVo7Fxo<c}wZYo1@
zVy>QosX}gIrh<`yfw_XAft8V=m5Hf>wt=C6L7#I^08k%$iKnkC`wb>W5f!x){P`er
zISV`@iy0WWK7cTz(;AZ*KtYytM_)$<hK>E)e-c?47?>FXd_r9RGcbJr{=KJX&hzKb
z|NjT_M!{$ZjGz!;Z+)@@=v~H=AirP+hi5m^fE*i77srr_TfKdrd<+I0Opd?*n_pj&
zG~M}eK~htvgZS>Q0Qp1n8r7~Gi7=O}VO4HlP`RWfeOttoggVD9GbXHO6g+ox>0MA5
Ndb;|#taD0e0suNuR676w

delta 210
zcmeyz-pQoc8Q|y6%O%Cdz`(%k>ERLtr1^oEhl3eNcFhsLHc`>B{yHlwhnN9Jv+g#a
zAZLL`WHAE+w-5+3Ub<WN2Pnvr?&#~tz_78O`%fY(kk23B6XN=xf#Li2?>#+po<D#7
z|Nnn?xj#UC42&f~e!&b5&u*jvIToHSjv*DdYI_~|7z{WLv3&n;e%^J)&D5t?IusWr
z@|avo{V^|8qk+3ce##FEt;Y#rZ&t?Szq#;h=Izv6M!~r=E<6Dm!r<xZ=d#Wzp$PyA
CtVrYl

diff --git a/public/images/edit.png b/public/images/edit.png
index 0275d91e4f0835a14c4afcf635cd7ec4def637cc..1b6a9e31539358ed27fd3cd99f0effec145da1f8 100644
GIT binary patch
delta 95
zcmdnPwV!K33fB!LMiEVgDTlUXY|L|Dk*V=?aSW-rmHeZhP2vNGN8uta56!MZCGHa|
zyE`WzV^Lw;I{7t=p3+O69v>SnjXK8<8-9v0*k^1GPO9WIV*mnAS3j3^P6<r_vECw;

delta 92
zcmdnbwTEj$3fFZ;b{<2M-qmwsH|9C8NK|^dIEGZ*O8(K$CQ-ocq1jca#C>9AcK75{
wEGmq;li#!GDKF*e@v-63@C!fiPCSN*fp_gzXWmeWJO&`}boFyt=akR{0Oai+&;S4c

diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index ec3ae159d..eb4e855b4 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -122,7 +122,7 @@ div.square {
  width: .6em; height: .6em;
 }
 
-.contextual {float:right; white-space: nowrap; line-height:1.4em;margin-top:5px;font-size:0.9em;}
+.contextual {float:right; white-space: nowrap; line-height:1.4em;margin-top:5px; padding-left: 10px; font-size:0.9em;}
 .contextual input {font-size:0.9em;}
 
 .splitcontentleft{float:left; width:49%;}
@@ -227,7 +227,6 @@ text-align:center;
 padding:0.6em;
 z-index:100;
 filter:alpha(opacity=50);
--moz-opacity:0.5;
 opacity: 0.5;
 -khtml-opacity: 0.5;
 }
diff --git a/test/fixtures/journals.yml b/test/fixtures/journals.yml
index 0de938168..169713fc5 100644
--- a/test/fixtures/journals.yml
+++ b/test/fixtures/journals.yml
@@ -6,3 +6,11 @@ journals_001:
   journalized_type: Issue
   user_id: 1
   journalized_id: 1
+journals_002: 
+  created_on: <%= 1.days.ago.to_date.to_s(:db) %>
+  notes: "Some notes"
+  id: 2
+  journalized_type: Issue
+  user_id: 2
+  journalized_id: 1
+  
\ No newline at end of file
diff --git a/test/functional/journals_controller_test.rb b/test/functional/journals_controller_test.rb
new file mode 100644
index 000000000..f231d10ee
--- /dev/null
+++ b/test/functional/journals_controller_test.rb
@@ -0,0 +1,51 @@
+# redMine - project management software
+# Copyright (C) 2006-2008  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 File.dirname(__FILE__) + '/../test_helper'
+require 'journals_controller'
+
+# Re-raise errors caught by the controller.
+class JournalsController; def rescue_action(e) raise e end; end
+
+class JournalsControllerTest < ActionController::TestCase
+  fixtures :projects, :users, :members, :roles, :issues, :journals, :journal_details, :enabled_modules
+  
+  def setup
+    @controller = JournalsController.new
+    @request    = ActionController::TestRequest.new
+    @response   = ActionController::TestResponse.new
+    User.current = nil
+  end
+  
+  def test_get_edit
+    @request.session[:user_id] = 1
+    xhr :get, :edit, :id => 2
+    assert_response :success
+    assert_select_rjs :insert, :after, 'journal-2-notes' do
+      assert_select 'form[id=journal-2-form]'
+      assert_select 'textarea'
+    end
+  end
+  
+  def test_post_edit
+    @request.session[:user_id] = 1
+    xhr :post, :edit, :id => 2, :notes => 'Updated notes'
+    assert_response :success
+    assert_select_rjs :replace, 'journal-2-notes'
+    assert_equal 'Updated notes', Journal.find(2).notes
+  end
+end

From 45b69c4a656491221eb12df85c282949955a50b8 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sat, 2 Feb 2008 10:54:31 +0000
Subject: [PATCH 167/710] Fixed an error on issue feeds.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1106 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/issues_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index dfee53841..b722d9340 100644
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -271,7 +271,7 @@ private
   
   # Retrieve query from session or build a new query
   def retrieve_query
-    if params[:query_id]
+    if !params[:query_id].blank?
       @query = Query.find(params[:query_id], :conditions => {:project_id => (@project ? @project.id : nil)})
       session[:query] = {:id => @query.id, :project_id => @query.project_id}
     else

From 12c0f5f66e21bbfdeed82f00eabe7b47ed99d85f Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sat, 2 Feb 2008 11:08:04 +0000
Subject: [PATCH 168/710] Do not show Roadmap menu item if the project doesn't
 define any versions.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1107 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 lib/redmine.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/redmine.rb b/lib/redmine.rb
index 1aee1767c..92a1cef14 100644
--- a/lib/redmine.rb
+++ b/lib/redmine.rb
@@ -93,7 +93,8 @@ end
 Redmine::MenuManager.map :project_menu do |menu|
   menu.push :overview, { :controller => 'projects', :action => 'show' }, :caption => :label_overview
   menu.push :activity, { :controller => 'projects', :action => 'activity' }, :caption => :label_activity
-  menu.push :roadmap, { :controller => 'projects', :action => 'roadmap' }, :caption => :label_roadmap
+  menu.push :roadmap, { :controller => 'projects', :action => 'roadmap' }, 
+              :if => Proc.new { |p| p.versions.any? }, :caption => :label_roadmap
   menu.push :issues, { :controller => 'issues', :action => 'index' }, :param => :project_id, :caption => :label_issue_plural
   menu.push :new_issue, { :controller => 'issues', :action => 'new' }, :param => :project_id, :caption => :label_issue_new,
               :html => { :accesskey => Redmine::AccessKeys.key_for(:new_issue) }

From 0123dc36515d103d29fd9225bad22aae664a2c12 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sat, 2 Feb 2008 15:51:48 +0000
Subject: [PATCH 169/710] Do not authorize project identifier with numbers only
 (would be interpreted as the project id in urls).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1108 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/models/project.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/models/project.rb b/app/models/project.rb
index 42f2ddfd9..73a8d6404 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -217,6 +217,7 @@ protected
   def validate
     errors.add(parent_id, " must be a root project") if parent and parent.parent
     errors.add_to_base("A project with subprojects can't be a subproject") if parent and children.size > 0
+    errors.add(:identifier, :activerecord_error_invalid) if !identifier.blank? && identifier.match(/^\d*$/)
   end
   
 private

From 225637c5dc23465c49b9f4733a08ba37e6a40b40 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 3 Feb 2008 13:54:59 +0000
Subject: [PATCH 170/710] =?UTF-8?q?Translations=20updates=20(#254,=20#255,?=
 =?UTF-8?q?=20#260):=20*=20Traditional=20Chinese=20(Shortie=20Lo)=20*=20Ge?=
 =?UTF-8?q?rman=20(Thomas=20L=C3=B6ber)=20*=20Russian=20(Michael=20Pirogov?=
 =?UTF-8?q?)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1109 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 lang/de.yml    | 138 ++++++++++++++++++++++++-------------------------
 lang/ru.yml    |   9 ++--
 lang/zh-tw.yml |  85 +++++++++++++++---------------
 3 files changed, 115 insertions(+), 117 deletions(-)

diff --git a/lang/de.yml b/lang/de.yml
index 0cdf989bf..f0f054b1b 100644
--- a/lang/de.yml
+++ b/lang/de.yml
@@ -72,14 +72,23 @@ notice_not_authorized: Sie sind nicht berechtigt, auf diese Seite zuzugreifen.
 notice_email_sent: Eine E-Mail wurde an %s gesendet.
 notice_email_error: Beim Senden einer E-Mail ist ein Fehler aufgetreten (%s).
 notice_feeds_access_key_reseted: Ihr RSS-Zugriffsschlüssel wurde zurückgesetzt.
+notice_failed_to_save_issues: "%d von %d ausgewählten Tickets konnte(n) nicht gespeichert werden: %s."
+notice_no_issue_selected: "Kein Ticket ausgewählt! Bitte wählen Sie die Tickets, die Sie bearbeiten möchten."
+notice_account_pending: "Ihr Konto wurde erstellt und wartet jetzt auf die Genehmigung des Administrators."
+notice_default_data_loaded: Die Standard-Konfiguration wurde erfolgreich geladen.
 
-error_scm_not_found: "Eintrag und/oder Revision besteht nicht im Projektarchiv."
-error_scm_command_failed: "An error occurred when trying to access the repository: %s"
+error_can_t_load_default_data: "Die Standard-Konfiguration konnte nicht geladen werden: %s"
+error_scm_not_found: Eintrag und/oder Revision besteht nicht im Projektarchiv.
+error_scm_command_failed: "Beim Zugriff auf das Projektarchiv ist ein Fehler aufgetreten: %s"
 
 mail_subject_lost_password: Ihr Redmine-Kennwort
 mail_body_lost_password: 'Benutzen Sie den folgenden Link, um Ihr Kennwort zu ändern:'
 mail_subject_register: Redmine Kontoaktivierung
 mail_body_register: 'Um Ihr Konto zu aktivieren, benutzen Sie folgenden Link:'
+mail_body_account_information_external: Sie können sich mit Ihrem Konto "%s" an Redmine anmelden.
+mail_body_account_information: Ihre Redmine Konto-Informationen
+mail_subject_account_activation_request: Antrag auf Redmine Kontoaktivierung
+mail_body_account_activation_request: 'Ein neuer Benutzer (%s) hat sich registriert. Sein Konto wartet auf Ihre Genehmigung:'
 
 gui_validation_error: 1 Fehler
 gui_validation_error_plural: %d Fehler
@@ -120,7 +129,7 @@ field_priority: Priorität
 field_fixed_version: Erledigt in Version
 field_user: Benutzer
 field_role: Rolle
-field_homepage: Startseite
+field_homepage: Projekt-Homepage
 field_is_public: Öffentlich
 field_parent: Unterprojekt von
 field_is_in_chlog: Ansicht im Change-Log
@@ -157,13 +166,16 @@ field_hours: Stunden
 field_activity: Aktivität
 field_spent_on: Datum
 field_identifier: Kennung
-field_is_filter: Als Fiter benutzen
+field_is_filter: Als Filter benutzen
 field_issue_to_id: Zugehöriges Ticket
 field_delay: Pufferzeit
 field_assignable: Tickets können dieser Rolle zugewiesen werden
 field_redirect_existing_links: Existierende Links umleiten
 field_estimated_hours: Geschätzter Aufwand
-field_default_value: Default
+field_column_names: Spalten
+field_time_zone: Zeitzone
+field_searchable: Durchsuchbar
+field_default_value: Standardwert
 
 setting_app_title: Applikations-Titel
 setting_app_subtitle: Applikations-Untertitel
@@ -174,17 +186,25 @@ setting_self_registration: Anmeldung ermöglicht
 setting_attachment_max_size: Max. Dateigröße
 setting_issues_export_limit: Max. Anzahl Tickets bei CSV/PDF-Export
 setting_mail_from: E-Mail-Absender
+setting_bcc_recipients: E-Mails als Blindkopie (BCC) senden
 setting_host_name: Hostname
 setting_text_formatting: Textformatierung
 setting_wiki_compression: Wiki-Historie komprimieren
 setting_feeds_limit: Feed-Inhalt begrenzen
-setting_autofetch_changesets: Commits automatisch abrufen
-setting_sys_api_enabled: Webservice für Repository-Verwaltung benutzen
+setting_autofetch_changesets: Changesets automatisch abrufen
+setting_sys_api_enabled: Webservice zur Verwaltung der Projektarchive benutzen
 setting_commit_ref_keywords: Schlüsselwörter (Beziehungen)
 setting_commit_fix_keywords: Schlüsselwörter (Status)
 setting_autologin: Automatische Anmeldung
 setting_date_format: Datumsformat
+setting_time_format: Zeitformat
 setting_cross_project_issue_relations: Ticket-Beziehungen zwischen Projekten erlauben
+setting_issue_list_default_columns: Default-Spalten in der Ticket-Auflistung
+setting_repositories_encodings: Kodierungen der Projektarchive
+setting_emails_footer: E-Mail-Fußzeile
+setting_protocol: Protokoll
+setting_per_page_options: Objekte pro Seite
+setting_user_format: Benutzer-Anzeigeformat
 
 label_user: Benutzer
 label_user_plural: Benutzer
@@ -198,6 +218,7 @@ label_issue: Ticket
 label_issue_new: Neues Ticket
 label_issue_plural: Tickets
 label_issue_view_all: Alle Tickets ansehen
+label_issues_by: Tickets von %s
 label_document: Dokument
 label_document_new: Neues Dokument
 label_document_plural: Dokumente
@@ -255,6 +276,7 @@ label_min_max_length: Länge (Min. - Max.)
 label_list: Liste
 label_date: Datum
 label_integer: Zahl
+label_float: Fließkommazahl
 label_boolean: Boolean
 label_string: Text
 label_text: Langer Text
@@ -296,6 +318,7 @@ label_current_status: Gegenwärtiger Status
 label_new_statuses_allowed: Neue Berechtigungen
 label_all: alle
 label_none: kein
+label_nobody: Niemand
 label_next: Weiter
 label_previous: Zurück
 label_used_by: Benutzt von
@@ -333,11 +356,13 @@ label_contains: enthält
 label_not_contains: enthält nicht
 label_day_plural: Tage
 label_repository: Projektarchiv
+label_repository_plural: Projektarchive
 label_browse: Codebrowser
 label_modification: %d Änderung
 label_modification_plural: %d Änderungen
 label_revision: Revision
 label_revision_plural: Revisionen
+label_associated_revisions: Zugehörige Revisionen
 label_added: hinzugefügt
 label_modified: geändert
 label_deleted: gelöscht
@@ -346,10 +371,10 @@ label_latest_revision_plural: Aktuellste Revisionen
 label_view_revisions: Revisionen anzeigen
 label_max_size: Maximale Größe
 label_on: von
-label_sort_highest: Anfang
-label_sort_higher: eins höher
-label_sort_lower: eins tiefer
-label_sort_lowest: Ende
+label_sort_highest: An den Anfang
+label_sort_higher: Eins höher
+label_sort_lower: Eins tiefer
+label_sort_lowest: Ans Ende
 label_roadmap: Roadmap
 label_roadmap_due_in: Fällig in
 label_roadmap_overdue: %s verspätet
@@ -362,8 +387,8 @@ label_wiki_edit: Wiki-Bearbeitung
 label_wiki_edit_plural: Wiki-Bearbeitungen
 label_wiki_page: Wiki-Seite
 label_wiki_page_plural: Wiki-Seiten
-label_index_by_title: Index by title
-label_index_by_date: Index by date
+label_index_by_title: Seiten nach Titel sortiert
+label_index_by_date: Seiten nach Datum sortiert
 label_current_version: Gegenwärtige Version
 label_preview: Vorschau
 label_feed_plural: Feeds
@@ -425,6 +450,25 @@ label_module_plural: Module
 label_added_time_by: Von %s vor %s hinzugefügt
 label_updated_time: Vor %s aktualisiert
 label_jump_to_a_project: Zu einem Projekt springen...
+label_file_plural: Dateien
+label_changeset_plural: Changesets
+label_default_columns: Default-Spalten
+label_no_change_option: (Keine Änderung)
+label_bulk_edit_selected_issues: Alle ausgewählten Tickets bearbeiten
+label_theme: Stil
+label_default: Default
+label_search_titles_only: Nur Titel durchsuchen
+label_user_mail_option_all: "Für alle Ereignisse in all meinen Projekten"
+label_user_mail_option_selected: "Für alle Ereignisse in den ausgewählten Projekten..."
+label_user_mail_option_none: "Nur für Dinge, die ich beobachte oder an denen ich beteiligt bin"
+label_user_mail_no_self_notified: "Ich möchte nicht über Änderungen benachrichtigt werden, die ich selbst durchführe."
+label_registration_activation_by_email: Kontoaktivierung durch E-Mail
+label_registration_manual_activation: Manuelle Kontoaktivierung
+label_registration_automatic_activation: Automatische Kontoaktivierung
+label_display_per_page: 'Pro Seite: %s'
+label_age: Alter
+label_change_properties: Eigenschaften ändern
+label_general: Allgemein
 
 button_login: Anmelden
 button_submit: OK
@@ -443,7 +487,7 @@ button_lock: Sperren
 button_unlock: Entsperren
 button_download: Download
 button_list: Liste
-button_view: Siehe
+button_view: Ansehen
 button_move: Verschieben
 button_back: Zurück
 button_cancel: Abbrechen
@@ -458,6 +502,10 @@ button_archive: Archivieren
 button_unarchive: Entarchivieren
 button_reset: Zurücksetzen
 button_rename: Umbenennen
+button_change_password: Kennwort ändern
+button_copy: Kopieren
+button_annotate: Mit Anmerkungen versehen
+button_update: Aktualisieren
 
 status_active: aktiv
 status_registered: angemeldet
@@ -477,6 +525,7 @@ text_tip_task_end_day: Aufgabe, die an diesem Tag endet
 text_tip_task_begin_end_day: Aufgabe, die an diesem Tag beginnt und endet
 text_project_identifier_info: 'Kleinbuchstaben (a-z), Ziffern und Bindestriche erlaubt.<br />Einmal gespeichert, kann die Kennung nicht mehr geändert werden.'
 text_caracters_maximum: Max. %d Zeichen.
+text_caracters_minimum: Muss mindestens %d Zeichen lang sein.
 text_length_between: Länge zwischen %d und %d Zeichen.
 text_tracker_no_workflow: Kein Workflow für diesen Tracker definiert.
 text_unallowed_characters: Nicht erlaubte Zeichen
@@ -488,13 +537,16 @@ text_wiki_destroy_confirmation: Sind Sie sicher, dass Sie dieses Wiki mit sämtl
 text_issue_category_destroy_question: Einige Tickets (%d) sind dieser Kategorie zugeodnet. Was möchten Sie tun?
 text_issue_category_destroy_assignments: Kategorie-Zuordnung entfernen
 text_issue_category_reassign_to: Tickets dieser Kategorie zuordnen
+text_user_mail_option: "Für nicht ausgewählte Projekte werden Sie nur Benachrichtigungen für Dinge erhalten, die Sie beobachten oder an denen Sie beteiligt sind (z. B. Tickets, deren Autor Sie sind oder die Ihnen zugewiesen sind)."
+text_no_configuration_data: "Rollen, Tracker, Ticket-Status und Workflows wurden noch nicht konfiguriert.\nEs ist sehr zu empfehlen, die Standard-Konfiguration zu laden. Sobald sie geladen ist, können Sie sie abändern."
+text_load_default_configuration: Standard-Konfiguration laden
 
 default_role_manager: Manager
-default_role_developper: Developer
+default_role_developper: Entwickler
 default_role_reporter: Reporter
 default_tracker_bug: Fehler
 default_tracker_feature: Feature
-default_tracker_support: Support
+default_tracker_support: Unterstützung
 default_issue_status_new: Neu
 default_issue_status_assigned: Zugewiesen
 default_issue_status_resolved: Gelöst
@@ -509,60 +561,8 @@ default_priority_high: Hoch
 default_priority_urgent: Dringend
 default_priority_immediate: Sofort
 default_activity_design: Design
-default_activity_development: Development
+default_activity_development: Entwicklung
 
 enumeration_issue_priorities: Ticket-Prioritäten
 enumeration_doc_categories: Dokumentenkategorien
 enumeration_activities: Aktivitäten (Zeiterfassung)
-label_file_plural: Dateien
-label_changeset_plural: Changesets
-field_column_names: Spalten
-label_default_columns: Default-Spalten
-setting_issue_list_default_columns: Default-Spalten in der Ticket-Auflistung
-setting_repositories_encodings: Repository-Kodierung
-notice_no_issue_selected: "Kein Ticket ausgewählt! Bitte wählen Sie die Tickets, die Sie bearbeiten möchten."
-label_bulk_edit_selected_issues: Alle ausgewählten Tickets bearbeiten
-label_no_change_option: (Keine Änderung)
-notice_failed_to_save_issues: "%d von %d ausgewählten Tickets konnte(n) nicht gespeichert werden: %s."
-label_theme: Stil
-label_default: Default
-label_search_titles_only: Nur Titel durchsuchen
-label_nobody: Niemand
-button_change_password: Kennwort ändern
-text_user_mail_option: "Für nicht ausgewählte Projekte werden Sie nur Benachrichtigungen für Dinge erhalten, die Sie beobachten oder an denen Sie beteiligt sind (z.B. Tickets, deren Autor Sie sind oder die Ihnen zugewiesen sind)."
-label_user_mail_option_selected: "Für alle Ereignisse in den ausgewählten Projekten..."
-label_user_mail_option_all: "Für alle Ereignisse in all meinen Projekten"
-label_user_mail_option_none: "Nur für Dinge, die ich beobachte oder an denen ich beteiligt bin"
-setting_emails_footer: E-Mail-Fußzeile
-label_float: Fließkommazahl
-button_copy: Kopieren
-mail_body_account_information_external: Sie können sich mit Ihrem Konto "%s" an Redmine anmelden.
-mail_body_account_information: Ihre Redmine Konto-Informationen
-setting_protocol: Protokoll
-label_user_mail_no_self_notified: "Ich möchte nicht über Änderungen benachrichtigt werden, die ich selbst durchführe."
-setting_time_format: Zeitformat
-label_registration_activation_by_email: Kontoaktivierung durch E-Mail
-mail_subject_account_activation_request: Antrag auf Redmine Kontoaktivierung
-mail_body_account_activation_request: 'Ein neuer Benutzer (%s) hat sich registriert. Sein Konto wartet auf Ihre Genehmigung:'
-label_registration_automatic_activation: Automatische Kontoaktivierung
-label_registration_manual_activation: Manuelle Kontoaktivierung
-notice_account_pending: "Ihr Konto wurde erstellt und wartet jetzt auf die Genehmigung des Administrators."
-field_time_zone: Zeitzone
-text_caracters_minimum: Muss mindestens %d Zeichen lang sein.
-setting_bcc_recipients: Blind carbon copy recipients (bcc)
-button_annotate: Annotate
-label_issues_by: Issues by %s
-field_searchable: Searchable
-label_display_per_page: 'Per page: %s'
-setting_per_page_options: Objects per page options
-label_age: Age
-notice_default_data_loaded: Default configuration successfully loaded.
-text_load_default_configuration: Load the default configuration
-text_no_configuration_data: "Roles, trackers, issue statuses and workflow have not been configured yet.\nIt is highly recommended to load the default configuration. You will be able to modify it once loaded."
-error_can_t_load_default_data: "Default configuration could not be loaded: %s"
-button_update: Update
-label_change_properties: Change properties
-label_general: General
-label_repository_plural: Repositories
-label_associated_revisions: Associated revisions
-setting_user_format: Users display format
diff --git a/lang/ru.yml b/lang/ru.yml
index 61ce06759..04b17b806 100644
--- a/lang/ru.yml
+++ b/lang/ru.yml
@@ -78,7 +78,8 @@ notice_account_pending: "Ваша учетная запись уже созда
 notice_default_data_loaded: Была загружена конфигурация по-умолчанию.
 
 error_scm_not_found: Хранилилище не содержит записи и/или исправления.
-error_scm_command_failed: "An error occurred when trying to access the repository: %s"
+error_scm_command_failed: "Ошибка доступа к хранилищу: %s"
+error_can_t_load_default_data: "Конфигурация по умолчанию не была загружена: %s"
 
 mail_subject_lost_password: Ваш Redmine пароль
 mail_body_lost_password: 'Для изменения Redmine пароля, зайдите по следующей ссылке:'
@@ -204,6 +205,7 @@ setting_emails_footer: Подстрочные примечания Emailов
 setting_protocol: Протокол
 setting_bcc_recipients: Использовать скрытые списки (bcc)
 setting_per_page_options: Кол-во строк на страницу
+setting_user_format: Формат отображения имени
 
 label_user: Пользователь
 label_user_plural: Пользователи
@@ -354,7 +356,7 @@ label_contains: содержит
 label_not_contains: не содержит
 label_day_plural: дней(я)
 label_repository: Хранилище
-label_browse: Искать
+label_browse: Обзор
 label_modification: %d изменение
 label_modification_plural: %d изменений
 label_revision: Редакция
@@ -565,6 +567,3 @@ default_activity_development: Разработка
 enumeration_issue_priorities: Приоритеты задач
 enumeration_doc_categories: Категории документов
 enumeration_activities: Действия (учет времени)
-
-error_can_t_load_default_data: "Конфигурация по умолчанию не была загружена: %s"
-setting_user_format: Users display format
diff --git a/lang/zh-tw.yml b/lang/zh-tw.yml
index 08b9057fa..d468b162b 100644
--- a/lang/zh-tw.yml
+++ b/lang/zh-tw.yml
@@ -30,22 +30,22 @@ activerecord_error_too_long: 長度過長
 activerecord_error_too_short: 長度太短
 activerecord_error_wrong_length: 長度不正確
 activerecord_error_taken: 已經被使用
-activerecord_error_not_a_number: is not a number
+activerecord_error_not_a_number: 不是一個數字
 activerecord_error_not_a_date: 日期格式不正確
 activerecord_error_greater_than_start_date: 必須在起始日期之後
 activerecord_error_not_same_project: 不屬於同一個專案
 activerecord_error_circular_dependency: 這個關聯會導致環狀相依
 
 general_fmt_age: %d 年
-general_fmt_age_plural: %d yrs
+general_fmt_age_plural: %d 年
 general_fmt_date: %%m/%%d/%%Y
 general_fmt_datetime: %%m/%%d/%%Y %%I:%%M %%p
 general_fmt_datetime_short: %%b %%d, %%I:%%M %%p
 general_fmt_time: %%I:%%M %%p
-general_text_No: 'No'
-general_text_Yes: 'Yes'
-general_text_no: 'no'
-general_text_yes: 'yes'
+general_text_No: '否'
+general_text_Yes: '是'
+general_text_no: '否'
+general_text_yes: '是'
 general_lang_name: 'Traditional Chinese (繁體中文)'
 general_csv_separator: ','
 general_csv_encoding: Big5
@@ -57,30 +57,29 @@ notice_account_updated: 帳戶更新資訊已儲存
 notice_account_invalid_creditentials: 帳戶或密碼不正確
 notice_account_password_updated: 帳戶新密碼已儲存
 notice_account_wrong_password: 密碼不正確
-notice_account_register_done: Account was successfully created. To activate your account, click on the link that was emailed to you.
-notice_account_unknown_email: Unknown user.
-notice_can_t_change_password: This account uses an external authentication source. Impossible to change the password.
-notice_account_lost_email_sent: An email with instructions to choose a new password has been sent to you.
-notice_account_activated: Your account has been activated. You can now log in.
+notice_account_register_done: 帳號已建立成功。欲啟用您的帳號，請點擊系統確認信函中的啟用連結。
+notice_account_unknown_email: 未知的使用者
+notice_can_t_change_password: 這個帳號使用外部認證方式，無法變更其密碼。
+notice_account_lost_email_sent: 包含選擇新密碼指示的電子郵件，已經寄出給您。
+notice_account_activated: 您的帳號已經啟用，可用它登入系統。
 notice_successful_create: 建立成功
 notice_successful_update: 更新成功
 notice_successful_delete: 刪除成功
-notice_successful_connection: Successful connection.
-notice_file_not_found: The page you were trying to access doesn't exist or has been removed.
-notice_locking_conflict: Data have been updated by another user.
+notice_successful_connection: 連線成功
+notice_file_not_found: 您想要存取的頁面已經不存在或被搬移至其他位置。
+notice_locking_conflict: 資料已被其他使用者更新。
 notice_not_authorized: 你未被授權存取此頁面。
 notice_email_sent: 郵件已經成功寄送至以下收件者： %s
 notice_email_error: 寄送郵件的過程中發生錯誤 (%s)
 notice_feeds_access_key_reseted: 您的 RSS 存取鍵已被重新設定。
-notice_failed_to_save_issues: "Failed to save %d issue(s) on %d selected: %s."
-notice_no_issue_selected: "No issue is selected! Please, check the issues you want to edit."
+notice_failed_to_save_issues: " %d 個項目儲存失敗 (總共選取 %d 個項目): %s."
+notice_no_issue_selected: "未選擇任何項目！請勾選您想要編輯的項目。"
 notice_account_pending: "您的帳號已經建立，正在等待管理員的審核。"
-notice_default_data_loaded: Default configuration successfully loaded.
+notice_default_data_loaded: 預設組態已載入成功。
 
-error_scm_not_found: SCM 儲存庫中找不到這個專案或版本。
-error_scm_command_failed: "An error occurred when trying to access the repository: %s"
-
-error_can_t_load_default_data: "Default configuration could not be loaded: %s"
+error_can_t_load_default_data: "無法載入預設組態： %s"
+error_scm_not_found: SCM 儲存庫中找不到這個專案與(或)版本。
+error_scm_command_failed: "嘗試存取儲存庫時發生錯誤：: %s"
 
 mail_subject_lost_password: 您的 Redmine 網站密碼
 mail_body_lost_password: '欲變更您的 Redmine 網站密碼, 請點選以下鏈結:'
@@ -133,8 +132,8 @@ field_role: 角色
 field_homepage: 網站首頁
 field_is_public: 公開
 field_parent: 父專案
-field_is_in_chlog: Issues displayed in changelog
-field_is_in_roadmap: Issues displayed in roadmap
+field_is_in_chlog: 項目顯示於變更記錄中
+field_is_in_roadmap: 項目顯示於版本藍圖中
 field_login: 帳戶名稱
 field_mail_notification: 電子郵件提醒選項
 field_admin: 管理者
@@ -176,7 +175,7 @@ field_estimated_hours: 預估工時
 field_column_names: Columns
 field_time_zone: 時區
 field_searchable: 可用做搜尋條件
-field_default_value: Default value
+field_default_value: 預設值
 
 setting_app_title: 標題
 setting_app_subtitle: 副標題
@@ -205,6 +204,7 @@ setting_repositories_encodings: Repositories encodings
 setting_emails_footer: 電子郵件附帶說明
 setting_protocol: 協定
 setting_per_page_options: 每頁顯示個數選項
+setting_user_format: 使用者顯示格式
 
 label_user: 用戶
 label_user_plural: 用戶清單
@@ -315,7 +315,7 @@ label_closed_issues_plural: 已結束
 label_total: 總計
 label_permissions: 權限
 label_current_status: 目前狀態
-label_new_statuses_allowed: New statuses allowed
+label_new_statuses_allowed: 可變更至以下狀態
 label_all: 全部
 label_none: 空值
 label_nobody: nobody
@@ -362,6 +362,7 @@ label_modification: %d 變更
 label_modification_plural: %d 變更
 label_revision: 版次
 label_revision_plural: 版次清單
+label_associated_revisions: Associated revisions
 label_added: 已新增
 label_modified: 已修改
 label_deleted: 已刪除
@@ -405,7 +406,7 @@ label_view_diff: View differences
 label_diff_inline: inline
 label_diff_side_by_side: side by side
 label_options: 選項清單
-label_copy_workflow_from: Copy workflow from
+label_copy_workflow_from: 從以下追蹤標籤複製工作流程
 label_permissions_report: 權限報表
 label_watched_issues: 觀察中的項目清單
 label_related_issues: 相關的項目清單
@@ -466,7 +467,7 @@ label_registration_manual_activation: 手動啟用帳戶
 label_registration_automatic_activation: 自動啟用帳戶
 label_display_per_page: '每頁顯示: %s 個'
 label_age: Age
-label_change_properties: Change properties
+label_change_properties: 變更屬性
 label_general: 一般
 
 button_login: 登入
@@ -512,33 +513,33 @@ status_locked: 鎖定中
 
 text_select_mail_notifications: 選擇欲寄送提醒通知郵件之動作
 text_regexp_info: eg. ^[A-Z0-9]+$
-text_min_max_length_info: 0 means no restriction
-text_project_destroy_confirmation: Are you sure you want to delete this project and all related data ?
-text_workflow_edit: Select a role and a tracker to edit the workflow
+text_min_max_length_info: 0 代表「不限制」
+text_project_destroy_confirmation: 您確定要刪除這個專案和其他相關資料？
+text_workflow_edit: 選擇角色與追蹤標籤以設定其工作流程
 text_are_you_sure: 確定執行？
 text_journal_changed: 從 %s 變更為 %s
 text_journal_set_to: 設定為 %s
-text_journal_deleted: deleted
-text_tip_task_begin_day: task beginning this day
-text_tip_task_end_day: task ending this day
-text_tip_task_begin_end_day: task beginning and ending this day
+text_journal_deleted: 已刪除
+text_tip_task_begin_day: 今天起始的工作
+text_tip_task_end_day: 今天截止的的工作
+text_tip_task_begin_end_day: 今天起始與截止的工作
 text_project_identifier_info: '只允許小寫英文字母（a-z）、阿拉伯數字與連字符號（-）。<br />儲存後，代碼不可再被更改。'
 text_caracters_maximum: 最多 %d 個字元.
 text_caracters_minimum: 長度必須大於 %d 個字元.
 text_length_between: 長度必須介於 %d 至 %d 個字元之間.
-text_tracker_no_workflow: No workflow defined for this tracker
-text_unallowed_characters: Unallowed characters
+text_tracker_no_workflow: 此追蹤標籤尚未定義工作流程
+text_unallowed_characters: 不允許的字元
 text_comma_separated: 可輸入多個值 (以逗號分隔).
 text_issues_ref_in_commit_messages: Referencing and fixing issues in commit messages
 text_issue_added: 已通報 %s 個項目
 text_issue_updated: 已更新 %s 個項目
-text_wiki_destroy_confirmation: Are you sure you want to delete this wiki and all its content ?
-text_issue_category_destroy_question: Some issues (%d) are assigned to this category. What do you want to do ?
-text_issue_category_destroy_assignments: Remove category assignments
-text_issue_category_reassign_to: Reassign issues to this category
+text_wiki_destroy_confirmation: 您確定要刪除這個 wiki 和其中的所有內容？
+text_issue_category_destroy_question: 有 (%d) 個項目被指派到此分類. 請選擇您想要的動作？
+text_issue_category_destroy_assignments: 移除這些項目的分類
+text_issue_category_reassign_to: 重新指派這些項目至其它分類
 text_user_mail_option: "For unselected projects, you will only receive notifications about things you watch or you're involved in (eg. issues you're the author or assignee)."
 text_no_configuration_data: "Roles, trackers, issue statuses and workflow have not been configured yet.\nIt is highly recommended to load the default configuration. You will be able to modify it once loaded."
-text_load_default_configuration: Load the default configuration
+text_load_default_configuration: 載入預設組態
 
 default_role_manager: 管理人員
 default_role_developper: 開發人員
@@ -565,5 +566,3 @@ default_activity_development: 開發
 enumeration_issue_priorities: 項目重要性
 enumeration_doc_categories: 文件分類
 enumeration_activities: 活動 (time tracking)
-label_associated_revisions: Associated revisions
-setting_user_format: Users display format

From b124501a4e825801024c873304757d3094753f02 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 3 Feb 2008 14:02:23 +0000
Subject: [PATCH 171/710] Add 'Author' to the available columns for the issue
 list.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1110 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/models/query.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/models/query.rb b/app/models/query.rb
index adfd5f42a..7127a464f 100644
--- a/app/models/query.rb
+++ b/app/models/query.rb
@@ -96,6 +96,7 @@ class Query < ActiveRecord::Base
     QueryColumn.new(:status, :sortable => "#{IssueStatus.table_name}.position"),
     QueryColumn.new(:priority, :sortable => "#{Enumeration.table_name}.position"),
     QueryColumn.new(:subject),
+    QueryColumn.new(:author),
     QueryColumn.new(:assigned_to, :sortable => "#{User.table_name}.lastname"),
     QueryColumn.new(:updated_on, :sortable => "#{Issue.table_name}.updated_on"),
     QueryColumn.new(:category, :sortable => "#{IssueCategory.table_name}.name"),

From 1ecef3a95ae0471707ce6490e9c725daabce9d67 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 3 Feb 2008 14:38:04 +0000
Subject: [PATCH 172/710] ProjectsController#add_news moved to
 NewsController#new. Preview added when adding/editing a news (#590).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1111 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/news_controller.rb      | 29 +++++++++++++++++++++++--
 app/controllers/projects_controller.rb  | 13 -----------
 app/views/news/edit.rhtml               | 12 ++++++++--
 app/views/news/index.rhtml              | 12 ++++++++--
 app/views/news/new.rhtml                | 14 ++++++++++++
 app/views/news/show.rhtml               | 10 ++++++++-
 app/views/projects/add_news.rhtml       |  6 -----
 lib/redmine.rb                          |  2 +-
 test/functional/news_controller_test.rb | 11 ++++++++++
 9 files changed, 82 insertions(+), 27 deletions(-)
 create mode 100644 app/views/news/new.rhtml
 delete mode 100644 app/views/projects/add_news.rhtml

diff --git a/app/controllers/news_controller.rb b/app/controllers/news_controller.rb
index 109afe454..66ed61cf4 100644
--- a/app/controllers/news_controller.rb
+++ b/app/controllers/news_controller.rb
@@ -17,7 +17,9 @@
 
 class NewsController < ApplicationController
   layout 'base'
-  before_filter :find_project, :authorize, :except => :index
+  before_filter :find_news, :except => [:new, :index, :preview]
+  before_filter :find_project, :only => :new
+  before_filter :authorize, :except => [:index, :preview]
   before_filter :find_optional_project, :only => :index
   accept_key_auth :index
   
@@ -36,6 +38,18 @@ class NewsController < ApplicationController
   def show
   end
 
+  def new
+    @news = News.new(:project => @project, :author => User.current)
+    if request.post?
+      @news.attributes = params[:news]
+      if @news.save
+        flash[:notice] = l(:notice_successful_create)
+        Mailer.deliver_news_added(@news) if Setting.notified_events.include?('news_added')
+        redirect_to :controller => 'news', :action => 'index', :project_id => @project
+      end
+    end
+  end
+  
   def edit
     if request.post? and @news.update_attributes(params[:news])
       flash[:notice] = l(:notice_successful_update)
@@ -64,14 +78,25 @@ class NewsController < ApplicationController
     redirect_to :action => 'index', :project_id => @project
   end
   
+  def preview
+    @text = (params[:news] ? params[:news][:description] : nil)
+    render :partial => 'common/preview'
+  end
+  
 private
-  def find_project
+  def find_news
     @news = News.find(params[:id])
     @project = @news.project
   rescue ActiveRecord::RecordNotFound
     render_404
   end
   
+  def find_project
+    @project = Project.find(params[:project_id])
+  rescue ActiveRecord::RecordNotFound
+    render_404
+  end
+  
   def find_optional_project
     return true unless params[:project_id]
     @project = Project.find(params[:project_id])
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 30e7ef85f..9560a451f 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -259,19 +259,6 @@ class ProjectsController < ApplicationController
     render :layout => false if request.xhr?
   end
 
-  # Add a news to @project
-  def add_news
-    @news = News.new(:project => @project, :author => User.current)
-    if request.post?
-      @news.attributes = params[:news]
-      if @news.save
-        flash[:notice] = l(:notice_successful_create)
-        Mailer.deliver_news_added(@news) if Setting.notified_events.include?('news_added')
-        redirect_to :controller => 'news', :action => 'index', :project_id => @project
-      end
-    end
-  end
-
   def add_file
     if request.post?
       @version = @project.versions.find_by_id(params[:version_id])
diff --git a/app/views/news/edit.rhtml b/app/views/news/edit.rhtml
index 5e015c4c7..a7e5e6e36 100644
--- a/app/views/news/edit.rhtml
+++ b/app/views/news/edit.rhtml
@@ -1,6 +1,14 @@
 <h2><%=l(:label_news)%></h2>
 
-<% labelled_tabular_form_for :news, @news, :url => { :action => "edit" } do |f| %>
+<% labelled_tabular_form_for :news, @news, :url => { :action => "edit" },
+                                           :html => { :id => 'news-form' } do |f| %>
 <%= render :partial => 'form', :locals => { :f => f } %>
 <%= submit_tag l(:button_save) %>
-<% end %>
\ No newline at end of file
+<%= link_to_remote l(:label_preview), 
+                   { :url => { :controller => 'news', :action => 'preview' },
+                     :method => 'post',
+                     :update => 'preview',
+                     :with => "Form.serialize('news-form')"
+                   }, :accesskey => accesskey(:preview) %>
+<% end %>
+<div id="preview" class="wiki"></div>
diff --git a/app/views/news/index.rhtml b/app/views/news/index.rhtml
index c6bb9ad5a..369eaf1b1 100644
--- a/app/views/news/index.rhtml
+++ b/app/views/news/index.rhtml
@@ -1,17 +1,25 @@
 <div class="contextual">
 <%= link_to_if_authorized(l(:label_news_new),
-                          {:controller => 'projects', :action => 'add_news', :id => @project},
+                          {:controller => 'news', :action => 'new', :project_id => @project},
                           :class => 'icon icon-add',
                           :onclick => 'Element.show("add-news"); return false;') if @project %>
 </div>
 
 <div id="add-news" style="display:none;">
 <h2><%=l(:label_news_new)%></h2>
-<% labelled_tabular_form_for :news, @news, :url => { :controller => 'projects', :action => "add_news", :id => @project } do |f| %>
+<% labelled_tabular_form_for :news, @news, :url => { :controller => 'news', :action => 'new', :project_id => @project },
+                                           :html => { :id => 'news-form' } do |f| %>
 <%= render :partial => 'news/form', :locals => { :f => f } %>
 <%= submit_tag l(:button_create) %>
+<%= link_to_remote l(:label_preview), 
+                   { :url => { :controller => 'news', :action => 'preview' },
+                     :method => 'post',
+                     :update => 'preview',
+                     :with => "Form.serialize('news-form')"
+                   }, :accesskey => accesskey(:preview) %> |
 <%= link_to l(:button_cancel), "#", :onclick => 'Element.hide("add-news")' %>
 <% end if @project %>
+<div id="preview" class="wiki"></div>
 </div>
 
 <h2><%=l(:label_news_plural)%></h2>
diff --git a/app/views/news/new.rhtml b/app/views/news/new.rhtml
new file mode 100644
index 000000000..9208d8840
--- /dev/null
+++ b/app/views/news/new.rhtml
@@ -0,0 +1,14 @@
+<h2><%=l(:label_news_new)%></h2>
+
+<% labelled_tabular_form_for :news, @news, :url => { :controller => 'news', :action => 'new', :project_id => @project },
+                                           :html => { :id => 'news-form' } do |f| %>
+<%= render :partial => 'news/form', :locals => { :f => f } %>
+<%= submit_tag l(:button_create) %>
+<%= link_to_remote l(:label_preview), 
+                   { :url => { :controller => 'news', :action => 'preview' },
+                     :method => 'post',
+                     :update => 'preview',
+                     :with => "Form.serialize('news-form')"
+                   }, :accesskey => accesskey(:preview) %>
+<% end %>
+<div id="preview" class="wiki"></div>
diff --git a/app/views/news/show.rhtml b/app/views/news/show.rhtml
index bff737f40..cc9eed043 100644
--- a/app/views/news/show.rhtml
+++ b/app/views/news/show.rhtml
@@ -10,11 +10,19 @@
 <h2><%=h @news.title %></h2>
 
 <div id="edit-news" style="display:none;">
-<% labelled_tabular_form_for :news, @news, :url => { :action => "edit", :id => @news } do |f| %>
+<% labelled_tabular_form_for :news, @news, :url => { :action => "edit", :id => @news },
+                                           :html => { :id => 'news-form' } do |f| %>
 <%= render :partial => 'form', :locals => { :f => f } %>
 <%= submit_tag l(:button_save) %>
+<%= link_to_remote l(:label_preview), 
+                   { :url => { :controller => 'news', :action => 'preview' },
+                     :method => 'post',
+                     :update => 'preview',
+                     :with => "Form.serialize('news-form')"
+                   }, :accesskey => accesskey(:preview) %> |
 <%= link_to l(:button_cancel), "#", :onclick => 'Element.hide("edit-news")' %>
 <% end %>
+<div id="preview" class="wiki"></div>
 </div>
 
 <p><em><% unless @news.summary.empty? %><%=h @news.summary %><br /><% end %>
diff --git a/app/views/projects/add_news.rhtml b/app/views/projects/add_news.rhtml
deleted file mode 100644
index a6ecd3da7..000000000
--- a/app/views/projects/add_news.rhtml
+++ /dev/null
@@ -1,6 +0,0 @@
-<h2><%=l(:label_news_new)%></h2>
-
-<% labelled_tabular_form_for :news, @news, :url => { :action => "add_news" } do |f| %>
-<%= render :partial => 'news/form', :locals => { :f => f } %>
-<%= submit_tag l(:button_create) %>
-<% end %>
\ No newline at end of file
diff --git a/lib/redmine.rb b/lib/redmine.rb
index 92a1cef14..c4c55a932 100644
--- a/lib/redmine.rb
+++ b/lib/redmine.rb
@@ -51,7 +51,7 @@ Redmine::AccessControl.map do |map|
   end
   
   map.project_module :news do |map|
-    map.permission :manage_news, {:projects => :add_news, :news => [:edit, :destroy, :destroy_comment]}, :require => :member
+    map.permission :manage_news, {:news => [:new, :edit, :destroy, :destroy_comment]}, :require => :member
     map.permission :view_news, {:news => [:index, :show]}, :public => true
     map.permission :comment_news, {:news => :add_comment}
   end
diff --git a/test/functional/news_controller_test.rb b/test/functional/news_controller_test.rb
index 8a02345fd..397e928f1 100644
--- a/test/functional/news_controller_test.rb
+++ b/test/functional/news_controller_test.rb
@@ -45,4 +45,15 @@ class NewsControllerTest < Test::Unit::TestCase
     assert_template 'index'
     assert_not_nil assigns(:newss)
   end
+  
+  def test_preview
+    get :preview, :project_id => 1,
+                  :news => {:title => '',
+                            :description => 'News description',
+                            :summary => ''}
+    assert_response :success
+    assert_template 'common/_preview'
+    assert_tag :tag => 'fieldset', :attributes => { :class => 'preview' },
+                                   :content => /News description/
+  end
 end

From c3d909e0cc11831cbe9cff385111d4960489034a Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 3 Feb 2008 15:15:52 +0000
Subject: [PATCH 173/710] Slight style changes on issue associated changesets
 list.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1112 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/issues/_changesets.rhtml | 12 ++++++------
 public/stylesheets/application.css |  7 ++++---
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/app/views/issues/_changesets.rhtml b/app/views/issues/_changesets.rhtml
index 1a4c1a5bd..caa983cbf 100644
--- a/app/views/issues/_changesets.rhtml
+++ b/app/views/issues/_changesets.rhtml
@@ -1,8 +1,8 @@
-<ul>
 <% changesets.each do |changeset| %>
-    <li class="<%= cycle('odd', 'even') %>"><%= link_to("#{l(:label_revision)} #{changeset.revision}",
-                    :controller => 'repositories', :action => 'revision', :id => @project, :rev => changeset.revision) %><br />
-        <em><%= changeset.committer %>, <%= format_time(changeset.committed_on) %></em>
-    <%= textilizable(changeset, :comments) %></li>
+    <div class="changeset <%= cycle('odd', 'even') %>">
+    <p><%= link_to("#{l(:label_revision)} #{changeset.revision}",
+                :controller => 'repositories', :action => 'revision', :id => @project, :rev => changeset.revision) %><br />
+        <span class="author"><%= authoring(changeset.committed_on, changeset.committer) %></span></p>
+    <%= textilizable(changeset, :comments) %>
+    </div>
 <% end %>
-</ul>
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index eb4e855b4..1090d8c87 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -136,9 +136,10 @@ textarea.wiki-edit { width: 99%; }
 li p {margin-top: 0;}
 div.issue {background:#ffffdd; padding:6px; margin-bottom:6px;border: 1px solid #d7d7d7;}
 
-div#issue-changesets {float:right; width:45%; margin-left: 1em; margin-bottom: 1em; background: #fff; padding-left: 1em;}
-div#issue-changesets ul {list-style-position: outside; list-style-type:none; margin: 0;  padding: 0;}
-div#issue-changesets li { padding: 4px; }
+div#issue-changesets {float:right; width:45%; margin-left: 1em; margin-bottom: 1em; background: #fff; padding-left: 1em; font-size: 90%;}
+div#issue-changesets .changeset { padding: 4px;}
+div#issue-changesets .changeset { border-bottom: 1px solid #ddd; }
+div#issue-changesets p { margin-top: 0; margin-bottom: 1em;}
 
 .autoscroll {overflow-x: auto; padding:1px; width:100%; margin-bottom: 1.2em;}
 #user_firstname, #user_lastname, #user_mail, #my_account_form select { width: 90%; }

From 2920daf2c81a667ea6495cc5426de9a05e0e55e2 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 3 Feb 2008 15:34:58 +0000
Subject: [PATCH 174/710] Do not use RedCloth's glyphs (#210).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1113 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 lib/redcloth.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/redcloth.rb b/lib/redcloth.rb
index 904701c9e..b614614c4 100644
--- a/lib/redcloth.rb
+++ b/lib/redcloth.rb
@@ -272,7 +272,7 @@ class RedCloth < String
         @shelf = []
         textile_rules = [:refs_textile, :block_textile_table, :block_textile_lists,
                          :block_textile_prefix, :inline_textile_image, :inline_textile_link,
-                         :inline_textile_code, :inline_textile_span, :glyphs_textile]
+                         :inline_textile_code, :inline_textile_span]
         markdown_rules = [:refs_markdown, :block_markdown_setext, :block_markdown_atx, :block_markdown_rule,
                           :block_markdown_bq, :block_markdown_lists, 
                           :inline_markdown_reflink, :inline_markdown_link]

From 0beafecd3bd490be646263bbbe9bce2c35bbdcb5 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 3 Feb 2008 16:21:51 +0000
Subject: [PATCH 175/710] Fixed #208: Issue list does not scroll up when you
 click next

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1114 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/helpers/application_helper.rb | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 1dfb57ff8..c8b55a695 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -119,17 +119,23 @@ module ApplicationHelper
     
     html = ''    
     html << link_to_remote(('&#171; ' + l(:label_previous)), 
-                            {:update => "content", :url => url_param.merge(page_param => paginator.current.previous)},
+                            {:update => 'content',
+                             :url => url_param.merge(page_param => paginator.current.previous),
+                             :complete => 'window.scrollTo(0,0)'},
                             {:href => url_for(:params => url_param.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 => url_param.merge(page_param => n)}, :update => 'content'},
+                      {:url => {:params => url_param.merge(page_param => n)},
+                       :update => 'content',
+                       :complete => 'window.scrollTo(0,0)'},
                       {:href => url_for(:params => url_param.merge(page_param => n))})
     end || '')
     
     html << ' ' + link_to_remote((l(:label_next) + ' &#187;'), 
-                                 {:update => "content", :url => url_param.merge(page_param => paginator.current.next)},
+                                 {:update => 'content',
+                                  :url => url_param.merge(page_param => paginator.current.next),
+                                  :complete => 'window.scrollTo(0,0)'},
                                  {:href => url_for(:params => url_param.merge(page_param => paginator.current.next))}) if paginator.current.next
     
     unless count.nil?

From 5dd3c239d35742b586dfac2ba829782561ff4365 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 3 Feb 2008 17:24:58 +0000
Subject: [PATCH 176/710] Fixed: error when uploading a file with no
 content-type specified by the browser.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1115 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/models/attachment.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/attachment.rb b/app/models/attachment.rb
index 927aa1735..c9783b9ce 100644
--- a/app/models/attachment.rb
+++ b/app/models/attachment.rb
@@ -42,7 +42,7 @@ class Attachment < ActiveRecord::Base
 			if @temp_file.size > 0
 				self.filename = sanitize_filename(@temp_file.original_filename)
 				self.disk_filename = DateTime.now.strftime("%y%m%d%H%M%S") + "_" + self.filename
-				self.content_type = @temp_file.content_type.chomp
+				self.content_type = @temp_file.content_type.to_s.chomp
 				self.filesize = @temp_file.size
 			end
 		end

From 9c451ac15728ffd104d98a605435dee3cb4b39cd Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 3 Feb 2008 17:34:31 +0000
Subject: [PATCH 177/710] Set wiki class to issue notes.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1116 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/helpers/journals_helper.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/helpers/journals_helper.rb b/app/helpers/journals_helper.rb
index c97446448..2f902432d 100644
--- a/app/helpers/journals_helper.rb
+++ b/app/helpers/journals_helper.rb
@@ -27,7 +27,7 @@ module JournalsHelper
       content << content_tag('div', links.join(' '), :class => 'contextual')
     end
     content << textilizable(journal, :notes)
-    content_tag('div', content, :id => "journal-#{journal.id}-notes", :class => (editable ? 'editable' : nil))
+    content_tag('div', content, :id => "journal-#{journal.id}-notes", :class => (editable ? 'wiki editable' : 'wiki'))
   end
   
   def link_to_in_place_notes_editor(text, field_id, url, options={})

From 09cfef094cc9ba49da9a2d4435eef5079c6682ad Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 3 Feb 2008 18:05:26 +0000
Subject: [PATCH 178/710] New icons for the wiki toolbar (from
 http://www.famfamfam.com/lab/icons/silk/).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1117 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 public/images/jstoolbar/bt_br.png              | Bin 244 -> 0 bytes
 public/images/jstoolbar/bt_code.png            | Bin 338 -> 1045 bytes
 public/images/jstoolbar/bt_del.png             | Bin 368 -> 368 bytes
 public/images/jstoolbar/bt_em.png              | Bin 311 -> 312 bytes
 public/images/jstoolbar/bt_h1.png              | Bin 995 -> 362 bytes
 public/images/jstoolbar/bt_h2.png              | Bin 994 -> 371 bytes
 public/images/jstoolbar/bt_h3.png              | Bin 993 -> 376 bytes
 public/images/jstoolbar/bt_img.png             | Bin 566 -> 1142 bytes
 public/images/jstoolbar/bt_ins.png             | Bin 322 -> 1055 bytes
 public/images/jstoolbar/bt_link.png            | Bin 900 -> 408 bytes
 public/images/jstoolbar/bt_ol.png              | Bin 249 -> 363 bytes
 public/images/jstoolbar/bt_pre.png             | Bin 224 -> 1040 bytes
 public/images/jstoolbar/bt_quote.png           | Bin 323 -> 0 bytes
 public/images/jstoolbar/bt_strong.png          | Bin 355 -> 360 bytes
 public/images/jstoolbar/bt_ul.png              | Bin 239 -> 365 bytes
 public/javascripts/jstoolbar/jstoolbar.js      |   9 ---------
 .../javascripts/jstoolbar/lang/jstoolbar-bg.js |   3 +--
 .../javascripts/jstoolbar/lang/jstoolbar-cs.js |   1 -
 .../javascripts/jstoolbar/lang/jstoolbar-de.js |   1 -
 .../javascripts/jstoolbar/lang/jstoolbar-en.js |   3 +--
 .../javascripts/jstoolbar/lang/jstoolbar-es.js |   3 +--
 .../javascripts/jstoolbar/lang/jstoolbar-fi.js |   3 +--
 .../javascripts/jstoolbar/lang/jstoolbar-fr.js |   3 +--
 .../javascripts/jstoolbar/lang/jstoolbar-he.js |   3 +--
 .../javascripts/jstoolbar/lang/jstoolbar-it.js |   3 +--
 .../javascripts/jstoolbar/lang/jstoolbar-ja.js |   3 +--
 .../javascripts/jstoolbar/lang/jstoolbar-ko.js |   3 +--
 .../javascripts/jstoolbar/lang/jstoolbar-lt.js |   3 +--
 .../javascripts/jstoolbar/lang/jstoolbar-nl.js |   3 +--
 .../javascripts/jstoolbar/lang/jstoolbar-pl.js |   3 +--
 .../jstoolbar/lang/jstoolbar-pt-br.js          |   3 +--
 .../javascripts/jstoolbar/lang/jstoolbar-pt.js |   3 +--
 .../javascripts/jstoolbar/lang/jstoolbar-ro.js |   3 +--
 .../javascripts/jstoolbar/lang/jstoolbar-ru.js |   1 -
 .../javascripts/jstoolbar/lang/jstoolbar-sr.js |   3 +--
 .../javascripts/jstoolbar/lang/jstoolbar-sv.js |   3 +--
 .../jstoolbar/lang/jstoolbar-zh-tw.js          |   1 -
 .../javascripts/jstoolbar/lang/jstoolbar-zh.js |   3 +--
 38 files changed, 18 insertions(+), 49 deletions(-)
 delete mode 100644 public/images/jstoolbar/bt_br.png
 delete mode 100644 public/images/jstoolbar/bt_quote.png

diff --git a/public/images/jstoolbar/bt_br.png b/public/images/jstoolbar/bt_br.png
deleted file mode 100644
index f8211a997071140a527e3ade540842b927a1baaf..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 244
zcmeAS@N?(olHy`uVBq!ia0vp^A|TAf3?x51|2hvyF&8^|hH!9j+<xf)0LbMG@Ck7R
z(r;efn=-k3j@X6`AT=dHe!>44{%5|C-v?4t;1OBOz`!j8!i<;h*8Kqrij}xVlsFfq
zCYEI8=P86_=B6?j80s5X=o^?+6*DLSRVaW|1m~xflqVLYGWaGY7v<-srer26xMdcl
zmgg5`7c2Ni?4GEl0#vK&>EaktF(;XWm66RxMLW!h$H%SVB#Xh#0}Tqo2db10q)3EK
ZW)$+2)3>XAkPFnn;OXk;vd$@?2>>LEMzsI{

diff --git a/public/images/jstoolbar/bt_code.png b/public/images/jstoolbar/bt_code.png
index 52924abf7c038c03fd1709422b0b426c18b39622..8b6aefbb5effeedceb8929e2bc6631d64771190d 100644
GIT binary patch
literal 1045
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbL!eu-;DiE~kEVo7Fxo<c}wZYo1r
zYM!2gp@l+LVqTe^f{}rNg@Tcxm9epvp|OItfuVsx)+!cNpjP%0PhVH|8;rsniWbj*
zOFjb%aTa()7Bet#eE?xbr!^)sfPyUPj=qiz3>*8o|0J?9FfcO&_=LFrXJEK@?_N(&
zPjPYaxpU{Tv$I=TT9T8K_wL>M{{8!)prEyD*DhVU^w_auQ>ILL{`~p(@85w&je^k-
z7#<<uz%k7P=o7}0AirP+hi5m^fSdqN7srr_TXXvY`5Fv3oU;=bSoD6kUwgaV_=tq?
zZ|7e@TnGGDPF0hv`|OnP{j@yKx08Y$D^@OK{L9iW>YcE$Lv+Psoh|jLcK2s?DxEp{
b-iq=5ZpIyE$5sGyBLjn{tDnm{r-UW|=&*Ik

literal 338
zcmeAS@N?(olHy`uVBq!ia0vp^A|TAd3?%E9GuQzs=3*z$5DpHG+YkL80J&NLJ|V6^
z`sw5AU7byVfxgF&?p9GzDl5&OIdkUio96@s_!ASNjg5^rZ(Q-_)xEu2<*k6K`AUNP
zg8w4}2G;|3P5@;%3p^r=85p>QK$!8;-MT+OL9r6oh!W?b)Wnj^{5*w_%-mE414DfS
z3w;BVs$vEupb7<$is1aTlJdl&R0iL~<f8oC)RfFb1-Hzi)bjkI>|zDqh}{#lRDf#3
zJzX3_D&{2b;AZD>F$`_?KIb%pm4}CCPr@@%w!6~O3TIa9l)t~%V!-<C-rnk3-5D<@
zaGNt)e?AnWaF;vnUJ~1^1B@G!n8L-bbnU(_Au%H{Z^uKYDb<Xz<x{t(_GT;wTEXDy
L>gTe~DWM4f*y?%F

diff --git a/public/images/jstoolbar/bt_del.png b/public/images/jstoolbar/bt_del.png
index c6f3a8b40ed5d3845587a888d25f0941536764cb..36a912b65151f3bdad6e6ac7bf82a850bcf5e002 100644
GIT binary patch
literal 368
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbL!eu-;DiE~kEVo7Fxo<c}wZYo1r
zYM!2gp@l+LVqTe^f{}rNg@Tcxm9epvfr)~)fuVsx@^ULvpjP%0PhVH|8;n9CdQuY2
zm3x3foCO|{#S9GGLLkg|>2BR0pdd@Sqpu?a!^VE@KZ&eBzF&Y(i0gj_hP7+gT3T8L
z1qDr+GG*z~r9C}8)z#JCzkgR$RNT6CtAvDvp`oFZlarU1*WSH*i;Ih+qN0GhTUuI@
zlar4fJ9h2bwR`vOojZ4K&YU^nR^M}ga*QQGe!&b5&u*jvIkBEDjv*Dd=Jwv^Yf#{E
zHfLYaz`+#v@4tI%%YnGBD%qFPd>QLDomeyf1k-xP32o;&yU!_G1Ph4YStHaLbL#Ay
zeL`x*A|cY6?XyewE=&zgu5Jka8!5`|;c+x=|3{`CCZ@fS0iCTtix@mz{an^LB{Ts5
Di@1HC

literal 368
zcmeAS@N?(olHy`uVBq!ia0vp^A|TAc3?z4jzqJQa%*9TgAsieWw;%dH0CJ53d_r7-
z^qW`rCQs^$2oKiQ);xFiP+4g{A0O|=^~*dxT+`Ch?%ux8(p+<3-xgUJX)7!9MGI#L
z`5w^%Y7;C8@(cdY@E;Yh-t)HrN^%x>L>4nJa0`Jj<E6WGe}IBwC9V-A&PAz-C7Jno
z3L%-fsSE~&`UV#I1}0U-3`#&13Lq81`DrEPiAAXlzKO|2`MIennTZN+nMJAP`9;~q
z3ceA$Cu*qx)n<CSIEGZrnR~%es6l~)HDHR!kxlRFZ(UJa9-rIAYHTMOP^9m8-!P*<
zkNKI%)y<j;#kXe)oQ%3B;QFhIvBzba{N2^3dOVch9nMy4d%f3Jk0rxBkuj$B^vMq?
owTtGN-HSW@O5)4$`nY8F>PgJp2m3F609wl6>FVdQ&MBb@09uNP{r~^~

diff --git a/public/images/jstoolbar/bt_em.png b/public/images/jstoolbar/bt_em.png
index f08de4f307569c741e1d120cd718d3073317e4b3..caa808236c6afd3284c222e34c3554616130d36c 100644
GIT binary patch
literal 312
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbL!eu-;DiE~kEVo7Fxo<c}wZYo1r
zYM!2gp@l+LVqTe^f{}rNg@Tcxm9dePiGhN)fuVuHpM>g1K&|X0p1!W^HyDLP^!cQn
z<}?6>I14-?iy0WWg+Q3`(%rg0KtYytM_)$<hK>E)e-c@Ne6s+b5ZC_<3{$2|Nls3V
zii!#f3OaZ0oS~tiqN3v7y?dRUoT{s<@7=rS<>fVJ&YYf}p5o%-ty{NdXJ;?@ey0y;
z0%J*#UoeBivm0qZj;*JQV@SoVx&5Ae3<^9<+H1Y<{{5eB`#3O9K#gT${#)h{uW4eR
x&Q6(_IGOoNd%<(3f_VboK1ZfVHc0*RkL?p<`1HWbbUM%=22WQ%mvv4FO#u8CWH<l-

literal 311
zcmeAS@N?(olHy`uVBq!ia0vp^A|TAd3?%E9GuQzs=3*z$5DpHG+YkL80J-V`J|V6^
z`pv6*ix$pEOG}Fg559Z*f~<`6<Vjrz_HE(g<2`rwP+4idwzg&(#}!_nQr?mvzu^B2
z{}Dj#^PW7Q1ZROqWHAE+w-5+3Ub<WN2Pi03;u=xnT$Gwvl9`{U5R#dj%3xrqZ(yNs
zU{Y1gpafK*08$a0pH@<ySd_}(o0wdbpPQPJnW*5FS(I9yUzA;};2W`fqLvC!t%IkF
zV@SoEWPuiDwnZ}*alL6Y2xN5M(bVQ-QS7WRr;=@9uk<;Q=MBcLLJxgB-7Pjd3Z66J
kXfd4buc3Nxq5uQK{~5yU`JE4M0?lIZboFyt=akR{01EDCz5oCK

diff --git a/public/images/jstoolbar/bt_h1.png b/public/images/jstoolbar/bt_h1.png
index 01f3eec0da09b79d6f034e68cfd31179826f7f17..b64e759941a2987a813f7c9a3b6d85320c7a2b43 100644
GIT binary patch
delta 351
zcmaFN{)$PlGr-TCmrII^fq{Y7)59eQNDF{42Q!e=(B%)Fs3=xnmYS!hU}&L`m6%ti
zr(k4YV4+}SXk~0{Wn`$JZD43%P`pd%Jy1P+iKnkC`wd1R5nbh+)r-o3LYxI2k;M!Q
z+(IDCc<FB4AD|#hx}&cn1H;CC?mvmFK)!c?Pl)S(28KCv=2TZ#7Z(?A-MV${+O^5a
z$x%^JEiLseK|w*!pFh{s)cpVde@{=3goH$PcDA9R;gl&;6crUMEiIQWUFziI<mKgc
z?%cU!$BwOg&Zh)4m$4+sFPOpM*^M+HC(6^sF{I+w+VkFG4GJ8r0Z0C*E}1&@cYNlI
zKB?0W<{qx~VVGgqy3^_F3YA?E(+<p@H-&u*lfIHDyNYRWm+%et9c2^!8W%esVEf5#
pCiL;!TduE6$E@;mF1()NA9wr|vw8GHT?wEy44$rjF6*2UngCS)d4vD}

literal 995
zcmeAS@N?(olHy`uVBq!ia0vp^A|TAc3?z4jzqJQa`X#OrCC){ui6xo&c?uz!xv2~(
znYnrjhQ<n6iFsvu3PuJ777B*uR;CtKMwSZN28IR(C%7WDfLhs0Jbhi+Z!q!-idffw
zGTI3g;w<opEM{Qf`T)X=PHRkN00mjn9eo`c7&i8E|4C$JU|?nl@Ck7Rihuw9{r@N!
z4S^9E0_Www$pZ6$wx^3@NX4z>gd<E69>OUMOd?Xt6_lB;h-mn#I!Y+$cyQk~WcB0_
cNMe#?U^&QWnY-YWH&7dcr>mdKI;Vst0GR|Z`2YX_

diff --git a/public/images/jstoolbar/bt_h2.png b/public/images/jstoolbar/bt_h2.png
index 36b15048e67810f070655de8d1c67fa7d2d3b04a..1e88cb936d295fffc18d41ff2dfafd98473bd91a 100644
GIT binary patch
delta 360
zcmaFF{+UU!Gr-TCmrII^fq{Y7)59eQNDF{42Q!e=(B%)Fs3=xnmYS!hU}&L`m6%ti
zr(k4YV4+}SXk~0{Wn`hCZD43%@JuP(2B@CB#M9T6{RX3uh%TRI$v-Bb5NCl$WHAE+
zw-5+3Ub<WN2Pnvr?&#~tz_78O`%fY(kna)T6XN=xfnm;^In~wG#l^*2w{Bg#c5QNU
za#U1Qc6NPsP*9MjrslC@#|#Y(EiEno|NsB}`}ceI?zObET)TE{>C&Z6PEOCCKkw=3
z*}He|`K}|mKtmZzg8YIR9G=}s19H+lT^vIyZmm7<&DWs7!*U^L;=^bMyL<naadG=6
zh@XA3bmkJ5dY{?G7h)qtw|y5gzJIhf;ZQ$sspBQ*CVo5VH#enrbtpVzjSx5MG+1}{
zVTGee*re0!$J#lje~}iIpXJBQ{rrr6{{?0aS>~x+f?lyeD;Ydp{an^LB{Ts59_fGD

literal 994
zcmeAS@N?(olHy`uVBq!ia0vp^A|TAc3?z4jzqJQa`X#OrCC){ui6xo&c?uz!xv2~(
znYnrjhQ<n6iFsvu3PuJ777B*uR;HF#CT0rS28IR(;_tnyfLhs0Jbhi+Z!q!-il}FQ
z&ie)w;w<opEM{Qf`T)X=PHRkN00mjn9eo`c7&i8E|4C$JU|?nl@Ck7Rihuw9{r@N!
z4S^9E0_Www$pZ6$mZytjNX4z>gd<E68EPjOSU9-mD=0HFbGhzP5D`%HSm-*VNu^?P
b#{y;sVLe9YlT}%<KwS);u6{1-oD!M<TN5))

diff --git a/public/images/jstoolbar/bt_h3.png b/public/images/jstoolbar/bt_h3.png
index 029d648e54ebdbaa7c246c76493247dbcfe94c25..646bad11d9d38bfafe8581ae47d75da433a74835 100644
GIT binary patch
delta 365
zcmaFJ{)0)eGr-TCmrII^fq{Y7)59eQNDF{42Q!e=(B%)Fs3=xnmYS!hU}&L`m6%ti
zr(k4YV4+}SXk~0{Wo)LPZD43%P_<p>KTth;iKnkC`wd1R5gp?U_GXY_oCO|{#S9GG
zLLkg|>2BR0pdd@Sqpu?a!^VE@KZ&eBzF&Y(h%3;5IdkSzS63Go7jNCVb?w@<$;ru4
zQBf@|^({d`L7JMHQ>IK&R8%~6?AWzy*CZq)va_@Q|NnpQ-o2il9!pEh=g*&ed3h~e
zy41<ZY46^>_lxFK1C3@Z3GxeOaCmkj4aiCLba4!+xV84YH(!GS56gw14S%KviSGRG
z%Ia&=80({^zghEu{B;+jlJ-?eFZ(C-9GL8xQ*qGOdB=|j&*C+_v&$Hk{%Dxny~$WU
z-ALHRk7M<tT_@Q^l1{yz<{r9&S0`nwa&BEEOP+2w^NVR);-r8!GI+ZBxvX<aXaWGU
CT!I(?

literal 993
zcmeAS@N?(olHy`uVBq!ia0vp^A|TAc3?z4jzqJQa`X#OrCC){ui6xo&c?uz!xv2~(
znYnrjhQ<n6iFsvu3PuJ777B(IRt5%E28IgS28IR(e+)D?1GTc3c>21s-(chw)Z}tG
zQe_Ji;w<opEM{Qf`T)X=PHRkN00mjn9eo`c7&i8E|4C$JU|?nl@Ck7Rihuw9{r@N!
z4S^9E0_Www$pZ6$rl*TzNX4z>gd<E6Y;hA9IRr%P9NpMNxb`cE2q=2&nK`3L#bVwJ
a21W)sGe&ROS<)szO$?r{elF{r5}E+@I53j{

diff --git a/public/images/jstoolbar/bt_img.png b/public/images/jstoolbar/bt_img.png
index 91c9a8a87caa26e20c36a13412c39b7ba9bda2fc..ddded465c9bd9e10697f8789e5df1f0fe413e06b 100644
GIT binary patch
literal 1142
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbL!eu-;DiE~kEVo7Fxo<c}wZYo1r
zYM!2gp@l+LVqTe^f{}rNg@Tcxm9dGHp^<{NfuVtc9;3($pjP%0PhVH|8;n9CCITMS
zS(QK`&H|6fVg?4T4<O9ww8mrxP>?0v(btiIVPik{pF~y$24;o;pAc8CY=)p}AQFgb
zVTkHsNN&+gp2CnkMId>KVe%Y?Y#>?+MCXc^G88X8R=o6m@zU?bYo8ad{a(EFfAtin
z>N#H3YXz#e9;@DZu4Rr_%bcK=rP(c84O_MbO<9{gWv}IwV?Z=z&N0iS=Yp1=Ygu}(
zXYIMDwbzojUQ6D4uXyjh>T~DL-Me@1IS{=6{vHIrzyJRIKLf-6Q7{?;v=4y?^Y?;s
zp>au&Uoh#mF%-_*+XvKM@9E+gQgJKy{Ar;k1D@8072RU4?yDXw@Q@8;Q`++3AOG^s
z*<5v}>(4!NuxD6&;X*&#i&X1}F~1!h%AP;G;5skg!nRB4V%7dm6ZZ1euUBbp*4aC6
zyU?lUcW2z0ar)s5uM>|8&N|J}v)IBI?4@|lL2R|E(z&Bg@;97I&is@5;~OvYEydrC
T@24LDI)%a0)z4*}Q$iB}Fpym5

delta 521
zcmV+k0`~p(2(|<viBL{Q4GJ0x0000DNk~Le0000K0000K2m$~A00QfZT9F|ZIAm#U
zE+8>8AZlT5b}k??FfceEF*rIfFgh?XAS*C2FfjZuDYF0o00(qQO+^RT0Sys0F*uc-
zhmmh5e*ua~L_t(|+QpN-PQx%1g>A=95NQYqk<tl-5Fi8yCM4K+0A@xW2(j@1tnADz
z42(!fpl(%LMg6B~BNE54jgyu_+e~HX9jue%d_Kvw4TB&6vlg0}oGXk+>f!O(?ISJ#
z=OC7e6HCkiQGx*yNev(aaC&_T5BB#a;ehKEf4K$VUvIJ?79FpekxVc`ILU#@0@K{k
z^h2Hj>lk5dr0@L_Q!Bub$xIk(L>~jj<nVzCEd$1yf(?VbZs(tf_NAPndl9lTC3sY4
ztY(-;5TYo~f|=kOYj->Ox(eZvD(7VL{=IaYz#Xz`IbBbF;w!X(Ghm9#>(*PRPZ<yV
zf3TTs6^~Xd^&_CmdgW?EC#H#RD7pmTcxtOyyW9L|dPSeMrA)e_1}KwLgdp(|@0FKr
z({XZfMsnMC-NuU$JOR^=Dj}sv1y%jha;-|Ob-rt7eYPj!_>jgWC_D+|51h`WBi6y9
z4IDc^LjHBO;pjelo|mQ#YoG^H1BWrzBlrC!%PJHKlkf~Rzx(_RY_z<Fdu1od00000
LNkvXXu0mjfq0ZS#

diff --git a/public/images/jstoolbar/bt_ins.png b/public/images/jstoolbar/bt_ins.png
index f6697db5103fec1c4cff342e6ae86c098ab039ce..92c8dff698f319d0801cf6480fe41f3665e8489c 100644
GIT binary patch
literal 1055
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbL!eu-;DiE~kEVo7Fxo<c}wZYo1r
zYM!2gp@l+LVqTe^f{}rNg@Tcxm9dePsfmKNfuVuHk=FQppjP%0PhVH|8;n9C2HJCF
z+#-QOoCO|{#S9EwA3&JVX^qJYpdd@Sqpu?a!^VE@KZ&di49pAxJ|V9E85lG*H5C;V
zB_t#S1OzxZIDjgjKYw0bT^$t_b?)3bFE6iS$BsEUIn9|fr=_JOC@3g7Ik~5&Cp$ZP
z%9JU^#l_#hf8V-wD^S-c7!83T7Xlow)?WrXnz1CvFPOpM*^M+HC(6^sF{I+w+&)LX
z1_d4#!K2$6l$bvKpWo%HBmOmk-}+<@|LQC2H%DYSFRPjzv(Bb#&yyoBlKOkT=rI{4
ziAy)TtU0&+izAB#(^K&mml--Q)aA%;kyB58cKj1dmMzo7%x_b8K;h)+>gTe~DWM4f
D=q`5E

literal 322
zcmeAS@N?(olHy`uVBq!ia0vp^A|TAd3?%E9GuQzs=3*z$5DpHG+YkL80J#PMJ|V6^
z`pv6*EzLC%;lWl`<_Gp|*|>h$<Vjt8e7tvWUnnchKX>-fqJ=X&JzUe$(qv_%CyJ@g
z2I>(g3Gxg6&+s1wTr7%~1Ilq0ctjR6FmMZjFyp1Wb$@_@VkNE-CC){ui6xo&c?uz!
zxv2~WhWZ8;`UWOd#SBV76$&5~!TD(=<%vb948DoUMftg@DVd21Zka`?<@rU~#R|R=
zyC-U?0M*)ix;TbZ%t;n#VP=c**{FT1X?BfTldCwx#>EO#XRu1ME|qthVJyPBR7lb1
sV!Y)u1M`k$iB|3nj4Tp`yT#cU8r39TeXkTL0~*EP>FVdQ&MBb@0Iuk4&j0`b

diff --git a/public/images/jstoolbar/bt_link.png b/public/images/jstoolbar/bt_link.png
index 9b3acbae5fdaf7957c5131a2e7a777b0d6862d57..8d67e3d905c3556ed49ab61f59eda1015dc16195 100644
GIT binary patch
literal 408
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbL!eu-;DiE~kEVo7Fxo<c}wZYo1r
zYM!2gp@l+LVqTe^f{}rNg@Tcxm9dGHfvJMFfuVtcI*-;5pjP%0PhVH|8;n9CT3S(N
zJt9CM&H|6fVg?3oArNM~bhqvgP>?0v(btiIVPik{pF~z5-y^^$#PvS|!@Ya=&Ye4V
z?AWojYu83aMI|REXJ=>6nKS46_wQ4tOerod?&<0I|NsBerAyCUyVlau;^gEM6ckil
zUG3%NwRi8{=g*(NfB*iC>!p=IGZ{;Q{DK)Ap4~_Ta=JZT978H@`JVUWJEFkDazH}3
zr&CfP=l}ng8&raRJ#b!mbyELg%^IfTT}j`xW40@t|8lS9w(J*u1O1x^nB5ARzwf>*
z7ttO3i+x*7qVC=Up=%uEkAITddTBuyv%^N=EWV8r(|tQ<sC)3ltXj3p;25Vpm*LXi
wewxZ>pC7PTd$+V#o7rKZ9q+`eF3(!*?@r^4kCo`r0XmDp)78&qol`;+0JUSATmS$7

literal 900
zcmeAS@N?(olHy`uVBq!ia0vp^A|TAc3?z4jzqJQa%*9TgAsieWw;%dHU|?V@4DbnY
z6_QbT`uKX$-iYezYH61xN3QR7s5$cO+qcMwkj%AvrcUXxceFk5v2^vSg%{pD=TR&1
znyFmBcJ=n{+tX)kiC)xUS9rjpyh74bw`FeOl{dR)ZoHhoX=2#aHEC&SItkmiU6^WY
zY<&CXxj9Gv14Tp>9Rgd=7c4n!8eA~@(o!I>5A|;8pRXIadF`&##%X7!tT{XXO6sAr
z51#zEXP@_E(#d`aJNs2T=e~J$uY3LVJ9n<lJhl74#r1&!J}%Xl-n@A;Vd0VZmV-Jv
zI`+wnJPQ)iW}f-~|MQF;3$NchzWV%PQ9Tz)i@X=VPwv^X=ia@eZD%7r0`2?z`=395
zzU9v3nKNgeIddj$=FBTsu7re!H#gOY28ucrU-R?zEG;d~opIQ?>~w5wM8l3n?(Ii9
z7M3jAa!M~@)#ig&-u}GeSAXaK|Nr;yT)cPho}sbzi)XjBqId5*zOT8t+0Dma#&;pm
z@B<&})~;Q<ZSVHXX}g??53A}sc2Dcv`C!iMDIdasaZz0o<QEJygdD&?jwUoc0akf^
zKxc3kctjR6FmMZjFyp1Wb$@_@VkNE-CC){ui6xo&c?uz!xv2~WhWZ8;`UWOd#SBV7
z6$&5~!TD(=<%vb948DoUMftg@DVd21Zka`?<@rU~#R|R=yC-U?0M%agba4!+n3HU9
zoJryX$FAwO)T0-1rENO3n{#?=lrs0OY7epBhATTco+xs1h3%~R?BTw$%hLD|E3dHc
zC8Hk}sXf6;XCE{LZ8MT`^Lo|iXZ6Ul!11qznfU6KrXDV_V9p&0Svxa!wKmqXG4D@T
zjhS%K(NEv(g#BSdo9M7<-GW)W^A`H86Dw~^b8~R>spC2G@m8D`;~B{}4l@LW=5l^c
z+u-CjBQ`7{VZq$~UZp$lxg-M=T3jdGRhLrKn7y8pagz+k!808dd<GrQLtVI@_-F*2
dIVkvv;orVki%?4=C!hxzJYD@<);T3K0RRi2+8_V`

diff --git a/public/images/jstoolbar/bt_ol.png b/public/images/jstoolbar/bt_ol.png
index 2dfaec7c7054e076af54aba5efa63e03129973c1..0cce2fae0c25f75d64f0fad5d2e319f6e32869af 100644
GIT binary patch
literal 363
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbL!eu-;DiE~kEVo7Fxo<c}wZYo1r
zYM!2gp@l+LVqTe^f{}rNg@Tcxm9epvsiA_lfuVsxWxez_pjP%0PhVH|8;n9CIvh87
zvdVx$oCO|{#S9GGLLkg|>2BR0pdd@Sqpu?a!^VE@KZ&eBeqex4i0gj_hT^5qr)+)y
z{Qdv6Yu9ROYAPx!N=Qfu2ncX+Z~#@ctbJa+_W9nud!wSFf`Wp)yu6&8oGdLZ4Gj%@
zwmzS;_x;ji?~ffjR$N@1ot>SWoXjb>?=estV@Z%-FoVOh8)-mJsHcl#NX4zzUT?kz
z1p#MkC5=T5@&Y^lJ6_!&E%auc{$GY(mlTDf2Jt(ZPh+}DO$9H6b2QzLIU}90`P}>C
xnpfF-BJ15cJ0?GCHSk)xEb{fzu(o$kn0J{lE&Z2X&<?bK!PC{xWt~$(69D(Ed9(lk

delta 235
zcmaFO^pi25Gr-TCmrII^fq{Y7)59eQNQ;0lBQucP?%wYQq?n7HJVQ7*IBq}me*omN
z1^9%x0_iue?j1-i*#~4Xl?3?(|7Uo*-N0*NzC^uPiEBiOb5UwyNoIbYLP%zADuaQc
zzJZ0lfk{;{gA!1K0!T%0ep*R+Vo@rCZ(?#$er{??W}<>yW>IQ+eo=O@f^Wp`iCQW^
zwR)Z|jv*Cul7IaF&&<qI&;IDS!mfo3XV@MdcQEt$XDINW?Nhz;(|gP}`6qs1He{%r
XC1m>kz0{TSK&=d(u6{1-oD!M<Q(#RX

diff --git a/public/images/jstoolbar/bt_pre.png b/public/images/jstoolbar/bt_pre.png
index df3f917d0eebb3d8ddcb46a2eee079aae81b2a20..99a7d52ced080c69a2d4b56f929ec6cca341f56c 100644
GIT binary patch
literal 1040
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbL!eu-;DiE~kEVo7Fxo<c}wZYo1r
zYM!2gp@l+LVqTe^f{}rNg@Tcxm9epvsfB{JfuVuHo9A(=K&|X0p1!W^HyDLERM>T1
z9he6c;w<opEM{Qf`T)X=PHRkN00mjn9eo`c7&i8E|4C$JU|?nl@CkAK&%og2<rNeZ
z<mBX(oSdAUogEbwRb5>TR6hzvLtxm4KumCp9?+AFB|(0{3=Yq3qyahJo-U3d6}Ptb
zIr23)a4@%TI`F?fr~K=qn;uTg!WswU4TGDmMi?_?&DkRL#Ef5HtIeIA2erb@C!}0a
q&Od!a>~=_Th>XzBhU+)a&yO$q!f<2FGq)q4fb?|rb6Mw<&;$UBwp*V7

delta 194
zcmbQh@qjU`Gr-TCmrII^fq{Y7)59eQNQ;0lBQucP?%wYQq{K>GBTAf$QWHxu^Yau!
zGILWI3=H)REc6Xbs)`wufGXHaJbhi+Z!q%mFk4A>Y@0PPUp<+DEx;$l6)5@U)x86$
zCHsIZrjj7P;QtIyw;Ol?dAgo1jv*Ddl7IaF&&;e>6S2JE;hHCGZJVb#<OCilxbcbk
laHTYJ+h>QJpKp9+V7RJk_(rq0_#jXtgQu&X%Q~loCIHWIK7arK

diff --git a/public/images/jstoolbar/bt_quote.png b/public/images/jstoolbar/bt_quote.png
deleted file mode 100644
index 25b2b8abe112f25e24c200f27548faeaa67c3000..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 323
zcmeAS@N?(olHy`uVBq!ia0vp^A|TAd3?%E9GuQzs=3*z$5DpHG+YkL80J-V`J|V6^
z`sw5AGiS~W4D>yIbhnC%QdehFS!w>}jVo^7JZEfdoR|>(=G8p`@BNuTrMx9Ue!>5d
z0E6udr8b}hXMsm#F#`j)5C}6~x?A@LC@5Cq8d2h0l$uzQnV+W+l9`*zU|^_kV4-hd
zQdP{L1XQ5_QW2b=R#Ki=l*-_nm|T>fo0^iDsNj}alv<u&lwGXg8?k$$mI_d<kEe@c
zNX49F3ubnn9W&aW&9R)xoY*$Uaxssft?lzO2TcW@T{KSj`|U7;@2!#h>5>CyIC*TA
wOUzK<lBn=A*x=}6Ft>QwR<`-MSCW|+4o;X9C3Q9`0%$ISr>mdKI;Vst0BZ<wfB*mh

diff --git a/public/images/jstoolbar/bt_strong.png b/public/images/jstoolbar/bt_strong.png
index 7e200d3f6f7d1a1df51be570785ac8db62231c24..33e6daaddcdea6573c964d21f26e8947b70061b0 100644
GIT binary patch
literal 360
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbL!eu-;DiE~kEVo7Fxo<c}wZYo1r
zYM!2gp@l+LVqTe^f{}rNg@Tcxm9dePk-37lfuVuH{}n#3fm+#1Jbhi+Z!ijp=xgrt
z&;$u_7I;J!Gca%qfiUBxyLEqnf-LEdzK#qG8~eHcB(ehet^qzFuKyVrwr<^8TwI)-
zoE#Mu)zZ>ZU0v<v<@Nme^Eq?oI5{~51qCT8DlT2RG&?(6LPA1QQ}g@x?^C8sS-W<v
zrKM$0PtUn?=S1V4UI7}&SQ6wH%;50sMjDV4=jq}YQgLhUSxcq{0}j?erj&^~X@>Xy
zuQ=v(={I**I1j`AGXIig)9;1&%w({g#=AwK`sM*KsqRn-pP4OXr7kQ5)30ZJTYWv~
vE!QVIi`8y?ov)XO>{Iv1nR}e!|2KwSDW)^5G68Hrn;1M@{an^LB{Ts5Kzn&$

literal 355
zcmeAS@N?(olHy`uVBq!ia0vp^A|TAc3?z4jzqJQa%*9TgAsieWw;%dH0CJ53d_r7-
z^qW`r%1ZOCtjrJW+cJ4l7at$c0M~P84@HCrZ(P5urMX5{M*8mU3)<S6ix$pEOH1==
zoD>bzCRh^W7yO^$KPq6o=WhX&<Sg)rEM{Qf76M_$OLy!300qTLTq8=Hi&7IyGV}8k
zLNaqx84L{d4J`BxOsa|*lz=J}Kq`Xs(@M${i&7bU6O)Vbb5m0?6BXPti&D$;i?WLq
zd?R*G)KUSejq!AG45^s2c7h{cg8~l=dlW0nmH+#%sl_Q2C>)cknvu8p_9L~U`~k)y
z@)K4EH(8`FPHwn%SnAB1TZbR9b~aC(Cn9@I`Auokm$a-zQwjBl!NtqW&(59j_VV;;
a515%$nF_DmHBAEA!{F)a=d#Wzp$P!bQiKNp

diff --git a/public/images/jstoolbar/bt_ul.png b/public/images/jstoolbar/bt_ul.png
index 6e20851ec2e1cf21f69dd1e18af25a3453deb860..df9ecc0cfd80167a3b3ca46f0d9c7c73797c4c57 100644
GIT binary patch
literal 365
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbL!eu-;DiE~kEVo7Fxo<c}wZYo1r
zYM!2gp@l+LVqTe^f{}rNg@Tcxm9epviHU-?fuVuH^S37Ffm+#1Jbhi+Z!ijp=*UOi
zf4>nZ#981GS<Jw|Ed;`hm+sd60SdCDJNh~@Fl_AS{*%ZG<cA0Ngt-1^U|75Neeu%g
zJzL+eUAtCOQ&Uk<Q9?pOKtO<lg9E5)?XmYQYoAZq`hMxL_j~v5jf#p23JUV_@^W%=
zvb3}`G&J0L?){X#@AqE&e(cz>;^N}$?Cj*^<kY8jg+R@WB|(0{3=Yq3qyagBo-U3d
z6}OTT6nIpAs06V7IPyb6W$BV7OH)%=ST?Rw;5l;SXaH-)&kBhjtSqf9t}c-`9hmOe
z+*u-Z>co)_tpi8S96504)Ujjd4xT*O8p<lg!0;@X>Al9H3HO19GkCiCxvX<aXaWEN
CqJZcC

delta 225
zcmaFM^qw)GGr-TCmrII^fq{Y7)59eQNQ;0lBQucP?%wYQq?n7HJVQ7*IBq}me*omN
z1^9%x0_iue?j1-i*#~4Xl?3?(|7Uo*-N0*NzC^uPiEBiOb5UwyNoIbYLP%zADuaQc
zzJZ0lfk{;{gA!1K0!T%0ep*R+Vo@rCZ(?#$er{??W}<>yW>IQ+eo=O@f^Wp`iCQW^
zwJM%2jv*Cul7IaF&&+J}kLL)#G?#>&)6M^lIU<!S?l@~m``R;9rkH;HmT~+dP(1^O
Mr>mdKI;Vst0RNgsK>z>%

diff --git a/public/javascripts/jstoolbar/jstoolbar.js b/public/javascripts/jstoolbar/jstoolbar.js
index 7941bd135..7a2a2a49e 100644
--- a/public/javascripts/jstoolbar/jstoolbar.js
+++ b/public/javascripts/jstoolbar/jstoolbar.js
@@ -406,15 +406,6 @@ jsToolBar.prototype.elements.del = {
 	}
 }
 
-// quote
-jsToolBar.prototype.elements.quote = {
-	type: 'button',
-	title: 'Inline quote',
-	fn: {
-		wiki: function() { this.singleTag('??') }
-	}
-}
-
 // code
 jsToolBar.prototype.elements.code = {
 	type: 'button',
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-bg.js b/public/javascripts/jstoolbar/lang/jstoolbar-bg.js
index 72bab0be3..cd36a4b55 100644
--- a/public/javascripts/jstoolbar/lang/jstoolbar-bg.js
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-bg.js
@@ -3,8 +3,7 @@ jsToolBar.strings['Strong'] = 'Strong';
 jsToolBar.strings['Italic'] = 'Italic';
 jsToolBar.strings['Underline'] = 'Underline';
 jsToolBar.strings['Deleted'] = 'Deleted';
-jsToolBar.strings['Inline quote'] = 'Inline quote';
-jsToolBar.strings['Code'] = 'Code';
+jsToolBar.strings['Code'] = 'Inline Code';
 jsToolBar.strings['Heading 1'] = 'Heading 1';
 jsToolBar.strings['Heading 2'] = 'Heading 2';
 jsToolBar.strings['Heading 3'] = 'Heading 3';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-cs.js b/public/javascripts/jstoolbar/lang/jstoolbar-cs.js
index fa18a871c..8a59a8162 100644
--- a/public/javascripts/jstoolbar/lang/jstoolbar-cs.js
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-cs.js
@@ -3,7 +3,6 @@ jsToolBar.strings['Strong'] = 'Tučné';
 jsToolBar.strings['Italic'] = 'Kurzíva';
 jsToolBar.strings['Underline'] = 'Podtržené';
 jsToolBar.strings['Deleted'] = 'Přeškrtnuté ';
-jsToolBar.strings['Inline quote'] = 'Citace';
 jsToolBar.strings['Code'] = 'Zobrazení kódu';
 jsToolBar.strings['Heading 1'] = 'Záhlaví 1';
 jsToolBar.strings['Heading 2'] = 'Záhlaví 2';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-de.js b/public/javascripts/jstoolbar/lang/jstoolbar-de.js
index 0c7a8799e..e2ba3fc1c 100644
--- a/public/javascripts/jstoolbar/lang/jstoolbar-de.js
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-de.js
@@ -3,7 +3,6 @@ jsToolBar.strings['Strong'] = 'Fett';
 jsToolBar.strings['Italic'] = 'Kursiv';
 jsToolBar.strings['Underline'] = 'Unterstrichen';
 jsToolBar.strings['Deleted'] = 'Durchgestrichen';
-jsToolBar.strings['Inline quote'] = 'Inline-Zitat';
 jsToolBar.strings['Code'] = 'Quelltext';
 jsToolBar.strings['Heading 1'] = 'Überschrift 1. Ordnung';
 jsToolBar.strings['Heading 2'] = 'Überschrift 2. Ordnung';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-en.js b/public/javascripts/jstoolbar/lang/jstoolbar-en.js
index 72bab0be3..cd36a4b55 100644
--- a/public/javascripts/jstoolbar/lang/jstoolbar-en.js
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-en.js
@@ -3,8 +3,7 @@ jsToolBar.strings['Strong'] = 'Strong';
 jsToolBar.strings['Italic'] = 'Italic';
 jsToolBar.strings['Underline'] = 'Underline';
 jsToolBar.strings['Deleted'] = 'Deleted';
-jsToolBar.strings['Inline quote'] = 'Inline quote';
-jsToolBar.strings['Code'] = 'Code';
+jsToolBar.strings['Code'] = 'Inline Code';
 jsToolBar.strings['Heading 1'] = 'Heading 1';
 jsToolBar.strings['Heading 2'] = 'Heading 2';
 jsToolBar.strings['Heading 3'] = 'Heading 3';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-es.js b/public/javascripts/jstoolbar/lang/jstoolbar-es.js
index 72bab0be3..cd36a4b55 100644
--- a/public/javascripts/jstoolbar/lang/jstoolbar-es.js
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-es.js
@@ -3,8 +3,7 @@ jsToolBar.strings['Strong'] = 'Strong';
 jsToolBar.strings['Italic'] = 'Italic';
 jsToolBar.strings['Underline'] = 'Underline';
 jsToolBar.strings['Deleted'] = 'Deleted';
-jsToolBar.strings['Inline quote'] = 'Inline quote';
-jsToolBar.strings['Code'] = 'Code';
+jsToolBar.strings['Code'] = 'Inline Code';
 jsToolBar.strings['Heading 1'] = 'Heading 1';
 jsToolBar.strings['Heading 2'] = 'Heading 2';
 jsToolBar.strings['Heading 3'] = 'Heading 3';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-fi.js b/public/javascripts/jstoolbar/lang/jstoolbar-fi.js
index 72bab0be3..cd36a4b55 100644
--- a/public/javascripts/jstoolbar/lang/jstoolbar-fi.js
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-fi.js
@@ -3,8 +3,7 @@ jsToolBar.strings['Strong'] = 'Strong';
 jsToolBar.strings['Italic'] = 'Italic';
 jsToolBar.strings['Underline'] = 'Underline';
 jsToolBar.strings['Deleted'] = 'Deleted';
-jsToolBar.strings['Inline quote'] = 'Inline quote';
-jsToolBar.strings['Code'] = 'Code';
+jsToolBar.strings['Code'] = 'Inline Code';
 jsToolBar.strings['Heading 1'] = 'Heading 1';
 jsToolBar.strings['Heading 2'] = 'Heading 2';
 jsToolBar.strings['Heading 3'] = 'Heading 3';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-fr.js b/public/javascripts/jstoolbar/lang/jstoolbar-fr.js
index 402c34d29..3cbc67863 100644
--- a/public/javascripts/jstoolbar/lang/jstoolbar-fr.js
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-fr.js
@@ -3,8 +3,7 @@ jsToolBar.strings['Strong'] = 'Gras';
 jsToolBar.strings['Italic'] = 'Italique';
 jsToolBar.strings['Underline'] = 'Souligné';
 jsToolBar.strings['Deleted'] = 'Rayé';
-jsToolBar.strings['Inline quote'] = 'Citation';
-jsToolBar.strings['Code'] = 'Code';
+jsToolBar.strings['Code'] = 'Code en ligne';
 jsToolBar.strings['Heading 1'] = 'Titre niveau 1';
 jsToolBar.strings['Heading 2'] = 'Titre niveau 2';
 jsToolBar.strings['Heading 3'] = 'Titre niveau 3';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-he.js b/public/javascripts/jstoolbar/lang/jstoolbar-he.js
index 72bab0be3..cd36a4b55 100644
--- a/public/javascripts/jstoolbar/lang/jstoolbar-he.js
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-he.js
@@ -3,8 +3,7 @@ jsToolBar.strings['Strong'] = 'Strong';
 jsToolBar.strings['Italic'] = 'Italic';
 jsToolBar.strings['Underline'] = 'Underline';
 jsToolBar.strings['Deleted'] = 'Deleted';
-jsToolBar.strings['Inline quote'] = 'Inline quote';
-jsToolBar.strings['Code'] = 'Code';
+jsToolBar.strings['Code'] = 'Inline Code';
 jsToolBar.strings['Heading 1'] = 'Heading 1';
 jsToolBar.strings['Heading 2'] = 'Heading 2';
 jsToolBar.strings['Heading 3'] = 'Heading 3';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-it.js b/public/javascripts/jstoolbar/lang/jstoolbar-it.js
index 72bab0be3..cd36a4b55 100644
--- a/public/javascripts/jstoolbar/lang/jstoolbar-it.js
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-it.js
@@ -3,8 +3,7 @@ jsToolBar.strings['Strong'] = 'Strong';
 jsToolBar.strings['Italic'] = 'Italic';
 jsToolBar.strings['Underline'] = 'Underline';
 jsToolBar.strings['Deleted'] = 'Deleted';
-jsToolBar.strings['Inline quote'] = 'Inline quote';
-jsToolBar.strings['Code'] = 'Code';
+jsToolBar.strings['Code'] = 'Inline Code';
 jsToolBar.strings['Heading 1'] = 'Heading 1';
 jsToolBar.strings['Heading 2'] = 'Heading 2';
 jsToolBar.strings['Heading 3'] = 'Heading 3';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-ja.js b/public/javascripts/jstoolbar/lang/jstoolbar-ja.js
index 72bab0be3..cd36a4b55 100644
--- a/public/javascripts/jstoolbar/lang/jstoolbar-ja.js
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-ja.js
@@ -3,8 +3,7 @@ jsToolBar.strings['Strong'] = 'Strong';
 jsToolBar.strings['Italic'] = 'Italic';
 jsToolBar.strings['Underline'] = 'Underline';
 jsToolBar.strings['Deleted'] = 'Deleted';
-jsToolBar.strings['Inline quote'] = 'Inline quote';
-jsToolBar.strings['Code'] = 'Code';
+jsToolBar.strings['Code'] = 'Inline Code';
 jsToolBar.strings['Heading 1'] = 'Heading 1';
 jsToolBar.strings['Heading 2'] = 'Heading 2';
 jsToolBar.strings['Heading 3'] = 'Heading 3';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-ko.js b/public/javascripts/jstoolbar/lang/jstoolbar-ko.js
index 72bab0be3..cd36a4b55 100644
--- a/public/javascripts/jstoolbar/lang/jstoolbar-ko.js
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-ko.js
@@ -3,8 +3,7 @@ jsToolBar.strings['Strong'] = 'Strong';
 jsToolBar.strings['Italic'] = 'Italic';
 jsToolBar.strings['Underline'] = 'Underline';
 jsToolBar.strings['Deleted'] = 'Deleted';
-jsToolBar.strings['Inline quote'] = 'Inline quote';
-jsToolBar.strings['Code'] = 'Code';
+jsToolBar.strings['Code'] = 'Inline Code';
 jsToolBar.strings['Heading 1'] = 'Heading 1';
 jsToolBar.strings['Heading 2'] = 'Heading 2';
 jsToolBar.strings['Heading 3'] = 'Heading 3';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-lt.js b/public/javascripts/jstoolbar/lang/jstoolbar-lt.js
index 72bab0be3..cd36a4b55 100644
--- a/public/javascripts/jstoolbar/lang/jstoolbar-lt.js
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-lt.js
@@ -3,8 +3,7 @@ jsToolBar.strings['Strong'] = 'Strong';
 jsToolBar.strings['Italic'] = 'Italic';
 jsToolBar.strings['Underline'] = 'Underline';
 jsToolBar.strings['Deleted'] = 'Deleted';
-jsToolBar.strings['Inline quote'] = 'Inline quote';
-jsToolBar.strings['Code'] = 'Code';
+jsToolBar.strings['Code'] = 'Inline Code';
 jsToolBar.strings['Heading 1'] = 'Heading 1';
 jsToolBar.strings['Heading 2'] = 'Heading 2';
 jsToolBar.strings['Heading 3'] = 'Heading 3';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-nl.js b/public/javascripts/jstoolbar/lang/jstoolbar-nl.js
index 72bab0be3..cd36a4b55 100644
--- a/public/javascripts/jstoolbar/lang/jstoolbar-nl.js
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-nl.js
@@ -3,8 +3,7 @@ jsToolBar.strings['Strong'] = 'Strong';
 jsToolBar.strings['Italic'] = 'Italic';
 jsToolBar.strings['Underline'] = 'Underline';
 jsToolBar.strings['Deleted'] = 'Deleted';
-jsToolBar.strings['Inline quote'] = 'Inline quote';
-jsToolBar.strings['Code'] = 'Code';
+jsToolBar.strings['Code'] = 'Inline Code';
 jsToolBar.strings['Heading 1'] = 'Heading 1';
 jsToolBar.strings['Heading 2'] = 'Heading 2';
 jsToolBar.strings['Heading 3'] = 'Heading 3';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-pl.js b/public/javascripts/jstoolbar/lang/jstoolbar-pl.js
index 72bab0be3..cd36a4b55 100644
--- a/public/javascripts/jstoolbar/lang/jstoolbar-pl.js
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-pl.js
@@ -3,8 +3,7 @@ jsToolBar.strings['Strong'] = 'Strong';
 jsToolBar.strings['Italic'] = 'Italic';
 jsToolBar.strings['Underline'] = 'Underline';
 jsToolBar.strings['Deleted'] = 'Deleted';
-jsToolBar.strings['Inline quote'] = 'Inline quote';
-jsToolBar.strings['Code'] = 'Code';
+jsToolBar.strings['Code'] = 'Inline Code';
 jsToolBar.strings['Heading 1'] = 'Heading 1';
 jsToolBar.strings['Heading 2'] = 'Heading 2';
 jsToolBar.strings['Heading 3'] = 'Heading 3';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-pt-br.js b/public/javascripts/jstoolbar/lang/jstoolbar-pt-br.js
index 72bab0be3..cd36a4b55 100644
--- a/public/javascripts/jstoolbar/lang/jstoolbar-pt-br.js
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-pt-br.js
@@ -3,8 +3,7 @@ jsToolBar.strings['Strong'] = 'Strong';
 jsToolBar.strings['Italic'] = 'Italic';
 jsToolBar.strings['Underline'] = 'Underline';
 jsToolBar.strings['Deleted'] = 'Deleted';
-jsToolBar.strings['Inline quote'] = 'Inline quote';
-jsToolBar.strings['Code'] = 'Code';
+jsToolBar.strings['Code'] = 'Inline Code';
 jsToolBar.strings['Heading 1'] = 'Heading 1';
 jsToolBar.strings['Heading 2'] = 'Heading 2';
 jsToolBar.strings['Heading 3'] = 'Heading 3';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-pt.js b/public/javascripts/jstoolbar/lang/jstoolbar-pt.js
index 72bab0be3..cd36a4b55 100644
--- a/public/javascripts/jstoolbar/lang/jstoolbar-pt.js
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-pt.js
@@ -3,8 +3,7 @@ jsToolBar.strings['Strong'] = 'Strong';
 jsToolBar.strings['Italic'] = 'Italic';
 jsToolBar.strings['Underline'] = 'Underline';
 jsToolBar.strings['Deleted'] = 'Deleted';
-jsToolBar.strings['Inline quote'] = 'Inline quote';
-jsToolBar.strings['Code'] = 'Code';
+jsToolBar.strings['Code'] = 'Inline Code';
 jsToolBar.strings['Heading 1'] = 'Heading 1';
 jsToolBar.strings['Heading 2'] = 'Heading 2';
 jsToolBar.strings['Heading 3'] = 'Heading 3';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-ro.js b/public/javascripts/jstoolbar/lang/jstoolbar-ro.js
index 72bab0be3..cd36a4b55 100644
--- a/public/javascripts/jstoolbar/lang/jstoolbar-ro.js
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-ro.js
@@ -3,8 +3,7 @@ jsToolBar.strings['Strong'] = 'Strong';
 jsToolBar.strings['Italic'] = 'Italic';
 jsToolBar.strings['Underline'] = 'Underline';
 jsToolBar.strings['Deleted'] = 'Deleted';
-jsToolBar.strings['Inline quote'] = 'Inline quote';
-jsToolBar.strings['Code'] = 'Code';
+jsToolBar.strings['Code'] = 'Inline Code';
 jsToolBar.strings['Heading 1'] = 'Heading 1';
 jsToolBar.strings['Heading 2'] = 'Heading 2';
 jsToolBar.strings['Heading 3'] = 'Heading 3';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-ru.js b/public/javascripts/jstoolbar/lang/jstoolbar-ru.js
index 92940f23a..6370a3e2d 100644
--- a/public/javascripts/jstoolbar/lang/jstoolbar-ru.js
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-ru.js
@@ -3,7 +3,6 @@ jsToolBar.strings['Strong'] = 'Жирный';
 jsToolBar.strings['Italic'] = 'Курсив';
 jsToolBar.strings['Underline'] = 'Подчеркнутый';
 jsToolBar.strings['Deleted'] = 'Зачеркнутый';
-jsToolBar.strings['Inline quote'] = 'Цитата';
 jsToolBar.strings['Code'] = 'Вставка кода';
 jsToolBar.strings['Heading 1'] = 'Заголовок 1';
 jsToolBar.strings['Heading 2'] = 'Заголовок 2';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-sr.js b/public/javascripts/jstoolbar/lang/jstoolbar-sr.js
index 72bab0be3..cd36a4b55 100644
--- a/public/javascripts/jstoolbar/lang/jstoolbar-sr.js
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-sr.js
@@ -3,8 +3,7 @@ jsToolBar.strings['Strong'] = 'Strong';
 jsToolBar.strings['Italic'] = 'Italic';
 jsToolBar.strings['Underline'] = 'Underline';
 jsToolBar.strings['Deleted'] = 'Deleted';
-jsToolBar.strings['Inline quote'] = 'Inline quote';
-jsToolBar.strings['Code'] = 'Code';
+jsToolBar.strings['Code'] = 'Inline Code';
 jsToolBar.strings['Heading 1'] = 'Heading 1';
 jsToolBar.strings['Heading 2'] = 'Heading 2';
 jsToolBar.strings['Heading 3'] = 'Heading 3';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-sv.js b/public/javascripts/jstoolbar/lang/jstoolbar-sv.js
index 72bab0be3..cd36a4b55 100644
--- a/public/javascripts/jstoolbar/lang/jstoolbar-sv.js
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-sv.js
@@ -3,8 +3,7 @@ jsToolBar.strings['Strong'] = 'Strong';
 jsToolBar.strings['Italic'] = 'Italic';
 jsToolBar.strings['Underline'] = 'Underline';
 jsToolBar.strings['Deleted'] = 'Deleted';
-jsToolBar.strings['Inline quote'] = 'Inline quote';
-jsToolBar.strings['Code'] = 'Code';
+jsToolBar.strings['Code'] = 'Inline Code';
 jsToolBar.strings['Heading 1'] = 'Heading 1';
 jsToolBar.strings['Heading 2'] = 'Heading 2';
 jsToolBar.strings['Heading 3'] = 'Heading 3';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-zh-tw.js b/public/javascripts/jstoolbar/lang/jstoolbar-zh-tw.js
index 7e795ec6d..1e46e2470 100644
--- a/public/javascripts/jstoolbar/lang/jstoolbar-zh-tw.js
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-zh-tw.js
@@ -3,7 +3,6 @@ jsToolBar.strings['Strong'] = '粗體';
 jsToolBar.strings['Italic'] = '斜體';
 jsToolBar.strings['Underline'] = '底線';
 jsToolBar.strings['Deleted'] = '刪除線';
-jsToolBar.strings['Inline quote'] = '內嵌引文';
 jsToolBar.strings['Code'] = '程式碼';
 jsToolBar.strings['Heading 1'] = '標題 1';
 jsToolBar.strings['Heading 2'] = '標題 2';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-zh.js b/public/javascripts/jstoolbar/lang/jstoolbar-zh.js
index 72bab0be3..cd36a4b55 100644
--- a/public/javascripts/jstoolbar/lang/jstoolbar-zh.js
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-zh.js
@@ -3,8 +3,7 @@ jsToolBar.strings['Strong'] = 'Strong';
 jsToolBar.strings['Italic'] = 'Italic';
 jsToolBar.strings['Underline'] = 'Underline';
 jsToolBar.strings['Deleted'] = 'Deleted';
-jsToolBar.strings['Inline quote'] = 'Inline quote';
-jsToolBar.strings['Code'] = 'Code';
+jsToolBar.strings['Code'] = 'Inline Code';
 jsToolBar.strings['Heading 1'] = 'Heading 1';
 jsToolBar.strings['Heading 2'] = 'Heading 2';
 jsToolBar.strings['Heading 3'] = 'Heading 3';

From 4e244be21cc1c9fbd885081a6d02527b67a5034d Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 3 Feb 2008 19:53:52 +0000
Subject: [PATCH 179/710] Slight changes on users list view and hide Anonymous
 user.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1118 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/users_controller.rb |  4 +--
 app/helpers/users_helper.rb         |  2 +-
 app/views/users/list.rhtml          | 50 +++++++++++++----------------
 public/stylesheets/application.css  |  6 ++++
 4 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index f67d1ae53..ceb70ab92 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -33,8 +33,8 @@ class UsersController < ApplicationController
     sort_init 'login', 'asc'
     sort_update
     
-    @status = params[:status] ? params[:status].to_i : 1    
-    conditions = nil
+    @status = params[:status] ? params[:status].to_i : 1
+    conditions = "status <> 0"
     conditions = ["status=?", @status] unless @status == 0
     
     @user_count = User.count(:conditions => conditions)
diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb
index 9dc87c5cc..7bd137161 100644
--- a/app/helpers/users_helper.rb
+++ b/app/helpers/users_helper.rb
@@ -17,7 +17,7 @@
 
 module UsersHelper
   def status_options_for_select(selected)
-    options_for_select([[l(:label_all), "*"], 
+    options_for_select([[l(:label_all), ''], 
                         [l(:status_active), 1],
                         [l(:status_registered), 2],
                         [l(:status_locked), 3]], selected)
diff --git a/app/views/users/list.rhtml b/app/views/users/list.rhtml
index 50054c989..7415af308 100644
--- a/app/views/users/list.rhtml
+++ b/app/views/users/list.rhtml
@@ -4,11 +4,10 @@
 
 <h2><%=l(:label_user_plural)%></h2>
 
-<% form_tag() do %>
+<% form_tag({}, :method => :get) do %>
 <fieldset><legend><%= l(:label_filter_plural) %></legend>
 <label><%= l(:field_status) %> :</label>
 <%= select_tag 'status', status_options_for_select(@status), :class => "small", :onchange => "this.form.submit(); return false;"  %>
-<%= submit_tag l(:button_apply), :class => "small" %>
 </fieldset>
 <% end %>
 &nbsp;
@@ -20,38 +19,33 @@
 	<%= sort_header_tag('lastname', :caption => l(:field_lastname)) %>
 	<th><%=l(:field_mail)%></th>
 	<%= sort_header_tag('admin', :caption => l(:field_admin)) %>
-	<%= sort_header_tag('status', :caption => l(:field_status)) %>
 	<%= sort_header_tag('created_on', :caption => l(:field_created_on)) %>
 	<%= sort_header_tag('last_login_on', :caption => l(:field_last_login_on)) %>
     <th></th>
   </tr></thead>
   <tbody>
-<% for user in @users %>
-  <tr class="<%= cycle("odd", "even") %>">
-	<td><%= link_to user.login, :action => 'edit', :id => user %></td>
-	<td><%= user.firstname %></td>
-	<td><%= user.lastname %></td>
-	<td><%= user.mail %></td>
-	<td align="center"><%= image_tag 'true.png' if user.admin? %></td>
-	<td align="center"><%= image_tag 'locked.png' if user.locked? %><%= image_tag 'user_new.png' if user.registered? %></td>
-	<td align="center"><%= format_time(user.created_on) %></td>
-	<td align="center"><%= format_time(user.last_login_on) unless user.last_login_on.nil? %></td>
-  <td align="center">
-    <% form_tag({:action => 'edit', :id => user}) do %>
-    <% if user.locked? %>
-      <%= hidden_field_tag 'user[status]', User::STATUS_ACTIVE %>
-      <%= submit_tag l(:button_unlock), :class => "button-small"  %>
-    <% elsif user.registered? %>
-      <%= hidden_field_tag 'user[status]', User::STATUS_ACTIVE %>
-      <%= submit_tag l(:button_activate), :class => "button-small"  %>
-    <% else %>
-      <%= hidden_field_tag 'user[status]', User::STATUS_LOCKED %>
-      <%= submit_tag l(:button_lock), :class => "button-small"  %>
-    <% end %>
-    <% end %>  
-  </td>
+<% for user in @users -%>
+  <tr class="user <%= cycle("odd", "even") %> <%= %w(anon active registered locked)[user.status] %>">
+	<td class="username"><%= link_to user.login, :action => 'edit', :id => user %></td>
+	<td class="firstname"><%= user.firstname %></td>
+	<td class="lastname"><%= user.lastname %></td>
+	<td class="email"><%= user.mail %></td>
+	<td align="center"><%= image_tag('true.png') if user.admin? %></td>
+	<td class="created_on" align="center"><%= format_time(user.created_on) %></td>
+	<td class="last_login_on" align="center"><%= format_time(user.last_login_on) unless user.last_login_on.nil? %></td>
+    <td>
+    <small>
+    <% if user.locked? -%>
+        <%= link_to l(:button_unlock), {:action => 'edit', :id => user, :user => {:status => User::STATUS_ACTIVE}}, :method => :post, :class => 'icon icon-unlock' %>
+    <% elsif user.registered? -%>
+        <%= link_to l(:button_activate), {:action => 'edit', :id => user, :user => {:status => User::STATUS_ACTIVE}}, :method => :post, :class => 'icon icon-unlock' %>
+    <% else -%>
+        <%= link_to l(:button_lock), {:action => 'edit', :id => user, :user => {:status => User::STATUS_LOCKED}}, :method => :post, :class => 'icon icon-lock' %>
+    <% end -%>
+    </small>
+    </td>
   </tr>
-<% end %>
+<% end -%>
   </tbody>
 </table>
 
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 1090d8c87..1abd1f6fd 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -94,6 +94,12 @@ tr.message td.last_message { font-size: 80%; }
 tr.message.locked td.subject a { background-image: url(../images/locked.png); }
 tr.message.sticky td.subject a { background-image: url(../images/sticky.png); font-weight: bold; }
 
+tr.user td { width:13%; }
+tr.user td.email { width:18%; }
+tr.user td { white-space: nowrap; }
+tr.user.locked, tr.user.registered { color: #aaa; }
+tr.user.locked a, tr.user.registered a { color: #aaa; }
+
 table.list tbody tr:hover { background-color:#ffffdd; }
 table td {padding:2px;}
 table p {margin:0;}

From a3dda6dc4a3dd898357b5aaab6acffdb03f4da5e Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Mon, 4 Feb 2008 18:01:38 +0000
Subject: [PATCH 180/710] Use Postgresql's reset_pk_sequence in Trac importer
 to reset issue id sequence (#595).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1119 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 lib/tasks/migrate_from_trac.rake | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/lib/tasks/migrate_from_trac.rake b/lib/tasks/migrate_from_trac.rake
index 63a719b35..2eca13dc3 100644
--- a/lib/tasks/migrate_from_trac.rake
+++ b/lib/tasks/migrate_from_trac.rake
@@ -373,16 +373,8 @@ namespace :redmine do
         	end
         end
         
-        # update issue id sequence if needed
-        begin
-          case ActiveRecord::Base.connection.adapter_name.downcase
-          when 'mysql'
-            # nothing to do
-          when 'postgresql'
-            sql = "SELECT setval('#{Issue.table_name}_id_seq', (SELECT MAX(id) FROM #{Issue.table_name}))"
-            ActiveRecord::Base.connection.execute(sql)
-          end
-        end
+        # update issue id sequence if needed (postgresql)
+        Issue.connection.reset_pk_sequence!(Issue.table_name) if Issue.connection.respond_to?('reset_pk_sequence!')
         puts
         
         # Wiki      

From 80a60247f527825aa5e02e19bcaec4bd864fce2a Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Mon, 4 Feb 2008 19:37:23 +0000
Subject: [PATCH 181/710] Slight changes to the activity view.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1120 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/helpers/projects_helper.rb     |  4 ++++
 app/views/projects/activity.rhtml  | 23 ++++++++++++++---------
 public/stylesheets/application.css |  6 ++++++
 3 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb
index 883be0ead..c07bbd2c2 100644
--- a/app/helpers/projects_helper.rb
+++ b/app/helpers/projects_helper.rb
@@ -26,6 +26,10 @@ module ProjectsHelper
                           }, options
   end
   
+  def format_activity_description(text)
+    h(truncate(text, 250))
+  end
+  
   def project_settings_tabs
     tabs = [{:name => 'info', :action => :edit_project, :partial => 'projects/edit', :label => :label_information_plural},
             {:name => 'modules', :action => :select_project_modules, :partial => 'projects/settings/modules', :label => :label_module_plural},
diff --git a/app/views/projects/activity.rhtml b/app/views/projects/activity.rhtml
index 41a8ae100..bde806554 100644
--- a/app/views/projects/activity.rhtml
+++ b/app/views/projects/activity.rhtml
@@ -1,17 +1,22 @@
 <h2><%=l(:label_activity)%>: <%= "#{month_name(@month).downcase} #{@year}" %></h2>
 
+<div id="activity">
 <% @events_by_day.keys.sort {|x,y| y <=> x }.each do |day| %>
-  <h3><%= day_name(day.cwday) %> <%= day.day %></h3>
-  <ul>
-  <% @events_by_day[day].sort {|x,y| y.event_datetime <=> x.event_datetime }.each do |e| %>
-    <li><p><%= format_time(e.event_datetime, false) %> <%= link_to truncate(e.event_title, 100), e.event_url %><br />
-    <% unless e.event_description.blank? %><em><%= truncate(e.event_description, 500) %></em><br /><% end %>
-    <span class="author"><%= e.event_author if e.respond_to?(:event_author) %></span></p></li>
+<h3><%= day_name(day.cwday) %> <%= day.day %></h3>
+<dl>
+<% @events_by_day[day].sort {|x,y| y.event_datetime <=> x.event_datetime }.each do |e| -%>
+  <dt class="<%= e.class.name.downcase %>"><span class="time"><%= format_time(e.event_datetime, false) %></span>
+  <%= link_to truncate(e.event_title, 100), e.event_url %></dt>
+  <dd><% unless e.event_description.blank? -%>
+  <span class="description"><%= format_activity_description(e.event_description) %></span><br />
   <% end %>
-  </ul>
-<% end %>
+  <span class="author"><%= e.event_author if e.respond_to?(:event_author) %></span></dd>
+<% end -%>
+</dl>
+<% end -%>
+</div>
 
-<% if @events_by_day.empty? %><p class="nodata"><%= l(:label_no_data) %></p><% end %>
+<%= content_tag('p', l(:label_no_data), :class => 'nodata') if @events_by_day.empty? %>
 
 <div style="float:left;">
 <% prev_params = params.clone.update :year => (@month==1 ? @year-1 : @year), :month =>(@month==1 ? 12 : @month-1) %>
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 1abd1f6fd..b3b8b341d 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -147,6 +147,12 @@ div#issue-changesets .changeset { padding: 4px;}
 div#issue-changesets .changeset { border-bottom: 1px solid #ddd; }
 div#issue-changesets p { margin-top: 0; margin-bottom: 1em;}
 
+div#activity dl { margin-left: 2em; }
+div#activity dd { margin-bottom: 1em; }
+div#activity dt { margin-bottom: 1px; }
+div#activity dt .time { color: #777; font-size: 80%; }
+div#activity dd .description { font-style: italic; }
+
 .autoscroll {overflow-x: auto; padding:1px; width:100%; margin-bottom: 1.2em;}
 #user_firstname, #user_lastname, #user_mail, #my_account_form select { width: 90%; }
 

From 54ff294da164d9c8a0659610019f801ae4788068 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Tue, 5 Feb 2008 17:28:02 +0000
Subject: [PATCH 182/710] More appropriate default sort order on sortable
 columns. Sortable column added on issue subject (#580).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1121 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/helpers/queries_helper.rb  |  4 +++-
 app/helpers/sort_helper.rb     | 11 +++++++----
 app/models/query.rb            | 11 ++++++-----
 app/views/admin/projects.rhtml |  6 +++---
 app/views/issues/_list.rhtml   |  2 +-
 app/views/users/list.rhtml     |  8 ++++----
 6 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/app/helpers/queries_helper.rb b/app/helpers/queries_helper.rb
index 3011d3aec..a58c5d0ea 100644
--- a/app/helpers/queries_helper.rb
+++ b/app/helpers/queries_helper.rb
@@ -22,7 +22,9 @@ module QueriesHelper
   end
   
   def column_header(column)
-    column.sortable ? sort_header_tag(column.sortable, :caption => column.caption) : content_tag('th', column.caption)
+    column.sortable ? sort_header_tag(column.sortable, :caption => column.caption,
+                                                       :default_order => column.default_order) : 
+                      content_tag('th', column.caption)
   end
   
   def column_content(column, issue)
diff --git a/app/helpers/sort_helper.rb b/app/helpers/sort_helper.rb
index dfd681fff..155e7e5e3 100644
--- a/app/helpers/sort_helper.rb
+++ b/app/helpers/sort_helper.rb
@@ -92,7 +92,7 @@ module SortHelper
   # - The optional caption explicitly specifies the displayed link text.
   # - A sort icon image is positioned to the right of the sort link.
   #
-  def sort_link(column, caption=nil)
+  def sort_link(column, caption, default_order)
     key, order = session[@sort_name][:key], session[@sort_name][:order]
     if key == column
       if order.downcase == 'asc'
@@ -104,11 +104,13 @@ module SortHelper
       end
     else
       icon = nil
-      order = 'desc' # changed for desc order by default
+      order = default_order
     end
     caption = titleize(Inflector::humanize(column)) unless caption
     
-    url = {:sort_key => column, :sort_order => order, :issue_id => params[:issue_id], :project_id => params[:project_id]}
+    url = {:sort_key => column, :sort_order => order, :status => params[:status], 
+                                                      :issue_id => params[:issue_id], 
+                                                      :project_id => params[:project_id]}
     
     link_to_remote(caption,
                   {:update => "content", :url => url},
@@ -138,8 +140,9 @@ module SortHelper
   #
   def sort_header_tag(column, options = {})
     caption = options.delete(:caption) || titleize(Inflector::humanize(column))
+    default_order = options.delete(:default_order) || 'asc'
     options[:title]= l(:label_sort_by, "\"#{caption}\"") unless options[:title]
-    content_tag('th', sort_link(column, caption), options)
+    content_tag('th', sort_link(column, caption, default_order), options)
   end
 
   private
diff --git a/app/models/query.rb b/app/models/query.rb
index 7127a464f..a4103c08a 100644
--- a/app/models/query.rb
+++ b/app/models/query.rb
@@ -16,12 +16,13 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class QueryColumn  
-  attr_accessor :name, :sortable
+  attr_accessor :name, :sortable, :default_order
   include GLoc
   
   def initialize(name, options={})
     self.name = name
     self.sortable = options[:sortable]
+    self.default_order = options[:default_order]
   end
   
   def caption
@@ -94,18 +95,18 @@ class Query < ActiveRecord::Base
   @@available_columns = [
     QueryColumn.new(:tracker, :sortable => "#{Tracker.table_name}.position"),
     QueryColumn.new(:status, :sortable => "#{IssueStatus.table_name}.position"),
-    QueryColumn.new(:priority, :sortable => "#{Enumeration.table_name}.position"),
-    QueryColumn.new(:subject),
+    QueryColumn.new(:priority, :sortable => "#{Enumeration.table_name}.position", :default_order => 'desc'),
+    QueryColumn.new(:subject, :sortable => "#{Issue.table_name}.subject"),
     QueryColumn.new(:author),
     QueryColumn.new(:assigned_to, :sortable => "#{User.table_name}.lastname"),
-    QueryColumn.new(:updated_on, :sortable => "#{Issue.table_name}.updated_on"),
+    QueryColumn.new(:updated_on, :sortable => "#{Issue.table_name}.updated_on", :default_order => 'desc'),
     QueryColumn.new(:category, :sortable => "#{IssueCategory.table_name}.name"),
     QueryColumn.new(:fixed_version),
     QueryColumn.new(:start_date, :sortable => "#{Issue.table_name}.start_date"),
     QueryColumn.new(:due_date, :sortable => "#{Issue.table_name}.due_date"),
     QueryColumn.new(:estimated_hours, :sortable => "#{Issue.table_name}.estimated_hours"),
     QueryColumn.new(:done_ratio, :sortable => "#{Issue.table_name}.done_ratio"),
-    QueryColumn.new(:created_on, :sortable => "#{Issue.table_name}.created_on"),
+    QueryColumn.new(:created_on, :sortable => "#{Issue.table_name}.created_on", :default_order => 'desc'),
   ]
   cattr_reader :available_columns
   
diff --git a/app/views/admin/projects.rhtml b/app/views/admin/projects.rhtml
index d35c484b5..c42845622 100644
--- a/app/views/admin/projects.rhtml
+++ b/app/views/admin/projects.rhtml
@@ -17,9 +17,9 @@
   <thead><tr>
 	<%= sort_header_tag('name', :caption => l(:label_project)) %>
 	<th><%=l(:field_description)%></th>
-	<th><%=l(:field_is_public)%></th>
 	<th><%=l(:label_subproject_plural)%></th>
-	<%= sort_header_tag('created_on', :caption => l(:field_created_on)) %>
+	<%= sort_header_tag('is_public', :caption => l(:field_is_public), :default_order => 'desc') %>
+	<%= sort_header_tag('created_on', :caption => l(:field_created_on), :default_order => 'desc') %>
     <th></th>
     <th></th>
   </tr></thead>
@@ -28,8 +28,8 @@
   <tr class="<%= cycle("odd", "even") %>">
 	<td><%= project.active? ? link_to(h(project.name), :controller => 'projects', :action => 'settings', :id => project) : h(project.name) %>
 	<td><%= textilizable project.short_description, :project => project %>
-	<td align="center"><%= image_tag 'true.png' if project.is_public? %>
 	<td align="center"><%= project.children.size %>
+	<td align="center"><%= image_tag 'true.png' if project.is_public? %>
 	<td align="center"><%= format_date(project.created_on) %>
   <td align="center" style="width:10%">
     <small>
diff --git a/app/views/issues/_list.rhtml b/app/views/issues/_list.rhtml
index d8e3102df..ff91f34f7 100644
--- a/app/views/issues/_list.rhtml
+++ b/app/views/issues/_list.rhtml
@@ -6,7 +6,7 @@
                                 :method => :get},
                                {:title => l(:label_bulk_edit_selected_issues)}) if @project && User.current.allowed_to?(:edit_issues, @project) %>
         </th>
-		<%= sort_header_tag("#{Issue.table_name}.id", :caption => '#') %>
+		<%= sort_header_tag("#{Issue.table_name}.id", :caption => '#', :default_order => 'desc') %>
         <% query.columns.each do |column| %>
           <%= column_header(column) %>
         <% end %>
diff --git a/app/views/users/list.rhtml b/app/views/users/list.rhtml
index 7415af308..e12aa3425 100644
--- a/app/views/users/list.rhtml
+++ b/app/views/users/list.rhtml
@@ -17,10 +17,10 @@
 	<%= sort_header_tag('login', :caption => l(:field_login)) %>
 	<%= sort_header_tag('firstname', :caption => l(:field_firstname)) %>
 	<%= sort_header_tag('lastname', :caption => l(:field_lastname)) %>
-	<th><%=l(:field_mail)%></th>
-	<%= sort_header_tag('admin', :caption => l(:field_admin)) %>
-	<%= sort_header_tag('created_on', :caption => l(:field_created_on)) %>
-	<%= sort_header_tag('last_login_on', :caption => l(:field_last_login_on)) %>
+	<%= sort_header_tag('mail', :caption => l(:field_mail)) %>
+	<%= sort_header_tag('admin', :caption => l(:field_admin), :default_order => 'desc') %>
+	<%= sort_header_tag('created_on', :caption => l(:field_created_on), :default_order => 'desc') %>
+	<%= sort_header_tag('last_login_on', :caption => l(:field_last_login_on), :default_order => 'desc') %>
     <th></th>
   </tr></thead>
   <tbody>

From 14b2d3f4b9ab95a19c7bcac2e5f3563077103eb0 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Tue, 5 Feb 2008 18:38:05 +0000
Subject: [PATCH 183/710] Slight change to the issue added/updated email
 templates.

Translations updates:
* Simplified Chinese (Liang Jin)
* Bulgarian (Nikolay Solakov)
* Lithuanian (Sergej Jegorov)
* Traditional Chinese (Shortie Lo)

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1122 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/mailer/issue_add.text.html.rhtml    |   2 +-
 app/views/mailer/issue_add.text.plain.rhtml   |   3 +-
 app/views/mailer/issue_edit.text.html.rhtml   |   5 +-
 app/views/mailer/issue_edit.text.plain.rhtml  |   9 +-
 lang/bg.yml                                   | 104 ++---
 lang/cs.yml                                   |   4 +-
 lang/de.yml                                   |   4 +-
 lang/en.yml                                   |   4 +-
 lang/es.yml                                   |   4 +-
 lang/fi.yml                                   |   4 +-
 lang/fr.yml                                   |   4 +-
 lang/he.yml                                   |   4 +-
 lang/it.yml                                   |   4 +-
 lang/ja.yml                                   |   4 +-
 lang/ko.yml                                   |   4 +-
 lang/lt.yml                                   | 134 +++----
 lang/nl.yml                                   |   4 +-
 lang/pl.yml                                   |   4 +-
 lang/pt-br.yml                                |   4 +-
 lang/pt.yml                                   |   4 +-
 lang/ro.yml                                   |   4 +-
 lang/ru.yml                                   |   4 +-
 lang/sr.yml                                   |   4 +-
 lang/sv.yml                                   |   4 +-
 lang/zh-tw.yml                                |  18 +-
 lang/zh.yml                                   | 376 +++++++++---------
 .../jstoolbar/lang/jstoolbar-lt.js            |  18 +-
 27 files changed, 372 insertions(+), 369 deletions(-)

diff --git a/app/views/mailer/issue_add.text.html.rhtml b/app/views/mailer/issue_add.text.html.rhtml
index 6d20c333f..b1c4605e6 100644
--- a/app/views/mailer/issue_add.text.html.rhtml
+++ b/app/views/mailer/issue_add.text.html.rhtml
@@ -1,3 +1,3 @@
-<%= l(:text_issue_added, "##{@issue.id}") %>
+<%= l(:text_issue_added, "##{@issue.id}", @issue.author) %>
 <hr />
 <%= render :partial => "issue_text_html", :locals => { :issue => @issue, :issue_url => @issue_url } %>
diff --git a/app/views/mailer/issue_add.text.plain.rhtml b/app/views/mailer/issue_add.text.plain.rhtml
index 38c17e777..c6cb0837f 100644
--- a/app/views/mailer/issue_add.text.plain.rhtml
+++ b/app/views/mailer/issue_add.text.plain.rhtml
@@ -1,3 +1,4 @@
-<%= l(:text_issue_added, "##{@issue.id}") %>
+<%= l(:text_issue_added, "##{@issue.id}", @issue.author) %>
+
 ----------------------------------------
 <%= render :partial => "issue_text_plain", :locals => { :issue => @issue, :issue_url => @issue_url } %>
diff --git a/app/views/mailer/issue_edit.text.html.rhtml b/app/views/mailer/issue_edit.text.html.rhtml
index 9af8592b4..7ce1f47c4 100644
--- a/app/views/mailer/issue_edit.text.html.rhtml
+++ b/app/views/mailer/issue_edit.text.html.rhtml
@@ -1,10 +1,11 @@
-<%= l(:text_issue_updated, "##{@issue.id}") %><br />
-<em><%= @journal.user.name %></em>
+<%= l(:text_issue_updated, "##{@issue.id}", @journal.user) %>
+
 <ul>
 <% for detail in @journal.details %>
     <li><%= show_detail(detail, true) %></li>
 <% end %>
 </ul>
+
 <%= textilizable(@journal.notes) %>
 <hr />
 <%= render :partial => "issue_text_html", :locals => { :issue => @issue, :issue_url => @issue_url } %>
diff --git a/app/views/mailer/issue_edit.text.plain.rhtml b/app/views/mailer/issue_edit.text.plain.rhtml
index 04b1bc54a..b5a5ec978 100644
--- a/app/views/mailer/issue_edit.text.plain.rhtml
+++ b/app/views/mailer/issue_edit.text.plain.rhtml
@@ -1,8 +1,9 @@
-<%= l(:text_issue_updated, "##{@issue.id}") %>
-<%= @journal.user.name %>
-<% for detail in @journal.details %>
+<%= l(:text_issue_updated, "##{@issue.id}", @journal.user) %>
+
+<% for detail in @journal.details -%>
 <%= show_detail(detail, true) %>
-<% end %>
+<% end -%>
+
 <%= @journal.notes if @journal.notes? %>
 ----------------------------------------
 <%= render :partial => "issue_text_plain", :locals => { :issue => @issue, :issue_url => @issue_url } %>
diff --git a/lang/bg.yml b/lang/bg.yml
index 7aac092cb..b783df592 100644
--- a/lang/bg.yml
+++ b/lang/bg.yml
@@ -73,8 +73,8 @@ notice_email_sent: Изпратен e-mail на %s
 notice_email_error: Грешка при изпращане на e-mail (%s)
 notice_feeds_access_key_reseted: Вашия ключ за RSS достъп беше променен.
 
-error_scm_not_found: Несъществуващ обект в склада.
-error_scm_command_failed: "An error occurred when trying to access the repository: %s"
+error_scm_not_found: Несъществуващ обект в хранилището.
+error_scm_command_failed: "Грешка при опит за комуникация с хранилище: %s"
 
 mail_subject_lost_password: Вашата парола
 mail_body_lost_password: 'За да смените паролата си, използвайте следния линк:'
@@ -95,9 +95,9 @@ field_filename: Файл
 field_filesize: Големина
 field_downloads: Downloads
 field_author: Автор
-field_created_on: Създадена
+field_created_on: От дата
 field_updated_on: Обновена
-field_field_format: Формат
+field_field_format: Тип
 field_is_for_all: За всички проекти
 field_possible_values: Възможни стойности
 field_regexp: Регулярен израз
@@ -178,8 +178,8 @@ setting_host_name: Хост
 setting_text_formatting: Форматиране на текста
 setting_wiki_compression: Wiki компресиране на историята
 setting_feeds_limit: Лимит на Feeds
-setting_autofetch_changesets: Автоматично обработване на commits в склада
-setting_sys_api_enabled: Разрешаване на WS за управление на склада
+setting_autofetch_changesets: Автоматично обработване на commits в хранилището
+setting_sys_api_enabled: Разрешаване на WS за управление на хранилището
 setting_commit_ref_keywords: Отбелязващи ключови думи
 setting_commit_fix_keywords: Приключващи ключови думи
 setting_autologin: Автоматичен вход
@@ -254,7 +254,7 @@ label_subproject_plural: Подпроекти
 label_min_max_length: Мин. - Макс. дължина
 label_list: Списък
 label_date: Дата
-label_integer: Число
+label_integer: Целочислен
 label_boolean: Чекбокс
 label_string: Текст
 label_text: Дълъг текст
@@ -332,7 +332,7 @@ label_ago: преди
 label_contains: съдържа
 label_not_contains: не съдържа
 label_day_plural: дни
-label_repository: Склад
+label_repository: Хранилище
 label_browse: Разглеждане
 label_modification: %d промяна
 label_modification_plural: %d промени
@@ -418,7 +418,7 @@ label_week: Седмица
 label_date_from: От
 label_date_to: До
 label_language_based: В зависимост от езика
-label_sort_by: Sort by %s
+label_sort_by: Сортиране по %s
 label_send_test_email: Изпращане на тестов e-mail
 label_feeds_access_key_created_on: %s от създаването на RSS ключа
 label_module_plural: Модули
@@ -482,8 +482,8 @@ text_tracker_no_workflow: Няма дефиниран работен проце
 text_unallowed_characters: Непозволени символи
 text_comma_separated: Позволено е изброяване (с разделител запетая).
 text_issues_ref_in_commit_messages: Отбелязване и приключване на задачи от commit съобщения
-text_issue_added: Публикувана е нова задача с номер %s.
-text_issue_updated: Задача %s е обновена.
+text_issue_added: Публикувана е нова задача с номер %s (by %s).
+text_issue_updated: Задача %s е обновена (by %s).
 text_wiki_destroy_confirmation: Сигурни ли сте, че искате да изтриете това Wiki и цялото му съдържание?
 text_issue_category_destroy_question: Има задачи (%d) обвързани с тази категория. Какво ще изберете?
 text_issue_category_destroy_assignments: Премахване на връзките с категорията
@@ -514,12 +514,12 @@ default_activity_development: Разработка
 enumeration_issue_priorities: Приоритети на задачи
 enumeration_doc_categories: Категории документи
 enumeration_activities: Дейности (time tracking)
-label_file_plural: Files
+label_file_plural: Файлове
 label_changeset_plural: Changesets
 field_column_names: Колони
 label_default_columns: По подразбиране
 setting_issue_list_default_columns: Показвани колони по подразбиране
-setting_repositories_encodings: Encodings на складовете
+setting_repositories_encodings: Кодови таблици на хранилищата
 notice_no_issue_selected: "Няма избрани задачи."
 label_bulk_edit_selected_issues: Редактиране на задачи
 label_no_change_option: (Без промяна)
@@ -527,42 +527,42 @@ notice_failed_to_save_issues: "Неуспешен запис на %d задач
 label_theme: Тема
 label_default: По подразбиране
 label_search_titles_only: Само в заглавията
-label_nobody: nobody
-button_change_password: Change password
-text_user_mail_option: "For unselected projects, you will only receive notifications about things you watch or you're involved in (eg. issues you're the author or assignee)."
-label_user_mail_option_selected: "For any event on the selected projects only..."
-label_user_mail_option_all: "For any event on all my projects"
-label_user_mail_option_none: "Only for things I watch or I'm involved in"
-setting_emails_footer: Emails footer
-label_float: Float
-button_copy: Copy
-mail_body_account_information_external: You can use your "%s" account to log into Redmine.
-mail_body_account_information: Your Redmine account information
-setting_protocol: Protocol
-label_user_mail_no_self_notified: "I don't want to be notified of changes that I make myself"
-setting_time_format: Time format
-label_registration_activation_by_email: account activation by email
-mail_subject_account_activation_request: Redmine account activation request
-mail_body_account_activation_request: 'A new user (%s) has registered. His account his pending your approval:'
-label_registration_automatic_activation: automatic account activation
-label_registration_manual_activation: manual account activation
-notice_account_pending: "Your account was created and is now pending administrator approval."
-field_time_zone: Time zone
-text_caracters_minimum: Must be at least %d characters long.
-setting_bcc_recipients: Blind carbon copy recipients (bcc)
-button_annotate: Annotate
-label_issues_by: Issues by %s
-field_searchable: Searchable
-label_display_per_page: 'Per page: %s'
-setting_per_page_options: Objects per page options
-label_age: Age
-notice_default_data_loaded: Default configuration successfully loaded.
-text_load_default_configuration: Load the default configuration
-text_no_configuration_data: "Roles, trackers, issue statuses and workflow have not been configured yet.\nIt is highly recommended to load the default configuration. You will be able to modify it once loaded."
-error_can_t_load_default_data: "Default configuration could not be loaded: %s"
-button_update: Update
-label_change_properties: Change properties
-label_general: General
-label_repository_plural: Repositories
-label_associated_revisions: Associated revisions
-setting_user_format: Users display format
+label_nobody: никой
+button_change_password: Промяна на парола
+text_user_mail_option: "За неизбраните проекти, ще получавате известия само за наблюдавани дейности или в които участвате (т.е. автор или назначени на мен)."
+label_user_mail_option_selected: "За всички събития само в избраните проекти..."
+label_user_mail_option_all: "За всяко събитие в проектите, в които участвам"
+label_user_mail_option_none: "Само за наблюдавани или в които участвам (автор или назначени на мен)"
+setting_emails_footer: Подтекст за e-mail
+label_float: Дробно
+button_copy: Копиране
+mail_body_account_information_external: Можете да използвате вашия "%s" акаунт за вход в Redmine.
+mail_body_account_information: Информацията за акаунта ви в Redmine
+setting_protocol: Протокол
+label_user_mail_no_self_notified: "Не искам известия за извършени от мен промени"
+setting_time_format: Формат на часа
+label_registration_activation_by_email: активиране на акаунта по email
+mail_subject_account_activation_request: Заявка за активиране на акаунт в Redmine
+mail_body_account_activation_request: 'Има новорегистриран потребител (%s), очакващ вашето одобрение:'
+label_registration_automatic_activation: автоматично активиране
+label_registration_manual_activation: ръчно активиране
+notice_account_pending: "Акаунтът Ви е създаден и очаква одобрение от администратор."
+field_time_zone: Часова зона
+text_caracters_minimum: Минимум %d символа.
+setting_bcc_recipients: Blind carbon copy (bcc) получатели
+button_annotate: Анотация
+label_issues_by: Задачи по %s
+field_searchable: С възможност за търсене
+label_display_per_page: 'На страница по: %s'
+setting_per_page_options: Опции за страниране
+label_age: Възраст
+notice_default_data_loaded: Примерната информацията е успешно заредена.
+text_load_default_configuration: Зареждане на примерна информация
+text_no_configuration_data: "Все още не са конфигурирани Роли, тракери, статуси на задачи и работен процес.\nСтрого се препоръчва зареждането на примерната информация. Веднъж заредена ще имате възможност да я редактирате."
+error_can_t_load_default_data: "Грешка при зареждане на примерната информация: %s"
+button_update: Обновяване
+label_change_properties: Промяна на настройки
+label_general: Основни
+label_repository_plural: Хранилища
+label_associated_revisions: Асоциирани ревизии
+setting_user_format: Потребителски формат
diff --git a/lang/cs.yml b/lang/cs.yml
index d6307babe..cec7d2a31 100644
--- a/lang/cs.yml
+++ b/lang/cs.yml
@@ -505,10 +505,10 @@ button_rename: Rename
 text_issue_category_destroy_question: Some issues (%d) are assigned to this category. What do you want to do ?
 label_module_plural: Modules
 label_jump_to_a_project: Jump to a project...
-text_issue_updated: Issue %s has been updated.
+text_issue_updated: Issue %s has been updated by %s.
 field_redirect_existing_links: Redirect existing links
 text_issue_category_reassign_to: Reassing issues to this category
-text_issue_added: Issue %s has been reported.
+text_issue_added: Issue %s has been reported by %s.
 label_file_plural: Files
 text_wiki_destroy_confirmation: Are you sure you want to delete this wiki and all its content ?
 label_updated_time: Updated %s ago
diff --git a/lang/de.yml b/lang/de.yml
index f0f054b1b..a2222af83 100644
--- a/lang/de.yml
+++ b/lang/de.yml
@@ -531,8 +531,8 @@ text_tracker_no_workflow: Kein Workflow für diesen Tracker definiert.
 text_unallowed_characters: Nicht erlaubte Zeichen
 text_comma_separated: Mehrere Werte erlaubt (durch Komma getrennt).
 text_issues_ref_in_commit_messages: Ticket-Beziehungen und -Status in Commit-Log-Meldungen
-text_issue_added: Ticket %s wurde erstellt.
-text_issue_updated: Ticket %s wurde aktualisiert.
+text_issue_added: Ticket %s wurde erstellt by %s.
+text_issue_updated: Ticket %s wurde aktualisiert by %s.
 text_wiki_destroy_confirmation: Sind Sie sicher, dass Sie dieses Wiki mit sämtlichem Inhalt löschen möchten?
 text_issue_category_destroy_question: Einige Tickets (%d) sind dieser Kategorie zugeodnet. Was möchten Sie tun?
 text_issue_category_destroy_assignments: Kategorie-Zuordnung entfernen
diff --git a/lang/en.yml b/lang/en.yml
index 534a4834e..8c54e1c79 100644
--- a/lang/en.yml
+++ b/lang/en.yml
@@ -531,8 +531,8 @@ text_tracker_no_workflow: No workflow defined for this tracker
 text_unallowed_characters: Unallowed characters
 text_comma_separated: Multiple values allowed (comma separated).
 text_issues_ref_in_commit_messages: Referencing and fixing issues in commit messages
-text_issue_added: Issue %s has been reported.
-text_issue_updated: Issue %s has been updated.
+text_issue_added: Issue %s has been reported by %s.
+text_issue_updated: Issue %s has been updated by %s.
 text_wiki_destroy_confirmation: Are you sure you want to delete this wiki and all its content ?
 text_issue_category_destroy_question: Some issues (%d) are assigned to this category. What do you want to do ?
 text_issue_category_destroy_assignments: Remove category assignments
diff --git a/lang/es.yml b/lang/es.yml
index 9023f2b6a..f8cd9e300 100644
--- a/lang/es.yml
+++ b/lang/es.yml
@@ -505,12 +505,12 @@ label_jump_to_a_project: Ir al proyecto...
 field_assignable: Se pueden asignar peticiones a este perfil
 label_sort_by: Ordenar por %s
 setting_issue_list_default_columns: Columnas por defecto para la lista de peticiones
-text_issue_updated: La petición %s ha sido actualizada.
+text_issue_updated: La petición %s ha sido actualizada por %s.
 notice_feeds_access_key_reseted: Su clave de acceso para RSS ha sido reiniciada
 field_redirect_existing_links: Redireccionar enlaces existentes
 text_issue_category_reassign_to: Reasignar las peticiones a la categoría
 notice_email_sent: Se ha enviado un correo a %s
-text_issue_added: Petición añadida
+text_issue_added: Petición añadida por %s.
 field_comments: Comentario
 label_file_plural: Archivos
 text_wiki_destroy_confirmation: ¿Seguro que quiere borrar el wiki y todo su contenido?
diff --git a/lang/fi.yml b/lang/fi.yml
index 5dbe5e8a5..cf04b23b4 100644
--- a/lang/fi.yml
+++ b/lang/fi.yml
@@ -533,8 +533,8 @@ text_tracker_no_workflow: Ei työnkulkua määritelty tälle tiketille
 text_unallowed_characters: Kiellettyjä merkkejä
 text_comma_separated: Useat arvot sallittu (pilkku eroteltuna).
 text_issues_ref_in_commit_messages: Liitän ja korjaan ongelmia syötetyssä viestissä
-text_issue_added: Tapahtuma %s on kirjattu.
-text_issue_updated: Tapahtuma %s on päivitetty.
+text_issue_added: Tapahtuma %s on kirjattu by %s.
+text_issue_updated: Tapahtuma %s on päivitetty by %s.
 text_wiki_destroy_confirmation: Oletko varma että haluat poistaa tämän wiki:n ja kaikki sen sisältämän tiedon?
 text_issue_category_destroy_question: Jotkut tapahtumat (%d) ovat nimetty tälle luokalle. Mitä haluat tehdä?
 text_issue_category_destroy_assignments: Poista luokan tehtävät
diff --git a/lang/fr.yml b/lang/fr.yml
index 1c1e7b5c2..7df8ec622 100644
--- a/lang/fr.yml
+++ b/lang/fr.yml
@@ -532,8 +532,8 @@ text_tracker_no_workflow: Aucun worflow n'est défini pour ce tracker
 text_unallowed_characters: Caractères non autorisés
 text_comma_separated: Plusieurs valeurs possibles (séparées par des virgules).
 text_issues_ref_in_commit_messages: Référencement et résolution des demandes dans les commentaires de commits
-text_issue_added: La demande %s a été soumise.
-text_issue_updated: La demande %s a été mise à jour.
+text_issue_added: La demande %s a été soumise par %s.
+text_issue_updated: La demande %s a été mise à jour par %s.
 text_wiki_destroy_confirmation: Etes-vous sûr de vouloir supprimer ce wiki et tout son contenu ?
 text_issue_category_destroy_question: Des demandes (%d) sont affectées à cette catégories. Que voulez-vous faire ?
 text_issue_category_destroy_assignments: N'affecter les demandes à aucune autre catégorie
diff --git a/lang/he.yml b/lang/he.yml
index 9b274c58d..7f26341b8 100644
--- a/lang/he.yml
+++ b/lang/he.yml
@@ -494,8 +494,8 @@ text_tracker_no_workflow: זרימת עבודה לא הוגדרה עבור עו
 text_unallowed_characters: תווים לא מורשים
 text_comma_separated: הכנסת ערכים מרובים מותרת (מופרדים בפסיקים).
 text_issues_ref_in_commit_messages: קישור ותיקום נושאים בהודעות הפקדות
-text_issue_added: הנושא %s דווח.
-text_issue_updated: הנושא %s עודכן.
+text_issue_added: הנושא %s דווח (by %s).
+text_issue_updated: הנושא %s עודכן (by %s).
 text_wiki_destroy_confirmation: האם אתה בטוח שברצונך למחוק את הWIKI הזה ואת כל תוכנו?
 text_issue_category_destroy_question: כמה נושאים (%d) מוצבים לקטגוריה הזו. מה ברצונך לעשות?
 text_issue_category_destroy_assignments: הסר הצבת קטגוריה
diff --git a/lang/it.yml b/lang/it.yml
index 5f07a2f24..7b27a54cb 100644
--- a/lang/it.yml
+++ b/lang/it.yml
@@ -482,8 +482,8 @@ text_tracker_no_workflow: Nessun workflow definito per questo tracker
 text_unallowed_characters: Unallowed characters
 text_comma_separated: Multiple values allowed (comma separated).
 text_issues_ref_in_commit_messages: Referencing and fixing issues in commit messages
-text_issue_added: "E' stata segnalata l'anomalia %s."
-text_issue_updated: "L'anomalia %s e' stata aggiornata."
+text_issue_added: "E' stata segnalata l'anomalia %s da %s."
+text_issue_updated: "L'anomalia %s e' stata aggiornata da %s."
 text_wiki_destroy_confirmation: Are you sure you want to delete this wiki and all its content ?
 text_issue_category_destroy_question: Some issues (%d) are assigned to this category. What do you want to do ?
 text_issue_category_destroy_assignments: Remove category assignments
diff --git a/lang/ja.yml b/lang/ja.yml
index 3266256c2..0b3926a23 100644
--- a/lang/ja.yml
+++ b/lang/ja.yml
@@ -483,8 +483,8 @@ text_tracker_no_workflow: このトラッカーにワークフローが定義さ
 text_unallowed_characters: 使えない文字です
 text_comma_separated: (カンマで区切った)複数の値が使えます
 text_issues_ref_in_commit_messages: コミットメッセージ内で問題の参照/修正
-text_issue_added: 問題 %s が報告されました。
-text_issue_updated: 問題 %s が更新されました。
+text_issue_added: 問題 %s が報告されました。 (by %s)
+text_issue_updated: 問題 %s が更新されました。 (by %s)
 text_wiki_destroy_confirmation: 本当にこのwikiとその内容の全てを削除しますか？
 text_issue_category_destroy_question: このカテゴリに割り当て済みの問題(%d)があります。何をしようとしていますか？
 text_issue_category_destroy_assignments: カテゴリの割り当てを削除する
diff --git a/lang/ko.yml b/lang/ko.yml
index 7f93fe94a..b9b9542fc 100644
--- a/lang/ko.yml
+++ b/lang/ko.yml
@@ -500,8 +500,8 @@ text_tracker_no_workflow: 이 추적타입(tracker)에 워크플로우가 정의
 text_unallowed_characters: 허용되지 않는 문자열
 text_comma_separated: 복수의 값들이 허용됩니다.(구분자 ,)
 text_issues_ref_in_commit_messages: 커밋메시지에서 티켓을 참조하거나 해결하기
-text_issue_added: 티켓[%s]이 보고되었습니다.
-text_issue_updated: 티켓[%s]이 수정되었습니다.
+text_issue_added: 티켓[%s]이 보고되었습니다 (by %s).
+text_issue_updated: 티켓[%s]이 수정되었습니다 (by %s).
 text_wiki_destroy_confirmation: 이 위키와 모든 내용을 지우시겠습니까?
 text_issue_category_destroy_question: 일부 티켓들(%d개)이 이 카테고리에 할당되어 있습니다. 어떻게 하시겠습니까?
 text_issue_category_destroy_assignments: 카테고리 할당 지우기
diff --git a/lang/lt.yml b/lang/lt.yml
index 51686f9ed..6f2965353 100644
--- a/lang/lt.yml
+++ b/lang/lt.yml
@@ -2,11 +2,11 @@ _gloc_rule_default: '|n| n==1 ? "" : "_plural" '
  
 actionview_datehelper_select_day_prefix: 
 actionview_datehelper_select_month_names: sausis,vasaris,kovas,balandis,gegužė,birželis,liepa,rugpjūtis,rugsėjis,spalis,lapkritis,gruodis
-actionview_datehelper_select_month_names_abbr: sausis,vasaris,kovas,balandis,gegužė,birželis,liepa,rugpjūtis,rugsėjis,spalis,lapkritis,gruodis
-actionview_datehelper_select_month_prefix: 
+actionview_datehelper_select_month_names_abbr: Sau,Vas,Kov,Bal,Geg,Brž,Lie,Rgp,Rgs,Spl,Lap,Grd
+actionview_datehelper_select_month_prefix:
 actionview_datehelper_select_year_prefix: 
-actionview_datehelper_time_in_words_day: 1 diena 
-actionview_datehelper_time_in_words_day_plural: %d dienos 
+actionview_datehelper_time_in_words_day: 1 diena
+actionview_datehelper_time_in_words_day_plural: %d dienų
 actionview_datehelper_time_in_words_hour_about: apytiksliai valanda 
 actionview_datehelper_time_in_words_hour_about_plural: apie %d valandas 
 actionview_datehelper_time_in_words_hour_about_single: apytiksliai valanda 
@@ -68,6 +68,7 @@ notice_successful_delete: Sėkmingas panaikinimas.
 notice_successful_connection: Sėkmingas susijungimas. 
 notice_file_not_found: Puslapis, į kurį ketinate įeiti, neegzistuoja arba pašalintas. 
 notice_locking_conflict: Duomenys atnaujinti kito vartotojo. 
+notice_scm_error: Duomenys ir/ar pakeitimai saugykloje(repozitorojoje) neegzistuoja.
 notice_not_authorized: Jūs neturite teisių gauti prieigą prie šio puslapio. 
 notice_email_sent: Laiškas išsiųstas %s
 notice_email_error: Laiško siųntimo metu įvyko klaida (%s)
@@ -105,7 +106,7 @@ field_author: Autorius
 field_created_on: Sukūrta
 field_updated_on: Atnaujinta
 field_field_format: Formatas
-field_is_for_all: Visiems laukasms
+field_is_for_all: Visiems projektams
 field_possible_values: Galimos reikšmės
 field_regexp: Pastovi išraiška
 field_min_length: Minimalus ilgis
@@ -114,14 +115,14 @@ field_value: Vertė
 field_category: Kategorija 
 field_title: Pavadinimas 
 field_project: Projektas 
-field_issue: Svarstoma problema 
+field_issue: Darbas 
 field_status: Būsena 
 field_notes: Pastabos 
-field_is_closed: Svarstoma problema uždaryta 
+field_is_closed: Darbas uždarytas 
 field_is_default: Numatytoji vertė 
 field_tracker: Pėdsekys 
-field_subject: Dalykas 
-field_due_date: Mokėjimo terminas 
+field_subject: Tema 
+field_due_date: Užbaigimo data 
 field_assigned_to: Paskirtas 
 field_priority: Prioritetas 
 field_fixed_version: Pastovi versija
@@ -129,9 +130,9 @@ field_user: Vartotojas
 field_role: Vaidmuo 
 field_homepage: Pagrindinis puslapis 
 field_is_public: Viešas 
-field_parent: Yra subprojektas
-field_is_in_chlog: Svarstomos problemos rodomos pokyčių žurnale 
-field_is_in_roadmap: Svarstomos problemos rodomos veiklos grafike 
+field_parent: Priklauso projektui
+field_is_in_chlog: Darbai rodomi pokyčių žurnale 
+field_is_in_roadmap: Darbai rodomi veiklos grafike 
 field_login: Registracijos vardas 
 field_mail_notification: Elektroninio pašto pranešimai 
 field_admin: Administratorius 
@@ -165,16 +166,15 @@ field_activity: Veikla
 field_spent_on: Data 
 field_identifier: Identifikuotojas 
 field_is_filter: Panaudotas kaip filtras 
-field_issue_to_id: Susijusi svarstoma problema 
+field_issue_to_id: Susijęs darbas
 field_delay: Užlaikymas 
-field_assignable: Svarstomos problemos gali būti paskirtos šiam vaidmeniui 
+field_assignable: Darbai gali būti paskirti šiam vaidmeniui 
 field_redirect_existing_links: Peradresuokite egzistuojančias sąsajas 
-field_estimated_hours: Apskaičiuotas laikas 
+field_estimated_hours: Numatyta trukmė 
 field_column_names: Skiltys 
 field_time_zone: Laiko juosta 
 field_searchable: Randamas 
 field_default_value: Numatytoji vertė 
-
 setting_app_title: Programos pavadinimas 
 setting_app_subtitle: Programos paantraštė 
 setting_welcome_text: Pasveikinimas 
@@ -182,7 +182,7 @@ setting_default_language: Numatytoji kalba
 setting_login_required: Reikalingas autentiškumo nustatymas  
 setting_self_registration: Saviregistracija 
 setting_attachment_max_size: Priedo maks. dydis 
-setting_issues_export_limit pagal dydį: Svarstomų problemų eksportavimo riba 
+setting_issues_export_limit pagal dydį: Darbų eksportavimo riba 
 setting_mail_from: Emisijos elektroninio pašto adresas 
 setting_bcc_recipients: Akli tikslios kopijos gavėjai (bcc)
 setting_host_name: Pagrindinio kompiuterio vardas
@@ -196,9 +196,9 @@ setting_commit_fix_keywords: Fiksavimo reikšminiai žodžiai
 setting_autologin: Autoregistracija
 setting_date_format: Datos formatas 
 setting_time_format: Laiko formatas 
-setting_cross_project_issue_relations: Leisti tarprojektinius svarstomos problemos ryšius
-setting_issue_list_default_columns: Numatytosios skiltys svarstomos problemos sąraše
-setting_repositories_encodings: Saugyklos encodingas
+setting_cross_project_issue_relations: Leisti tarprojektinius darbų ryšius
+setting_issue_list_default_columns: Numatytosios skiltys darbų sąraše
+setting_repositories_encodings: Saugyklos enkodingas
 setting_emails_footer: elektroninio pašto puslapinė poraštė
 setting_protocol: Protokolas
  
@@ -210,11 +210,11 @@ label_project_new: Naujas projektas
 label_project_plural: Projektai 
 label_project_all: Visi Projektai 
 label_project_latest: Paskutiniai projektai 
-label_issue: Svarstoma problema 
-label_issue_new: Nauja svarstoma problema 
-label_issue_plural: Svarstomos problemos 
-label_issue_view_all: Peržiūrėti visas svarstomas problemas
-label_issues_by: Svarstomos problemos pagal %s 
+label_issue: Darbas 
+label_issue_new: Naujas darbas 
+label_issue_plural: Darbai 
+label_issue_view_all: Peržiūrėti visus darbus
+label_issues_by: Darbai pagal %s 
 label_document: Dokumentas
 label_document_new: Naujas dokumentas
 label_document_plural: Dokumentai 
@@ -229,11 +229,11 @@ label_tracker: Pėdsekys
 label_tracker_plural: Pėdsekiai 
 label_tracker_new: Naujas pėdsekys 
 label_workflow: Darbų eiga 
-label_issue_status: Svarstomos problemos padėtis 
-label_issue_status_plural: Svarstomos problemos padėtys 
+label_issue_status: Darbo padėtis 
+label_issue_status_plural: Darbų padėtys 
 label_issue_status_new: Nauja padėtis 
-label_issue_category: Svarstomos problemos kategorija 
-label_issue_category_plural: Svarstomos problemos kategorijos 
+label_issue_category: Darbo kategorija 
+label_issue_category_plural: Darbo kategorijos 
 label_issue_category_new: Nauja kategorija 
 label_custom_field: Kliento laukas 
 label_custom_field_plural: Kliento laukai 
@@ -247,14 +247,14 @@ label_register: Užsiregistruoti
 label_password_lost: Prarastas slaptažodis
 label_home: Pagrindinis 
 label_my_page: Mano puslapis
-label_my_account: Mano pranešimas 
+label_my_account: Mano paskyra 
 label_my_projects: Mano projektai 
-label_administration: Administracija 
+label_administration: Administravimas 
 label_login: Prisijungti 
 label_logout: Atsijungti 
 label_help: Pagalba 
-label_reported_issues: Praneštos svarstomos problemos 
-label_assigned_to_me_issues: Svarstomos problemos, paskirtos man 
+label_reported_issues: Pranešti darbai 
+label_assigned_to_me_issues: Darbai, priskirti man 
 label_last_login: Paskutinis ryšys 
 label_last_updates: Paskutinis atnaujinimas
 label_last_updates_plural: %d paskutinis atnaujinimas 
@@ -304,10 +304,10 @@ label_confirmation: Patvirtinimas
 label_export_to: Eksportuoti į 
 label_read: Skaitykite... 
 label_public_projects: Vieši projektai 
-label_open_issues: atidarytas 
-label_open_issues_plural: atidaryti
-label_closed_issues: uždarytas 
-label_closed_issues_plural: uždaryti
+label_open_issues: atidaryta
+label_open_issues_plural: atidarytos
+label_closed_issues: uždaryta 
+label_closed_issues_plural: uždarytos
 label_total: Bendra suma 
 label_permissions: Leidimai 
 label_current_status: Einamoji padėtis 
@@ -364,15 +364,15 @@ label_latest_revision: Paskutinė revizija
 label_latest_revision_plural: Paskutinės revizijos 
 label_view_revisions: Pežiūrėti revizijas 
 label_max_size: Maksimalus dydis 
-label_on: 'ant' 
+label_on: 'iš' 
 label_sort_highest: Perkelti į viršūnę 
 label_sort_higher: Perkelti į viršų 
 label_sort_lower: Perkelti žemyn 
 label_sort_lowest: Perkelti į apačią 
 label_roadmap: Veiklos grafikas 
-label_roadmap_due_in: Baigiama 
+label_roadmap_due_in: Baigiasi po 
 label_roadmap_overdue: %s vėluojama 
-label_roadmap_no_issues: Jokios svarstomos problemos šiai versijai
+label_roadmap_no_issues: Jokio darbo šiai versijai nėra
 label_search: Ieškoti 
 label_result_plural: Rezultatai 
 label_all_words: Visi žodžiai 
@@ -387,7 +387,7 @@ label_current_version: Einamoji versija
 label_preview: Peržiūra 
 label_feed_plural: Įeitys(Feeds)
 label_changes_details: Visų pakeitimų detalės 
-label_issue_tracking: Svarstomų problemų sekimas 
+label_issue_tracking: Darbų sekimas 
 label_spent_time: Sugaištas laikas 
 label_f_hour: %.2f valanda 
 label_f_hour_plural: %.2f valandų 
@@ -402,8 +402,8 @@ label_diff_side_by_side: šalia
 label_options: Pasirinkimai
 label_copy_workflow_from: Kopijuoti darbų eiga iš 
 label_permissions_report: Leidimų pranešimas 
-label_watched_issues: Stebėtos svarstomos problemos 
-label_related_issues: Susijusios svarstomos problemos 
+label_watched_issues: Stebimi darbai 
+label_related_issues: Susiję darbai 
 label_applied_status: Taikomoji padėtis 
 label_loading: Kraunama... 
 label_relation_new: Naujas ryšys 
@@ -448,7 +448,7 @@ label_file_plural: Bylos
 label_changeset_plural: Changesets 
 label_default_columns: Numatytosios skiltys 
 label_no_change_option: (Jokio pakeitimo) 
-label_bulk_edit_selected_issues: Masinis pasirinktų svarstomųjų problemų(issues) redagavimas 
+label_bulk_edit_selected_issues: Masinis pasirinktų darbų(issues) redagavimas 
 label_theme: Tema 
 label_default: Numatyta(as) 
 label_search_titles_only: Ieškoti pavadinimų tiktai 
@@ -483,7 +483,7 @@ button_back: Atgal
 button_cancel: Atšaukti 
 button_activate: Aktyvinti 
 button_sort: Rūšiuoti
-button_log_time: Log laikas 
+button_log_time: Praleistas laikas 
 button_rollback: Grįžti į šią versiją
 button_watch: Stebėti 
 button_unwatch: Nestebėti
@@ -500,7 +500,7 @@ status_active: aktyvus
 status_registered: užregistruotas 
 status_locked: užrakintas 
  
-text_select_mail_notifications: Išrinkite veiksmus, apie kuriuos būtų pranešta elektroniniu pasštu. 
+text_select_mail_notifications: Išrinkite veiksmus, apie kuriuos būtų pranešta elektroniniu paštu.
 text_regexp_info: pvz. ^[A-Z0-9]+$ 
 text_min_max_length_info: 0 reiškia jokių apribojimų
 text_project_destroy_confirmation: Ar esate įsitikinęs, kad jūs norite pašalinti šį projektą ir visus susijusius duomenis? 
@@ -511,7 +511,7 @@ text_journal_set_to: nustatyta į %s
 text_journal_deleted: ištrintas 
 text_tip_task_begin_day: užduotis, prasidedanti šią dieną 
 text_tip_task_end_day: užduotis, pasibaigianti šią dieną 
-text_tip_task_begin_end_day: užduoties prasidedanti ir pasibaigianti šią dieną 
+text_tip_task_begin_end_day: užduotis, prasidedanti ir pasibaigianti šią dieną 
 text_project_identifier_info: 'Mažosios raidės (a-z), skaičiai ir brūkšniai galimi.<br/>Išsaugojus, identifikuotojas negali būti keičiamas.' 
 text_caracters_maximum: %d simbolių maksimumas. 
 text_caracters_minimum: Turi būti mažiausiai %d simbolių ilgio. 
@@ -519,14 +519,14 @@ text_length_between: Ilgis tarp %d ir %d simbolių.
 text_tracker_no_workflow: Jokia darbų eiga neapibrėžta šiam pėdsekiui 
 text_unallowed_characters: Neleistini simboliai 
 text_comma_separated: Leistinos kelios reikšmės (atskirtos kableliu). 
-text_issues_ref_in_commit_messages: Nurodymas ir fiksavimas svarstomų problemų pavedimų(commit) pranešimuose 
-text_issue_added: Svarstoma problema %s buvo pranešta. 
-text_issue_updated: Svarstoma problema %s buvo atnaujinta. 
+text_issues_ref_in_commit_messages: Darbų pavedimų(commit) nurodymas ir fiksavimas  pranešimuose 
+text_issue_added: Darbas %s buvo praneštas (by %s). 
+text_issue_updated: Darbas %s buvo atnaujintas (by %s). 
 text_wiki_destroy_confirmation: Ar esate įsitikinęs, kad jūs norite pašalinti wiki ir visą jos turinį? 
-text_issue_category_destroy_question: Kai kurios svarstomos problemos (%d) yra paskirtos šiai kategorijai. Ką jūs norite padaryti? 
+text_issue_category_destroy_question: Kai kurie darbai (%d) yra paskirti šiai kategorijai. Ką jūs norite daryti? 
 text_issue_category_destroy_assignments: Pašalinti kategorijos užduotis 
-text_issue_category_reassign_to: Iš naujo paskirti svarstomas problemas šiai kategorijai 
-text_user_mail_option: "neišrinktiems projektams, jūs tiktai gausite pranešimus apie daiktus, kuriuos jūs stebite, ar jūs esate įtrauktas į (eg. svarstomos problemos, jūs esate autorius ar įgaliotinis)." 
+text_issue_category_reassign_to: Iš naujo priskirti darbus šiai kategorijai 
+text_user_mail_option: "neišrinktiems projektams, jūs tiktai gausite pranešimus apie įvykius, kuriuos jūs stebite, arba į kuriuos esate įtrauktas (pvz. darbai, jūs esate autorius ar įgaliotinis)." 
  
 default_role_manager: Vadovas 
 default_role_developper: Projektuotojas 
@@ -550,20 +550,20 @@ default_priority_immediate: Neatidėliotinas
 default_activity_design: Projektavimas
 default_activity_development: Vystymas 
  
-enumeration_issue_priorities: Svarstomos problemos prioritetai 
+enumeration_issue_priorities: Darbo prioritetai 
 enumeration_doc_categories: Dokumento kategorijos 
 enumeration_activities: Veiklos (laiko sekimas)
-label_display_per_page: 'Per page: %s'
+label_display_per_page: '%s įrašų puslapyje'
 setting_per_page_options: Objects per page options
-notice_default_data_loaded: Default configuration successfully loaded.
-label_age: Age
-label_general: General
-button_update: Update
-setting_issues_export_limit: Issues export limit
-label_change_properties: Change properties
-text_load_default_configuration: Load the default configuration
-text_no_configuration_data: "Roles, trackers, issue statuses and workflow have not been configured yet.\nIt is highly recommended to load the default configuration. You will be able to modify it once loaded."
-label_repository_plural: Repositories
-error_can_t_load_default_data: "Default configuration could not be loaded: %s"
-label_associated_revisions: Associated revisions
-setting_user_format: Users display format
+notice_default_data_loaded: Numatytoji konfiguracija sėkmingai užkrauta.
+label_age: Amžius
+label_general: Bendri
+button_update: Atnaujinti
+setting_issues_export_limit: Darbų eksportavimo limitas
+label_change_properties: Pakeisti nustatymus
+text_load_default_configuration: Užkrauti numatytąj konfiguraciją
+text_no_configuration_data: "Vaidmenys, pėdsekiai, darbų būsenos ir darbų eiga dar nebuvo konfigūruoti.\nGriežtai rekomenduojam užkrauti numatytąją(default)konfiguraciją. Užkrovus, galėsite ją modifikuoti."
+label_repository_plural: Saugiklos
+error_can_t_load_default_data: "Numatytoji konfiguracija negali būti užkrauta: %s"
+label_associated_revisions: susijusios revizijos
+setting_user_format: Vartotojo atvaizdavimo formatas
diff --git a/lang/nl.yml b/lang/nl.yml
index dc413b058..c2d692706 100644
--- a/lang/nl.yml
+++ b/lang/nl.yml
@@ -482,8 +482,8 @@ text_tracker_no_workflow: Geen workflow gedefinieerd voor deze tracker
 text_unallowed_characters: Niet toegestane tekens
 text_coma_separated: Meerdere waarden toegestaan (door komma's gescheiden).
 text_issues_ref_in_commit_messages: Opzoeken en aanpassen van issues in commit berichten
-text_issue_added: Issue %s is gerapporteerd.
-text_issue_updated: Issue %s is gewijzigd.
+text_issue_added: Issue %s is gerapporteerd (by %s).
+text_issue_updated: Issue %s is gewijzigd (by %s).
 text_wiki_destroy_confirmation: Are you sure you want to delete this wiki and all its content ?
 text_issue_category_destroy_question: Some issues (%d) are assigned to this category. What do you want to do ?
 text_issue_category_destroy_assignments: Remove category assignments
diff --git a/lang/pl.yml b/lang/pl.yml
index 10b5cd029..0f99628af 100644
--- a/lang/pl.yml
+++ b/lang/pl.yml
@@ -500,12 +500,12 @@ label_this_week: ten tydzień
 label_jump_to_a_project: Skocz do projektu...
 field_assignable: Zagadnienia mogą być przypisane do tej roli
 label_sort_by: Sortuj po %s
-text_issue_updated: Zagadnienie %s zostało zaktualizowane.
+text_issue_updated: Zagadnienie %s zostało zaktualizowane (by %s).
 notice_feeds_access_key_reseted: Twój klucz dostępu RSS został zrestetowany.
 field_redirect_existing_links: Przekierowanie istniejących odnośników
 text_issue_category_reassign_to: Przydziel zagadnienie do tej kategorii
 notice_email_sent: Email został wysłany do %s
-text_issue_added: Zagadnienie %s zostało wprowadzone.
+text_issue_added: Zagadnienie %s zostało wprowadzone (by %s).
 text_wiki_destroy_confirmation: Jesteś pewien, że chcesz usunąć to wiki i całą jego zawartość ?
 notice_email_error: Wystąpił błąd w trakcie wysyłania maila (%s)
 label_updated_time: Zaktualizowane %s temu
diff --git a/lang/pt-br.yml b/lang/pt-br.yml
index b246cfd30..3c6fd1265 100644
--- a/lang/pt-br.yml
+++ b/lang/pt-br.yml
@@ -482,8 +482,8 @@ text_tracker_no_workflow: Sem workflow definido para este tipo.
 text_unallowed_characters: Unallowed characters
 text_comma_separated: Multiple values allowed (comma separated).
 text_issues_ref_in_commit_messages: Referencing and fixing issues in commit messages
-text_issue_added: Tarefa %s foi incluída.
-text_issue_updated: Tarefa %s foi alterada.
+text_issue_added: Tarefa %s foi incluída (by %s).
+text_issue_updated: Tarefa %s foi alterada (by %s).
 text_wiki_destroy_confirmation: Are you sure you want to delete this wiki and all its content ?
 text_issue_category_destroy_question: Some issues (%d) are assigned to this category. What do you want to do ?
 text_issue_category_destroy_assignments: Remove category assignments
diff --git a/lang/pt.yml b/lang/pt.yml
index aa98d15a8..3b5647d53 100644
--- a/lang/pt.yml
+++ b/lang/pt.yml
@@ -482,8 +482,8 @@ text_tracker_no_workflow: Sem workflow definido para este tipo.
 text_unallowed_characters: Caracteres não permitidos
 text_comma_separated: Permitido múltiplos valores (separados por vírgula).
 text_issues_ref_in_commit_messages: Referenciando e arrumando tarefas nas mensagens de commit
-text_issue_added: Tarefa %s foi incluída.
-text_issue_updated: Tarefa %s foi alterada.
+text_issue_added: Tarefa %s foi incluída (by %s).
+text_issue_updated: Tarefa %s foi alterada (by %s).
 text_wiki_destroy_confirmation: Are you sure you want to delete this wiki and all its content ?
 text_issue_category_destroy_question: Some issues (%d) are assigned to this category. What do you want to do ?
 text_issue_category_destroy_assignments: Remove category assignments
diff --git a/lang/ro.yml b/lang/ro.yml
index d9011c21e..2fed755ac 100644
--- a/lang/ro.yml
+++ b/lang/ro.yml
@@ -480,8 +480,8 @@ text_tracker_no_workflow: Nu este definit nici un workflow pentru acest tip de t
 text_unallowed_characters: Caractere nepermise
 text_comma_separated: Se poate folosi valori multiple (separate de virgula).
 text_issues_ref_in_commit_messages: Referencing and fixing issues in commit messages
-text_issue_added: Tichetul %s a fost raportat.
-text_issue_updated: tichetul %s a fost modificat.
+text_issue_added: Tichetul %s a fost raportat (by %s).
+text_issue_updated: tichetul %s a fost modificat (by %s).
 text_wiki_destroy_confirmation: Sunteti sigur ca vreti sa stergeti acest wiki si continutul ei ?
 text_issue_category_destroy_question: Cateva tichete (%d) apartin acestei categorii. Cum vreti sa procedati ?
 text_issue_category_destroy_assignments: Remove category assignments
diff --git a/lang/ru.yml b/lang/ru.yml
index 04b17b806..44b1664cf 100644
--- a/lang/ru.yml
+++ b/lang/ru.yml
@@ -531,8 +531,8 @@ text_tracker_no_workflow: Для этого трекера последоват
 text_unallowed_characters: Запрещенные символы
 text_comma_separated: Допустимы несколько значений (разделенные запятой).
 text_issues_ref_in_commit_messages: Сопоставление и изменение статуса задач исходя из текста сообщений
-text_issue_added: О вопросе %s был создает отчет.
-text_issue_updated: Вопрос %s был обновлен.
+text_issue_added: О вопросе %s был создает отчет (by %s).
+text_issue_updated: Вопрос %s был обновлен (by %s).
 text_wiki_destroy_confirmation: Вы уверены, что хотите удалить данную вики и все содержание? 
 text_issue_category_destroy_question: Несколько задач (%d) назначено в данную категорию. Что вы хотите предпринять?
 text_issue_category_destroy_assignments: Удалить назначения категории
diff --git a/lang/sr.yml b/lang/sr.yml
index 71503be01..3132beeec 100644
--- a/lang/sr.yml
+++ b/lang/sr.yml
@@ -504,8 +504,8 @@ text_tracker_no_workflow: Tok rada nije definisan za ovaj tracker
 text_unallowed_characters: Nedozvoljeni karakteri
 text_comma_separated: Višestruke vrednosti su dozvoljene (razdvojene zarezom).
 text_issues_ref_in_commit_messages: Referencing and fixing issues in commit messages
-text_issue_added: Kartica %s je prijavljena.
-text_issue_updated: Kartica %s je izmenjena.
+text_issue_added: Kartica %s je prijavljena (by %s).
+text_issue_updated: Kartica %s je izmenjena (by %s).
 text_wiki_destroy_confirmation: Da li ste sigurni da želite da izbrišete ovaj wiki i svu njegovu sadržinu ?
 text_issue_category_destroy_question: Neke kartice (%d) su dodeljene ovoj kategoriji. Šta želite da uradite ?
 text_issue_category_destroy_assignments: Ukloni dodeljivanje kategorija
diff --git a/lang/sv.yml b/lang/sv.yml
index 604590aff..b8a9a3a11 100644
--- a/lang/sv.yml
+++ b/lang/sv.yml
@@ -482,8 +482,8 @@ text_tracker_no_workflow: Inget workflow definerat för denna tracker
 text_unallowed_characters: Unallowed characters
 text_comma_separated: Multiple values allowed (comma separated).
 text_issues_ref_in_commit_messages: Referencing and fixing issues in commit messages
-text_issue_added: Brist %s har rapporterats.
-text_issue_updated: Brist %s har uppdaterats.
+text_issue_added: Brist %s har rapporterats (by %s).
+text_issue_updated: Brist %s har uppdaterats (by %s).
 text_wiki_destroy_confirmation: Are you sure you want to delete this wiki and all its content ?
 text_issue_category_destroy_question: Some issues (%d) are assigned to this category. What do you want to do ?
 text_issue_category_destroy_assignments: Remove category assignments
diff --git a/lang/zh-tw.yml b/lang/zh-tw.yml
index d468b162b..94631b86d 100644
--- a/lang/zh-tw.yml
+++ b/lang/zh-tw.yml
@@ -191,16 +191,16 @@ setting_host_name: 主機名稱
 setting_text_formatting: 文字格式
 setting_wiki_compression: 壓縮 Wiki 歷史文章
 setting_feeds_limit: Feed content limit
-setting_autofetch_changesets: Autofetch commits
-setting_sys_api_enabled: Enable WS for repository management
-setting_commit_ref_keywords: Referencing keywords
-setting_commit_fix_keywords: Fixing keywords
+setting_autofetch_changesets: 自動取得送交版次
+setting_sys_api_enabled: 啟用管理版本庫之網頁服務 (Web Service)
+setting_commit_ref_keywords: 用於參照項目之關鍵字
+setting_commit_fix_keywords: 用於修正項目之關鍵字
 setting_autologin: 自動登入
 setting_date_format: 日期格式
 setting_time_format: 時間格式
 setting_cross_project_issue_relations: 允許關聯至其它專案的項目
 setting_issue_list_default_columns: 預設顯示於項目清單的欄位
-setting_repositories_encodings: Repositories encodings
+setting_repositories_encodings: 版本庫編碼
 setting_emails_footer: 電子郵件附帶說明
 setting_protocol: 協定
 setting_per_page_options: 每頁顯示個數選項
@@ -362,7 +362,7 @@ label_modification: %d 變更
 label_modification_plural: %d 變更
 label_revision: 版次
 label_revision_plural: 版次清單
-label_associated_revisions: Associated revisions
+label_associated_revisions: 相關版次
 label_added: 已新增
 label_modified: 已修改
 label_deleted: 已刪除
@@ -530,9 +530,9 @@ text_length_between: 長度必須介於 %d 至 %d 個字元之間.
 text_tracker_no_workflow: 此追蹤標籤尚未定義工作流程
 text_unallowed_characters: 不允許的字元
 text_comma_separated: 可輸入多個值 (以逗號分隔).
-text_issues_ref_in_commit_messages: Referencing and fixing issues in commit messages
-text_issue_added: 已通報 %s 個項目
-text_issue_updated: 已更新 %s 個項目
+text_issues_ref_in_commit_messages: 送交訊息中參照(或修正)項目之關鍵字
+text_issue_added: 已通報 %s 個項目 (by %s)
+text_issue_updated: 已更新 %s 個項目 (by %s)
 text_wiki_destroy_confirmation: 您確定要刪除這個 wiki 和其中的所有內容？
 text_issue_category_destroy_question: 有 (%d) 個項目被指派到此分類. 請選擇您想要的動作？
 text_issue_category_destroy_assignments: 移除這些項目的分類
diff --git a/lang/zh.yml b/lang/zh.yml
index 469bfb0c5..70ee8b137 100644
--- a/lang/zh.yml
+++ b/lang/zh.yml
@@ -1,5 +1,5 @@
-# translated by andy wu
-# email:andywu.zh@gmail.com
+# Originally translated by andy wu (email:andywu.zh@gmail.com)
+# new translations added by the translation team from 72pines at http://code.72pines.org/projects/show/72pines-redmine/
 
 _gloc_rule_default: '|n| n==1 ? "" : "_plural" '
 
@@ -32,12 +32,12 @@ activerecord_error_blank: 不能是空格
 activerecord_error_too_long: 太长
 activerecord_error_too_short: 太短
 activerecord_error_wrong_length: 长度有问题
-activerecord_error_taken: has already been taken
+activerecord_error_taken: 已经存在了
 activerecord_error_not_a_number: 不是数字
 activerecord_error_not_a_date: 不是有效的日期
 activerecord_error_greater_than_start_date: 必需大于开始日期
-activerecord_error_not_same_project: doesn't belong to the same project
-activerecord_error_circular_dependency: This relation would create a circular dependency
+activerecord_error_not_same_project: 不属于同一个项目
+activerecord_error_circular_dependency: 这个设置会造成循环关系的错误
 
 general_fmt_age: %d yr
 general_fmt_age_plural: %d yrs
@@ -58,12 +58,12 @@ general_first_day_of_week: '7'
 
 notice_account_updated: 帐户更新成功。
 notice_account_invalid_creditentials: 用户名或密码不正确
-notice_account_password_updated: 成功更新口令
-notice_account_wrong_password: 错误的口令
+notice_account_password_updated: 成功更新密码
+notice_account_wrong_password: 错误的密码
 notice_account_register_done: 帐户已创建成功
 notice_account_unknown_email: 未知用户
-notice_can_t_change_password: 该帐户使用了外部认证。无法更改口令。
-notice_account_lost_email_sent: 邮件已被发送，邮件中有关于选择新口令的指导
+notice_can_t_change_password: 该帐户使用了外部认证。无法更改密码。
+notice_account_lost_email_sent: 邮件已被发送，邮件中有关于选择新密码的指导
 notice_account_activated: 您的帐号已被激活。您现在可以登录了。
 notice_successful_create: 创建成功
 notice_successful_update: 更新成功
@@ -71,18 +71,18 @@ notice_successful_delete: 删除成功
 notice_successful_connection: 连接成功
 notice_file_not_found: 您访问的页面不存在或已被删除。
 notice_locking_conflict: 数据已被另一个用户更新
-notice_not_authorized: You are not authorized to access this page.
-notice_email_sent: An email was sent to %s
-notice_email_error: An error occurred while sending mail (%s)
-notice_feeds_access_key_reseted: Your RSS access key was reseted.
+notice_not_authorized: 对不起，您无权访问此页面.
+notice_email_sent: 已经成功发送email到 %s
+notice_email_error: 发送email时发生错误 (%s)
+notice_feeds_access_key_reseted: 您的RSS访问代码已经被重置了.
 
-error_scm_not_found: 在版本库中不存在该条目或修订
-error_scm_command_failed: "An error occurred when trying to access the repository: %s"
+error_scm_not_found: 在源代码库中不存在该条目或修订
+error_scm_command_failed: "访问源代码库的时候发生错误: %s"
 
-mail_subject_lost_password: 您的redMine口令
-mail_body_lost_password: 'To change your Redmine password, click on the following link:'
+mail_subject_lost_password: 您的redMine密码
+mail_body_lost_password: '点击以下的链接来修改您在redmine系统的密码:'
 mail_subject_register: redMine帐户激活
-mail_body_register: 'To activate your Redmine account, click on the following link:'
+mail_body_register: '点击以下的链接来激活您的redMine帐号:'
 
 gui_validation_error: 1 个错误
 gui_validation_error_plural: %d 个错误
@@ -110,10 +110,10 @@ field_value: 值
 field_category: 分类
 field_title: 标题
 field_project: 项目
-field_issue: 任务
+field_issue: 问题
 field_status: 状态
 field_notes: 说明
-field_is_closed: 已关闭的任务
+field_is_closed: 已关闭的问题
 field_is_default: 默认状态
 field_tracker: 跟踪
 field_subject: 主题
@@ -126,16 +126,16 @@ field_role: 角色
 field_homepage: 主页
 field_is_public: 公开
 field_parent: 上级项目
-field_is_in_chlog: 在更新日志中显示任务
-field_is_in_roadmap: 在路线图中显示任务
+field_is_in_chlog: 在更新日志中显示问题
+field_is_in_roadmap: 在路线图中显示问题
 field_login: 登录名
 field_mail_notification: 邮件通知
 field_admin: 管理员
 field_last_login_on: 最后登录
 field_language: 语言
 field_effective_date: 日期
-field_password: 口令
-field_new_password: 新口令
+field_password: 密码
+field_new_password: 新密码
 field_password_confirmation: 确认
 field_version: 版本
 field_type: 类别
@@ -147,7 +147,7 @@ field_attr_login: 登录名属性
 field_attr_firstname: 名字属性
 field_attr_lastname: 姓属性
 field_attr_mail: 邮件属性
-field_onthefly: On-the-fly user creation
+field_onthefly: 即时的用户生成
 field_start_date: 开始
 field_done_ratio: %% 完成
 field_auth_source: 认证模式
@@ -159,14 +159,14 @@ field_subproject: 子项目
 field_hours: Hours
 field_activity: 活动
 field_spent_on: 日期
-field_identifier: Identifier
-field_is_filter: Used as a filter
-field_issue_to_id: Related issue
-field_delay: Delay
-field_assignable: Issues can be assigned to this role
-field_redirect_existing_links: Redirect existing links
-field_estimated_hours: Estimated time
-field_default_value: Default value
+field_identifier: 标识
+field_is_filter: 作为过滤条件
+field_issue_to_id: 相关的问题报告
+field_delay: 延期
+field_assignable: 是否可以分配到问题
+field_redirect_existing_links: 重定向现有的链接
+field_estimated_hours: 预期时间
+field_default_value: 默认值
 
 setting_app_title: 应用程序标题
 setting_app_subtitle: 应用程序子标题
@@ -175,19 +175,19 @@ setting_default_language: 默认语言
 setting_login_required: 要求认证
 setting_self_registration: 允许自注册
 setting_attachment_max_size: 附件最大尺寸
-setting_issues_export_limit: Issues export limit
-setting_mail_from: Emission mail address
+setting_issues_export_limit: 问题输出条目的限制
+setting_mail_from: 邮件发送人的地址
 setting_host_name: 主机名称
 setting_text_formatting: 文本格式
-setting_wiki_compression: Wiki history compression
-setting_feeds_limit: Feed content limit
-setting_autofetch_changesets: Autofetch commits
-setting_sys_api_enabled: Enable WS for repository management
-setting_commit_ref_keywords: Referencing keywords
-setting_commit_fix_keywords: Fixing keywords
-setting_autologin: Autologin
-setting_date_format: Date format
-setting_cross_project_issue_relations: Allow cross-project issue relations
+setting_wiki_compression: Wiki文档的历史记录压缩
+setting_feeds_limit: RSS Feed内容条数
+setting_autofetch_changesets: 自动获取程序变动
+setting_sys_api_enabled: 启用后台的WS代码用于管理
+setting_commit_ref_keywords: 提交变动时引用问题号码的关键字
+setting_commit_fix_keywords: 提交变动时自动标志问题状态的关键字
+setting_autologin: 自动登录
+setting_date_format: 日期格式
+setting_cross_project_issue_relations: 允许不同项目之间的问题关联
 
 label_user: 用户
 label_user_plural: 用户列表
@@ -195,12 +195,12 @@ label_user_new: 新建用户
 label_project: 项目
 label_project_new: 新建项目
 label_project_plural: 项目列表
-label_project_all: All Projects
-label_project_latest: 最近的项目列表
-label_issue: 任务
-label_issue_new: 新建任务
-label_issue_plural: 任务列表
-label_issue_view_all: 查看所有任务
+label_project_all: 所有的项目
+label_project_latest: 最近更新的项目
+label_issue: 问题
+label_issue_new: 新建问题
+label_issue_plural: 问题列表
+label_issue_view_all: 查看所有问题
 label_document: 文档
 label_document_new: 新建文档
 label_document_plural: 文档列表
@@ -214,13 +214,13 @@ label_member_plural: 成员列表
 label_tracker: 跟踪标签
 label_tracker_plural: 跟踪标签列表
 label_tracker_new: 新建跟踪标签
-label_workflow: 工作流
-label_issue_status: 任务状态列表
-label_issue_status_plural: 任务状态列表
-label_issue_status_new: 新建任务状态列表
-label_issue_category: 任务类别
-label_issue_category_plural: 任务类别列表
-label_issue_category_new: 新建任务类别
+label_workflow: 工作流程
+label_issue_status: 问题状态列表
+label_issue_status_plural: 问题状态列表
+label_issue_status_new: 新建问题状态列表
+label_issue_category: 问题类别
+label_issue_category_plural: 问题类别列表
+label_issue_category_new: 新建问题类别
 label_custom_field: 自定义字段
 label_custom_field_plural: 自定义字段列表
 label_custom_field_new: 新建自定义字段
@@ -230,7 +230,7 @@ label_information: 信息
 label_information_plural: 信息
 label_please_login: 请登录
 label_register: 注册
-label_password_lost: 忘记口令
+label_password_lost: 忘记密码
 label_home: 主页
 label_my_page: 我的工作台
 label_my_account: 我的帐号
@@ -240,7 +240,7 @@ label_login: 登录
 label_logout: 退出
 label_help: 帮助
 label_reported_issues: 已报告的问题
-label_assigned_to_me_issues: 分配给我的任务
+label_assigned_to_me_issues: 分配给我的问题
 label_last_login: 最后登录
 label_last_updates: 最后更新
 label_last_updates_plural: %d 最后更新
@@ -255,12 +255,12 @@ label_auth_source_new: 新建认证模式
 label_auth_source_plural: 认证模式列表
 label_subproject_plural: 子项目列表
 label_min_max_length: 最小 - 最大 长度
-label_list: list
-label_date: Date
-label_integer: Integer
-label_boolean: Boolean
-label_string: Text
-label_text: Long text
+label_list: 列表
+label_date: 日期
+label_integer: 整数
+label_boolean: 是否
+label_string: 文字
+label_text: 长段文字
 label_attribute: 属性
 label_attribute_plural: 属性
 label_download: %d 个下载次数
@@ -296,7 +296,7 @@ label_closed_issues_plural: 已关闭
 label_total: 合计
 label_permissions: 权限列表
 label_current_status: 当前状态
-label_new_statuses_allowed: New statuses allowed
+label_new_statuses_allowed: 启用了新状态
 label_all: 全部
 label_none: 无
 label_next: 下一个
@@ -306,7 +306,7 @@ label_details: 详情
 label_add_note: 添加说明
 label_per_page: 每面
 label_calendar: 日历
-label_months_from: months from
+label_months_from: 个月以来
 label_gantt: 甘特图(Gantt)
 label_internal: 内部
 label_last_changes: 最近的 %d 次更改
@@ -328,14 +328,14 @@ label_in_less_than: 剩余天数小于
 label_in_more_than: 剩余天数大于
 label_in: 剩余天数
 label_today: 今天
-label_this_week: this week
+label_this_week: 本周
 label_less_than_ago: 之前天数少于
 label_more_than_ago: 之前天数大于
 label_ago: 之前天数
 label_contains: 包含
 label_not_contains: 不包含
 label_day_plural: 天数
-label_repository: 版本库
+label_repository: 源代码库
 label_browse: 浏览
 label_modification: %d 个更新
 label_modification_plural: %d 个更新
@@ -354,45 +354,45 @@ label_sort_higher: 上移
 label_sort_lower: 下移
 label_sort_lowest: 置底
 label_roadmap: 路线图
-label_roadmap_due_in: Due in 
+label_roadmap_due_in: 截止日期到 
 label_roadmap_overdue: %s late
-label_roadmap_no_issues: 该版本没有任务
+label_roadmap_no_issues: 该版本没有问题
 label_search: 查找
 label_result_plural: 个结果
 label_all_words: 所有单词
 label_wiki: Wiki
-label_wiki_edit: Wiki edit
-label_wiki_edit_plural: Wiki edits
-label_wiki_page_plural: Wiki pages
+label_wiki_edit: Wiki 编辑
+label_wiki_edit_plural: Wiki 编辑记录
+label_wiki_page_plural: Wiki 页面
 label_index_by_title: 索引
-label_index_by_date: Index by date
+label_index_by_date: 按照日期排序的索引
 label_current_version: 当前版本
 label_preview: 预览
 label_feed_plural: Feeds
 label_changes_details: 所有更改的详情
-label_issue_tracking: 任务跟踪
+label_issue_tracking: 问题跟踪
 label_spent_time: 耗时
 label_f_hour: %.2f 小时
 label_f_hour_plural: %.2f 小时
 label_time_tracking: 时间跟踪
 label_change_plural: 更改列表
 label_statistics: 统计
-label_commits_per_month: Commits per month
-label_commits_per_author: Commits per author
-label_view_diff: View differences
+label_commits_per_month: Commits/月
+label_commits_per_author: Commits/用户
+label_view_diff: 查看变动
 label_diff_inline: inline
 label_diff_side_by_side: side by side
-label_options: Options
-label_copy_workflow_from: Copy workflow from
-label_permissions_report: Permissions report
-label_watched_issues: Watched issues
-label_related_issues: Related issues
-label_applied_status: Applied status
-label_loading: Loading...
-label_relation_new: New relation
-label_relation_delete: Delete relation
-label_relates_to: related to
-label_duplicates: duplicates
+label_options: 选项
+label_copy_workflow_from: 从以下项目复制工作流程
+label_permissions_report: 权限设置列表
+label_watched_issues: 跟踪的问题
+label_related_issues: 相关的问题
+label_applied_status: 修改了状态
+label_loading: 载入中...
+label_relation_new: 新的关联
+label_relation_delete: 删除关联
+label_relates_to: 关联到
+label_duplicates: 重复
 label_blocks: blocks
 label_blocked_by: blocked by
 label_precedes: precedes
@@ -401,32 +401,32 @@ label_end_to_start: end to start
 label_end_to_end: end to end
 label_start_to_start: start to start
 label_start_to_end: start to end
-label_stay_logged_in: Stay logged in
-label_disabled: disabled
-label_show_completed_versions: Show completed versions
-label_me: me
-label_board: Forum
-label_board_new: New forum
-label_board_plural: Forums
-label_topic_plural: Topics
-label_message_plural: Messages
-label_message_last: Last message
-label_message_new: New message
-label_reply_plural: Replies
-label_send_information: Send account information to the user
-label_year: Year
-label_month: Month
-label_week: Week
-label_date_from: From
-label_date_to: To
-label_language_based: Language based
-label_sort_by: Sort by %s
-label_send_test_email: Send a test email
-label_feeds_access_key_created_on: RSS access key created %s ago
-label_module_plural: Modules
-label_added_time_by: Added by %s %s ago
-label_updated_time: Updated %s ago
-label_jump_to_a_project: Jump to a project...
+label_stay_logged_in: 保持一直登录
+label_disabled: 禁用了
+label_show_completed_versions: 显示已经完成的版本
+label_me: 我
+label_board: 讨论区
+label_board_new: 新的版面
+label_board_plural: 讨论区
+label_topic_plural: 主题
+label_message_plural: 帖子
+label_message_last: 最新的帖子
+label_message_new: 新贴
+label_reply_plural: 回复
+label_send_information: 给用户发送帐号信息
+label_year: 年
+label_month: 月
+label_week: 周
+label_date_from: 从
+label_date_to: 到
+label_language_based: 语言
+label_sort_by: 根据 %s 排序 
+label_send_test_email: 发送测试email
+label_feeds_access_key_created_on: RSS 访问代码是在 %s 之前建立的
+label_module_plural: 模块
+label_added_time_by: 由 %s 在 %s 之前添加
+label_updated_time:  更新于 %s 前
+label_jump_to_a_project: 选择一个项目...
 
 button_login: 登录
 button_submit: 提交
@@ -452,14 +452,14 @@ button_cancel: 取消
 button_activate: 激活
 button_sort: 排序
 button_log_time: 登记工时
-button_rollback: Rollback to this version
-button_watch: Watch
-button_unwatch: Unwatch
-button_reply: Reply
-button_archive: Archive
-button_unarchive: Unarchive
-button_reset: Reset
-button_rename: Rename
+button_rollback: 恢复到这个版本
+button_watch: 跟踪
+button_unwatch: 取消跟踪
+button_reply: 回复
+button_archive: 存档
+button_unarchive: 取消存档
+button_reset: 重置
+button_rename: 重命名
 
 status_active: 激活
 status_registered: 已注册
@@ -469,7 +469,7 @@ text_select_mail_notifications: 选择需要发送邮件通知的动作。
 text_regexp_info: eg. ^[A-Z0-9]+$
 text_min_max_length_info: 0 表示没有限制
 text_project_destroy_confirmation: 您确信要删除这个项目以及所有相关的数据吗？
-text_workflow_edit: 选择一个角色和跟踪标签来编辑这个工作流
+text_workflow_edit: 选择一个角色和跟踪标签来编辑这个工作流程
 text_are_you_sure: 您确定？
 text_journal_changed: 从 %s 更改为 %s
 text_journal_set_to: 设置为 %s
@@ -477,19 +477,19 @@ text_journal_deleted: 已删除
 text_tip_task_begin_day: 开始于此
 text_tip_task_end_day: 在此结束
 text_tip_task_begin_end_day: 开始并结束于此
-text_project_identifier_info: 'Lower case letters (a-z), numbers and dashes allowed.<br />Once saved, the identifier can not be changed.'
-text_caracters_maximum: %d characters maximum.
-text_length_between: Length between %d and %d characters.
-text_tracker_no_workflow: No workflow defined for this tracker
-text_unallowed_characters: Unallowed characters
-text_comma_separated: Multiple values allowed (comma separated).
-text_issues_ref_in_commit_messages: Referencing and fixing issues in commit messages
-text_issue_added: %s ѱ
-text_issue_updated: %s Ѹ
-text_wiki_destroy_confirmation: Are you sure you want to delete this wiki and all its content ?
-text_issue_category_destroy_question: Some issues (%d) are assigned to this category. What do you want to do ?
-text_issue_category_destroy_assignments: Remove category assignments
-text_issue_category_reassign_to: Reassing issues to this category
+text_project_identifier_info: '只允许使用小写字母 (a-z), 数字和-短横号.<br />注意，保存以后, 标志名就不能修改了.'
+text_caracters_maximum: 最多 %d 个字符.
+text_length_between: 字符长度应该在 %d 和 %d 个之间.
+text_tracker_no_workflow: 还没有定义工作流程
+text_unallowed_characters: 有不符合规定的字符
+text_comma_separated: 可以使用多个值 (用逗号,分开).
+text_issues_ref_in_commit_messages: 信息里面直接可以使用的ref关联或者是fix修复标签设置
+text_issue_added: 问题 %s 成功提交 (by %s).
+text_issue_updated: 问题 %s 成功更新 (by %s).
+text_wiki_destroy_confirmation: 您是否确定要删除以下的 wiki 页面及其内容?
+text_issue_category_destroy_question: 有一些问题 (%d 个) 属于这个分类. 您还想继续操作吗?
+text_issue_category_destroy_assignments: 取消分类的设置
+text_issue_category_reassign_to: 重新添加到分类
 
 default_role_manager: 管理员
 default_role_developper: 开发人员
@@ -513,59 +513,59 @@ default_priority_immediate: 立刻
 default_activity_design: 设计
 default_activity_development: 开发
 
-enumeration_issue_priorities: 任务优先级
+enumeration_issue_priorities: 问题优先级
 enumeration_doc_categories: 文档类别
-enumeration_activities: Activities (time tracking)
-label_wiki_page: Wiki page
-label_file_plural: Files
-label_changeset_plural: Changesets
-field_column_names: Columns
-label_default_columns: Default columns
-setting_issue_list_default_columns: Default columns displayed on the issue list
-setting_repositories_encodings: Repositories encodings
-notice_no_issue_selected: "No issue is selected! Please, check the issues you want to edit."
-label_bulk_edit_selected_issues: Bulk edit selected issues
-label_no_change_option: (No change)
-notice_failed_to_save_issues: "Failed to save %d issue(s) on %d selected: %s."
-label_theme: Theme
-label_default: Default
-label_search_titles_only: Search titles only
+enumeration_activities: 活动情况 (时间跟踪)
+label_wiki_page: Wiki 页面
+label_file_plural: 文件
+label_changeset_plural: 程序变动
+field_column_names: 列
+label_default_columns: 默认列
+setting_issue_list_default_columns: 问题列表中显示的默认列
+setting_repositories_encodings: 源代码库编码
+notice_no_issue_selected: "没有选择任何的问题! 请选择您要编辑的问题."
+label_bulk_edit_selected_issues: 批量修改已选择的问题
+label_no_change_option: (不变)
+notice_failed_to_save_issues: "在保存 %d 个问题时(总共 %d 个)失败: %s."
+label_theme: 主题
+label_default: 默认
+label_search_titles_only: 仅在标题中搜索
 label_nobody: nobody
-button_change_password: Change password
-text_user_mail_option: "For unselected projects, you will only receive notifications about things you watch or you're involved in (eg. issues you're the author or assignee)."
-label_user_mail_option_selected: "For any event on the selected projects only..."
-label_user_mail_option_all: "For any event on all my projects"
-label_user_mail_option_none: "Only for things I watch or I'm involved in"
-setting_emails_footer: Emails footer
+button_change_password: 修改密码
+text_user_mail_option: "对于没有选择的项目, 您将只会收到您已经跟踪或者是参与的项目的通知 (比如说，您是问题的报告者, 或是负责解决这个问题的)."
+label_user_mail_option_selected: "对于所选择的项目，收取任何相关的通知..."
+label_user_mail_option_all: "对于我参与的项目，收取任何相关的通知"
+label_user_mail_option_none: "只收取和我跟踪或者参与的项目的通知"
+setting_emails_footer: Emails 末尾的信息
 label_float: Float
-button_copy: Copy
-mail_body_account_information_external: You can use your "%s" account to log into Redmine.
-mail_body_account_information: Your Redmine account information
-setting_protocol: Protocol
-label_user_mail_no_self_notified: "I don't want to be notified of changes that I make myself"
-setting_time_format: Time format
-label_registration_activation_by_email: account activation by email
-mail_subject_account_activation_request: Redmine account activation request
-mail_body_account_activation_request: 'A new user (%s) has registered. His account his pending your approval:'
-label_registration_automatic_activation: automatic account activation
-label_registration_manual_activation: manual account activation
-notice_account_pending: "Your account was created and is now pending administrator approval."
-field_time_zone: Time zone
-text_caracters_minimum: Must be at least %d characters long.
-setting_bcc_recipients: Blind carbon copy recipients (bcc)
-button_annotate: Annotate
+button_copy: 复制
+mail_body_account_information_external: 您可以使用 "%s" 帐号登录了.
+mail_body_account_information: 您的帐号信息
+setting_protocol: 协议(Protocol)
+label_user_mail_no_self_notified: "对于我提交的修改，不要给我发送通知"
+setting_time_format: 时间格式
+label_registration_activation_by_email: 通过email认证激活帐号
+mail_subject_account_activation_request: Redmine 帐号激活请求
+mail_body_account_activation_request: '新用户 (%s) 已经注册成功. 他的帐号需要您的认可后生效:'
+label_registration_automatic_activation: 自动激活帐号
+label_registration_manual_activation: 手动激活帐号
+notice_account_pending: "您的帐号已经成功建立, 但是还需要等待管理员的认可后才能激活."
+field_time_zone: 时区
+text_caracters_minimum: "至少需要 %d 个字符."
+setting_bcc_recipients: 抄送地址 (bcc)
+button_annotate: 注释
 label_issues_by: Issues by %s
 field_searchable: Searchable
-label_display_per_page: 'Per page: %s'
-setting_per_page_options: Objects per page options
+label_display_per_page: '每页显示: %s'
+setting_per_page_options: 每页显示条目的设置
 label_age: Age
-notice_default_data_loaded: Default configuration successfully loaded.
-text_load_default_configuration: Load the default configuration
-text_no_configuration_data: "Roles, trackers, issue statuses and workflow have not been configured yet.\nIt is highly recommended to load the default configuration. You will be able to modify it once loaded."
-error_can_t_load_default_data: "Default configuration could not be loaded: %s"
-button_update: Update
-label_change_properties: Change properties
-label_general: General
-label_repository_plural: Repositories
-label_associated_revisions: Associated revisions
-setting_user_format: Users display format
+notice_default_data_loaded: 成功载入默认设置.
+text_load_default_configuration: 载入默认设置
+text_no_configuration_data: "用户权限，跟踪标签, 问题状态列表和工作流程还没有设置好.\n强烈推荐载入默认的设置. 载入后您可以再进行定制."
+error_can_t_load_default_data: "不能载入默认设置: %s"
+button_update: 更新
+label_change_properties: 修改属性
+label_general: 一般
+label_repository_plural: 源代码库
+label_associated_revisions: 相关的版本
+setting_user_format: 用户显示格式
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-lt.js b/public/javascripts/jstoolbar/lang/jstoolbar-lt.js
index cd36a4b55..f0a7c5d90 100644
--- a/public/javascripts/jstoolbar/lang/jstoolbar-lt.js
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-lt.js
@@ -1,14 +1,14 @@
 jsToolBar.strings = {};
-jsToolBar.strings['Strong'] = 'Strong';
+jsToolBar.strings['Strong'] = 'Pastorinti';
 jsToolBar.strings['Italic'] = 'Italic';
-jsToolBar.strings['Underline'] = 'Underline';
-jsToolBar.strings['Deleted'] = 'Deleted';
-jsToolBar.strings['Code'] = 'Inline Code';
+jsToolBar.strings['Underline'] = 'Pabraukti';
+jsToolBar.strings['Deleted'] = 'Užbraukti';
+jsToolBar.strings['Code'] = 'Kodas';
 jsToolBar.strings['Heading 1'] = 'Heading 1';
 jsToolBar.strings['Heading 2'] = 'Heading 2';
 jsToolBar.strings['Heading 3'] = 'Heading 3';
-jsToolBar.strings['Unordered list'] = 'Unordered list';
-jsToolBar.strings['Ordered list'] = 'Ordered list';
-jsToolBar.strings['Preformatted text'] = 'Preformatted text';
-jsToolBar.strings['Wiki link'] = 'Link to a Wiki page';
-jsToolBar.strings['Image'] = 'Image';
+jsToolBar.strings['Unordered list'] = 'Nenumeruotas sąrašas';
+jsToolBar.strings['Ordered list'] = 'Numeruotas sąrašas';
+jsToolBar.strings['Preformatted text'] = 'Preformatuotas tekstas';
+jsToolBar.strings['Wiki link'] = 'Nuoroda į Wiki puslapį';
+jsToolBar.strings['Image'] = 'Paveikslas';

From fde2a497da752b4780a82a22b6becb20abb1953f Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Tue, 5 Feb 2008 18:50:21 +0000
Subject: [PATCH 184/710] Activity test fix (r1120).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1123 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 test/functional/projects_controller_test.rb | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/test/functional/projects_controller_test.rb b/test/functional/projects_controller_test.rb
index 16eb2906e..71a3e3dfe 100644
--- a/test/functional/projects_controller_test.rb
+++ b/test/functional/projects_controller_test.rb
@@ -163,9 +163,10 @@ class ProjectsControllerTest < Test::Unit::TestCase
     
     assert_tag :tag => "h3", 
                :content => /#{2.days.ago.to_date.day}/,
-               :sibling => { :tag => "ul",
-                 :child => { :tag => "li",
-                   :child => { :tag => "p",
+               :sibling => { :tag => "dl",
+                 :child => { :tag => "dt",
+                   :attributes => { :class => 'journal' },
+                   :child => { :tag => "a",
                      :content => /(#{IssueStatus.find(2).name})/,
                    }
                  }
@@ -178,9 +179,10 @@ class ProjectsControllerTest < Test::Unit::TestCase
                
     assert_tag :tag => "h3", 
                :content => /#{3.day.ago.to_date.day}/,
-               :sibling => { :tag => "ul",
-                 :child => { :tag => "li",
-                   :child => { :tag => "p",
+               :sibling => { :tag => "dl",
+                 :child => { :tag => "dt",
+                   :attributes => { :class => 'issue' },
+                   :child => { :tag => "a",
                      :content => /#{Issue.find(1).subject}/,
                    }
                  }

From 68d3305ae22aaabc23200ede18809cb96d912a54 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Wed, 6 Feb 2008 18:56:52 +0000
Subject: [PATCH 185/710] Fixed settings.yml syntax (yaml parsing fails with
 JRuby 1.0.3: #606).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1124 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 config/settings.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/settings.yml b/config/settings.yml
index a45ae17ce..4f7be5132 100644
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -86,12 +86,12 @@ cross_project_issue_relations:
   default: 0
 notified_events:
   serialized: true
-  default: --
+  default: 
   - issue_added
   - issue_updated
 issue_list_default_columns:
   serialized: true
-  default: --
+  default: 
   - tracker
   - status
   - priority

From 943ba3e34fed6d82f79a737e043c408746ab392a Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Wed, 6 Feb 2008 19:05:42 +0000
Subject: [PATCH 186/710] Trac importer: handle nil usernames.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1125 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 lib/tasks/migrate_from_trac.rake | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/tasks/migrate_from_trac.rake b/lib/tasks/migrate_from_trac.rake
index 2eca13dc3..5c006bc82 100644
--- a/lib/tasks/migrate_from_trac.rake
+++ b/lib/tasks/migrate_from_trac.rake
@@ -157,6 +157,8 @@ namespace :redmine do
       end
       
       def self.find_or_create_user(username, project_member = false)
+        return User.anonymous if username.blank?
+        
         u = User.find_by_login(username)
         if !u
           # Create a new user if not found

From c80c1e1eada561326d36f2c0d115eb9ea76d16dd Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Wed, 6 Feb 2008 20:02:30 +0000
Subject: [PATCH 187/710] Create a journal and send an email when an issue is
 closed by commit (#609). The redmine user is found using the committer
 username or email. Otherwise, the journal is created with anonymous user.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1126 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/models/changeset.rb      | 16 +++++++++++++++-
 lang/bg.yml                  |  1 +
 lang/cs.yml                  |  1 +
 lang/de.yml                  |  1 +
 lang/en.yml                  |  1 +
 lang/es.yml                  |  1 +
 lang/fi.yml                  |  1 +
 lang/fr.yml                  |  1 +
 lang/he.yml                  |  1 +
 lang/it.yml                  |  1 +
 lang/ja.yml                  |  1 +
 lang/ko.yml                  |  1 +
 lang/lt.yml                  |  1 +
 lang/nl.yml                  |  1 +
 lang/pl.yml                  |  1 +
 lang/pt-br.yml               |  1 +
 lang/pt.yml                  |  1 +
 lang/ro.yml                  |  1 +
 lang/ru.yml                  |  1 +
 lang/sr.yml                  |  1 +
 lang/sv.yml                  |  1 +
 lang/zh-tw.yml               |  1 +
 lang/zh.yml                  |  1 +
 test/unit/repository_test.rb | 33 +++++++++++++++++++++++++++++----
 24 files changed, 66 insertions(+), 5 deletions(-)

diff --git a/app/models/changeset.rb b/app/models/changeset.rb
index 1b79104c4..3703ab927 100644
--- a/app/models/changeset.rb
+++ b/app/models/changeset.rb
@@ -48,6 +48,7 @@ class Changeset < ActiveRecord::Base
   def after_create
     scan_comment_for_issue_ids
   end
+  require 'pp'
   
   def scan_comment_for_issue_ids
     return if comments.blank?
@@ -79,11 +80,14 @@ class Changeset < ActiveRecord::Base
         # 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
+          # don't change the status is the issue is closed
           next if issue.status.is_closed?
+          user = committer_user || User.anonymous
+          journal = issue.init_journal(user, l(:text_status_changed_by_changeset, "r#{self.revision}"))
           issue.status = fix_status
           issue.done_ratio = done_ratio if done_ratio
           issue.save
+          Mailer.deliver_issue_edit(journal) if Setting.notified_events.include?('issue_updated')
         end
       end
       referenced_issues += target_issues
@@ -92,6 +96,16 @@ class Changeset < ActiveRecord::Base
     self.issues = referenced_issues.uniq
   end
 
+  # Returns the Redmine User corresponding to the committer
+  def committer_user
+    if committer && committer.strip =~ /^([^<]+)(<(.*)>)?$/
+      username, email = $1.strip, $3
+      u = User.find_by_login(username)
+      u ||= User.find_by_mail(email) unless email.blank?
+      u
+    end
+  end
+  
   # Returns the previous changeset
   def previous
     @previous ||= Changeset.find(:first, :conditions => ['revision < ? AND repository_id = ?', self.revision, self.repository_id], :order => 'revision DESC')
diff --git a/lang/bg.yml b/lang/bg.yml
index b783df592..6fb1cf6de 100644
--- a/lang/bg.yml
+++ b/lang/bg.yml
@@ -566,3 +566,4 @@ label_general: Основни
 label_repository_plural: Хранилища
 label_associated_revisions: Асоциирани ревизии
 setting_user_format: Потребителски формат
+text_status_changed_by_changeset: Applied in changeset %s.
diff --git a/lang/cs.yml b/lang/cs.yml
index cec7d2a31..894568f20 100644
--- a/lang/cs.yml
+++ b/lang/cs.yml
@@ -566,3 +566,4 @@ label_general: General
 label_repository_plural: Repositories
 label_associated_revisions: Associated revisions
 setting_user_format: Users display format
+text_status_changed_by_changeset: Applied in changeset %s.
diff --git a/lang/de.yml b/lang/de.yml
index a2222af83..668c4333c 100644
--- a/lang/de.yml
+++ b/lang/de.yml
@@ -566,3 +566,4 @@ default_activity_development: Entwicklung
 enumeration_issue_priorities: Ticket-Prioritäten
 enumeration_doc_categories: Dokumentenkategorien
 enumeration_activities: Aktivitäten (Zeiterfassung)
+text_status_changed_by_changeset: Applied in changeset %s.
diff --git a/lang/en.yml b/lang/en.yml
index 8c54e1c79..c056c6ce5 100644
--- a/lang/en.yml
+++ b/lang/en.yml
@@ -540,6 +540,7 @@ text_issue_category_reassign_to: Reassign issues to this category
 text_user_mail_option: "For unselected projects, you will only receive notifications about things you watch or you're involved in (eg. issues you're the author or assignee)."
 text_no_configuration_data: "Roles, trackers, issue statuses and workflow have not been configured yet.\nIt is highly recommended to load the default configuration. You will be able to modify it once loaded."
 text_load_default_configuration: Load the default configuration
+text_status_changed_by_changeset: Applied in changeset %s.
 
 default_role_manager: Manager
 default_role_developper: Developer
diff --git a/lang/es.yml b/lang/es.yml
index f8cd9e300..b80d82178 100644
--- a/lang/es.yml
+++ b/lang/es.yml
@@ -569,3 +569,4 @@ label_general: General
 label_repository_plural: Repositories
 label_associated_revisions: Associated revisions
 setting_user_format: Users display format
+text_status_changed_by_changeset: Applied in changeset %s.
diff --git a/lang/fi.yml b/lang/fi.yml
index cf04b23b4..3e297932d 100644
--- a/lang/fi.yml
+++ b/lang/fi.yml
@@ -570,3 +570,4 @@ enumeration_doc_categories: Dokumentin luokat
 enumeration_activities: Aktiviteetit (ajan seuranta)
 label_associated_revisions: Liittyvät versiot
 setting_user_format: Users display format
+text_status_changed_by_changeset: Applied in changeset %s.
diff --git a/lang/fr.yml b/lang/fr.yml
index 7df8ec622..ac615f03c 100644
--- a/lang/fr.yml
+++ b/lang/fr.yml
@@ -541,6 +541,7 @@ text_issue_category_reassign_to: Réaffecter les demandes à cette catégorie
 text_user_mail_option: "Pour les projets non sélectionnés, vous recevrez seulement des notifications pour ce que vous surveillez ou à quoi vous participez (exemple: demandes dont vous êtes l'auteur ou la personne assignée)."
 text_no_configuration_data: "Les rôles, trackers, statuts et le workflow ne sont pas encore paramétrés.\nIl est vivement recommandé de charger le paramétrage par defaut. Vous pourrez le modifier une fois chargé."
 text_load_default_configuration: Charger le paramétrage par défaut
+text_status_changed_by_changeset: Appliqué par commit %s.
 
 default_role_manager: Manager
 default_role_developper: Développeur
diff --git a/lang/he.yml b/lang/he.yml
index 7f26341b8..4063d2fcd 100644
--- a/lang/he.yml
+++ b/lang/he.yml
@@ -566,3 +566,4 @@ label_general: General
 label_repository_plural: Repositories
 label_associated_revisions: Associated revisions
 setting_user_format: Users display format
+text_status_changed_by_changeset: Applied in changeset %s.
diff --git a/lang/it.yml b/lang/it.yml
index 7b27a54cb..216a1ada4 100644
--- a/lang/it.yml
+++ b/lang/it.yml
@@ -566,3 +566,4 @@ label_general: General
 label_repository_plural: Repositories
 label_associated_revisions: Associated revisions
 setting_user_format: Users display format
+text_status_changed_by_changeset: Applied in changeset %s.
diff --git a/lang/ja.yml b/lang/ja.yml
index 0b3926a23..7607b21de 100644
--- a/lang/ja.yml
+++ b/lang/ja.yml
@@ -567,3 +567,4 @@ label_general: General
 label_repository_plural: Repositories
 label_associated_revisions: Associated revisions
 setting_user_format: Users display format
+text_status_changed_by_changeset: Applied in changeset %s.
diff --git a/lang/ko.yml b/lang/ko.yml
index b9b9542fc..31ac5bf9f 100644
--- a/lang/ko.yml
+++ b/lang/ko.yml
@@ -566,3 +566,4 @@ label_general: 일반
 label_repository_plural: 저장소들
 label_associated_revisions: Associated revisions
 setting_user_format: Users display format
+text_status_changed_by_changeset: Applied in changeset %s.
diff --git a/lang/lt.yml b/lang/lt.yml
index 6f2965353..3aa86702a 100644
--- a/lang/lt.yml
+++ b/lang/lt.yml
@@ -567,3 +567,4 @@ label_repository_plural: Saugiklos
 error_can_t_load_default_data: "Numatytoji konfiguracija negali būti užkrauta: %s"
 label_associated_revisions: susijusios revizijos
 setting_user_format: Vartotojo atvaizdavimo formatas
+text_status_changed_by_changeset: Applied in changeset %s.
diff --git a/lang/nl.yml b/lang/nl.yml
index c2d692706..c54273873 100644
--- a/lang/nl.yml
+++ b/lang/nl.yml
@@ -567,3 +567,4 @@ label_general: General
 label_repository_plural: Repositories
 label_associated_revisions: Associated revisions
 setting_user_format: Users display format
+text_status_changed_by_changeset: Applied in changeset %s.
diff --git a/lang/pl.yml b/lang/pl.yml
index 0f99628af..e3fc957b4 100644
--- a/lang/pl.yml
+++ b/lang/pl.yml
@@ -566,3 +566,4 @@ label_general: Ogólne
 label_repository_plural: Repozytoria
 label_associated_revisions: Associated revisions
 setting_user_format: Users display format
+text_status_changed_by_changeset: Applied in changeset %s.
diff --git a/lang/pt-br.yml b/lang/pt-br.yml
index 3c6fd1265..ce68c5bac 100644
--- a/lang/pt-br.yml
+++ b/lang/pt-br.yml
@@ -566,3 +566,4 @@ label_general: General
 label_repository_plural: Repositories
 label_associated_revisions: Associated revisions
 setting_user_format: Users display format
+text_status_changed_by_changeset: Applied in changeset %s.
diff --git a/lang/pt.yml b/lang/pt.yml
index 3b5647d53..246705599 100644
--- a/lang/pt.yml
+++ b/lang/pt.yml
@@ -566,3 +566,4 @@ label_general: General
 label_repository_plural: Repositories
 label_associated_revisions: Associated revisions
 setting_user_format: Users display format
+text_status_changed_by_changeset: Applied in changeset %s.
diff --git a/lang/ro.yml b/lang/ro.yml
index 2fed755ac..97bb794dd 100644
--- a/lang/ro.yml
+++ b/lang/ro.yml
@@ -566,3 +566,4 @@ label_general: General
 label_repository_plural: Repositories
 label_associated_revisions: Associated revisions
 setting_user_format: Users display format
+text_status_changed_by_changeset: Applied in changeset %s.
diff --git a/lang/ru.yml b/lang/ru.yml
index 44b1664cf..1358b648d 100644
--- a/lang/ru.yml
+++ b/lang/ru.yml
@@ -567,3 +567,4 @@ default_activity_development: Разработка
 enumeration_issue_priorities: Приоритеты задач
 enumeration_doc_categories: Категории документов
 enumeration_activities: Действия (учет времени)
+text_status_changed_by_changeset: Applied in changeset %s.
diff --git a/lang/sr.yml b/lang/sr.yml
index 3132beeec..e6a268004 100644
--- a/lang/sr.yml
+++ b/lang/sr.yml
@@ -567,3 +567,4 @@ label_general: General
 label_repository_plural: Repositories
 label_associated_revisions: Associated revisions
 setting_user_format: Users display format
+text_status_changed_by_changeset: Applied in changeset %s.
diff --git a/lang/sv.yml b/lang/sv.yml
index b8a9a3a11..da03bf0ba 100644
--- a/lang/sv.yml
+++ b/lang/sv.yml
@@ -567,3 +567,4 @@ label_general: General
 label_repository_plural: Repositories
 label_associated_revisions: Associated revisions
 setting_user_format: Users display format
+text_status_changed_by_changeset: Applied in changeset %s.
diff --git a/lang/zh-tw.yml b/lang/zh-tw.yml
index 94631b86d..833e98b00 100644
--- a/lang/zh-tw.yml
+++ b/lang/zh-tw.yml
@@ -566,3 +566,4 @@ default_activity_development: 開發
 enumeration_issue_priorities: 項目重要性
 enumeration_doc_categories: 文件分類
 enumeration_activities: 活動 (time tracking)
+text_status_changed_by_changeset: Applied in changeset %s.
diff --git a/lang/zh.yml b/lang/zh.yml
index 70ee8b137..cdaeeaa04 100644
--- a/lang/zh.yml
+++ b/lang/zh.yml
@@ -569,3 +569,4 @@ label_general: 一般
 label_repository_plural: 源代码库
 label_associated_revisions: 相关的版本
 setting_user_format: 用户显示格式
+text_status_changed_by_changeset: Applied in changeset %s.
diff --git a/test/unit/repository_test.rb b/test/unit/repository_test.rb
index 5e0432c60..21fb00b80 100644
--- a/test/unit/repository_test.rb
+++ b/test/unit/repository_test.rb
@@ -18,7 +18,16 @@
 require File.dirname(__FILE__) + '/../test_helper'
 
 class RepositoryTest < Test::Unit::TestCase
-  fixtures :projects, :repositories, :issues, :issue_statuses, :changesets, :changes
+  fixtures :projects,
+           :trackers,
+           :projects_trackers,
+           :repositories,
+           :issues,
+           :issue_statuses,
+           :changesets,
+           :changes,
+           :users,
+           :enumerations
   
   def setup
     @repository = Project.find(1).repository
@@ -42,19 +51,35 @@ class RepositoryTest < Test::Unit::TestCase
     Setting.commit_fix_done_ratio = "90"
     Setting.commit_ref_keywords = 'refs , references, IssueID'
     Setting.commit_fix_keywords = 'fixes , closes'
-
+    Setting.default_language = 'en'
+    ActionMailer::Base.deliveries.clear
+    
     # make sure issue 1 is not already closed
-    assert !Issue.find(1).status.is_closed?
+    fixed_issue = Issue.find(1)
+    assert !fixed_issue.status.is_closed?
+    old_status = fixed_issue.status
         
     Repository.scan_changesets_for_issue_ids
     assert_equal [101, 102], Issue.find(3).changeset_ids
     
     # fixed issues
-    fixed_issue = Issue.find(1)
+    fixed_issue.reload
     assert fixed_issue.status.is_closed?
     assert_equal 90, fixed_issue.done_ratio
     assert_equal [101], fixed_issue.changeset_ids
     
+    # issue change
+    journal = fixed_issue.journals.find(:first, :order => 'created_on desc')
+    assert_equal User.find_by_login('dlopper'), journal.user
+    assert_equal 'Applied in changeset r2.', journal.notes
+    
+    # 2 email notifications
+    assert_equal 2, ActionMailer::Base.deliveries.size
+    mail = ActionMailer::Base.deliveries.first
+    assert_kind_of TMail::Mail, mail
+    assert mail.subject.starts_with?("[#{fixed_issue.project.name} - #{fixed_issue.tracker.name} ##{fixed_issue.id}]")
+    assert mail.body.include?("Status changed from #{old_status} to #{fixed_issue.status}")
+    
     # ignoring commits referencing an issue of another project
     assert_equal [], Issue.find(4).changesets
   end

From 9a2ec76a81d2c97c0ccc33452c2ef4557016a0a5 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Wed, 6 Feb 2008 20:43:31 +0000
Subject: [PATCH 188/710] Mantis importer: few fixes in user mapping.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1127 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 lib/tasks/migrate_from_mantis.rake | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/lib/tasks/migrate_from_mantis.rake b/lib/tasks/migrate_from_mantis.rake
index 36e7e1514..af8892a6b 100644
--- a/lib/tasks/migrate_from_mantis.rake
+++ b/lib/tasks/migrate_from_mantis.rake
@@ -87,18 +87,24 @@ task :migrate_from_mantis => :environment do
       set_table_name :mantis_user_table
       
       def firstname
-        realname.blank? ? username : realname.split.first[0..29]
+        @firstname = realname.blank? ? username : realname.split.first[0..29]
+        @firstname.gsub!(/[^\w\s\'\-]/i, '')
+        @firstname
       end
       
       def lastname
-        realname.blank? ? username : realname.split[1..-1].join(' ')[0..29]
+        @lastname = realname.blank? ? username : realname.split[1..-1].join(' ')[0..29]
+        @lastname.gsub!(/[^\w\s\'\-]/i, '')
+        @lastname = '-' if @lastname.blank?
+        @lastname
       end
       
       def email
-        if read_attribute(:email).match(/^([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})$/i)
-          read_attribute(:email)
+        if read_attribute(:email).match(/^([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})$/i) &&
+             !User.find_by_mail(read_attribute(:email))
+          @email = read_attribute(:email)
         else
-          "#{username}@foo.bar"
+          @email = "#{username}@foo.bar"
         end
       end
       
@@ -246,7 +252,7 @@ task :migrate_from_mantis => :environment do
     	u.password = 'mantis'
     	u.status = User::STATUS_LOCKED if user.enabled != 1
     	u.admin = true if user.access_level == 90
-    	next unless u.save
+    	next unless u.save!
     	users_migrated += 1
     	users_map[user.id] = u.id
     	print '.'

From 6d109258c909f71edc3a4b43843c296acf66aad0 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Thu, 7 Feb 2008 18:06:35 +0000
Subject: [PATCH 189/710] Added a few extensions/mimetypes.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1128 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 lib/redmine/mime_type.rb | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/lib/redmine/mime_type.rb b/lib/redmine/mime_type.rb
index c9db93956..e0bc3991d 100644
--- a/lib/redmine/mime_type.rb
+++ b/lib/redmine/mime_type.rb
@@ -19,7 +19,7 @@ module Redmine
   module MimeType
 
     MIME_TYPES = {
-      'text/plain' => 'txt,tpl,properties',
+      'text/plain' => 'txt,tpl,properties,patch,diff,ini,readme,install,upgrade',
       'text/css' => 'css',
       'text/html' => 'html,htm,xhtml',
       'text/x-c' => 'c,cpp,h',
@@ -30,25 +30,28 @@ module Redmine
       'text/x-php' => 'php,php3,php4,php5',
       'text/x-python' => 'py',
       'text/x-ruby' => 'rb,rbw,ruby,rake',
+      'text/x-csh' => 'csh',
       'text/x-sh' => 'sh',
-      'text/xml' => 'xml',
+      'text/xml' => 'xml,xsd,mxml',
       'text/yaml' => 'yml,yaml',
       'image/gif' => 'gif',
       'image/jpeg' => 'jpg,jpeg,jpe',
       'image/png' => 'png',
-      'image/tiff' => 'tiff,tif'
+      'image/tiff' => 'tiff,tif',
+      'image/x-ms-bmp' => 'bmp',
+      'image/x-xpixmap' => 'xpm',
     }.freeze
     
     EXTENSIONS = MIME_TYPES.inject({}) do |map, (type, exts)|
-      exts.split(',').each {|ext| map[ext] = type}
+      exts.split(',').each {|ext| map[ext.strip] = type}
       map
     end
     
     # returns mime type for name or nil if unknown
     def self.of(name)
       return nil unless name
-      m = name.to_s.match(/\.([^\.]+)$/)
-      EXTENSIONS[m[1]] if m
+      m = name.to_s.match(/(^|\.)([^\.]+)$/)
+      EXTENSIONS[m[2].downcase] if m
     end
     
     def self.main_mimetype_of(name)

From 43a6f312edde2399c9c986ed61b1e9b0e1066db6 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sat, 9 Feb 2008 16:11:18 +0000
Subject: [PATCH 190/710] Merged IssuesController #edit and #update into a
 single actions. Users with 'edit issues' permission can now update any
 property including custom fields when adding a note or changing the status
 (#519, #581, #587).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1129 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/issues_controller.rb      |  71 +++++++++-------------
 app/views/issues/_edit.rhtml              |  39 ++++++++++++
 app/views/issues/_form.rhtml              |   8 +--
 app/views/issues/_form_update.rhtml       |  10 +++
 app/views/issues/_update.rhtml            |  54 ----------------
 app/views/issues/context_menu.rhtml       |   6 +-
 app/views/issues/edit.rhtml               |  18 +-----
 app/views/issues/new.rhtml                |   3 +
 app/views/issues/show.rhtml               |   7 +--
 app/views/issues/update.rhtml             |   4 --
 lang/bg.yml                               |   1 +
 lang/cs.yml                               |   1 +
 lang/de.yml                               |   1 +
 lang/en.yml                               |   1 +
 lang/es.yml                               |   1 +
 lang/fi.yml                               |   1 +
 lang/fr.yml                               |   1 +
 lang/he.yml                               |   1 +
 lang/it.yml                               |   1 +
 lang/ja.yml                               |   1 +
 lang/ko.yml                               |   1 +
 lang/lt.yml                               |   1 +
 lang/nl.yml                               |   1 +
 lang/pl.yml                               |   1 +
 lang/pt-br.yml                            |   1 +
 lang/pt.yml                               |   1 +
 lang/ro.yml                               |   1 +
 lang/ru.yml                               |   1 +
 lang/sr.yml                               |   1 +
 lang/sv.yml                               |   1 +
 lang/zh-tw.yml                            |   1 +
 lang/zh.yml                               |   1 +
 lib/redmine.rb                            |   4 +-
 public/images/note.png                    | Bin 469 -> 0 bytes
 public/stylesheets/application.css        |   1 -
 test/functional/issues_controller_test.rb |  27 +++-----
 test/integration/issues_test.rb           |   2 +-
 37 files changed, 126 insertions(+), 150 deletions(-)
 create mode 100644 app/views/issues/_edit.rhtml
 create mode 100644 app/views/issues/_form_update.rhtml
 delete mode 100644 app/views/issues/_update.rhtml
 delete mode 100644 app/views/issues/update.rhtml
 delete mode 100644 public/images/note.png

diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index b722d9340..dbb49405c 100644
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -25,7 +25,7 @@ class IssuesController < ApplicationController
   before_filter :find_optional_project, :only => [:index, :changes]
   accept_key_auth :index, :changes
   
-  cache_sweeper :issue_sweeper, :only => [ :new, :edit, :update, :destroy ]
+  cache_sweeper :issue_sweeper, :only => [ :new, :edit, :destroy ]
 
   helper :journals
   helper :projects
@@ -85,10 +85,12 @@ class IssuesController < ApplicationController
   end
   
   def show
-    @custom_values = @issue.custom_values.find(:all, :include => :custom_field, :order => "#{CustomField.table_name}.position")
+    @custom_values = @project.custom_fields_for_issues(@issue.tracker).collect { |x| @issue.custom_values.find_by_custom_field_id(x.id) || CustomValue.new(:custom_field => x, :customized => @issue) }
     @journals = @issue.journals.find(:all, :include => [:user, :details], :order => "#{Journal.table_name}.created_on ASC")
-    @status_options = @issue.new_statuses_allowed_to(User.current)
+    @allowed_statuses = @issue.new_statuses_allowed_to(User.current)
+    @edit_allowed = User.current.allowed_to?(:edit_issues, @project)
     @activities = Enumeration::get_values('ACTI')
+    @priorities = Enumeration::get_values('IPRI')
     respond_to do |format|
       format.html { render :template => 'issues/show.rhtml' }
       format.pdf  { send_data(render(:template => 'issues/show.rfpdf', :layout => false), :type => 'application/pdf', :filename => "#{@project.identifier}-#{@issue.id}.pdf") }
@@ -140,48 +142,33 @@ class IssuesController < ApplicationController
     render :layout => !request.xhr?
   end
   
-  def edit
-    @priorities = Enumeration::get_values('IPRI')
-    @custom_values = []
-    if request.get?
-      @custom_values = @project.custom_fields_for_issues(@issue.tracker).collect { |x| @issue.custom_values.find_by_custom_field_id(x.id) || CustomValue.new(:custom_field => x, :customized => @issue) }
-    else
-      begin
-        journal = @issue.init_journal(User.current)
-        # Retrieve custom fields and values
-        if params["custom_fields"]
-          @custom_values = @project.custom_fields_for_issues(@issue.tracker).collect { |x| CustomValue.new(:custom_field => x, :customized => @issue, :value => params["custom_fields"][x.id.to_s]) }
-          @issue.custom_values = @custom_values
-        end
-        @issue.attributes = params[:issue]
-        if @issue.save
-          flash[:notice] = l(:notice_successful_update)
-          Mailer.deliver_issue_edit(journal) if Setting.notified_events.include?('issue_updated')
-          redirect_to(params[:back_to] || {:action => 'show', :id => @issue})
-        end
-      rescue ActiveRecord::StaleObjectError
-        # Optimistic locking exception
-        flash[:error] = l(:notice_locking_conflict)
-      end
-    end		
-  end
-  
-  # Attributes that can be updated on workflow transition
+  # Attributes that can be updated on workflow transition (without :edit permission)
   # TODO: make it configurable (at least per role)
   UPDATABLE_ATTRS_ON_TRANSITION = %w(status_id assigned_to_id fixed_version_id done_ratio) unless const_defined?(:UPDATABLE_ATTRS_ON_TRANSITION)
   
-  def update
-    @status_options = @issue.new_statuses_allowed_to(User.current)
+  def edit
+    @allowed_statuses = @issue.new_statuses_allowed_to(User.current)
     @activities = Enumeration::get_values('ACTI')
-    journal = @issue.init_journal(User.current, params[:notes])
-    # User can change issue attributes only if a workflow transition is allowed
-    if !@status_options.empty? && params[:issue]
-      attrs = params[:issue].dup
-      attrs.delete_if {|k,v| !UPDATABLE_ATTRS_ON_TRANSITION.include?(k) }
-      attrs.delete(:status_id) unless @status_options.detect {|s| s.id.to_s == attrs[:status_id].to_s}
-      @issue.attributes = attrs
-    end
-    if request.post?
+    @priorities = Enumeration::get_values('IPRI')
+    @custom_values = []
+    @edit_allowed = User.current.allowed_to?(:edit_issues, @project)
+    if request.get?
+      @custom_values = @project.custom_fields_for_issues(@issue.tracker).collect { |x| @issue.custom_values.find_by_custom_field_id(x.id) || CustomValue.new(:custom_field => x, :customized => @issue) }
+    else
+      @notes = params[:notes]
+      journal = @issue.init_journal(User.current, @notes)
+      # User can change issue attributes only if he has :edit permission or if a workflow transition is allowed
+      if (@edit_allowed || !@allowed_statuses.empty?) && params[:issue]
+        attrs = params[:issue].dup
+        attrs.delete_if {|k,v| !UPDATABLE_ATTRS_ON_TRANSITION.include?(k) } unless @edit_allowed
+        attrs.delete(:status_id) unless @allowed_statuses.detect {|s| s.id.to_s == attrs[:status_id].to_s}
+        @issue.attributes = attrs
+      end
+      # Update custom fields if user has :edit permission
+      if @edit_allowed && params[:custom_fields]
+        @custom_values = @project.custom_fields_for_issues(@issue.tracker).collect { |x| CustomValue.new(:custom_field => x, :customized => @issue, :value => params["custom_fields"][x.id.to_s]) }
+        @issue.custom_values = @custom_values
+      end
       attachments = attach_files(@issue, params[:attachments])
       attachments.each {|a| journal.details << JournalDetail.new(:property => 'attachment', :prop_key => a.id, :value => a.filename)}
       if @issue.save
@@ -243,7 +230,7 @@ class IssuesController < ApplicationController
   def preview
     issue = Issue.find_by_id(params[:id])
     @attachements = issue.attachments if issue
-    @text = (params[:issue] ? params[:issue][:description] : nil) || params[:notes]
+    @text = params[:notes] || (params[:issue] ? params[:issue][:description] : nil)
     render :partial => 'common/preview'
   end
   
diff --git a/app/views/issues/_edit.rhtml b/app/views/issues/_edit.rhtml
new file mode 100644
index 000000000..0f843e855
--- /dev/null
+++ b/app/views/issues/_edit.rhtml
@@ -0,0 +1,39 @@
+<% labelled_tabular_form_for :issue, @issue,
+                             :url => {:action => 'edit', :id => @issue},
+                             :html => {:id => 'issue-form',
+                                       :multipart => true} do |f| %>
+    <%= error_messages_for 'issue' %>
+    <div class="box">
+    <% if @edit_allowed || !@allowed_statuses.empty? %>
+        <fieldset>
+        <legend><%= l(:label_change_properties) %>
+        <% if !@issue.new_record? && !@issue.errors.any? && @edit_allowed %>
+        <small>(<%= link_to l(:label_more), {}, :onclick => 'Effect.toggle("issue_descr_fields", "appear", {duration:0.3}); return false;' %>)</small>
+        <% end %>
+        </legend>
+        <%= render :partial => (@edit_allowed ? 'form' : 'form_update'), :locals => {:f => f} %>
+        </fieldset>
+    <% end %>
+    
+    <fieldset><legend><%= l(:field_notes) %></legend>
+    <%= text_area_tag 'notes', @notes, :cols => 60, :rows => 10, :class => 'wiki-edit' %>
+    <%= wikitoolbar_for 'notes' %>
+    
+    <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>
+    </fieldset>
+    </div>
+    
+    <%= f.hidden_field :lock_version %>
+    <%= submit_tag l(:button_submit) %>
+    <%= link_to_remote l(:label_preview), 
+                       { :url => { :controller => 'issues', :action => 'preview', :id => @issue },
+                         :method => 'post',
+                         :update => 'preview',
+                         :with => 'Form.serialize("issue-form")',
+                         :complete => "location.hash='preview'"
+                       }, :accesskey => accesskey(:preview) %>
+<% end %>
+
+<div id="preview" class="wiki"></div>
diff --git a/app/views/issues/_form.rhtml b/app/views/issues/_form.rhtml
index d11cea84c..6a4cd0f5f 100644
--- a/app/views/issues/_form.rhtml
+++ b/app/views/issues/_form.rhtml
@@ -1,6 +1,3 @@
-<%= error_messages_for 'issue' %>
-<div class="box">
-
 <% if @issue.new_record? %>
 <p><%= f.select :tracker_id, @project.trackers.collect {|t| [t.name, t.id]}, :required => true %></p>
 <%= observe_field :issue_tracker_id, :url => { :action => :new },
@@ -8,15 +5,17 @@
                                      :with => "Form.serialize('issue-form')" %>
 <% end %>
 
+<div id="issue_descr_fields" <%= 'style="display:none"' unless @issue.new_record? || @issue.errors.any? %>>
 <p><%= f.text_field :subject, :size => 80, :required => true %></p>
 <p><%= f.text_area :description, :required => true,
                    :cols => 60,
                    :rows => (@issue.description.blank? ? 10 : [[10, @issue.description.length / 50].max, 100].min),
                    :accesskey => accesskey(:edit),
                    :class => 'wiki-edit' %></p>
+</div>
 
 <div class="splitcontentleft">
-<% if @issue.new_record? %>
+<% if @issue.new_record? || @allowed_statuses %>
 <p><%= f.select :status_id, (@allowed_statuses.collect {|p| [p.name, p.id]}), :required => true %></p>
 <% else %>
 <p><label><%= l(:field_status) %></label> <%= @issue.status.name %></p>
@@ -49,7 +48,6 @@
 <%= 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>
 <% end %>
-</div>
 
 <%= wikitoolbar_for 'issue_description' %>
 
diff --git a/app/views/issues/_form_update.rhtml b/app/views/issues/_form_update.rhtml
new file mode 100644
index 000000000..25e81a7fd
--- /dev/null
+++ b/app/views/issues/_form_update.rhtml
@@ -0,0 +1,10 @@
+<div class="splitcontentleft">
+<p><%= f.select :status_id, (@allowed_statuses.collect {|p| [p.name, p.id]}), :required => true %></p>
+<p><%= f.select :assigned_to_id, (@issue.assignable_users.collect {|m| [m.name, m.id]}), :include_blank => true %></p>
+</div>
+<div class="splitcontentright">
+<p><%= f.select :done_ratio, ((0..10).to_a.collect {|r| ["#{r*10} %", r*10] }) %></p>
+<%= content_tag('p', f.select(:fixed_version_id, 
+                          (@project.versions.sort.collect {|v| [v.name, v.id]}),
+                          { :include_blank => true })) unless @project.versions.empty? %>
+</div>
diff --git a/app/views/issues/_update.rhtml b/app/views/issues/_update.rhtml
deleted file mode 100644
index 49d1473d9..000000000
--- a/app/views/issues/_update.rhtml
+++ /dev/null
@@ -1,54 +0,0 @@
-<% labelled_tabular_form_for(:issue, @issue, :url => {:action => 'update', :id => @issue},
-                                             :html => {:multipart => true,
-                                                       :id => 'issue-form'}) do |f| %>
-
-<div class="box">
-<% unless @status_options.empty? %>
-<%= f.hidden_field :lock_version %>
-<fieldset><legend><%= l(:label_change_properties) %></legend>
-    <div class="splitcontentleft">
-    <p><%= f.select :status_id, (@status_options.collect {|p| [p.name, p.id]}), :required => true %></p>
-    <p><%= f.select :assigned_to_id, (@issue.assignable_users.collect {|m| [m.name, m.id]}), :include_blank => true %></p>
-    </div>
-    <div class="splitcontentright">
-    <p><%= f.select :done_ratio, ((0..10).to_a.collect {|r| ["#{r*10} %", r*10] }) %></p>
-    <p><%= f.select :fixed_version_id, (@project.versions.sort.collect {|v| [v.name, v.id]}), { :include_blank => true } %></p>
-    </div>
-</fieldset>
-<% end%>
-<% if authorize_for('timelog', 'edit') %>
-<fieldset><legend><%= l(:button_log_time) %></legend>
-    <% fields_for :time_entry, @time_entry, { :builder => TabularFormBuilder, :lang => current_language} do |time_entry| %>
-    <div class="splitcontentleft">
-    <p><%= time_entry.text_field :hours, :size => 6, :label => :label_spent_time %> <%= l(:field_hours) %></p>
-    </div>
-    <div class="splitcontentright">
-    <p><%= time_entry.text_field :comments, :size => 40 %></p>
-    <p><%= time_entry.select :activity_id, (@activities.collect {|p| [p.name, p.id]}) %></p>
-    </div>
-    <% end %>
-</fieldset>
-<% end %>
-
-<fieldset><legend><%= l(:field_notes) %></legend>
-<%= text_area_tag 'notes', @notes, :cols => 60, :rows => 10, :class => 'wiki-edit' %>
-<%= wikitoolbar_for 'notes' %>
-
-<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>
-</fieldset>
-</div>
-
-<%= submit_tag l(:button_submit) %>
-<%= link_to_remote l(:label_preview), 
-                   { :url => { :controller => 'issues', :action => 'preview', :id => @issue },
-                     :method => 'post',
-                     :update => 'preview',
-                     :with => "Form.serialize('issue-form')",
-                     :complete => "window.location.hash='preview'"
-                   }, :accesskey => accesskey(:preview) %> |
-<%= toggle_link l(:button_cancel), 'update' %>
-<% end %>
-
-<div id="preview" class="wiki"></div>
diff --git a/app/views/issues/context_menu.rhtml b/app/views/issues/context_menu.rhtml
index 9691a7713..46b177067 100644
--- a/app/views/issues/context_menu.rhtml
+++ b/app/views/issues/context_menu.rhtml
@@ -6,7 +6,7 @@
 		<a href="#" class="submenu" onclick="return false;"><%= l(:field_status) %></a>
 		<ul>
 		<% @statuses.each do |s| %>
-		    <li><%= context_menu_link s.name, {:controller => 'issues', :action => 'update', :id => @issue, :issue => {:status_id => s}},
+		    <li><%= context_menu_link s.name, {:controller => 'issues', :action => 'edit', :id => @issue, :issue => {:status_id => s}},
 		                              :selected => (s == @issue.status), :disabled => !(@allowed_statuses.include?(s)) %></li>
 		<% end %>
 		</ul>
@@ -24,10 +24,10 @@
 		<a href="#" class="submenu"><%= l(:field_assigned_to) %></a>
 		<ul>
 		<% @assignables.each do |u| %>
-		    <li><%= context_menu_link u.name, {:controller => 'issues', :action => 'update', :id => @issue, :issue => {:assigned_to_id => u}, :back_to => back_to}, :method => :post,
+		    <li><%= context_menu_link u.name, {:controller => 'issues', :action => 'edit', :id => @issue, :issue => {:assigned_to_id => u}, :back_to => back_to}, :method => :post,
 		                              :selected => (u == @issue.assigned_to), :disabled => !@can[:assign] %></li>
 		<% end %>
-		    <li><%= context_menu_link l(:label_nobody), {:controller => 'issues', :action => 'update', :id => @issue, :issue => {:assigned_to_id => nil}, :back_to => back_to}, :method => :post,
+		    <li><%= context_menu_link l(:label_nobody), {:controller => 'issues', :action => 'edit', :id => @issue, :issue => {:assigned_to_id => nil}, :back_to => back_to}, :method => :post,
 		                              :selected => @issue.assigned_to.nil?, :disabled => !@can[:assign] %></li>
 		</ul>
 	</li>
diff --git a/app/views/issues/edit.rhtml b/app/views/issues/edit.rhtml
index 1577216ed..97f26a205 100644
--- a/app/views/issues/edit.rhtml
+++ b/app/views/issues/edit.rhtml
@@ -1,19 +1,3 @@
 <h2><%=h "#{@issue.tracker.name} ##{@issue.id}" %></h2>
 
-<% labelled_tabular_form_for :issue, @issue,
-                             :url => {:action => 'edit'},
-                             :html => {:id => 'issue-form'} do |f| %>
-    <%= render :partial => 'form', :locals => {:f => f} %>
-    <%= f.hidden_field :lock_version %>
-    <%= submit_tag l(:button_save) %>
-    <%= link_to_remote l(:label_preview), 
-                       { :url => { :controller => 'issues', :action => 'preview', :id => @issue },
-                         :method => 'post',
-                         :update => 'preview',
-                         :with => "Form.serialize('issue-form')",
-                         :complete => "location.href='#preview-top'"
-                       }, :accesskey => accesskey(:preview) %>
-<% end %>
-
-<a name="preview-top"></a>
-<div id="preview" class="wiki"></div>
+<%= render :partial => 'edit' %>
diff --git a/app/views/issues/new.rhtml b/app/views/issues/new.rhtml
index 8ff07f226..1e9e323fe 100644
--- a/app/views/issues/new.rhtml
+++ b/app/views/issues/new.rhtml
@@ -2,7 +2,10 @@
 
 <% labelled_tabular_form_for :issue, @issue, 
                              :html => {:multipart => true, :id => 'issue-form'} do |f| %>
+    <%= error_messages_for 'issue' %>
+    <div class="box">
     <%= render :partial => 'issues/form', :locals => {:f => f} %>
+    </div>
     <%= submit_tag l(:button_create) %>
     <%= link_to_remote l(:label_preview), 
                        { :url => { :controller => 'issues', :action => 'preview', :id => @issue },
diff --git a/app/views/issues/show.rhtml b/app/views/issues/show.rhtml
index d29b1b88f..a16dc60e0 100644
--- a/app/views/issues/show.rhtml
+++ b/app/views/issues/show.rhtml
@@ -1,6 +1,5 @@
 <div class="contextual">
-<%= show_and_goto_link(l(:button_update), 'update', :class => 'icon icon-note') if authorize_for('issues', 'update') %>
-<%= link_to_if_authorized l(:button_edit), {:controller => 'issues', :action => 'edit', :id => @issue}, :class => 'icon icon-edit', :accesskey => accesskey(:edit) %>
+<%= show_and_goto_link(l(:button_update), 'update', :class => 'icon icon-edit', :accesskey => accesskey(:edit)) if authorize_for('issues', 'edit') %>
 <%= link_to_if_authorized l(:button_log_time), {:controller => 'timelog', :action => 'edit', :issue_id => @issue}, :class => 'icon icon-time' %>
 <%= watcher_tag(@issue, User.current) %>
 <%= link_to_if_authorized l(:button_copy), {:controller => 'issues', :action => 'new', :project_id => @project, :copy_from => @issue }, :class => 'icon icon-copy' %>
@@ -89,11 +88,11 @@ end %>
 </div>
 <% end %>
 
-<% if authorize_for('issues', 'update') %>
+<% if authorize_for('issues', 'edit') %>
   <a name="update-anchor"></a>
   <div id="update" style="display:none;">
   <h3><%= l(:button_update) %></h3>
-  <%= render :partial => 'update' %>
+  <%= render :partial => 'edit' %>
   </div>
 <% end %>
 
diff --git a/app/views/issues/update.rhtml b/app/views/issues/update.rhtml
deleted file mode 100644
index 44e72da87..000000000
--- a/app/views/issues/update.rhtml
+++ /dev/null
@@ -1,4 +0,0 @@
-<h2><%= @issue.tracker.name %> #<%= @issue.id %>: <%=h @issue.subject %></h2>
-
-<%= error_messages_for 'issue' %>
-<%= render :partial => 'update' %>
diff --git a/lang/bg.yml b/lang/bg.yml
index 6fb1cf6de..bc0e070c0 100644
--- a/lang/bg.yml
+++ b/lang/bg.yml
@@ -567,3 +567,4 @@ label_repository_plural: Хранилища
 label_associated_revisions: Асоциирани ревизии
 setting_user_format: Потребителски формат
 text_status_changed_by_changeset: Applied in changeset %s.
+label_more: More
diff --git a/lang/cs.yml b/lang/cs.yml
index 894568f20..35bda2b6a 100644
--- a/lang/cs.yml
+++ b/lang/cs.yml
@@ -567,3 +567,4 @@ label_repository_plural: Repositories
 label_associated_revisions: Associated revisions
 setting_user_format: Users display format
 text_status_changed_by_changeset: Applied in changeset %s.
+label_more: More
diff --git a/lang/de.yml b/lang/de.yml
index 668c4333c..fd296b600 100644
--- a/lang/de.yml
+++ b/lang/de.yml
@@ -567,3 +567,4 @@ enumeration_issue_priorities: Ticket-Prioritäten
 enumeration_doc_categories: Dokumentenkategorien
 enumeration_activities: Aktivitäten (Zeiterfassung)
 text_status_changed_by_changeset: Applied in changeset %s.
+label_more: More
diff --git a/lang/en.yml b/lang/en.yml
index c056c6ce5..b86eeef2b 100644
--- a/lang/en.yml
+++ b/lang/en.yml
@@ -469,6 +469,7 @@ label_display_per_page: 'Per page: %s'
 label_age: Age
 label_change_properties: Change properties
 label_general: General
+label_more: More
 
 button_login: Login
 button_submit: Submit
diff --git a/lang/es.yml b/lang/es.yml
index b80d82178..60e4a4d13 100644
--- a/lang/es.yml
+++ b/lang/es.yml
@@ -570,3 +570,4 @@ label_repository_plural: Repositories
 label_associated_revisions: Associated revisions
 setting_user_format: Users display format
 text_status_changed_by_changeset: Applied in changeset %s.
+label_more: More
diff --git a/lang/fi.yml b/lang/fi.yml
index 3e297932d..38cf19a46 100644
--- a/lang/fi.yml
+++ b/lang/fi.yml
@@ -571,3 +571,4 @@ enumeration_activities: Aktiviteetit (ajan seuranta)
 label_associated_revisions: Liittyvät versiot
 setting_user_format: Users display format
 text_status_changed_by_changeset: Applied in changeset %s.
+label_more: More
diff --git a/lang/fr.yml b/lang/fr.yml
index ac615f03c..e428935af 100644
--- a/lang/fr.yml
+++ b/lang/fr.yml
@@ -470,6 +470,7 @@ label_display_per_page: 'Par page: %s'
 label_age: Age
 label_change_properties: Changer les propriétés
 label_general: Général
+label_more: Plus
 
 button_login: Connexion
 button_submit: Soumettre
diff --git a/lang/he.yml b/lang/he.yml
index 4063d2fcd..ca577558a 100644
--- a/lang/he.yml
+++ b/lang/he.yml
@@ -567,3 +567,4 @@ label_repository_plural: Repositories
 label_associated_revisions: Associated revisions
 setting_user_format: Users display format
 text_status_changed_by_changeset: Applied in changeset %s.
+label_more: More
diff --git a/lang/it.yml b/lang/it.yml
index 216a1ada4..f227c6942 100644
--- a/lang/it.yml
+++ b/lang/it.yml
@@ -567,3 +567,4 @@ label_repository_plural: Repositories
 label_associated_revisions: Associated revisions
 setting_user_format: Users display format
 text_status_changed_by_changeset: Applied in changeset %s.
+label_more: More
diff --git a/lang/ja.yml b/lang/ja.yml
index 7607b21de..92b79b6ef 100644
--- a/lang/ja.yml
+++ b/lang/ja.yml
@@ -568,3 +568,4 @@ label_repository_plural: Repositories
 label_associated_revisions: Associated revisions
 setting_user_format: Users display format
 text_status_changed_by_changeset: Applied in changeset %s.
+label_more: More
diff --git a/lang/ko.yml b/lang/ko.yml
index 31ac5bf9f..097d74788 100644
--- a/lang/ko.yml
+++ b/lang/ko.yml
@@ -567,3 +567,4 @@ label_repository_plural: 저장소들
 label_associated_revisions: Associated revisions
 setting_user_format: Users display format
 text_status_changed_by_changeset: Applied in changeset %s.
+label_more: More
diff --git a/lang/lt.yml b/lang/lt.yml
index 3aa86702a..3106bd764 100644
--- a/lang/lt.yml
+++ b/lang/lt.yml
@@ -568,3 +568,4 @@ error_can_t_load_default_data: "Numatytoji konfiguracija negali būti užkrauta:
 label_associated_revisions: susijusios revizijos
 setting_user_format: Vartotojo atvaizdavimo formatas
 text_status_changed_by_changeset: Applied in changeset %s.
+label_more: More
diff --git a/lang/nl.yml b/lang/nl.yml
index c54273873..1c76180be 100644
--- a/lang/nl.yml
+++ b/lang/nl.yml
@@ -568,3 +568,4 @@ label_repository_plural: Repositories
 label_associated_revisions: Associated revisions
 setting_user_format: Users display format
 text_status_changed_by_changeset: Applied in changeset %s.
+label_more: More
diff --git a/lang/pl.yml b/lang/pl.yml
index e3fc957b4..3ebce3e92 100644
--- a/lang/pl.yml
+++ b/lang/pl.yml
@@ -567,3 +567,4 @@ label_repository_plural: Repozytoria
 label_associated_revisions: Associated revisions
 setting_user_format: Users display format
 text_status_changed_by_changeset: Applied in changeset %s.
+label_more: More
diff --git a/lang/pt-br.yml b/lang/pt-br.yml
index ce68c5bac..688ce0cfd 100644
--- a/lang/pt-br.yml
+++ b/lang/pt-br.yml
@@ -567,3 +567,4 @@ label_repository_plural: Repositories
 label_associated_revisions: Associated revisions
 setting_user_format: Users display format
 text_status_changed_by_changeset: Applied in changeset %s.
+label_more: More
diff --git a/lang/pt.yml b/lang/pt.yml
index 246705599..4734c66fc 100644
--- a/lang/pt.yml
+++ b/lang/pt.yml
@@ -567,3 +567,4 @@ label_repository_plural: Repositories
 label_associated_revisions: Associated revisions
 setting_user_format: Users display format
 text_status_changed_by_changeset: Applied in changeset %s.
+label_more: More
diff --git a/lang/ro.yml b/lang/ro.yml
index 97bb794dd..be566b959 100644
--- a/lang/ro.yml
+++ b/lang/ro.yml
@@ -567,3 +567,4 @@ label_repository_plural: Repositories
 label_associated_revisions: Associated revisions
 setting_user_format: Users display format
 text_status_changed_by_changeset: Applied in changeset %s.
+label_more: More
diff --git a/lang/ru.yml b/lang/ru.yml
index 1358b648d..6921169ce 100644
--- a/lang/ru.yml
+++ b/lang/ru.yml
@@ -568,3 +568,4 @@ enumeration_issue_priorities: Приоритеты задач
 enumeration_doc_categories: Категории документов
 enumeration_activities: Действия (учет времени)
 text_status_changed_by_changeset: Applied in changeset %s.
+label_more: More
diff --git a/lang/sr.yml b/lang/sr.yml
index e6a268004..ddf84a5d3 100644
--- a/lang/sr.yml
+++ b/lang/sr.yml
@@ -568,3 +568,4 @@ label_repository_plural: Repositories
 label_associated_revisions: Associated revisions
 setting_user_format: Users display format
 text_status_changed_by_changeset: Applied in changeset %s.
+label_more: More
diff --git a/lang/sv.yml b/lang/sv.yml
index da03bf0ba..4bec394ce 100644
--- a/lang/sv.yml
+++ b/lang/sv.yml
@@ -568,3 +568,4 @@ label_repository_plural: Repositories
 label_associated_revisions: Associated revisions
 setting_user_format: Users display format
 text_status_changed_by_changeset: Applied in changeset %s.
+label_more: More
diff --git a/lang/zh-tw.yml b/lang/zh-tw.yml
index 833e98b00..50a6384f2 100644
--- a/lang/zh-tw.yml
+++ b/lang/zh-tw.yml
@@ -567,3 +567,4 @@ enumeration_issue_priorities: 項目重要性
 enumeration_doc_categories: 文件分類
 enumeration_activities: 活動 (time tracking)
 text_status_changed_by_changeset: Applied in changeset %s.
+label_more: More
diff --git a/lang/zh.yml b/lang/zh.yml
index cdaeeaa04..dc431f5c0 100644
--- a/lang/zh.yml
+++ b/lang/zh.yml
@@ -570,3 +570,4 @@ label_repository_plural: 源代码库
 label_associated_revisions: 相关的版本
 setting_user_format: 用户显示格式
 text_status_changed_by_changeset: Applied in changeset %s.
+label_more: More
diff --git a/lib/redmine.rb b/lib/redmine.rb
index c4c55a932..69151012b 100644
--- a/lib/redmine.rb
+++ b/lib/redmine.rb
@@ -32,9 +32,9 @@ Redmine::AccessControl.map do |map|
                                   :reports => :issue_report}, :public => true                    
     map.permission :add_issues, {:issues => :new}
     map.permission :edit_issues, {:projects => :bulk_edit_issues,
-                                  :issues => [:edit, :update, :destroy_attachment]}
+                                  :issues => [:edit, :destroy_attachment]}
     map.permission :manage_issue_relations, {:issue_relations => [:new, :destroy]}
-    map.permission :add_issue_notes, {:issues => :update}
+    map.permission :add_issue_notes, {:issues => :edit}
     map.permission :move_issues, {:projects => :move_issues}, :require => :loggedin
     map.permission :delete_issues, {:issues => :destroy}, :require => :member
     # Queries
diff --git a/public/images/note.png b/public/images/note.png
deleted file mode 100644
index 256368397286776fa63c18805623ef4efdb750b8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 469
zcmV;`0V@89P)<h;3K|Lk000e1NJLTq000mG000mO0{{R3C@l|D0000lbVXQnLvm$d
zbZKvHAXI5>WdL?%ZZ04)F(7kgaC9ypGB7YVATlsIH8eUjIUp-AF)%O-KQw*-000Mc
zNliru*9jF90SKU&=dl0)010qNS#tmY3labT3lag+-G2N4000DMK}|sb0I`n?{9y$E
z005;>OjJex|Nrmr@8{>|z23b_dqQ)yYpuPl*4Ebd_xHW`t^fbd#^;=Ky<^74#?H>p
zrSF{o|L26~Yf`;R-rnA|=e6(m=kNd4Ip;YD&Inq@QiR@wt^c)z_ly|lAtC1}QpQq@
z=ajww#+3h@2-XNn#zN=!=alD^od2bJrCP@S#%tbV-Z5H?drIf;=l9mu|0!CvLNWLM
z_pQd1_r}imrL~l$Yu@+XY&1RZ0001ZNkl<Zc-muNzzxhqQ29p2CZ@=IHC;V@14AUf
zrn;844iaBcT~1j;70y>sRFYFxLGY!dW#lB}Igt6X5|SJo9E==bK@m|gaS2H#AYfz!
z3-AkY2@3JC3kx$rHF0ur^YHSqGs4VZW?^MxXF{0BzzEdKKnef=KAs3D*$m`T00000
LNkvXXu0mjfayQNg

diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index b3b8b341d..b386c3285 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -512,7 +512,6 @@ vertical-align: middle;
 .icon-reload  { background-image: url(../images/reload.png); }
 .icon-lock  { background-image: url(../images/locked.png); }
 .icon-unlock  { background-image: url(../images/unlock.png); }
-.icon-note  { background-image: url(../images/note.png); }
 .icon-checked  { background-image: url(../images/true.png); }
 
 .icon22-projects { background-image: url(../images/22x22/projects.png); }
diff --git a/test/functional/issues_controller_test.rb b/test/functional/issues_controller_test.rb
index f4c99f1ed..6fdbb0341 100644
--- a/test/functional/issues_controller_test.rb
+++ b/test/functional/issues_controller_test.rb
@@ -217,18 +217,11 @@ class IssuesControllerTest < Test::Unit::TestCase
     assert mail.body.include?("Subject changed from #{old_subject} to #{new_subject}")
   end
   
-  def test_get_update
-    @request.session[:user_id] = 2
-    get :update, :id => 1
-    assert_response :success
-    assert_template 'update'
-  end
-  
-  def test_update_with_status_and_assignee_change
+  def test_post_edit_with_status_and_assignee_change
     issue = Issue.find(1)
     assert_equal 1, issue.status_id
     @request.session[:user_id] = 2
-    post :update,
+    post :edit,
          :id => 1,
          :issue => { :status_id => 2, :assigned_to_id => 3 },
          :notes => 'Assigned to dlopper'
@@ -243,10 +236,10 @@ class IssuesControllerTest < Test::Unit::TestCase
     assert mail.body.include?("Status changed from New to Assigned")
   end
   
-  def test_update_with_note_only
+  def test_post_edit_with_note_only
     notes = 'Note added by IssuesControllerTest#test_update_with_note_only'
     # anonymous user
-    post :update,
+    post :edit,
          :id => 1,
          :notes => notes
     assert_redirected_to 'issues/show/1'
@@ -259,10 +252,10 @@ class IssuesControllerTest < Test::Unit::TestCase
     assert mail.body.include?(notes)
   end
   
-  def test_update_with_note_and_spent_time
+  def test_post_edit_with_note_and_spent_time
     @request.session[:user_id] = 2
     spent_hours_before = Issue.find(1).spent_hours
-    post :update,
+    post :edit,
          :id => 1,
          :notes => '2.5 hours added',
          :time_entry => { :hours => '2.5', :comments => '', :activity_id => Enumeration.get_values('ACTI').first }
@@ -280,9 +273,9 @@ class IssuesControllerTest < Test::Unit::TestCase
     assert_equal spent_hours_before + 2.5, issue.spent_hours
   end
   
-  def test_update_with_attachment_only
+  def test_post_edit_with_attachment_only
     # anonymous user
-    post :update,
+    post :edit,
          :id => 1,
          :notes => '',
          :attachments => [ test_uploaded_file('testfile.txt', 'text/plain') ]
@@ -297,12 +290,12 @@ class IssuesControllerTest < Test::Unit::TestCase
     assert mail.body.include?('testfile.txt')
   end
   
-  def test_update_with_no_change
+  def test_post_edit_with_no_change
     issue = Issue.find(1)
     issue.journals.clear
     ActionMailer::Base.deliveries.clear
     
-    post :update,
+    post :edit,
          :id => 1,
          :notes => ''
     assert_redirected_to 'issues/show/1'
diff --git a/test/integration/issues_test.rb b/test/integration/issues_test.rb
index 7249ed3da..eda4ef676 100644
--- a/test/integration/issues_test.rb
+++ b/test/integration/issues_test.rb
@@ -48,7 +48,7 @@ class IssuesTest < ActionController::IntegrationTest
   def test_issue_attachements
     log_user('jsmith', 'jsmith')
 
-    post 'issues/update/1',
+    post 'issues/edit/1',
          :notes => 'Some notes',
          :attachments => ([] << ActionController::TestUploadedFile.new(Test::Unit::TestCase.fixture_path + '/files/testfile.txt', 'text/plain'))
     assert_redirected_to "issues/show/1"

From 4155c97222cea69406060979efca3ebaaed9dcec Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 10 Feb 2008 13:17:41 +0000
Subject: [PATCH 191/710] Issue list now supports bulk edit/move/delete (#563,
 #607). For now, issues from different projects can not be bulk
 edited/moved/deleted at once.

There are 2 ways to select a set of issues on the issue list:
* by using checkbox and/or the little pencil that will select/unselect all issues (#567)
* by clicking on the rows (but not on the links), Ctrl and Shift keys can be used to select multiple issues

Context menu was disabled on links so that the default context menu of the browser is displayed when right-clicking on a link (#545).
All this was tested with Firefox 2, IE 6/7, Opera 8 (use Alt+Click instead of Right-click) and Safari 2/3.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1130 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/issues_controller.rb          | 142 ++++++++++---
 app/controllers/projects_controller.rb        |  79 +-------
 app/views/issues/_list.rhtml                  |  28 +--
 app/views/issues/_list_simple.rhtml           |  11 +-
 ...{_bulk_edit_form.rhtml => bulk_edit.rhtml} |  23 ++-
 app/views/issues/context_menu.rhtml           |  39 ++--
 app/views/issues/index.rhtml                  |  12 --
 .../move_issues.rhtml => issues/move.rhtml}   |  23 +--
 app/views/issues/show.rhtml                   |   2 +-
 app/views/my/page.rhtml                       |   2 +-
 lang/bg.yml                                   |   1 +
 lang/cs.yml                                   |   1 +
 lang/de.yml                                   |   1 +
 lang/en.yml                                   |   1 +
 lang/es.yml                                   |   1 +
 lang/fi.yml                                   |   1 +
 lang/fr.yml                                   |   1 +
 lang/he.yml                                   |   1 +
 lang/it.yml                                   |   1 +
 lang/ja.yml                                   |   1 +
 lang/ko.yml                                   |   1 +
 lang/lt.yml                                   |   1 +
 lang/nl.yml                                   |   1 +
 lang/pl.yml                                   |   1 +
 lang/pt-br.yml                                |   1 +
 lang/pt.yml                                   |   1 +
 lang/ro.yml                                   |   1 +
 lang/ru.yml                                   |   1 +
 lang/sr.yml                                   |   1 +
 lang/sv.yml                                   |   1 +
 lang/zh-tw.yml                                |   1 +
 lang/zh.yml                                   |   1 +
 lib/redmine.rb                                |   5 +-
 public/javascripts/application.js             |  13 +-
 public/javascripts/context_menu.js            | 186 ++++++++++++++----
 test/functional/issues_controller_test.rb     | 121 +++++++++++-
 test/functional/projects_controller_test.rb   |  26 ---
 37 files changed, 486 insertions(+), 248 deletions(-)
 rename app/views/issues/{_bulk_edit_form.rhtml => bulk_edit.rhtml} (74%)
 rename app/views/{projects/move_issues.rhtml => issues/move.rhtml} (53%)

diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index dbb49405c..85151e905 100644
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -19,13 +19,14 @@ class IssuesController < ApplicationController
   layout 'base'
   menu_item :new_issue, :only => :new
   
-  before_filter :find_issue, :except => [:index, :changes, :preview, :new, :update_form]
+  before_filter :find_issue, :only => [:show, :edit, :destroy_attachment]
+  before_filter :find_issues, :only => [:bulk_edit, :move, :destroy]
   before_filter :find_project, :only => [:new, :update_form]
-  before_filter :authorize, :except => [:index, :changes, :preview, :update_form]
+  before_filter :authorize, :except => [:index, :changes, :preview, :update_form, :context_menu]
   before_filter :find_optional_project, :only => [:index, :changes]
   accept_key_auth :index, :changes
   
-  cache_sweeper :issue_sweeper, :only => [ :new, :edit, :destroy ]
+  cache_sweeper :issue_sweeper, :only => [ :new, :edit, :bulk_edit, :destroy ]
 
   helper :journals
   helper :projects
@@ -152,18 +153,20 @@ class IssuesController < ApplicationController
     @priorities = Enumeration::get_values('IPRI')
     @custom_values = []
     @edit_allowed = User.current.allowed_to?(:edit_issues, @project)
+    
+    @notes = params[:notes]
+    journal = @issue.init_journal(User.current, @notes)
+    # User can change issue attributes only if he has :edit permission or if a workflow transition is allowed
+    if (@edit_allowed || !@allowed_statuses.empty?) && params[:issue]
+      attrs = params[:issue].dup
+      attrs.delete_if {|k,v| !UPDATABLE_ATTRS_ON_TRANSITION.include?(k) } unless @edit_allowed
+      attrs.delete(:status_id) unless @allowed_statuses.detect {|s| s.id.to_s == attrs[:status_id].to_s}
+      @issue.attributes = attrs
+    end
+
     if request.get?
       @custom_values = @project.custom_fields_for_issues(@issue.tracker).collect { |x| @issue.custom_values.find_by_custom_field_id(x.id) || CustomValue.new(:custom_field => x, :customized => @issue) }
     else
-      @notes = params[:notes]
-      journal = @issue.init_journal(User.current, @notes)
-      # User can change issue attributes only if he has :edit permission or if a workflow transition is allowed
-      if (@edit_allowed || !@allowed_statuses.empty?) && params[:issue]
-        attrs = params[:issue].dup
-        attrs.delete_if {|k,v| !UPDATABLE_ATTRS_ON_TRANSITION.include?(k) } unless @edit_allowed
-        attrs.delete(:status_id) unless @allowed_statuses.detect {|s| s.id.to_s == attrs[:status_id].to_s}
-        @issue.attributes = attrs
-      end
       # Update custom fields if user has :edit permission
       if @edit_allowed && params[:custom_fields]
         @custom_values = @project.custom_fields_for_issues(@issue.tracker).collect { |x| CustomValue.new(:custom_field => x, :customized => @issue, :value => params["custom_fields"][x.id.to_s]) }
@@ -191,8 +194,78 @@ class IssuesController < ApplicationController
     flash.now[:error] = l(:notice_locking_conflict)
   end
 
+  # Bulk edit a set of issues
+  def bulk_edit
+    if request.post?
+      status = params[:status_id].blank? ? nil : IssueStatus.find_by_id(params[:status_id])
+      priority = params[:priority_id].blank? ? nil : Enumeration.find_by_id(params[:priority_id])
+      assigned_to = params[:assigned_to_id].blank? ? nil : User.find_by_id(params[:assigned_to_id])
+      category = params[:category_id].blank? ? nil : @project.issue_categories.find_by_id(params[:category_id])
+      fixed_version = params[:fixed_version_id].blank? ? nil : @project.versions.find_by_id(params[:fixed_version_id])
+      
+      unsaved_issue_ids = []      
+      @issues.each do |issue|
+        journal = issue.init_journal(User.current, params[:notes])
+        issue.priority = priority if priority
+        issue.assigned_to = assigned_to if assigned_to || params[:assigned_to_id] == 'none'
+        issue.category = category if category
+        issue.fixed_version = fixed_version if fixed_version
+        issue.start_date = params[:start_date] unless params[:start_date].blank?
+        issue.due_date = params[:due_date] unless params[:due_date].blank?
+        issue.done_ratio = params[:done_ratio] unless params[:done_ratio].blank?
+        # Don't save any change to the issue if the user is not authorized to apply the requested status
+        if (status.nil? || (issue.status.new_status_allowed_to?(status, current_role, issue.tracker) && issue.status = status)) && issue.save
+          # Send notification for each issue (if changed)
+          Mailer.deliver_issue_edit(journal) if journal.details.any? && Setting.notified_events.include?('issue_updated')
+        else
+          # Keep unsaved issue ids to display them in flash error
+          unsaved_issue_ids << issue.id
+        end
+      end
+      if unsaved_issue_ids.empty?
+        flash[:notice] = l(:notice_successful_update) unless @issues.empty?
+      else
+        flash[:error] = l(:notice_failed_to_save_issues, unsaved_issue_ids.size, @issues.size, '#' + unsaved_issue_ids.join(', #'))
+      end
+      redirect_to :controller => 'issues', :action => 'index', :project_id => @project
+      return
+    end
+    # Find potential statuses the user could be allowed to switch issues to
+    @available_statuses = Workflow.find(:all, :include => :new_status,
+                                              :conditions => {:role_id => current_role.id}).collect(&:new_status).compact.uniq
+  end
+
+  def move
+    @allowed_projects = []
+    # find projects to which the user is allowed to move the issue
+    if User.current.admin?
+      # admin is allowed to move issues to any active (visible) project
+      @allowed_projects = Project.find(:all, :conditions => Project.visible_by(User.current), :order => 'name')
+    else
+      User.current.memberships.each {|m| @allowed_projects << m.project if m.role.allowed_to?(:move_issues)}
+    end
+    @target_project = @allowed_projects.detect {|p| p.id.to_s == params[:new_project_id]} if params[:new_project_id]
+    @target_project ||= @project    
+    @trackers = @target_project.trackers
+    if request.post?
+      new_tracker = params[:new_tracker_id].blank? ? nil : @target_project.trackers.find_by_id(params[:new_tracker_id])
+      unsaved_issue_ids = []
+      @issues.each do |issue|
+        unsaved_issue_ids << issue.id unless issue.move_to(@target_project, new_tracker)
+      end
+      if unsaved_issue_ids.empty?
+        flash[:notice] = l(:notice_successful_update) unless @issues.empty?
+      else
+        flash[:error] = l(:notice_failed_to_save_issues, unsaved_issue_ids.size, @issues.size, '#' + unsaved_issue_ids.join(', #'))
+      end
+      redirect_to :controller => 'issues', :action => 'index', :project_id => @project
+      return
+    end
+    render :layout => false if request.xhr?
+  end
+  
   def destroy
-    @issue.destroy
+    @issues.each(&:destroy)
     redirect_to :action => 'index', :project_id => @project
   end
 
@@ -208,17 +281,27 @@ class IssuesController < ApplicationController
   end
   
   def context_menu
+    @issues = Issue.find_all_by_id(params[:ids], :include => :project)
+    if (@issues.size == 1)
+      @issue = @issues.first
+      @allowed_statuses = @issue.new_statuses_allowed_to(User.current)
+      @assignables = @issue.assignable_users
+      @assignables << @issue.assigned_to if @issue.assigned_to && !@assignables.include?(@issue.assigned_to)
+    end
+    projects = @issues.collect(&:project).compact.uniq
+    @project = projects.first if projects.size == 1
+
+    @can = {:edit => (@project && User.current.allowed_to?(:edit_issues, @project)),
+            :update => (@issue && (User.current.allowed_to?(:edit_issues, @project) || (User.current.allowed_to?(:change_status, @project) && !@allowed_statuses.empty?))),
+            :move => (@project && User.current.allowed_to?(:move_issues, @project)),
+            :copy => (@issue && @project.trackers.include?(@issue.tracker) && User.current.allowed_to?(:add_issues, @project)),
+            :delete => (@project && User.current.allowed_to?(:delete_issues, @project))
+            }
+
     @priorities = Enumeration.get_values('IPRI').reverse
     @statuses = IssueStatus.find(:all, :order => 'position')
-    @allowed_statuses = @issue.new_statuses_allowed_to(User.current)
-    @assignables = @issue.assignable_users
-    @assignables << @issue.assigned_to if @issue.assigned_to && !@assignables.include?(@issue.assigned_to)
-    @can = {:edit => User.current.allowed_to?(:edit_issues, @project),
-            :assign => (@allowed_statuses.any? || User.current.allowed_to?(:edit_issues, @project)),
-            :add => User.current.allowed_to?(:add_issues, @project),
-            :move => User.current.allowed_to?(:move_issues, @project),
-            :copy => (@project.trackers.include?(@issue.tracker) && User.current.allowed_to?(:add_issues, @project)),
-            :delete => User.current.allowed_to?(:delete_issues, @project)}
+    @back = request.env['HTTP_REFERER']
+    
     render :layout => false
   end
 
@@ -242,6 +325,21 @@ private
     render_404
   end
   
+  # Filter for bulk operations
+  def find_issues
+    @issues = Issue.find_all_by_id(params[:id] || params[:ids])
+    raise ActiveRecord::RecordNotFound if @issues.empty?
+    projects = @issues.collect(&:project).compact.uniq
+    if projects.size == 1
+      @project = projects.first
+    else
+      # TODO: let users bulk edit/move/destroy issues from different projects
+      render_error 'Can not bulk edit/move/destroy issues from different projects' and return false
+    end
+  rescue ActiveRecord::RecordNotFound
+    render_404
+  end
+  
   def find_project
     @project = Project.find(params[:project_id])
   rescue ActiveRecord::RecordNotFound
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 9560a451f..cddfb6f81 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -22,7 +22,7 @@ class ProjectsController < ApplicationController
   menu_item :roadmap, :only => :roadmap
   menu_item :files, :only => [:list_files, :add_file]
   menu_item :settings, :only => :settings
-  menu_item :issues, :only => [:bulk_edit_issues, :changelog, :move_issues]
+  menu_item :issues, :only => [:changelog]
   
   before_filter :find_project, :except => [ :index, :list, :add ]
   before_filter :authorize, :except => [ :index, :list, :add, :archive, :unarchive, :destroy ]
@@ -182,83 +182,6 @@ class ProjectsController < ApplicationController
   	end
   end
 
-  # Bulk edit issues
-  def bulk_edit_issues
-    if request.post?
-      status = params[:status_id].blank? ? nil : IssueStatus.find_by_id(params[:status_id])
-      priority = params[:priority_id].blank? ? nil : Enumeration.find_by_id(params[:priority_id])
-      assigned_to = params[:assigned_to_id].blank? ? nil : User.find_by_id(params[:assigned_to_id])
-      category = params[:category_id].blank? ? nil : @project.issue_categories.find_by_id(params[:category_id])
-      fixed_version = params[:fixed_version_id].blank? ? nil : @project.versions.find_by_id(params[:fixed_version_id])
-      issues = @project.issues.find_all_by_id(params[:issue_ids])
-      unsaved_issue_ids = []      
-      issues.each do |issue|
-        journal = issue.init_journal(User.current, params[:notes])
-        issue.priority = priority if priority
-        issue.assigned_to = assigned_to if assigned_to || params[:assigned_to_id] == 'none'
-        issue.category = category if category
-        issue.fixed_version = fixed_version if fixed_version
-        issue.start_date = params[:start_date] unless params[:start_date].blank?
-        issue.due_date = params[:due_date] unless params[:due_date].blank?
-        issue.done_ratio = params[:done_ratio] unless params[:done_ratio].blank?
-        # Don't save any change to the issue if the user is not authorized to apply the requested status
-        if (status.nil? || (issue.status.new_status_allowed_to?(status, current_role, issue.tracker) && issue.status = status)) && issue.save
-          # Send notification for each issue (if changed)
-          Mailer.deliver_issue_edit(journal) if journal.details.any? && Setting.notified_events.include?('issue_updated')
-        else
-          # Keep unsaved issue ids to display them in flash error
-          unsaved_issue_ids << issue.id
-        end
-      end
-      if unsaved_issue_ids.empty?
-        flash[:notice] = l(:notice_successful_update) unless issues.empty?
-      else
-        flash[:error] = l(:notice_failed_to_save_issues, unsaved_issue_ids.size, issues.size, '#' + unsaved_issue_ids.join(', #'))
-      end
-      redirect_to :controller => 'issues', :action => 'index', :project_id => @project
-      return
-    end
-    # Find potential statuses the user could be allowed to switch issues to
-    @available_statuses = Workflow.find(:all, :include => :new_status,
-                                              :conditions => {:role_id => current_role.id}).collect(&:new_status).compact.uniq
-    render :update do |page|
-      page.hide 'query_form'
-      page.replace_html  'bulk-edit', :partial => 'issues/bulk_edit_form'
-    end
-  end
-
-  def move_issues
-    @issues = @project.issues.find(params[:issue_ids]) if params[:issue_ids]
-    redirect_to :controller => 'issues', :action => 'index', :project_id => @project and return unless @issues
-    
-    @projects = []
-    # find projects to which the user is allowed to move the issue
-    if User.current.admin?
-      # admin is allowed to move issues to any active (visible) project
-      @projects = Project.find(:all, :conditions => Project.visible_by(User.current), :order => 'name')
-    else
-      User.current.memberships.each {|m| @projects << m.project if m.role.allowed_to?(:move_issues)}
-    end
-    @target_project = @projects.detect {|p| p.id.to_s == params[:new_project_id]} if params[:new_project_id]
-    @target_project ||= @project    
-    @trackers = @target_project.trackers
-    if request.post?
-      new_tracker = params[:new_tracker_id].blank? ? nil : @target_project.trackers.find_by_id(params[:new_tracker_id])
-      unsaved_issue_ids = []
-      @issues.each do |issue|
-        unsaved_issue_ids << issue.id unless issue.move_to(@target_project, new_tracker)
-      end
-      if unsaved_issue_ids.empty?
-        flash[:notice] = l(:notice_successful_update) unless @issues.empty?
-      else
-        flash[:error] = l(:notice_failed_to_save_issues, unsaved_issue_ids.size, @issues.size, '#' + unsaved_issue_ids.join(', #'))
-      end
-      redirect_to :controller => 'issues', :action => 'index', :project_id => @project
-      return
-    end
-    render :layout => false if request.xhr?
-  end
-
   def add_file
     if request.post?
       @version = @project.versions.find_by_id(params[:version_id])
diff --git a/app/views/issues/_list.rhtml b/app/views/issues/_list.rhtml
index ff91f34f7..1f5470200 100644
--- a/app/views/issues/_list.rhtml
+++ b/app/views/issues/_list.rhtml
@@ -1,10 +1,7 @@
-<div id="bulk-edit"></div>
-<table class="list">
+<% form_tag({}) do -%>	
+<table class="list issues">
     <thead><tr>
-        <th><%= link_to_remote(image_tag('edit.png'),
-                               {:url => { :controller => 'projects', :action => 'bulk_edit_issues', :id => @project },
-                                :method => :get},
-                               {:title => l(:label_bulk_edit_selected_issues)}) if @project && User.current.allowed_to?(:edit_issues, @project) %>
+        <th><%= link_to image_tag('edit.png'), {}, :onclick => 'toggleIssuesSelection(this.up("form")); return false;' %>
         </th>
 		<%= sort_header_tag("#{Issue.table_name}.id", :caption => '#', :default_order => 'desc') %>
         <% query.columns.each do |column| %>
@@ -12,14 +9,21 @@
         <% end %>
 	</tr></thead>
 	<tbody>
-	<% issues.each do |issue| %>
+	<% issues.each do |issue| -%>
 	<tr id="issue-<%= issue.id %>" class="issue hascontextmenu <%= cycle('odd', 'even') %> <%= "status-#{issue.status.position} priority-#{issue.priority.position}" %>">
-	    <td class="checkbox"><%= check_box_tag("issue_ids[]", issue.id, false, :id => "issue_#{issue.id}", :disabled => (!@project || @project != issue.project)) %></td>
+	    <td class="checkbox"><%= check_box_tag("ids[]", issue.id, false) %></td>
 		<td><%= link_to issue.id, :controller => 'issues', :action => 'show', :id => issue %></td>
-        <% query.columns.each do |column| %>
-          <%= content_tag 'td', column_content(column, issue), :class => column.name %>
-        <% end %>
+        <% query.columns.each do |column| %><%= content_tag 'td', column_content(column, issue), :class => column.name %><% end %>
 	</tr>
-	<% end %>
+	<% end -%>
 	</tbody>
 </table>
+<% end -%>
+
+<% content_for :header_tags do -%>
+    <%= javascript_include_tag 'context_menu' %>
+    <%= stylesheet_link_tag 'context_menu' %>
+<% end -%>
+
+<div id="context-menu" style="display: none;"></div>
+<%= javascript_tag "new ContextMenu('#{url_for(:controller => 'issues', :action => 'context_menu')}')" %>
diff --git a/app/views/issues/_list_simple.rhtml b/app/views/issues/_list_simple.rhtml
index eb93f8ea1..8900b7359 100644
--- a/app/views/issues/_list_simple.rhtml
+++ b/app/views/issues/_list_simple.rhtml
@@ -1,5 +1,6 @@
-<% if issues.length > 0 %>
-	<table class="list">		
+<% if issues && issues.any? %>
+<% form_tag({}) do %>
+	<table class="list issues">		
 		<thead><tr>
 		<th>#</th>
 		<th><%=l(:field_tracker)%></th>
@@ -9,6 +10,7 @@
 		<% for issue in issues %>
 		<tr id="issue-<%= issue.id %>" class="issue hascontextmenu <%= cycle('odd', 'even') %> <%= "status-#{issue.status.position} priority-#{issue.priority.position}" %>">
 			<td class="id">
+			    <%= check_box_tag("ids[]", issue.id, false, :style => 'display:none;') %>
 				<%= link_to issue.id, :controller => 'issues', :action => 'show', :id => issue %>
 			</td>
 			<td><%=h issue.project.name %> - <%= issue.tracker.name %><br />
@@ -20,6 +22,7 @@
 		<% end %>
 		</tbody>
 	</table>
+<% end %>
 <% else %>
-	<i><%=l(:label_no_data)%></i>
-<% end %>
\ No newline at end of file
+	<p class="nodata"><%= l(:label_no_data) %></p>
+<% end %>
diff --git a/app/views/issues/_bulk_edit_form.rhtml b/app/views/issues/bulk_edit.rhtml
similarity index 74%
rename from app/views/issues/_bulk_edit_form.rhtml
rename to app/views/issues/bulk_edit.rhtml
index e9e1cef86..d19262271 100644
--- a/app/views/issues/_bulk_edit_form.rhtml
+++ b/app/views/issues/bulk_edit.rhtml
@@ -1,6 +1,12 @@
-<div id="bulk-edit-fields">
-<fieldset class="box"><legend><%= l(:label_bulk_edit_selected_issues) %></legend>
+<h2><%= l(:label_bulk_edit_selected_issues) %></h2>
 
+<ul><%= @issues.collect {|i| content_tag('li', link_to(h("#{i.tracker} ##{i.id}"), { :action => 'show', :id => i }) + h(": #{i.subject}")) }.join("\n") %></ul>
+
+<% form_tag() do %>
+<%= @issues.collect {|i| hidden_field_tag('ids[]', i.id)}.join %>
+<div class="box">
+<fieldset>
+<legend><%= l(:label_change_properties) %></legend>
 <p>
 <% if @available_statuses.any? %>
 <label><%= l(:field_status) %>: 
@@ -28,11 +34,12 @@
 <label><%= l(:field_done_ratio) %>: 
 <%= select_tag 'done_ratio', options_for_select([[l(:label_no_change_option), '']] + (0..10).to_a.collect {|r| ["#{r*10} %", r*10] }) %></label>
 </p>
-
-<label for="notes"><%= l(:field_notes) %></label><br />
-<%= text_area_tag 'notes', '', :cols => 80, :rows => 5 %>
-
 </fieldset>
-<p><%= submit_tag l(:button_apply) %>
-<%= link_to l(:button_cancel), {}, :onclick => 'Element.hide("bulk-edit-fields"); if ($("query_form")) {Element.show("query_form")}; return false;' %></p>
+
+<fieldset><legend><%= l(:field_notes) %></legend>
+<%= text_area_tag 'notes', @notes, :cols => 60, :rows => 10, :class => 'wiki-edit' %>
+<%= wikitoolbar_for 'notes' %>
 </div>
+
+<p><%= submit_tag l(:button_submit) %>
+<% end %>
diff --git a/app/views/issues/context_menu.rhtml b/app/views/issues/context_menu.rhtml
index 46b177067..b3a03b05d 100644
--- a/app/views/issues/context_menu.rhtml
+++ b/app/views/issues/context_menu.rhtml
@@ -1,40 +1,45 @@
-<% back_to = url_for(:controller => 'issues', :action => 'index', :project_id => @project) %>
 <ul>
+<% if !@issue.nil? -%>
 	<li><%= context_menu_link l(:button_edit), {:controller => 'issues', :action => 'edit', :id => @issue},
 	        :class => 'icon-edit', :disabled => !@can[:edit] %></li>
 	<li class="folder">			
 		<a href="#" class="submenu" onclick="return false;"><%= l(:field_status) %></a>
 		<ul>
-		<% @statuses.each do |s| %>
+		<% @statuses.each do |s| -%>
 		    <li><%= context_menu_link s.name, {:controller => 'issues', :action => 'edit', :id => @issue, :issue => {:status_id => s}},
-		                              :selected => (s == @issue.status), :disabled => !(@allowed_statuses.include?(s)) %></li>
-		<% end %>
+		                              :selected => (s == @issue.status), :disabled => !(@can[:update] && @allowed_statuses.include?(s)) %></li>
+		<% end -%>
 		</ul>
 	</li>
 	<li class="folder">			
 		<a href="#" class="submenu"><%= l(:field_priority) %></a>
 		<ul>
-		<% @priorities.each do |p| %>
-		    <li><%= context_menu_link p.name, {:controller => 'issues', :action => 'edit', :id => @issue, 'issue[priority_id]' => p, :back_to => back_to}, :method => :post,
+		<% @priorities.each do |p| -%>
+		    <li><%= context_menu_link p.name, {:controller => 'issues', :action => 'edit', :id => @issue, 'issue[priority_id]' => p, :back_to => @back}, :method => :post,
 		                              :selected => (p == @issue.priority), :disabled => !@can[:edit] %></li>
-		<% end %>
+		<% end -%>
 		</ul>
 	</li>
 	<li class="folder">			
 		<a href="#" class="submenu"><%= l(:field_assigned_to) %></a>
 		<ul>
-		<% @assignables.each do |u| %>
-		    <li><%= context_menu_link u.name, {:controller => 'issues', :action => 'edit', :id => @issue, :issue => {:assigned_to_id => u}, :back_to => back_to}, :method => :post,
-		                              :selected => (u == @issue.assigned_to), :disabled => !@can[:assign] %></li>
-		<% end %>
-		    <li><%= context_menu_link l(:label_nobody), {:controller => 'issues', :action => 'edit', :id => @issue, :issue => {:assigned_to_id => nil}, :back_to => back_to}, :method => :post,
-		                              :selected => @issue.assigned_to.nil?, :disabled => !@can[:assign] %></li>
+		<% @assignables.each do |u| -%>
+		    <li><%= context_menu_link u.name, {:controller => 'issues', :action => 'edit', :id => @issue, 'issue[assigned_to_id]' => u, :back_to => @back}, :method => :post,
+		                              :selected => (u == @issue.assigned_to), :disabled => !@can[:update] %></li>
+		<% end -%>
+		    <li><%= context_menu_link l(:label_nobody), {:controller => 'issues', :action => 'edit', :id => @issue, 'issue[assigned_to_id]' => '', :back_to => @back}, :method => :post,
+		                              :selected => @issue.assigned_to.nil?, :disabled => !@can[:update] %></li>
 		</ul>
 	</li>
 	<li><%= context_menu_link l(:button_copy), {:controller => 'issues', :action => 'new', :project_id => @project, :copy_from => @issue},
 	        :class => 'icon-copy', :disabled => !@can[:copy] %></li>
-	<li><%= context_menu_link l(:button_move), {:controller => 'projects', :action => 'move_issues', :id => @project, "issue_ids[]" => @issue.id },
-	                          :class => 'icon-move', :disabled => !@can[:move]  %>
-    <li><%= context_menu_link l(:button_delete), {:controller => 'issues', :action => 'destroy', :id => @issue},
-                              :method => :post, :confirm => l(:text_are_you_sure), :class => 'icon-del', :disabled => !@can[:delete] %></li>		
+<% else -%>
+	<li><%= context_menu_link l(:button_edit), {:controller => 'issues', :action => 'bulk_edit', :ids => @issues.collect(&:id)},
+	        :class => 'icon-edit', :disabled => !@can[:edit] %></li>
+<% end -%>
+  
+  <li><%= context_menu_link l(:button_move), {:controller => 'issues', :action => 'move', :ids => @issues.collect(&:id)},
+	                        :class => 'icon-move', :disabled => !@can[:move]  %></li>
+  <li><%= context_menu_link l(:button_delete), {:controller => 'issues', :action => 'destroy', :ids => @issues.collect(&:id)},
+                            :method => :post, :confirm => l(:text_issues_destroy_confirmation), :class => 'icon-del', :disabled => !@can[:delete] %></li>
 </ul>
diff --git a/app/views/issues/index.rhtml b/app/views/issues/index.rhtml
index 48697c505..c5f26dfb6 100644
--- a/app/views/issues/index.rhtml
+++ b/app/views/issues/index.rhtml
@@ -31,7 +31,6 @@
     <%= link_to l(:button_delete), {:controller => 'queries', :action => 'destroy', :id => @query}, :confirm => l(:text_are_you_sure), :method => :post, :class => 'icon icon-del' %>
     <% end %>
     </div>
-    
     <h2><%=h @query.name %></h2>
     <div id="query_form"></div>
     <% html_title @query.name %>
@@ -41,7 +40,6 @@
 <% if @issues.empty? %>
 <p class="nodata"><%= l(:label_no_data) %></p>
 <% else %>
-<% form_tag({:controller => 'projects', :action => 'bulk_edit_issues', :id => @project}, :id => 'issues_form', :onsubmit => "if (!checkBulkEdit(this)) {alert('#{l(:notice_no_issue_selected)}'); return false;}" ) do %>	
 <%= render :partial => 'issues/list', :locals => {:issues => @issues, :query => @query} %>
 <div class="contextual">
 <%= l(:label_export_to) %>
@@ -51,7 +49,6 @@
 <p class="pagination"><%= pagination_links_full @issue_pages, @issue_count %></p>
 <% end %>
 <% end %>
-<% end %>
 
 <% content_for :sidebar do %>
     <%= render :partial => 'issues/sidebar' %>
@@ -60,13 +57,4 @@
 <% content_for :header_tags do %>
     <%= auto_discovery_link_tag(:atom, {:query_id => @query, :format => 'atom', :page => nil, :key => User.current.rss_key}, :title => l(:label_issue_plural)) %>
     <%= auto_discovery_link_tag(:atom, {:action => 'changes', :query_id => @query, :format => 'atom', :page => nil, :key => User.current.rss_key}, :title => l(:label_changes_details)) %>
-    <%= javascript_include_tag 'calendar/calendar' %>
-    <%= javascript_include_tag "calendar/lang/calendar-#{current_language}.js" %>
-    <%= javascript_include_tag 'calendar/calendar-setup' %>
-    <%= stylesheet_link_tag 'calendar' %>
-    <%= javascript_include_tag 'context_menu' %>
-    <%= stylesheet_link_tag 'context_menu' %>
 <% end %>
-
-<div id="context-menu" style="display: none;"></div>
-<%= javascript_tag 'new ContextMenu({})' %>
diff --git a/app/views/projects/move_issues.rhtml b/app/views/issues/move.rhtml
similarity index 53%
rename from app/views/projects/move_issues.rhtml
rename to app/views/issues/move.rhtml
index 95eaf9dec..c74270f1a 100644
--- a/app/views/projects/move_issues.rhtml
+++ b/app/views/issues/move.rhtml
@@ -1,23 +1,15 @@
-<h2><%=l(:button_move)%></h2>
+<h2><%= l(:button_move) %></h2>
 
+<ul><%= @issues.collect {|i| content_tag('li', link_to(h("#{i.tracker} ##{i.id}"), { :action => 'show', :id => i }) + h(": #{i.subject}")) }.join("\n") %></ul>
 
-<% form_tag({:action => 'move_issues', :id => @project}, :class => 'tabular', :id => 'move_form') do %>
+<% form_tag({}, :id => 'move_form') do %>
+<%= @issues.collect {|i| hidden_field_tag('ids[]', i.id)}.join %>
 
-<div class="box">
-<p><label><%= l(:label_issue_plural) %> :</label>
-<% for issue in @issues %>
-    <%= link_to_issue issue %>: <%=h issue.subject %>
-    <%= hidden_field_tag "issue_ids[]", issue.id %><br />
-<% end %>
-<i>(<%= @issues.length%> <%= lwr(:label_issue, @issues.length)%>)</i></p>
-
-&nbsp;
-
-<!--[form:issue]-->
+<div class="box tabular">
 <p><label for="new_project_id"><%=l(:field_project)%> :</label>
 <%= select_tag "new_project_id",
-               options_from_collection_for_select(@projects, 'id', 'name', @target_project.id),
-               :onchange => remote_function(:url => {:action => 'move_issues' , :id => @project},
+               options_from_collection_for_select(@allowed_projects, 'id', 'name', @target_project.id),
+               :onchange => remote_function(:url => {:action => 'move' , :id => @project},
                                             :method => :get,
                                             :update => 'content',
                                             :with => "Form.serialize('move_form')") %></p>
@@ -25,5 +17,6 @@
 <p><label for="new_tracker_id"><%=l(:field_tracker)%> :</label>
 <%= select_tag "new_tracker_id", "<option value=\"\">#{l(:label_no_change_option)}</option>" + options_from_collection_for_select(@trackers, "id", "name") %></p>
 </div>
+
 <%= submit_tag l(:button_move) %>
 <% end %>
diff --git a/app/views/issues/show.rhtml b/app/views/issues/show.rhtml
index a16dc60e0..3392aef83 100644
--- a/app/views/issues/show.rhtml
+++ b/app/views/issues/show.rhtml
@@ -3,7 +3,7 @@
 <%= link_to_if_authorized l(:button_log_time), {:controller => 'timelog', :action => 'edit', :issue_id => @issue}, :class => 'icon icon-time' %>
 <%= watcher_tag(@issue, User.current) %>
 <%= link_to_if_authorized l(:button_copy), {:controller => 'issues', :action => 'new', :project_id => @project, :copy_from => @issue }, :class => 'icon icon-copy' %>
-<%= 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_move), {:controller => 'issues', :action => 'move', :id => @issue }, :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>
 
diff --git a/app/views/my/page.rhtml b/app/views/my/page.rhtml
index 26ee44fcc..4d4c921b6 100644
--- a/app/views/my/page.rhtml
+++ b/app/views/my/page.rhtml
@@ -37,6 +37,6 @@
 <% end %>
 
 <div id="context-menu" style="display: none;"></div>
-<%= javascript_tag 'new ContextMenu({})' %>
+<%= javascript_tag "new ContextMenu('#{url_for(:controller => 'issues', :action => 'context_menu')}')" %>
 
 <% html_title(l(:label_my_page)) -%>
diff --git a/lang/bg.yml b/lang/bg.yml
index bc0e070c0..164d67671 100644
--- a/lang/bg.yml
+++ b/lang/bg.yml
@@ -568,3 +568,4 @@ label_associated_revisions: Асоциирани ревизии
 setting_user_format: Потребителски формат
 text_status_changed_by_changeset: Applied in changeset %s.
 label_more: More
+text_issues_destroy_confirmation: 'Are you sure you want to delete the selected issue(s) ?'
diff --git a/lang/cs.yml b/lang/cs.yml
index 35bda2b6a..86a111cc7 100644
--- a/lang/cs.yml
+++ b/lang/cs.yml
@@ -568,3 +568,4 @@ label_associated_revisions: Associated revisions
 setting_user_format: Users display format
 text_status_changed_by_changeset: Applied in changeset %s.
 label_more: More
+text_issues_destroy_confirmation: 'Are you sure you want to delete the selected issue(s) ?'
diff --git a/lang/de.yml b/lang/de.yml
index fd296b600..c5a6cdf95 100644
--- a/lang/de.yml
+++ b/lang/de.yml
@@ -568,3 +568,4 @@ enumeration_doc_categories: Dokumentenkategorien
 enumeration_activities: Aktivitäten (Zeiterfassung)
 text_status_changed_by_changeset: Applied in changeset %s.
 label_more: More
+text_issues_destroy_confirmation: 'Are you sure you want to delete the selected issue(s) ?'
diff --git a/lang/en.yml b/lang/en.yml
index b86eeef2b..a37be93c7 100644
--- a/lang/en.yml
+++ b/lang/en.yml
@@ -542,6 +542,7 @@ text_user_mail_option: "For unselected projects, you will only receive notificat
 text_no_configuration_data: "Roles, trackers, issue statuses and workflow have not been configured yet.\nIt is highly recommended to load the default configuration. You will be able to modify it once loaded."
 text_load_default_configuration: Load the default configuration
 text_status_changed_by_changeset: Applied in changeset %s.
+text_issues_destroy_confirmation: 'Are you sure you want to delete the selected issue(s) ?'
 
 default_role_manager: Manager
 default_role_developper: Developer
diff --git a/lang/es.yml b/lang/es.yml
index 60e4a4d13..1bc7d00fb 100644
--- a/lang/es.yml
+++ b/lang/es.yml
@@ -571,3 +571,4 @@ label_associated_revisions: Associated revisions
 setting_user_format: Users display format
 text_status_changed_by_changeset: Applied in changeset %s.
 label_more: More
+text_issues_destroy_confirmation: 'Are you sure you want to delete the selected issue(s) ?'
diff --git a/lang/fi.yml b/lang/fi.yml
index 38cf19a46..7a8848302 100644
--- a/lang/fi.yml
+++ b/lang/fi.yml
@@ -572,3 +572,4 @@ label_associated_revisions: Liittyvät versiot
 setting_user_format: Users display format
 text_status_changed_by_changeset: Applied in changeset %s.
 label_more: More
+text_issues_destroy_confirmation: 'Are you sure you want to delete the selected issue(s) ?'
diff --git a/lang/fr.yml b/lang/fr.yml
index e428935af..8c569fc5a 100644
--- a/lang/fr.yml
+++ b/lang/fr.yml
@@ -543,6 +543,7 @@ text_user_mail_option: "Pour les projets non sélectionnés, vous recevrez seule
 text_no_configuration_data: "Les rôles, trackers, statuts et le workflow ne sont pas encore paramétrés.\nIl est vivement recommandé de charger le paramétrage par defaut. Vous pourrez le modifier une fois chargé."
 text_load_default_configuration: Charger le paramétrage par défaut
 text_status_changed_by_changeset: Appliqué par commit %s.
+text_issues_destroy_confirmation: 'Etes-vous sûr de vouloir supprimer le(s) demandes(s) selectionnée(s) ?'
 
 default_role_manager: Manager
 default_role_developper: Développeur
diff --git a/lang/he.yml b/lang/he.yml
index ca577558a..6631a457f 100644
--- a/lang/he.yml
+++ b/lang/he.yml
@@ -568,3 +568,4 @@ label_associated_revisions: Associated revisions
 setting_user_format: Users display format
 text_status_changed_by_changeset: Applied in changeset %s.
 label_more: More
+text_issues_destroy_confirmation: 'Are you sure you want to delete the selected issue(s) ?'
diff --git a/lang/it.yml b/lang/it.yml
index f227c6942..3c77c97a6 100644
--- a/lang/it.yml
+++ b/lang/it.yml
@@ -568,3 +568,4 @@ label_associated_revisions: Associated revisions
 setting_user_format: Users display format
 text_status_changed_by_changeset: Applied in changeset %s.
 label_more: More
+text_issues_destroy_confirmation: 'Are you sure you want to delete the selected issue(s) ?'
diff --git a/lang/ja.yml b/lang/ja.yml
index 92b79b6ef..50d23e80f 100644
--- a/lang/ja.yml
+++ b/lang/ja.yml
@@ -569,3 +569,4 @@ label_associated_revisions: Associated revisions
 setting_user_format: Users display format
 text_status_changed_by_changeset: Applied in changeset %s.
 label_more: More
+text_issues_destroy_confirmation: 'Are you sure you want to delete the selected issue(s) ?'
diff --git a/lang/ko.yml b/lang/ko.yml
index 097d74788..62ec95ef3 100644
--- a/lang/ko.yml
+++ b/lang/ko.yml
@@ -568,3 +568,4 @@ label_associated_revisions: Associated revisions
 setting_user_format: Users display format
 text_status_changed_by_changeset: Applied in changeset %s.
 label_more: More
+text_issues_destroy_confirmation: 'Are you sure you want to delete the selected issue(s) ?'
diff --git a/lang/lt.yml b/lang/lt.yml
index 3106bd764..a7b12736a 100644
--- a/lang/lt.yml
+++ b/lang/lt.yml
@@ -569,3 +569,4 @@ label_associated_revisions: susijusios revizijos
 setting_user_format: Vartotojo atvaizdavimo formatas
 text_status_changed_by_changeset: Applied in changeset %s.
 label_more: More
+text_issues_destroy_confirmation: 'Are you sure you want to delete the selected issue(s) ?'
diff --git a/lang/nl.yml b/lang/nl.yml
index 1c76180be..7b5f6bf3a 100644
--- a/lang/nl.yml
+++ b/lang/nl.yml
@@ -569,3 +569,4 @@ label_associated_revisions: Associated revisions
 setting_user_format: Users display format
 text_status_changed_by_changeset: Applied in changeset %s.
 label_more: More
+text_issues_destroy_confirmation: 'Are you sure you want to delete the selected issue(s) ?'
diff --git a/lang/pl.yml b/lang/pl.yml
index 3ebce3e92..5c12c658f 100644
--- a/lang/pl.yml
+++ b/lang/pl.yml
@@ -568,3 +568,4 @@ label_associated_revisions: Associated revisions
 setting_user_format: Users display format
 text_status_changed_by_changeset: Applied in changeset %s.
 label_more: More
+text_issues_destroy_confirmation: 'Are you sure you want to delete the selected issue(s) ?'
diff --git a/lang/pt-br.yml b/lang/pt-br.yml
index 688ce0cfd..4616e83a7 100644
--- a/lang/pt-br.yml
+++ b/lang/pt-br.yml
@@ -568,3 +568,4 @@ label_associated_revisions: Associated revisions
 setting_user_format: Users display format
 text_status_changed_by_changeset: Applied in changeset %s.
 label_more: More
+text_issues_destroy_confirmation: 'Are you sure you want to delete the selected issue(s) ?'
diff --git a/lang/pt.yml b/lang/pt.yml
index 4734c66fc..31df179f2 100644
--- a/lang/pt.yml
+++ b/lang/pt.yml
@@ -568,3 +568,4 @@ label_associated_revisions: Associated revisions
 setting_user_format: Users display format
 text_status_changed_by_changeset: Applied in changeset %s.
 label_more: More
+text_issues_destroy_confirmation: 'Are you sure you want to delete the selected issue(s) ?'
diff --git a/lang/ro.yml b/lang/ro.yml
index be566b959..52e856683 100644
--- a/lang/ro.yml
+++ b/lang/ro.yml
@@ -568,3 +568,4 @@ label_associated_revisions: Associated revisions
 setting_user_format: Users display format
 text_status_changed_by_changeset: Applied in changeset %s.
 label_more: More
+text_issues_destroy_confirmation: 'Are you sure you want to delete the selected issue(s) ?'
diff --git a/lang/ru.yml b/lang/ru.yml
index 6921169ce..c720dfb72 100644
--- a/lang/ru.yml
+++ b/lang/ru.yml
@@ -569,3 +569,4 @@ enumeration_doc_categories: Категории документов
 enumeration_activities: Действия (учет времени)
 text_status_changed_by_changeset: Applied in changeset %s.
 label_more: More
+text_issues_destroy_confirmation: 'Are you sure you want to delete the selected issue(s) ?'
diff --git a/lang/sr.yml b/lang/sr.yml
index ddf84a5d3..c32394dc3 100644
--- a/lang/sr.yml
+++ b/lang/sr.yml
@@ -569,3 +569,4 @@ label_associated_revisions: Associated revisions
 setting_user_format: Users display format
 text_status_changed_by_changeset: Applied in changeset %s.
 label_more: More
+text_issues_destroy_confirmation: 'Are you sure you want to delete the selected issue(s) ?'
diff --git a/lang/sv.yml b/lang/sv.yml
index 4bec394ce..40a1ce8f6 100644
--- a/lang/sv.yml
+++ b/lang/sv.yml
@@ -569,3 +569,4 @@ label_associated_revisions: Associated revisions
 setting_user_format: Users display format
 text_status_changed_by_changeset: Applied in changeset %s.
 label_more: More
+text_issues_destroy_confirmation: 'Are you sure you want to delete the selected issue(s) ?'
diff --git a/lang/zh-tw.yml b/lang/zh-tw.yml
index 50a6384f2..601f5c2ec 100644
--- a/lang/zh-tw.yml
+++ b/lang/zh-tw.yml
@@ -568,3 +568,4 @@ enumeration_doc_categories: 文件分類
 enumeration_activities: 活動 (time tracking)
 text_status_changed_by_changeset: Applied in changeset %s.
 label_more: More
+text_issues_destroy_confirmation: 'Are you sure you want to delete the selected issue(s) ?'
diff --git a/lang/zh.yml b/lang/zh.yml
index dc431f5c0..fd513a96a 100644
--- a/lang/zh.yml
+++ b/lang/zh.yml
@@ -571,3 +571,4 @@ label_associated_revisions: 相关的版本
 setting_user_format: 用户显示格式
 text_status_changed_by_changeset: Applied in changeset %s.
 label_more: More
+text_issues_destroy_confirmation: 'Are you sure you want to delete the selected issue(s) ?'
diff --git a/lib/redmine.rb b/lib/redmine.rb
index 69151012b..9bec55409 100644
--- a/lib/redmine.rb
+++ b/lib/redmine.rb
@@ -31,11 +31,10 @@ Redmine::AccessControl.map do |map|
                                   :queries => :index,
                                   :reports => :issue_report}, :public => true                    
     map.permission :add_issues, {:issues => :new}
-    map.permission :edit_issues, {:projects => :bulk_edit_issues,
-                                  :issues => [:edit, :destroy_attachment]}
+    map.permission :edit_issues, {:issues => [:edit, :bulk_edit, :destroy_attachment]}
     map.permission :manage_issue_relations, {:issue_relations => [:new, :destroy]}
     map.permission :add_issue_notes, {:issues => :edit}
-    map.permission :move_issues, {:projects => :move_issues}, :require => :loggedin
+    map.permission :move_issues, {:issues => :move}, :require => :loggedin
     map.permission :delete_issues, {:issues => :destroy}, :require => :member
     # Queries
     map.permission :manage_public_queries, {:queries => [:new, :edit, :destroy]}, :require => :member
diff --git a/public/javascripts/application.js b/public/javascripts/application.js
index 5ad04e91d..d77362a06 100644
--- a/public/javascripts/application.js
+++ b/public/javascripts/application.js
@@ -1,3 +1,6 @@
+/* redMine - project management software
+   Copyright (C) 2006-2008  Jean-Philippe Lang */
+
 function checkAll (id, checked) {
 	var el = document.getElementById(id);
 	for (var i = 0; i < el.elements.length; i++) {
@@ -49,16 +52,6 @@ function promptToRemote(text, param, url) {
     }
 }
 
-/* checks that at least one checkbox is checked (used when submitting bulk edit form) */
-function checkBulkEdit(form) {
-	for (var i = 0; i < form.elements.length; i++) {
-        if (form.elements[i].checked) {
-            return true;
-        }
-    }
-    return false;
-}
-
 function collapseScmEntry(id) {
     var els = document.getElementsByClassName(id, 'browser');
 	for (var i = 0; i < els.length; i++) {
diff --git a/public/javascripts/context_menu.js b/public/javascripts/context_menu.js
index 11754cde8..e3f128d89 100644
--- a/public/javascripts/context_menu.js
+++ b/public/javascripts/context_menu.js
@@ -1,47 +1,161 @@
+/* redMine - project management software
+   Copyright (C) 2006-2008  Jean-Philippe Lang */
+
+var observingContextMenuClick;
+
 ContextMenu = Class.create();
 ContextMenu.prototype = {
-	initialize: function (options) {
-		this.options = Object.extend({selector: '.hascontextmenu'}, options || { });
-		
-		Event.observe(document, 'click', function(e){
-		    var t = Event.findElement(e, 'a');
-		    if ((t != document) && (Element.hasClassName(t, 'disabled') || Element.hasClassName(t, 'submenu'))) {
-                Event.stop(e);
-		    } else {
-       			$('context-menu').hide();
-    			if (this.selection) {
-                    this.selection.removeClassName('context-menu-selection');
-    			}
-			}
-			
-		}.bind(this));
-		
-		$$(this.options.selector).invoke('observe', (window.opera ? 'click' : 'contextmenu'), function(e){
-			if (window.opera && !e.ctrlKey) {
-				return;
-			}
-			this.show(e);
-		}.bind(this));
-		
+	initialize: function (url) {
+	this.url = url;
+
+	// prevent selection when using Ctrl/Shit key
+	var tables = $$('table.issues');
+	for (i=0; i<tables.length; i++) {
+		tables[i].onselectstart = function () { return false; } // ie
+		tables[i].onmousedown = function () { return false; } // mozilla
+	}
+
+	if (!observingContextMenuClick) {
+		Event.observe(document, 'click', this.Click.bindAsEventListener(this));
+		Event.observe(document, (window.opera ? 'click' : 'contextmenu'), this.RightClick.bindAsEventListener(this));
+		observingContextMenuClick = true;
+	}
+	
+	this.unselectAll();
+	this.lastSelected = null;
 	},
-	show: function(e) {
+  
+	RightClick: function(e) {
+		this.hideMenu();
+		// do not show the context menu on links
+		if (Event.findElement(e, 'a') != document) { return; }
+		// right-click simulated by Alt+Click with Opera
+		if (window.opera && !e.altKey) { return; }
+		var tr = Event.findElement(e, 'tr');
+		if ((tr == document) || !tr.hasClassName('hascontextmenu')) { return; }
 		Event.stop(e);
-		Element.hide('context-menu');
-		if (this.selection) {
-		 this.selection.removeClassName('context-menu-selection');
+		if (!this.isSelected(tr)) {
+			this.unselectAll();
+			this.addSelection(tr);
+			this.lastSelected = tr;
 		}
+		this.showMenu(e);
+	},
+
+  Click: function(e) {
+  	this.hideMenu();
+  	if (Event.findElement(e, 'a') != document) { return; }
+    if (window.opera && e.altKey) {	return; }
+    if (Event.isLeftClick(e) || (navigator.appVersion.match(/\bMSIE\b/))) {      
+      var tr = Event.findElement(e, 'tr');
+      if (tr!=document && tr.hasClassName('hascontextmenu')) {
+        // a row was clicked, check if the click was on checkbox
+        var box = Event.findElement(e, 'input');
+        if (box!=document) {
+          // a checkbox may be clicked
+          if (box.checked) {
+            tr.addClassName('context-menu-selection');
+          } else {
+            tr.removeClassName('context-menu-selection');
+          }
+        } else {
+          if (e.ctrlKey) {
+            this.toggleSelection(tr);
+          } else if (e.shiftKey) {
+            if (this.lastSelected != null) {
+              var toggling = false;
+              var rows = $$('.hascontextmenu');
+              for (i=0; i<rows.length; i++) {
+                if (toggling || rows[i]==tr) {
+                  this.addSelection(rows[i]);
+                }
+                if (rows[i]==tr || rows[i]==this.lastSelected) {
+                  toggling = !toggling;
+                }
+              }
+            } else {
+              this.addSelection(tr);
+            }
+          } else {
+            this.unselectAll();
+            this.addSelection(tr);
+          }
+          this.lastSelected = tr;
+        }
+      } else {
+        // click is outside the rows
+        var t = Event.findElement(e, 'a');
+        if ((t != document) && (Element.hasClassName(t, 'disabled') || Element.hasClassName(t, 'submenu'))) {
+          Event.stop(e);
+        }
+      }
+    }
+  },
+  
+  showMenu: function(e) {
 		$('context-menu').style['left'] = (Event.pointerX(e) + 'px');
 		$('context-menu').style['top'] = (Event.pointerY(e) + 'px');		
 		Element.update('context-menu', '');
+		new Ajax.Updater({success:'context-menu'}, this.url, 
+      {asynchronous:true,
+       evalScripts:true,
+       parameters:Form.serialize(Event.findElement(e, 'form')),
+       onComplete:function(request){
+         Effect.Appear('context-menu', {duration: 0.20});
+         if (window.parseStylesheets) { window.parseStylesheets(); } // IE
+      }})
+  },
+  
+  hideMenu: function() {
+    Element.hide('context-menu');
+  },
+  
+  addSelection: function(tr) {
+    tr.addClassName('context-menu-selection');
+    this.checkSelectionBox(tr, true);
+  },
+  
+  toggleSelection: function(tr) {
+    if (this.isSelected(tr)) {
+      this.removeSelection(tr);
+    } else {
+      this.addSelection(tr);
+    }
+  },
+  
+  removeSelection: function(tr) {
+    tr.removeClassName('context-menu-selection');
+    this.checkSelectionBox(tr, false);
+  },
+  
+  unselectAll: function() {
+    var rows = $$('.hascontextmenu');
+    for (i=0; i<rows.length; i++) {
+      this.removeSelection(rows[i]);
+    }
+  },
+  
+  checkSelectionBox: function(tr, checked) {
+  	var inputs = Element.getElementsBySelector(tr, 'input');
+  	if (inputs.length > 0) { inputs[0].checked = checked; }
+  },
+  
+  isSelected: function(tr) {
+    return Element.hasClassName(tr, 'context-menu-selection');
+  }
+}
 
-		var tr = Event.findElement(e, 'tr');
-		tr.addClassName('context-menu-selection');
-		this.selection = tr;
-		var id = tr.id.substring(6, tr.id.length);
-		/* TODO: do not hard code path */
-		new Ajax.Updater({success:'context-menu'}, '../../issues/context_menu/' + id, {asynchronous:true, evalScripts:true, onComplete:function(request){
-		  Effect.Appear('context-menu', {duration: 0.20});
-		  if (window.parseStylesheets) { window.parseStylesheets(); }
-		}})		
+function toggleIssuesSelection(el) {
+	var boxes = el.getElementsBySelector('input[type=checkbox]');
+	var all_checked = true;
+	for (i = 0; i < boxes.length; i++) { if (boxes[i].checked == false) { all_checked = false; } }
+	for (i = 0; i < boxes.length; i++) {
+		if (all_checked) {
+			boxes[i].checked = false;
+			boxes[i].up('tr').removeClassName('context-menu-selection');
+		} else if (boxes[i].checked == false) {
+			boxes[i].checked = true;
+			boxes[i].up('tr').addClassName('context-menu-selection');
+		}
 	}
 }
diff --git a/test/functional/issues_controller_test.rb b/test/functional/issues_controller_test.rb
index 6fdbb0341..4f28ab224 100644
--- a/test/functional/issues_controller_test.rb
+++ b/test/functional/issues_controller_test.rb
@@ -197,6 +197,28 @@ class IssuesControllerTest < Test::Unit::TestCase
     assert_not_nil assigns(:issue)
     assert_equal Issue.find(1), assigns(:issue)
   end
+  
+  def test_get_edit_with_params
+    @request.session[:user_id] = 2
+    get :edit, :id => 1, :issue => { :status_id => 5, :priority_id => 7 }
+    assert_response :success
+    assert_template 'edit'
+    
+    issue = assigns(:issue)
+    assert_not_nil issue
+    
+    assert_equal 5, issue.status_id
+    assert_tag :select, :attributes => { :name => 'issue[status_id]' },
+                        :child => { :tag => 'option', 
+                                    :content => 'Closed',
+                                    :attributes => { :selected => 'selected' } }
+                                    
+    assert_equal 7, issue.priority_id
+    assert_tag :select, :attributes => { :name => 'issue[priority_id]' },
+                        :child => { :tag => 'option', 
+                                    :content => 'Urgent',
+                                    :attributes => { :selected => 'selected' } }
+  end
 
   def test_post_edit
     @request.session[:user_id] = 2
@@ -305,12 +327,105 @@ class IssuesControllerTest < Test::Unit::TestCase
     # No email should be sent
     assert ActionMailer::Base.deliveries.empty?
   end
-  
-  def test_context_menu
+
+  def test_bulk_edit
     @request.session[:user_id] = 2
-    get :context_menu, :id => 1
+    # update issues priority
+    post :bulk_edit, :ids => [1, 2], :priority_id => 7, :notes => 'Bulk editing', :assigned_to_id => ''
+    assert_response 302
+    # check that the issues were updated
+    assert_equal [7, 7], Issue.find_all_by_id([1, 2]).collect {|i| i.priority.id}
+    assert_equal 'Bulk editing', Issue.find(1).journals.find(:first, :order => 'created_on DESC').notes
+  end
+
+  def test_move_one_issue_to_another_project
+    @request.session[:user_id] = 1
+    post :move, :id => 1, :new_project_id => 2
+    assert_redirected_to 'projects/ecookbook/issues'
+    assert_equal 2, Issue.find(1).project_id
+  end
+
+  def test_bulk_move_to_another_project
+    @request.session[:user_id] = 1
+    post :move, :ids => [1, 2], :new_project_id => 2
+    assert_redirected_to 'projects/ecookbook/issues'
+    # Issues moved to project 2
+    assert_equal 2, Issue.find(1).project_id
+    assert_equal 2, Issue.find(2).project_id
+    # No tracker change
+    assert_equal 1, Issue.find(1).tracker_id
+    assert_equal 2, Issue.find(2).tracker_id
+  end
+ 
+  def test_bulk_move_to_another_tracker
+    @request.session[:user_id] = 1
+    post :move, :ids => [1, 2], :new_tracker_id => 2
+    assert_redirected_to 'projects/ecookbook/issues'
+    assert_equal 2, Issue.find(1).tracker_id
+    assert_equal 2, Issue.find(2).tracker_id
+  end
+  
+  def test_context_menu_one_issue
+    @request.session[:user_id] = 2
+    get :context_menu, :ids => [1]
     assert_response :success
     assert_template 'context_menu'
+    assert_tag :tag => 'a', :content => 'Edit',
+                            :attributes => { :href => '/issues/edit/1',
+                                             :class => 'icon-edit' }
+    assert_tag :tag => 'a', :content => 'Closed',
+                            :attributes => { :href => '/issues/edit/1?issue%5Bstatus_id%5D=5',
+                                             :class => '' }
+    assert_tag :tag => 'a', :content => 'Immediate',
+                            :attributes => { :href => '/issues/edit/1?issue%5Bpriority_id%5D=8',
+                                             :class => '' }
+    assert_tag :tag => 'a', :content => 'Dave Lopper',
+                            :attributes => { :href => '/issues/edit/1?issue%5Bassigned_to_id%5D=3',
+                                             :class => '' }
+    assert_tag :tag => 'a', :content => 'Copy',
+                            :attributes => { :href => '/projects/ecookbook/issues/new?copy_from=1',
+                                             :class => 'icon-copy' }
+    assert_tag :tag => 'a', :content => 'Move',
+                            :attributes => { :href => '/issues/move?ids%5B%5D=1',
+                                             :class => 'icon-move' }
+    assert_tag :tag => 'a', :content => 'Delete',
+                            :attributes => { :href => '/issues/destroy?ids%5B%5D=1',
+                                             :class => 'icon-del' }
+  end
+
+  def test_context_menu_one_issue_by_anonymous
+    get :context_menu, :ids => [1]
+    assert_response :success
+    assert_template 'context_menu'
+    assert_tag :tag => 'a', :content => 'Delete',
+                            :attributes => { :href => '#',
+                                             :class => 'icon-del disabled' }
+  end
+  
+  def test_context_menu_multiple_issues_of_same_project
+    @request.session[:user_id] = 2
+    get :context_menu, :ids => [1, 2]
+    assert_response :success
+    assert_template 'context_menu'
+    assert_tag :tag => 'a', :content => 'Edit',
+                            :attributes => { :href => '/issues/bulk_edit?ids%5B%5D=1&amp;ids%5B%5D=2',
+                                             :class => 'icon-edit' }
+    assert_tag :tag => 'a', :content => 'Move',
+                            :attributes => { :href => '/issues/move?ids%5B%5D=1&amp;ids%5B%5D=2',
+                                             :class => 'icon-move' }
+    assert_tag :tag => 'a', :content => 'Delete',
+                            :attributes => { :href => '/issues/destroy?ids%5B%5D=1&amp;ids%5B%5D=2',
+                                             :class => 'icon-del' }
+  end
+
+  def test_context_menu_multiple_issues_of_different_project
+    @request.session[:user_id] = 2
+    get :context_menu, :ids => [1, 2, 4]
+    assert_response :success
+    assert_template 'context_menu'
+    assert_tag :tag => 'a', :content => 'Delete',
+                            :attributes => { :href => '#',
+                                             :class => 'icon-del disabled' }
   end
   
   def test_destroy
diff --git a/test/functional/projects_controller_test.rb b/test/functional/projects_controller_test.rb
index 71a3e3dfe..92ac6f09a 100644
--- a/test/functional/projects_controller_test.rb
+++ b/test/functional/projects_controller_test.rb
@@ -93,32 +93,6 @@ class ProjectsControllerTest < Test::Unit::TestCase
     assert_nil Project.find_by_id(1)
   end
   
-  def test_bulk_edit_issues
-    @request.session[:user_id] = 2
-    # update issues priority
-    post :bulk_edit_issues, :id => 1, :issue_ids => [1, 2], :priority_id => 7, :notes => 'Bulk editing', :assigned_to_id => ''
-    assert_response 302
-    # check that the issues were updated
-    assert_equal [7, 7], Issue.find_all_by_id([1, 2]).collect {|i| i.priority.id}
-    assert_equal 'Bulk editing', Issue.find(1).journals.find(:first, :order => 'created_on DESC').notes
-  end
-
-  def test_move_issues_to_another_project
-    @request.session[:user_id] = 1
-    post :move_issues, :id => 1, :issue_ids => [1, 2], :new_project_id => 2
-    assert_redirected_to 'projects/ecookbook/issues'
-    assert_equal 2, Issue.find(1).project_id
-    assert_equal 2, Issue.find(2).project_id
-  end
-  
-  def test_move_issues_to_another_tracker
-    @request.session[:user_id] = 1
-    post :move_issues, :id => 1, :issue_ids => [1, 2], :new_tracker_id => 2
-    assert_redirected_to 'projects/ecookbook/issues'
-    assert_equal 2, Issue.find(1).tracker_id
-    assert_equal 2, Issue.find(2).tracker_id
-  end
-  
   def test_list_files
     get :list_files, :id => 1
     assert_response :success

From 14b3d6d0120549cd7f36c395bedc39272c322f9a Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 10 Feb 2008 14:14:18 +0000
Subject: [PATCH 192/710] Fixed: Anonymous users may not see the issue list
 headers in the correct language.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1131 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/application.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/application.rb b/app/controllers/application.rb
index f4883cf52..a6d881ff3 100644
--- a/app/controllers/application.rb
+++ b/app/controllers/application.rb
@@ -65,7 +65,7 @@ class ApplicationController < ActionController::Base
       elsif request.env['HTTP_ACCEPT_LANGUAGE']
         accept_lang = parse_qvalues(request.env['HTTP_ACCEPT_LANGUAGE']).first.split('-').first
         if accept_lang and !accept_lang.empty? and GLoc.valid_languages.include? accept_lang.to_sym
-          accept_lang
+          User.current.language = accept_lang
         end
       end
     rescue

From d859d38dd9d430f1a1fe330d2c9149a94aa667af Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 10 Feb 2008 14:24:51 +0000
Subject: [PATCH 193/710] =?UTF-8?q?Translation=20updates:=20*=20Finnish=20?=
 =?UTF-8?q?(Antti=20Perki=C3=B6m=C3=A4ki,=20#612)=20*=20Russian=20(Michael?=
 =?UTF-8?q?=20Pirogov,=20#622)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1132 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 lang/fi.yml                                   | 10 +++----
 lang/ru.yml                                   | 10 +++----
 .../jstoolbar/lang/jstoolbar-fi.js            | 26 +++++++++----------
 3 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/lang/fi.yml b/lang/fi.yml
index 7a8848302..dda26242b 100644
--- a/lang/fi.yml
+++ b/lang/fi.yml
@@ -79,7 +79,7 @@ notice_default_data_loaded: Vakio asetusten palautus onnistui.
 
 error_can_t_load_default_data: "Vakio asetuksia ei voitu ladata: %s"
 error_scm_not_found: "Syötettä ja/tai versiota ei löydy säiliöstä."
-error_scm_command_failed: "An error occurred when trying to access the repository: %s"
+error_scm_command_failed: "Säiliöön pääsyssä tapahtui virhe: %s"
 
 mail_subject_lost_password: Sinun Redmine salasanasi
 mail_body_lost_password: 'Vaihtaaksesi Redmine salasanasi, paina seuraavaa linkkiä:'
@@ -533,8 +533,8 @@ text_tracker_no_workflow: Ei työnkulkua määritelty tälle tiketille
 text_unallowed_characters: Kiellettyjä merkkejä
 text_comma_separated: Useat arvot sallittu (pilkku eroteltuna).
 text_issues_ref_in_commit_messages: Liitän ja korjaan ongelmia syötetyssä viestissä
-text_issue_added: Tapahtuma %s on kirjattu by %s.
-text_issue_updated: Tapahtuma %s on päivitetty by %s.
+text_issue_added: Tapahtuma %s on kirjattu.
+text_issue_updated: Tapahtuma %s on päivitetty.
 text_wiki_destroy_confirmation: Oletko varma että haluat poistaa tämän wiki:n ja kaikki sen sisältämän tiedon?
 text_issue_category_destroy_question: Jotkut tapahtumat (%d) ovat nimetty tälle luokalle. Mitä haluat tehdä?
 text_issue_category_destroy_assignments: Poista luokan tehtävät
@@ -569,7 +569,7 @@ enumeration_issue_priorities: Tapahtuman prioriteetit
 enumeration_doc_categories: Dokumentin luokat
 enumeration_activities: Aktiviteetit (ajan seuranta)
 label_associated_revisions: Liittyvät versiot
-setting_user_format: Users display format
+setting_user_format: Käyttäjien esitysmuoto
 text_status_changed_by_changeset: Applied in changeset %s.
-label_more: More
 text_issues_destroy_confirmation: 'Are you sure you want to delete the selected issue(s) ?'
+label_more: More
diff --git a/lang/ru.yml b/lang/ru.yml
index c720dfb72..f4cbb9976 100644
--- a/lang/ru.yml
+++ b/lang/ru.yml
@@ -531,9 +531,9 @@ text_tracker_no_workflow: Для этого трекера последоват
 text_unallowed_characters: Запрещенные символы
 text_comma_separated: Допустимы несколько значений (разделенные запятой).
 text_issues_ref_in_commit_messages: Сопоставление и изменение статуса задач исходя из текста сообщений
-text_issue_added: О вопросе %s был создает отчет (by %s).
-text_issue_updated: Вопрос %s был обновлен (by %s).
-text_wiki_destroy_confirmation: Вы уверены, что хотите удалить данную вики и все содержание? 
+text_issue_added: По задаче %s был создан отчет (%s).
+text_issue_updated: Задача %s была обновлена (%s).
+text_wiki_destroy_confirmation: Вы уверены, что хотите удалить данную вики и все содержимое?
 text_issue_category_destroy_question: Несколько задач (%d) назначено в данную категорию. Что вы хотите предпринять?
 text_issue_category_destroy_assignments: Удалить назначения категории
 text_issue_category_reassign_to: Переназначить задачи для данной категории
@@ -567,6 +567,6 @@ default_activity_development: Разработка
 enumeration_issue_priorities: Приоритеты задач
 enumeration_doc_categories: Категории документов
 enumeration_activities: Действия (учет времени)
-text_status_changed_by_changeset: Applied in changeset %s.
-label_more: More
+text_status_changed_by_changeset: Реализовано в %s редакции.
+label_more: Больше
 text_issues_destroy_confirmation: 'Are you sure you want to delete the selected issue(s) ?'
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-fi.js b/public/javascripts/jstoolbar/lang/jstoolbar-fi.js
index cd36a4b55..357d25951 100644
--- a/public/javascripts/jstoolbar/lang/jstoolbar-fi.js
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-fi.js
@@ -1,14 +1,14 @@
 jsToolBar.strings = {};
-jsToolBar.strings['Strong'] = 'Strong';
-jsToolBar.strings['Italic'] = 'Italic';
-jsToolBar.strings['Underline'] = 'Underline';
-jsToolBar.strings['Deleted'] = 'Deleted';
-jsToolBar.strings['Code'] = 'Inline Code';
-jsToolBar.strings['Heading 1'] = 'Heading 1';
-jsToolBar.strings['Heading 2'] = 'Heading 2';
-jsToolBar.strings['Heading 3'] = 'Heading 3';
-jsToolBar.strings['Unordered list'] = 'Unordered list';
-jsToolBar.strings['Ordered list'] = 'Ordered list';
-jsToolBar.strings['Preformatted text'] = 'Preformatted text';
-jsToolBar.strings['Wiki link'] = 'Link to a Wiki page';
-jsToolBar.strings['Image'] = 'Image';
+jsToolBar.strings['Strong'] = 'Lihavoitu';
+jsToolBar.strings['Italic'] = 'Kursivoitu';
+jsToolBar.strings['Underline'] = 'Alleviivattu';
+jsToolBar.strings['Deleted'] = 'Yliviivattu';
+jsToolBar.strings['Code'] = 'Koodi näkymä';
+jsToolBar.strings['Heading 1'] = 'Otsikko 1';
+jsToolBar.strings['Heading 2'] = 'Otsikko 2';
+jsToolBar.strings['Heading 3'] = 'Otsikko 3';
+jsToolBar.strings['Unordered list'] = 'Järjestämätön lista';
+jsToolBar.strings['Ordered list'] = 'Järjestetty lista';
+jsToolBar.strings['Preformatted text'] = 'Ennaltamuotoiltu teksti';
+jsToolBar.strings['Wiki link'] = 'Linkki Wiki sivulle';
+jsToolBar.strings['Image'] = 'Kuva';

From 913a806f9011ac3d47cd365d1c694660534f52f4 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Mon, 11 Feb 2008 17:59:41 +0000
Subject: [PATCH 194/710] Fixed: context menu not available if the initial
 issue list is empty.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1133 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/issues/_list.rhtml | 8 --------
 app/views/issues/index.rhtml | 5 +++++
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/app/views/issues/_list.rhtml b/app/views/issues/_list.rhtml
index 1f5470200..343f7173d 100644
--- a/app/views/issues/_list.rhtml
+++ b/app/views/issues/_list.rhtml
@@ -19,11 +19,3 @@
 	</tbody>
 </table>
 <% end -%>
-
-<% content_for :header_tags do -%>
-    <%= javascript_include_tag 'context_menu' %>
-    <%= stylesheet_link_tag 'context_menu' %>
-<% end -%>
-
-<div id="context-menu" style="display: none;"></div>
-<%= javascript_tag "new ContextMenu('#{url_for(:controller => 'issues', :action => 'context_menu')}')" %>
diff --git a/app/views/issues/index.rhtml b/app/views/issues/index.rhtml
index c5f26dfb6..4d1f4f176 100644
--- a/app/views/issues/index.rhtml
+++ b/app/views/issues/index.rhtml
@@ -57,4 +57,9 @@
 <% content_for :header_tags do %>
     <%= auto_discovery_link_tag(:atom, {:query_id => @query, :format => 'atom', :page => nil, :key => User.current.rss_key}, :title => l(:label_issue_plural)) %>
     <%= auto_discovery_link_tag(:atom, {:action => 'changes', :query_id => @query, :format => 'atom', :page => nil, :key => User.current.rss_key}, :title => l(:label_changes_details)) %>
+    <%= javascript_include_tag 'context_menu' %>
+    <%= stylesheet_link_tag 'context_menu' %>
 <% end %>
+
+<div id="context-menu" style="display: none;"></div>
+<%= javascript_tag "new ContextMenu('#{url_for(:controller => 'issues', :action => 'context_menu')}')" %>

From 5152771fdd59cee5369ba15c4946fa8a64fefe2a Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Mon, 11 Feb 2008 18:06:38 +0000
Subject: [PATCH 195/710] Fixed: 404 error when selecting an other project on
 issues/move.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1134 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/issues/move.rhtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/issues/move.rhtml b/app/views/issues/move.rhtml
index c74270f1a..35761e160 100644
--- a/app/views/issues/move.rhtml
+++ b/app/views/issues/move.rhtml
@@ -9,7 +9,7 @@
 <p><label for="new_project_id"><%=l(:field_project)%> :</label>
 <%= select_tag "new_project_id",
                options_from_collection_for_select(@allowed_projects, 'id', 'name', @target_project.id),
-               :onchange => remote_function(:url => {:action => 'move' , :id => @project},
+               :onchange => remote_function(:url => { :action => 'move' },
                                             :method => :get,
                                             :update => 'content',
                                             :with => "Form.serialize('move_form')") %></p>

From 15ed53cf17ffa4603e290a3777f56ff97cae7b61 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Mon, 11 Feb 2008 18:08:36 +0000
Subject: [PATCH 196/710] Footer update.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1135 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/layouts/base.rhtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/layouts/base.rhtml b/app/views/layouts/base.rhtml
index 91c3b2634..1f7472006 100644
--- a/app/views/layouts/base.rhtml
+++ b/app/views/layouts/base.rhtml
@@ -68,7 +68,7 @@
 <div id="ajax-indicator" style="display:none;"><span><%= l(:label_loading) %></span></div>
 	
 <div id="footer">
-    Powered by <%= link_to Redmine::Info.app_name, Redmine::Info.url %> <%= Redmine::VERSION %> &copy; 2006-2007 Jean-Philippe Lang
+    Powered by <%= link_to Redmine::Info.app_name, Redmine::Info.url %> <%= Redmine::VERSION %> &copy; 2006-2008 Jean-Philippe Lang
 </div>
 </div>
 </body>

From 93ef8b7f77ec84bef19d7a872a15b8d406cdb46e Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Mon, 11 Feb 2008 20:45:46 +0000
Subject: [PATCH 197/710] Replaced window.hash= by Element.scrollTo()

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1136 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/helpers/application_helper.rb | 2 +-
 app/views/issues/_edit.rhtml      | 2 +-
 app/views/issues/new.rhtml        | 3 +--
 app/views/issues/show.rhtml       | 1 -
 app/views/wiki/edit.rhtml         | 3 +--
 5 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index c8b55a695..791c6d806 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -59,7 +59,7 @@ module ApplicationHelper
   def show_and_goto_link(name, id, options={})
     onclick = "Element.show('#{id}'); "
     onclick << (options[:focus] ? "Form.Element.focus('#{options[:focus]}'); " : "this.blur(); ")
-    onclick << "location.href='##{id}-anchor'; "
+    onclick << "Element.scrollTo('#{id}'); "
     onclick << "return false;"
     link_to(name, "#", options.merge(:onclick => onclick))
   end
diff --git a/app/views/issues/_edit.rhtml b/app/views/issues/_edit.rhtml
index 0f843e855..5bd685e47 100644
--- a/app/views/issues/_edit.rhtml
+++ b/app/views/issues/_edit.rhtml
@@ -32,7 +32,7 @@
                          :method => 'post',
                          :update => 'preview',
                          :with => 'Form.serialize("issue-form")',
-                         :complete => "location.hash='preview'"
+                         :complete => "Element.scrollTo('preview')"
                        }, :accesskey => accesskey(:preview) %>
 <% end %>
 
diff --git a/app/views/issues/new.rhtml b/app/views/issues/new.rhtml
index 1e9e323fe..52c32dbbd 100644
--- a/app/views/issues/new.rhtml
+++ b/app/views/issues/new.rhtml
@@ -12,9 +12,8 @@
                          :method => 'post',
                          :update => 'preview',
                          :with => "Form.serialize('issue-form')",
-                         :complete => "location.href='#preview-top'"
+                         :complete => "Element.scrollTo('preview')"
                        }, :accesskey => accesskey(:preview) %>
 <% end %>
 
-<a name="preview-top"></a>
 <div id="preview" class="wiki"></div>
diff --git a/app/views/issues/show.rhtml b/app/views/issues/show.rhtml
index 3392aef83..e3999bd8e 100644
--- a/app/views/issues/show.rhtml
+++ b/app/views/issues/show.rhtml
@@ -89,7 +89,6 @@ end %>
 <% end %>
 
 <% if authorize_for('issues', 'edit') %>
-  <a name="update-anchor"></a>
   <div id="update" style="display:none;">
   <h3><%= l(:button_update) %></h3>
   <%= render :partial => 'edit' %>
diff --git a/app/views/wiki/edit.rhtml b/app/views/wiki/edit.rhtml
index 10276264f..e5b0687f6 100644
--- a/app/views/wiki/edit.rhtml
+++ b/app/views/wiki/edit.rhtml
@@ -16,12 +16,11 @@
                          :method => 'post',
                          :update => 'preview',
                          :with => "Form.serialize('wiki_form')",
-                         :complete => "location.href='#preview-top'"
+                         :complete => "Element.scrollTo('preview')"
                        }, :accesskey => accesskey(:preview) %></p>
 <%= wikitoolbar_for 'content_text' %>
 <% end %>
 
-<a name="preview-top"></a>
 <div id="preview" class="wiki"></div>
 
 <% content_for :header_tags do %>

From c5d998528fedb6652074c06132cabd9435a4d5be Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Tue, 12 Feb 2008 17:58:46 +0000
Subject: [PATCH 198/710] The following menus can now be extended by plugins:
 top_menu, account_menu, application_menu (empty by default). Sligth layout
 change: links in the top menu are now li elements.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1137 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/helpers/application_helper.rb  |  8 -------
 app/views/layouts/base.rhtml       | 16 +++----------
 config/routes.rb                   |  4 +++-
 lib/redmine.rb                     | 32 ++++++++++++++++++++------
 lib/redmine/menu_manager.rb        | 36 +++++++++++++++++++++---------
 public/stylesheets/application.css | 10 +++++++++
 6 files changed, 66 insertions(+), 40 deletions(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 791c6d806..abe76c797 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -31,14 +31,6 @@ module ApplicationHelper
   def link_to_if_authorized(name, options = {}, html_options = nil, *parameters_for_method_reference)
     link_to(name, options, html_options, *parameters_for_method_reference) if authorize_for(options[:controller] || params[:controller], options[:action])
   end
-  
-  def link_to_signin
-    link_to l(:label_login), { :controller => 'account', :action => 'login' }, :class => 'signin'
-  end
-  
-  def link_to_signout
-    link_to l(:label_logout), { :controller => 'account', :action => 'logout' }, :class => 'logout'
-  end
 
   # Display a link to user's account page
   def link_to_user(user)
diff --git a/app/views/layouts/base.rhtml b/app/views/layouts/base.rhtml
index 1f7472006..820a8e700 100644
--- a/app/views/layouts/base.rhtml
+++ b/app/views/layouts/base.rhtml
@@ -21,20 +21,10 @@
 <div id="wrapper">
 <div id="top-menu">
     <div id="account">
-        <% if User.current.logged? %>
-            <%=l(:label_logged_as)%> <%= User.current.login %> -
-            <%= link_to l(:label_my_account), { :controller => 'my', :action => 'account' }, :class => 'myaccount' %>
-            <%= link_to_signout %>
-        <% else %>
-            <%= link_to_signin %>
-            <%= link_to(l(:label_register), { :controller => 'account',:action => 'register' }, :class => 'register') if Setting.self_registration? %>
-        <% end %>
+        <%= render_menu :account_menu -%>
     </div>
-    <%= link_to l(:label_home), home_url, :class => 'home' %>
-    <%= link_to l(:label_my_page), { :controller => 'my', :action => 'page'}, :class => 'mypage' if User.current.logged? %>
-    <%= link_to l(:label_project_plural), { :controller => 'projects' }, :class => 'projects' %>
-    <%= link_to l(:label_administration), { :controller => 'admin' }, :class => 'admin' if User.current.admin? %>
-    <%= link_to l(:label_help), Redmine::Info.help_url, :class => 'help' %>
+    <%= content_tag('div', "#{l(:label_logged_as)} #{User.current.login}", :id => 'loggedas') if User.current.logged? %>
+    <%= render_menu :top_menu -%>
 </div>
       
 <div id="header">
diff --git a/config/routes.rb b/config/routes.rb
index febb5e247..2610c2623 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -7,7 +7,9 @@ ActionController::Routing::Routes.draw do |map|
   # Keep in mind you can assign values other than :controller and :action
 
   map.home '', :controller => 'welcome'
-
+  map.signin 'login', :controller => 'account', :action => 'login'
+  map.signout 'logout', :controller => 'account', :action => 'logout'
+  
   map.connect 'wiki/:id/:page/:action', :controller => 'wiki', :page => nil
   map.connect 'roles/workflow/:id/:role_id/:tracker_id', :controller => 'roles', :action => 'workflow'
   map.connect 'help/:ctrl/:page', :controller => 'help'
diff --git a/lib/redmine.rb b/lib/redmine.rb
index 9bec55409..b235df32e 100644
--- a/lib/redmine.rb
+++ b/lib/redmine.rb
@@ -88,23 +88,41 @@ Redmine::AccessControl.map do |map|
   end
 end
 
-# Project menu configuration
+Redmine::MenuManager.map :top_menu do |menu|
+  menu.push :home, :home_url, :html => { :class => 'home' }
+  menu.push :my_page, { :controller => 'my', :action => 'page' }, :html => { :class => 'mypage' }, :if => Proc.new { User.current.logged? }
+  menu.push :projects, { :controller => 'projects', :action => 'index' }, :caption => :label_project_plural, :html => { :class => 'projects' }
+  menu.push :administration, { :controller => 'admin', :action => 'index' }, :html => { :class => 'admin' }, :if => Proc.new { User.current.admin? }
+  menu.push :help, Redmine::Info.help_url, :html => { :class => 'help' }
+end
+
+Redmine::MenuManager.map :account_menu do |menu|
+  menu.push :login, :signin_url, :html => { :class => 'login' }, :if => Proc.new { !User.current.logged? }
+  menu.push :register, { :controller => 'account', :action => 'register' }, :html => { :class => 'register' }, :if => Proc.new { !User.current.logged? && Setting.self_registration? }
+  menu.push :my_account, { :controller => 'my', :action => 'account' }, :html => { :class => 'myaccount' }, :if => Proc.new { User.current.logged? }
+  menu.push :logout, :signout_url, :html => { :class => 'logout' }, :if => Proc.new { User.current.logged? }
+end
+
+Redmine::MenuManager.map :application_menu do |menu|
+  # Empty
+end
+
 Redmine::MenuManager.map :project_menu do |menu|
-  menu.push :overview, { :controller => 'projects', :action => 'show' }, :caption => :label_overview
-  menu.push :activity, { :controller => 'projects', :action => 'activity' }, :caption => :label_activity
+  menu.push :overview, { :controller => 'projects', :action => 'show' }
+  menu.push :activity, { :controller => 'projects', :action => 'activity' }
   menu.push :roadmap, { :controller => 'projects', :action => 'roadmap' }, 
-              :if => Proc.new { |p| p.versions.any? }, :caption => :label_roadmap
+              :if => Proc.new { |p| p.versions.any? }
   menu.push :issues, { :controller => 'issues', :action => 'index' }, :param => :project_id, :caption => :label_issue_plural
   menu.push :new_issue, { :controller => 'issues', :action => 'new' }, :param => :project_id, :caption => :label_issue_new,
               :html => { :accesskey => Redmine::AccessKeys.key_for(:new_issue) }
   menu.push :news, { :controller => 'news', :action => 'index' }, :param => :project_id, :caption => :label_news_plural
   menu.push :documents, { :controller => 'documents', :action => 'index' }, :param => :project_id, :caption => :label_document_plural
   menu.push :wiki, { :controller => 'wiki', :action => 'index', :page => nil }, 
-              :if => Proc.new { |p| p.wiki && !p.wiki.new_record? }, :caption => :label_wiki
+              :if => Proc.new { |p| p.wiki && !p.wiki.new_record? }
   menu.push :boards, { :controller => 'boards', :action => 'index', :id => nil }, :param => :project_id,
               :if => Proc.new { |p| p.boards.any? }, :caption => :label_board_plural
   menu.push :files, { :controller => 'projects', :action => 'list_files' }, :caption => :label_attachment_plural
   menu.push :repository, { :controller => 'repositories', :action => 'show' },
-              :if => Proc.new { |p| p.repository && !p.repository.new_record? }, :caption => :label_repository
-  menu.push :settings, { :controller => 'projects', :action => 'settings' }, :caption => :label_settings
+              :if => Proc.new { |p| p.repository && !p.repository.new_record? }
+  menu.push :settings, { :controller => 'projects', :action => 'settings' }
 end
diff --git a/lib/redmine/menu_manager.rb b/lib/redmine/menu_manager.rb
index 379028ebc..3b29912a1 100644
--- a/lib/redmine/menu_manager.rb
+++ b/lib/redmine/menu_manager.rb
@@ -61,16 +61,28 @@ module Redmine
         @controller.current_menu_item
       end
       
-      # Renders the application main menu as a ul element
+      # Renders the application main menu
       def render_main_menu(project)
+        render_menu((project && !project.new_record?) ? :project_menu : :application_menu, project)
+      end
+      
+      def render_menu(menu, project=nil)
         links = []
-        Redmine::MenuManager.allowed_items(:project_menu, User.current, project).each do |item|
+        Redmine::MenuManager.allowed_items(menu, User.current, project).each do |item|
           unless item.condition && !item.condition.call(project)
+            url = case item.url
+            when Hash
+              project.nil? ? item.url : {item.param => project}.merge(item.url)
+            when Symbol
+              send(item.url)
+            else
+              item.url
+            end
+            #url = (project && item.url.is_a?(Hash)) ? {item.param => project}.merge(item.url) : (item.url.is_a?(Symbol) ? send(item.url) : item.url)
             links << content_tag('li', 
-                       link_to(l(item.caption), {item.param => project}.merge(item.url),
-                               (current_menu_item == item.name ? item.html_options.merge(:class => 'selected') : item.html_options)))
+              link_to(l(item.caption), url, (current_menu_item == item.name ? item.html_options.merge(:class => 'selected') : item.html_options)))
           end
-        end if project && !project.new_record?
+        end
         links.empty? ? nil : content_tag('ul', links.join("\n"))
       end
     end
@@ -89,35 +101,37 @@ module Redmine
       end
       
       def allowed_items(menu_name, user, project)
-        items(menu_name).select {|item| user && user.allowed_to?(item.url, project)}
+        project ? items(menu_name).select {|item| user && user.allowed_to?(item.url, project)} : items(menu_name)
       end
     end
     
     class Mapper
       # Adds an item at the end of the menu. Available options:
       # * param: the parameter name that is used for the project id (default is :id)
-      # * condition: a proc that is called before rendering the item, the item is displayed only if it returns true
+      # * if: a proc that is called before rendering the item, the item is displayed only if it returns true
       # * caption: the localized string key that is used as the item label
       # * html_options: a hash of html options that are passed to link_to
       def push(name, url, options={})
-        @items ||= []
-        @items << MenuItem.new(name, url, options)
+        items << MenuItem.new(name, url, options)
       end
       
       def items
-        @items
+        @items ||= []
       end
     end
     
     class MenuItem
+      include GLoc
       attr_reader :name, :url, :param, :condition, :caption, :html_options
       
       def initialize(name, url, options)
+        raise "Invalid option :if for menu item '#{name}'" if options[:if] && !options[:if].respond_to?(:call)
+        raise "Invalid option :html for menu item '#{name}'" if options[:html] && !options[:html].is_a?(Hash)
         @name = name
         @url = url
         @condition = options[:if]
         @param = options[:param] || :id
-        @caption = options[:caption] || name.to_s.humanize
+        @caption = options[:caption] || (l_has_string?("label_#{name}".to_sym) ? "label_#{name}".to_sym : name.to_s.humanize)
         @html_options = options[:html] || {}
       end
     end    
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index b386c3285..bfc66f75e 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -10,7 +10,17 @@ h4, .wiki h3 {font-size: 12px;padding: 2px 10px 1px 0px;margin-bottom: 5px; bord
 #wrapper {background: white;}
 
 #top-menu {background: #2C4056;color: #fff;height:1.5em; padding: 2px 6px 0px 6px;}
+#top-menu ul {margin: 0;  padding: 0;}
+#top-menu li {
+  float:left;
+  list-style-type:none;
+  margin: 0px 0px 0px 0px;
+  padding: 0px 0px 0px 0px;
+  white-space:nowrap;
+}
 #top-menu a {color: #fff; padding-right: 4px;}
+#top-menu #loggedas { float: right; margin-right: 0.5em; color: #fff; }
+
 #account {float:right;}
 
 #header {height:5.3em;margin:0;background-color:#507AAA;color:#f8f8f8; padding: 4px 8px 0px 6px; position:relative;}

From 30a7314b861f1c61d8dbc27d2d57b2146ce57855 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Tue, 12 Feb 2008 18:31:15 +0000
Subject: [PATCH 199/710] Fixed: wiki and changeset links not displayed when
 previewing issue description or notes.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1138 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/issues_controller.rb   | 4 ++--
 app/controllers/journals_controller.rb | 1 +
 app/views/issues/_edit.rhtml           | 2 +-
 app/views/issues/new.rhtml             | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index 85151e905..b0e82d365 100644
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -21,7 +21,7 @@ class IssuesController < ApplicationController
   
   before_filter :find_issue, :only => [:show, :edit, :destroy_attachment]
   before_filter :find_issues, :only => [:bulk_edit, :move, :destroy]
-  before_filter :find_project, :only => [:new, :update_form]
+  before_filter :find_project, :only => [:new, :update_form, :preview]
   before_filter :authorize, :except => [:index, :changes, :preview, :update_form, :context_menu]
   before_filter :find_optional_project, :only => [:index, :changes]
   accept_key_auth :index, :changes
@@ -311,7 +311,7 @@ class IssuesController < ApplicationController
   end
   
   def preview
-    issue = Issue.find_by_id(params[:id])
+    issue = @project.issues.find_by_id(params[:id])
     @attachements = issue.attachments if issue
     @text = params[:notes] || (params[:issue] ? params[:issue][:description] : nil)
     render :partial => 'common/preview'
diff --git a/app/controllers/journals_controller.rb b/app/controllers/journals_controller.rb
index b867b4ae6..05d41fa30 100644
--- a/app/controllers/journals_controller.rb
+++ b/app/controllers/journals_controller.rb
@@ -34,6 +34,7 @@ private
   def find_journal
     @journal = Journal.find(params[:id])
     render_403 and return false unless @journal.editable_by?(User.current)
+    @project = @journal.journalized.project
   rescue ActiveRecord::RecordNotFound
     render_404
   end
diff --git a/app/views/issues/_edit.rhtml b/app/views/issues/_edit.rhtml
index 5bd685e47..7c4cf501c 100644
--- a/app/views/issues/_edit.rhtml
+++ b/app/views/issues/_edit.rhtml
@@ -28,7 +28,7 @@
     <%= f.hidden_field :lock_version %>
     <%= submit_tag l(:button_submit) %>
     <%= link_to_remote l(:label_preview), 
-                       { :url => { :controller => 'issues', :action => 'preview', :id => @issue },
+                       { :url => { :controller => 'issues', :action => 'preview', :project_id => @project, :id => @issue },
                          :method => 'post',
                          :update => 'preview',
                          :with => 'Form.serialize("issue-form")',
diff --git a/app/views/issues/new.rhtml b/app/views/issues/new.rhtml
index 52c32dbbd..7b9dde899 100644
--- a/app/views/issues/new.rhtml
+++ b/app/views/issues/new.rhtml
@@ -8,7 +8,7 @@
     </div>
     <%= submit_tag l(:button_create) %>
     <%= link_to_remote l(:label_preview), 
-                       { :url => { :controller => 'issues', :action => 'preview', :id => @issue },
+                       { :url => { :controller => 'issues', :action => 'preview', :project_id => @project, :id => @issue },
                          :method => 'post',
                          :update => 'preview',
                          :with => "Form.serialize('issue-form')",

From 616899d8793f3001c6d458276bebbd1b9cbe03ab Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Tue, 12 Feb 2008 18:33:38 +0000
Subject: [PATCH 200/710] Fixed: empty status list shouldn't be displayed when
 the user can not change the status.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1139 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/issues/_form.rhtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/issues/_form.rhtml b/app/views/issues/_form.rhtml
index 6a4cd0f5f..20ca666c4 100644
--- a/app/views/issues/_form.rhtml
+++ b/app/views/issues/_form.rhtml
@@ -15,7 +15,7 @@
 </div>
 
 <div class="splitcontentleft">
-<% if @issue.new_record? || @allowed_statuses %>
+<% if @issue.new_record? || @allowed_statuses.any? %>
 <p><%= f.select :status_id, (@allowed_statuses.collect {|p| [p.name, p.id]}), :required => true %></p>
 <% else %>
 <p><label><%= l(:field_status) %></label> <%= @issue.status.name %></p>

From a2626bbccf876fa290d0ee2b3c84168e6eb728da Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Tue, 12 Feb 2008 21:11:16 +0000
Subject: [PATCH 201/710] Fixed: not null constraints not removed with
 Postgresql.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1140 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 db/migrate/048_allow_null_version_effective_date.rb   |  2 +-
 db/migrate/076_allow_null_position.rb                 | 10 +++++-----
 db/migrate/087_change_projects_description_to_text.rb |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/db/migrate/048_allow_null_version_effective_date.rb b/db/migrate/048_allow_null_version_effective_date.rb
index 4b46bfe0e..82d2a33ec 100644
--- a/db/migrate/048_allow_null_version_effective_date.rb
+++ b/db/migrate/048_allow_null_version_effective_date.rb
@@ -1,6 +1,6 @@
 class AllowNullVersionEffectiveDate < ActiveRecord::Migration
   def self.up
-    change_column :versions, :effective_date, :date, :default => nil
+    change_column :versions, :effective_date, :date, :default => nil, :null => true
   end
 
   def self.down
diff --git a/db/migrate/076_allow_null_position.rb b/db/migrate/076_allow_null_position.rb
index 45008d653..ece0370db 100644
--- a/db/migrate/076_allow_null_position.rb
+++ b/db/migrate/076_allow_null_position.rb
@@ -1,11 +1,11 @@
 class AllowNullPosition < ActiveRecord::Migration
   def self.up
     # removes the 'not null' constraint on position fields
-    change_column :issue_statuses, :position, :integer, :default => 1
-    change_column :roles, :position, :integer, :default => 1
-    change_column :trackers, :position, :integer, :default => 1
-    change_column :boards, :position, :integer, :default => 1
-    change_column :enumerations, :position, :integer, :default => 1
+    change_column :issue_statuses, :position, :integer, :default => 1, :null => true
+    change_column :roles, :position, :integer, :default => 1, :null => true
+    change_column :trackers, :position, :integer, :default => 1, :null => true
+    change_column :boards, :position, :integer, :default => 1, :null => true
+    change_column :enumerations, :position, :integer, :default => 1, :null => true
   end
 
   def self.down
diff --git a/db/migrate/087_change_projects_description_to_text.rb b/db/migrate/087_change_projects_description_to_text.rb
index 2829655d1..b06b0aa1c 100644
--- a/db/migrate/087_change_projects_description_to_text.rb
+++ b/db/migrate/087_change_projects_description_to_text.rb
@@ -1,6 +1,6 @@
 class ChangeProjectsDescriptionToText < ActiveRecord::Migration
   def self.up
-    change_column :projects, :description, :text
+    change_column :projects, :description, :text, :null => true
   end
 
   def self.down

From 4dc7f662e3d93f93d8164c1450a9c4a49bc15503 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Tue, 12 Feb 2008 21:43:54 +0000
Subject: [PATCH 202/710] Added issue subject to the time entries view and
 subject + tracker to the csv export (#616). Default order on date column set
 to desc.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1142 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/timelog_controller.rb | 8 ++++++--
 app/views/timelog/details.rhtml       | 6 +++---
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/app/controllers/timelog_controller.rb b/app/controllers/timelog_controller.rb
index 39e6d2fd3..926fe0c6f 100644
--- a/app/controllers/timelog_controller.rb
+++ b/app/controllers/timelog_controller.rb
@@ -151,6 +151,8 @@ private
                  l(:field_user),
                  l(:field_activity),
                  l(:field_issue),
+                 l(:field_tracker),
+                 l(:field_subject),
                  l(:field_hours),
                  l(:field_comments)
                  ]
@@ -158,9 +160,11 @@ private
       # csv lines
       @entries.each do |entry|
         fields = [l_date(entry.spent_on),
-                  entry.user.name,
-                  entry.activity.name,
+                  entry.user,
+                  entry.activity,
                   (entry.issue ? entry.issue.id : nil),
+                  (entry.issue ? entry.issue.tracker : nil),
+                  (entry.issue ? entry.issue.subject : nil),
                   entry.hours,
                   entry.comments
                   ]
diff --git a/app/views/timelog/details.rhtml b/app/views/timelog/details.rhtml
index ac647c3a5..6f119206e 100644
--- a/app/views/timelog/details.rhtml
+++ b/app/views/timelog/details.rhtml
@@ -12,7 +12,7 @@
 <% unless @entries.empty? %>
 <table class="list">
 <thead>
-<%= sort_header_tag('spent_on', :caption => l(:label_date)) %>
+<%= sort_header_tag('spent_on', :caption => l(:label_date), :default_order => 'desc') %>
 <%= sort_header_tag('user_id', :caption => l(:label_member)) %>
 <%= sort_header_tag('activity_id', :caption => l(:label_activity)) %>
 <%= sort_header_tag('issue_id', :caption => l(:label_issue)) %>
@@ -26,10 +26,10 @@
 <td align="center"><%= format_date(entry.spent_on) %></td>
 <td align="center"><%= entry.user.name %></td>
 <td align="center"><%= entry.activity.name %></td>
-<td align="center">
+<td>
     <% if entry.issue %>
     <div class="tooltip">
-    <%= link_to_issue entry.issue %>
+    <%= link_to_issue entry.issue %>: <%= h(truncate(entry.issue.subject, 50)) %>
     <span class="tip">
     <%= render_issue_tooltip entry.issue %>
     </span>		

From 0b6a010a12b976aac210c35af559e112baff8ca2 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Tue, 12 Feb 2008 22:43:37 +0000
Subject: [PATCH 203/710] Translation for various hard-coded strings (#577).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1143 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/helpers/application_helper.rb             |  4 ++++
 app/views/projects/settings/_modules.rhtml    |  2 +-
 app/views/projects/settings/_repository.rhtml |  5 +++--
 app/views/projects/settings/_wiki.rhtml       |  3 ++-
 app/views/settings/_notifications.rhtml       |  2 +-
 lang/bg.yml                                   |  8 ++++++++
 lang/cs.yml                                   |  8 ++++++++
 lang/de.yml                                   |  8 ++++++++
 lang/en.yml                                   |  8 ++++++++
 lang/es.yml                                   |  8 ++++++++
 lang/fi.yml                                   |  8 ++++++++
 lang/fr.yml                                   | 11 +++++++++--
 lang/he.yml                                   |  8 ++++++++
 lang/it.yml                                   |  8 ++++++++
 lang/ja.yml                                   |  8 ++++++++
 lang/ko.yml                                   |  8 ++++++++
 lang/lt.yml                                   |  8 ++++++++
 lang/nl.yml                                   |  8 ++++++++
 lang/pl.yml                                   |  8 ++++++++
 lang/pt-br.yml                                |  8 ++++++++
 lang/pt.yml                                   |  8 ++++++++
 lang/ro.yml                                   |  8 ++++++++
 lang/ru.yml                                   |  8 ++++++++
 lang/sr.yml                                   |  8 ++++++++
 lang/sv.yml                                   |  8 ++++++++
 lang/zh-tw.yml                                |  8 ++++++++
 lang/zh.yml                                   |  8 ++++++++
 27 files changed, 188 insertions(+), 7 deletions(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index abe76c797..b66851eef 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -95,6 +95,10 @@ module ApplicationHelper
     l(:label_added_time_by, author || 'Anonymous', time_tag)
   end
   
+  def l_or_humanize(s)
+    l_has_string?("label_#{s}".to_sym) ? l("label_#{s}".to_sym) : s.to_s.humanize
+  end
+  
   def day_name(day)
     l(:general_day_names).split(',')[day-1]
   end
diff --git a/app/views/projects/settings/_modules.rhtml b/app/views/projects/settings/_modules.rhtml
index 2ecdaf7e8..d600f2090 100644
--- a/app/views/projects/settings/_modules.rhtml
+++ b/app/views/projects/settings/_modules.rhtml
@@ -3,7 +3,7 @@
             :html => {:id => 'modules-form'} do |f| %>
             
 <div class=box>
-<strong>Select modules to enable for this project:</strong>
+<strong><%= l(:text_select_project_modules) %></strong>
 <br />
 <% Redmine::AccessControl.available_project_modules.each do |m| %>
 <p><label><%= check_box_tag 'enabled_modules[]', m, @project.module_enabled?(m) %> <%= m.to_s.humanize %></label></p>
diff --git a/app/views/projects/settings/_repository.rhtml b/app/views/projects/settings/_repository.rhtml
index 10530a296..95830ab98 100644
--- a/app/views/projects/settings/_repository.rhtml
+++ b/app/views/projects/settings/_repository.rhtml
@@ -1,11 +1,12 @@
 <% remote_form_for :repository, @repository, 
                    :url => { :controller => 'repositories', :action => 'edit', :id => @project },
-                   :builder => TabularFormBuilder do |f| %>
+                   :builder => TabularFormBuilder,
+                   :lang => current_language do |f| %>
 
 <%= error_messages_for 'repository' %>
 
 <div class="box tabular">
-<p><label>SCM</label><%= scm_select_tag(@repository) %></p>
+<p><label><%= l(:label_scm) %></label><%= scm_select_tag(@repository) %></p>
 <%= repository_field_tags(f, @repository) if @repository %>
 </div>
 
diff --git a/app/views/projects/settings/_wiki.rhtml b/app/views/projects/settings/_wiki.rhtml
index 267c077e1..00da93039 100644
--- a/app/views/projects/settings/_wiki.rhtml
+++ b/app/views/projects/settings/_wiki.rhtml
@@ -1,6 +1,7 @@
 <% remote_form_for :wiki, @wiki,
                    :url => { :controller => 'wikis', :action => 'edit', :id => @project },
-                   :builder => TabularFormBuilder do |f| %>
+                   :builder => TabularFormBuilder,
+                   :lang => current_language do |f| %>
 
 <%= error_messages_for 'wiki' %>
 
diff --git a/app/views/settings/_notifications.rhtml b/app/views/settings/_notifications.rhtml
index ca04352f4..ac3213853 100644
--- a/app/views/settings/_notifications.rhtml
+++ b/app/views/settings/_notifications.rhtml
@@ -12,7 +12,7 @@
 <fieldset class="box"><legend><%=l(:text_select_mail_notifications)%></legend>
 <% @notifiables.each do |notifiable| %>
   <label><%= check_box_tag 'settings[notified_events][]', notifiable, Setting.notified_events.include?(notifiable) %>
-  <%= notifiable.humanize %></label><br />
+  <%= l_or_humanize(notifiable) %></label><br />
 <% end %>
 <%= hidden_field_tag 'settings[notified_events][]', '' %>
 <p><%= check_all_links('mail-options-form') %></p>
diff --git a/lang/bg.yml b/lang/bg.yml
index 164d67671..88ac9c889 100644
--- a/lang/bg.yml
+++ b/lang/bg.yml
@@ -569,3 +569,11 @@ setting_user_format: Потребителски формат
 text_status_changed_by_changeset: Applied in changeset %s.
 label_more: More
 text_issues_destroy_confirmation: 'Are you sure you want to delete the selected issue(s) ?'
+label_scm: SCM
+text_select_project_modules: 'Select modules to enable for this project:'
+label_issue_added: Issue added
+label_issue_updated: Issue updated
+label_document_added: Document added
+label_message_posted: Message added
+label_file_added: File added
+label_news_added: News added
diff --git a/lang/cs.yml b/lang/cs.yml
index 86a111cc7..fd4ee5223 100644
--- a/lang/cs.yml
+++ b/lang/cs.yml
@@ -569,3 +569,11 @@ setting_user_format: Users display format
 text_status_changed_by_changeset: Applied in changeset %s.
 label_more: More
 text_issues_destroy_confirmation: 'Are you sure you want to delete the selected issue(s) ?'
+label_scm: SCM
+text_select_project_modules: 'Select modules to enable for this project:'
+label_issue_added: Issue added
+label_issue_updated: Issue updated
+label_document_added: Document added
+label_message_posted: Message added
+label_file_added: File added
+label_news_added: News added
diff --git a/lang/de.yml b/lang/de.yml
index c5a6cdf95..ba6589b24 100644
--- a/lang/de.yml
+++ b/lang/de.yml
@@ -569,3 +569,11 @@ enumeration_activities: Aktivitäten (Zeiterfassung)
 text_status_changed_by_changeset: Applied in changeset %s.
 label_more: More
 text_issues_destroy_confirmation: 'Are you sure you want to delete the selected issue(s) ?'
+label_scm: SCM
+text_select_project_modules: 'Select modules to enable for this project:'
+label_issue_added: Issue added
+label_issue_updated: Issue updated
+label_document_added: Document added
+label_message_posted: Message added
+label_file_added: File added
+label_news_added: News added
diff --git a/lang/en.yml b/lang/en.yml
index a37be93c7..c0b986238 100644
--- a/lang/en.yml
+++ b/lang/en.yml
@@ -219,9 +219,12 @@ label_issue_new: New issue
 label_issue_plural: Issues
 label_issue_view_all: View all issues
 label_issues_by: Issues by %s
+label_issue_added: Issue added
+label_issue_updated: Issue updated
 label_document: Document
 label_document_new: New document
 label_document_plural: Documents
+label_document_added: Document added
 label_role: Role
 label_role_plural: Roles
 label_role_new: New role
@@ -291,6 +294,7 @@ label_attachment: File
 label_attachment_new: New file
 label_attachment_delete: Delete file
 label_attachment_plural: Files
+label_file_added: File added
 label_report: Report
 label_report_plural: Reports
 label_news: News
@@ -298,6 +302,7 @@ label_news_new: Add news
 label_news_plural: News
 label_news_latest: Latest news
 label_news_view_all: View all news
+label_news_added: News added
 label_change_log: Change log
 label_settings: Settings
 label_overview: Overview
@@ -435,6 +440,7 @@ label_topic_plural: Topics
 label_message_plural: Messages
 label_message_last: Last message
 label_message_new: New message
+label_message_posted: Message added
 label_reply_plural: Replies
 label_send_information: Send account information to the user
 label_year: Year
@@ -470,6 +476,7 @@ label_age: Age
 label_change_properties: Change properties
 label_general: General
 label_more: More
+label_scm: SCM
 
 button_login: Login
 button_submit: Submit
@@ -543,6 +550,7 @@ text_no_configuration_data: "Roles, trackers, issue statuses and workflow have n
 text_load_default_configuration: Load the default configuration
 text_status_changed_by_changeset: Applied in changeset %s.
 text_issues_destroy_confirmation: 'Are you sure you want to delete the selected issue(s) ?'
+text_select_project_modules: 'Select modules to enable for this project:'
 
 default_role_manager: Manager
 default_role_developper: Developer
diff --git a/lang/es.yml b/lang/es.yml
index 1bc7d00fb..d76e7c8a6 100644
--- a/lang/es.yml
+++ b/lang/es.yml
@@ -572,3 +572,11 @@ setting_user_format: Users display format
 text_status_changed_by_changeset: Applied in changeset %s.
 label_more: More
 text_issues_destroy_confirmation: 'Are you sure you want to delete the selected issue(s) ?'
+label_scm: SCM
+text_select_project_modules: 'Select modules to enable for this project:'
+label_issue_added: Issue added
+label_issue_updated: Issue updated
+label_document_added: Document added
+label_message_posted: Message added
+label_file_added: File added
+label_news_added: News added
diff --git a/lang/fi.yml b/lang/fi.yml
index dda26242b..f9bb3620d 100644
--- a/lang/fi.yml
+++ b/lang/fi.yml
@@ -573,3 +573,11 @@ setting_user_format: Käyttäjien esitysmuoto
 text_status_changed_by_changeset: Applied in changeset %s.
 text_issues_destroy_confirmation: 'Are you sure you want to delete the selected issue(s) ?'
 label_more: More
+label_scm: SCM
+text_select_project_modules: 'Select modules to enable for this project:'
+label_issue_added: Issue added
+label_issue_updated: Issue updated
+label_document_added: Document added
+label_message_posted: Message added
+label_file_added: File added
+label_news_added: News added
diff --git a/lang/fr.yml b/lang/fr.yml
index 8c569fc5a..2f2c3cab1 100644
--- a/lang/fr.yml
+++ b/lang/fr.yml
@@ -68,7 +68,6 @@ notice_successful_delete: Suppression effectuée avec succès.
 notice_successful_connection: Connection réussie.
 notice_file_not_found: "La page à laquelle vous souhaitez accéder n'existe pas ou a été supprimée."
 notice_locking_conflict: Les données ont été mises à jour par un autre utilisateur. Mise à jour impossible.
-notice_scm_error: "L'entrée et/ou la révision demandée n'existe pas dans le dépôt."
 notice_not_authorized: "Vous n'êtes pas autorisés à accéder à cette page."
 notice_email_sent: "Un email a été envoyé à %s"
 notice_email_error: "Erreur lors de l'envoi de l'email (%s)"
@@ -219,10 +218,13 @@ label_issue: Demande
 label_issue_new: Nouvelle demande
 label_issue_plural: Demandes
 label_issue_view_all: Voir toutes les demandes
+label_issue_added: Demande ajoutée
+label_issue_updated: Demande mise à jour
 label_issues_by: Demandes par %s
 label_document: Document
 label_document_new: Nouveau document
 label_document_plural: Documents
+label_document_added: Document ajouté
 label_role: Rôle
 label_role_plural: Rôles
 label_role_new: Nouveau rôle
@@ -292,6 +294,7 @@ label_attachment: Fichier
 label_attachment_new: Nouveau fichier
 label_attachment_delete: Supprimer le fichier
 label_attachment_plural: Fichiers
+label_file_added: Fichier ajouté
 label_report: Rapport
 label_report_plural: Rapports
 label_news: Annonce
@@ -299,6 +302,7 @@ label_news_new: Nouvelle annonce
 label_news_plural: Annonces
 label_news_latest: Dernières annonces
 label_news_view_all: Voir toutes les annonces
+label_news_added: Annonce ajoutée
 label_change_log: Historique
 label_settings: Configuration
 label_overview: Aperçu
@@ -436,6 +440,7 @@ label_topic_plural: Discussions
 label_message_plural: Messages
 label_message_last: Dernier message
 label_message_new: Nouveau message
+label_message_posted: Message ajouté
 label_reply_plural: Réponses
 label_send_information: Envoyer les informations à l'utilisateur
 label_year: Année
@@ -471,6 +476,7 @@ label_age: Age
 label_change_properties: Changer les propriétés
 label_general: Général
 label_more: Plus
+label_scm: SCM
 
 button_login: Connexion
 button_submit: Soumettre
@@ -513,7 +519,7 @@ status_active: actif
 status_registered: enregistré
 status_locked: vérouillé
 
-text_select_mail_notifications: Sélectionner les actions pour lesquelles la notification par mail doit être activée.
+text_select_mail_notifications: Actions pour lesquelles une notification par e-mail est envoyée
 text_regexp_info: ex. ^[A-Z0-9]+$
 text_min_max_length_info: 0 pour aucune restriction
 text_project_destroy_confirmation: Etes-vous sûr de vouloir supprimer ce projet et tout ce qui lui est rattaché ?
@@ -544,6 +550,7 @@ text_no_configuration_data: "Les rôles, trackers, statuts et le workflow ne son
 text_load_default_configuration: Charger le paramétrage par défaut
 text_status_changed_by_changeset: Appliqué par commit %s.
 text_issues_destroy_confirmation: 'Etes-vous sûr de vouloir supprimer le(s) demandes(s) selectionnée(s) ?'
+text_select_project_modules: 'Selectionner les modules à activer pour ce project:'
 
 default_role_manager: Manager
 default_role_developper: Développeur
diff --git a/lang/he.yml b/lang/he.yml
index 6631a457f..9cd91d387 100644
--- a/lang/he.yml
+++ b/lang/he.yml
@@ -569,3 +569,11 @@ setting_user_format: Users display format
 text_status_changed_by_changeset: Applied in changeset %s.
 label_more: More
 text_issues_destroy_confirmation: 'Are you sure you want to delete the selected issue(s) ?'
+label_scm: SCM
+text_select_project_modules: 'Select modules to enable for this project:'
+label_issue_added: Issue added
+label_issue_updated: Issue updated
+label_document_added: Document added
+label_message_posted: Message added
+label_file_added: File added
+label_news_added: News added
diff --git a/lang/it.yml b/lang/it.yml
index 3c77c97a6..78bfbb9c3 100644
--- a/lang/it.yml
+++ b/lang/it.yml
@@ -569,3 +569,11 @@ setting_user_format: Users display format
 text_status_changed_by_changeset: Applied in changeset %s.
 label_more: More
 text_issues_destroy_confirmation: 'Are you sure you want to delete the selected issue(s) ?'
+label_scm: SCM
+text_select_project_modules: 'Select modules to enable for this project:'
+label_issue_added: Issue added
+label_issue_updated: Issue updated
+label_document_added: Document added
+label_message_posted: Message added
+label_file_added: File added
+label_news_added: News added
diff --git a/lang/ja.yml b/lang/ja.yml
index 50d23e80f..0ef22d50b 100644
--- a/lang/ja.yml
+++ b/lang/ja.yml
@@ -570,3 +570,11 @@ setting_user_format: Users display format
 text_status_changed_by_changeset: Applied in changeset %s.
 label_more: More
 text_issues_destroy_confirmation: 'Are you sure you want to delete the selected issue(s) ?'
+label_scm: SCM
+text_select_project_modules: 'Select modules to enable for this project:'
+label_issue_added: Issue added
+label_issue_updated: Issue updated
+label_document_added: Document added
+label_message_posted: Message added
+label_file_added: File added
+label_news_added: News added
diff --git a/lang/ko.yml b/lang/ko.yml
index 62ec95ef3..606cf7e11 100644
--- a/lang/ko.yml
+++ b/lang/ko.yml
@@ -569,3 +569,11 @@ setting_user_format: Users display format
 text_status_changed_by_changeset: Applied in changeset %s.
 label_more: More
 text_issues_destroy_confirmation: 'Are you sure you want to delete the selected issue(s) ?'
+label_scm: SCM
+text_select_project_modules: 'Select modules to enable for this project:'
+label_issue_added: Issue added
+label_issue_updated: Issue updated
+label_document_added: Document added
+label_message_posted: Message added
+label_file_added: File added
+label_news_added: News added
diff --git a/lang/lt.yml b/lang/lt.yml
index a7b12736a..383654300 100644
--- a/lang/lt.yml
+++ b/lang/lt.yml
@@ -570,3 +570,11 @@ setting_user_format: Vartotojo atvaizdavimo formatas
 text_status_changed_by_changeset: Applied in changeset %s.
 label_more: More
 text_issues_destroy_confirmation: 'Are you sure you want to delete the selected issue(s) ?'
+label_scm: SCM
+text_select_project_modules: 'Select modules to enable for this project:'
+label_issue_added: Issue added
+label_issue_updated: Issue updated
+label_document_added: Document added
+label_message_posted: Message added
+label_file_added: File added
+label_news_added: News added
diff --git a/lang/nl.yml b/lang/nl.yml
index 7b5f6bf3a..30ea9dd5d 100644
--- a/lang/nl.yml
+++ b/lang/nl.yml
@@ -570,3 +570,11 @@ setting_user_format: Users display format
 text_status_changed_by_changeset: Applied in changeset %s.
 label_more: More
 text_issues_destroy_confirmation: 'Are you sure you want to delete the selected issue(s) ?'
+label_scm: SCM
+text_select_project_modules: 'Select modules to enable for this project:'
+label_issue_added: Issue added
+label_issue_updated: Issue updated
+label_document_added: Document added
+label_message_posted: Message added
+label_file_added: File added
+label_news_added: News added
diff --git a/lang/pl.yml b/lang/pl.yml
index 5c12c658f..fce25d09b 100644
--- a/lang/pl.yml
+++ b/lang/pl.yml
@@ -569,3 +569,11 @@ setting_user_format: Users display format
 text_status_changed_by_changeset: Applied in changeset %s.
 label_more: More
 text_issues_destroy_confirmation: 'Are you sure you want to delete the selected issue(s) ?'
+label_scm: SCM
+text_select_project_modules: 'Select modules to enable for this project:'
+label_issue_added: Issue added
+label_issue_updated: Issue updated
+label_document_added: Document added
+label_message_posted: Message added
+label_file_added: File added
+label_news_added: News added
diff --git a/lang/pt-br.yml b/lang/pt-br.yml
index 4616e83a7..4df1c9c1e 100644
--- a/lang/pt-br.yml
+++ b/lang/pt-br.yml
@@ -569,3 +569,11 @@ setting_user_format: Users display format
 text_status_changed_by_changeset: Applied in changeset %s.
 label_more: More
 text_issues_destroy_confirmation: 'Are you sure you want to delete the selected issue(s) ?'
+label_scm: SCM
+text_select_project_modules: 'Select modules to enable for this project:'
+label_issue_added: Issue added
+label_issue_updated: Issue updated
+label_document_added: Document added
+label_message_posted: Message added
+label_file_added: File added
+label_news_added: News added
diff --git a/lang/pt.yml b/lang/pt.yml
index 31df179f2..9aa017ee9 100644
--- a/lang/pt.yml
+++ b/lang/pt.yml
@@ -569,3 +569,11 @@ setting_user_format: Users display format
 text_status_changed_by_changeset: Applied in changeset %s.
 label_more: More
 text_issues_destroy_confirmation: 'Are you sure you want to delete the selected issue(s) ?'
+label_scm: SCM
+text_select_project_modules: 'Select modules to enable for this project:'
+label_issue_added: Issue added
+label_issue_updated: Issue updated
+label_document_added: Document added
+label_message_posted: Message added
+label_file_added: File added
+label_news_added: News added
diff --git a/lang/ro.yml b/lang/ro.yml
index 52e856683..16f055413 100644
--- a/lang/ro.yml
+++ b/lang/ro.yml
@@ -569,3 +569,11 @@ setting_user_format: Users display format
 text_status_changed_by_changeset: Applied in changeset %s.
 label_more: More
 text_issues_destroy_confirmation: 'Are you sure you want to delete the selected issue(s) ?'
+label_scm: SCM
+text_select_project_modules: 'Select modules to enable for this project:'
+label_issue_added: Issue added
+label_issue_updated: Issue updated
+label_document_added: Document added
+label_message_posted: Message added
+label_file_added: File added
+label_news_added: News added
diff --git a/lang/ru.yml b/lang/ru.yml
index f4cbb9976..795bb7706 100644
--- a/lang/ru.yml
+++ b/lang/ru.yml
@@ -570,3 +570,11 @@ enumeration_activities: Действия (учет времени)
 text_status_changed_by_changeset: Реализовано в %s редакции.
 label_more: Больше
 text_issues_destroy_confirmation: 'Are you sure you want to delete the selected issue(s) ?'
+label_scm: SCM
+text_select_project_modules: 'Select modules to enable for this project:'
+label_issue_added: Issue added
+label_issue_updated: Issue updated
+label_document_added: Document added
+label_message_posted: Message added
+label_file_added: File added
+label_news_added: News added
diff --git a/lang/sr.yml b/lang/sr.yml
index c32394dc3..55f668790 100644
--- a/lang/sr.yml
+++ b/lang/sr.yml
@@ -570,3 +570,11 @@ setting_user_format: Users display format
 text_status_changed_by_changeset: Applied in changeset %s.
 label_more: More
 text_issues_destroy_confirmation: 'Are you sure you want to delete the selected issue(s) ?'
+label_scm: SCM
+text_select_project_modules: 'Select modules to enable for this project:'
+label_issue_added: Issue added
+label_issue_updated: Issue updated
+label_document_added: Document added
+label_message_posted: Message added
+label_file_added: File added
+label_news_added: News added
diff --git a/lang/sv.yml b/lang/sv.yml
index 40a1ce8f6..b2d637dca 100644
--- a/lang/sv.yml
+++ b/lang/sv.yml
@@ -570,3 +570,11 @@ setting_user_format: Users display format
 text_status_changed_by_changeset: Applied in changeset %s.
 label_more: More
 text_issues_destroy_confirmation: 'Are you sure you want to delete the selected issue(s) ?'
+label_scm: SCM
+text_select_project_modules: 'Select modules to enable for this project:'
+label_issue_added: Issue added
+label_issue_updated: Issue updated
+label_document_added: Document added
+label_message_posted: Message added
+label_file_added: File added
+label_news_added: News added
diff --git a/lang/zh-tw.yml b/lang/zh-tw.yml
index 601f5c2ec..ad4cff73b 100644
--- a/lang/zh-tw.yml
+++ b/lang/zh-tw.yml
@@ -569,3 +569,11 @@ enumeration_activities: 活動 (time tracking)
 text_status_changed_by_changeset: Applied in changeset %s.
 label_more: More
 text_issues_destroy_confirmation: 'Are you sure you want to delete the selected issue(s) ?'
+label_scm: SCM
+text_select_project_modules: 'Select modules to enable for this project:'
+label_issue_added: Issue added
+label_issue_updated: Issue updated
+label_document_added: Document added
+label_message_posted: Message added
+label_file_added: File added
+label_news_added: News added
diff --git a/lang/zh.yml b/lang/zh.yml
index fd513a96a..0edd41c52 100644
--- a/lang/zh.yml
+++ b/lang/zh.yml
@@ -572,3 +572,11 @@ setting_user_format: 用户显示格式
 text_status_changed_by_changeset: Applied in changeset %s.
 label_more: More
 text_issues_destroy_confirmation: 'Are you sure you want to delete the selected issue(s) ?'
+label_scm: SCM
+text_select_project_modules: 'Select modules to enable for this project:'
+label_issue_added: Issue added
+label_issue_updated: Issue updated
+label_document_added: Document added
+label_message_posted: Message added
+label_file_added: File added
+label_news_added: News added

From 8adb320978290991bc3d75864a5dc3476be9b81b Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Wed, 13 Feb 2008 20:47:27 +0000
Subject: [PATCH 204/710] Fixed a bug in localization introduced by r1131
 (anonymous users inherit the language of the first anonymous user).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1144 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/application.rb       |  1 +
 test/integration/application_test.rb | 43 ++++++++++++++++++++++++++++
 2 files changed, 44 insertions(+)
 create mode 100644 test/integration/application_test.rb

diff --git a/app/controllers/application.rb b/app/controllers/application.rb
index a6d881ff3..3644c396a 100644
--- a/app/controllers/application.rb
+++ b/app/controllers/application.rb
@@ -59,6 +59,7 @@ class ApplicationController < ActionController::Base
   end 
   
   def set_localization
+    User.current.language = nil unless User.current.logged?
     lang = begin
       if !User.current.language.blank? and GLoc.valid_languages.include? User.current.language.to_sym
         User.current.language
diff --git a/test/integration/application_test.rb b/test/integration/application_test.rb
new file mode 100644
index 000000000..18f4891c2
--- /dev/null
+++ b/test/integration/application_test.rb
@@ -0,0 +1,43 @@
+# redMine - project management software
+# Copyright (C) 2006-2008  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 "#{File.dirname(__FILE__)}/../test_helper"
+
+class ApplicationTest < ActionController::IntegrationTest
+  fixtures :users
+  
+  def test_set_localization
+    Setting.default_language = 'en'
+    
+    # a french user
+    get 'projects', { }, 'Accept-Language' => 'fr,fr-fr;q=0.8,en-us;q=0.5,en;q=0.3'
+    assert_response :success
+    assert_tag :tag => 'h2', :content => 'Projets'
+    assert_equal 'fr', User.current.language
+    
+    # then an italien user
+    get 'projects', { }, 'Accept-Language' => 'it;q=0.8,en-us;q=0.5,en;q=0.3'
+    assert_response :success
+    assert_tag :tag => 'h2', :content => 'Progetti'
+    assert_equal 'it', User.current.language
+    
+    # not a supported language: default language should be used
+    get 'projects', { }, 'Accept-Language' => 'zz'
+    assert_response :success
+    assert_tag :tag => 'h2', :content => 'Projects'
+  end
+end

From 71d089c83329a0dcaad650f3a97b8d5262db1dd8 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Thu, 14 Feb 2008 21:17:28 +0000
Subject: [PATCH 205/710] Escape titles in activity view.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1145 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/projects/activity.rhtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/projects/activity.rhtml b/app/views/projects/activity.rhtml
index bde806554..12139c2e7 100644
--- a/app/views/projects/activity.rhtml
+++ b/app/views/projects/activity.rhtml
@@ -6,7 +6,7 @@
 <dl>
 <% @events_by_day[day].sort {|x,y| y.event_datetime <=> x.event_datetime }.each do |e| -%>
   <dt class="<%= e.class.name.downcase %>"><span class="time"><%= format_time(e.event_datetime, false) %></span>
-  <%= link_to truncate(e.event_title, 100), e.event_url %></dt>
+  <%= link_to h(truncate(e.event_title, 100)), e.event_url %></dt>
   <dd><% unless e.event_description.blank? -%>
   <span class="description"><%= format_activity_description(e.event_description) %></span><br />
   <% end %>

From 29e297d273941c79ea14b821f4aa054c4b98301d Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Fri, 15 Feb 2008 16:41:44 +0000
Subject: [PATCH 206/710] Make Mantis importer preserve bug ids.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1146 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 lib/tasks/migrate_from_mantis.rake | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/lib/tasks/migrate_from_mantis.rake b/lib/tasks/migrate_from_mantis.rake
index af8892a6b..99607f2a2 100644
--- a/lib/tasks/migrate_from_mantis.rake
+++ b/lib/tasks/migrate_from_mantis.rake
@@ -308,7 +308,8 @@ task :migrate_from_mantis => :environment do
       print "Migrating bugs"
       Issue.destroy_all
       issues_map = {}
-      MantisBug.find(:all).each do |bug|
+      keep_bug_ids = (Issue.count == 0)
+      MantisBug.find(:all, :order => 'id ASC').each do |bug|
         next unless projects_map[bug.project_id] && users_map[bug.reporter_id]
     	i = Issue.new :project_id => projects_map[bug.project_id], 
                       :subject => encode(bug.summary),
@@ -321,6 +322,7 @@ task :migrate_from_mantis => :environment do
     	i.fixed_version = Version.find_by_project_id_and_name(i.project_id, bug.fixed_in_version) unless bug.fixed_in_version.blank?
     	i.status = STATUS_MAPPING[bug.status] || DEFAULT_STATUS
     	i.tracker = (bug.severity == 10 ? TRACKER_FEATURE : TRACKER_BUG)
+    	i.id = bug.id if keep_bug_ids
     	next unless i.save
     	issues_map[bug.id] = i.id
     	print '.'
@@ -357,6 +359,9 @@ task :migrate_from_mantis => :environment do
           i.add_watcher(User.find_by_id(users_map[monitor.user_id]))
         end
       end
+      
+      # update issue id sequence if needed (postgresql)
+      Issue.connection.reset_pk_sequence!(Issue.table_name) if Issue.connection.respond_to?('reset_pk_sequence!')
       puts
       
       # Bug relationships

From 377a45ae1adc5abadf93b73fb4a4b9a0a8398652 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Fri, 15 Feb 2008 17:04:27 +0000
Subject: [PATCH 207/710] Slight changes to calendar and activity h2 titles.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1147 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/projects/activity.rhtml | 2 +-
 app/views/projects/calendar.rhtml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/projects/activity.rhtml b/app/views/projects/activity.rhtml
index 12139c2e7..dce333f61 100644
--- a/app/views/projects/activity.rhtml
+++ b/app/views/projects/activity.rhtml
@@ -1,4 +1,4 @@
-<h2><%=l(:label_activity)%>: <%= "#{month_name(@month).downcase} #{@year}" %></h2>
+<h2><%= "#{month_name(@month)} #{@year}" %></h2>
 
 <div id="activity">
 <% @events_by_day.keys.sort {|x,y| y <=> x }.each do |day| %>
diff --git a/app/views/projects/calendar.rhtml b/app/views/projects/calendar.rhtml
index 171e82345..3214d7b06 100644
--- a/app/views/projects/calendar.rhtml
+++ b/app/views/projects/calendar.rhtml
@@ -1,5 +1,5 @@
 <% cache(:year => @year, :month => @month, :tracker_ids => @selected_tracker_ids, :subprojects => params[:with_subprojects], :lang => current_language) do %>
-<h2><%= l(:label_calendar) %>: <%= "#{month_name(@month).downcase} #{@year}" %></h2>
+<h2><%= "#{month_name(@month)} #{@year}" %></h2>
 
 <table width="100%">
 <tr><td align="left">

From 96b78fdae579335057439c25211b2e2195b40130 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Fri, 15 Feb 2008 17:22:21 +0000
Subject: [PATCH 208/710] Fix applied to ruby-net-ldap (#608).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1148 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 vendor/plugins/ruby-net-ldap-0.0.4/lib/net/ber.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vendor/plugins/ruby-net-ldap-0.0.4/lib/net/ber.rb b/vendor/plugins/ruby-net-ldap-0.0.4/lib/net/ber.rb
index e76100656..6589415dc 100644
--- a/vendor/plugins/ruby-net-ldap-0.0.4/lib/net/ber.rb
+++ b/vendor/plugins/ruby-net-ldap-0.0.4/lib/net/ber.rb
@@ -68,7 +68,7 @@ module Net
     # this can throw TypeErrors and other nasties.
     #
     def read_ber syntax=nil
-      return nil if eof?
+      return nil if (StringIO == self.class) and  eof?
 
       id = getc  # don't trash this value, we'll use it later
       tag = id & 31

From 38307c097907e5b4e04c6d4159dc28171251be26 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Fri, 15 Feb 2008 17:47:19 +0000
Subject: [PATCH 209/710] =?UTF-8?q?Added=20Ukrainan=20translation=20(Natal?=
 =?UTF-8?q?ia=20Konovka=20&=20Mykhaylo=20Sorochan).=20Translation=20update?=
 =?UTF-8?q?s:=20*=20Lithuanian=20(Sergej=20Jegorov)=20*=20Russian=20(Micha?=
 =?UTF-8?q?el=20Pirogov)=20*=20Traditional=20Chinese=20(Shortie=20Lo)=20*?=
 =?UTF-8?q?=20Finnish=20(Antti=20Perki=C3=B6m=C3=A4ki)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1149 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 lang/fi.yml                                   |  12 +-
 lang/lt.yml                                   |  22 +-
 lang/ru.yml                                   |  21 +-
 lang/uk.yml                                   | 581 ++++++++++++++++++
 lang/zh-tw.yml                                |  44 +-
 .../javascripts/calendar/lang/calendar-lt.js  |  13 +-
 .../javascripts/calendar/lang/calendar-uk.js  | 127 ++++
 .../jstoolbar/lang/jstoolbar-uk.js            |  14 +
 8 files changed, 780 insertions(+), 54 deletions(-)
 create mode 100644 lang/uk.yml
 create mode 100644 public/javascripts/calendar/lang/calendar-uk.js
 create mode 100644 public/javascripts/jstoolbar/lang/jstoolbar-uk.js

diff --git a/lang/fi.yml b/lang/fi.yml
index f9bb3620d..e0b1d5c4a 100644
--- a/lang/fi.yml
+++ b/lang/fi.yml
@@ -356,7 +356,7 @@ label_not_contains: ei sisällä
 label_day_plural: päivät
 label_repository: Säiliö
 label_repository_plural: Säiliötä
-label_browse: Selata
+label_browse: Selaus
 label_modification: %d muutos
 label_modification_plural: %d muutettu
 label_revision: Versio
@@ -570,14 +570,14 @@ enumeration_doc_categories: Dokumentin luokat
 enumeration_activities: Aktiviteetit (ajan seuranta)
 label_associated_revisions: Liittyvät versiot
 setting_user_format: Käyttäjien esitysmuoto
-text_status_changed_by_changeset: Applied in changeset %s.
-text_issues_destroy_confirmation: 'Are you sure you want to delete the selected issue(s) ?'
-label_more: More
-label_scm: SCM
-text_select_project_modules: 'Select modules to enable for this project:'
+text_status_changed_by_changeset: Päivitetty muutosversioon %s.
+text_issues_destroy_confirmation: 'Oletko varma että haluat poistaa valitut tapahtumat ?'
+label_more: Lisää
 label_issue_added: Issue added
 label_issue_updated: Issue updated
 label_document_added: Document added
 label_message_posted: Message added
 label_file_added: File added
+label_scm: SCM
+text_select_project_modules: 'Select modules to enable for this project:'
 label_news_added: News added
diff --git a/lang/lt.yml b/lang/lt.yml
index 383654300..2447a279d 100644
--- a/lang/lt.yml
+++ b/lang/lt.yml
@@ -78,7 +78,7 @@ notice_no_issue_selected: "Nepasirinkta nė viena problema! Prašom pažymėti p
 notice_account_pending: "Jūsų paskyra buvo sukūrta ir dabar laukiama administratoriaus patvirtinimo."
 
 error_scm_not_found: "Duomenys ir/ar pakeitimai saugykloje(repozitorojoje) neegzistuoja."
-error_scm_command_failed: "An error occurred when trying to access the repository: %s"
+error_scm_command_failed: "Įvyko klaida jungiantis prie saugyklos: %s"
 
 mail_subject_lost_password: Jūsų Redmine slaptažodis
 mail_body_lost_password: 'Norėdami pakeisti Redmine slaptažodį, spauskite nuorodą:'
@@ -567,14 +567,14 @@ label_repository_plural: Saugiklos
 error_can_t_load_default_data: "Numatytoji konfiguracija negali būti užkrauta: %s"
 label_associated_revisions: susijusios revizijos
 setting_user_format: Vartotojo atvaizdavimo formatas
-text_status_changed_by_changeset: Applied in changeset %s.
-label_more: More
-text_issues_destroy_confirmation: 'Are you sure you want to delete the selected issue(s) ?'
+text_status_changed_by_changeset: Pakeista %s revizijoi.
+label_more: Daugiau
+text_issues_destroy_confirmation: 'Ar jūs tikrai norite panaikinti pažimėtą(us) darbą(us)?'
 label_scm: SCM
-text_select_project_modules: 'Select modules to enable for this project:'
-label_issue_added: Issue added
-label_issue_updated: Issue updated
-label_document_added: Document added
-label_message_posted: Message added
-label_file_added: File added
-label_news_added: News added
+text_select_project_modules: 'Parinkite modulius, kuriuos norite naudoti šiame projekte:'
+label_issue_added: Darbas pridėtas
+label_issue_updated: Darbas atnaujintas
+label_document_added: Dokumentas pridėtas
+label_message_posted: Pranešimas pridėtas
+label_file_added: Byla pridėta
+label_news_added: Naujiena pridėta
diff --git a/lang/ru.yml b/lang/ru.yml
index 795bb7706..d4bd03080 100644
--- a/lang/ru.yml
+++ b/lang/ru.yml
@@ -569,12 +569,15 @@ enumeration_doc_categories: Категории документов
 enumeration_activities: Действия (учет времени)
 text_status_changed_by_changeset: Реализовано в %s редакции.
 label_more: Больше
-text_issues_destroy_confirmation: 'Are you sure you want to delete the selected issue(s) ?'
-label_scm: SCM
-text_select_project_modules: 'Select modules to enable for this project:'
-label_issue_added: Issue added
-label_issue_updated: Issue updated
-label_document_added: Document added
-label_message_posted: Message added
-label_file_added: File added
-label_news_added: News added
+text_issues_destroy_confirmation: 'Вы уверены, что хотите удалить выбранные задачи?'
+label_scm: 'Тип хранилища' 
+text_select_project_modules: 'Выберите модули, которые будут использованы в проекте:'
+label_issue_added: Задача добавлена
+label_issue_updated: Задача обновлена
+label_document_added: Документ добавлен
+label_message_posted: Сообщение добавлено
+label_file_added: Файл добавлен
+label_news_added: Новость добавлена
+label_calendar_filter: Включая
+label_calendar_no_assigned: не мои
+label_timelog_today: Расход времени за сегодня
diff --git a/lang/uk.yml b/lang/uk.yml
new file mode 100644
index 000000000..dc146dcfd
--- /dev/null
+++ b/lang/uk.yml
@@ -0,0 +1,581 @@
+_gloc_rule_default: '|n| n==1 ? "" : "_plural" '
+
+actionview_datehelper_select_day_prefix:
+actionview_datehelper_select_month_names: Січень,Лютий,Березень,Квітень,Травень,Червень,Липень,Серпень,Вересень,Жовтень,Листопад,Грудень
+actionview_datehelper_select_month_names_abbr: Січ,Лют,Бер,Квіт,Трав,Чер,Лип,Серп,Вер,Жов,Лис,Груд
+actionview_datehelper_select_month_prefix:
+actionview_datehelper_select_year_prefix:
+actionview_datehelper_time_in_words_day: 1 день
+actionview_datehelper_time_in_words_day_plural: %d днів(я)
+actionview_datehelper_time_in_words_hour_about: близько години
+actionview_datehelper_time_in_words_hour_about_plural: близько %d годин(и)
+actionview_datehelper_time_in_words_hour_about_single: близько години
+actionview_datehelper_time_in_words_minute: 1 хвилина
+actionview_datehelper_time_in_words_minute_half: півхвилини
+actionview_datehelper_time_in_words_minute_less_than: менше хвилини
+actionview_datehelper_time_in_words_minute_plural: %d хвилин(и)
+actionview_datehelper_time_in_words_minute_single: 1 хвилина
+actionview_datehelper_time_in_words_second_less_than: менше секунди
+actionview_datehelper_time_in_words_second_less_than_plural: менше %d секунд(и)
+actionview_instancetag_blank_option: Оберіть
+
+activerecord_error_inclusion: немає в списку
+activerecord_error_exclusion: зарезервовано 
+activerecord_error_invalid: невірне
+activerecord_error_confirmation: не збігається з підтвердженням
+activerecord_error_accepted: необхідно прийняти
+activerecord_error_empty: не може бути порожнім
+activerecord_error_blank: не може бути незаповненим
+activerecord_error_too_long: дуже довге
+activerecord_error_too_short: дуже коротке
+activerecord_error_wrong_length: не відповідає довжині
+activerecord_error_taken: вже використовується
+activerecord_error_not_a_number: не є числом
+activerecord_error_not_a_date: є недійсною датою
+activerecord_error_greater_than_start_date: повинна бути пізніша за дату початку
+activerecord_error_not_same_project: не відносяться до одного проекту
+activerecord_error_circular_dependency: Такий зв'язок приведе до циклічної залежності
+
+general_fmt_age: %d р.
+general_fmt_age_plural: %d рр.
+general_fmt_date: %%m/%%d/%%Y
+general_fmt_datetime: %%m/%%d/%%Y %%I:%%M %%p
+general_fmt_datetime_short: %%b %%d, %%I:%%M %%p
+general_fmt_time: %%I:%%M %%p
+general_text_No: 'Ні'
+general_text_Yes: 'Так'
+general_text_no: 'Ні'
+general_text_yes: 'Так'
+general_lang_name: 'Ukrainian (Українська)'
+general_csv_separator: ','
+general_csv_encoding: UTF-8
+general_pdf_encoding: UTF-8
+general_day_names: Понеділок,Вівторок,Середа,Четвер,П'ятниця,Субота,Неділя
+general_first_day_of_week: '1'
+
+notice_account_updated: Обліковий запис успішно оновлений.
+notice_account_invalid_creditentials: Неправильне ім'я користувача або пароль
+notice_account_password_updated: Пароль успішно оновлений.
+notice_account_wrong_password: Невірний пароль
+notice_account_register_done: Обліковий запис успішно створений. Для активації Вашого облікового запису зайдіть по посиланню, яке відіслане вам електронною поштою.
+notice_account_unknown_email: Невідомий користувач.
+notice_can_t_change_password: Для даного облікового запису використовується джерело зовнішньої аутентифікації. Неможливо змінити пароль.
+notice_account_lost_email_sent: Вам відправлений лист з інструкціями по вибору нового пароля.
+notice_account_activated: Ваш обліковий запис активований. Ви можете увійти.
+notice_successful_create: Створення успішно завершене.
+notice_successful_update: Оновлення успішно завершене.
+notice_successful_delete: Видалення успішно завершене.
+notice_successful_connection: Підключення успішно встановлене.
+notice_file_not_found: Сторінка, на яку ви намагаєтеся зайти, не існує або видалена.
+notice_locking_conflict: Дані оновлено іншим користувачем.
+notice_scm_error: Запису та/або виправлення немає в репозиторії.
+notice_not_authorized: У вас немає прав для відвідини даної сторінки.
+notice_email_sent: Відправлено листа %s
+notice_email_error: Під час відправки листа відбулася помилка (%s)
+notice_feeds_access_key_reseted: Ваш ключ доступу RSS було скинуто.
+notice_failed_to_save_issues: "Не вдалося зберегти %d пункт(ів) з %d вибраних: %s."
+notice_no_issue_selected: "Не вибрано жодної задачі! Будь ласка, відзначте задачу, яку ви хочете відредагувати."
+notice_account_pending: "Ваш обліковий запис створено і він чекає на підтвердження адміністратором."
+
+mail_subject_lost_password: Ваш Redmine пароль
+mail_body_lost_password: 'Для зміни Redmine пароля, зайдіть за наступним посиланням:'
+mail_subject_register: Активація облікового запису Redmine
+mail_body_register: 'Для активації облікового запису Redmine, зайдіть за наступним посиланням:'
+mail_body_account_information_external: Ви можете використовувати ваш "%s" обліковий запис для входу в Redmine.
+mail_body_account_information: Інформація по Вашому обліковому запису Redmine
+mail_subject_account_activation_request: Запит на активацію облікового запису Redmine
+mail_body_account_activation_request: 'Новий користувач (%s) зареєструвався. Його обліковий запис чекає на ваше підтвердження:'
+
+gui_validation_error: 1 помилка
+gui_validation_error_plural: %d помилки(ок)
+
+field_name: Ім'я
+field_description: Опис
+field_summary: Короткий опис
+field_is_required: Необхідно
+field_firstname: Ім'я
+field_lastname: Прізвище
+field_mail: Ел. пошта
+field_filename: Файл
+field_filesize: Розмір
+field_downloads: Завантаження
+field_author: Автор
+field_created_on: Створено
+field_updated_on: Оновлено
+field_field_format: Формат
+field_is_for_all: Для усіх проектів
+field_possible_values: Можливі значення
+field_regexp: Регулярний вираз
+field_min_length: Мінімальна довжина 
+field_max_length: Максимальна довжина 
+field_value: Значення
+field_category: Категорія
+field_title: Назва
+field_project: Проект
+field_issue: Питання
+field_status: Статус
+field_notes: Примітки
+field_is_closed: Питання закрито
+field_is_default: Типове значення
+field_tracker: Координатор
+field_subject: Тема
+field_due_date: Дата виконання
+field_assigned_to: Призначена до
+field_priority: Пріоритет
+field_fixed_version: Фіксована версія
+field_user: Користувач
+field_role: Роль
+field_homepage: Домашня сторінка
+field_is_public: Публічний
+field_parent: Підпроект
+field_is_in_chlog: Питання, що відображаються в журналі змін
+field_is_in_roadmap: Питання, що відображаються в оперативному плані
+field_login: Вхід 
+field_mail_notification: Повідомлення за електронною поштою
+field_admin: Адміністратор 
+field_last_login_on: Останнє підключення
+field_language: Мова
+field_effective_date: Дата
+field_password: Пароль
+field_new_password: Новий пароль
+field_password_confirmation: Підтвердження
+field_version: Версія
+field_type: Тип
+field_host: Машина
+field_port: Порт
+field_account: Обліковий запис
+field_base_dn: Базове відмітне ім'я
+field_attr_login: Атрибут Реєстрація
+field_attr_firstname: Атрибут Ім'я
+field_attr_lastname: Атрибут Прізвище
+field_attr_mail: Атрибут Email
+field_onthefly: Створення користувача на льоту
+field_start_date: Початок
+field_done_ratio: %% зроблено
+field_auth_source: Режим аутентифікації
+field_hide_mail: Приховувати мій email
+field_comments: Коментар
+field_url: URL
+field_start_page: Стартова сторінка
+field_subproject: Підпроект
+field_hours: Годин(и/а)
+field_activity: Діяльність
+field_spent_on: Дата
+field_identifier: Ідентифікатор
+field_is_filter: Використовується як фільтр
+field_issue_to_id: Зв'язані задачі
+field_delay: Відкласти
+field_assignable: Задача може бути призначена цій ролі
+field_redirect_existing_links: Перенаправити існуючі посилання
+field_estimated_hours: Оцінний час
+field_column_names: Колонки
+field_time_zone: Часовий пояс
+field_searchable: Вживається у пошуку
+
+setting_app_title: Назва додатку
+setting_app_subtitle: Підзаголовок додатку
+setting_welcome_text: Текст привітання
+setting_default_language: Стандартна мова
+setting_login_required: Необхідна аутентифікація
+setting_self_registration: Можлива само-реєстрація
+setting_attachment_max_size: Максимальний размір вкладення
+setting_issues_export_limit: Обмеження по задачах, що експортуються
+setting_mail_from: email адреса для передачі інформації
+setting_bcc_recipients: Отримувачі сліпої копії (bcc)
+setting_host_name: Им'я машини
+setting_text_formatting: Форматування тексту
+setting_wiki_compression: Стиснення історії Wiki
+setting_feeds_limit: Обмеження змісту подачі
+setting_autofetch_changesets: Автоматично доставати доповнення
+setting_sys_api_enabled: Дозволити WS для управління репозиторієм
+setting_commit_ref_keywords: Ключові слова для посилання
+setting_commit_fix_keywords: Призначення ключових слів
+setting_autologin: Автоматичний вхід
+setting_date_format: Формат дати
+setting_time_format: Формат часу
+setting_cross_project_issue_relations: Дозволити міжпроектні відносини між питаннями
+setting_issue_list_default_columns: Колонки, що відображаються за умовчанням в списку питань
+setting_repositories_encodings: Кодування репозиторія
+setting_emails_footer: Підпис до електронної пошти
+setting_protocol: Протокол
+
+label_user: Користувач
+label_user_plural: Користувачі
+label_user_new: Новий користувач
+label_project: Проект
+label_project_new: Новий проект
+label_project_plural: Проекти
+label_project_all: Усі проекти
+label_project_latest: Останні проекти
+label_issue: Питання
+label_issue_new: Нові питання
+label_issue_plural: Питання
+label_issue_view_all: Проглянути всі питання
+label_issues_by: Питання за %s
+label_document: Документ
+label_document_new: Новий документ
+label_document_plural: Документи
+label_role: Роль
+label_role_plural: Ролі
+label_role_new: Нова роль
+label_role_and_permissions: Ролі і права доступу
+label_member: Учасник
+label_member_new: Новий учасник
+label_member_plural: Учасники
+label_tracker: Координатор
+label_tracker_plural: Координатори
+label_tracker_new: Новий Координатор
+label_workflow: Послідовність дій
+label_issue_status: Статус питання
+label_issue_status_plural: Статуси питань
+label_issue_status_new: Новий статус
+label_issue_category: Категорія питання
+label_issue_category_plural: Категорії питань
+label_issue_category_new: Нова категорія
+label_custom_field: Поле клієнта
+label_custom_field_plural: Поля клієнта
+label_custom_field_new: Нове поле клієнта
+label_enumerations: Довідники
+label_enumeration_new: Нове значення
+label_information: Інформація
+label_information_plural: Інформація
+label_please_login: Будь ласка, увійдіть
+label_register: Зареєструватися
+label_password_lost: Забули пароль
+label_home: Домашня сторінка
+label_my_page: Моя сторінка
+label_my_account: Мій обліковий запис
+label_my_projects: Мої проекти
+label_administration: Адміністрування
+label_login: Увійти
+label_logout: Вийти
+label_help: Допомога
+label_reported_issues: Створені питання
+label_assigned_to_me_issues: Мої питання
+label_last_login: Останнє підключення
+label_last_updates: Останнє оновлення
+label_last_updates_plural: %d останні оновлення
+label_registered_on: Зареєстрований(а)
+label_activity: Активність
+label_new: Новий
+label_logged_as: Увійшов як
+label_environment: Оточення
+label_authentication: Аутентифікація
+label_auth_source: Режим аутентифікації
+label_auth_source_new: Новий режим аутентифікації
+label_auth_source_plural: Режими аутентифікації
+label_subproject_plural: Підпроекти
+label_min_max_length: Мінімальна - максимальна довжина
+label_list: Список
+label_date: Дата
+label_integer: Цілий
+label_float: З плаваючою крапкою
+label_boolean: Логічний
+label_string: Текст
+label_text: Довгий текст
+label_attribute: Атрибут
+label_attribute_plural: атрибути
+label_download: %d Завантажено
+label_download_plural: %d Завантажень
+label_no_data: Немає даних для відображення
+label_change_status: Змінити статус
+label_history: Історія
+label_attachment: Файл
+label_attachment_new: Новий файл
+label_attachment_delete: Видалити файл
+label_attachment_plural: Файли
+label_report: Звіт
+label_report_plural: Звіти
+label_news: Новини
+label_news_new: Додати новину
+label_news_plural: Новини
+label_news_latest: Останні новини
+label_news_view_all: Подивитися всі новини
+label_change_log: Журнал змін
+label_settings: Налаштування
+label_overview: Перегляд
+label_version: Версія
+label_version_new: Нова версія
+label_version_plural: Версії
+label_confirmation: Підтвердження
+label_export_to: Експортувати в
+label_read: Читання...
+label_public_projects: Публічні проекти
+label_open_issues: відкрите
+label_open_issues_plural: відкриті
+label_closed_issues: закрите
+label_closed_issues_plural: закриті
+label_total: Всього
+label_permissions: Права доступу
+label_current_status: Поточний статус
+label_new_statuses_allowed: Дозволені нові статуси 
+label_all: Усі
+label_none: Нікому
+label_nobody: Ніхто
+label_next: Наступний
+label_previous: Попередній
+label_used_by: Використовується 
+label_details: Подробиці
+label_add_note: Додати зауваження 
+label_per_page: На сторінку
+label_calendar: Календар
+label_months_from: місяців(ця) з
+label_gantt: Діаграма Ганта
+label_internal: Внутрішній
+label_last_changes: останні %d змін
+label_change_view_all: Проглянути всі зміни
+label_personalize_page: Персоналізувати цю сторінку
+label_comment: Коментувати
+label_comment_plural: Коментарі
+label_comment_add: Залишити коментар
+label_comment_added: Коментар додано
+label_comment_delete: Видалити коментарі
+label_query: Запит клієнта
+label_query_plural: Запити клієнтів
+label_query_new: Новий запит
+label_filter_add: Додати фільтр
+label_filter_plural: Фільтри
+label_equals: є
+label_not_equals: немає
+label_in_less_than: менш ніж
+label_in_more_than: більш ніж
+label_in: у
+label_today: сьогодні
+label_this_week: цього тижня
+label_less_than_ago: менш ніж днів(я) назад 
+label_more_than_ago: більш ніж днів(я) назад 
+label_ago: днів(я) назад
+label_contains: містить
+label_not_contains: не містить
+label_day_plural: днів(я)
+label_repository: Репозиторій
+label_browse: Проглянути
+label_modification: %d зміна
+label_modification_plural: %d змін
+label_revision: Версія
+label_revision_plural: Версій
+label_added: додано
+label_modified: змінене 
+label_deleted: видалено
+label_latest_revision: Остання версія
+label_latest_revision_plural: Останні версії
+label_view_revisions: Проглянути версії
+label_max_size: Максимальний розмір
+label_on: 'з'
+label_sort_highest: У початок
+label_sort_higher: Вгору
+label_sort_lower: Вниз
+label_sort_lowest: У кінець
+label_roadmap: Оперативний план
+label_roadmap_due_in: Строк
+label_roadmap_overdue: %s запізнення
+label_roadmap_no_issues: Немає питань для даної версії
+label_search: Пошук
+label_result_plural: Результати 
+label_all_words: Всі слова
+label_wiki: Wiki
+label_wiki_edit: Редагування Wiki
+label_wiki_edit_plural: Редагування Wiki 
+label_wiki_page: Сторінка Wiki
+label_wiki_page_plural: Сторінки Wiki
+label_index_by_title: Індекс за назвою
+label_index_by_date: Індекс за датою
+label_current_version: Поточна версія
+label_preview: Попередній перегляд
+label_feed_plural: Подання
+label_changes_details: Подробиці по всіх змінах 
+label_issue_tracking: Координація питань
+label_spent_time: Витрачений час
+label_f_hour: %.2f година
+label_f_hour_plural: %.2f годин(и)
+label_time_tracking: Облік часу
+label_change_plural: Зміни
+label_statistics: Статистика
+label_commits_per_month: Подань на місяць
+label_commits_per_author: Подань на користувача 
+label_view_diff: Проглянути відмінності
+label_diff_inline: підключений
+label_diff_side_by_side: поряд
+label_options: Опції
+label_copy_workflow_from: Скопіювати послідовність дій з
+label_permissions_report: Звіт про права доступу
+label_watched_issues: Проглянуті питання
+label_related_issues: Зв'язані питання
+label_applied_status: Застосовний статус
+label_loading: Завантаження...
+label_relation_new: Новий зв'язок
+label_relation_delete: Видалити зв'язок
+label_relates_to: пов'язане з
+label_duplicates: дублює
+label_blocks: блокує
+label_blocked_by: заблоковане 
+label_precedes: передує
+label_follows: наступний за
+label_end_to_start: з кінця до початку
+label_end_to_end: з кінця до кінця
+label_start_to_start: з початку до початку
+label_start_to_end: з початку до кінця
+label_stay_logged_in: Залишатися в системі
+label_disabled: відключений
+label_show_completed_versions: Показати завершені версії
+label_me: мене
+label_board: Форум
+label_board_new: Новий форум
+label_board_plural: Форуми
+label_topic_plural: Теми
+label_message_plural: Повідомлення
+label_message_last: Останнє повідомлення
+label_message_new: Нове повідомлення
+label_reply_plural: Відповіді
+label_send_information: Відправити користувачеві інформацію з облікового запису
+label_year: Рік
+label_month: Місяць
+label_week: Неділя
+label_date_from: З
+label_date_to: Кому
+label_language_based: На основі мови користувача
+label_sort_by: Сортувати за %s
+label_send_test_email: Послати email для перевірки
+label_feeds_access_key_created_on: Ключ доступу RSS створений %s назад 
+label_module_plural: Модулі
+label_added_time_by: Доданий %s %s назад
+label_updated_time: Оновлений %s назад
+label_jump_to_a_project: Перейти до проекту...
+label_file_plural: Файли
+label_changeset_plural: Набори змін
+label_default_columns: Типові колонки
+label_no_change_option: (Немає змін)
+label_bulk_edit_selected_issues: Редагувати всі вибрані питання
+label_theme: Тема
+label_default: Типовий
+label_search_titles_only: Шукати тільки в назвах
+label_user_mail_option_all: "Для всіх подій у всіх моїх проектах"
+label_user_mail_option_selected: "Для всіх подій тільки у вибраному проекті..."
+label_user_mail_option_none: "Тільки для того, що я проглядаю або в чому я беру участь"
+label_user_mail_no_self_notified: "Не сповіщати про зміни, які я зробив сам"
+label_registration_activation_by_email: активація облікового запису електронною поштою
+label_registration_manual_activation: ручна активація облікового запису
+label_registration_automatic_activation: автоматична активація облыкового
+label_my_time_report: Мій звіт витраченого часу
+
+button_login: Вхід
+button_submit: Відправити
+button_save: Зберегти
+button_check_all: Відзначити все 
+button_uncheck_all: Очистити 
+button_delete: Видалити
+button_create: Створити
+button_test: Перевірити
+button_edit: Редагувати
+button_add: Додати
+button_change: Змінити
+button_apply: Застосувати
+button_clear: Очистити
+button_lock: Заблокувати
+button_unlock: Разблокувати
+button_download: Завантажити
+button_list: Список
+button_view: Переглянути
+button_move: Перемістити
+button_back: Назад
+button_cancel: Відмінити
+button_activate: Активувати
+button_sort: Сортувати
+button_log_time: Записати час
+button_rollback: Відкотити до даної версії
+button_watch: Дивитися
+button_unwatch: Не дивитися
+button_reply: Відповісти
+button_archive: Архівувати
+button_unarchive: Розархівувати
+button_reset: Перезапустити
+button_rename: Перейменувати
+button_change_password: Змінити пароль 
+button_copy: Копіювати
+button_annotate: Анотувати
+
+status_active: Активний
+status_registered: Зареєстрований 
+status_locked: Заблокований
+
+text_select_mail_notifications: Виберіть дії, на які відсилатиметься повідомлення на електронну пошту.
+text_regexp_info: eg. ^[A-Z0-9]+$
+text_min_max_length_info: 0 означає відсутність заборон
+text_project_destroy_confirmation: Ви наполягаєте на видаленні цього проекту і всієї інформації, що відноситься до нього?
+text_workflow_edit: Виберіть роль і координатор для редагування послідовності дій
+text_are_you_sure: Ви впевнені?
+text_journal_changed: змінився з %s на %s
+text_journal_set_to: параметр змінився на %s
+text_journal_deleted: видалено
+text_tip_task_begin_day: день початку задачі
+text_tip_task_end_day: день завершення задачі
+text_tip_task_begin_end_day: початок задачі і закінчення цього дня
+text_project_identifier_info: 'Рядкові букви (a-z), допустимі цифри і дефіс.<br />Збережений ідентифікатор не може бути змінений.'
+text_caracters_maximum: %d символів(а) максимум.
+text_caracters_minimum: Повинно мати якнайменше  %d символів(а) у довжину.
+text_length_between: Довжина між %d і %d символів.
+text_tracker_no_workflow: Для цього координатора послідовність дій не визначена
+text_unallowed_characters: Заборонені символи
+text_comma_separated: Допустимі декілька значень (розділені комою).
+text_issues_ref_in_commit_messages: Посилання та зміна питань у повідомленнях до подавань
+text_issue_added: Питання %s створено.
+text_issue_updated: Питання %s оновлено.
+text_wiki_destroy_confirmation: Ви впевнені, що хочете видалити цю wiki і весь зміст?
+text_issue_category_destroy_question: Декілька питань (%d) призначено в цю категорію. Що ви хочете зробити?
+text_issue_category_destroy_assignments: Видалити призначення категорії
+text_issue_category_reassign_to: Перепризначити задачі до даної категорії
+text_user_mail_option: "Для невибраних проектів ви отримуватимете повідомлення тільки про те, що проглядаєте або в чому берете участь (наприклад, питання автором яких ви є або які вам призначені)."
+
+default_role_manager: Менеджер
+default_role_developper: Розробник
+default_role_reporter: Репортер
+звітів default_tracker_bug: Помилка
+default_tracker_feature: Властивість 
+default_tracker_support: Підтримка
+default_issue_status_new: Новий
+default_issue_status_assigned: Призначено
+default_issue_status_resolved: Вирішено
+default_issue_status_feedback: Зворотний зв'язок
+default_issue_status_closed: Зачинено
+default_issue_status_rejected: Відмовлено
+default_doc_category_user: Документація користувача
+default_doc_category_tech: Технічна документація 
+default_priority_low: Низький
+default_priority_normal: Нормальний
+default_priority_high: Високий
+default_priority_urgent: Терміновий
+default_priority_immediate: Негайний
+default_activity_design: Проектування
+default_activity_development: Розробка
+
+enumeration_issue_priorities: Пріоритети питань
+enumeration_doc_categories: Категорії документів
+enumeration_activities: Дії (облік часу)
+text_status_changed_by_changeset: Applied in changeset %s.
+label_display_per_page: 'Per page: %s'
+label_issue_added: Issue added
+label_issue_updated: Issue updated
+setting_per_page_options: Objects per page options
+notice_default_data_loaded: Default configuration successfully loaded.
+error_scm_not_found: "Entry and/or revision doesn't exist in the repository."
+label_associated_revisions: Associated revisions
+label_document_added: Document added
+label_message_posted: Message added
+text_issues_destroy_confirmation: 'Are you sure you want to delete the selected issue(s) ?'
+error_scm_command_failed: "An error occurred when trying to access the repository: %s"
+setting_user_format: Users display format
+label_age: Age
+label_file_added: File added
+label_more: More
+field_default_value: Default value
+default_tracker_bug: Bug
+label_scm: SCM
+label_general: General
+button_update: Update
+text_select_project_modules: 'Select modules to enable for this project:'
+label_change_properties: Change properties
+text_load_default_configuration: Load the default configuration
+text_no_configuration_data: "Roles, trackers, issue statuses and workflow have not been configured yet.\nIt is highly recommended to load the default configuration. You will be able to modify it once loaded."
+label_news_added: News added
+label_repository_plural: Repositories
+error_can_t_load_default_data: "Default configuration could not be loaded: %s"
diff --git a/lang/zh-tw.yml b/lang/zh-tw.yml
index ad4cff73b..44bdfb12a 100644
--- a/lang/zh-tw.yml
+++ b/lang/zh-tw.yml
@@ -125,7 +125,7 @@ field_tracker: 追蹤標籤
 field_subject: 主旨
 field_due_date: 完成日期
 field_assigned_to: 分派給
-field_priority: 重要性
+field_priority: 優先權
 field_fixed_version: 版本
 field_user: 用戶
 field_role: 角色
@@ -219,9 +219,12 @@ label_issue_new: 建立新的項目
 label_issue_plural: 項目清單
 label_issue_view_all: 檢視所有項目
 label_issues_by: 項目按 %s 分組顯示
+label_issue_added: 項目已新增
+label_issue_updated: 項目已更新
 label_document: 文件
 label_document_new: 建立新的文件
 label_document_plural: 文件
+label_document_added: 文件已新增
 label_role: 角色
 label_role_plural: 角色
 label_role_new: 建立新角色
@@ -291,6 +294,7 @@ label_attachment: 檔案
 label_attachment_new: 建立新的檔案
 label_attachment_delete: 刪除檔案
 label_attachment_plural: 檔案
+label_file_added: 檔案已新增
 label_report: 報告
 label_report_plural: 報告
 label_news: 新聞
@@ -298,6 +302,7 @@ label_news_new: 建立新的新聞
 label_news_plural: 新聞
 label_news_latest: 最近新聞
 label_news_view_all: 檢視所有新聞
+label_news_added: 新聞已新增
 label_change_log: 變更記錄
 label_settings: 設定
 label_overview: 概觀
@@ -399,12 +404,12 @@ label_f_hour: %.2f 小時
 label_f_hour_plural: %.2f 小時
 label_time_tracking: Time tracking
 label_change_plural: 變更
-label_statistics: Statistics
-label_commits_per_month: Commits per month
-label_commits_per_author: Commits per author
-label_view_diff: View differences
-label_diff_inline: inline
-label_diff_side_by_side: side by side
+label_statistics: 統計資訊
+label_commits_per_month: 依月份統計送交次數
+label_commits_per_author: 依作者統計送交次數
+label_view_diff: 檢視差異
+label_diff_inline: 直列
+label_diff_side_by_side: 並排
 label_options: 選項清單
 label_copy_workflow_from: 從以下追蹤標籤複製工作流程
 label_permissions_report: 權限報表
@@ -424,7 +429,7 @@ label_end_to_start: end to start
 label_end_to_end: end to end
 label_start_to_start: start to start
 label_start_to_end: start to end
-label_stay_logged_in: Stay logged in
+label_stay_logged_in: 維持已登入狀態
 label_disabled: 關閉
 label_show_completed_versions: 顯示已完成的版本
 label_me: 我自己
@@ -435,6 +440,7 @@ label_topic_plural: 討論主題
 label_message_plural: 訊息
 label_message_last: 上一封訊息
 label_message_new: 建立新的訊息
+label_message_posted: 訊息已新增
 label_reply_plural: 回應
 label_send_information: 寄送帳戶資訊電子郵件給用戶
 label_year: 年
@@ -469,6 +475,8 @@ label_display_per_page: '每頁顯示: %s 個'
 label_age: Age
 label_change_properties: 變更屬性
 label_general: 一般
+label_more: 更多 »
+label_scm: 版本控管
 
 button_login: 登入
 button_submit: 送出
@@ -531,8 +539,8 @@ text_tracker_no_workflow: 此追蹤標籤尚未定義工作流程
 text_unallowed_characters: 不允許的字元
 text_comma_separated: 可輸入多個值 (以逗號分隔).
 text_issues_ref_in_commit_messages: 送交訊息中參照(或修正)項目之關鍵字
-text_issue_added: 已通報 %s 個項目 (by %s)
-text_issue_updated: 已更新 %s 個項目 (by %s)
+text_issue_added: 項目 %s 已被 %s 通報。
+text_issue_updated: 項目 %s 已被 %s 更新。
 text_wiki_destroy_confirmation: 您確定要刪除這個 wiki 和其中的所有內容？
 text_issue_category_destroy_question: 有 (%d) 個項目被指派到此分類. 請選擇您想要的動作？
 text_issue_category_destroy_assignments: 移除這些項目的分類
@@ -540,6 +548,9 @@ text_issue_category_reassign_to: 重新指派這些項目至其它分類
 text_user_mail_option: "For unselected projects, you will only receive notifications about things you watch or you're involved in (eg. issues you're the author or assignee)."
 text_no_configuration_data: "Roles, trackers, issue statuses and workflow have not been configured yet.\nIt is highly recommended to load the default configuration. You will be able to modify it once loaded."
 text_load_default_configuration: 載入預設組態
+text_status_changed_by_changeset: 已套用至變更集 %s.
+text_issues_destroy_confirmation: '確定刪除已選擇的項目？'
+text_select_project_modules: '選擇此專案可使用之模組：'
 
 default_role_manager: 管理人員
 default_role_developper: 開發人員
@@ -563,17 +574,6 @@ default_priority_immediate: 急
 default_activity_design: 設計
 default_activity_development: 開發
 
-enumeration_issue_priorities: 項目重要性
+enumeration_issue_priorities: 項目優先權
 enumeration_doc_categories: 文件分類
 enumeration_activities: 活動 (time tracking)
-text_status_changed_by_changeset: Applied in changeset %s.
-label_more: More
-text_issues_destroy_confirmation: 'Are you sure you want to delete the selected issue(s) ?'
-label_scm: SCM
-text_select_project_modules: 'Select modules to enable for this project:'
-label_issue_added: Issue added
-label_issue_updated: Issue updated
-label_document_added: Document added
-label_message_posted: Message added
-label_file_added: File added
-label_news_added: News added
diff --git a/public/javascripts/calendar/lang/calendar-lt.js b/public/javascripts/calendar/lang/calendar-lt.js
index a988a2c2e..888cfc801 100644
--- a/public/javascripts/calendar/lang/calendar-lt.js
+++ b/public/javascripts/calendar/lang/calendar-lt.js
@@ -1,9 +1,10 @@
 // ** I18N
 
-// Calendar EN language
-// Author: Mihai Bazon, <mihai_bazon@yahoo.com>
-// Encoding: any
+// Calendar LT language
+// Author: Gediminas Muižis, <gediminas.muizis@elgama.eu>
+// Encoding: UTF-8
 // Distributed under the same terms as the calendar itself.
+// Ver: 0.2
 
 // For translators: please use UTF-8 if possible.  We strongly believe that
 // Unicode is the answer to a real internationalized world.  Also please
@@ -45,7 +46,7 @@ Calendar._SDN = new Array
 
 // First day of the week. "0" means display Sunday first, "1" means display
 // Monday first, etc.
-Calendar._FD = 0;
+Calendar._FD = 1;
 
 // full month names
 Calendar._MN = new Array
@@ -68,11 +69,11 @@ Calendar._SMN = new Array
  "Vas",
  "Kov",
  "Bal",
- "May",
+ "Geg",
  "Brž",
  "Lie",
+ "Rgp",
  "Rgs",
- "Rgj",
  "Spl",
  "Lap",
  "Grd");
diff --git a/public/javascripts/calendar/lang/calendar-uk.js b/public/javascripts/calendar/lang/calendar-uk.js
new file mode 100644
index 000000000..0dbde793d
--- /dev/null
+++ b/public/javascripts/calendar/lang/calendar-uk.js
@@ -0,0 +1,127 @@
+// ** I18N
+
+// Calendar EN language
+// Author: Mihai Bazon, <mihai_bazon@yahoo.com>
+// Encoding: any
+// Distributed under the same terms as the calendar itself.
+
+// For translators: please use UTF-8 if possible.  We strongly believe that
+// Unicode is the answer to a real internationalized world.  Also please
+// include your contact information in the header, as can be seen above.
+
+// full day names
+Calendar._DN = new Array
+("Sunday",
+ "Monday",
+ "Tuesday",
+ "Wednesday",
+ "Thursday",
+ "Friday",
+ "Saturday",
+ "Sunday");
+
+// Please note that the following array of short day names (and the same goes
+// for short month names, _SMN) isn't absolutely necessary.  We give it here
+// for exemplification on how one can customize the short day names, but if
+// they are simply the first N letters of the full name you can simply say:
+//
+//   Calendar._SDN_len = N; // short day name length
+//   Calendar._SMN_len = N; // short month name length
+//
+// If N = 3 then this is not needed either since we assume a value of 3 if not
+// present, to be compatible with translation files that were written before
+// this feature.
+
+// short day names
+Calendar._SDN = new Array
+("Sun",
+ "Mon",
+ "Tue",
+ "Wed",
+ "Thu",
+ "Fri",
+ "Sat",
+ "Sun");
+
+// First day of the week. "0" means display Sunday first, "1" means display
+// Monday first, etc.
+Calendar._FD = 0;
+
+// full month names
+Calendar._MN = new Array
+("January",
+ "February",
+ "March",
+ "April",
+ "May",
+ "June",
+ "July",
+ "August",
+ "September",
+ "October",
+ "November",
+ "December");
+
+// short month names
+Calendar._SMN = new Array
+("Jan",
+ "Feb",
+ "Mar",
+ "Apr",
+ "May",
+ "Jun",
+ "Jul",
+ "Aug",
+ "Sep",
+ "Oct",
+ "Nov",
+ "Dec");
+
+// tooltips
+Calendar._TT = {};
+Calendar._TT["INFO"] = "About the calendar";
+
+Calendar._TT["ABOUT"] =
+"DHTML Date/Time Selector\n" +
+"(c) dynarch.com 2002-2005 / Author: Mihai Bazon\n" + // don't translate this this ;-)
+"For latest version visit: http://www.dynarch.com/projects/calendar/\n" +
+"Distributed under GNU LGPL.  See http://gnu.org/licenses/lgpl.html for details." +
+"\n\n" +
+"Date selection:\n" +
+"- Use the \xab, \xbb buttons to select year\n" +
+"- Use the " + String.fromCharCode(0x2039) + ", " + String.fromCharCode(0x203a) + " buttons to select month\n" +
+"- Hold mouse button on any of the above buttons for faster selection.";
+Calendar._TT["ABOUT_TIME"] = "\n\n" +
+"Time selection:\n" +
+"- Click on any of the time parts to increase it\n" +
+"- or Shift-click to decrease it\n" +
+"- or click and drag for faster selection.";
+
+Calendar._TT["PREV_YEAR"] = "Prev. year (hold for menu)";
+Calendar._TT["PREV_MONTH"] = "Prev. month (hold for menu)";
+Calendar._TT["GO_TODAY"] = "Go Today";
+Calendar._TT["NEXT_MONTH"] = "Next month (hold for menu)";
+Calendar._TT["NEXT_YEAR"] = "Next year (hold for menu)";
+Calendar._TT["SEL_DATE"] = "Select date";
+Calendar._TT["DRAG_TO_MOVE"] = "Drag to move";
+Calendar._TT["PART_TODAY"] = " (today)";
+
+// the following is to inform that "%s" is to be the first day of week
+// %s will be replaced with the day name.
+Calendar._TT["DAY_FIRST"] = "Display %s first";
+
+// This may be locale-dependent.  It specifies the week-end days, as an array
+// of comma-separated numbers.  The numbers are from 0 to 6: 0 means Sunday, 1
+// means Monday, etc.
+Calendar._TT["WEEKEND"] = "0,6";
+
+Calendar._TT["CLOSE"] = "Close";
+Calendar._TT["TODAY"] = "Today";
+Calendar._TT["TIME_PART"] = "(Shift-)Click or drag to change value";
+
+// date formats
+Calendar._TT["DEF_DATE_FORMAT"] = "%Y-%m-%d";
+Calendar._TT["TT_DATE_FORMAT"] = "%a, %b %e";
+
+Calendar._TT["WK"] = "wk";
+Calendar._TT["TIME"] = "Time:";
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-uk.js b/public/javascripts/jstoolbar/lang/jstoolbar-uk.js
new file mode 100644
index 000000000..cd36a4b55
--- /dev/null
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-uk.js
@@ -0,0 +1,14 @@
+jsToolBar.strings = {};
+jsToolBar.strings['Strong'] = 'Strong';
+jsToolBar.strings['Italic'] = 'Italic';
+jsToolBar.strings['Underline'] = 'Underline';
+jsToolBar.strings['Deleted'] = 'Deleted';
+jsToolBar.strings['Code'] = 'Inline Code';
+jsToolBar.strings['Heading 1'] = 'Heading 1';
+jsToolBar.strings['Heading 2'] = 'Heading 2';
+jsToolBar.strings['Heading 3'] = 'Heading 3';
+jsToolBar.strings['Unordered list'] = 'Unordered list';
+jsToolBar.strings['Ordered list'] = 'Ordered list';
+jsToolBar.strings['Preformatted text'] = 'Preformatted text';
+jsToolBar.strings['Wiki link'] = 'Link to a Wiki page';
+jsToolBar.strings['Image'] = 'Image';

From 384a444cee694c7a8fcaeb91b421164ac255ac56 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sat, 16 Feb 2008 09:14:59 +0000
Subject: [PATCH 210/710] Fix grammar error in e-mail footer (closes #673).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1150 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 config/settings.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/settings.yml b/config/settings.yml
index 4f7be5132..590ebee6a 100644
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -106,6 +106,6 @@ ui_theme:
   default: ''
 emails_footer:
   default: |-
-    You have received this notification because you have either subscribed to it, or are involved in.
+    You have received this notification because you have either subscribed to it, or are involved in it.
     To change your notification preferences, please click here: http://hostname/my/account
   
\ No newline at end of file

From abb0b15407b33cbe50dc263474631c5bfcf2bd5f Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sat, 16 Feb 2008 10:15:19 +0000
Subject: [PATCH 211/710] Added translation support for project modules names
 and a few other strings.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1151 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/admin/info.rhtml                 | 12 ++++++------
 app/views/projects/list_files.rhtml        |  2 +-
 app/views/projects/settings/_modules.rhtml |  5 +++--
 app/views/settings/_authentication.rhtml   |  2 +-
 lang/bg.yml                                | 15 +++++++++++++++
 lang/cs.yml                                | 15 +++++++++++++++
 lang/de.yml                                | 15 +++++++++++++++
 lang/en.yml                                | 16 ++++++++++++++++
 lang/es.yml                                | 15 +++++++++++++++
 lang/fi.yml                                | 15 +++++++++++++++
 lang/fr.yml                                | 16 ++++++++++++++++
 lang/he.yml                                | 15 +++++++++++++++
 lang/it.yml                                | 15 +++++++++++++++
 lang/ja.yml                                | 15 +++++++++++++++
 lang/ko.yml                                | 15 +++++++++++++++
 lang/lt.yml                                | 15 +++++++++++++++
 lang/nl.yml                                | 15 +++++++++++++++
 lang/pl.yml                                | 15 +++++++++++++++
 lang/pt-br.yml                             | 15 +++++++++++++++
 lang/pt.yml                                | 15 +++++++++++++++
 lang/ro.yml                                | 15 +++++++++++++++
 lang/ru.yml                                | 15 +++++++++++++++
 lang/sr.yml                                | 15 +++++++++++++++
 lang/sv.yml                                | 15 +++++++++++++++
 lang/uk.yml                                | 15 +++++++++++++++
 lang/zh-tw.yml                             | 15 +++++++++++++++
 lang/zh.yml                                | 15 +++++++++++++++
 27 files changed, 358 insertions(+), 10 deletions(-)

diff --git a/app/views/admin/info.rhtml b/app/views/admin/info.rhtml
index 15ab94851..05c27f5ac 100644
--- a/app/views/admin/info.rhtml
+++ b/app/views/admin/info.rhtml
@@ -1,16 +1,16 @@
 <h2><%=l(:label_information_plural)%></h2>
 
-<p><%=l(:field_version)%>: <strong><%= Redmine::Info.versioned_name %></strong> (<%= @db_adapter_name %>)</p>
+<p><strong><%= Redmine::Info.versioned_name %></strong> (<%= @db_adapter_name %>)</p>
 
 <table class="list">
-<tr class="odd"><td>Default administrator account changed</td><td><%= image_tag (@flags[:default_admin_changed] ? 'true.png' : 'false.png'), :style => "vertical-align:bottom;" %></td></tr>
-<tr class="even"><td>File repository writable</td><td><%= image_tag (@flags[:file_repository_writable] ? 'true.png' : 'false.png'), :style => "vertical-align:bottom;" %></td></tr>
-<tr class="odd"><td>RMagick available</td><td><%= image_tag (@flags[:rmagick_available] ? 'true.png' : 'false.png'), :style => "vertical-align:bottom;" %></td></tr>
+<tr class="odd"><td><%= l(:text_default_administrator_account_changed) %></td><td><%= image_tag (@flags[:default_admin_changed] ? 'true.png' : 'false.png'), :style => "vertical-align:bottom;" %></td></tr>
+<tr class="even"><td><%= l(:text_file_repository_writable) %></td><td><%= image_tag (@flags[:file_repository_writable] ? 'true.png' : 'false.png'), :style => "vertical-align:bottom;" %></td></tr>
+<tr class="odd"><td><%= l(:text_rmagick_available) %></td><td><%= image_tag (@flags[:rmagick_available] ? 'true.png' : 'false.png'), :style => "vertical-align:bottom;" %></td></tr>
 </table>
 
 <% if @plugins.any? %>
 &nbsp;
-<h3 class="icon22 icon22-plugin">Plugins</h3>
+<h3 class="icon22 icon22-plugin"><%= l(:label_plugins) %></h3>
 <table class="list">
     <% @plugins.keys.sort {|x,y| x.to_s <=> y.to_s}.each do |plugin| %>
         <tr class="<%= cycle('odd', 'even') %>">
@@ -18,7 +18,7 @@
         <td><%=h @plugins[plugin].description %></td>
         <td><%=h @plugins[plugin].author %></td>
         <td><%=h @plugins[plugin].version %></td>
-        <td><%= link_to('Configure', :controller => 'settings', :action => 'plugin', :id => plugin.to_s) if @plugins[plugin].configurable? %></td>
+        <td><%= link_to(l(:button_configure), :controller => 'settings', :action => 'plugin', :id => plugin.to_s) if @plugins[plugin].configurable? %></td>
         </tr>
     <% end %>
 </table>
diff --git a/app/views/projects/list_files.rhtml b/app/views/projects/list_files.rhtml
index 9b297de59..47b262388 100644
--- a/app/views/projects/list_files.rhtml
+++ b/app/views/projects/list_files.rhtml
@@ -12,7 +12,7 @@
     <th><%=l(:field_filename)%></th>
     <th><%=l(:label_date)%></th>
     <th><%=l(:field_filesize)%></th>
-    <th>D/L</th>
+    <th><%=l(:label_downloads_abbr)%></th>
     <th>MD5</th>
     <% if delete_allowed %><th></th><% end %>
   </tr></thead>
diff --git a/app/views/projects/settings/_modules.rhtml b/app/views/projects/settings/_modules.rhtml
index d600f2090..b4decf78a 100644
--- a/app/views/projects/settings/_modules.rhtml
+++ b/app/views/projects/settings/_modules.rhtml
@@ -4,9 +4,10 @@
             
 <div class=box>
 <strong><%= l(:text_select_project_modules) %></strong>
-<br />
+
 <% Redmine::AccessControl.available_project_modules.each do |m| %>
-<p><label><%= check_box_tag 'enabled_modules[]', m, @project.module_enabled?(m) %> <%= m.to_s.humanize %></label></p>
+<p><label><%= check_box_tag 'enabled_modules[]', m, @project.module_enabled?(m) -%>
+ <%= (l_has_string?("project_module_#{m}".to_sym) ? l("project_module_#{m}".to_sym) : m.to_s.humanize) %></label></p>
 <% end %>
 </div>
 
diff --git a/app/views/settings/_authentication.rhtml b/app/views/settings/_authentication.rhtml
index a8fa63f0d..6bf20cbce 100644
--- a/app/views/settings/_authentication.rhtml
+++ b/app/views/settings/_authentication.rhtml
@@ -20,7 +20,7 @@
 </div>
 
 <div style="float:right;">
-    <%= link_to 'Manage LDAP authentication...', :controller => 'auth_sources', :action => 'list' %>
+    <%= link_to l(:label_ldap_authentication), :controller => 'auth_sources', :action => 'list' %>
 </div>
 
 <%= submit_tag l(:button_save) %>
diff --git a/lang/bg.yml b/lang/bg.yml
index 88ac9c889..a0f439eab 100644
--- a/lang/bg.yml
+++ b/lang/bg.yml
@@ -577,3 +577,18 @@ label_document_added: Document added
 label_message_posted: Message added
 label_file_added: File added
 label_news_added: News added
+project_module_boards: Boards
+project_module_issue_tracking: Issue tracking
+project_module_wiki: Wiki
+project_module_files: Files
+project_module_documents: Documents
+project_module_repository: Repository
+project_module_news: News
+project_module_time_tracking: Time tracking
+text_file_repository_writable: File repository writable
+text_default_administrator_account_changed: Default administrator account changed
+text_rmagick_available: RMagick available (optional)
+button_configure: Configure
+label_plugins: Plugins
+label_ldap_authentication: LDAP authentication
+label_downloads_abbr: D/L
diff --git a/lang/cs.yml b/lang/cs.yml
index fd4ee5223..d952ffd57 100644
--- a/lang/cs.yml
+++ b/lang/cs.yml
@@ -577,3 +577,18 @@ label_document_added: Document added
 label_message_posted: Message added
 label_file_added: File added
 label_news_added: News added
+project_module_boards: Boards
+project_module_issue_tracking: Issue tracking
+project_module_wiki: Wiki
+project_module_files: Files
+project_module_documents: Documents
+project_module_repository: Repository
+project_module_news: News
+project_module_time_tracking: Time tracking
+text_file_repository_writable: File repository writable
+text_default_administrator_account_changed: Default administrator account changed
+text_rmagick_available: RMagick available (optional)
+button_configure: Configure
+label_plugins: Plugins
+label_ldap_authentication: LDAP authentication
+label_downloads_abbr: D/L
diff --git a/lang/de.yml b/lang/de.yml
index ba6589b24..15b033b04 100644
--- a/lang/de.yml
+++ b/lang/de.yml
@@ -577,3 +577,18 @@ label_document_added: Document added
 label_message_posted: Message added
 label_file_added: File added
 label_news_added: News added
+project_module_boards: Boards
+project_module_issue_tracking: Issue tracking
+project_module_wiki: Wiki
+project_module_files: Files
+project_module_documents: Documents
+project_module_repository: Repository
+project_module_news: News
+project_module_time_tracking: Time tracking
+text_file_repository_writable: File repository writable
+text_default_administrator_account_changed: Default administrator account changed
+text_rmagick_available: RMagick available (optional)
+button_configure: Configure
+label_plugins: Plugins
+label_ldap_authentication: LDAP authentication
+label_downloads_abbr: D/L
diff --git a/lang/en.yml b/lang/en.yml
index c0b986238..509fe4252 100644
--- a/lang/en.yml
+++ b/lang/en.yml
@@ -206,6 +206,15 @@ setting_protocol: Protocol
 setting_per_page_options: Objects per page options
 setting_user_format: Users display format
 
+project_module_issue_tracking: Issue tracking
+project_module_time_tracking: Time tracking
+project_module_news: News
+project_module_documents: Documents
+project_module_files: Files
+project_module_wiki: Wiki
+project_module_repository: Repository
+project_module_boards: Boards
+
 label_user: User
 label_user_plural: Users
 label_user_new: New user
@@ -477,6 +486,9 @@ label_change_properties: Change properties
 label_general: General
 label_more: More
 label_scm: SCM
+label_plugins: Plugins
+label_ldap_authentication: LDAP authentication
+label_downloads_abbr: D/L
 
 button_login: Login
 button_submit: Submit
@@ -514,6 +526,7 @@ button_change_password: Change password
 button_copy: Copy
 button_annotate: Annotate
 button_update: Update
+button_configure: Configure
 
 status_active: active
 status_registered: registered
@@ -551,6 +564,9 @@ text_load_default_configuration: Load the default configuration
 text_status_changed_by_changeset: Applied in changeset %s.
 text_issues_destroy_confirmation: 'Are you sure you want to delete the selected issue(s) ?'
 text_select_project_modules: 'Select modules to enable for this project:'
+text_default_administrator_account_changed: Default administrator account changed
+text_file_repository_writable: File repository writable
+text_rmagick_available: RMagick available (optional)
 
 default_role_manager: Manager
 default_role_developper: Developer
diff --git a/lang/es.yml b/lang/es.yml
index d76e7c8a6..0b048af9b 100644
--- a/lang/es.yml
+++ b/lang/es.yml
@@ -580,3 +580,18 @@ label_document_added: Document added
 label_message_posted: Message added
 label_file_added: File added
 label_news_added: News added
+project_module_boards: Boards
+project_module_issue_tracking: Issue tracking
+project_module_wiki: Wiki
+project_module_files: Files
+project_module_documents: Documents
+project_module_repository: Repository
+project_module_news: News
+project_module_time_tracking: Time tracking
+text_file_repository_writable: File repository writable
+text_default_administrator_account_changed: Default administrator account changed
+text_rmagick_available: RMagick available (optional)
+button_configure: Configure
+label_plugins: Plugins
+label_ldap_authentication: LDAP authentication
+label_downloads_abbr: D/L
diff --git a/lang/fi.yml b/lang/fi.yml
index e0b1d5c4a..aa6bb2834 100644
--- a/lang/fi.yml
+++ b/lang/fi.yml
@@ -581,3 +581,18 @@ label_file_added: File added
 label_scm: SCM
 text_select_project_modules: 'Select modules to enable for this project:'
 label_news_added: News added
+project_module_boards: Boards
+project_module_issue_tracking: Issue tracking
+project_module_wiki: Wiki
+project_module_files: Files
+project_module_documents: Documents
+project_module_repository: Repository
+project_module_news: News
+project_module_time_tracking: Time tracking
+text_file_repository_writable: File repository writable
+text_default_administrator_account_changed: Default administrator account changed
+text_rmagick_available: RMagick available (optional)
+button_configure: Configure
+label_plugins: Plugins
+label_ldap_authentication: LDAP authentication
+label_downloads_abbr: D/L
diff --git a/lang/fr.yml b/lang/fr.yml
index 2f2c3cab1..97469d7df 100644
--- a/lang/fr.yml
+++ b/lang/fr.yml
@@ -206,6 +206,15 @@ setting_protocol: Protocole
 setting_per_page_options: Options d'objets affichés par page
 setting_user_format: Format d'affichage des utilisateurs
 
+project_module_issue_tracking: Suivi des demandes
+project_module_time_tracking: Suivi du temps passé
+project_module_news: Publication d'annonces
+project_module_documents: Publication de documents
+project_module_files: Publication de fichiers
+project_module_wiki: Wiki
+project_module_repository: Dépôt de sources
+project_module_boards: Forums de discussion
+
 label_user: Utilisateur
 label_user_plural: Utilisateurs
 label_user_new: Nouvel utilisateur
@@ -477,6 +486,9 @@ label_change_properties: Changer les propriétés
 label_general: Général
 label_more: Plus
 label_scm: SCM
+label_plugins: Plugins
+label_ldap_authentication: Authentification LDAP
+label_downloads_abbr: D/L
 
 button_login: Connexion
 button_submit: Soumettre
@@ -514,6 +526,7 @@ button_change_password: Changer de mot de passe
 button_copy: Copier
 button_annotate: Annoter
 button_update: Mettre à jour
+button_configure: Configurer
 
 status_active: actif
 status_registered: enregistré
@@ -551,6 +564,9 @@ text_load_default_configuration: Charger le paramétrage par défaut
 text_status_changed_by_changeset: Appliqué par commit %s.
 text_issues_destroy_confirmation: 'Etes-vous sûr de vouloir supprimer le(s) demandes(s) selectionnée(s) ?'
 text_select_project_modules: 'Selectionner les modules à activer pour ce project:'
+text_default_administrator_account_changed: Compte administrateur par défaut changé
+text_file_repository_writable: Répertoire de stockage des fichiers accessible en écriture
+text_rmagick_available: Bibliothèque RMagick présente (optionnelle)
 
 default_role_manager: Manager
 default_role_developper: Développeur
diff --git a/lang/he.yml b/lang/he.yml
index 9cd91d387..578e30814 100644
--- a/lang/he.yml
+++ b/lang/he.yml
@@ -577,3 +577,18 @@ label_document_added: Document added
 label_message_posted: Message added
 label_file_added: File added
 label_news_added: News added
+project_module_boards: Boards
+project_module_issue_tracking: Issue tracking
+project_module_wiki: Wiki
+project_module_files: Files
+project_module_documents: Documents
+project_module_repository: Repository
+project_module_news: News
+project_module_time_tracking: Time tracking
+text_file_repository_writable: File repository writable
+text_default_administrator_account_changed: Default administrator account changed
+text_rmagick_available: RMagick available (optional)
+button_configure: Configure
+label_plugins: Plugins
+label_ldap_authentication: LDAP authentication
+label_downloads_abbr: D/L
diff --git a/lang/it.yml b/lang/it.yml
index 78bfbb9c3..650390a88 100644
--- a/lang/it.yml
+++ b/lang/it.yml
@@ -577,3 +577,18 @@ label_document_added: Document added
 label_message_posted: Message added
 label_file_added: File added
 label_news_added: News added
+project_module_boards: Boards
+project_module_issue_tracking: Issue tracking
+project_module_wiki: Wiki
+project_module_files: Files
+project_module_documents: Documents
+project_module_repository: Repository
+project_module_news: News
+project_module_time_tracking: Time tracking
+text_file_repository_writable: File repository writable
+text_default_administrator_account_changed: Default administrator account changed
+text_rmagick_available: RMagick available (optional)
+button_configure: Configure
+label_plugins: Plugins
+label_ldap_authentication: LDAP authentication
+label_downloads_abbr: D/L
diff --git a/lang/ja.yml b/lang/ja.yml
index 0ef22d50b..e926e9255 100644
--- a/lang/ja.yml
+++ b/lang/ja.yml
@@ -578,3 +578,18 @@ label_document_added: Document added
 label_message_posted: Message added
 label_file_added: File added
 label_news_added: News added
+project_module_boards: Boards
+project_module_issue_tracking: Issue tracking
+project_module_wiki: Wiki
+project_module_files: Files
+project_module_documents: Documents
+project_module_repository: Repository
+project_module_news: News
+project_module_time_tracking: Time tracking
+text_file_repository_writable: File repository writable
+text_default_administrator_account_changed: Default administrator account changed
+text_rmagick_available: RMagick available (optional)
+button_configure: Configure
+label_plugins: Plugins
+label_ldap_authentication: LDAP authentication
+label_downloads_abbr: D/L
diff --git a/lang/ko.yml b/lang/ko.yml
index 606cf7e11..cef2494a4 100644
--- a/lang/ko.yml
+++ b/lang/ko.yml
@@ -577,3 +577,18 @@ label_document_added: Document added
 label_message_posted: Message added
 label_file_added: File added
 label_news_added: News added
+project_module_boards: Boards
+project_module_issue_tracking: Issue tracking
+project_module_wiki: Wiki
+project_module_files: Files
+project_module_documents: Documents
+project_module_repository: Repository
+project_module_news: News
+project_module_time_tracking: Time tracking
+text_file_repository_writable: File repository writable
+text_default_administrator_account_changed: Default administrator account changed
+text_rmagick_available: RMagick available (optional)
+button_configure: Configure
+label_plugins: Plugins
+label_ldap_authentication: LDAP authentication
+label_downloads_abbr: D/L
diff --git a/lang/lt.yml b/lang/lt.yml
index 2447a279d..e49346d3e 100644
--- a/lang/lt.yml
+++ b/lang/lt.yml
@@ -578,3 +578,18 @@ label_document_added: Dokumentas pridėtas
 label_message_posted: Pranešimas pridėtas
 label_file_added: Byla pridėta
 label_news_added: Naujiena pridėta
+project_module_boards: Boards
+project_module_issue_tracking: Issue tracking
+project_module_wiki: Wiki
+project_module_files: Files
+project_module_documents: Documents
+project_module_repository: Repository
+project_module_news: News
+project_module_time_tracking: Time tracking
+text_file_repository_writable: File repository writable
+text_default_administrator_account_changed: Default administrator account changed
+text_rmagick_available: RMagick available (optional)
+button_configure: Configure
+label_plugins: Plugins
+label_ldap_authentication: LDAP authentication
+label_downloads_abbr: D/L
diff --git a/lang/nl.yml b/lang/nl.yml
index 30ea9dd5d..5f711eef2 100644
--- a/lang/nl.yml
+++ b/lang/nl.yml
@@ -578,3 +578,18 @@ label_document_added: Document added
 label_message_posted: Message added
 label_file_added: File added
 label_news_added: News added
+project_module_boards: Boards
+project_module_issue_tracking: Issue tracking
+project_module_wiki: Wiki
+project_module_files: Files
+project_module_documents: Documents
+project_module_repository: Repository
+project_module_news: News
+project_module_time_tracking: Time tracking
+text_file_repository_writable: File repository writable
+text_default_administrator_account_changed: Default administrator account changed
+text_rmagick_available: RMagick available (optional)
+button_configure: Configure
+label_plugins: Plugins
+label_ldap_authentication: LDAP authentication
+label_downloads_abbr: D/L
diff --git a/lang/pl.yml b/lang/pl.yml
index fce25d09b..51b9930cb 100644
--- a/lang/pl.yml
+++ b/lang/pl.yml
@@ -577,3 +577,18 @@ label_document_added: Document added
 label_message_posted: Message added
 label_file_added: File added
 label_news_added: News added
+project_module_boards: Boards
+project_module_issue_tracking: Issue tracking
+project_module_wiki: Wiki
+project_module_files: Files
+project_module_documents: Documents
+project_module_repository: Repository
+project_module_news: News
+project_module_time_tracking: Time tracking
+text_file_repository_writable: File repository writable
+text_default_administrator_account_changed: Default administrator account changed
+text_rmagick_available: RMagick available (optional)
+button_configure: Configure
+label_plugins: Plugins
+label_ldap_authentication: LDAP authentication
+label_downloads_abbr: D/L
diff --git a/lang/pt-br.yml b/lang/pt-br.yml
index 4df1c9c1e..3d47c1417 100644
--- a/lang/pt-br.yml
+++ b/lang/pt-br.yml
@@ -577,3 +577,18 @@ label_document_added: Document added
 label_message_posted: Message added
 label_file_added: File added
 label_news_added: News added
+project_module_boards: Boards
+project_module_issue_tracking: Issue tracking
+project_module_wiki: Wiki
+project_module_files: Files
+project_module_documents: Documents
+project_module_repository: Repository
+project_module_news: News
+project_module_time_tracking: Time tracking
+text_file_repository_writable: File repository writable
+text_default_administrator_account_changed: Default administrator account changed
+text_rmagick_available: RMagick available (optional)
+button_configure: Configure
+label_plugins: Plugins
+label_ldap_authentication: LDAP authentication
+label_downloads_abbr: D/L
diff --git a/lang/pt.yml b/lang/pt.yml
index 9aa017ee9..578a556fe 100644
--- a/lang/pt.yml
+++ b/lang/pt.yml
@@ -577,3 +577,18 @@ label_document_added: Document added
 label_message_posted: Message added
 label_file_added: File added
 label_news_added: News added
+project_module_boards: Boards
+project_module_issue_tracking: Issue tracking
+project_module_wiki: Wiki
+project_module_files: Files
+project_module_documents: Documents
+project_module_repository: Repository
+project_module_news: News
+project_module_time_tracking: Time tracking
+text_file_repository_writable: File repository writable
+text_default_administrator_account_changed: Default administrator account changed
+text_rmagick_available: RMagick available (optional)
+button_configure: Configure
+label_plugins: Plugins
+label_ldap_authentication: LDAP authentication
+label_downloads_abbr: D/L
diff --git a/lang/ro.yml b/lang/ro.yml
index 16f055413..2139442b5 100644
--- a/lang/ro.yml
+++ b/lang/ro.yml
@@ -577,3 +577,18 @@ label_document_added: Document added
 label_message_posted: Message added
 label_file_added: File added
 label_news_added: News added
+project_module_boards: Boards
+project_module_issue_tracking: Issue tracking
+project_module_wiki: Wiki
+project_module_files: Files
+project_module_documents: Documents
+project_module_repository: Repository
+project_module_news: News
+project_module_time_tracking: Time tracking
+text_file_repository_writable: File repository writable
+text_default_administrator_account_changed: Default administrator account changed
+text_rmagick_available: RMagick available (optional)
+button_configure: Configure
+label_plugins: Plugins
+label_ldap_authentication: LDAP authentication
+label_downloads_abbr: D/L
diff --git a/lang/ru.yml b/lang/ru.yml
index d4bd03080..e4b3272f6 100644
--- a/lang/ru.yml
+++ b/lang/ru.yml
@@ -581,3 +581,18 @@ label_news_added: Новость добавлена
 label_calendar_filter: Включая
 label_calendar_no_assigned: не мои
 label_timelog_today: Расход времени за сегодня
+project_module_boards: Boards
+project_module_issue_tracking: Issue tracking
+project_module_wiki: Wiki
+project_module_files: Files
+project_module_documents: Documents
+project_module_repository: Repository
+project_module_news: News
+project_module_time_tracking: Time tracking
+text_file_repository_writable: File repository writable
+text_default_administrator_account_changed: Default administrator account changed
+text_rmagick_available: RMagick available (optional)
+button_configure: Configure
+label_plugins: Plugins
+label_ldap_authentication: LDAP authentication
+label_downloads_abbr: D/L
diff --git a/lang/sr.yml b/lang/sr.yml
index 55f668790..0972f507d 100644
--- a/lang/sr.yml
+++ b/lang/sr.yml
@@ -578,3 +578,18 @@ label_document_added: Document added
 label_message_posted: Message added
 label_file_added: File added
 label_news_added: News added
+project_module_boards: Boards
+project_module_issue_tracking: Issue tracking
+project_module_wiki: Wiki
+project_module_files: Files
+project_module_documents: Documents
+project_module_repository: Repository
+project_module_news: News
+project_module_time_tracking: Time tracking
+text_file_repository_writable: File repository writable
+text_default_administrator_account_changed: Default administrator account changed
+text_rmagick_available: RMagick available (optional)
+button_configure: Configure
+label_plugins: Plugins
+label_ldap_authentication: LDAP authentication
+label_downloads_abbr: D/L
diff --git a/lang/sv.yml b/lang/sv.yml
index b2d637dca..f370da42b 100644
--- a/lang/sv.yml
+++ b/lang/sv.yml
@@ -578,3 +578,18 @@ label_document_added: Document added
 label_message_posted: Message added
 label_file_added: File added
 label_news_added: News added
+project_module_boards: Boards
+project_module_issue_tracking: Issue tracking
+project_module_wiki: Wiki
+project_module_files: Files
+project_module_documents: Documents
+project_module_repository: Repository
+project_module_news: News
+project_module_time_tracking: Time tracking
+text_file_repository_writable: File repository writable
+text_default_administrator_account_changed: Default administrator account changed
+text_rmagick_available: RMagick available (optional)
+button_configure: Configure
+label_plugins: Plugins
+label_ldap_authentication: LDAP authentication
+label_downloads_abbr: D/L
diff --git a/lang/uk.yml b/lang/uk.yml
index dc146dcfd..82d2856b5 100644
--- a/lang/uk.yml
+++ b/lang/uk.yml
@@ -579,3 +579,18 @@ text_no_configuration_data: "Roles, trackers, issue statuses and workflow have n
 label_news_added: News added
 label_repository_plural: Repositories
 error_can_t_load_default_data: "Default configuration could not be loaded: %s"
+project_module_boards: Boards
+project_module_issue_tracking: Issue tracking
+project_module_wiki: Wiki
+project_module_files: Files
+project_module_documents: Documents
+project_module_repository: Repository
+project_module_news: News
+project_module_time_tracking: Time tracking
+text_file_repository_writable: File repository writable
+text_default_administrator_account_changed: Default administrator account changed
+text_rmagick_available: RMagick available (optional)
+button_configure: Configure
+label_plugins: Plugins
+label_ldap_authentication: LDAP authentication
+label_downloads_abbr: D/L
diff --git a/lang/zh-tw.yml b/lang/zh-tw.yml
index 44bdfb12a..439647ff8 100644
--- a/lang/zh-tw.yml
+++ b/lang/zh-tw.yml
@@ -577,3 +577,18 @@ default_activity_development: 開發
 enumeration_issue_priorities: 項目優先權
 enumeration_doc_categories: 文件分類
 enumeration_activities: 活動 (time tracking)
+project_module_boards: Boards
+project_module_issue_tracking: Issue tracking
+project_module_wiki: Wiki
+project_module_files: Files
+project_module_documents: Documents
+project_module_repository: Repository
+project_module_news: News
+project_module_time_tracking: Time tracking
+text_file_repository_writable: File repository writable
+text_default_administrator_account_changed: Default administrator account changed
+text_rmagick_available: RMagick available (optional)
+button_configure: Configure
+label_plugins: Plugins
+label_ldap_authentication: LDAP authentication
+label_downloads_abbr: D/L
diff --git a/lang/zh.yml b/lang/zh.yml
index 0edd41c52..70d97c781 100644
--- a/lang/zh.yml
+++ b/lang/zh.yml
@@ -580,3 +580,18 @@ label_document_added: Document added
 label_message_posted: Message added
 label_file_added: File added
 label_news_added: News added
+project_module_boards: Boards
+project_module_issue_tracking: Issue tracking
+project_module_wiki: Wiki
+project_module_files: Files
+project_module_documents: Documents
+project_module_repository: Repository
+project_module_news: News
+project_module_time_tracking: Time tracking
+text_file_repository_writable: File repository writable
+text_default_administrator_account_changed: Default administrator account changed
+text_rmagick_available: RMagick available (optional)
+button_configure: Configure
+label_plugins: Plugins
+label_ldap_authentication: LDAP authentication
+label_downloads_abbr: D/L

From 1c8cf4ef8338736ebcaa905f8932545a24e817c6 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sat, 16 Feb 2008 13:19:33 +0000
Subject: [PATCH 212/710] Added the following permissions (#527, #585, #627): *
 edit_issue_notes: let user edit any notes * edit_own_issue_notes: let user
 edit his own notes only

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1152 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/journals_controller.rb      |  2 +-
 app/helpers/journals_helper.rb              |  2 +-
 app/models/journal.rb                       |  3 ++-
 app/views/issues/_history.rhtml             |  2 ++
 app/views/journals/update.rjs               | 11 ++++++++---
 lib/redmine.rb                              |  2 ++
 test/functional/journals_controller_test.rb |  8 ++++++++
 7 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/app/controllers/journals_controller.rb b/app/controllers/journals_controller.rb
index 05d41fa30..758b8507f 100644
--- a/app/controllers/journals_controller.rb
+++ b/app/controllers/journals_controller.rb
@@ -22,11 +22,11 @@ class JournalsController < ApplicationController
   def edit
     if request.post?
       @journal.update_attributes(:notes => params[:notes]) if params[:notes]
+      @journal.destroy if @journal.details.empty? && @journal.notes.blank?
       respond_to do |format|
         format.html { redirect_to :controller => 'issues', :action => 'show', :id => @journal.journalized_id }
         format.js { render :action => 'update' }
       end
-      return
     end
   end
   
diff --git a/app/helpers/journals_helper.rb b/app/helpers/journals_helper.rb
index 2f902432d..234bfabc0 100644
--- a/app/helpers/journals_helper.rb
+++ b/app/helpers/journals_helper.rb
@@ -19,7 +19,7 @@ module JournalsHelper
   def render_notes(journal, options={})
     content = ''
     editable = journal.editable_by?(User.current)
-    if editable
+    if editable && !journal.notes.blank?
       links = []
       links << link_to_in_place_notes_editor(image_tag('edit.png'), "journal-#{journal.id}-notes", 
                                              { :controller => 'journals', :action => 'edit', :id => journal },
diff --git a/app/models/journal.rb b/app/models/journal.rb
index df7308435..013e2644d 100644
--- a/app/models/journal.rb
+++ b/app/models/journal.rb
@@ -51,6 +51,7 @@ class Journal < ActiveRecord::Base
   end
   
   def editable_by?(usr)
-    usr && usr.admin?
+    project = journalized.project
+    usr && usr.logged? && (usr.allowed_to?(:edit_issue_notes, project) || (self.user == usr && usr.allowed_to?(:edit_own_issue_notes, project)))
   end
 end
diff --git a/app/views/issues/_history.rhtml b/app/views/issues/_history.rhtml
index edfb9b94d..7c1ee2113 100644
--- a/app/views/issues/_history.rhtml
+++ b/app/views/issues/_history.rhtml
@@ -1,5 +1,6 @@
 <% note_id = 1 %>
 <% for journal in journals %>
+    <div id="change-<%= journal.id %>">
 	<h4><div style="float:right;"><%= link_to "##{note_id}", :anchor => "note-#{note_id}" %></div>
 	<%= content_tag('a', '', :name => "note-#{note_id}")%>
 	<%= format_time(journal.created_on) %> - <%= journal.user.name %></h4>
@@ -9,5 +10,6 @@
 	<% end %>
 	</ul>
 	<%= render_notes(journal) unless journal.notes.blank? %>
+	</div>
   	<% note_id += 1 %>
 <% end %>
diff --git a/app/views/journals/update.rjs b/app/views/journals/update.rjs
index 9da0ebeae..2b5a54c0a 100644
--- a/app/views/journals/update.rjs
+++ b/app/views/journals/update.rjs
@@ -1,3 +1,8 @@
-page.replace "journal-#{@journal.id}-notes", render_notes(@journal)
-page.show "journal-#{@journal.id}-notes"
-page.remove "journal-#{@journal.id}-form"
+if @journal.frozen?
+  # journal was destroyed
+  page.remove "change-#{@journal.id}"
+else
+  page.replace "journal-#{@journal.id}-notes", render_notes(@journal)
+  page.show "journal-#{@journal.id}-notes"
+  page.remove "journal-#{@journal.id}-form"
+end
diff --git a/lib/redmine.rb b/lib/redmine.rb
index b235df32e..e76d77e9e 100644
--- a/lib/redmine.rb
+++ b/lib/redmine.rb
@@ -34,6 +34,8 @@ Redmine::AccessControl.map do |map|
     map.permission :edit_issues, {:issues => [:edit, :bulk_edit, :destroy_attachment]}
     map.permission :manage_issue_relations, {:issue_relations => [:new, :destroy]}
     map.permission :add_issue_notes, {:issues => :edit}
+    map.permission :edit_issue_notes, {:journals => :edit}, :require => :loggedin
+    map.permission :edit_own_issue_notes, {:journals => :edit}, :require => :loggedin
     map.permission :move_issues, {:issues => :move}, :require => :loggedin
     map.permission :delete_issues, {:issues => :destroy}, :require => :member
     # Queries
diff --git a/test/functional/journals_controller_test.rb b/test/functional/journals_controller_test.rb
index f231d10ee..e6a90185c 100644
--- a/test/functional/journals_controller_test.rb
+++ b/test/functional/journals_controller_test.rb
@@ -48,4 +48,12 @@ class JournalsControllerTest < ActionController::TestCase
     assert_select_rjs :replace, 'journal-2-notes'
     assert_equal 'Updated notes', Journal.find(2).notes
   end
+  
+  def test_post_edit_with_empty_notes
+    @request.session[:user_id] = 1
+    xhr :post, :edit, :id => 2, :notes => ''
+    assert_response :success
+    assert_select_rjs :remove, 'change-2'
+    assert_nil Journal.find_by_id(2)
+  end
 end

From 05823373724e472b6b7f9f172733aa16d132ced7 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sat, 16 Feb 2008 15:34:17 +0000
Subject: [PATCH 213/710] Added: * the 'include' macro to include a wiki page *
 macro escaping support (with exclamation mark)

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1153 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 lib/redmine/wiki_formatting.rb               | 21 +++++++++++++-------
 lib/redmine/wiki_formatting/macros.rb        | 21 ++++++++++++++++++--
 test/unit/helpers/application_helper_test.rb |  3 +++
 3 files changed, 36 insertions(+), 9 deletions(-)

diff --git a/lib/redmine/wiki_formatting.rb b/lib/redmine/wiki_formatting.rb
index f7fa803a6..79da2a38a 100644
--- a/lib/redmine/wiki_formatting.rb
+++ b/lib/redmine/wiki_formatting.rb
@@ -93,21 +93,28 @@ module Redmine
       end
       
       MACROS_RE = /
+                    (!)?                        # escaping
+                    (
                     \{\{                        # opening tag
                     ([\w]+)                     # macro name
                     (\(([^\}]*)\))?             # optional arguments
                     \}\}                        # closing tag
+                    )
                   /x unless const_defined?(:MACROS_RE)
       
       def inline_macros(text)
         text.gsub!(MACROS_RE) do
-          all, macro = $&, $1.downcase
-          args = ($3 || '').split(',').each(&:strip)
-          begin
-            @macros_runner.call(macro, args)
-          rescue => e
-            "<div class=\"flash error\">Error executing the <strong>#{macro}</strong> macro (#{e})</div>"
-          end || all
+          esc, all, macro = $1, $2, $3.downcase
+          args = ($5 || '').split(',').each(&:strip)
+          if esc.nil?
+            begin
+              @macros_runner.call(macro, args)
+            rescue => e
+              "<div class=\"flash error\">Error executing the <strong>#{macro}</strong> macro (#{e})</div>"
+            end || all
+          else
+            all
+          end
         end
       end
       
diff --git a/lib/redmine/wiki_formatting/macros.rb b/lib/redmine/wiki_formatting/macros.rb
index f9920afdb..c0f2b222a 100644
--- a/lib/redmine/wiki_formatting/macros.rb
+++ b/lib/redmine/wiki_formatting/macros.rb
@@ -62,7 +62,7 @@ module Redmine
       end
           
       # Builtin macros
-      desc "Example macro."
+      desc "Sample macro."
       macro :hello_world do |obj, args|
         "Hello world! Object: #{obj.class.name}, " + (args.empty? ? "Called with no argument." : "Arguments: #{args.join(', ')}")
       end
@@ -72,10 +72,27 @@ module Redmine
         out = ''
         @@available_macros.keys.collect(&:to_s).sort.each do |macro|
           out << content_tag('dt', content_tag('code', macro))
-          out << content_tag('dd', simple_format(@@available_macros[macro.to_sym]))
+          out << content_tag('dd', textilizable(@@available_macros[macro.to_sym]))
         end
         content_tag('dl', out)
       end
+      
+      desc "Include a wiki page. Example:\n\n  !{{include(Foo)}}"
+      macro :include do |obj, args|
+        if @project && !@project.wiki.nil?
+          page = @project.wiki.find_page(args.first)
+          if page && page.content
+            @included_wiki_pages ||= []
+            raise 'Circular inclusion detected' if @included_wiki_pages.include?(page.title)
+            @included_wiki_pages << page.title
+            out = textilizable(page.content, :text)
+            @included_wiki_pages.pop
+            out
+          else
+            raise "Page #{args.first} doesn't exist"
+          end
+        end
+      end
     end
   end
 end
diff --git a/test/unit/helpers/application_helper_test.rb b/test/unit/helpers/application_helper_test.rb
index 33509cfc0..4e617f699 100644
--- a/test/unit/helpers/application_helper_test.rb
+++ b/test/unit/helpers/application_helper_test.rb
@@ -120,6 +120,9 @@ class ApplicationHelperTest < HelperTestCase
   def test_macro_hello_world
     text = "{{hello_world}}"
     assert textilizable(text).match(/Hello world!/)
+    # escaping
+    text = "!{{hello_world}}"
+    assert_equal '<p>{{hello_world}}</p>', textilizable(text)
   end
   
   def test_date_format_default

From 153c4c242d7ade5f9c35fe75090bcb170c26ab96 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sat, 16 Feb 2008 16:20:35 +0000
Subject: [PATCH 214/710] Atom feeds: * prevent duplicate entry ids for issue
 changes * prevent empty email in author element

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1154 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/models/journal.rb           | 2 +-
 app/views/common/feed.atom.rxml | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/models/journal.rb b/app/models/journal.rb
index 013e2644d..5aebbb7ce 100644
--- a/app/models/journal.rb
+++ b/app/models/journal.rb
@@ -32,7 +32,7 @@ class Journal < ActiveRecord::Base
   acts_as_event :title => Proc.new {|o| "#{o.issue.tracker.name} ##{o.issue.id}: #{o.issue.subject}" + ((s = o.new_status) ? " (#{s})" : '') },
                 :description => :notes,
                 :author => :user,
-                :url => Proc.new {|o| {:controller => 'issues', :action => 'show', :id => o.issue.id}}
+                :url => Proc.new {|o| {:controller => 'issues', :action => 'show', :id => o.issue.id, :anchor => "change-#{o.id}"}}
 
   def save
     # Do not save an empty journal
diff --git a/app/views/common/feed.atom.rxml b/app/views/common/feed.atom.rxml
index 59b3163f4..6695565f4 100644
--- a/app/views/common/feed.atom.rxml
+++ b/app/views/common/feed.atom.rxml
@@ -15,8 +15,8 @@ xml.feed "xmlns" => "http://www.w3.org/2005/Atom" do
       xml.updated item.event_datetime.xmlschema
       author = item.event_author if item.respond_to?(:author)
       xml.author do
-        xml.name(author.is_a?(User) ? author.name : author)
-        xml.email(author.mail) if author.is_a?(User)
+        xml.name(author)
+        xml.email(author.mail) if author.respond_to?(:mail) && !author.mail.blank?
       end if author
       xml.content "type" => "html" do
         xml.text! textilizable(item.event_description)

From 0153954ebb6abde6b1021ad6e80d3bb0dd99aade Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sat, 16 Feb 2008 16:25:58 +0000
Subject: [PATCH 215/710] Added a simple rake task to fetch changesets from the
 repositories:

  rake redmine:fetch_changesets

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1155 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 lib/tasks/fetch_changesets.rake | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
 create mode 100644 lib/tasks/fetch_changesets.rake

diff --git a/lib/tasks/fetch_changesets.rake b/lib/tasks/fetch_changesets.rake
new file mode 100644
index 000000000..681032bd6
--- /dev/null
+++ b/lib/tasks/fetch_changesets.rake
@@ -0,0 +1,24 @@
+# redMine - project management software
+# Copyright (C) 2006-2008  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.
+
+desc 'Fetch changesets from the repositories'
+
+namespace :redmine do
+  task :fetch_changesets => :environment do
+    Repository.fetch_changesets
+  end
+end

From 53a04b0a44ca8cc8a2be369234377d6625892e84 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sat, 16 Feb 2008 18:09:26 +0000
Subject: [PATCH 216/710] Fixed: CVS repository doesn't work if port is used in
 the url (#653). Added functional tests for CVS adapter.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1156 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 lib/redmine/scm/adapters/cvs_adapter.rb       |   4 +-
 .../functional/application_controller_test.rb |   1 +
 .../repositories_cvs_controller_test.rb       | 133 ++++++++++++++++++
 ...repositories_subversion_controller_test.rb |   1 +
 4 files changed, 137 insertions(+), 2 deletions(-)
 create mode 100644 test/functional/repositories_cvs_controller_test.rb

diff --git a/lib/redmine/scm/adapters/cvs_adapter.rb b/lib/redmine/scm/adapters/cvs_adapter.rb
index 73dc9b6c4..c0f60c02a 100644
--- a/lib/redmine/scm/adapters/cvs_adapter.rb
+++ b/lib/redmine/scm/adapters/cvs_adapter.rb
@@ -140,8 +140,8 @@ module Redmine
               
               if state=="entry_start"
                 branch_map=Hash.new
-                # gsub(/^:.*@[^:]+:/, '') is here to remove :pserver:anonymous@foo.bar: string if present in the url
-                if /^RCS file: #{Regexp.escape(root_url.gsub(/^:.*@[^:]+:/, ''))}\/#{Regexp.escape(path_with_project)}(.+),v$/ =~ line
+                # gsub(/^:.*@[^:]+:\d*/, '') is here to remove :pserver:anonymous@foo.bar: string if present in the url
+                if /^RCS file: #{Regexp.escape(root_url.gsub(/^:.*@[^:]+:\d*/, ''))}\/#{Regexp.escape(path_with_project)}(.+),v$/ =~ line
                   entry_path = normalize_cvs_path($1)
                   entry_name = normalize_path(File.basename($1))
                   logger.debug("Path #{entry_path} <=> Name #{entry_name}")
diff --git a/test/functional/application_controller_test.rb b/test/functional/application_controller_test.rb
index 3a40b15a9..6fcf8fe9a 100644
--- a/test/functional/application_controller_test.rb
+++ b/test/functional/application_controller_test.rb
@@ -35,5 +35,6 @@ class ApplicationControllerTest < Test::Unit::TestCase
     GLoc.valid_languages.each do |lang|
       assert set_language_if_valid(lang)
     end
+    set_language_if_valid('en')
   end
 end
diff --git a/test/functional/repositories_cvs_controller_test.rb b/test/functional/repositories_cvs_controller_test.rb
new file mode 100644
index 000000000..059823707
--- /dev/null
+++ b/test/functional/repositories_cvs_controller_test.rb
@@ -0,0 +1,133 @@
+# redMine - project management software
+# Copyright (C) 2006-2008  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 File.dirname(__FILE__) + '/../test_helper'
+require 'repositories_controller'
+
+# Re-raise errors caught by the controller.
+class RepositoriesController; def rescue_action(e) raise e end; end
+
+class RepositoriesCvsControllerTest < Test::Unit::TestCase
+
+  # No '..' in the repository path
+  REPOSITORY_PATH = RAILS_ROOT.gsub(%r{config\/\.\.}, '') + '/tmp/test/cvs_repository'
+  REPOSITORY_PATH.gsub!(/\//, "\\") if RUBY_PLATFORM =~ /mswin/
+  # CVS module
+  MODULE_NAME = 'test'
+  
+  def setup
+    @controller = RepositoriesController.new
+    @request    = ActionController::TestRequest.new
+    @response   = ActionController::TestResponse.new
+    Setting.default_language = 'en'
+    User.current = nil
+
+    @project = Project.find(1)
+    @project.repository = Repository::Cvs.create(:root_url => REPOSITORY_PATH,
+                                                 :url => MODULE_NAME)
+  end
+  
+  if File.directory?(REPOSITORY_PATH)
+    def test_show
+      get :show, :id => 1
+      assert_response :success
+      assert_template 'show'
+      assert_not_nil assigns(:entries)
+      assert_not_nil assigns(:changesets)
+    end
+    
+    def test_browse_root
+      get :browse, :id => 1
+      assert_response :success
+      assert_template 'browse'
+      assert_not_nil assigns(:entries)
+      assert_equal 3, assigns(:entries).size
+      
+      entry = assigns(:entries).detect {|e| e.name == 'images'}
+      assert_equal 'dir', entry.kind
+
+      entry = assigns(:entries).detect {|e| e.name == 'README'}
+      assert_equal 'file', entry.kind
+    end
+    
+    def test_browse_directory
+      get :browse, :id => 1, :path => ['sources']
+      assert_response :success
+      assert_template 'browse'
+      assert_not_nil assigns(:entries)
+      entry = assigns(:entries).detect {|e| e.name == 'watchers_controller.rb'}
+      assert_equal 'file', entry.kind
+      assert_equal 'sources/watchers_controller.rb', entry.path
+    end
+  
+    def test_entry
+      get :entry, :id => 1, :path => ['sources', 'watchers_controller.rb']
+      assert_response :success
+      assert_template 'entry'
+    end
+    
+    def test_entry_not_found
+      get :entry, :id => 1, :path => ['sources', 'zzz.c']
+      assert_tag :tag => 'div', :attributes => { :class => /error/ },
+                                :content => /Entry and\/or revision doesn't exist/
+    end
+  
+    def test_entry_download
+      get :entry, :id => 1, :path => ['sources', 'watchers_controller.rb'], :format => 'raw'
+      assert_response :success
+    end
+    
+    def test_diff
+      Project.find(1).repository.fetch_changesets
+      get :diff, :id => 1, :rev => 3, :type => 'inline'
+      assert_response :success
+      assert_template 'diff'
+      assert_tag :tag => 'td', :attributes => { :class => 'line-code diff_out' },
+                               :content => /watched.remove_watcher/
+      assert_tag :tag => 'td', :attributes => { :class => 'line-code diff_in' },
+                               :content => /watched.remove_all_watcher/
+    end
+
+    def test_annotate
+      Project.find(1).repository.fetch_changesets
+      get :annotate, :id => 1, :path => ['sources', 'watchers_controller.rb']
+      assert_response :success
+      assert_template 'annotate'
+      # 1.1 line
+      assert_tag :tag => 'th', :attributes => { :class => 'line-num' },
+                               :content => '18',
+                               :sibling => { :tag => 'td', :attributes => { :class => 'revision' },
+                                             :content => /1.1/,
+                                             :sibling => { :tag => 'td', :attributes => { :class => 'author' },
+                                                           :content => /LANG/
+                                           }
+                               }
+      # 1.2 line
+      assert_tag :tag => 'th', :attributes => { :class => 'line-num' },
+                               :content => '32',
+                               :sibling => { :tag => 'td', :attributes => { :class => 'revision' },
+                                             :content => /1.2/,
+                                             :sibling => { :tag => 'td', :attributes => { :class => 'author' },
+                                                           :content => /LANG/
+                                           }
+                               }
+    end
+  else
+    puts "CVS test repository NOT FOUND. Skipping functional tests !!!"
+    def test_fake; assert true end
+  end
+end
diff --git a/test/functional/repositories_subversion_controller_test.rb b/test/functional/repositories_subversion_controller_test.rb
index ab5ec14ca..a70682818 100644
--- a/test/functional/repositories_subversion_controller_test.rb
+++ b/test/functional/repositories_subversion_controller_test.rb
@@ -31,6 +31,7 @@ class RepositoriesSubversionControllerTest < Test::Unit::TestCase
     @controller = RepositoriesController.new
     @request    = ActionController::TestRequest.new
     @response   = ActionController::TestResponse.new
+    Setting.default_language = 'en'
     User.current = nil
   end
 

From a798a1ac4dc75f5fc64ea7a1e7808fb798f12f97 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sat, 16 Feb 2008 18:28:46 +0000
Subject: [PATCH 217/710] Removed fragment caching on gantt and calendar.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1157 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/issues_controller.rb   |  2 --
 app/controllers/projects_controller.rb |  3 --
 app/controllers/versions_controller.rb |  2 --
 app/sweepers/issue_sweeper.rb          | 38 ------------------------
 app/sweepers/project_sweeper.rb        | 40 --------------------------
 app/sweepers/version_sweeper.rb        | 34 ----------------------
 app/views/projects/calendar.rhtml      |  2 --
 app/views/projects/gantt.rhtml         |  5 ----
 8 files changed, 126 deletions(-)
 delete mode 100644 app/sweepers/issue_sweeper.rb
 delete mode 100644 app/sweepers/project_sweeper.rb
 delete mode 100644 app/sweepers/version_sweeper.rb

diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index b0e82d365..8b3cc339d 100644
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -25,8 +25,6 @@ class IssuesController < ApplicationController
   before_filter :authorize, :except => [:index, :changes, :preview, :update_form, :context_menu]
   before_filter :find_optional_project, :only => [:index, :changes]
   accept_key_auth :index, :changes
-  
-  cache_sweeper :issue_sweeper, :only => [ :new, :edit, :bulk_edit, :destroy ]
 
   helper :journals
   helper :projects
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index cddfb6f81..a3eac71ab 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -29,9 +29,6 @@ class ProjectsController < ApplicationController
   before_filter :require_admin, :only => [ :add, :archive, :unarchive, :destroy ]
   accept_key_auth :activity, :calendar
   
-  cache_sweeper :project_sweeper, :only => [ :add, :edit, :archive, :unarchive, :destroy ]
-  cache_sweeper :version_sweeper, :only => [ :add_version ]
-
   helper :sort
   include SortHelper
   helper :custom_fields
diff --git a/app/controllers/versions_controller.rb b/app/controllers/versions_controller.rb
index 55b3a7fce..aeb802ccb 100644
--- a/app/controllers/versions_controller.rb
+++ b/app/controllers/versions_controller.rb
@@ -20,8 +20,6 @@ class VersionsController < ApplicationController
   menu_item :roadmap
   before_filter :find_project, :authorize
 
-  cache_sweeper :version_sweeper, :only => [ :edit, :destroy ]
-  
   def show
   end
   
diff --git a/app/sweepers/issue_sweeper.rb b/app/sweepers/issue_sweeper.rb
deleted file mode 100644
index dc9020535..000000000
--- a/app/sweepers/issue_sweeper.rb
+++ /dev/null
@@ -1,38 +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.
-
-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
diff --git a/app/sweepers/project_sweeper.rb b/app/sweepers/project_sweeper.rb
deleted file mode 100644
index f64f6f564..000000000
--- a/app/sweepers/project_sweeper.rb
+++ /dev/null
@@ -1,40 +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.
-
-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
diff --git a/app/sweepers/version_sweeper.rb b/app/sweepers/version_sweeper.rb
deleted file mode 100644
index e1323e261..000000000
--- a/app/sweepers/version_sweeper.rb
+++ /dev/null
@@ -1,34 +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.
-
-class VersionSweeper < ActionController::Caching::Sweeper
-  observe Version
-
-  def after_save(version)
-    expire_cache_for(version)
-  end
-  
-  def after_destroy(version)
-    expire_cache_for(version)
-  end
-          
-private
-  def expire_cache_for(version)
-    # calendar and gantt fragments of the project
-    expire_fragment(Regexp.new("projects/(calendar|gantt)/#{version.project_id}\\."))
-  end
-end
diff --git a/app/views/projects/calendar.rhtml b/app/views/projects/calendar.rhtml
index 3214d7b06..a2af3e2bb 100644
--- a/app/views/projects/calendar.rhtml
+++ b/app/views/projects/calendar.rhtml
@@ -1,4 +1,3 @@
-<% cache(:year => @year, :month => @month, :tracker_ids => @selected_tracker_ids, :subprojects => params[:with_subprojects], :lang => current_language) do %>
 <h2><%= "#{month_name(@month)} #{@year}" %></h2>
 
 <table width="100%">
@@ -20,7 +19,6 @@
 <%= image_tag 'arrow_from.png' %>&nbsp;&nbsp;<%= l(:text_tip_task_begin_day) %><br />
 <%= image_tag 'arrow_to.png' %>&nbsp;&nbsp;<%= l(:text_tip_task_end_day) %><br />
 <%= image_tag 'arrow_bw.png' %>&nbsp;&nbsp;<%= l(:text_tip_task_begin_end_day) %><br />
-<% end %>
 
 <% content_for :sidebar do %>
     <h3><%= l(:label_calendar) %></h3>
diff --git a/app/views/projects/gantt.rhtml b/app/views/projects/gantt.rhtml
index 0e252aeae..ece776699 100644
--- a/app/views/projects/gantt.rhtml
+++ b/app/views/projects/gantt.rhtml
@@ -55,8 +55,6 @@ t_height = g_height + headers_height
 </table>
 <% end %>
 
-<% cache(:year => @year_from, :month => @month_from, :months => @months, :zoom => @zoom, :tracker_ids => @selected_tracker_ids, :subprojects => params[:with_subprojects], :lang => current_language) do %>
-
 <table width="100%" style="border:0; border-collapse: collapse;">
 <tr>
 <td style="width:<%= subject_width %>px;">
@@ -205,9 +203,6 @@ top = headers_height + 10
 	<% top = top + 20
 end %>
 
-<% end # cache 
-%>
-
 <%
 #
 # Today red line (excluded from cache)

From 33493f8010fd9fdd4f1d0eb914aac82c1d02d0b3 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sat, 16 Feb 2008 19:28:24 +0000
Subject: [PATCH 218/710] Mantis importer: do not duplicate Mantis username in
 firstname and lastname if realname is blank.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1158 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 lib/tasks/migrate_from_mantis.rake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/tasks/migrate_from_mantis.rake b/lib/tasks/migrate_from_mantis.rake
index 99607f2a2..5f9663a39 100644
--- a/lib/tasks/migrate_from_mantis.rake
+++ b/lib/tasks/migrate_from_mantis.rake
@@ -93,7 +93,7 @@ task :migrate_from_mantis => :environment do
       end
       
       def lastname
-        @lastname = realname.blank? ? username : realname.split[1..-1].join(' ')[0..29]
+        @lastname = realname.blank? ? '-' : realname.split[1..-1].join(' ')[0..29]
         @lastname.gsub!(/[^\w\s\'\-]/i, '')
         @lastname = '-' if @lastname.blank?
         @lastname

From d69a05a6eef989301d7fb79a9521744a731dd48e Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sat, 16 Feb 2008 21:05:10 +0000
Subject: [PATCH 219/710] Rescue and display an error message when trying to
 delete a role that is in use.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1159 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/roles_controller.rb | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/app/controllers/roles_controller.rb b/app/controllers/roles_controller.rb
index a8a31cd4d..4796bb7f0 100644
--- a/app/controllers/roles_controller.rb
+++ b/app/controllers/roles_controller.rb
@@ -53,12 +53,11 @@ class RolesController < ApplicationController
 
   def destroy
     @role = Role.find(params[:id])
-    #unless @role.members.empty?
-    #  flash[:error] = 'Some members have this role. Can\'t delete it.'
-    #else
-      @role.destroy
-    #end
+    @role.destroy
     redirect_to :action => 'list'
+  rescue
+    flash[:error] = 'This role is in use and can not be deleted.'
+    redirect_to :action => 'index'
   end
   
   def move

From 5d6d0136c1322a209bb17077fa908659a756a998 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sat, 16 Feb 2008 21:24:12 +0000
Subject: [PATCH 220/710] =?UTF-8?q?Fixes=20for=20wiki=5Fsyntax.html=20(#67?=
 =?UTF-8?q?8)=20by=20Thomas=20L=C3=B6ber.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1160 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 public/help/wiki_syntax.html | 40 +++++++++++++++++++-----------------
 1 file changed, 21 insertions(+), 19 deletions(-)

diff --git a/public/help/wiki_syntax.html b/public/help/wiki_syntax.html
index f02eb62ab..17b54a0b2 100644
--- a/public/help/wiki_syntax.html
+++ b/public/help/wiki_syntax.html
@@ -1,9 +1,11 @@
-<html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<meta http-equiv="Content-Style-Type" content="text/css" />
 <title>Wiki formatting</title>
-<link rel="stylesheet" href="html.css" type="text/css">
-<style>
+<link rel="stylesheet" href="html.css" type="text/css" />
+<style type="text/css">
 h1 { font-family: Verdana, sans-serif; font-size: 14px; text-align: center; color: #444; }
 table { font-family: Verdana, sans-serif; font-size: 12px; color: #444; }
 table td { vertical-align: top; background-color: #f5f5f5; height: 2em; vertical-align: middle;}
@@ -20,13 +22,13 @@ table td h3 { font-size: 1.2em; text-align: left; }
 
 <table width="100%">
 <tr><th colspan="3">Font Styles</th></tr>
-<tr><th><img src="../../images/jstoolbar/bt_strong.png" style="border: 1px solid #bbb;" /></th><td width="50%">*Strong*</td><td width="50%"><strong>Strong</strong></td></tr>
-<tr><th><img src="../../images/jstoolbar/bt_em.png" style="border: 1px solid #bbb;" /></th><td>_Italic_</td><td><em>Italic</em></td></tr>
-<tr><th><img src="../../images/jstoolbar/bt_ins.png" style="border: 1px solid #bbb;" /></th><td>+Underline+</td><td><ins>Underline</ins></td></tr>
-<tr><th><img src="../../images/jstoolbar/bt_del.png" style="border: 1px solid #bbb;" /></th><td>-Deleted-</td><td><del>Deleted</del></td></tr>
-<tr><th><img src="../../images/jstoolbar/bt_quote.png" style="border: 1px solid #bbb;" /></th><td>??Quote??</td><td><cite>Quote</cite></td></tr>
-<tr><th><img src="../../images/jstoolbar/bt_code.png" style="border: 1px solid #bbb;" /></th><td>@Code@</td><td><code>Code</code></td></tr>
-<tr><th></th><td>&lt;pre><br>&nbsp;lines<br />&nbsp;of code<br />&lt;/pre></td><td>
+<tr><th><img src="../../images/jstoolbar/bt_strong.png" style="border: 1px solid #bbb;" alt="Strong" /></th><td width="50%">*Strong*</td><td width="50%"><strong>Strong</strong></td></tr>
+<tr><th><img src="../../images/jstoolbar/bt_em.png" style="border: 1px solid #bbb;" alt="Italic" /></th><td>_Italic_</td><td><em>Italic</em></td></tr>
+<tr><th><img src="../../images/jstoolbar/bt_ins.png" style="border: 1px solid #bbb;" alt="Underline" /></th><td>+Underline+</td><td><ins>Underline</ins></td></tr>
+<tr><th><img src="../../images/jstoolbar/bt_del.png" style="border: 1px solid #bbb;" alt="Deleted" /></th><td>-Deleted-</td><td><del>Deleted</del></td></tr>
+<tr><th></th><td>??Quote??</td><td><cite>Quote</cite></td></tr>
+<tr><th><img src="../../images/jstoolbar/bt_code.png" style="border: 1px solid #bbb;" alt="Inline Code" /></th><td>@Inline Code@</td><td><code>Inline Code</code></td></tr>
+<tr><th><img src="../../images/jstoolbar/bt_pre.png" style="border: 1px solid #bbb;" alt="Preformatted text" /></th><td>&lt;pre><br />&nbsp;lines<br />&nbsp;of code<br />&lt;/pre></td><td>
 <pre>
  lines
  of code
@@ -34,24 +36,24 @@ table td h3 { font-size: 1.2em; text-align: left; }
 </td></tr>
 
 <tr><th colspan="3">Lists</th></tr>
-<tr><th><img src="../../images/jstoolbar/bt_ul.png" style="border: 1px solid #bbb;" /></th><td>* Item 1<br />* Item 2</td><td><ul><li>Item 1</li><li>Item 2</li></ul></td></tr>
-<tr><th><img src="../../images/jstoolbar/bt_ol.png" style="border: 1px solid #bbb;" /></th><td># Item 1<br /># Item 2</td><td><ol><li>Item 1</li><li>Item 2</li></ol></td></tr>
+<tr><th><img src="../../images/jstoolbar/bt_ul.png" style="border: 1px solid #bbb;" alt="Unordered list" /></th><td>* Item 1<br />* Item 2</td><td><ul><li>Item 1</li><li>Item 2</li></ul></td></tr>
+<tr><th><img src="../../images/jstoolbar/bt_ol.png" style="border: 1px solid #bbb;" alt="Ordered list" /></th><td># Item 1<br /># Item 2</td><td><ol><li>Item 1</li><li>Item 2</li></ol></td></tr>
 
 <tr><th colspan="3">Headings</th></tr>
-<tr><th></th><td>h1. Title 1</td><td><h1>Title 1</h1></td></tr>
-<tr><th><img src="../../images/jstoolbar/bt_heading.png" style="border: 1px solid #bbb;" /></th><td>h2. Title 2</td><td><h2>Title 2</h2></td></tr>
-<tr><th></th><td>h3. Title 3</td><td><h3>Title 3</h3></td></tr>
+<tr><th><img src="../../images/jstoolbar/bt_h1.png" style="border: 1px solid #bbb;" alt="Heading 1" /></th><td>h1. Title 1</td><td><h1>Title 1</h1></td></tr>
+<tr><th><img src="../../images/jstoolbar/bt_h2.png" style="border: 1px solid #bbb;" alt="Heading 2" /></th><td>h2. Title 2</td><td><h2>Title 2</h2></td></tr>
+<tr><th><img src="../../images/jstoolbar/bt_h3.png" style="border: 1px solid #bbb;" alt="Heading 3" /></th><td>h3. Title 3</td><td><h3>Title 3</h3></td></tr>
 
 <tr><th colspan="3">Links</th></tr>
 <tr><th></th><td>http://foo.bar</td><td><a href="#">http://foo.bar</a></td></tr>
-<tr><th><img src="../../images/jstoolbar/bt_link.png" style="border: 1px solid #bbb;" /></th><td>[[Wiki page]]</td><td><a href="#">Wiki page</a></td></tr>
+<tr><th><img src="../../images/jstoolbar/bt_link.png" style="border: 1px solid #bbb;" alt="Link to a Wiki page" /></th><td>[[Wiki page]]</td><td><a href="#">Wiki page</a></td></tr>
 <tr><th></th><td>Issue #12</td><td>Issue <a href="#">#12</a></td></tr>
 <tr><th></th><td>Revision r43</td><td>Revision <a href="#">r43</a></td></tr>
 
 <tr><th colspan="3">Inline images</th></tr>
-<tr><th></th><td>!<em>image_url</em>!</td><td></td></tr>
+<tr><th><img src="../../images/jstoolbar/bt_img.png" style="border: 1px solid #bbb;" alt="Image" /></th><td>!<em>image_url</em>!</td><td></td></tr>
 <tr><th></th><td>!<em>attached_image</em>!</td><td></td></tr>
 </table>
 
 </body>
-</html>
\ No newline at end of file
+</html>

From e5daf25618e017e50293a77ea33ddc51cf1603b3 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 17 Feb 2008 14:17:20 +0000
Subject: [PATCH 221/710] Fixes: * email notifications: host name is missing in
 generated links (#639, #201) * email notifications: referenced changesets,
 wiki pages, attachments... are not turned into links (only ticket ids are) *
 attachment links and inline images don't work in issue notes

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1161 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/helpers/application_helper.rb             | 37 ++++++++++++-------
 app/models/journal.rb                         |  9 ++++-
 app/views/mailer/_issue_text_html.rhtml       |  2 +-
 .../mailer/document_added.text.html.rhtml     |  2 +-
 app/views/mailer/issue_edit.text.html.rhtml   |  2 +-
 .../mailer/message_posted.text.html.rhtml     |  2 +-
 app/views/mailer/news_added.text.html.rhtml   |  2 +-
 test/fixtures/journals.yml                    |  2 +-
 test/unit/mailer_test.rb                      | 21 ++++++++++-
 9 files changed, 58 insertions(+), 21 deletions(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index b66851eef..e39ea0906 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -178,16 +178,20 @@ module ApplicationHelper
     case args.size
     when 1
       obj = nil
-      text = args.shift || ''
+      text = args.shift
     when 2
       obj = args.shift
-      text = obj.send(args.shift)
+      text = obj.send(args.shift).to_s
     else
       raise ArgumentError, 'invalid arguments to textilizable'
     end
+    return '' if text.blank?
+    
+    only_path = options.delete(:only_path) == false ? false : true
 
     # when using an image link, try to use an attachment, if possible
-    attachments = options[:attachments]
+    attachments = options[:attachments] || (obj && obj.respond_to?(:attachments) ? obj.attachments : nil)
+    
     if attachments
       text = text.gsub(/!((\<|\=|\>)?(\([^\)]+\))?(\[[^\]]+\])?(\{[^\}]+\})?)(\S+\.(gif|jpg|jpeg|png))!/) do |m|
         style = $1
@@ -195,7 +199,7 @@ module ApplicationHelper
         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 => 'download', :id => found.id
+          image_url = url_for :only_path => only_path, :controller => 'attachments', :action => 'download', :id => found.id
           "!#{style}#{image_url}!"
         else
           "!#{style}#{filename}!"
@@ -216,10 +220,10 @@ module ApplicationHelper
       # used for single-file wiki export
       format_wiki_link = Proc.new {|project, title| "##{title}" }
     else
-      format_wiki_link = Proc.new {|project, title| url_for :controller => 'wiki', :action => 'index', :id => project, :page => title }
+      format_wiki_link = Proc.new {|project, title| url_for(:only_path => only_path, :controller => 'wiki', :action => 'index', :id => project, :page => title) }
     end
     
-    project = options[:project] || @project
+    project = options[:project] || @project || (obj && obj.respond_to?(:project) ? obj.project : nil)
     
     # Wiki links
     # 
@@ -278,7 +282,8 @@ module ApplicationHelper
       if esc.nil?
         if prefix.nil? && sep == 'r'
           if project && (changeset = project.changesets.find_by_revision(oid))
-            link = link_to("r#{oid}", {:controller => 'repositories', :action => 'revision', :id => project.id, :rev => oid}, :class => 'changeset',
+            link = link_to("r#{oid}", {:only_path => only_path, :controller => 'repositories', :action => 'revision', :id => project.id, :rev => oid},
+                                      :class => 'changeset',
                                       :title => truncate(changeset.comments, 100))
           end
         elsif sep == '#'
@@ -286,17 +291,20 @@ module ApplicationHelper
           case prefix
           when nil
             if issue = Issue.find_by_id(oid, :include => [:project, :status], :conditions => Project.visible_by(User.current))        
-              link = link_to("##{oid}", {:controller => 'issues', :action => 'show', :id => oid}, :class => 'issue',
+              link = link_to("##{oid}", {:only_path => only_path, :controller => 'issues', :action => 'show', :id => oid},
+                                        :class => 'issue',
                                         :title => "#{truncate(issue.subject, 100)} (#{issue.status.name})")
               link = content_tag('del', link) if issue.closed?
             end
           when 'document'
             if document = Document.find_by_id(oid, :include => [:project], :conditions => Project.visible_by(User.current))
-              link = link_to h(document.title), {:controller => 'documents', :action => 'show', :id => document}, :class => 'document'
+              link = link_to h(document.title), {:only_path => only_path, :controller => 'documents', :action => 'show', :id => document},
+                                                :class => 'document'
             end
           when 'version'
             if version = Version.find_by_id(oid, :include => [:project], :conditions => Project.visible_by(User.current))
-              link = link_to h(version.name), {:controller => 'versions', :action => 'show', :id => version}, :class => 'version'
+              link = link_to h(version.name), {:only_path => only_path, :controller => 'versions', :action => 'show', :id => version},
+                                              :class => 'version'
             end
           end
         elsif sep == ':'
@@ -305,15 +313,18 @@ module ApplicationHelper
           case prefix
           when 'document'
             if project && document = project.documents.find_by_title(name)
-              link = link_to h(document.title), {:controller => 'documents', :action => 'show', :id => document}, :class => 'document'
+              link = link_to h(document.title), {:only_path => only_path, :controller => 'documents', :action => 'show', :id => document},
+                                                :class => 'document'
             end
           when 'version'
             if project && version = project.versions.find_by_name(name)
-              link = link_to h(version.name), {:controller => 'versions', :action => 'show', :id => version}, :class => 'version'
+              link = link_to h(version.name), {:only_path => only_path, :controller => 'versions', :action => 'show', :id => version},
+                                              :class => 'version'
             end
           when 'attachment'
             if attachments && attachment = attachments.detect {|a| a.filename == name }
-              link = link_to h(attachment.filename), {:controller => 'attachments', :action => 'download', :id => attachment}, :class => 'attachment'
+              link = link_to h(attachment.filename), {:only_path => only_path, :controller => 'attachments', :action => 'download', :id => attachment},
+                                                     :class => 'attachment'
             end
           end
         end
diff --git a/app/models/journal.rb b/app/models/journal.rb
index 5aebbb7ce..d757ef90d 100644
--- a/app/models/journal.rb
+++ b/app/models/journal.rb
@@ -51,7 +51,14 @@ class Journal < ActiveRecord::Base
   end
   
   def editable_by?(usr)
-    project = journalized.project
     usr && usr.logged? && (usr.allowed_to?(:edit_issue_notes, project) || (self.user == usr && usr.allowed_to?(:edit_own_issue_notes, project)))
   end
+  
+  def project
+    journalized.respond_to?(:project) ? journalized.project : nil
+  end
+  
+  def attachments
+    journalized.respond_to?(:attachments) ? journalized.attachments : nil
+  end
 end
diff --git a/app/views/mailer/_issue_text_html.rhtml b/app/views/mailer/_issue_text_html.rhtml
index a3eb05b01..d0f247812 100644
--- a/app/views/mailer/_issue_text_html.rhtml
+++ b/app/views/mailer/_issue_text_html.rhtml
@@ -12,4 +12,4 @@
 <% end %>
 </ul>
 
-<%= textilizable(issue.description) %>
+<%= textilizable(issue, :description, :only_path => false) %>
diff --git a/app/views/mailer/document_added.text.html.rhtml b/app/views/mailer/document_added.text.html.rhtml
index 2ef63012b..dc1f659a0 100644
--- a/app/views/mailer/document_added.text.html.rhtml
+++ b/app/views/mailer/document_added.text.html.rhtml
@@ -1,3 +1,3 @@
 <%= link_to @document.title, @document_url %> (<%= @document.category.name %>)<br />
 <br />
-<%= textilizable(@document.description) %>
+<%= textilizable(@document, :description, :only_path => false) %>
diff --git a/app/views/mailer/issue_edit.text.html.rhtml b/app/views/mailer/issue_edit.text.html.rhtml
index 7ce1f47c4..48affaf77 100644
--- a/app/views/mailer/issue_edit.text.html.rhtml
+++ b/app/views/mailer/issue_edit.text.html.rhtml
@@ -6,6 +6,6 @@
 <% end %>
 </ul>
 
-<%= textilizable(@journal.notes) %>
+<%= textilizable(@journal, :notes, :only_path => false) %>
 <hr />
 <%= render :partial => "issue_text_html", :locals => { :issue => @issue, :issue_url => @issue_url } %>
diff --git a/app/views/mailer/message_posted.text.html.rhtml b/app/views/mailer/message_posted.text.html.rhtml
index 837272c0a..d91ce5a04 100644
--- a/app/views/mailer/message_posted.text.html.rhtml
+++ b/app/views/mailer/message_posted.text.html.rhtml
@@ -1,4 +1,4 @@
 <h1><%=h @message.board.project.name %> - <%=h @message.board.name %>: <%= link_to @message.subject, @message_url %></h1>
 <em><%= @message.author %></em>
 
-<%= textilizable @message.content %>
+<%= textilizable(@message, :content, :only_path => false) %>
diff --git a/app/views/mailer/news_added.text.html.rhtml b/app/views/mailer/news_added.text.html.rhtml
index 010ef8ee1..15bc89fac 100644
--- a/app/views/mailer/news_added.text.html.rhtml
+++ b/app/views/mailer/news_added.text.html.rhtml
@@ -1,4 +1,4 @@
 <h1><%= link_to @news.title, @news_url %></h1>
 <em><%= @news.author.name %></em>
 
-<%= textilizable(@news.description) %>
+<%= textilizable(@news, :description, :only_path => false) %>
diff --git a/test/fixtures/journals.yml b/test/fixtures/journals.yml
index 169713fc5..70aa5da73 100644
--- a/test/fixtures/journals.yml
+++ b/test/fixtures/journals.yml
@@ -8,7 +8,7 @@ journals_001:
   journalized_id: 1
 journals_002: 
   created_on: <%= 1.days.ago.to_date.to_s(:db) %>
-  notes: "Some notes"
+  notes: "Some notes with Redmine links: #2, r2."
   id: 2
   journalized_type: Issue
   user_id: 2
diff --git a/test/unit/mailer_test.rb b/test/unit/mailer_test.rb
index 096551ee5..dc3fde414 100644
--- a/test/unit/mailer_test.rb
+++ b/test/unit/mailer_test.rb
@@ -18,7 +18,26 @@
 require File.dirname(__FILE__) + '/../test_helper'
 
 class MailerTest < Test::Unit::TestCase
-  fixtures :projects, :issues, :users, :members, :documents, :attachments, :news, :tokens, :journals, :journal_details, :trackers, :issue_statuses, :enumerations
+  fixtures :projects, :issues, :users, :members, :documents, :attachments, :news, :tokens, :journals, :journal_details, :changesets, :trackers, :issue_statuses, :enumerations
+  
+  def test_generated_links_in_emails
+    ActionMailer::Base.deliveries.clear
+    Setting.host_name = 'mydomain.foo'
+    Setting.protocol = 'https'
+    
+    journal = Journal.find(2)
+    assert Mailer.deliver_issue_edit(journal)
+    
+    mail = ActionMailer::Base.deliveries.last
+    assert_kind_of TMail::Mail, mail
+    # link to the main ticket
+    assert mail.body.include?('<a href="https://mydomain.foo/issues/show/1">Bug #1: Can\'t print recipes</a>')
+    
+    # link to a referenced ticket
+    assert mail.body.include?('<a href="https://mydomain.foo/issues/show/2" class="issue" title="Add ingredients categories (Assigned)">#2</a>')
+    # link to a changeset
+    assert mail.body.include?('<a href="https://mydomain.foo/repositories/revision/1?rev=2" class="changeset" title="This commit fixes #1, #2 and references #1 &amp; #3">r2</a>')
+  end
   
   # test mailer methods for each language
   def test_issue_add

From 652dc1a73af8f975e6e126b7b735d524efb40b6f Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 17 Feb 2008 15:02:54 +0000
Subject: [PATCH 222/710] Fixed: auto closing of duplicates doesn't work.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1162 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/models/issue.rb  | 4 ++++
 app/models/mailer.rb | 1 -
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/models/issue.rb b/app/models/issue.rb
index a1c46cadf..8dcacde72 100644
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -142,6 +142,9 @@ class Issue < ActiveRecord::Base
   end
   
   def after_save
+    # Reload is needed in order to get the right status
+    reload
+    
     # Update start/due dates of following issues
     relations_from.each(&:set_issue_to_dates)
     
@@ -165,6 +168,7 @@ class Issue < ActiveRecord::Base
   def init_journal(user, notes = "")
     @current_journal ||= Journal.new(:journalized => self, :user => user, :notes => notes)
     @issue_before_change = self.clone
+    @issue_before_change.status = self.status
     @custom_values_before_change = {}
     self.custom_values.each {|c| @custom_values_before_change.store c.custom_field_id, c.value }
     @current_journal
diff --git a/app/models/mailer.rb b/app/models/mailer.rb
index a8566a7a2..a1357d89c 100644
--- a/app/models/mailer.rb
+++ b/app/models/mailer.rb
@@ -31,7 +31,6 @@ class Mailer < ActionMailer::Base
 
   def issue_edit(journal)
     issue = journal.journalized
-    issue.reload
     recipients issue.recipients
     # Watchers in cc
     cc(issue.watcher_recipients - @recipients)

From 09bd61da7436def15f3e5f576f8319dbac75b8f7 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Mon, 18 Feb 2008 18:28:37 +0000
Subject: [PATCH 223/710] Order issues by id on the roadmap.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1163 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/projects/roadmap.rhtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/projects/roadmap.rhtml b/app/views/projects/roadmap.rhtml
index 4dc94b8c6..fbfec4727 100644
--- a/app/views/projects/roadmap.rhtml
+++ b/app/views/projects/roadmap.rhtml
@@ -13,7 +13,7 @@
     <% issues = version.fixed_issues.find(:all,
                                           :include => [:status, :tracker],
                                           :conditions => ["tracker_id in (#{@selected_tracker_ids.join(',')})"],
-                                          :order => "#{Tracker.table_name}.position") unless @selected_tracker_ids.empty?
+                                          :order => "#{Tracker.table_name}.position, #{Issue.table_name}.id") unless @selected_tracker_ids.empty?
        issues ||= []
     %>
     <ul>

From 948097bc4d0f3a5163a9f464169790fee9b421cd Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Thu, 21 Feb 2008 17:45:49 +0000
Subject: [PATCH 224/710] Do not clear issue relations when moving an issue to
 another project if cross-project issue relations are allowed (closes #696).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1164 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/models/issue.rb | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/models/issue.rb b/app/models/issue.rb
index 8dcacde72..6b9b3bd1c 100644
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -66,8 +66,10 @@ class Issue < ActiveRecord::Base
     transaction do
       if new_project && project_id != new_project.id
         # delete issue relations
-        self.relations_from.clear
-        self.relations_to.clear
+        unless Setting.cross_project_issue_relations?
+          self.relations_from.clear
+          self.relations_to.clear
+        end
         # issue is moved to another project
         self.category = nil 
         self.fixed_version = nil

From d461363d27b9acf371445bd29b2618363d1cc1bf Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Thu, 21 Feb 2008 17:50:33 +0000
Subject: [PATCH 225/710] Fixed: Adding time when Updating a ticket is gone
 (closes #701).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1165 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/issues/_edit.rhtml | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/app/views/issues/_edit.rhtml b/app/views/issues/_edit.rhtml
index 7c4cf501c..f9b234d85 100644
--- a/app/views/issues/_edit.rhtml
+++ b/app/views/issues/_edit.rhtml
@@ -14,6 +14,19 @@
         <%= render :partial => (@edit_allowed ? 'form' : 'form_update'), :locals => {:f => f} %>
         </fieldset>
     <% end %>
+    <% if authorize_for('timelog', 'edit') %>
+    <fieldset><legend><%= l(:button_log_time) %></legend>
+        <% fields_for :time_entry, @time_entry, { :builder => TabularFormBuilder, :lang => current_language} do |time_entry| %>
+        <div class="splitcontentleft">
+        <p><%= time_entry.text_field :hours, :size => 6, :label => :label_spent_time %> <%= l(:field_hours) %></p>
+        </div>
+        <div class="splitcontentright">
+        <p><%= time_entry.text_field :comments, :size => 40 %></p>
+        <p><%= time_entry.select :activity_id, (@activities.collect {|p| [p.name, p.id]}) %></p>
+        </div>
+        <% end %>
+    </fieldset>
+    <% end %>
     
     <fieldset><legend><%= l(:field_notes) %></legend>
     <%= text_area_tag 'notes', @notes, :cols => 60, :rows => 10, :class => 'wiki-edit' %>

From 3f4a8469ac6b7dbaa849c2ffe206ddccbc9abca8 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Thu, 21 Feb 2008 17:57:00 +0000
Subject: [PATCH 226/710] Added 'estimated time' in the csv export of the issue
 list.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1166 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/helpers/issues_helper.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/helpers/issues_helper.rb b/app/helpers/issues_helper.rb
index 197760b53..e5a557f31 100644
--- a/app/helpers/issues_helper.rb
+++ b/app/helpers/issues_helper.rb
@@ -123,6 +123,7 @@ module IssuesHelper
                   l(:field_start_date),
                   l(:field_due_date),
                   l(:field_done_ratio),
+                  l(:field_estimated_hours),
                   l(:field_created_on),
                   l(:field_updated_on)
                   ]
@@ -146,6 +147,7 @@ module IssuesHelper
                   format_date(issue.start_date),
                   format_date(issue.due_date),
                   issue.done_ratio,
+                  issue.estimated_hours,
                   format_time(issue.created_on),  
                   format_time(issue.updated_on)
                   ]

From 7d1075507221fb0fe1344ddd58f7ee7f485a203c Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Thu, 21 Feb 2008 19:30:27 +0000
Subject: [PATCH 227/710] Fixed: "undefined method 'textilizable'" error on
 email notification when running Repository#fetch_changesets from the console.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1167 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/models/mailer.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/models/mailer.rb b/app/models/mailer.rb
index a1357d89c..75a2e960b 100644
--- a/app/models/mailer.rb
+++ b/app/models/mailer.rb
@@ -16,9 +16,9 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class Mailer < ActionMailer::Base
-  helper ApplicationHelper
-  helper IssuesHelper
-  helper CustomFieldsHelper
+  helper :application
+  helper :issues
+  helper :custom_fields
   
   include ActionController::UrlWriter
   

From ade572048a768c0ee330d444216469c0e9d97f42 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Thu, 21 Feb 2008 19:49:47 +0000
Subject: [PATCH 228/710] Roadmap enhancements (closes #697, #698): * separate
 related issues from wiki contents * leading h1 in version wiki pages is
 hidden (done using css, won't work with IE6) * smaller wiki headings * xhtml
 validation

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1168 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/projects/roadmap.rhtml   | 16 ++++++++++------
 public/stylesheets/application.css |  6 ++++++
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/app/views/projects/roadmap.rhtml b/app/views/projects/roadmap.rhtml
index fbfec4727..6a1b6b099 100644
--- a/app/views/projects/roadmap.rhtml
+++ b/app/views/projects/roadmap.rhtml
@@ -2,8 +2,8 @@
 
 <% if @versions.empty? %>
 <p class="nodata"><%= l(:label_no_data) %></p>
-<% end %>
-
+<% else %>
+<div id="roadmap">
 <% @versions.each do |version| %>   
     <%= tag 'a', :name => version.name %>
     <h3 class="icon22 icon22-package"><%= link_to h(version.name), :controller => 'versions', :action => 'show', :id => version %></h3>
@@ -16,8 +16,9 @@
                                           :order => "#{Tracker.table_name}.position, #{Issue.table_name}.id") unless @selected_tracker_ids.empty?
        issues ||= []
     %>
+    <% if issues.size > 0 %>
+    <fieldset class="related-issues"><legend><%= l(:label_related_issues) %></legend>
     <ul>
-      <% if issues.size > 0 %>
         <% issues.each do |issue| %>
           <li>
             <%= link = link_to_issue(issue)
@@ -25,19 +26,22 @@
             <%= content_tag "em", "(#{l(:label_closed_issues)})" if issue.status.is_closed? %>
           </li>
         <% end %>
-      <% end %>
     </ul>
+    </fieldset>
+    <% end %>
+<% end %>
+</div>
 <% end %>
 
 <% content_for :sidebar do %>
 <% form_tag do %>
 <h3><%= l(:label_roadmap) %></h3>
 <% @trackers.each do |tracker| %>
-  <label><%= check_box_tag "tracker_ids[]", tracker.id, (@selected_tracker_ids.include? tracker.id.to_s) %>
+  <label><%= check_box_tag "tracker_ids[]", tracker.id, (@selected_tracker_ids.include? tracker.id.to_s), :id => nil %>
   <%= tracker.name %></label><br />
 <% end %>
 <br />
-<label for="completed"><%= check_box_tag "completed", 1, params[:completed] %> <%= l(:label_show_completed_versions) %>
+<label for="completed"><%= check_box_tag "completed", 1, params[:completed] %> <%= l(:label_show_completed_versions) %></label>
 <p><%= submit_tag l(:button_apply), :class => 'button-small' %></p>
 <% end %>
 
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index bfc66f75e..cffcab26f 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -163,6 +163,12 @@ div#activity dt { margin-bottom: 1px; }
 div#activity dt .time { color: #777; font-size: 80%; }
 div#activity dd .description { font-style: italic; }
 
+div#roadmap fieldset.related-issues { margin-bottom: 1em; }
+div#roadmap fieldset.related-issues ul { margin-top: 0.3em; margin-bottom: 0.3em; }
+div#roadmap .wiki h1:first-child { display: none; }
+div#roadmap .wiki h1 { font-size: 120%; }
+div#roadmap .wiki h2 { font-size: 110%; }
+
 .autoscroll {overflow-x: auto; padding:1px; width:100%; margin-bottom: 1.2em;}
 #user_firstname, #user_lastname, #user_mail, #my_account_form select { width: 90%; }
 

From b935aebd99369a9c8e848f9d346be56e02c57c4b Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Fri, 22 Feb 2008 17:26:53 +0000
Subject: [PATCH 229/710] Fixed: LDAP authentication without password may be
 possible (#714).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1169 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/models/auth_source_ldap.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/models/auth_source_ldap.rb b/app/models/auth_source_ldap.rb
index b79b3ced0..5a6789a3b 100644
--- a/app/models/auth_source_ldap.rb
+++ b/app/models/auth_source_ldap.rb
@@ -27,6 +27,7 @@ class AuthSourceLdap < AuthSource
   end
   
   def authenticate(login, password)
+    return nil if login.blank? || password.blank?
     attrs = []
     # get user's DN
     ldap_con = initialize_ldap_con(self.account, self.account_password)

From b0bb41ad355771d4ae4704585f29bc12ae6c345d Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Fri, 22 Feb 2008 17:48:37 +0000
Subject: [PATCH 230/710] Fixed: Issue custom fields "required" flag not stored
 (broken by r1090). Closes #715.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1171 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/models/custom_field.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/custom_field.rb b/app/models/custom_field.rb
index 6be081b0b..990adf9e2 100644
--- a/app/models/custom_field.rb
+++ b/app/models/custom_field.rb
@@ -55,7 +55,7 @@ class CustomField < ActiveRecord::Base
     end
     
     # validate default value
-    v = CustomValue.new(:custom_field => self.dup, :value => default_value, :customized => nil)
+    v = CustomValue.new(:custom_field => self.clone, :value => default_value, :customized => nil)
     v.custom_field.is_required = false
     errors.add(:default_value, :activerecord_error_invalid) unless v.valid?
   end

From 792b7f30e32eec84d6106e947fc3987e4e26a0b0 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Fri, 22 Feb 2008 18:19:00 +0000
Subject: [PATCH 231/710] Menus items: * fixed broken translation when a plugin
 is installed (closes #649) * small fix to the plugin API: options parameter
 added to Redmine::Plugin#menu

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1172 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 extra/sample_plugin/init.rb | 2 +-
 lib/redmine/menu_manager.rb | 9 +++++++--
 lib/redmine/plugin.rb       | 9 +++++----
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/extra/sample_plugin/init.rb b/extra/sample_plugin/init.rb
index 48a5d935c..7389aaa6f 100644
--- a/extra/sample_plugin/init.rb
+++ b/extra/sample_plugin/init.rb
@@ -21,5 +21,5 @@ Redmine::Plugin.register :sample_plugin do
   end
 
   # A new item is added to the project menu
-  menu :project_menu, :label_plugin_example, :controller => 'example', :action => 'say_hello'
+  menu :project_menu, :sample_plugin, { :controller => 'example', :action => 'say_hello' }, :caption => 'Sample'
 end
diff --git a/lib/redmine/menu_manager.rb b/lib/redmine/menu_manager.rb
index 3b29912a1..c645b5ce8 100644
--- a/lib/redmine/menu_manager.rb
+++ b/lib/redmine/menu_manager.rb
@@ -122,7 +122,7 @@ module Redmine
     
     class MenuItem
       include GLoc
-      attr_reader :name, :url, :param, :condition, :caption, :html_options
+      attr_reader :name, :url, :param, :condition, :html_options
       
       def initialize(name, url, options)
         raise "Invalid option :if for menu item '#{name}'" if options[:if] && !options[:if].respond_to?(:call)
@@ -131,9 +131,14 @@ module Redmine
         @url = url
         @condition = options[:if]
         @param = options[:param] || :id
-        @caption = options[:caption] || (l_has_string?("label_#{name}".to_sym) ? "label_#{name}".to_sym : name.to_s.humanize)
+        @caption_key = options[:caption]
         @html_options = options[:html] || {}
       end
+      
+      def caption
+        # check if localized string exists on first render (after GLoc strings are loaded)
+        @caption ||= (@caption_key || (l_has_string?("label_#{@name}".to_sym) ? "label_#{@name}".to_sym : @name.to_s.humanize))
+      end
     end    
   end
 end
diff --git a/lib/redmine/plugin.rb b/lib/redmine/plugin.rb
index e6047974e..36632c13e 100644
--- a/lib/redmine/plugin.rb
+++ b/lib/redmine/plugin.rb
@@ -66,11 +66,12 @@ module Redmine #:nodoc:
 
     # Adds an item to the given +menu+.
     # The +id+ parameter (equals to the project id) is automatically added to the url.
-    #   menu :project_menu, :label_plugin_example, :controller => 'example', :action => 'say_hello'
+    #   menu :project_menu, :plugin_example, { :controller => 'example', :action => 'say_hello' }, :caption => 'Sample'
     #   
-    # Currently, only the project menu can be extended. Thus, the +name+ parameter must be +:project_menu+
-    def menu(name, label, url)
-      Redmine::MenuManager.map(name) {|menu| menu.push label, url}
+    # +name+ parameter can be: :top_menu, :account_menu, :application_menu or :project_menu
+    # 
+    def menu(name, item, url, options={})
+      Redmine::MenuManager.map(name) {|menu| menu.push item, url, options}
     end
 
     # Defines a permission called +name+ for the given +actions+.

From 328df74dd1779963b80317b72e56aa2a4ea5e2f2 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Tue, 26 Feb 2008 18:15:58 +0000
Subject: [PATCH 232/710] Adds date range filter and pagination on time entries
 detail view (closes #434).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1173 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/timelog_controller.rb      | 116 ++++++++++++++-------
 app/helpers/application_helper.rb          |   4 +
 app/helpers/sort_helper.rb                 |  10 +-
 app/helpers/timelog_helper.rb              |  47 +++++++++
 app/models/time_entry.rb                   |   7 +-
 app/views/timelog/_list.rhtml              |  32 ++++++
 app/views/timelog/details.rhtml            |  80 +++++++-------
 lang/bg.yml                                |   8 ++
 lang/cs.yml                                |   8 ++
 lang/de.yml                                |   8 ++
 lang/en.yml                                |   8 ++
 lang/es.yml                                |   8 ++
 lang/fi.yml                                |   8 ++
 lang/fr.yml                                |   8 ++
 lang/he.yml                                |   8 ++
 lang/it.yml                                |   8 ++
 lang/ja.yml                                |   8 ++
 lang/ko.yml                                |   8 ++
 lang/lt.yml                                |   8 ++
 lang/nl.yml                                |   8 ++
 lang/pl.yml                                |   8 ++
 lang/pt-br.yml                             |   8 ++
 lang/pt.yml                                |   8 ++
 lang/ro.yml                                |   8 ++
 lang/ru.yml                                |   8 ++
 lang/sr.yml                                |   8 ++
 lang/sv.yml                                |   8 ++
 lang/uk.yml                                |   8 ++
 lang/zh-tw.yml                             |   8 ++
 lang/zh.yml                                |   8 ++
 public/stylesheets/application.css         |   7 ++
 public/stylesheets/calendar.css            |   2 +-
 test/fixtures/time_entries.yml             |   2 +-
 test/functional/timelog_controller_test.rb |  50 ++++++++-
 34 files changed, 453 insertions(+), 88 deletions(-)
 create mode 100644 app/views/timelog/_list.rhtml

diff --git a/app/controllers/timelog_controller.rb b/app/controllers/timelog_controller.rb
index 926fe0c6f..6ce86fd50 100644
--- a/app/controllers/timelog_controller.rb
+++ b/app/controllers/timelog_controller.rb
@@ -23,6 +23,7 @@ class TimelogController < ApplicationController
   helper :sort
   include SortHelper
   helper :issues
+  include TimelogHelper
   
   def report
     @available_criterias = { 'version' => {:sql => "#{Issue.table_name}.fixed_version_id",
@@ -104,14 +105,84 @@ class TimelogController < ApplicationController
   def details
     sort_init 'spent_on', 'desc'
     sort_update
-    
-    @entries = (@issue ? @issue : @project).time_entries.find(:all, :include => [:activity, :user, {:issue => [:tracker, :assigned_to, :priority]}], :order => sort_clause)
 
-    @total_hours = @entries.inject(0) { |sum,entry| sum + entry.hours }
-    @owner_id = User.current.id
+    @free_period = false
+    @from, @to = nil, nil
+
+    if params[:period_type] == '1' || (params[:period_type].nil? && !params[:period].nil?)
+      case params[:period].to_s
+      when 'today'
+        @from = @to = Date.today
+      when 'yesterday'
+        @from = @to = Date.today - 1
+      when 'current_week'
+        @from = Date.today - (Date.today.cwday - 1)%7
+        @to = @from + 6
+      when 'last_week'
+        @from = Date.today - 7 - (Date.today.cwday - 1)%7
+        @to = @from + 6
+      when '7_days'
+        @from = Date.today - 7
+        @to = Date.today
+      when 'current_month'
+        @from = Date.civil(Date.today.year, Date.today.month, 1)
+        @to = (@from >> 1) - 1
+      when 'last_month'
+        @from = Date.civil(Date.today.year, Date.today.month, 1) << 1
+        @to = (@from >> 1) - 1
+      when '30_days'
+        @from = Date.today - 30
+        @to = Date.today
+      when 'current_year'
+        @from = Date.civil(Date.today.year, 1, 1)
+        @to = Date.civil(Date.today.year, 12, 31)
+      end
+    elsif params[:period_type] == '2' || (params[:period_type].nil? && (!params[:from].nil? || !params[:to].nil?))
+      begin; @from = params[:from].to_s.to_date unless params[:from].blank?; rescue; end
+      begin; @to = params[:to].to_s.to_date unless params[:to].blank?; rescue; end
+      @free_period = true
+    else
+      # default
+    end
     
-    send_csv and return if 'csv' == params[:export]    
-    render :action => 'details', :layout => false if request.xhr?
+    @from, @to = @to, @from if @from && @to && @from > @to
+    
+    conditions = nil
+    if @from
+      if @to
+        conditions = ['spent_on BETWEEN ? AND ?', @from, @to]
+      else
+        conditions = ['spent_on >= ?', @from]
+      end
+    elsif @to
+      conditions = ['spent_on <= ?', @to]
+    end
+    
+    @owner_id = User.current.id
+
+    respond_to do |format|
+      format.html {
+        # Paginate results
+        @entry_count = (@issue ? @issue : @project).time_entries.count(:conditions => conditions)
+        @entry_pages = Paginator.new self, @entry_count, per_page_option, params['page']
+        @entries = (@issue ? @issue : @project).time_entries.find(:all, 
+                                                                  :include => [:activity, :user, {:issue => [:tracker, :assigned_to, :priority]}],
+                                                                  :conditions => conditions,
+                                                                  :order => sort_clause,
+                                                                  :limit  =>  @entry_pages.items_per_page,
+                                                                  :offset =>  @entry_pages.current.offset)
+        @total_hours = (@issue ? @issue : @project).time_entries.sum(:hours, :conditions => conditions).to_f
+        render :layout => !request.xhr?
+      }
+      format.csv {
+        # Export all entries
+        @entries = (@issue ? @issue : @project).time_entries.find(:all, 
+                                                                  :include => [:activity, :user, {:issue => [:tracker, :assigned_to, :priority]}],
+                                                                  :conditions => conditions,
+                                                                  :order => sort_clause)
+        send_data(entries_to_csv(@entries).read, :type => 'text/csv; header=present', :filename => 'timelog.csv')
+      }
+    end
   end
   
   def edit
@@ -141,37 +212,4 @@ private
       return false
     end
   end
-  
-  def send_csv
-    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_spent_on),
-                 l(:field_user),
-                 l(:field_activity),
-                 l(:field_issue),
-                 l(:field_tracker),
-                 l(:field_subject),
-                 l(:field_hours),
-                 l(:field_comments)
-                 ]
-      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),
-                  entry.user,
-                  entry.activity,
-                  (entry.issue ? entry.issue.id : nil),
-                  (entry.issue ? entry.issue.tracker : nil),
-                  (entry.issue ? entry.issue.subject : nil),
-                  entry.hours,
-                  entry.comments
-                  ]
-        csv << fields.collect {|c| begin; ic.iconv(c.to_s); rescue; c.to_s; end }
-      end
-    end
-    export.rewind
-    send_data(export.read, :type => 'text/csv; header=present', :filename => 'export.csv')
-  end
 end
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index e39ea0906..af493b034 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -90,6 +90,10 @@ module ApplicationHelper
     include_date ? local.strftime("#{@date_format} #{@time_format}") : local.strftime(@time_format)
   end
   
+  def html_hours(text)
+    text.gsub(%r{(\d+)\.(\d+)}, '<span class="hours hours-int">\1</span><span class="hours hours-dec">.\2</span>')
+  end
+  
   def authoring(created, author)
     time_tag = content_tag('acronym', distance_of_time_in_words(Time.now, created), :title => format_time(created))
     l(:label_added_time_by, author || 'Anonymous', time_tag)
diff --git a/app/helpers/sort_helper.rb b/app/helpers/sort_helper.rb
index 155e7e5e3..f16ff3c7d 100644
--- a/app/helpers/sort_helper.rb
+++ b/app/helpers/sort_helper.rb
@@ -108,13 +108,13 @@ module SortHelper
     end
     caption = titleize(Inflector::humanize(column)) unless caption
     
-    url = {:sort_key => column, :sort_order => order, :status => params[:status], 
-                                                      :issue_id => params[:issue_id], 
-                                                      :project_id => params[:project_id]}
+    sort_options = { :sort_key => column, :sort_order => order }
+    # don't reuse params if filters are present
+    url_options = params.has_key?(:set_filter) ? sort_options : params.merge(sort_options)
     
     link_to_remote(caption,
-                  {:update => "content", :url => url},
-                  {:href => url_for(url)}) +
+                  {:update => "content", :url => url_options},
+                  {:href => url_for(url_options)}) +
     (icon ? nbsp(2) + image_tag(icon) : '')
   end
 
diff --git a/app/helpers/timelog_helper.rb b/app/helpers/timelog_helper.rb
index 22e4eba0b..2af748f6f 100644
--- a/app/helpers/timelog_helper.rb
+++ b/app/helpers/timelog_helper.rb
@@ -27,4 +27,51 @@ module TimelogHelper
     end
     sum
   end
+  
+  def options_for_period_select(value)
+    options_for_select([[l(:label_all_time), 'all'],
+                        [l(:label_today), 'today'],
+                        [l(:label_yesterday), 'yesterday'],
+                        [l(:label_this_week), 'current_week'],
+                        [l(:label_last_week), 'last_week'],
+                        [l(:label_last_n_days, 7), '7_days'],
+                        [l(:label_this_month), 'current_month'],
+                        [l(:label_last_month), 'last_month'],
+                        [l(:label_last_n_days, 30), '30_days'],
+                        [l(:label_this_year), 'current_year']],
+                        value)
+  end
+  
+  def entries_to_csv(entries)
+    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_spent_on),
+                 l(:field_user),
+                 l(:field_activity),
+                 l(:field_issue),
+                 l(:field_tracker),
+                 l(:field_subject),
+                 l(:field_hours),
+                 l(:field_comments)
+                 ]
+      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),
+                  entry.user,
+                  entry.activity,
+                  (entry.issue ? entry.issue.id : nil),
+                  (entry.issue ? entry.issue.tracker : nil),
+                  (entry.issue ? entry.issue.subject : nil),
+                  entry.hours,
+                  entry.comments
+                  ]
+        csv << fields.collect {|c| begin; ic.iconv(c.to_s); rescue; c.to_s; end }
+      end
+    end
+    export.rewind
+    export
+  end
 end
diff --git a/app/models/time_entry.rb b/app/models/time_entry.rb
index 905857073..04df5233f 100644
--- a/app/models/time_entry.rb
+++ b/app/models/time_entry.rb
@@ -46,5 +46,10 @@ class TimeEntry < ActiveRecord::Base
     self.tyear = spent_on ? spent_on.year : nil
     self.tmonth = spent_on ? spent_on.month : nil
     self.tweek = spent_on ? Date.civil(spent_on.year, spent_on.month, spent_on.day).cweek : nil
-  end  
+  end
+  
+  # Returns true if the time entry can be edited by usr, otherwise false
+  def editable_by?(usr)
+    usr == self.user
+  end
 end
diff --git a/app/views/timelog/_list.rhtml b/app/views/timelog/_list.rhtml
new file mode 100644
index 000000000..929d8f7dd
--- /dev/null
+++ b/app/views/timelog/_list.rhtml
@@ -0,0 +1,32 @@
+<table class="list time-entries">
+<thead>
+<%= sort_header_tag('spent_on', :caption => l(:label_date), :default_order => 'desc') %>
+<%= sort_header_tag('user_id', :caption => l(:label_member)) %>
+<%= sort_header_tag('activity_id', :caption => l(:label_activity)) %>
+<%= sort_header_tag('issue_id', :caption => l(:label_issue), :default_order => 'desc') %>
+<th><%= l(:field_comments) %></th>
+<%= sort_header_tag('hours', :caption => l(:field_hours)) %>
+<th></th>
+</thead>
+<tbody>
+<% entries.each do |entry| -%>
+<tr class="time-entry <%= cycle("odd", "even") %>">
+<td class="spent_on"><%= format_date(entry.spent_on) %></td>
+<td class="user"><%= entry.user.name %></td>
+<td class="activity"><%= entry.activity.name %></td>
+<td class="subject">
+  <% if entry.issue -%>
+  <div class="tooltip"><%= link_to_issue entry.issue %>: <%= h(truncate(entry.issue.subject, 50)) -%>
+  <span class="tip"><%= render_issue_tooltip entry.issue %></span>
+  </div>
+  <% end -%>
+</td>
+<td class="comments"><%=h entry.comments %></td>
+<td class="hours"><%= entry.hours %></td>
+<td align="center"><%= link_to_if_authorized(l(:button_edit), 
+                                             {:controller => 'timelog', :action => 'edit', :id => entry},
+                                             :class => 'icon icon-edit') if entry.editable_by?(User.current) %></td>
+</tr>
+<% end -%>
+</tbdoy>
+</table>
diff --git a/app/views/timelog/details.rhtml b/app/views/timelog/details.rhtml
index 6f119206e..0e128f6ae 100644
--- a/app/views/timelog/details.rhtml
+++ b/app/views/timelog/details.rhtml
@@ -4,48 +4,48 @@
 
 <h2><%= l(:label_spent_time) %></h2>
 
-<h3><%= link_to(@project.name, {:action => 'details', :project_id => @project}) if @project %>
-<%= "/ " + link_to_issue(@issue) + h(": #{@issue.subject}") if @issue %></h3>
+<% if @issue %>
+<h3><%= link_to(@project.name, {:action => 'details', :project_id => @project}) %> / <%= link_to_issue(@issue) %></h3>
+<% end %>
 
-<h3 class="textright"><%= l(:label_total) %>: <%= lwr(:label_f_hour, @total_hours) %></h3>
+<% form_remote_tag( :url => {}, :method => :get, :update => 'content' ) do %>
+<%= hidden_field_tag 'project_id', params[:project_id] %>
+<%= hidden_field_tag 'issue_id', params[:issue_id] if @issue %>
+
+<fieldset><legend><%= l(:label_date_range) %></legend>
+<p>
+<%= radio_button_tag 'period_type', '1', !@free_period %>
+<%= select_tag 'period', options_for_period_select(params[:period]),
+                         :onchange => 'this.form.onsubmit();',
+                         :onfocus => '$("period_type_1").checked = true;' %>
+</p>
+<p>
+<%= radio_button_tag 'period_type', '2', @free_period %>
+<%= l(:label_date_from) %>
+<%= text_field_tag 'from', @from, :size => 10, :onfocus => '$("period_type_2").checked = true;' %> <%= calendar_for('from') %>
+<%= l(:label_date_to) %>
+<%= text_field_tag 'to', @to, :size => 10, :onfocus => '$("period_type_2").checked = true;' %> <%= calendar_for('to') %>
+<%= submit_tag l(:button_submit), :name => nil, :onclick => '$("period_type_2").checked = true;' %>
+</p>
+</fieldset>
+<% end %>
+
+<div class="total-hours">
+<p><%= l(:label_total) %>: <%= html_hours(lwr(:label_f_hour, @total_hours)) %></p>
+</div>
 
 <% unless @entries.empty? %>
-<table class="list">
-<thead>
-<%= sort_header_tag('spent_on', :caption => l(:label_date), :default_order => 'desc') %>
-<%= sort_header_tag('user_id', :caption => l(:label_member)) %>
-<%= sort_header_tag('activity_id', :caption => l(:label_activity)) %>
-<%= sort_header_tag('issue_id', :caption => l(:label_issue)) %>
-<th><%= l(:field_comments) %></th>
-<%= sort_header_tag('hours', :caption => l(:field_hours)) %>
-<th></th>
-</thead>
-<tbody>
-<% @entries.each do |entry| %>
-<tr class="<%= cycle("odd", "even") %>">
-<td align="center"><%= format_date(entry.spent_on) %></td>
-<td align="center"><%= entry.user.name %></td>
-<td align="center"><%= entry.activity.name %></td>
-<td>
-    <% if entry.issue %>
-    <div class="tooltip">
-    <%= link_to_issue entry.issue %>: <%= h(truncate(entry.issue.subject, 50)) %>
-    <span class="tip">
-    <%= render_issue_tooltip entry.issue %>
-    </span>		
-	</div>
-	<% end %>
-</td>
-<td><%=h entry.comments %></td>
-<td align="center"><strong><%= entry.hours %></strong></td>
-<td align="center"><%= link_to_if_authorized(l(:button_edit), {:controller => 'timelog', :action => 'edit', :id => entry}, :class => "icon icon-edit") if entry.user_id == @owner_id %></td>
-</tr>
-<% end %>
-</tbdoy>
-</table>
-
+<%= render :partial => 'list', :locals => { :entries => @entries }%>
 <div class="contextual">
-<%= l(:label_export_to) %>
-<%= link_to 'CSV', params.update(:export => 'csv'), :class => 'icon icon-csv' %>
+    <%= l(:label_export_to) %>
+    <%= link_to 'CSV', params.merge(:format => 'csv'), :class => 'icon icon-csv' %>
 </div>
-<% end %>
\ No newline at end of file
+<p class="pagination"><%= pagination_links_full @entry_pages, @entry_count %></p>
+<% end %>
+
+<% content_for :header_tags do %>
+    <%= javascript_include_tag 'calendar/calendar' %>
+    <%= javascript_include_tag "calendar/lang/calendar-#{current_language}.js" %>
+    <%= javascript_include_tag 'calendar/calendar-setup' %>
+    <%= stylesheet_link_tag 'calendar' %>
+<% end %>
diff --git a/lang/bg.yml b/lang/bg.yml
index a0f439eab..debb643cc 100644
--- a/lang/bg.yml
+++ b/lang/bg.yml
@@ -592,3 +592,11 @@ button_configure: Configure
 label_plugins: Plugins
 label_ldap_authentication: LDAP authentication
 label_downloads_abbr: D/L
+label_this_month: this month
+label_last_n_days: last %d days
+label_all_time: all time
+label_this_year: this year
+label_date_range: Date range
+label_last_week: last week
+label_yesterday: yesterday
+label_last_month: last month
diff --git a/lang/cs.yml b/lang/cs.yml
index d952ffd57..2ff862372 100644
--- a/lang/cs.yml
+++ b/lang/cs.yml
@@ -592,3 +592,11 @@ button_configure: Configure
 label_plugins: Plugins
 label_ldap_authentication: LDAP authentication
 label_downloads_abbr: D/L
+label_this_month: this month
+label_last_n_days: last %d days
+label_all_time: all time
+label_this_year: this year
+label_date_range: Date range
+label_last_week: last week
+label_yesterday: yesterday
+label_last_month: last month
diff --git a/lang/de.yml b/lang/de.yml
index 15b033b04..b12f558d0 100644
--- a/lang/de.yml
+++ b/lang/de.yml
@@ -592,3 +592,11 @@ button_configure: Configure
 label_plugins: Plugins
 label_ldap_authentication: LDAP authentication
 label_downloads_abbr: D/L
+label_this_month: this month
+label_last_n_days: last %d days
+label_all_time: all time
+label_this_year: this year
+label_date_range: Date range
+label_last_week: last week
+label_yesterday: yesterday
+label_last_month: last month
diff --git a/lang/en.yml b/lang/en.yml
index 509fe4252..dadd0a4e5 100644
--- a/lang/en.yml
+++ b/lang/en.yml
@@ -362,7 +362,15 @@ label_in_less_than: in less than
 label_in_more_than: in more than
 label_in: in
 label_today: today
+label_all_time: all time
+label_yesterday: yesterday
 label_this_week: this week
+label_last_week: last week
+label_last_n_days: last %d days
+label_this_month: this month
+label_last_month: last month
+label_this_year: this year
+label_date_range: Date range
 label_less_than_ago: less than days ago
 label_more_than_ago: more than days ago
 label_ago: days ago
diff --git a/lang/es.yml b/lang/es.yml
index 0b048af9b..1fd355cd2 100644
--- a/lang/es.yml
+++ b/lang/es.yml
@@ -595,3 +595,11 @@ button_configure: Configure
 label_plugins: Plugins
 label_ldap_authentication: LDAP authentication
 label_downloads_abbr: D/L
+label_this_month: this month
+label_last_n_days: last %d days
+label_all_time: all time
+label_this_year: this year
+label_date_range: Date range
+label_last_week: last week
+label_yesterday: yesterday
+label_last_month: last month
diff --git a/lang/fi.yml b/lang/fi.yml
index aa6bb2834..351c47c1b 100644
--- a/lang/fi.yml
+++ b/lang/fi.yml
@@ -596,3 +596,11 @@ button_configure: Configure
 label_plugins: Plugins
 label_ldap_authentication: LDAP authentication
 label_downloads_abbr: D/L
+label_this_month: this month
+label_last_n_days: last %d days
+label_all_time: all time
+label_this_year: this year
+label_date_range: Date range
+label_last_week: last week
+label_yesterday: yesterday
+label_last_month: last month
diff --git a/lang/fr.yml b/lang/fr.yml
index 97469d7df..73d2e0af6 100644
--- a/lang/fr.yml
+++ b/lang/fr.yml
@@ -362,7 +362,15 @@ label_in_less_than: dans moins de
 label_in_more_than: dans plus de
 label_in: dans
 label_today: aujourd'hui
+label_all_time: toute la période
+label_yesterday: hier
 label_this_week: cette semaine
+label_last_week: la semaine dernière
+label_last_n_days: les %d derniers jours
+label_this_month: ce mois-ci
+label_last_month: le mois dernier
+label_this_year: cette année
+label_date_range: Période
 label_less_than_ago: il y a moins de
 label_more_than_ago: il y a plus de
 label_ago: il y a
diff --git a/lang/he.yml b/lang/he.yml
index 578e30814..d0071e26f 100644
--- a/lang/he.yml
+++ b/lang/he.yml
@@ -592,3 +592,11 @@ button_configure: Configure
 label_plugins: Plugins
 label_ldap_authentication: LDAP authentication
 label_downloads_abbr: D/L
+label_this_month: this month
+label_last_n_days: last %d days
+label_all_time: all time
+label_this_year: this year
+label_date_range: Date range
+label_last_week: last week
+label_yesterday: yesterday
+label_last_month: last month
diff --git a/lang/it.yml b/lang/it.yml
index 650390a88..7c6f17986 100644
--- a/lang/it.yml
+++ b/lang/it.yml
@@ -592,3 +592,11 @@ button_configure: Configure
 label_plugins: Plugins
 label_ldap_authentication: LDAP authentication
 label_downloads_abbr: D/L
+label_this_month: this month
+label_last_n_days: last %d days
+label_all_time: all time
+label_this_year: this year
+label_date_range: Date range
+label_last_week: last week
+label_yesterday: yesterday
+label_last_month: last month
diff --git a/lang/ja.yml b/lang/ja.yml
index e926e9255..bc5303f8f 100644
--- a/lang/ja.yml
+++ b/lang/ja.yml
@@ -593,3 +593,11 @@ button_configure: Configure
 label_plugins: Plugins
 label_ldap_authentication: LDAP authentication
 label_downloads_abbr: D/L
+label_this_month: this month
+label_last_n_days: last %d days
+label_all_time: all time
+label_this_year: this year
+label_date_range: Date range
+label_last_week: last week
+label_yesterday: yesterday
+label_last_month: last month
diff --git a/lang/ko.yml b/lang/ko.yml
index cef2494a4..bb112c259 100644
--- a/lang/ko.yml
+++ b/lang/ko.yml
@@ -592,3 +592,11 @@ button_configure: Configure
 label_plugins: Plugins
 label_ldap_authentication: LDAP authentication
 label_downloads_abbr: D/L
+label_this_month: this month
+label_last_n_days: last %d days
+label_all_time: all time
+label_this_year: this year
+label_date_range: Date range
+label_last_week: last week
+label_yesterday: yesterday
+label_last_month: last month
diff --git a/lang/lt.yml b/lang/lt.yml
index e49346d3e..eb5a5d6e9 100644
--- a/lang/lt.yml
+++ b/lang/lt.yml
@@ -593,3 +593,11 @@ button_configure: Configure
 label_plugins: Plugins
 label_ldap_authentication: LDAP authentication
 label_downloads_abbr: D/L
+label_this_month: this month
+label_last_n_days: last %d days
+label_all_time: all time
+label_this_year: this year
+label_date_range: Date range
+label_last_week: last week
+label_yesterday: yesterday
+label_last_month: last month
diff --git a/lang/nl.yml b/lang/nl.yml
index 5f711eef2..c9bd74db7 100644
--- a/lang/nl.yml
+++ b/lang/nl.yml
@@ -593,3 +593,11 @@ button_configure: Configure
 label_plugins: Plugins
 label_ldap_authentication: LDAP authentication
 label_downloads_abbr: D/L
+label_this_month: this month
+label_last_n_days: last %d days
+label_all_time: all time
+label_this_year: this year
+label_date_range: Date range
+label_last_week: last week
+label_yesterday: yesterday
+label_last_month: last month
diff --git a/lang/pl.yml b/lang/pl.yml
index 51b9930cb..927025ece 100644
--- a/lang/pl.yml
+++ b/lang/pl.yml
@@ -592,3 +592,11 @@ button_configure: Configure
 label_plugins: Plugins
 label_ldap_authentication: LDAP authentication
 label_downloads_abbr: D/L
+label_this_month: this month
+label_last_n_days: last %d days
+label_all_time: all time
+label_this_year: this year
+label_date_range: Date range
+label_last_week: last week
+label_yesterday: yesterday
+label_last_month: last month
diff --git a/lang/pt-br.yml b/lang/pt-br.yml
index 3d47c1417..003940ced 100644
--- a/lang/pt-br.yml
+++ b/lang/pt-br.yml
@@ -592,3 +592,11 @@ button_configure: Configure
 label_plugins: Plugins
 label_ldap_authentication: LDAP authentication
 label_downloads_abbr: D/L
+label_this_month: this month
+label_last_n_days: last %d days
+label_all_time: all time
+label_this_year: this year
+label_date_range: Date range
+label_last_week: last week
+label_yesterday: yesterday
+label_last_month: last month
diff --git a/lang/pt.yml b/lang/pt.yml
index 578a556fe..0649005e8 100644
--- a/lang/pt.yml
+++ b/lang/pt.yml
@@ -592,3 +592,11 @@ button_configure: Configure
 label_plugins: Plugins
 label_ldap_authentication: LDAP authentication
 label_downloads_abbr: D/L
+label_this_month: this month
+label_last_n_days: last %d days
+label_all_time: all time
+label_this_year: this year
+label_date_range: Date range
+label_last_week: last week
+label_yesterday: yesterday
+label_last_month: last month
diff --git a/lang/ro.yml b/lang/ro.yml
index 2139442b5..7e71846b2 100644
--- a/lang/ro.yml
+++ b/lang/ro.yml
@@ -592,3 +592,11 @@ button_configure: Configure
 label_plugins: Plugins
 label_ldap_authentication: LDAP authentication
 label_downloads_abbr: D/L
+label_this_month: this month
+label_last_n_days: last %d days
+label_all_time: all time
+label_this_year: this year
+label_date_range: Date range
+label_last_week: last week
+label_yesterday: yesterday
+label_last_month: last month
diff --git a/lang/ru.yml b/lang/ru.yml
index e4b3272f6..d0c4ddef9 100644
--- a/lang/ru.yml
+++ b/lang/ru.yml
@@ -596,3 +596,11 @@ button_configure: Configure
 label_plugins: Plugins
 label_ldap_authentication: LDAP authentication
 label_downloads_abbr: D/L
+label_this_month: this month
+label_last_n_days: last %d days
+label_all_time: all time
+label_this_year: this year
+label_date_range: Date range
+label_last_week: last week
+label_yesterday: yesterday
+label_last_month: last month
diff --git a/lang/sr.yml b/lang/sr.yml
index 0972f507d..f1ed25882 100644
--- a/lang/sr.yml
+++ b/lang/sr.yml
@@ -593,3 +593,11 @@ button_configure: Configure
 label_plugins: Plugins
 label_ldap_authentication: LDAP authentication
 label_downloads_abbr: D/L
+label_this_month: this month
+label_last_n_days: last %d days
+label_all_time: all time
+label_this_year: this year
+label_date_range: Date range
+label_last_week: last week
+label_yesterday: yesterday
+label_last_month: last month
diff --git a/lang/sv.yml b/lang/sv.yml
index f370da42b..9bd7e0d4c 100644
--- a/lang/sv.yml
+++ b/lang/sv.yml
@@ -593,3 +593,11 @@ button_configure: Configure
 label_plugins: Plugins
 label_ldap_authentication: LDAP authentication
 label_downloads_abbr: D/L
+label_this_month: this month
+label_last_n_days: last %d days
+label_all_time: all time
+label_this_year: this year
+label_date_range: Date range
+label_last_week: last week
+label_yesterday: yesterday
+label_last_month: last month
diff --git a/lang/uk.yml b/lang/uk.yml
index 82d2856b5..b0c73b85b 100644
--- a/lang/uk.yml
+++ b/lang/uk.yml
@@ -594,3 +594,11 @@ button_configure: Configure
 label_plugins: Plugins
 label_ldap_authentication: LDAP authentication
 label_downloads_abbr: D/L
+label_this_month: this month
+label_last_n_days: last %d days
+label_all_time: all time
+label_this_year: this year
+label_date_range: Date range
+label_last_week: last week
+label_yesterday: yesterday
+label_last_month: last month
diff --git a/lang/zh-tw.yml b/lang/zh-tw.yml
index 439647ff8..ab2947676 100644
--- a/lang/zh-tw.yml
+++ b/lang/zh-tw.yml
@@ -592,3 +592,11 @@ button_configure: Configure
 label_plugins: Plugins
 label_ldap_authentication: LDAP authentication
 label_downloads_abbr: D/L
+label_this_month: this month
+label_last_n_days: last %d days
+label_all_time: all time
+label_this_year: this year
+label_date_range: Date range
+label_last_week: last week
+label_yesterday: yesterday
+label_last_month: last month
diff --git a/lang/zh.yml b/lang/zh.yml
index 70d97c781..ae2faf23c 100644
--- a/lang/zh.yml
+++ b/lang/zh.yml
@@ -595,3 +595,11 @@ button_configure: Configure
 label_plugins: Plugins
 label_ldap_authentication: LDAP authentication
 label_downloads_abbr: D/L
+label_this_month: this month
+label_last_n_days: last %d days
+label_all_time: all time
+label_this_year: this year
+label_date_range: Date range
+label_last_week: last week
+label_yesterday: yesterday
+label_last_month: last month
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index cffcab26f..003b21eca 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -110,6 +110,10 @@ tr.user td { white-space: nowrap; }
 tr.user.locked, tr.user.registered { color: #aaa; }
 tr.user.locked a, tr.user.registered a { color: #aaa; }
 
+tr.time-entry { text-align: center; white-space: nowrap; }
+tr.time-entry td.subject, tr.time-entry td.comments { text-align: left; }
+tr.time-entry td.hours { text-align: right; font-weight: bold; padding-right: 0.6em; }
+
 table.list tbody tr:hover { background-color:#ffffdd; }
 table td {padding:2px;}
 table p {margin:0;}
@@ -169,6 +173,9 @@ div#roadmap .wiki h1:first-child { display: none; }
 div#roadmap .wiki h1 { font-size: 120%; }
 div#roadmap .wiki h2 { font-size: 110%; }
 
+div.total-hours { text-align: left; font-size: 110%; font-weight: bold; }
+div.total-hours span.hours-int { font-size: 120%; }
+
 .autoscroll {overflow-x: auto; padding:1px; width:100%; margin-bottom: 1.2em;}
 #user_firstname, #user_lastname, #user_mail, #my_account_form select { width: 90%; }
 
diff --git a/public/stylesheets/calendar.css b/public/stylesheets/calendar.css
index 842dbf71a..c8d2dd619 100644
--- a/public/stylesheets/calendar.css
+++ b/public/stylesheets/calendar.css
@@ -6,7 +6,7 @@ img.calendar-trigger {
     margin-left: 4px;
 }
 
-div.calendar { position: relative; z-index: 15;}
+div.calendar { position: relative; z-index: 30;}
 
 .calendar, .calendar table {
   border: 1px solid #556;
diff --git a/test/fixtures/time_entries.yml b/test/fixtures/time_entries.yml
index 4e4ff6896..ae2b1efea 100644
--- a/test/fixtures/time_entries.yml
+++ b/test/fixtures/time_entries.yml
@@ -21,7 +21,7 @@ time_entries_002:
   comments: ""
   updated_on: 2007-03-23 14:11:04 +01:00
   activity_id: 8
-  spent_on: 2007-03-23
+  spent_on: 2007-03-12
   issue_id: 1
   id: 2
   hours: 150.0
diff --git a/test/functional/timelog_controller_test.rb b/test/functional/timelog_controller_test.rb
index 62f1a2e7f..e1236ffac 100644
--- a/test/functional/timelog_controller_test.rb
+++ b/test/functional/timelog_controller_test.rb
@@ -22,7 +22,7 @@ require 'timelog_controller'
 class TimelogController; def rescue_action(e) raise e end; end
 
 class TimelogControllerTest < Test::Unit::TestCase
-  fixtures :time_entries, :issues
+  fixtures :projects, :issues, :time_entries, :users, :trackers, :enumerations, :issue_statuses
 
   def setup
     @controller = TimelogController.new
@@ -49,4 +49,52 @@ class TimelogControllerTest < Test::Unit::TestCase
     assert_template 'report'
     assert_not_nil assigns(:hours)
   end
+  
+  def test_details_at_project_level
+    get :details, :project_id => 1
+    assert_response :success
+    assert_template 'details'
+    assert_not_nil assigns(:entries)
+    assert_equal 3, assigns(:entries).size
+    assert_not_nil assigns(:total_hours)
+    assert_equal 155.25, assigns(:total_hours)
+    # display all time by default
+    assert_nil assigns(:from)
+    assert_nil assigns(:to)
+  end
+  
+  def test_details_at_project_level_with_date_range
+    get :details, :project_id => 1, :from => '2007-03-20', :to => '2007-04-30'
+    assert_response :success
+    assert_template 'details'
+    assert_not_nil assigns(:entries)
+    assert_equal 2, assigns(:entries).size
+    assert_not_nil assigns(:total_hours)
+    assert_equal 5.25, assigns(:total_hours)
+    assert_equal '2007-03-20'.to_date, assigns(:from)
+    assert_equal '2007-04-30'.to_date, assigns(:to)
+  end
+
+  def test_details_at_project_level_with_period
+    get :details, :project_id => 1, :period => '7_days'
+    assert_response :success
+    assert_template 'details'
+    assert_not_nil assigns(:entries)
+    assert_not_nil assigns(:total_hours)
+    assert_equal Date.today - 7, assigns(:from)
+    assert_equal Date.today, assigns(:to)
+  end
+  
+  def test_details_at_issue_level
+    get :details, :issue_id => 1
+    assert_response :success
+    assert_template 'details'
+    assert_not_nil assigns(:entries)
+    assert_equal 2, assigns(:entries).size
+    assert_not_nil assigns(:total_hours)
+    assert_equal 154.25, assigns(:total_hours)
+    # display all time by default
+    assert_nil assigns(:from)
+    assert_nil assigns(:to)
+  end
 end

From 8531e176aab6e3f4b6805aaa19af0b257b6cafb2 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Tue, 26 Feb 2008 18:30:24 +0000
Subject: [PATCH 233/710] Do not send an email with no recipient, cc or bcc
 (closes #743).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1174 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/models/mailer.rb | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/app/models/mailer.rb b/app/models/mailer.rb
index 75a2e960b..ad5a3647b 100644
--- a/app/models/mailer.rb
+++ b/app/models/mailer.rb
@@ -122,7 +122,16 @@ class Mailer < ActionMailer::Base
     subject 'Redmine test'
     body :url => url_for(:controller => 'welcome')
   end
-  
+
+  # Overrides default deliver! method to prevent from sending an email
+  # with no recipient, cc or bcc
+  def deliver!(mail = @mail)
+    return false if (recipients.nil? || recipients.empty?) && 
+                    (cc.nil? || cc.empty?) &&
+                    (bcc.nil? || bcc.empty?)
+    super
+  end
+
   private
   def initialize_defaults(method_name)
     super

From 421d4203113a3cefdcc6998a9b9cc92ddbb27321 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Tue, 26 Feb 2008 19:47:29 +0000
Subject: [PATCH 234/710] Trac importer fix: * error when trying to convert too
 long ticket ids (closes #719)

Enhancements (#619):
* Trac guide wiki pages skipped
* wiki attachments migration added

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1175 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 lib/tasks/migrate_from_trac.rake | 56 +++++++++++++++++++++++++++-----
 1 file changed, 48 insertions(+), 8 deletions(-)

diff --git a/lib/tasks/migrate_from_trac.rake b/lib/tasks/migrate_from_trac.rake
index 5c006bc82..9ae1c550a 100644
--- a/lib/tasks/migrate_from_trac.rake
+++ b/lib/tasks/migrate_from_trac.rake
@@ -43,7 +43,13 @@ namespace :redmine do
                             'low' => priorities[0],
                             'normal' => priorities[1],
                             'high' => priorities[2],
-                            'highest' => priorities[3]
+                            'highest' => priorities[3],
+                            # ---
+                            'trivial' => priorities[0],
+                            'minor' => priorities[1],
+                            'major' => priorities[2],
+                            'critical' => priorities[3],
+                            'blocker' => priorities[4]
                             }
       
         TRACKER_BUG = Tracker.find_by_position(1)
@@ -143,8 +149,19 @@ namespace :redmine do
         def time; Time.at(read_attribute(:time)) end
       end
       
+      TRAC_WIKI_PAGES = %w(TracAccessibility TracAdmin TracBackup TracBrowser TracCgi TracChangeset \
+                           TracEnvironment TracFastCgi TracGuide TracImport TracIni TracInstall TracInterfaceCustomization \
+                           TracLinks TracLogging TracModPython TracNotification TracPermissions TracPlugins TracQuery \
+                           TracReports TracRoadmap TracRss TracSearch TracStandalone TracSupport TracSyntaxColoring TracTickets \
+                           TracTicketsCustomFields TracTimeline TracUnicode TracUpgrade TracWiki WikiDeletePage WikiFormatting \
+                           WikiHtml WikiMacros WikiNewPage WikiPageNames WikiProcessors WikiRestructuredText WikiRestructuredTextLinks \
+                           CamelCase TitleIndex)
+      
       class TracWikiPage < ActiveRecord::Base
-        set_table_name :wiki  
+        set_table_name :wiki
+        set_primary_key :name
+        
+        has_many :attachments, :class_name => "TracAttachment", :foreign_key => :id, :conditions => "#{TracMigrate::TracAttachment.table_name}.type = 'wiki'"
         
         def self.columns
           # Hides readonly Trac field to prevent clash with AR readonly? method (Rails 2.0)
@@ -203,8 +220,12 @@ namespace :redmine do
         text = text.gsub(/\[(\d+)\]/, 'r\1')
         # Ticket number re-writing
         text = text.gsub(/#(\d+)/) do |s|
-          TICKET_MAP[$1.to_i] ||= $1
-          "\##{TICKET_MAP[$1.to_i] || $1}"
+          if $1.length < 10
+            TICKET_MAP[$1.to_i] ||= $1
+            "\##{TICKET_MAP[$1.to_i] || $1}"
+          else
+            s
+          end
         end
         # Preformatted blocks
         text = text.gsub(/\{\{\{/, '<pre>')
@@ -236,6 +257,7 @@ namespace :redmine do
         migrated_custom_values = 0
         migrated_ticket_attachments = 0
         migrated_wiki_edits = 0      
+        migrated_wiki_attachments = 0
   
         # Components
         print "Migrating components"
@@ -384,8 +406,12 @@ namespace :redmine do
         @target_project.wiki.destroy if @target_project.wiki
         @target_project.reload
         wiki = Wiki.new(:project => @target_project, :start_page => 'WikiStart')
+        wiki_edit_count = 0
         if wiki.save
           TracWikiPage.find(:all, :order => 'name, version').each do |page|
+            # Do not migrate Trac manual wiki pages
+            next if TRAC_WIKI_PAGES.include?(page.name)
+            wiki_edit_count += 1
             print '.'
             STDOUT.flush
             p = wiki.find_or_new_page(page.name)
@@ -394,7 +420,20 @@ namespace :redmine do
             p.content.author = find_or_create_user(page.author) unless page.author.blank? || page.author == 'trac'
             p.content.comments = page.comment
             p.new_record? ? p.save : p.content.save
-            migrated_wiki_edits += 1 unless p.content.new_record?
+            
+            next if p.content.new_record?
+            migrated_wiki_edits += 1 
+            
+            # Attachments
+            page.attachments.each do |attachment|
+              next unless attachment.exist?
+              next if p.attachments.find_by_filename(attachment.filename.gsub(/^.*(\\|\/)/, '').gsub(/[^\w\.\-]/,'_')) #add only once per page
+              a = Attachment.new :created_on => attachment.time
+              a.file = attachment
+              a.author = find_or_create_user(attachment.author)
+              a.container = p
+              migrated_wiki_attachments += 1 if a.save
+            end
           end
           
           wiki.reload
@@ -409,9 +448,10 @@ namespace :redmine do
         puts "Components:      #{migrated_components}/#{TracComponent.count}"
         puts "Milestones:      #{migrated_milestones}/#{TracMilestone.count}"
         puts "Tickets:         #{migrated_tickets}/#{TracTicket.count}"
-        puts "Ticket files:    #{migrated_ticket_attachments}/" + TracAttachment.count("type = 'ticket'").to_s
+        puts "Ticket files:    #{migrated_ticket_attachments}/" + TracAttachment.count(:conditions => {:type => 'ticket'}).to_s
         puts "Custom values:   #{migrated_custom_values}/#{TracTicketCustom.count}"
-        puts "Wiki edits:      #{migrated_wiki_edits}/#{TracWikiPage.count}"
+        puts "Wiki edits:      #{migrated_wiki_edits}/#{wiki_edit_count}"
+        puts "Wiki files:      #{migrated_wiki_attachments}/" + TracAttachment.count(:conditions => {:type => 'wiki'}).to_s
       end
       
       def self.limit_for(klass, attribute)
@@ -542,7 +582,7 @@ namespace :redmine do
     
     DEFAULT_PORTS = {'mysql' => 3306, 'postgresl' => 5432}
     
-    prompt('Trac directory') {|directory| TracMigrate.set_trac_directory directory}
+    prompt('Trac directory') {|directory| TracMigrate.set_trac_directory directory.strip}
     prompt('Trac database adapter (sqlite, sqlite3, mysql, postgresql)', :default => 'sqlite') {|adapter| TracMigrate.set_trac_adapter adapter}
     unless %w(sqlite sqlite3).include?(TracMigrate.trac_adapter)
       prompt('Trac database host', :default => 'localhost') {|host| TracMigrate.set_trac_db_host host}

From 200842ba5e753f342940d7df0f1cc342ae8485d4 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Wed, 27 Feb 2008 20:50:19 +0000
Subject: [PATCH 235/710] Propagates time tracking to the parent project
 (closes #433). Time report enhancements.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1176 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/projects_controller.rb     |   6 +-
 app/controllers/timelog_controller.rb      |  84 ++++++++++++---------
 app/helpers/timelog_helper.rb              |   4 +-
 app/models/project.rb                      |  15 ++++
 app/models/time_entry.rb                   |   6 ++
 app/views/timelog/_list.rhtml              |  16 ++--
 app/views/timelog/_report_criteria.rhtml   |  22 +++---
 app/views/timelog/details.rhtml            |   3 +-
 app/views/timelog/report.rhtml             |  46 +++++++----
 lib/ar_condition.rb                        |  41 ++++++++++
 public/images/report.png                   | Bin 0 -> 1152 bytes
 public/stylesheets/application.css         |  11 ++-
 test/fixtures/time_entries.yml             |  21 +++++-
 test/functional/timelog_controller_test.rb |  30 +++++---
 14 files changed, 221 insertions(+), 84 deletions(-)
 create mode 100644 lib/ar_condition.rb
 create mode 100644 public/images/report.png

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index a3eac71ab..39eb33b99 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -90,7 +90,11 @@ class ProjectsController < ApplicationController
     @trackers = @project.trackers
     @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])
     @total_issues_by_tracker = Issue.count(:group => :tracker, :conditions => ["project_id=?", @project.id])
-    @total_hours = @project.time_entries.sum(:hours)
+    TimeEntry.visible_by(User.current) do
+      @total_hours = TimeEntry.sum(:hours, 
+                                   :include => :project,
+                                   :conditions => ["(#{Project.table_name}.id = ? OR #{Project.table_name}.parent_id = ?)", @project.id, @project.id]).to_f
+    end
     @key = User.current.rss_key
   end
 
diff --git a/app/controllers/timelog_controller.rb b/app/controllers/timelog_controller.rb
index 6ce86fd50..d672ac577 100644
--- a/app/controllers/timelog_controller.rb
+++ b/app/controllers/timelog_controller.rb
@@ -26,26 +26,30 @@ class TimelogController < ApplicationController
   include TimelogHelper
   
   def report
-    @available_criterias = { 'version' => {:sql => "#{Issue.table_name}.fixed_version_id",
-                                          :values => @project.versions,
+    @available_criterias = { 'project' => {:sql => "#{TimeEntry.table_name}.project_id",
+                                          :klass => Project,
+                                          :label => :label_project},
+                             'version' => {:sql => "#{Issue.table_name}.fixed_version_id",
+                                          :klass => Version,
                                           :label => :label_version},
                              'category' => {:sql => "#{Issue.table_name}.category_id",
-                                            :values => @project.issue_categories,
+                                            :klass => IssueCategory,
                                             :label => :field_category},
                              'member' => {:sql => "#{TimeEntry.table_name}.user_id",
-                                         :values => @project.users,
+                                         :klass => User,
                                          :label => :label_member},
                              'tracker' => {:sql => "#{Issue.table_name}.tracker_id",
-                                          :values => Tracker.find(:all),
+                                          :klass => Tracker,
                                           :label => :label_tracker},
                              'activity' => {:sql => "#{TimeEntry.table_name}.activity_id",
-                                           :values => Enumeration::get_values('ACTI'),
+                                           :klass => Enumeration,
                                            :label => :label_activity}
                            }
     
     @criterias = params[:criterias] || []
     @criterias = @criterias.select{|criteria| @available_criterias.has_key? criteria}
     @criterias.uniq!
+    @criterias = @criterias[0,3]
     
     @columns = (params[:period] && %w(year month week).include?(params[:period])) ? params[:period] : 'month'
     
@@ -63,8 +67,11 @@ class TimelogController < ApplicationController
       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 << " FROM #{TimeEntry.table_name}"
+      sql << " LEFT JOIN #{Issue.table_name} ON #{TimeEntry.table_name}.issue_id = #{Issue.table_name}.id"
+      sql << " LEFT JOIN #{Project.table_name} ON #{TimeEntry.table_name}.project_id = #{Project.table_name}.id"
+      sql << " WHERE (#{Project.table_name}.id = %s OR #{Project.table_name}.parent_id = %s)" % [@project.id, @project.id]
+      sql << " AND (%s)" % Project.allowed_to_condition(User.current, :view_time_entries)
       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"
       
@@ -80,6 +87,8 @@ class TimelogController < ApplicationController
           row['week'] = "#{row['tyear']}-#{row['tweek']}"
         end
       end
+      
+      @total_hours = @hours.inject(0) {|s,k| s = s + k['hours'].to_f}
     end
        
     @periods = []
@@ -147,41 +156,44 @@ class TimelogController < ApplicationController
     
     @from, @to = @to, @from if @from && @to && @from > @to
     
-    conditions = nil
+    cond = ARCondition.new
+    cond << (@issue.nil? ? ["(#{Project.table_name}.id = ? OR #{Project.table_name}.parent_id = ?)", @project.id, @project.id] :
+                           ["#{TimeEntry.table_name}.issue_id = ?", @issue.id])
+    
     if @from
       if @to
-        conditions = ['spent_on BETWEEN ? AND ?', @from, @to]
+        cond << ['spent_on BETWEEN ? AND ?', @from, @to]
       else
-        conditions = ['spent_on >= ?', @from]
+        cond << ['spent_on >= ?', @from]
       end
     elsif @to
-      conditions = ['spent_on <= ?', @to]
+      cond << ['spent_on <= ?', @to]
     end
-    
-    @owner_id = User.current.id
 
-    respond_to do |format|
-      format.html {
-        # Paginate results
-        @entry_count = (@issue ? @issue : @project).time_entries.count(:conditions => conditions)
-        @entry_pages = Paginator.new self, @entry_count, per_page_option, params['page']
-        @entries = (@issue ? @issue : @project).time_entries.find(:all, 
-                                                                  :include => [:activity, :user, {:issue => [:tracker, :assigned_to, :priority]}],
-                                                                  :conditions => conditions,
-                                                                  :order => sort_clause,
-                                                                  :limit  =>  @entry_pages.items_per_page,
-                                                                  :offset =>  @entry_pages.current.offset)
-        @total_hours = (@issue ? @issue : @project).time_entries.sum(:hours, :conditions => conditions).to_f
-        render :layout => !request.xhr?
-      }
-      format.csv {
-        # Export all entries
-        @entries = (@issue ? @issue : @project).time_entries.find(:all, 
-                                                                  :include => [:activity, :user, {:issue => [:tracker, :assigned_to, :priority]}],
-                                                                  :conditions => conditions,
-                                                                  :order => sort_clause)
-        send_data(entries_to_csv(@entries).read, :type => 'text/csv; header=present', :filename => 'timelog.csv')
-      }
+    TimeEntry.visible_by(User.current) do
+      respond_to do |format|
+        format.html {
+          # Paginate results
+          @entry_count = TimeEntry.count(:include => :project, :conditions => cond.conditions)
+          @entry_pages = Paginator.new self, @entry_count, per_page_option, params['page']
+          @entries = TimeEntry.find(:all, 
+                                    :include => [:project, :activity, :user, {:issue => :tracker}],
+                                    :conditions => cond.conditions,
+                                    :order => sort_clause,
+                                    :limit  =>  @entry_pages.items_per_page,
+                                    :offset =>  @entry_pages.current.offset)
+          @total_hours = TimeEntry.sum(:hours, :include => :project, :conditions => cond.conditions).to_f
+          render :layout => !request.xhr?
+        }
+        format.csv {
+          # Export all entries
+          @entries = TimeEntry.find(:all, 
+                                    :include => [:project, :activity, :user, {:issue => [:tracker, :assigned_to, :priority]}],
+                                    :conditions => cond.conditions,
+                                    :order => sort_clause)
+          send_data(entries_to_csv(@entries).read, :type => 'text/csv; header=present', :filename => 'timelog.csv')
+        }
+      end
     end
   end
   
diff --git a/app/helpers/timelog_helper.rb b/app/helpers/timelog_helper.rb
index 2af748f6f..05b55907c 100644
--- a/app/helpers/timelog_helper.rb
+++ b/app/helpers/timelog_helper.rb
@@ -17,7 +17,7 @@
 
 module TimelogHelper
   def select_hours(data, criteria, value)
-    data.select {|row| row[criteria] == value.to_s}
+    data.select {|row| row[criteria] == value}
   end
   
   def sum_hours(data)
@@ -50,6 +50,7 @@ module TimelogHelper
       headers = [l(:field_spent_on),
                  l(:field_user),
                  l(:field_activity),
+                 l(:field_project),
                  l(:field_issue),
                  l(:field_tracker),
                  l(:field_subject),
@@ -62,6 +63,7 @@ module TimelogHelper
         fields = [l_date(entry.spent_on),
                   entry.user,
                   entry.activity,
+                  entry.project,
                   (entry.issue ? entry.issue.id : nil),
                   (entry.issue ? entry.issue.tracker : nil),
                   (entry.issue ? entry.issue.subject : nil),
diff --git a/app/models/project.rb b/app/models/project.rb
index 73a8d6404..8f1dada1d 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -110,6 +110,21 @@ class Project < ActiveRecord::Base
     end
   end
   
+  def self.allowed_to_condition(user, permission)
+    statements = []
+    active_statement = "#{Project.table_name}.status=#{Project::STATUS_ACTIVE}"
+    if user.admin?
+      # no restriction
+    elsif user.logged?
+      statements << "#{Project.table_name}.is_public = #{connection.quoted_true}" if Role.non_member.allowed_to?(permission)
+      allowed_project_ids = user.memberships.select {|m| m.role.allowed_to?(permission)}.collect {|m| m.project_id}
+      statements << "#{Project.table_name}.id IN (#{allowed_project_ids.join(',')})"
+    else
+      statements << "#{Project.table_name}.is_public = #{connection.quoted_true}" if Role.anonymous.allowed_to?(permission)
+    end
+    statements.empty? ? active_statement : "(#{active_statement} AND (#{statements.join(' OR ')}))"
+  end
+  
   def self.find(*args)
     if args.first && args.first.is_a?(String) && !args.first.match(/^\d*$/)
       project = find_by_identifier(*args)
diff --git a/app/models/time_entry.rb b/app/models/time_entry.rb
index 04df5233f..0f8f62889 100644
--- a/app/models/time_entry.rb
+++ b/app/models/time_entry.rb
@@ -52,4 +52,10 @@ class TimeEntry < ActiveRecord::Base
   def editable_by?(usr)
     usr == self.user
   end
+  
+  def self.visible_by(usr)
+    with_scope(:find => { :conditions => Project.allowed_to_condition(usr, :view_time_entries) }) do
+      yield
+    end
+  end
 end
diff --git a/app/views/timelog/_list.rhtml b/app/views/timelog/_list.rhtml
index 929d8f7dd..ae5b6376a 100644
--- a/app/views/timelog/_list.rhtml
+++ b/app/views/timelog/_list.rhtml
@@ -3,6 +3,7 @@
 <%= sort_header_tag('spent_on', :caption => l(:label_date), :default_order => 'desc') %>
 <%= sort_header_tag('user_id', :caption => l(:label_member)) %>
 <%= sort_header_tag('activity_id', :caption => l(:label_activity)) %>
+<%= sort_header_tag("#{Project.table_name}.name", :caption => l(:label_project)) %>
 <%= sort_header_tag('issue_id', :caption => l(:label_issue), :default_order => 'desc') %>
 <th><%= l(:field_comments) %></th>
 <%= sort_header_tag('hours', :caption => l(:field_hours)) %>
@@ -12,17 +13,16 @@
 <% entries.each do |entry| -%>
 <tr class="time-entry <%= cycle("odd", "even") %>">
 <td class="spent_on"><%= format_date(entry.spent_on) %></td>
-<td class="user"><%= entry.user.name %></td>
-<td class="activity"><%= entry.activity.name %></td>
+<td class="user"><%=h entry.user %></td>
+<td class="activity"><%=h entry.activity %></td>
+<td class="project"><%=h entry.project %></td>
 <td class="subject">
-  <% if entry.issue -%>
-  <div class="tooltip"><%= link_to_issue entry.issue %>: <%= h(truncate(entry.issue.subject, 50)) -%>
-  <span class="tip"><%= render_issue_tooltip entry.issue %></span>
-  </div>
-  <% end -%>
+<% if entry.issue -%>
+<%= link_to_issue entry.issue %>: <%= h(truncate(entry.issue.subject, 50)) -%>
+<% end -%>
 </td>
 <td class="comments"><%=h entry.comments %></td>
-<td class="hours"><%= entry.hours %></td>
+<td class="hours"><%= html_hours("%.2f" % entry.hours) %></td>
 <td align="center"><%= link_to_if_authorized(l(:button_edit), 
                                              {:controller => 'timelog', :action => 'edit', :id => entry},
                                              :class => 'icon icon-edit') if entry.editable_by?(User.current) %></td>
diff --git a/app/views/timelog/_report_criteria.rhtml b/app/views/timelog/_report_criteria.rhtml
index 0b7e91cfd..b048c874a 100644
--- a/app/views/timelog/_report_criteria.rhtml
+++ b/app/views/timelog/_report_criteria.rhtml
@@ -1,17 +1,17 @@
-<% @available_criterias[criterias[level]][:values].each do |value| %>
-<tr class="<%= cycle('odd', 'even') if criterias.length < level + 2 %>">
+<% @hours.collect {|h| h[criterias[level]]}.uniq.each do |value| %>
+<% hours_for_value = select_hours(hours, criterias[level], value) -%>
+<% next if hours_for_value.empty? -%>
+<tr class="<%= cycle('odd', 'even') %> <%= 'last-level' unless criterias.length > level+1 %>">
 <%= '<td></td>' * level %>
-<td><%= value.name %></td>
-<%= '<td></td>' * (criterias.length - level - 1) %>
-<% hours_for_value = select_hours(hours, criterias[level], value.id) %>
-  <% @periods.each do |period| %>
+<td><%= value.nil? ? l(:label_none) : @available_criterias[criterias[level]][:klass].find_by_id(value) %></td>
+<%= '<td></td>' * (criterias.length - level - 1) -%>
+  <% @periods.each do |period| -%>
     <% sum = sum_hours(select_hours(hours_for_value, @columns, period.to_s)) %>
-    <td align="center"><%= sum > 0 ? "%.2f" % sum : "-" %></td>
-  <% end %>
+    <td class="hours"><%= html_hours("%.2f" % sum) if sum > 0 %></td>
+  <% end -%>
 </tr>
-<% if criterias.length > level+1 %>
+<% if criterias.length > level+1 -%>
   <%= render(:partial => 'report_criteria', :locals => {:criterias => criterias, :hours => hours_for_value, :level => (level + 1)}) %>
-<% end %>
+<% end -%>
 
 <% end %>
-<% reset_cycle %>
diff --git a/app/views/timelog/details.rhtml b/app/views/timelog/details.rhtml
index 0e128f6ae..802090b7a 100644
--- a/app/views/timelog/details.rhtml
+++ b/app/views/timelog/details.rhtml
@@ -1,4 +1,5 @@
 <div class="contextual">
+<%= link_to(l(:label_report), {:controller => 'timelog', :action => 'report', :project_id => @project}, :class => 'icon icon-report') %>
 <%= link_to_if_authorized l(:button_log_time), {:controller => 'timelog', :action => 'edit', :project_id => @project, :issue_id => @issue}, :class => 'icon icon-time' %>
 </div>
 
@@ -25,7 +26,7 @@
 <%= text_field_tag 'from', @from, :size => 10, :onfocus => '$("period_type_2").checked = true;' %> <%= calendar_for('from') %>
 <%= l(:label_date_to) %>
 <%= text_field_tag 'to', @to, :size => 10, :onfocus => '$("period_type_2").checked = true;' %> <%= calendar_for('to') %>
-<%= submit_tag l(:button_submit), :name => nil, :onclick => '$("period_type_2").checked = true;' %>
+<%= submit_tag l(:button_apply), :name => nil, :onclick => '$("period_type_2").checked = true;' %>
 </p>
 </fieldset>
 <% end %>
diff --git a/app/views/timelog/report.rhtml b/app/views/timelog/report.rhtml
index 4fabfe3dd..8fc15a3b4 100644
--- a/app/views/timelog/report.rhtml
+++ b/app/views/timelog/report.rhtml
@@ -1,31 +1,43 @@
+<div class="contextual">
+<%= link_to(l(:label_details), {:controller => 'timelog', :action => 'details', :project_id => @project}, :class => 'icon icon-details') %>
+<%= link_to_if_authorized l(:button_log_time), {:controller => 'timelog', :action => 'edit', :project_id => @project, :issue_id => @issue}, :class => 'icon icon-time' %>
+</div>
+
 <h2><%= l(:label_spent_time) %></h2>
 
 <% form_remote_tag(:url => {:project_id => @project}, :update => 'content') do %>
   <% @criterias.each do |criteria| %>
     <%= hidden_field_tag 'criterias[]', criteria %>
   <% end %>
+  <fieldset><legend><%= l(:label_date_range) %></legend>
   <p>
-  <%= l(:label_date_from) %>: <%= text_field_tag 'date_from', @date_from, :size => 10 %><%= calendar_for('date_from') %>
-  &nbsp;
-  <%= l(:label_date_to) %>: <%= text_field_tag 'date_to', @date_to, :size => 10 %><%= calendar_for('date_to') %>
-  &nbsp;
-  <%= l(:label_details) %>:
+  <%= l(:label_date_from) %>
+  <%= text_field_tag 'date_from', @date_from, :size => 10 %><%= calendar_for('date_from') %>
+  <%= l(:label_date_to) %>
+  <%= text_field_tag 'date_to', @date_to, :size => 10 %><%= calendar_for('date_to') %>
+  <%= l(:label_details) %>
   <%= select_tag 'period', options_for_select([[l(:label_year), 'year'],
                                                [l(:label_month), 'month'],
                                                [l(:label_week), 'week']], @columns) %>
   &nbsp;
   <%= submit_tag l(:button_apply) %>
-  <%= link_to_remote l(:button_clear), {:url => {:project_id => @project}, :update => 'content'}, :class => 'icon icon-reload' %>
   </p>
+  </fieldset>
 
-  <% if @criterias.length < 3 %>
-  <p><%= l(:button_add) %>: <%= select_tag('criterias[]', options_for_select([[]] + (@available_criterias.keys - @criterias).collect{|k| [l(@available_criterias[k][:label]), k]}), :onchange => "this.form.onsubmit();") %></p>
-  <% end %>
+  <p><%= l(:button_add) %>: <%= select_tag('criterias[]', options_for_select([[]] + (@available_criterias.keys - @criterias).collect{|k| [l(@available_criterias[k][:label]), k]}),
+                                                          :onchange => "this.form.onsubmit();",
+                                                          :style => 'width: 200px',
+                                                          :disabled => (@criterias.length >= 3)) %>
+     <%= link_to_remote l(:button_clear), {:url => {:project_id => @project, :date_from => @date_from, :date_to => @date_to, :period => @columns}, :update => 'content'},
+                                          :class => 'icon icon-reload' %></p>
   
-<br />
+<% unless @criterias.empty? %>
+<div class="total-hours">
+<p><%= l(:label_total) %>: <%= html_hours(lwr(:label_f_hour, @total_hours)) %></p>
+</div>
 
-<% unless @criterias.empty? %>  
-<table class="list">
+<% unless @hours.empty? %>
+<table class="list" id="time-report">
 <thead>
 <tr>
 <% @criterias.each do |criteria| %>
@@ -36,13 +48,21 @@
 <% end %>
 </tr>
 </thead>
-
 <tbody>
 <%= render :partial => 'report_criteria', :locals => {:criterias => @criterias, :hours => @hours, :level => 0} %>
+  <tr class="total">
+  <td><%= l(:label_total) %></td>
+  <%= '<td></td>' * (@criterias.size - 1) %>
+  <% @periods.each do |period| -%>
+    <% sum = sum_hours(select_hours(@hours, @columns, period.to_s)) %>
+    <td class="hours"><%= html_hours("%.2f" % sum) if sum > 0 %></td>
+  <% end -%>
+  </tr>
 </tbody>
 </table>
 <% end %>
 <% end %>
+<% end %>
 
 <% content_for :header_tags do %>
 <%= javascript_include_tag 'calendar/calendar' %>
diff --git a/lib/ar_condition.rb b/lib/ar_condition.rb
new file mode 100644
index 000000000..b08e90761
--- /dev/null
+++ b/lib/ar_condition.rb
@@ -0,0 +1,41 @@
+# redMine - project management software
+# Copyright (C) 2006-2008  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 ARCondition
+  attr_reader :conditions
+  
+  def initialize(condition=nil)
+    @conditions = ['1=1']
+    @conditions.add(condition) if condition
+  end
+  
+  def add(condition)
+    if condition.is_a?(Array)
+      @conditions.first << " AND (#{condition.first})"
+      @conditions += condition[1..-1]
+    elsif condition.is_a?(String)
+      @conditions.first << " AND (#{condition})"
+    else
+      raise "Unsupported #{condition.class} condition: #{condition}"
+    end
+    self
+  end
+
+  def <<(condition)
+    add(condition)
+  end
+end
diff --git a/public/images/report.png b/public/images/report.png
new file mode 100644
index 0000000000000000000000000000000000000000..05386ac4f44c052af3a0fe6426d418b133cdde7f
GIT binary patch
literal 1152
zcmeHE?@Lor7(S+@n_8Oo!y=m$C`G!NU^4<;TRGDyQ$$CFB6H}p!i`9-MA=;#EGrmk
zwhvj}4@Fn8I)up0EIEDhf*(2!KOCu`TaX<E;SeRav;V`x`##Tm9(dowdEVP~uG8tp
zJw^aPy0g;m=A04FlthjNN4C{-DhfK9f+u^tt-+3q7fcNu-Coe`?I|=BmzvstUXB-L
z^Dz!(meMkd)pXcwF`EtZnT5PHIq0l$B*!-G%_=T1%r(B{lHpQia{vJ2N<0&6FG_~F
znB=RdsQ_T|ZtB0*%>X2Vy6Ogp4nPEwKoqw{R8N=(a*IfiR8fLd!y08oV_0JmNg}cp
zAz9aT1ydPOK_Z&s(V$J0{fbHyl|q$@GNF_b*`h%=maL4(lrcsmio+0!1X`IYP~=yT
zO4T-o0~B)<aWqeXQC(*`e@d-lT3Cewf+9qiX;I1*BI>%PsWyf^jD#5$G{vnbQ3>(!
zx{5?b0!)Mc2!=?Z*hADRf^1l^MUcRMBk)iH{wR(rGy=6S)VLcPXTt&Rz=OsECpaYp
z-L862{yo;tFVjwYMZ=ZF(7bck^}5|?btn=@nRxVL<jg?zLtjqTt+n-;w4qQar2qcY
zoqKJ`{<W8U`|`KhX*9=TOZ{ns`5&#*<H8jAb^OM%Ix>9cQ*P$+2Y;;(_f4LaODDRv
zK0ewxh_cQ(4i4PUD1YN?zWIzLug~5))eD|3lvKYOIrMsQU)TtqH!iGo*0??!@}9gq
z|8lBtw8=K+&F<aeu5$UZ9ix$}rk%Ad+n0*=rzBYm=ThnWm6`me)ts@^*{&V&<vJZM
J`?#&8|3A!`I#2)r

literal 0
HcmV?d00001

diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 003b21eca..b3dcac6b0 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -112,7 +112,8 @@ tr.user.locked a, tr.user.registered a { color: #aaa; }
 
 tr.time-entry { text-align: center; white-space: nowrap; }
 tr.time-entry td.subject, tr.time-entry td.comments { text-align: left; }
-tr.time-entry td.hours { text-align: right; font-weight: bold; padding-right: 0.6em; }
+tr.time-entry td.hours { text-align: right; font-weight: bold; padding-right: 0.5em; }
+tr.time-entry .hours-dec { font-size: 0.9em; }
 
 table.list tbody tr:hover { background-color:#ffffdd; }
 table td {padding:2px;}
@@ -173,6 +174,12 @@ div#roadmap .wiki h1:first-child { display: none; }
 div#roadmap .wiki h1 { font-size: 120%; }
 div#roadmap .wiki h2 { font-size: 110%; }
 
+table#time-report td.hours { text-align: right; padding-right: 0.5em; }
+table#time-report tbody tr { font-style: italic; color: #777; }
+table#time-report tbody tr.last-level { font-style: normal; color: #555; }
+table#time-report tbody tr.total { font-style: normal; font-weight: bold; color: #555; background-color:#EEEEEE; }
+table#time-report .hours-dec { font-size: 0.9em; }
+
 div.total-hours { text-align: left; font-size: 110%; font-weight: bold; }
 div.total-hours span.hours-int { font-size: 120%; }
 
@@ -536,6 +543,8 @@ vertical-align: middle;
 .icon-lock  { background-image: url(../images/locked.png); }
 .icon-unlock  { background-image: url(../images/unlock.png); }
 .icon-checked  { background-image: url(../images/true.png); }
+.icon-details  { background-image: url(../images/zoom_in.png); }
+.icon-report  { background-image: url(../images/report.png); }
 
 .icon22-projects { background-image: url(../images/22x22/projects.png); }
 .icon22-users { background-image: url(../images/22x22/users.png); }
diff --git a/test/fixtures/time_entries.yml b/test/fixtures/time_entries.yml
index ae2b1efea..151077d2b 100644
--- a/test/fixtures/time_entries.yml
+++ b/test/fixtures/time_entries.yml
@@ -6,7 +6,7 @@ time_entries_001:
   project_id: 1
   comments: My hours
   updated_on: 2007-03-23 12:54:18 +01:00
-  activity_id: 8
+  activity_id: 9
   spent_on: 2007-03-23
   issue_id: 1
   id: 1
@@ -20,7 +20,7 @@ time_entries_002:
   project_id: 1
   comments: ""
   updated_on: 2007-03-23 14:11:04 +01:00
-  activity_id: 8
+  activity_id: 9
   spent_on: 2007-03-12
   issue_id: 1
   id: 2
@@ -34,10 +34,25 @@ time_entries_003:
   project_id: 1
   comments: ""
   updated_on: 2007-04-21 12:20:48 +02:00
-  activity_id: 8
+  activity_id: 9
   spent_on: 2007-04-21
   issue_id: 2
   id: 3
   hours: 1.0
   user_id: 1
   tyear: 2007
+time_entries_004: 
+  created_on: 2007-04-22 12:20:48 +02:00
+  tweek: 16
+  tmonth: 4
+  project_id: 3
+  comments: Time spent on a subproject
+  updated_on: 2007-04-22 12:20:48 +02:00
+  activity_id: 10
+  spent_on: 2007-04-22
+  issue_id: 
+  id: 4
+  hours: 7.65
+  user_id: 1
+  tyear: 2007
+  
\ No newline at end of file
diff --git a/test/functional/timelog_controller_test.rb b/test/functional/timelog_controller_test.rb
index e1236ffac..4163ce548 100644
--- a/test/functional/timelog_controller_test.rb
+++ b/test/functional/timelog_controller_test.rb
@@ -37,27 +37,39 @@ class TimelogControllerTest < Test::Unit::TestCase
   end
   
   def test_report_one_criteria
-    get :report, :project_id => 1, :period => "month", :date_from => "2007-01-01", :date_to => "2007-12-31", :criterias => ["member"]
+    get :report, :project_id => 1, :period => 'week', :date_from => "2007-04-01", :date_to => "2007-04-30", :criterias => ['project']
     assert_response :success
     assert_template 'report'
-    assert_not_nil assigns(:hours)
-  end
+    assert_not_nil assigns(:total_hours)
+    assert_equal "8.65", "%.2f" % assigns(:total_hours)
+ end
   
   def test_report_two_criterias
-    get :report, :project_id => 1, :period => "week", :date_from => "2007-01-01", :date_to => "2007-12-31", :criterias => ["member", "activity"]
+    get :report, :project_id => 1, :period => 'month', :date_from => "2007-01-01", :date_to => "2007-12-31", :criterias => ["member", "activity"]
     assert_response :success
     assert_template 'report'
-    assert_not_nil assigns(:hours)
+    assert_not_nil assigns(:total_hours)
+    assert_equal "162.90", "%.2f" % assigns(:total_hours)
   end
   
+  def test_report_one_criteria_no_result
+    get :report, :project_id => 1, :period => 'week', :date_from => "1998-04-01", :date_to => "1998-04-30", :criterias => ['project']
+    assert_response :success
+    assert_template 'report'
+    assert_not_nil assigns(:total_hours)
+    assert_equal "0.00", "%.2f" % assigns(:total_hours)
+ end
+
   def test_details_at_project_level
     get :details, :project_id => 1
     assert_response :success
     assert_template 'details'
     assert_not_nil assigns(:entries)
-    assert_equal 3, assigns(:entries).size
+    assert_equal 4, assigns(:entries).size
+    # project and subproject
+    assert_equal [1, 3], assigns(:entries).collect(&:project_id).uniq.sort
     assert_not_nil assigns(:total_hours)
-    assert_equal 155.25, assigns(:total_hours)
+    assert_equal "162.90", "%.2f" % assigns(:total_hours)
     # display all time by default
     assert_nil assigns(:from)
     assert_nil assigns(:to)
@@ -68,9 +80,9 @@ class TimelogControllerTest < Test::Unit::TestCase
     assert_response :success
     assert_template 'details'
     assert_not_nil assigns(:entries)
-    assert_equal 2, assigns(:entries).size
+    assert_equal 3, assigns(:entries).size
     assert_not_nil assigns(:total_hours)
-    assert_equal 5.25, assigns(:total_hours)
+    assert_equal "12.90", "%.2f" % assigns(:total_hours)
     assert_equal '2007-03-20'.to_date, assigns(:from)
     assert_equal '2007-04-30'.to_date, assigns(:to)
   end

From 1ddb59df2afb4539e6484e7c339683d18fc0ac94 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Wed, 27 Feb 2008 23:01:35 +0000
Subject: [PATCH 236/710] Fixed JournalControllerTest.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1177 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 test/functional/journals_controller_test.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/functional/journals_controller_test.rb b/test/functional/journals_controller_test.rb
index e6a90185c..327c7e79a 100644
--- a/test/functional/journals_controller_test.rb
+++ b/test/functional/journals_controller_test.rb
@@ -21,7 +21,7 @@ require 'journals_controller'
 # Re-raise errors caught by the controller.
 class JournalsController; def rescue_action(e) raise e end; end
 
-class JournalsControllerTest < ActionController::TestCase
+class JournalsControllerTest < Test::Unit::TestCase
   fixtures :projects, :users, :members, :roles, :issues, :journals, :journal_details, :enabled_modules
   
   def setup

From b6bd5c7f12afab446bca83d2eea277f1969637da Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Thu, 28 Feb 2008 21:57:03 +0000
Subject: [PATCH 237/710] Include subprojects on the issue list, calendar and
 gantt by default.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1178 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/projects_controller.rb | 19 +++++++++++++------
 app/models/issue.rb                    |  6 ++++++
 app/models/query.rb                    | 20 +++++++++++---------
 app/views/projects/calendar.rhtml      |  5 +++--
 app/views/projects/gantt.rhtml         |  3 ++-
 app/views/queries/_filters.rhtml       |  2 +-
 6 files changed, 36 insertions(+), 19 deletions(-)

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 39eb33b99..adb49114c 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -87,9 +87,15 @@ class ProjectsController < ApplicationController
     @members_by_role = @project.members.find(:all, :include => [:user, :role], :order => 'position').group_by {|m| m.role}
     @subprojects = @project.active_children
     @news = @project.news.find(:all, :limit => 5, :include => [ :author, :project ], :order => "#{News.table_name}.created_on DESC")
-    @trackers = @project.trackers
-    @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])
-    @total_issues_by_tracker = Issue.count(:group => :tracker, :conditions => ["project_id=?", @project.id])
+    @trackers = @project.rolled_up_trackers
+    Issue.visible_by(User.current) do
+      @open_issues_by_tracker = Issue.count(:group => :tracker,
+                                            :include => [:project, :status, :tracker],
+                                            :conditions => ["(#{Project.table_name}.id=? OR #{Project.table_name}.parent_id=?) and #{IssueStatus.table_name}.is_closed=?", @project.id, @project.id, false])
+      @total_issues_by_tracker = Issue.count(:group => :tracker,
+                                            :include => [:project, :status, :tracker],
+                                            :conditions => ["#{Project.table_name}.id=? OR #{Project.table_name}.parent_id=?", @project.id, @project.id])
+    end
     TimeEntry.visible_by(User.current) do
       @total_hours = TimeEntry.sum(:hours, 
                                    :include => :project,
@@ -307,9 +313,9 @@ class ProjectsController < ApplicationController
     @year ||= Date.today.year
     @month ||= Date.today.month    
     @calendar = Redmine::Helpers::Calendar.new(Date.civil(@year, @month, 1), current_language, :month)
-    
+    @with_subprojects = params[:with_subprojects].nil? ? true : (params[:with_subprojects] == '1')
     events = []
-    @project.issues_with_subprojects(params[:with_subprojects]) do
+    @project.issues_with_subprojects(@with_subprojects) do
       events += Issue.find(:all, 
                            :include => [:tracker, :status, :assigned_to, :priority, :project], 
                            :conditions => ["((start_date BETWEEN ? AND ?) OR (due_date BETWEEN ? AND ?)) AND #{Issue.table_name}.tracker_id IN (#{@selected_tracker_ids.join(',')})", @calendar.startdt, @calendar.enddt, @calendar.startdt, @calendar.enddt]
@@ -350,9 +356,10 @@ class ProjectsController < ApplicationController
     
     @date_from = Date.civil(@year_from, @month_from, 1)
     @date_to = (@date_from >> @months) - 1
+    @with_subprojects = params[:with_subprojects].nil? ? true : (params[:with_subprojects] == '1')
     
     @events = []
-    @project.issues_with_subprojects(params[:with_subprojects]) do
+    @project.issues_with_subprojects(@with_subprojects) do
       @events += Issue.find(:all, 
                            :order => "start_date, due_date",
                            :include => [:tracker, :status, :assigned_to, :priority, :project], 
diff --git a/app/models/issue.rb b/app/models/issue.rb
index 6b9b3bd1c..9d7f6eaaf 100644
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -231,4 +231,10 @@ class Issue < ActiveRecord::Base
   def soonest_start
     @soonest_start ||= relations_to.collect{|relation| relation.successor_soonest_start}.compact.min
   end
+  
+  def self.visible_by(usr)
+    with_scope(:find => { :conditions => Project.visible_by(usr) }) do
+      yield
+    end
+  end
 end
diff --git a/app/models/query.rb b/app/models/query.rb
index a4103c08a..73828f739 100644
--- a/app/models/query.rb
+++ b/app/models/query.rb
@@ -83,7 +83,7 @@ class Query < ActiveRecord::Base
   @@operators_by_filter_type = { :list => [ "=", "!" ],
                                  :list_status => [ "o", "=", "!", "c", "*" ],
                                  :list_optional => [ "=", "!", "!*", "*" ],
-                                 :list_one_or_more => [ "*", "=" ],
+                                 :list_subprojects => [ "*", "!*", "=" ],
                                  :date => [ "<t+", ">t+", "t+", "t", "w", ">t-", "<t-", "t-" ],
                                  :date_past => [ ">t-", "<t-", "t-", "t", "w" ],
                                  :string => [ "=", "~", "!", "!~" ],
@@ -163,7 +163,7 @@ class Query < ActiveRecord::Base
       @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.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] } }
+        @available_filters["subproject_id"] = { :type => :list_subprojects, :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
@@ -259,16 +259,18 @@ class Query < ActiveRecord::Base
   def statement
     # project/subprojects clause
     clause = ''
-    if project && has_filter?("subproject_id")
-      subproject_ids = []
-      if operator_for("subproject_id") == "="
-        subproject_ids = values_for("subproject_id").each(&:to_i)
+    if project && !@project.active_children.empty?
+      ids = [project.id]
+      if has_filter?("subproject_id") && operator_for("subproject_id") == "="
+        # include the selected subprojects
+        ids += values_for("subproject_id").each(&:to_i)
       else
-        subproject_ids = project.active_children.collect{|p| p.id}
+        # include all the subprojects unless 'none' is selected
+        ids += project.active_children.collect{|p| p.id} unless has_filter?("subproject_id") && operator_for("subproject_id") == "!*"
       end
-      clause << "#{Issue.table_name}.project_id IN (%d,%s)" % [project.id, subproject_ids.join(",")] if project
+      clause << "#{Issue.table_name}.project_id IN (%s)" % ids.join(',')
     elsif project
-      clause << "#{Issue.table_name}.project_id=%d" % project.id
+      clause << "#{Issue.table_name}.project_id = %d" % project.id
     else
       clause << Project.visible_by(User.current)
     end
diff --git a/app/views/projects/calendar.rhtml b/app/views/projects/calendar.rhtml
index a2af3e2bb..743721cb3 100644
--- a/app/views/projects/calendar.rhtml
+++ b/app/views/projects/calendar.rhtml
@@ -31,9 +31,10 @@
       <label><%= check_box_tag "tracker_ids[]", tracker.id, (@selected_tracker_ids.include? tracker.id.to_s) %> <%= tracker.name %></label><br />
     <% end %>
     <% if @project.active_children.any? %>
-    <br /><label><%= check_box_tag "with_subprojects", 1, params[:with_subprojects] %> <%=l(:label_subproject_plural)%></label>
+    <br /><label><%= check_box_tag 'with_subprojects', 1, @with_subprojects %> <%=l(:label_subproject_plural)%></label>
+    <%= hidden_field_tag 'with_subprojects', 0 %>
     <% end %>
-    <p><%= submit_tag l(:button_apply), :class => 'button-small' %></p>
+    <p><%= submit_tag l(:button_apply), :class => 'button-small', :name => nil %></p>
     <% end %>
 <% end %>
 
diff --git a/app/views/projects/gantt.rhtml b/app/views/projects/gantt.rhtml
index ece776699..2979bce2b 100644
--- a/app/views/projects/gantt.rhtml
+++ b/app/views/projects/gantt.rhtml
@@ -235,7 +235,8 @@ if Date.today >= @date_from and Date.today <= @date_to %>
       <label><%= check_box_tag "tracker_ids[]", tracker.id, (@selected_tracker_ids.include? tracker.id.to_s) %> <%= tracker.name %></label><br />
     <% end %>
     <% if @project.active_children.any? %>
-    <br /><label><%= check_box_tag "with_subprojects", 1, params[:with_subprojects] %> <%=l(:label_subproject_plural)%></label>
+    <br /><label><%= check_box_tag 'with_subprojects', 1, @with_subprojects %> <%=l(:label_subproject_plural)%></label>
+    <%= hidden_field_tag 'with_subprojects', 0 %>
     <% end %>
     <p><%= submit_tag l(:button_apply), :class => 'button-small' %></p>
     <% end %>
diff --git a/app/views/queries/_filters.rhtml b/app/views/queries/_filters.rhtml
index bc60bd5eb..2465818d8 100644
--- a/app/views/queries/_filters.rhtml
+++ b/app/views/queries/_filters.rhtml
@@ -75,7 +75,7 @@ function toggle_multi_select(field) {
     <td valign="top">    
     <div id="div_values_<%= field %>" style="display:none;">
     <% case options[:type]
-    when :list, :list_optional, :list_status, :list_one_or_more %>
+    when :list, :list_optional, :list_status, :list_subprojects %>
         <select <%= "multiple=true" if query.values_for(field) and query.values_for(field).length > 1 %> name="values[<%= field %>][]" id="values_<%= field %>" class="select-small" style="vertical-align: top;">
         <%= options_for_select options[:values], query.values_for(field) %>        
         </select>

From 4b15dc10c10d9cb54d156457cc7d6823dac55520 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Thu, 28 Feb 2008 22:00:56 +0000
Subject: [PATCH 238/710] Fixed: Multiple "new" statuses in filing new ticket
 (closes #751).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1179 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/issues_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index 8b3cc339d..e03afb252 100644
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -116,7 +116,7 @@ class IssuesController < ApplicationController
       return
     end    
     @issue.status = default_status
-    @allowed_statuses = ([default_status] + default_status.find_new_statuses_allowed_to(User.current.role_for_project(@project), @issue.tracker))
+    @allowed_statuses = ([default_status] + default_status.find_new_statuses_allowed_to(User.current.role_for_project(@project), @issue.tracker)).uniq
     
     if request.get? || request.xhr?
       @issue.start_date ||= Date.today

From 9daf39ec5242a6a87efb9c862952e176d4314856 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Fri, 29 Feb 2008 19:46:58 +0000
Subject: [PATCH 239/710] Adds an optional description to attachments.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1180 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/application.rb                | 20 ++++++++------
 app/controllers/documents_controller.rb       |  2 ++
 app/helpers/application_helper.rb             |  2 +-
 app/views/attachments/_form.rhtml             | 13 +++++++---
 app/views/attachments/_links.rhtml            | 17 +++++++-----
 app/views/common/_attachments_form.rhtml      |  6 -----
 app/views/documents/index.rhtml               |  2 +-
 app/views/documents/new.rhtml                 |  2 +-
 app/views/documents/show.rhtml                | 26 +++++--------------
 app/views/issues/_edit.rhtml                  | 10 +++----
 app/views/issues/_form.rhtml                  |  4 +--
 app/views/messages/_form.rhtml                |  9 +++----
 app/views/projects/add_file.rhtml             |  2 +-
 app/views/projects/list_files.rhtml           |  3 ++-
 app/views/wiki/show.rhtml                     | 10 ++++---
 db/migrate/089_add_attachments_description.rb |  9 +++++++
 lang/bg.yml                                   |  2 ++
 lang/cs.yml                                   |  2 ++
 lang/de.yml                                   |  2 ++
 lang/en.yml                                   |  2 ++
 lang/es.yml                                   |  2 ++
 lang/fi.yml                                   |  2 ++
 lang/fr.yml                                   |  2 ++
 lang/he.yml                                   |  2 ++
 lang/it.yml                                   |  2 ++
 lang/ja.yml                                   |  2 ++
 lang/ko.yml                                   |  2 ++
 lang/lt.yml                                   |  2 ++
 lang/nl.yml                                   |  2 ++
 lang/pl.yml                                   |  2 ++
 lang/pt-br.yml                                |  2 ++
 lang/pt.yml                                   |  2 ++
 lang/ro.yml                                   |  2 ++
 lang/ru.yml                                   |  2 ++
 lang/sr.yml                                   |  2 ++
 lang/sv.yml                                   |  2 ++
 lang/uk.yml                                   |  2 ++
 lang/zh-tw.yml                                |  2 ++
 lang/zh.yml                                   |  2 ++
 public/javascripts/application.js             | 15 ++++++++---
 public/stylesheets/application.css            |  4 +++
 test/functional/documents_controller_test.rb  |  2 +-
 test/functional/issues_controller_test.rb     |  2 +-
 test/integration/issues_test.rb               |  3 ++-
 44 files changed, 138 insertions(+), 71 deletions(-)
 delete mode 100644 app/views/common/_attachments_form.rhtml
 create mode 100644 db/migrate/089_add_attachments_description.rb

diff --git a/app/controllers/application.rb b/app/controllers/application.rb
index 3644c396a..7510d503e 100644
--- a/app/controllers/application.rb
+++ b/app/controllers/application.rb
@@ -160,16 +160,20 @@ class ApplicationController < ActionController::Base
   end
   
   # TODO: move to model
-  def attach_files(obj, files)
-    attachments = []
-    if files && files.is_a?(Array)
-      files.each do |file|
-        next unless file.size > 0
-        a = Attachment.create(:container => obj, :file => file, :author => User.current)
-        attachments << a unless a.new_record?
+  def attach_files(obj, attachments)
+    attached = []
+    if attachments && attachments.is_a?(Hash)
+      attachments.each_value do |attachment|
+        file = attachment['file']
+        next unless file && file.size > 0
+        a = Attachment.create(:container => obj, 
+                              :file => file,
+                              :description => attachment['description'].to_s.strip,
+                              :author => User.current)
+        attached << a unless a.new_record?
       end
     end
-    attachments
+    attached
   end
 
   # Returns the number of objects that should be displayed
diff --git a/app/controllers/documents_controller.rb b/app/controllers/documents_controller.rb
index 93f25c495..7e732b9b6 100644
--- a/app/controllers/documents_controller.rb
+++ b/app/controllers/documents_controller.rb
@@ -21,6 +21,8 @@ class DocumentsController < ApplicationController
   before_filter :find_document, :except => [:index, :new]
   before_filter :authorize
   
+  helper :attachments
+  
   def index
     @sort_by = %w(category date title author).include?(params[:sort_by]) ? params[:sort_by] : 'category'
     documents = @project.documents.find :all, :include => [:attachments, :category]
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index af493b034..b9318a3f7 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -396,7 +396,7 @@ module ApplicationHelper
   
   def labelled_tabular_form_for(name, object, options, &proc)
     options[:html] ||= {}
-    options[:html].store :class, "tabular"
+    options[:html][:class] = 'tabular' unless options[:html].has_key?(:class)
     form_for(name, object, options.merge({ :builder => TabularFormBuilder, :lang => current_language}), &proc)
   end
   
diff --git a/app/views/attachments/_form.rhtml b/app/views/attachments/_form.rhtml
index 18f08c6be..094668f9d 100644
--- a/app/views/attachments/_form.rhtml
+++ b/app/views/attachments/_form.rhtml
@@ -1,4 +1,9 @@
-<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>
+<span id="attachments_fields">
+<%= file_field_tag 'attachments[1][file]', :size => 30, :id => nil  -%>
+<%= text_field_tag 'attachments[1][description]', '', :size => 60, :id => nil %>
+<em><%= l(:label_optional_description) %></em>
+</span>
+<br />
+<small><%= link_to l(:label_add_another_file), {}, :onclick => 'addFileField(); return false;' %>
+(<%= l(:label_max_size) %>: <%= number_to_human_size(Setting.attachment_max_size.to_i.kilobytes) %>)
+</small>
diff --git a/app/views/attachments/_links.rhtml b/app/views/attachments/_links.rhtml
index cce11292e..4d485548b 100644
--- a/app/views/attachments/_links.rhtml
+++ b/app/views/attachments/_links.rhtml
@@ -1,12 +1,17 @@
 <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] %>
-    <span class="author"><%= attachment.author.name %>, <%= format_date(attachment.created_on) %></span>
-  <% end %>
+<p><%= link_to attachment.filename, {:controller => 'attachments', :action => 'download', :id => attachment }, :class => 'icon icon-attachment' -%>
+<%= h(" - #{attachment.description}") unless attachment.description.blank? %>
+  <span class="size">(<%= number_to_human_size attachment.filesize %>)</span>
   <% 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 %>
+    <%= link_to image_tag('delete.png'), options[:delete_url].update({:attachment_id => attachment}),
+                                         :confirm => l(:text_are_you_sure),
+                                         :method => :post,
+                                         :class => 'delete',
+                                         :title => l(:button_delete) %>
+  <% end %>
+  <% unless options[:no_author] %>
+    <span class="author"><%= attachment.author %>, <%= format_time(attachment.created_on) %></span>
   <% end %>
   </p>
 <% end %>
diff --git a/app/views/common/_attachments_form.rhtml b/app/views/common/_attachments_form.rhtml
deleted file mode 100644
index 673f4a52e..000000000
--- a/app/views/common/_attachments_form.rhtml
+++ /dev/null
@@ -1,6 +0,0 @@
-<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>
diff --git a/app/views/documents/index.rhtml b/app/views/documents/index.rhtml
index ff58c2b2f..14d997360 100644
--- a/app/views/documents/index.rhtml
+++ b/app/views/documents/index.rhtml
@@ -10,7 +10,7 @@
 <% form_tag({:controller => 'documents', :action => 'new', :project_id => @project}, :class => "tabular", :multipart => true) do %>
 <%= render :partial => 'documents/form' %>
 <div class="box">
-<%= render :partial => 'common/attachments_form'%>
+<p><label><%=l(:label_attachment_plural)%></label><%= render :partial => 'attachments/form' %></p>
 </div>
 <%= submit_tag l(:button_create) %>
 <%= link_to l(:button_cancel), "#", :onclick => 'Element.hide("add-document")' %>
diff --git a/app/views/documents/new.rhtml b/app/views/documents/new.rhtml
index 4f728da79..639b4f292 100644
--- a/app/views/documents/new.rhtml
+++ b/app/views/documents/new.rhtml
@@ -4,7 +4,7 @@
 <%= render :partial => 'documents/form' %>
 
 <div class="box">
-<%= render :partial => 'common/attachments_form'%>
+<p><label><%=l(:label_attachment_plural)%></label><%= render :partial => 'attachments/form' %></p>
 </div>
 
 <%= submit_tag l(:button_create) %>
diff --git a/app/views/documents/show.rhtml b/app/views/documents/show.rhtml
index 3014387bd..aa90c5518 100644
--- a/app/views/documents/show.rhtml
+++ b/app/views/documents/show.rhtml
@@ -10,29 +10,17 @@
 <div class="wiki">
 <%= textilizable @document.description, :attachments => @document.attachments %>
 </div>
-<br />
 
 <h3><%= l(:label_attachment_plural) %></h3>
-<ul class="documents">  
-<% for attachment in @attachments %>
-    <li>
-        <div class="contextual">
-        <%= link_to_if_authorized l(:button_delete), {:controller => 'documents', :action => 'destroy_attachment', :id => @document, :attachment_id => attachment}, :confirm => l(:text_are_you_sure), :method => :post, :class => 'icon icon-del' %>
-        </div>
-        <%= link_to attachment.filename, :action => 'download', :id => @document, :attachment_id => attachment %>
-        (<%= number_to_human_size attachment.filesize %>)<br />
-        <span class="author"><%= authoring attachment.created_on, attachment.author %></span><br />
-        <%= lwr(:label_download, attachment.downloads) %>
-    </li>
-<% end %>
-</ul>
-<br />
-
+<%= link_to_attachments @attachments, :delete_url => (authorize_for('documents', 'destroy_attachment') ? {:controller => 'documents', :action => 'destroy_attachment', :id => @document} : nil) %>
 
 <% 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 %>
-    <%= render :partial => 'attachments/form' %>
+<p><%= link_to l(:label_attachment_new), {}, :onclick => "Element.show('add_attachment_form'); Element.hide(this); Element.scrollTo('add_attachment_form'); return false;",
+                                             :id => 'attach_files_link' %></p>
+  <% form_tag({ :controller => 'documents', :action => 'add_attachment', :id => @document }, :multipart => true, :id => "add_attachment_form", :style => "display:none;") do %>
+  <div class="box">
+  <p><%= render :partial => 'attachments/form' %></p>
+  </div>
   <%= submit_tag l(:button_add) %>
   <% end %> 
 <% end %>
diff --git a/app/views/issues/_edit.rhtml b/app/views/issues/_edit.rhtml
index f9b234d85..2e00ab520 100644
--- a/app/views/issues/_edit.rhtml
+++ b/app/views/issues/_edit.rhtml
@@ -1,12 +1,12 @@
 <% labelled_tabular_form_for :issue, @issue,
                              :url => {:action => 'edit', :id => @issue},
                              :html => {:id => 'issue-form',
+                                       :class => nil,
                                        :multipart => true} do |f| %>
     <%= error_messages_for 'issue' %>
     <div class="box">
     <% if @edit_allowed || !@allowed_statuses.empty? %>
-        <fieldset>
-        <legend><%= l(:label_change_properties) %>
+        <fieldset class="tabular"><legend><%= l(:label_change_properties) %>
         <% if !@issue.new_record? && !@issue.errors.any? && @edit_allowed %>
         <small>(<%= link_to l(:label_more), {}, :onclick => 'Effect.toggle("issue_descr_fields", "appear", {duration:0.3}); return false;' %>)</small>
         <% end %>
@@ -15,7 +15,7 @@
         </fieldset>
     <% end %>
     <% if authorize_for('timelog', 'edit') %>
-    <fieldset><legend><%= l(:button_log_time) %></legend>
+        <fieldset class="tabular"><legend><%= l(:button_log_time) %></legend>
         <% fields_for :time_entry, @time_entry, { :builder => TabularFormBuilder, :lang => current_language} do |time_entry| %>
         <div class="splitcontentleft">
         <p><%= time_entry.text_field :hours, :size => 6, :label => :label_spent_time %> <%= l(:field_hours) %></p>
@@ -32,9 +32,7 @@
     <%= text_area_tag 'notes', @notes, :cols => 60, :rows => 10, :class => 'wiki-edit' %>
     <%= wikitoolbar_for 'notes' %>
     
-    <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>
+    <p><%=l(:label_attachment_plural)%><br /><%= render :partial => 'attachments/form' %></p>
     </fieldset>
     </div>
     
diff --git a/app/views/issues/_form.rhtml b/app/views/issues/_form.rhtml
index 20ca666c4..1742d1391 100644
--- a/app/views/issues/_form.rhtml
+++ b/app/views/issues/_form.rhtml
@@ -44,9 +44,7 @@
 <%= render :partial => 'form_custom_fields', :locals => {:values => @custom_values} %>
 
 <% if @issue.new_record? %>
-<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>
+<p><label><%=l(:label_attachment_plural)%></label><%= render :partial => 'attachments/form' %></p>
 <% end %>
 
 <%= wikitoolbar_for 'issue_description' %>
diff --git a/app/views/messages/_form.rhtml b/app/views/messages/_form.rhtml
index aa0355070..540811ec3 100644
--- a/app/views/messages/_form.rhtml
+++ b/app/views/messages/_form.rhtml
@@ -4,7 +4,7 @@
 <div class="box">
 <!--[form:message]-->
 <p><label><%= l(:field_subject) %></label><br />
-<%= f.text_field :subject, :required => true, :size => 120 %>
+<%= f.text_field :subject, :size => 120 %>
 
 <% if !replying && User.current.allowed_to?(:edit_messages, @project) %>
     <label><%= f.check_box :sticky %> Sticky</label>
@@ -12,11 +12,10 @@
 <% end %>
 </p>
 
-<p><%= f.text_area :content, :required => true, :cols => 80, :rows => 15, :class => 'wiki-edit', :id => 'message_content' %></p>
+<p><%= f.text_area :content, :cols => 80, :rows => 15, :class => 'wiki-edit', :id => 'message_content' %></p>
 <%= wikitoolbar_for 'message_content' %>
 <!--[eoform:message]-->
 
-<span class="tabular">
-<%= render :partial => 'attachments/form' %>
-</span>
+<p><%= l(:label_attachment_plural) %><br />
+<%= render :partial => 'attachments/form' %></p>
 </div>
diff --git a/app/views/projects/add_file.rhtml b/app/views/projects/add_file.rhtml
index 839275373..0ee55083d 100644
--- a/app/views/projects/add_file.rhtml
+++ b/app/views/projects/add_file.rhtml
@@ -7,7 +7,7 @@
 <p><label for="version_id"><%=l(:field_version)%> <span class="required">*</span></label>
 <%= select_tag "version_id", options_from_collection_for_select(@versions, "id", "name") %></p>
 
-<%= render :partial => 'attachments/form' %>
+<p><label><%=l(:label_attachment_plural)%></label><%= render :partial => 'attachments/form' %></p>
 </div>
 <%= submit_tag l(:button_add) %>
 <% end %> 
\ No newline at end of file
diff --git a/app/views/projects/list_files.rhtml b/app/views/projects/list_files.rhtml
index 47b262388..e02077d8e 100644
--- a/app/views/projects/list_files.rhtml
+++ b/app/views/projects/list_files.rhtml
@@ -23,7 +23,8 @@
   <% for file in version.attachments %>		
   <tr class="<%= cycle("odd", "even") %>">
     <td></td>
-    <td><%= link_to file.filename, :controller => 'versions', :action => 'download', :id => version, :attachment_id => file %></td>
+    <td><%= link_to(file.filename, {:controller => 'versions', :action => 'download', :id => version, :attachment_id => file},
+                                   :title => file.description) %></td>
     <td align="center"><%= format_date(file.created_on) %></td>
     <td align="center"><%= number_to_human_size(file.filesize) %></td>
     <td align="center"><%= file.downloads %></td>
diff --git a/app/views/wiki/show.rhtml b/app/views/wiki/show.rhtml
index 6f1df124b..77d82884f 100644
--- a/app/views/wiki/show.rhtml
+++ b/app/views/wiki/show.rhtml
@@ -25,10 +25,14 @@
 <%= link_to_attachments @page.attachments, :delete_url => (authorize_for('wiki', 'destroy_attachment') ? {:controller => 'wiki', :action => 'destroy_attachment', :page => @page.title} : nil) %>
 
 <% if authorize_for('wiki', 'add_attachment') %>
-<p><%= toggle_link l(:label_attachment_new), "add_attachment_form" %></p>
-<% form_tag({ :controller => 'wiki', :action => 'add_attachment', :page => @page.title }, :multipart => true, :class => "tabular", :id => "add_attachment_form", :style => "display:none;") do %>
-  <%= render :partial => 'attachments/form' %>
+<p><%= link_to l(:label_attachment_new), {}, :onclick => "Element.show('add_attachment_form'); Element.hide(this); Element.scrollTo('add_attachment_form'); return false;",
+                                             :id => 'attach_files_link' %></p>
+<% form_tag({ :controller => 'wiki', :action => 'add_attachment', :page => @page.title }, :multipart => true, :id => "add_attachment_form", :style => "display:none;") do %>
+  <div class="box">
+  <p><%= render :partial => 'attachments/form' %></p>
+  </div>
 <%= submit_tag l(:button_add) %>
+<%= link_to l(:button_cancel), {}, :onclick => "Element.hide('add_attachment_form'); Element.show('attach_files_link'); return false;" %>
 <% end %>
 <% end %>
 
diff --git a/db/migrate/089_add_attachments_description.rb b/db/migrate/089_add_attachments_description.rb
new file mode 100644
index 000000000..411dfe4d6
--- /dev/null
+++ b/db/migrate/089_add_attachments_description.rb
@@ -0,0 +1,9 @@
+class AddAttachmentsDescription < ActiveRecord::Migration
+  def self.up
+    add_column :attachments, :description, :string
+  end
+
+  def self.down
+    remove_column :attachments, :description
+  end
+end
diff --git a/lang/bg.yml b/lang/bg.yml
index debb643cc..64fff5ae9 100644
--- a/lang/bg.yml
+++ b/lang/bg.yml
@@ -600,3 +600,5 @@ label_date_range: Date range
 label_last_week: last week
 label_yesterday: yesterday
 label_last_month: last month
+label_add_another_file: Add another file
+label_optional_description: Optional description
diff --git a/lang/cs.yml b/lang/cs.yml
index 2ff862372..6de5ee01b 100644
--- a/lang/cs.yml
+++ b/lang/cs.yml
@@ -600,3 +600,5 @@ label_date_range: Date range
 label_last_week: last week
 label_yesterday: yesterday
 label_last_month: last month
+label_add_another_file: Add another file
+label_optional_description: Optional description
diff --git a/lang/de.yml b/lang/de.yml
index b12f558d0..f2b1c2023 100644
--- a/lang/de.yml
+++ b/lang/de.yml
@@ -600,3 +600,5 @@ label_date_range: Date range
 label_last_week: last week
 label_yesterday: yesterday
 label_last_month: last month
+label_add_another_file: Add another file
+label_optional_description: Optional description
diff --git a/lang/en.yml b/lang/en.yml
index dadd0a4e5..b06977035 100644
--- a/lang/en.yml
+++ b/lang/en.yml
@@ -497,6 +497,8 @@ label_scm: SCM
 label_plugins: Plugins
 label_ldap_authentication: LDAP authentication
 label_downloads_abbr: D/L
+label_optional_description: Optional description
+label_add_another_file: Add another file
 
 button_login: Login
 button_submit: Submit
diff --git a/lang/es.yml b/lang/es.yml
index 1fd355cd2..9c72af18d 100644
--- a/lang/es.yml
+++ b/lang/es.yml
@@ -603,3 +603,5 @@ label_date_range: Date range
 label_last_week: last week
 label_yesterday: yesterday
 label_last_month: last month
+label_add_another_file: Add another file
+label_optional_description: Optional description
diff --git a/lang/fi.yml b/lang/fi.yml
index 351c47c1b..350e5ba44 100644
--- a/lang/fi.yml
+++ b/lang/fi.yml
@@ -604,3 +604,5 @@ label_date_range: Date range
 label_last_week: last week
 label_yesterday: yesterday
 label_last_month: last month
+label_add_another_file: Add another file
+label_optional_description: Optional description
diff --git a/lang/fr.yml b/lang/fr.yml
index 73d2e0af6..c2baa3b7e 100644
--- a/lang/fr.yml
+++ b/lang/fr.yml
@@ -497,6 +497,8 @@ label_scm: SCM
 label_plugins: Plugins
 label_ldap_authentication: Authentification LDAP
 label_downloads_abbr: D/L
+label_optional_description: Description facultative
+label_add_another_file: Ajouter un autre fichier
 
 button_login: Connexion
 button_submit: Soumettre
diff --git a/lang/he.yml b/lang/he.yml
index d0071e26f..680364714 100644
--- a/lang/he.yml
+++ b/lang/he.yml
@@ -600,3 +600,5 @@ label_date_range: Date range
 label_last_week: last week
 label_yesterday: yesterday
 label_last_month: last month
+label_add_another_file: Add another file
+label_optional_description: Optional description
diff --git a/lang/it.yml b/lang/it.yml
index 7c6f17986..b2eb1c9c6 100644
--- a/lang/it.yml
+++ b/lang/it.yml
@@ -600,3 +600,5 @@ label_date_range: Date range
 label_last_week: last week
 label_yesterday: yesterday
 label_last_month: last month
+label_add_another_file: Add another file
+label_optional_description: Optional description
diff --git a/lang/ja.yml b/lang/ja.yml
index bc5303f8f..2a742072d 100644
--- a/lang/ja.yml
+++ b/lang/ja.yml
@@ -601,3 +601,5 @@ label_date_range: Date range
 label_last_week: last week
 label_yesterday: yesterday
 label_last_month: last month
+label_add_another_file: Add another file
+label_optional_description: Optional description
diff --git a/lang/ko.yml b/lang/ko.yml
index bb112c259..cce1480d8 100644
--- a/lang/ko.yml
+++ b/lang/ko.yml
@@ -600,3 +600,5 @@ label_date_range: Date range
 label_last_week: last week
 label_yesterday: yesterday
 label_last_month: last month
+label_add_another_file: Add another file
+label_optional_description: Optional description
diff --git a/lang/lt.yml b/lang/lt.yml
index eb5a5d6e9..7701280a0 100644
--- a/lang/lt.yml
+++ b/lang/lt.yml
@@ -601,3 +601,5 @@ label_date_range: Date range
 label_last_week: last week
 label_yesterday: yesterday
 label_last_month: last month
+label_add_another_file: Add another file
+label_optional_description: Optional description
diff --git a/lang/nl.yml b/lang/nl.yml
index c9bd74db7..a0a5305e4 100644
--- a/lang/nl.yml
+++ b/lang/nl.yml
@@ -601,3 +601,5 @@ label_date_range: Date range
 label_last_week: last week
 label_yesterday: yesterday
 label_last_month: last month
+label_add_another_file: Add another file
+label_optional_description: Optional description
diff --git a/lang/pl.yml b/lang/pl.yml
index 927025ece..6de13aea4 100644
--- a/lang/pl.yml
+++ b/lang/pl.yml
@@ -600,3 +600,5 @@ label_date_range: Date range
 label_last_week: last week
 label_yesterday: yesterday
 label_last_month: last month
+label_add_another_file: Add another file
+label_optional_description: Optional description
diff --git a/lang/pt-br.yml b/lang/pt-br.yml
index 003940ced..83b640a43 100644
--- a/lang/pt-br.yml
+++ b/lang/pt-br.yml
@@ -600,3 +600,5 @@ label_date_range: Date range
 label_last_week: last week
 label_yesterday: yesterday
 label_last_month: last month
+label_add_another_file: Add another file
+label_optional_description: Optional description
diff --git a/lang/pt.yml b/lang/pt.yml
index 0649005e8..e100d153e 100644
--- a/lang/pt.yml
+++ b/lang/pt.yml
@@ -600,3 +600,5 @@ label_date_range: Date range
 label_last_week: last week
 label_yesterday: yesterday
 label_last_month: last month
+label_add_another_file: Add another file
+label_optional_description: Optional description
diff --git a/lang/ro.yml b/lang/ro.yml
index 7e71846b2..142a2a84f 100644
--- a/lang/ro.yml
+++ b/lang/ro.yml
@@ -600,3 +600,5 @@ label_date_range: Date range
 label_last_week: last week
 label_yesterday: yesterday
 label_last_month: last month
+label_add_another_file: Add another file
+label_optional_description: Optional description
diff --git a/lang/ru.yml b/lang/ru.yml
index d0c4ddef9..83e63115f 100644
--- a/lang/ru.yml
+++ b/lang/ru.yml
@@ -604,3 +604,5 @@ label_date_range: Date range
 label_last_week: last week
 label_yesterday: yesterday
 label_last_month: last month
+label_add_another_file: Add another file
+label_optional_description: Optional description
diff --git a/lang/sr.yml b/lang/sr.yml
index f1ed25882..2cd92607f 100644
--- a/lang/sr.yml
+++ b/lang/sr.yml
@@ -601,3 +601,5 @@ label_date_range: Date range
 label_last_week: last week
 label_yesterday: yesterday
 label_last_month: last month
+label_add_another_file: Add another file
+label_optional_description: Optional description
diff --git a/lang/sv.yml b/lang/sv.yml
index 9bd7e0d4c..a9b30ae2f 100644
--- a/lang/sv.yml
+++ b/lang/sv.yml
@@ -601,3 +601,5 @@ label_date_range: Date range
 label_last_week: last week
 label_yesterday: yesterday
 label_last_month: last month
+label_add_another_file: Add another file
+label_optional_description: Optional description
diff --git a/lang/uk.yml b/lang/uk.yml
index b0c73b85b..0be41cf04 100644
--- a/lang/uk.yml
+++ b/lang/uk.yml
@@ -602,3 +602,5 @@ label_date_range: Date range
 label_last_week: last week
 label_yesterday: yesterday
 label_last_month: last month
+label_add_another_file: Add another file
+label_optional_description: Optional description
diff --git a/lang/zh-tw.yml b/lang/zh-tw.yml
index ab2947676..c63e6c3bf 100644
--- a/lang/zh-tw.yml
+++ b/lang/zh-tw.yml
@@ -600,3 +600,5 @@ label_date_range: Date range
 label_last_week: last week
 label_yesterday: yesterday
 label_last_month: last month
+label_add_another_file: Add another file
+label_optional_description: Optional description
diff --git a/lang/zh.yml b/lang/zh.yml
index ae2faf23c..a50d8be48 100644
--- a/lang/zh.yml
+++ b/lang/zh.yml
@@ -603,3 +603,5 @@ label_date_range: Date range
 label_last_week: last week
 label_yesterday: yesterday
 label_last_month: last month
+label_add_another_file: Add another file
+label_optional_description: Optional description
diff --git a/public/javascripts/application.js b/public/javascripts/application.js
index d77362a06..4e8849842 100644
--- a/public/javascripts/application.js
+++ b/public/javascripts/application.js
@@ -10,15 +10,24 @@ function checkAll (id, checked) {
 	}
 }
 
+var fileFieldCount = 1;
+
 function addFileField() {
+    if (fileFieldCount >= 10) return false
+    fileFieldCount++;
     var f = document.createElement("input");
     f.type = "file";
-    f.name = "attachments[]";
+    f.name = "attachments[" + fileFieldCount + "][file]";
     f.size = 30;
-        
-    p = document.getElementById("attachments_p");
+    var d = document.createElement("input");
+    d.type = "text";
+    d.name = "attachments[" + fileFieldCount + "][description]";
+    d.size = 60;
+    
+    p = document.getElementById("attachments_fields");
     p.appendChild(document.createElement("br"));
     p.appendChild(f);
+    p.appendChild(d);
 }
 
 function showTab(name) {
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index b3dcac6b0..833937482 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -222,7 +222,11 @@ width: 200px;
 .required {color: #bb0000;}
 .summary {font-style: italic;}
 
+#attachments_fields input[type=text] {margin-left: 8px; }
+
 div.attachments p { margin:4px 0 2px 0; }
+div.attachments img { vertical-align: middle; }
+div.attachments span.author { font-size: 0.9em; color: #888; }
 
 /***** Flash & error messages ****/
 #errorExplanation, div.flash, .nodata {
diff --git a/test/functional/documents_controller_test.rb b/test/functional/documents_controller_test.rb
index 7ba308ec5..f150a5b7a 100644
--- a/test/functional/documents_controller_test.rb
+++ b/test/functional/documents_controller_test.rb
@@ -44,7 +44,7 @@ class DocumentsControllerTest < Test::Unit::TestCase
                :document => { :title => 'DocumentsControllerTest#test_post_new',
                               :description => 'This is a new document',
                               :category_id => 2},
-               :attachments => [ ActionController::TestUploadedFile.new(Test::Unit::TestCase.fixture_path + '/files/testfile.txt', 'text/plain') ]
+               :attachments => {'1' => {'file' => test_uploaded_file('testfile.txt', 'text/plain')}}
                
     assert_redirected_to 'projects/ecookbook/documents'
     
diff --git a/test/functional/issues_controller_test.rb b/test/functional/issues_controller_test.rb
index 4f28ab224..34b030d98 100644
--- a/test/functional/issues_controller_test.rb
+++ b/test/functional/issues_controller_test.rb
@@ -300,7 +300,7 @@ class IssuesControllerTest < Test::Unit::TestCase
     post :edit,
          :id => 1,
          :notes => '',
-         :attachments => [ test_uploaded_file('testfile.txt', 'text/plain') ]
+         :attachments => {'1' => {'file' => test_uploaded_file('testfile.txt', 'text/plain')}}
     assert_redirected_to 'issues/show/1'
     j = Issue.find(1).journals.find(:first, :order => 'id DESC')
     assert j.notes.blank?
diff --git a/test/integration/issues_test.rb b/test/integration/issues_test.rb
index eda4ef676..facd7c630 100644
--- a/test/integration/issues_test.rb
+++ b/test/integration/issues_test.rb
@@ -50,13 +50,14 @@ class IssuesTest < ActionController::IntegrationTest
 
     post 'issues/edit/1',
          :notes => 'Some notes',
-         :attachments => ([] << ActionController::TestUploadedFile.new(Test::Unit::TestCase.fixture_path + '/files/testfile.txt', 'text/plain'))
+         :attachments => {'1' => {'file' => test_uploaded_file('testfile.txt', 'text/plain'), 'description' => 'This is an attachment'}}
     assert_redirected_to "issues/show/1"
     
     # make sure attachment was saved
     attachment = Issue.find(1).attachments.find_by_filename("testfile.txt")
     assert_kind_of Attachment, attachment
     assert_equal Issue.find(1), attachment.container
+    assert_equal 'This is an attachment', attachment.description
     # verify the size of the attachment stored in db
     #assert_equal file_data_1.length, attachment.filesize
     # verify that the attachment was written to disk

From 87742f23edb3bbcbaf12540d2ff510ad8edac09e Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Fri, 29 Feb 2008 21:18:35 +0000
Subject: [PATCH 240/710] Login field name changed to username (#755).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1181 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/account_controller.rb      | 2 +-
 app/views/account/login.rhtml              | 6 +++---
 test/functional/account_controller_test.rb | 4 ++--
 test/test_helper.rb                        | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/controllers/account_controller.rb b/app/controllers/account_controller.rb
index 40debb1f6..e719e8c9b 100644
--- a/app/controllers/account_controller.rb
+++ b/app/controllers/account_controller.rb
@@ -43,7 +43,7 @@ class AccountController < ApplicationController
       self.logged_user = nil
     else
       # Authenticate user
-      user = User.try_to_login(params[:login], params[:password])
+      user = User.try_to_login(params[:username], params[:password])
       if user
         self.logged_user = user
         # generate a key and set cookie if autologin
diff --git a/app/views/account/login.rhtml b/app/views/account/login.rhtml
index 5bfbfb8d6..ea1a1cd44 100644
--- a/app/views/account/login.rhtml
+++ b/app/views/account/login.rhtml
@@ -2,8 +2,8 @@
 <% form_tag({:action=> "login"}) do %>
 <table>
 <tr>
-    <td align="right"><label for="login"><%=l(:field_login)%>:</label></td>
-    <td align="left"><p><%= text_field_tag 'login', nil, :size => 40 %></p></td>
+    <td align="right"><label for="username"><%=l(:field_login)%>:</label></td>
+    <td align="left"><p><%= text_field_tag 'username', nil, :size => 40 %></p></td>
 </tr>
 <tr>
     <td align="right"><label for="password"><%=l(:field_password)%>:</label></td>
@@ -28,6 +28,6 @@
     </td>
 </tr>
 </table>
-<%= javascript_tag "Form.Element.focus('login');" %>
+<%= javascript_tag "Form.Element.focus('username');" %>
 <% end %>
 </div>
diff --git a/test/functional/account_controller_test.rb b/test/functional/account_controller_test.rb
index a923de3ea..666acf0dd 100644
--- a/test/functional/account_controller_test.rb
+++ b/test/functional/account_controller_test.rb
@@ -45,7 +45,7 @@ class AccountControllerTest < Test::Unit::TestCase
   end
   
   def test_login_with_wrong_password
-    post :login, :login => 'admin', :password => 'bad'
+    post :login, :username => 'admin', :password => 'bad'
     assert_response :success
     assert_template 'login'
     assert_tag 'div',
@@ -56,7 +56,7 @@ class AccountControllerTest < Test::Unit::TestCase
   def test_autologin
     Setting.autologin = "7"
     Token.delete_all
-    post :login, :login => 'admin', :password => 'admin', :autologin => 1
+    post :login, :username => 'admin', :password => 'admin', :autologin => 1
     assert_redirected_to 'my/page'
     token = Token.find :first
     assert_not_nil token
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 7c81c3607..61670318a 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -49,7 +49,7 @@ class Test::Unit::TestCase
     assert_equal nil, session[:user_id]
     assert_response :success
     assert_template "account/login"
-    post "/account/login", :login => login, :password => password
+    post "/account/login", :username => login, :password => password
     assert_redirected_to "my/page"
     assert_equal login, User.find(session[:user_id]).login
   end

From c01c64e9783dc361d98ca8dc37d2b3a661ae1945 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Fri, 29 Feb 2008 22:54:07 +0000
Subject: [PATCH 241/710] Let the user choose when deleting issues with
 reported hours (closes #734, #71): * to delete the hours * to assign the
 hours to the project * to reassign the hours to another issue

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1182 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/issues_controller.rb      | 20 +++++++++++
 app/models/issue.rb                       |  2 +-
 app/views/issue_categories/destroy.rhtml  |  4 +--
 app/views/issues/destroy.rhtml            | 15 ++++++++
 lang/bg.yml                               |  5 +++
 lang/cs.yml                               |  5 +++
 lang/de.yml                               |  5 +++
 lang/en.yml                               |  5 +++
 lang/es.yml                               |  5 +++
 lang/fi.yml                               |  5 +++
 lang/fr.yml                               |  7 +++-
 lang/he.yml                               |  5 +++
 lang/it.yml                               |  5 +++
 lang/ja.yml                               |  5 +++
 lang/ko.yml                               |  5 +++
 lang/lt.yml                               |  5 +++
 lang/nl.yml                               |  5 +++
 lang/pl.yml                               |  5 +++
 lang/pt-br.yml                            |  5 +++
 lang/pt.yml                               |  5 +++
 lang/ro.yml                               |  5 +++
 lang/ru.yml                               |  5 +++
 lang/sr.yml                               |  5 +++
 lang/sv.yml                               |  5 +++
 lang/uk.yml                               |  5 +++
 lang/zh-tw.yml                            |  5 +++
 lang/zh.yml                               |  5 +++
 test/functional/issues_controller_test.rb | 44 ++++++++++++++++++++---
 test/unit/issue_test.rb                   |  6 ++++
 29 files changed, 200 insertions(+), 8 deletions(-)
 create mode 100644 app/views/issues/destroy.rhtml

diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index e03afb252..53627db92 100644
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -263,6 +263,26 @@ class IssuesController < ApplicationController
   end
   
   def destroy
+    @hours = TimeEntry.sum(:hours, :conditions => ['issue_id IN (?)', @issues]).to_f
+    if @hours > 0
+      case params[:todo]
+      when 'destroy'
+        # nothing to do
+      when 'nullify'
+        TimeEntry.update_all('issue_id = NULL', ['issue_id IN (?)', @issues])
+      when 'reassign'
+        reassign_to = @project.issues.find_by_id(params[:reassign_to_id])
+        if reassign_to.nil?
+          flash.now[:error] = l(:error_issue_not_found_in_project)
+          return
+        else
+          TimeEntry.update_all("issue_id = #{reassign_to.id}", ['issue_id IN (?)', @issues])
+        end
+      else
+        # display the destroy form
+        return
+      end
+    end
     @issues.each(&:destroy)
     redirect_to :action => 'index', :project_id => @project
   end
diff --git a/app/models/issue.rb b/app/models/issue.rb
index 9d7f6eaaf..1d25a4604 100644
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -27,7 +27,7 @@ class Issue < ActiveRecord::Base
 
   has_many :journals, :as => :journalized, :dependent => :destroy
   has_many :attachments, :as => :container, :dependent => :destroy
-  has_many :time_entries, :dependent => :nullify
+  has_many :time_entries, :dependent => :delete_all
   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"
diff --git a/app/views/issue_categories/destroy.rhtml b/app/views/issue_categories/destroy.rhtml
index a563736e2..2b61810e7 100644
--- a/app/views/issue_categories/destroy.rhtml
+++ b/app/views/issue_categories/destroy.rhtml
@@ -3,9 +3,9 @@
 <% form_tag({}) do %>
 <div class="box">
 <p><strong><%= l(:text_issue_category_destroy_question, @issue_count) %></strong></p>
-<p><%= radio_button_tag 'todo', 'nullify', true %> <%= l(:text_issue_category_destroy_assignments) %><br />
+<p><label><%= radio_button_tag 'todo', 'nullify', true %> <%= l(:text_issue_category_destroy_assignments) %></label><br />
 <% if @categories.size > 0 %>
-<%= radio_button_tag 'todo', 'reassign', false %> <%= l(:text_issue_category_reassign_to) %>:
+<label><%= radio_button_tag 'todo', 'reassign', false %> <%= l(:text_issue_category_reassign_to) %></label>:
 <%= select_tag 'reassign_to_id', options_from_collection_for_select(@categories, 'id', 'name') %></p>
 <% end %>
 </div>
diff --git a/app/views/issues/destroy.rhtml b/app/views/issues/destroy.rhtml
new file mode 100644
index 000000000..2f3c036b6
--- /dev/null
+++ b/app/views/issues/destroy.rhtml
@@ -0,0 +1,15 @@
+<h2><%= l(:confirmation) %></h2>
+
+<% form_tag do %>
+<%= @issues.collect {|i| hidden_field_tag 'ids[]', i.id } %>
+<div class="box">
+<p><strong><%= l(:text_destroy_time_entries_question, @hours) %></strong></p>
+<p>
+<label><%= radio_button_tag 'todo', 'destroy', true %> <%= l(:text_destroy_time_entries) %></label><br />
+<label><%= radio_button_tag 'todo', 'nullify', false %> <%= l(:text_assign_time_entries_to_project) %></label><br />
+<label><%= radio_button_tag 'todo', 'reassign', false, :onchange => 'if (this.checked) { $("reassign_to_id").focus(); }' %> <%= l(:text_reassign_time_entries) %></label>
+<%= text_field_tag 'reassign_to_id', params[:reassign_to_id], :size => 6, :onfocus => '$("todo_reassign").checked=true;' %>
+</p>
+</div>
+<%= submit_tag l(:button_apply) %>
+<% end %>
diff --git a/lang/bg.yml b/lang/bg.yml
index 64fff5ae9..12d5dfa5f 100644
--- a/lang/bg.yml
+++ b/lang/bg.yml
@@ -602,3 +602,8 @@ label_yesterday: yesterday
 label_last_month: last month
 label_add_another_file: Add another file
 label_optional_description: Optional description
+text_destroy_time_entries_question: %.02f hours were reported on the issues you are about to delete. What do you want to do ?
+error_issue_not_found_in_project: 'The issue was not found or does not belong to this project'
+text_assign_time_entries_to_project: Assign reported hours to the project
+text_destroy_time_entries: Delete reported hours
+text_reassign_time_entries: 'Reassign reported hours to this issue:'
diff --git a/lang/cs.yml b/lang/cs.yml
index 6de5ee01b..56b77d87b 100644
--- a/lang/cs.yml
+++ b/lang/cs.yml
@@ -602,3 +602,8 @@ label_yesterday: yesterday
 label_last_month: last month
 label_add_another_file: Add another file
 label_optional_description: Optional description
+text_destroy_time_entries_question: %.02f hours were reported on the issues you are about to delete. What do you want to do ?
+error_issue_not_found_in_project: 'The issue was not found or does not belong to this project'
+text_assign_time_entries_to_project: Assign reported hours to the project
+text_destroy_time_entries: Delete reported hours
+text_reassign_time_entries: 'Reassign reported hours to this issue:'
diff --git a/lang/de.yml b/lang/de.yml
index f2b1c2023..9397cf892 100644
--- a/lang/de.yml
+++ b/lang/de.yml
@@ -602,3 +602,8 @@ label_yesterday: yesterday
 label_last_month: last month
 label_add_another_file: Add another file
 label_optional_description: Optional description
+text_destroy_time_entries_question: %.02f hours were reported on the issues you are about to delete. What do you want to do ?
+error_issue_not_found_in_project: 'The issue was not found or does not belong to this project'
+text_assign_time_entries_to_project: Assign reported hours to the project
+text_destroy_time_entries: Delete reported hours
+text_reassign_time_entries: 'Reassign reported hours to this issue:'
diff --git a/lang/en.yml b/lang/en.yml
index b06977035..7ed2c8775 100644
--- a/lang/en.yml
+++ b/lang/en.yml
@@ -80,6 +80,7 @@ notice_default_data_loaded: Default configuration successfully loaded.
 error_can_t_load_default_data: "Default configuration could not be loaded: %s"
 error_scm_not_found: "Entry and/or revision doesn't exist in the repository."
 error_scm_command_failed: "An error occurred when trying to access the repository: %s"
+error_issue_not_found_in_project: 'The issue was not found or does not belong to this project'
 
 mail_subject_lost_password: Your Redmine password
 mail_body_lost_password: 'To change your Redmine password, click on the following link:'
@@ -577,6 +578,10 @@ text_select_project_modules: 'Select modules to enable for this project:'
 text_default_administrator_account_changed: Default administrator account changed
 text_file_repository_writable: File repository writable
 text_rmagick_available: RMagick available (optional)
+text_destroy_time_entries_question: %.02f hours were reported on the issues you are about to delete. What do you want to do ?
+text_destroy_time_entries: Delete reported hours
+text_assign_time_entries_to_project: Assign reported hours to the project
+text_reassign_time_entries: 'Reassign reported hours to this issue:'
 
 default_role_manager: Manager
 default_role_developper: Developer
diff --git a/lang/es.yml b/lang/es.yml
index 9c72af18d..9032d3599 100644
--- a/lang/es.yml
+++ b/lang/es.yml
@@ -605,3 +605,8 @@ label_yesterday: yesterday
 label_last_month: last month
 label_add_another_file: Add another file
 label_optional_description: Optional description
+text_destroy_time_entries_question: %.02f hours were reported on the issues you are about to delete. What do you want to do ?
+error_issue_not_found_in_project: 'The issue was not found or does not belong to this project'
+text_assign_time_entries_to_project: Assign reported hours to the project
+text_destroy_time_entries: Delete reported hours
+text_reassign_time_entries: 'Reassign reported hours to this issue:'
diff --git a/lang/fi.yml b/lang/fi.yml
index 350e5ba44..dbcc3763c 100644
--- a/lang/fi.yml
+++ b/lang/fi.yml
@@ -606,3 +606,8 @@ label_yesterday: yesterday
 label_last_month: last month
 label_add_another_file: Add another file
 label_optional_description: Optional description
+text_destroy_time_entries_question: %.02f hours were reported on the issues you are about to delete. What do you want to do ?
+error_issue_not_found_in_project: 'The issue was not found or does not belong to this project'
+text_assign_time_entries_to_project: Assign reported hours to the project
+text_destroy_time_entries: Delete reported hours
+text_reassign_time_entries: 'Reassign reported hours to this issue:'
diff --git a/lang/fr.yml b/lang/fr.yml
index c2baa3b7e..accd5c1bf 100644
--- a/lang/fr.yml
+++ b/lang/fr.yml
@@ -80,6 +80,7 @@ notice_default_data_loaded: Paramétrage par défaut chargé avec succès.
 error_can_t_load_default_data: "Une erreur s'est produite lors du chargement du paramétrage: %s"
 error_scm_not_found: "L'entrée et/ou la révision demandée n'existe pas dans le dépôt."
 error_scm_command_failed: "Une erreur s'est produite lors de l'accès au dépôt: %s"
+error_issue_not_found_in_project: "La demande n'existe pas ou n'appartient pas à ce projet"
 
 mail_subject_lost_password: Votre mot de passe redMine
 mail_body_lost_password: 'Pour changer votre mot de passe Redmine, cliquez sur le lien suivant:'
@@ -565,7 +566,7 @@ text_issues_ref_in_commit_messages: Référencement et résolution des demandes
 text_issue_added: La demande %s a été soumise par %s.
 text_issue_updated: La demande %s a été mise à jour par %s.
 text_wiki_destroy_confirmation: Etes-vous sûr de vouloir supprimer ce wiki et tout son contenu ?
-text_issue_category_destroy_question: Des demandes (%d) sont affectées à cette catégories. Que voulez-vous faire ?
+text_issue_category_destroy_question: %d demandes sont affectées à cette catégories. Que voulez-vous faire ?
 text_issue_category_destroy_assignments: N'affecter les demandes à aucune autre catégorie
 text_issue_category_reassign_to: Réaffecter les demandes à cette catégorie
 text_user_mail_option: "Pour les projets non sélectionnés, vous recevrez seulement des notifications pour ce que vous surveillez ou à quoi vous participez (exemple: demandes dont vous êtes l'auteur ou la personne assignée)."
@@ -577,6 +578,10 @@ text_select_project_modules: 'Selectionner les modules à activer pour ce projec
 text_default_administrator_account_changed: Compte administrateur par défaut changé
 text_file_repository_writable: Répertoire de stockage des fichiers accessible en écriture
 text_rmagick_available: Bibliothèque RMagick présente (optionnelle)
+text_destroy_time_entries_question: %.02f heures ont été enregistrées sur les demandes à supprimer. Que voulez-vous faire ?
+text_destroy_time_entries: Supprimer les heures
+text_assign_time_entries_to_project: Reporter les heures sur le projet
+text_reassign_time_entries: 'Reporter les heures sur cette demande:'
 
 default_role_manager: Manager
 default_role_developper: Développeur
diff --git a/lang/he.yml b/lang/he.yml
index 680364714..a43f1c022 100644
--- a/lang/he.yml
+++ b/lang/he.yml
@@ -602,3 +602,8 @@ label_yesterday: yesterday
 label_last_month: last month
 label_add_another_file: Add another file
 label_optional_description: Optional description
+text_destroy_time_entries_question: %.02f hours were reported on the issues you are about to delete. What do you want to do ?
+error_issue_not_found_in_project: 'The issue was not found or does not belong to this project'
+text_assign_time_entries_to_project: Assign reported hours to the project
+text_destroy_time_entries: Delete reported hours
+text_reassign_time_entries: 'Reassign reported hours to this issue:'
diff --git a/lang/it.yml b/lang/it.yml
index b2eb1c9c6..80ffc5f6c 100644
--- a/lang/it.yml
+++ b/lang/it.yml
@@ -602,3 +602,8 @@ label_yesterday: yesterday
 label_last_month: last month
 label_add_another_file: Add another file
 label_optional_description: Optional description
+text_destroy_time_entries_question: %.02f hours were reported on the issues you are about to delete. What do you want to do ?
+error_issue_not_found_in_project: 'The issue was not found or does not belong to this project'
+text_assign_time_entries_to_project: Assign reported hours to the project
+text_destroy_time_entries: Delete reported hours
+text_reassign_time_entries: 'Reassign reported hours to this issue:'
diff --git a/lang/ja.yml b/lang/ja.yml
index 2a742072d..d652f4b19 100644
--- a/lang/ja.yml
+++ b/lang/ja.yml
@@ -603,3 +603,8 @@ label_yesterday: yesterday
 label_last_month: last month
 label_add_another_file: Add another file
 label_optional_description: Optional description
+text_destroy_time_entries_question: %.02f hours were reported on the issues you are about to delete. What do you want to do ?
+error_issue_not_found_in_project: 'The issue was not found or does not belong to this project'
+text_assign_time_entries_to_project: Assign reported hours to the project
+text_destroy_time_entries: Delete reported hours
+text_reassign_time_entries: 'Reassign reported hours to this issue:'
diff --git a/lang/ko.yml b/lang/ko.yml
index cce1480d8..12fa4b8fb 100644
--- a/lang/ko.yml
+++ b/lang/ko.yml
@@ -602,3 +602,8 @@ label_yesterday: yesterday
 label_last_month: last month
 label_add_another_file: Add another file
 label_optional_description: Optional description
+text_destroy_time_entries_question: %.02f hours were reported on the issues you are about to delete. What do you want to do ?
+error_issue_not_found_in_project: 'The issue was not found or does not belong to this project'
+text_assign_time_entries_to_project: Assign reported hours to the project
+text_destroy_time_entries: Delete reported hours
+text_reassign_time_entries: 'Reassign reported hours to this issue:'
diff --git a/lang/lt.yml b/lang/lt.yml
index 7701280a0..5d26c7ea9 100644
--- a/lang/lt.yml
+++ b/lang/lt.yml
@@ -603,3 +603,8 @@ label_yesterday: yesterday
 label_last_month: last month
 label_add_another_file: Add another file
 label_optional_description: Optional description
+text_destroy_time_entries_question: %.02f hours were reported on the issues you are about to delete. What do you want to do ?
+error_issue_not_found_in_project: 'The issue was not found or does not belong to this project'
+text_assign_time_entries_to_project: Assign reported hours to the project
+text_destroy_time_entries: Delete reported hours
+text_reassign_time_entries: 'Reassign reported hours to this issue:'
diff --git a/lang/nl.yml b/lang/nl.yml
index a0a5305e4..12563f2e4 100644
--- a/lang/nl.yml
+++ b/lang/nl.yml
@@ -603,3 +603,8 @@ label_yesterday: yesterday
 label_last_month: last month
 label_add_another_file: Add another file
 label_optional_description: Optional description
+text_destroy_time_entries_question: %.02f hours were reported on the issues you are about to delete. What do you want to do ?
+error_issue_not_found_in_project: 'The issue was not found or does not belong to this project'
+text_assign_time_entries_to_project: Assign reported hours to the project
+text_destroy_time_entries: Delete reported hours
+text_reassign_time_entries: 'Reassign reported hours to this issue:'
diff --git a/lang/pl.yml b/lang/pl.yml
index 6de13aea4..575c8262a 100644
--- a/lang/pl.yml
+++ b/lang/pl.yml
@@ -602,3 +602,8 @@ label_yesterday: yesterday
 label_last_month: last month
 label_add_another_file: Add another file
 label_optional_description: Optional description
+text_destroy_time_entries_question: %.02f hours were reported on the issues you are about to delete. What do you want to do ?
+error_issue_not_found_in_project: 'The issue was not found or does not belong to this project'
+text_assign_time_entries_to_project: Assign reported hours to the project
+text_destroy_time_entries: Delete reported hours
+text_reassign_time_entries: 'Reassign reported hours to this issue:'
diff --git a/lang/pt-br.yml b/lang/pt-br.yml
index 83b640a43..d128617da 100644
--- a/lang/pt-br.yml
+++ b/lang/pt-br.yml
@@ -602,3 +602,8 @@ label_yesterday: yesterday
 label_last_month: last month
 label_add_another_file: Add another file
 label_optional_description: Optional description
+text_destroy_time_entries_question: %.02f hours were reported on the issues you are about to delete. What do you want to do ?
+error_issue_not_found_in_project: 'The issue was not found or does not belong to this project'
+text_assign_time_entries_to_project: Assign reported hours to the project
+text_destroy_time_entries: Delete reported hours
+text_reassign_time_entries: 'Reassign reported hours to this issue:'
diff --git a/lang/pt.yml b/lang/pt.yml
index e100d153e..33b76892b 100644
--- a/lang/pt.yml
+++ b/lang/pt.yml
@@ -602,3 +602,8 @@ label_yesterday: yesterday
 label_last_month: last month
 label_add_another_file: Add another file
 label_optional_description: Optional description
+text_destroy_time_entries_question: %.02f hours were reported on the issues you are about to delete. What do you want to do ?
+error_issue_not_found_in_project: 'The issue was not found or does not belong to this project'
+text_assign_time_entries_to_project: Assign reported hours to the project
+text_destroy_time_entries: Delete reported hours
+text_reassign_time_entries: 'Reassign reported hours to this issue:'
diff --git a/lang/ro.yml b/lang/ro.yml
index 142a2a84f..b8b737e42 100644
--- a/lang/ro.yml
+++ b/lang/ro.yml
@@ -602,3 +602,8 @@ label_yesterday: yesterday
 label_last_month: last month
 label_add_another_file: Add another file
 label_optional_description: Optional description
+text_destroy_time_entries_question: %.02f hours were reported on the issues you are about to delete. What do you want to do ?
+error_issue_not_found_in_project: 'The issue was not found or does not belong to this project'
+text_assign_time_entries_to_project: Assign reported hours to the project
+text_destroy_time_entries: Delete reported hours
+text_reassign_time_entries: 'Reassign reported hours to this issue:'
diff --git a/lang/ru.yml b/lang/ru.yml
index 83e63115f..93fbd3b74 100644
--- a/lang/ru.yml
+++ b/lang/ru.yml
@@ -606,3 +606,8 @@ label_yesterday: yesterday
 label_last_month: last month
 label_add_another_file: Add another file
 label_optional_description: Optional description
+text_destroy_time_entries_question: %.02f hours were reported on the issues you are about to delete. What do you want to do ?
+error_issue_not_found_in_project: 'The issue was not found or does not belong to this project'
+text_assign_time_entries_to_project: Assign reported hours to the project
+text_destroy_time_entries: Delete reported hours
+text_reassign_time_entries: 'Reassign reported hours to this issue:'
diff --git a/lang/sr.yml b/lang/sr.yml
index 2cd92607f..16e870b76 100644
--- a/lang/sr.yml
+++ b/lang/sr.yml
@@ -603,3 +603,8 @@ label_yesterday: yesterday
 label_last_month: last month
 label_add_another_file: Add another file
 label_optional_description: Optional description
+text_destroy_time_entries_question: %.02f hours were reported on the issues you are about to delete. What do you want to do ?
+error_issue_not_found_in_project: 'The issue was not found or does not belong to this project'
+text_assign_time_entries_to_project: Assign reported hours to the project
+text_destroy_time_entries: Delete reported hours
+text_reassign_time_entries: 'Reassign reported hours to this issue:'
diff --git a/lang/sv.yml b/lang/sv.yml
index a9b30ae2f..3375a6850 100644
--- a/lang/sv.yml
+++ b/lang/sv.yml
@@ -603,3 +603,8 @@ label_yesterday: yesterday
 label_last_month: last month
 label_add_another_file: Add another file
 label_optional_description: Optional description
+text_destroy_time_entries_question: %.02f hours were reported on the issues you are about to delete. What do you want to do ?
+error_issue_not_found_in_project: 'The issue was not found or does not belong to this project'
+text_assign_time_entries_to_project: Assign reported hours to the project
+text_destroy_time_entries: Delete reported hours
+text_reassign_time_entries: 'Reassign reported hours to this issue:'
diff --git a/lang/uk.yml b/lang/uk.yml
index 0be41cf04..2fd3589f5 100644
--- a/lang/uk.yml
+++ b/lang/uk.yml
@@ -604,3 +604,8 @@ label_yesterday: yesterday
 label_last_month: last month
 label_add_another_file: Add another file
 label_optional_description: Optional description
+text_destroy_time_entries_question: %.02f hours were reported on the issues you are about to delete. What do you want to do ?
+error_issue_not_found_in_project: 'The issue was not found or does not belong to this project'
+text_assign_time_entries_to_project: Assign reported hours to the project
+text_destroy_time_entries: Delete reported hours
+text_reassign_time_entries: 'Reassign reported hours to this issue:'
diff --git a/lang/zh-tw.yml b/lang/zh-tw.yml
index c63e6c3bf..070aa290c 100644
--- a/lang/zh-tw.yml
+++ b/lang/zh-tw.yml
@@ -602,3 +602,8 @@ label_yesterday: yesterday
 label_last_month: last month
 label_add_another_file: Add another file
 label_optional_description: Optional description
+text_destroy_time_entries_question: %.02f hours were reported on the issues you are about to delete. What do you want to do ?
+error_issue_not_found_in_project: 'The issue was not found or does not belong to this project'
+text_assign_time_entries_to_project: Assign reported hours to the project
+text_destroy_time_entries: Delete reported hours
+text_reassign_time_entries: 'Reassign reported hours to this issue:'
diff --git a/lang/zh.yml b/lang/zh.yml
index a50d8be48..6b2e64abd 100644
--- a/lang/zh.yml
+++ b/lang/zh.yml
@@ -605,3 +605,8 @@ label_yesterday: yesterday
 label_last_month: last month
 label_add_another_file: Add another file
 label_optional_description: Optional description
+text_destroy_time_entries_question: %.02f hours were reported on the issues you are about to delete. What do you want to do ?
+error_issue_not_found_in_project: 'The issue was not found or does not belong to this project'
+text_assign_time_entries_to_project: Assign reported hours to the project
+text_destroy_time_entries: Delete reported hours
+text_reassign_time_entries: 'Reassign reported hours to this issue:'
diff --git a/test/functional/issues_controller_test.rb b/test/functional/issues_controller_test.rb
index 34b030d98..da8118668 100644
--- a/test/functional/issues_controller_test.rb
+++ b/test/functional/issues_controller_test.rb
@@ -37,7 +37,8 @@ class IssuesControllerTest < Test::Unit::TestCase
            :workflows,
            :custom_fields,
            :custom_values,
-           :custom_fields_trackers
+           :custom_fields_trackers,
+           :time_entries
   
   def setup
     @controller = IssuesController.new
@@ -428,13 +429,48 @@ class IssuesControllerTest < Test::Unit::TestCase
                                              :class => 'icon-del disabled' }
   end
   
-  def test_destroy
+  def test_destroy_issue_with_no_time_entries
     @request.session[:user_id] = 2
-    post :destroy, :id => 1
+    post :destroy, :id => 3
     assert_redirected_to 'projects/ecookbook/issues'
-    assert_nil Issue.find_by_id(1)
+    assert_nil Issue.find_by_id(3)
   end
 
+  def test_destroy_issues_with_time_entries
+    @request.session[:user_id] = 2
+    post :destroy, :ids => [1, 3]
+    assert_response :success
+    assert_template 'destroy'
+    assert_not_nil assigns(:hours)
+    assert Issue.find_by_id(1) && Issue.find_by_id(3)
+  end
+
+  def test_destroy_issues_and_destroy_time_entries
+    @request.session[:user_id] = 2
+    post :destroy, :ids => [1, 3], :todo => 'destroy'
+    assert_redirected_to 'projects/ecookbook/issues'
+    assert !(Issue.find_by_id(1) || Issue.find_by_id(3))
+    assert_nil TimeEntry.find_by_id([1, 2])
+  end
+
+  def test_destroy_issues_and_assign_time_entries_to_project
+    @request.session[:user_id] = 2
+    post :destroy, :ids => [1, 3], :todo => 'nullify'
+    assert_redirected_to 'projects/ecookbook/issues'
+    assert !(Issue.find_by_id(1) || Issue.find_by_id(3))
+    assert_nil TimeEntry.find(1).issue_id
+    assert_nil TimeEntry.find(2).issue_id
+  end
+  
+  def test_destroy_issues_and_reassign_time_entries_to_another_issue
+    @request.session[:user_id] = 2
+    post :destroy, :ids => [1, 3], :todo => 'reassign', :reassign_to_id => 2
+    assert_redirected_to 'projects/ecookbook/issues'
+    assert !(Issue.find_by_id(1) || Issue.find_by_id(3))
+    assert_equal 2, TimeEntry.find(1).issue_id
+    assert_equal 2, TimeEntry.find(2).issue_id
+  end
+  
   def test_destroy_attachment
     issue = Issue.find(3)
     a = issue.attachments.size
diff --git a/test/unit/issue_test.rb b/test/unit/issue_test.rb
index da91dd02c..7712b764e 100644
--- a/test/unit/issue_test.rb
+++ b/test/unit/issue_test.rb
@@ -70,4 +70,10 @@ class IssueTest < Test::Unit::TestCase
     # Make sure time entries were move to the target project
     assert_equal 2, issue.time_entries.first.project_id
   end
+  
+  def test_issue_destroy
+    Issue.find(1).destroy
+    assert_nil Issue.find_by_id(1)
+    assert_nil TimeEntry.find_by_issue_id(1)
+  end
 end

From 7ee55562ffb84be384578a0145b896f4734fa38b Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sat, 1 Mar 2008 09:00:02 +0000
Subject: [PATCH 242/710] Fixed: fetch_changesets fails on commit comments that
 close 2 duplicates issues.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1183 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/models/changeset.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/models/changeset.rb b/app/models/changeset.rb
index 3703ab927..6bd15b158 100644
--- a/app/models/changeset.rb
+++ b/app/models/changeset.rb
@@ -80,6 +80,8 @@ class Changeset < ActiveRecord::Base
         # update status of issues
         logger.debug "Issues fixed by changeset #{self.revision}: #{issue_ids.join(', ')}." if logger && logger.debug?
         target_issues.each do |issue|
+          # the issue may have been updated by the closure of another one (eg. duplicate)
+          issue.reload
           # don't change the status is the issue is closed
           next if issue.status.is_closed?
           user = committer_user || User.anonymous

From 8ea2ecb983c2a48c1a8ec5bb680f711829a91e0c Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sat, 1 Mar 2008 20:09:57 +0000
Subject: [PATCH 243/710] Fixed #759: Can not view a project without View time
 entries permission (broken by r1176).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1184 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/models/project.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/project.rb b/app/models/project.rb
index 8f1dada1d..95a201454 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -118,7 +118,7 @@ class Project < ActiveRecord::Base
     elsif user.logged?
       statements << "#{Project.table_name}.is_public = #{connection.quoted_true}" if Role.non_member.allowed_to?(permission)
       allowed_project_ids = user.memberships.select {|m| m.role.allowed_to?(permission)}.collect {|m| m.project_id}
-      statements << "#{Project.table_name}.id IN (#{allowed_project_ids.join(',')})"
+      statements << "#{Project.table_name}.id IN (#{allowed_project_ids.join(',')})" if allowed_project_ids.any?
     else
       statements << "#{Project.table_name}.is_public = #{connection.quoted_true}" if Role.anonymous.allowed_to?(permission)
     end

From 942091f9e844f673240d75c27f4c6d2167a664e1 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Wed, 5 Mar 2008 08:25:22 +0000
Subject: [PATCH 244/710] Display links to Atom feeds (closes #496, #750).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1185 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/issues_controller.rb      |  11 +++++++++--
 app/views/issues/_list.rhtml              |   2 +-
 app/views/issues/changes.rxml             |   8 ++++----
 app/views/issues/index.rhtml              |  12 +++++++-----
 app/views/issues/show.rhtml               |  13 +++++++++----
 app/views/news/index.rhtml                |   5 +++++
 app/views/projects/activity.rhtml         |   9 ++++++---
 app/views/projects/gantt.rhtml            |   9 +++++----
 app/views/timelog/details.rhtml           |   9 +++++----
 app/views/wiki/show.rhtml                 |   9 ++++-----
 app/views/wiki/special_date_index.rhtml   |  13 +++++++++----
 app/views/wiki/special_page_index.rhtml   |  13 +++++++++----
 lang/en.yml                               |   2 +-
 lang/fr.yml                               |   2 +-
 public/images/feed.png                    | Bin 359 -> 524 bytes
 public/stylesheets/application.css        |  14 ++++++--------
 test/functional/issues_controller_test.rb |   2 +-
 17 files changed, 82 insertions(+), 51 deletions(-)

diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index 53627db92..4a44d09bc 100644
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -49,7 +49,13 @@ class IssuesController < ApplicationController
     sort_update
     retrieve_query
     if @query.valid?
-      limit = %w(pdf csv).include?(params[:format]) ? Setting.issues_export_limit.to_i : per_page_option
+      limit = per_page_option
+      respond_to do |format|
+        format.html { }
+        format.atom { }
+        format.csv  { limit = Setting.issues_export_limit.to_i }
+        format.pdf  { limit = Setting.issues_export_limit.to_i }
+      end
       @issue_count = Issue.count(:include => [:status, :project], :conditions => @query.statement)
       @issue_pages = Paginator.new self, @issue_count, limit, params['page']
       @issues = Issue.find :all, :order => sort_clause,
@@ -74,7 +80,7 @@ class IssuesController < ApplicationController
     sort_update
     retrieve_query
     if @query.valid?
-      @changes = Journal.find :all, :include => [ :details, :user, {:issue => [:project, :author, :tracker, :status]} ],
+      @journals = Journal.find :all, :include => [ :details, :user, {:issue => [:project, :author, :tracker, :status]} ],
                                      :conditions => @query.statement,
                                      :limit => 25,
                                      :order => "#{Journal.table_name}.created_on DESC"
@@ -92,6 +98,7 @@ class IssuesController < ApplicationController
     @priorities = Enumeration::get_values('IPRI')
     respond_to do |format|
       format.html { render :template => 'issues/show.rhtml' }
+      format.atom { render :action => 'changes', :layout => false, :content_type => 'application/atom+xml' }
       format.pdf  { send_data(render(:template => 'issues/show.rfpdf', :layout => false), :type => 'application/pdf', :filename => "#{@project.identifier}-#{@issue.id}.pdf") }
     end
   end
diff --git a/app/views/issues/_list.rhtml b/app/views/issues/_list.rhtml
index 343f7173d..91390ac67 100644
--- a/app/views/issues/_list.rhtml
+++ b/app/views/issues/_list.rhtml
@@ -11,7 +11,7 @@
 	<tbody>
 	<% issues.each do |issue| -%>
 	<tr id="issue-<%= issue.id %>" class="issue hascontextmenu <%= cycle('odd', 'even') %> <%= "status-#{issue.status.position} priority-#{issue.priority.position}" %>">
-	    <td class="checkbox"><%= check_box_tag("ids[]", issue.id, false) %></td>
+	    <td class="checkbox"><%= check_box_tag("ids[]", issue.id, false, :id => nil) %></td>
 		<td><%= link_to issue.id, :controller => 'issues', :action => 'show', :id => issue %></td>
         <% query.columns.each do |column| %><%= content_tag 'td', column_content(column, issue), :class => column.name %><% end %>
 	</tr>
diff --git a/app/views/issues/changes.rxml b/app/views/issues/changes.rxml
index f1aa5d206..239d2d6a3 100644
--- a/app/views/issues/changes.rxml
+++ b/app/views/issues/changes.rxml
@@ -1,12 +1,12 @@
 xml.instruct!
 xml.feed "xmlns" => "http://www.w3.org/2005/Atom" do
   xml.title   @title
-  xml.link    "rel" => "self", "href" => url_for(:controller => 'feeds', :action => 'history', :format => 'atom', :only_path => false)
-  xml.link    "rel" => "alternate", "href" => url_for(:controller => 'welcome', :only_path => false)
+  xml.link    "rel" => "self", "href" => url_for(:format => 'atom', :key => User.current.rss_key, :only_path => false)
+  xml.link    "rel" => "alternate", "href" => home_url(:only_path => false)
   xml.id      url_for(:controller => 'welcome', :only_path => false)
-  xml.updated((@changes.first ? @changes.first.event_datetime : Time.now).xmlschema)
+  xml.updated((@journals.first ? @journals.first.event_datetime : Time.now).xmlschema)
   xml.author  { xml.name "#{Setting.app_title}" }
-  @changes.each do |change|
+  @journals.each do |change|
     issue = change.issue
     xml.entry do
       xml.title   "#{issue.project.name} - #{issue.tracker.name} ##{issue.id}: #{issue.subject}"
diff --git a/app/views/issues/index.rhtml b/app/views/issues/index.rhtml
index 4d1f4f176..d3408fa99 100644
--- a/app/views/issues/index.rhtml
+++ b/app/views/issues/index.rhtml
@@ -41,12 +41,14 @@
 <p class="nodata"><%= l(:label_no_data) %></p>
 <% else %>
 <%= render :partial => 'issues/list', :locals => {:issues => @issues, :query => @query} %>
-<div class="contextual">
-<%= l(:label_export_to) %>
-<%= link_to 'CSV', {:format => 'csv'}, :class => 'icon icon-csv' %>,
-<%= link_to 'PDF', {:format => 'pdf'}, :class => 'icon icon-pdf' %>
-</div>
 <p class="pagination"><%= pagination_links_full @issue_pages, @issue_count %></p>
+
+<p class="other-formats">
+<%= l(:label_export_to) %>
+<span><%= link_to 'Atom', {:format => 'atom', :key => User.current.rss_key}, :class => 'feed' %></span>
+<span><%= link_to 'CSV', {:format => 'csv'}, :class => 'csv' %></span>
+<span><%= link_to 'PDF', {:format => 'pdf'}, :class => 'pdf' %></span>
+</p>
 <% end %>
 <% end %>
 
diff --git a/app/views/issues/show.rhtml b/app/views/issues/show.rhtml
index e3999bd8e..c5efe4f25 100644
--- a/app/views/issues/show.rhtml
+++ b/app/views/issues/show.rhtml
@@ -95,13 +95,18 @@ end %>
   </div>
 <% end %>
 
-<div class="contextual">
-<%= l(:label_export_to) %><%= link_to 'PDF', {:format => 'pdf'}, :class => 'icon icon-pdf' %>
-</div>
-&nbsp;
+<p class="other-formats">
+<%= l(:label_export_to) %>
+<span><%= link_to 'Atom', {:format => 'atom', :key => User.current.rss_key}, :class => 'feed' %></span>
+<span><%= link_to 'PDF', {:format => 'pdf'}, :class => 'pdf' %></span>
+</p>
 
 <% html_title "#{@issue.tracker.name} ##{@issue.id}: #{@issue.subject}" %>
 
 <% content_for :sidebar do %>
     <%= render :partial => 'issues/sidebar' %>
 <% end %>
+
+<% content_for :header_tags do %>
+    <%= auto_discovery_link_tag(:atom, {:format => 'atom', :key => User.current.rss_key}, :title => "#{@issue.project} - #{@issue.tracker} ##{@issue.id}: #{@issue.subject}") %>
+<% end %>
diff --git a/app/views/news/index.rhtml b/app/views/news/index.rhtml
index 369eaf1b1..87db8a5f7 100644
--- a/app/views/news/index.rhtml
+++ b/app/views/news/index.rhtml
@@ -39,6 +39,11 @@
 <% end %>
 <p class="pagination"><%= pagination_links_full @news_pages %></p>
 
+<p class="other-formats">
+<%= l(:label_export_to) %>
+<span><%= link_to 'Atom', {:format => 'atom', :key => User.current.rss_key}, :class => 'feed' %></span>
+</p>
+
 <% content_for :header_tags do %>
   <%= auto_discovery_link_tag(:atom, params.merge({:format => 'atom', :page => nil, :key => User.current.rss_key})) %>
 <% end %>
diff --git a/app/views/projects/activity.rhtml b/app/views/projects/activity.rhtml
index dce333f61..aca08fd6f 100644
--- a/app/views/projects/activity.rhtml
+++ b/app/views/projects/activity.rhtml
@@ -27,12 +27,15 @@
 <% next_params = params.clone.update :year => (@month==12 ? @year+1 : @year), :month =>(@month==12 ? 1 : @month+1) %>
 <%= link_to_remote ((@month==12 ? "#{month_name(1)} #{@year+1}" : "#{month_name(@month+1)}") + ' &#187;'), 
                     {:update => "content", :url => next_params}, {:href => url_for(next_params)} %>
-&nbsp;
 </div>
-<br />
+&nbsp;
+<p class="other-formats">
+    <%= l(:label_export_to) %>
+    <%= link_to 'Atom', params.merge(:format => :atom, :key => User.current.rss_key).delete_if{|k,v|k=="commit"}, :class => 'feed' %>
+</p>
 
 <% content_for :header_tags do %>
-<%= auto_discovery_link_tag(:atom, params.merge({:format => 'atom', :year => nil, :month => nil, :key => User.current.rss_key})) %>
+<%= auto_discovery_link_tag(:atom, params.merge(:format => 'atom', :year => nil, :month => nil, :key => User.current.rss_key).delete_if{|k,v|k=="commit"}) %>
 <% end %>
 
 <% content_for :sidebar do %>
diff --git a/app/views/projects/gantt.rhtml b/app/views/projects/gantt.rhtml
index 2979bce2b..05bd4b9bc 100644
--- a/app/views/projects/gantt.rhtml
+++ b/app/views/projects/gantt.rhtml
@@ -223,10 +223,11 @@ if Date.today >= @date_from and Date.today <= @date_to %>
 </tr>
 </table>
 
-<div class="contextual"><%= l(:label_export_to) %>
-<%= link_to 'PDF', {:zoom => @zoom, :year => @year_from, :month => @month_from, :months => @months, :tracker_ids => @selected_tracker_ids, :with_subprojects => params[:with_subprojects], :format => 'pdf'}, :class => 'icon icon-pdf' %>
-<%= link_to 'PNG', {:zoom => @zoom, :year => @year_from, :month => @month_from, :months => @months, :tracker_ids => @selected_tracker_ids, :with_subprojects => params[:with_subprojects], :format => 'png'}, :class => 'icon icon-image' if respond_to?('gantt_image') %>
-</div>
+<p class="other-formats">
+<%= l(:label_export_to) %>
+<span><%= link_to 'PDF', {:zoom => @zoom, :year => @year_from, :month => @month_from, :months => @months, :tracker_ids => @selected_tracker_ids, :with_subprojects => params[:with_subprojects], :format => 'pdf'}, :class => 'pdf' %></span>
+<%= content_tag('span', link_to('PNG', {:zoom => @zoom, :year => @year_from, :month => @month_from, :months => @months, :tracker_ids => @selected_tracker_ids, :with_subprojects => params[:with_subprojects], :format => 'png'}, :class => 'image')) if respond_to?('gantt_image') %>
+</p>
 
 <% content_for :sidebar do %>
     <h3><%= l(:label_gantt) %></h3>
diff --git a/app/views/timelog/details.rhtml b/app/views/timelog/details.rhtml
index 802090b7a..cba1597d1 100644
--- a/app/views/timelog/details.rhtml
+++ b/app/views/timelog/details.rhtml
@@ -37,11 +37,12 @@
 
 <% unless @entries.empty? %>
 <%= render :partial => 'list', :locals => { :entries => @entries }%>
-<div class="contextual">
-    <%= l(:label_export_to) %>
-    <%= link_to 'CSV', params.merge(:format => 'csv'), :class => 'icon icon-csv' %>
-</div>
 <p class="pagination"><%= pagination_links_full @entry_pages, @entry_count %></p>
+
+<p class="other-formats">
+<%= l(:label_export_to) %>
+<span><%= link_to 'CSV', params.merge(:format => 'csv'), :class => 'csv' %></span>
+</p>
 <% end %>
 
 <% content_for :header_tags do %>
diff --git a/app/views/wiki/show.rhtml b/app/views/wiki/show.rhtml
index 77d82884f..e4413d090 100644
--- a/app/views/wiki/show.rhtml
+++ b/app/views/wiki/show.rhtml
@@ -36,12 +36,11 @@
 <% end %>
 <% end %>
 
-<div class="contextual">
+<p class="other-formats">
 <%= l(:label_export_to) %>
-<%= link_to 'HTML', {:page => @page.title, :export => 'html', :version => @content.version}, :class => 'icon icon-html' %>,
-<%= link_to 'TXT', {:page => @page.title, :export => 'txt', :version => @content.version}, :class => 'icon icon-txt' %>
-</div>
-&nbsp;
+<span><%= link_to 'HTML', {:page => @page.title, :export => 'html', :version => @content.version}, :class => 'html' %></span>
+<span><%= link_to 'TXT', {:page => @page.title, :export => 'txt', :version => @content.version}, :class => 'text' %></span>
+</p>
 
 <% content_for :header_tags do %>
   <%= stylesheet_link_tag 'scm' %>
diff --git a/app/views/wiki/special_date_index.rhtml b/app/views/wiki/special_date_index.rhtml
index ac68f809e..6717ebc85 100644
--- a/app/views/wiki/special_date_index.rhtml
+++ b/app/views/wiki/special_date_index.rhtml
@@ -17,9 +17,14 @@
   <%= render :partial => 'sidebar' %>
 <% end %>
 
-<div class="contextual">
 <% unless @pages.empty? %>
-<%= l(:label_export_to) %> <%= link_to 'HTML', {:action => 'special', :page => 'export'}, :class => 'icon icon-html' %>
+<p class="other-formats">
+<%= l(:label_export_to) %>
+<span><%= link_to 'Atom', {:controller => 'projects', :action => 'activity', :id => @project, :show_wiki_pages => 1, :format => 'atom', :key => User.current.rss_key}, :class => 'feed' %></span>
+<span><%= link_to 'HTML', {:action => 'special', :page => 'export'}, :class => 'html' %></span>
+</p>
+<% end %>
+
+<% content_for :header_tags do %>
+<%= auto_discovery_link_tag(:atom, :controller => 'projects', :action => 'activity', :id => @project, :show_wiki_pages => 1, :format => 'atom', :key => User.current.rss_key) %>
 <% end %>
-</div>
-&nbsp;
diff --git a/app/views/wiki/special_page_index.rhtml b/app/views/wiki/special_page_index.rhtml
index db6629de8..f21cc3423 100644
--- a/app/views/wiki/special_page_index.rhtml
+++ b/app/views/wiki/special_page_index.rhtml
@@ -14,9 +14,14 @@
   <%= render :partial => 'sidebar' %>
 <% end %>
 
-<div class="contextual">
 <% unless @pages.empty? %>
-<%= l(:label_export_to) %> <%= link_to 'HTML', {:action => 'special', :page => 'export'}, :class => 'icon icon-html' %>
+<p class="other-formats">
+<%= l(:label_export_to) %>
+<span><%= link_to 'Atom', {:controller => 'projects', :action => 'activity', :id => @project, :show_wiki_pages => 1, :format => 'atom', :key => User.current.rss_key}, :class => 'feed' %></span>
+<span><%= link_to 'HTML', {:action => 'special', :page => 'export'} %></span>
+</p>
+<% end %>
+
+<% content_for :header_tags do %>
+<%= auto_discovery_link_tag(:atom, :controller => 'projects', :action => 'activity', :id => @project, :show_wiki_pages => 1, :format => 'atom', :key => User.current.rss_key) %>
 <% end %>
-</div>
-&nbsp;
diff --git a/lang/en.yml b/lang/en.yml
index 7ed2c8775..a5da5a855 100644
--- a/lang/en.yml
+++ b/lang/en.yml
@@ -320,7 +320,7 @@ label_version: Version
 label_version_new: New version
 label_version_plural: Versions
 label_confirmation: Confirmation
-label_export_to: Export to
+label_export_to: 'Also available in:'
 label_read: Read...
 label_public_projects: Public projects
 label_open_issues: open
diff --git a/lang/fr.yml b/lang/fr.yml
index accd5c1bf..30c9f6cca 100644
--- a/lang/fr.yml
+++ b/lang/fr.yml
@@ -320,7 +320,7 @@ label_version: Version
 label_version_new: Nouvelle version
 label_version_plural: Versions
 label_confirmation: Confirmation
-label_export_to: Exporter en
+label_export_to: 'Formats disponibles:'
 label_read: Lire...
 label_public_projects: Projets publics
 label_open_issues: ouvert
diff --git a/public/images/feed.png b/public/images/feed.png
index 51dc9778e79854fbccaddc52c62d2d2fadf15677..900188ae068198fb18263442abbeb106dbbec341 100644
GIT binary patch
literal 524
zcmV+n0`vWeP)<h;3K|Lk000e1NJLTq000aC000aK1^@s6R&`wG0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzu1Q2eRCwBCQadbzQ563E|G)ZDbrV&u
z#-l;BgvKZxSP%&o#9*)xgGo%LCRT&NWD<!)M1-YbkS=2Jhy)>oNHoN|N{V0m*FCpt
zag&>K&dqnu_nmXDqK$9*xs`<-X2zMSfN2VZ0r{$u_Kg(q9RH3+UcXvY0t4Xw5<5&x
z!RNODJ&}T*Od%nV1g0dH-NcI><}fp9Di;Y@8LTG*Q3b1q4_G|7LtIZvFfr*#1J3L$
zt`)To1*yu;bqu#L9d2$$hu4Yrnmp`B-th8~kYHk@qmpLQ+f>f68;PNB{s?1h=MX(%
zw$}?!o>hYNgdruWnFdD#Zp`)jus-Y;kHE<CsjN8FRRs%E(>;l+W+oGu*+X#SG7aji
zq9!pBx_~>^jILVeuPlQY(voUiHVGbBIL1xv3uDct2%S92A@nr3{!5zfu12uUgFpqx
z%vMBJZgl5hNldG*(Ec}KMqmog9^$BUTCsigDq}j;`8HfWeMsL|kd4#(IFz!<truEK
zW^_a?EycewGS`-+MH#JI_+f`dlV3yV6N^gyeGeidut<)+>&ccM0R{jl8qAKtqD=<?
O0000<MNUMnLSTZLFyn*(

literal 359
zcmeAS@N?(olHy`uVBq!ia0vp^d?3uh3?wzC-F*zC*h@TpUD>ZQ3y8>Ys9!DJ4HV)m
z@Q5sCVBi)4Va7{$>;3=*S<)SS9T^xl_H+M9WCilW1AIbUf%O0X|36Pqdt1Tqw~gWZ
z>zlu3FnsP8`?A*e&os&RN9TXsQTF-ik@rU?zw2W7y^P`3oXD5^`@bFU{`Kw4kG01C
zH!^-dQu2SN*u6C={|~7CIU4o;&gwrm<}~)y-vJuUSQ6wH%;50sMjDXQ=IP=XQgKVS
zH(IFKfQNapMPaO*8H>|`FaMsext#bv>{1U?%hyI$$2U9PzkmK}2FqSIi=Xlt7q-oR
zKCAIkRPoxYYi{jXc;(jBnyMK&6V@G@?9V=XVlUIoje62<=Wbk`db7gunds4If8*>n
zF1G70)@%AI9DFltkMEyJU*z1lCU#t6KHBh(U(o(b5Bt1_!Qx#&7cqFc`njxgN@xNA
D=CYsx

diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 833937482..cd875c7f7 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -80,7 +80,7 @@ a img{ border: 0; }
 /***** Tables *****/
 table.list { border: 1px solid #e4e4e4;  border-collapse: collapse; width: 100%; margin-bottom: 4px; }
 table.list th {  background-color:#EEEEEE; padding: 4px; white-space:nowrap; }
-table.list td { overflow: hidden; text-overflow: ellipsis; vertical-align: top;}
+table.list td { overflow: hidden; vertical-align: top;}
 table.list td.id { width: 2%; text-align: center;}
 table.list td.checkbox { width: 15px; padding: 0px;}
 
@@ -228,6 +228,11 @@ div.attachments p { margin:4px 0 2px 0; }
 div.attachments img { vertical-align: middle; }
 div.attachments span.author { font-size: 0.9em; color: #888; }
 
+p.other-formats { text-align: right; font-size:0.9em; color: #666; }
+.other-formats span + span:before { content: "| "; }
+
+a.feed { background: url(../images/feed.png) no-repeat 1px 50%; padding: 2px 0px 3px 16px; }
+
 /***** Flash & error messages ****/
 #errorExplanation, div.flash, .nodata {
     padding: 4px 4px 4px 30px;
@@ -275,7 +280,6 @@ padding:0.6em;
 z-index:100;
 filter:alpha(opacity=50);
 opacity: 0.5;
--khtml-opacity: 0.5;
 }
 
 html>body #ajax-indicator { position: fixed; }
@@ -518,11 +522,6 @@ vertical-align: middle;
 .icon-move { background-image: url(../images/move.png); }
 .icon-save { background-image: url(../images/save.png); }
 .icon-cancel { background-image: url(../images/cancel.png); }
-.icon-pdf { background-image: url(../images/pdf.png); }
-.icon-csv { background-image: url(../images/csv.png); }
-.icon-html { background-image: url(../images/html.png); }
-.icon-image { background-image: url(../images/image.png); }
-.icon-txt { background-image: url(../images/txt.png); }
 .icon-file { background-image: url(../images/file.png); }
 .icon-folder { background-image: url(../images/folder.png); }
 .open .icon-folder { background-image: url(../images/folder_open.png); }
@@ -537,7 +536,6 @@ vertical-align: middle;
 .icon-attachment  { background-image: url(../images/attachment.png); }
 .icon-index  { background-image: url(../images/index.png); }
 .icon-history  { background-image: url(../images/history.png); }
-.icon-feed  { background-image: url(../images/feed.png); }
 .icon-time  { background-image: url(../images/time.png); }
 .icon-stats  { background-image: url(../images/stats.png); }
 .icon-warning  { background-image: url(../images/warning.png); }
diff --git a/test/functional/issues_controller_test.rb b/test/functional/issues_controller_test.rb
index da8118668..4f644d522 100644
--- a/test/functional/issues_controller_test.rb
+++ b/test/functional/issues_controller_test.rb
@@ -96,7 +96,7 @@ class IssuesControllerTest < Test::Unit::TestCase
   def test_changes
     get :changes, :project_id => 1
     assert_response :success
-    assert_not_nil assigns(:changes)
+    assert_not_nil assigns(:journals)
     assert_equal 'application/atom+xml', @response.content_type
   end
   

From 918937c8736ea6e3a3f72a210b47dfbcfa1aaf5f Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Wed, 5 Mar 2008 08:54:26 +0000
Subject: [PATCH 245/710] =?UTF-8?q?Translations=20updates:=20*=20Finnish?=
 =?UTF-8?q?=20(Antti=20Perki=C3=B6m=C3=A4ki)=20*=20Russian=20(Michael=20Pi?=
 =?UTF-8?q?rogov)=20*=20Chinese=20Traditional=20(shortie=20lo)=20*=20Japan?=
 =?UTF-8?q?ese=20(Satoru=20Kurashiki)=20*=20Korean=20(Jongyoon=20Choi)=20*?=
 =?UTF-8?q?=20Simplified=20Chinese=20(chaoqun=20zou)=20*=20German=20(Thoma?=
 =?UTF-8?q?s=20L=C3=B6ber)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixed zh and zh-tw encoding in PDF (chaoqun zou).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1186 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/helpers/ifpdf_helper.rb                   |  11 +-
 lang/de.yml                                   |  89 ++--
 lang/fi.yml                                   |  86 ++--
 lang/ja.yml                                   | 178 +++----
 lang/ko.yml                                   | 128 ++---
 lang/ru.yml                                   |  62 +--
 lang/zh-tw.yml                                |  61 +--
 lang/zh.yml                                   | 452 +++++++++---------
 .../javascripts/calendar/lang/calendar-fi.js  |   2 +-
 .../jstoolbar/lang/jstoolbar-ja.js            |  26 +-
 10 files changed, 550 insertions(+), 545 deletions(-)

diff --git a/app/helpers/ifpdf_helper.rb b/app/helpers/ifpdf_helper.rb
index 585dbeeca..2cfca1929 100644
--- a/app/helpers/ifpdf_helper.rb
+++ b/app/helpers/ifpdf_helper.rb
@@ -27,13 +27,18 @@ module IfpdfHelper
     def initialize(lang)
       super()
       set_language_if_valid lang
-      case current_language
-      when :ja
+      case current_language.to_s
+      when 'ja'
         extend(PDF_Japanese)
         AddSJISFont()
         @font_for_content = 'SJIS'
         @font_for_footer = 'SJIS'
-      when :zh
+      when 'zh'
+        extend(PDF_Chinese)
+        AddGBFont()
+        @font_for_content = 'GB'
+        @font_for_footer = 'GB'
+      when 'zh-tw'
         extend(PDF_Chinese)
         AddBig5Font()
         @font_for_content = 'Big5'
diff --git a/lang/de.yml b/lang/de.yml
index 9397cf892..6cde2d9d4 100644
--- a/lang/de.yml
+++ b/lang/de.yml
@@ -80,6 +80,7 @@ notice_default_data_loaded: Die Standard-Konfiguration wurde erfolgreich geladen
 error_can_t_load_default_data: "Die Standard-Konfiguration konnte nicht geladen werden: %s"
 error_scm_not_found: Eintrag und/oder Revision besteht nicht im Projektarchiv.
 error_scm_command_failed: "Beim Zugriff auf das Projektarchiv ist ein Fehler aufgetreten: %s"
+error_issue_not_found_in_project: 'Das Ticket wurde nicht gefunden oder gehört nicht zu diesem Projekt.'
 
 mail_subject_lost_password: Ihr Redmine-Kennwort
 mail_body_lost_password: 'Benutzen Sie den folgenden Link, um Ihr Kennwort zu ändern:'
@@ -206,6 +207,15 @@ setting_protocol: Protokoll
 setting_per_page_options: Objekte pro Seite
 setting_user_format: Benutzer-Anzeigeformat
 
+project_module_issue_tracking: Ticket-Verfolgung
+project_module_time_tracking: Zeiterfassung
+project_module_news: News
+project_module_documents: Dokumente
+project_module_files: Dateien
+project_module_wiki: Wiki
+project_module_repository: Projektarchiv
+project_module_boards: Foren
+
 label_user: Benutzer
 label_user_plural: Benutzer
 label_user_new: Neuer Benutzer
@@ -219,9 +229,12 @@ label_issue_new: Neues Ticket
 label_issue_plural: Tickets
 label_issue_view_all: Alle Tickets ansehen
 label_issues_by: Tickets von %s
+label_issue_added: Ticket hinzugefügt
+label_issue_updated: Ticket aktualisiert
 label_document: Dokument
 label_document_new: Neues Dokument
 label_document_plural: Dokumente
+label_document_added: Dokument hinzugefügt
 label_role: Rolle
 label_role_plural: Rollen
 label_role_new: Neue Rolle
@@ -291,6 +304,7 @@ label_attachment: Datei
 label_attachment_new: Neue Datei
 label_attachment_delete: Anhang löschen
 label_attachment_plural: Dateien
+label_file_added: Datei hinzugefügt
 label_report: Bericht
 label_report_plural: Berichte
 label_news: News
@@ -298,6 +312,7 @@ label_news_new: News hinzufügen
 label_news_plural: News
 label_news_latest: Letzte News
 label_news_view_all: Alle News anzeigen
+label_news_added: News hinzugefügt
 label_change_log: Change-Log
 label_settings: Konfiguration
 label_overview: Übersicht
@@ -348,7 +363,15 @@ label_in_less_than: in weniger als
 label_in_more_than: in mehr als
 label_in: an
 label_today: heute
-label_this_week: diese Woche
+label_all_time: gesamter Zeitraum
+label_yesterday: gestern
+label_this_week: aktuelle Woche
+label_last_week: vorige Woche
+label_last_n_days: die letzten %d Tage
+label_this_month: aktueller Monat
+label_last_month: voriger Monat
+label_this_year: aktuelles Jahr
+label_date_range: Zeitraum
 label_less_than_ago: vor weniger als
 label_more_than_ago: vor mehr als
 label_ago: vor
@@ -435,6 +458,7 @@ label_topic_plural: Themen
 label_message_plural: Nachrichten
 label_message_last: Letzte Nachricht
 label_message_new: Neue Nachricht
+label_message_posted: Forums-Beitrag hinzugefügt
 label_reply_plural: Antworten
 label_send_information: Sende Kontoinformationen zum Benutzer
 label_year: Jahr
@@ -466,9 +490,16 @@ label_registration_activation_by_email: Kontoaktivierung durch E-Mail
 label_registration_manual_activation: Manuelle Kontoaktivierung
 label_registration_automatic_activation: Automatische Kontoaktivierung
 label_display_per_page: 'Pro Seite: %s'
-label_age: Alter
+label_age: Geändert vor
 label_change_properties: Eigenschaften ändern
 label_general: Allgemein
+label_more: Mehr
+label_scm: Versionskontrollsystem
+label_plugins: Plugins
+label_ldap_authentication: LDAP-Authentifizierung
+label_downloads_abbr: D/L
+label_optional_description: Beschreibung (optional)
+label_add_another_file: Eine weitere Datei hinzufügen
 
 button_login: Anmelden
 button_submit: OK
@@ -506,12 +537,13 @@ button_change_password: Kennwort ändern
 button_copy: Kopieren
 button_annotate: Mit Anmerkungen versehen
 button_update: Aktualisieren
+button_configure: Konfigurieren
 
 status_active: aktiv
 status_registered: angemeldet
 status_locked: gesperrt
 
-text_select_mail_notifications: Aktionen, für die Mailbenachrichtigung aktiviert werden soll.
+text_select_mail_notifications: Bitte wählen Sie die Aktionen aus, für die eine Mailbenachrichtigung gesendet werden soll
 text_regexp_info: z. B. ^[A-Z0-9]+$
 text_min_max_length_info: 0 heißt keine Beschränkung
 text_project_destroy_confirmation: Sind Sie sicher, dass sie das Projekt löschen wollen?
@@ -540,6 +572,16 @@ text_issue_category_reassign_to: Tickets dieser Kategorie zuordnen
 text_user_mail_option: "Für nicht ausgewählte Projekte werden Sie nur Benachrichtigungen für Dinge erhalten, die Sie beobachten oder an denen Sie beteiligt sind (z. B. Tickets, deren Autor Sie sind oder die Ihnen zugewiesen sind)."
 text_no_configuration_data: "Rollen, Tracker, Ticket-Status und Workflows wurden noch nicht konfiguriert.\nEs ist sehr zu empfehlen, die Standard-Konfiguration zu laden. Sobald sie geladen ist, können Sie sie abändern."
 text_load_default_configuration: Standard-Konfiguration laden
+text_status_changed_by_changeset: Status geändert durch Changeset %s.
+text_issues_destroy_confirmation: 'Sind Sie sicher, dass Sie die ausgewählten Tickets löschen möchten?'
+text_select_project_modules: 'Bitte wählen Sie die Module aus, die in diesem Projekt aktiviert sein sollen:'
+text_default_administrator_account_changed: Administrator-Kennwort geändert
+text_file_repository_writable: Verzeichnis für Dateien beschreibbar
+text_rmagick_available: RMagick verfügbar (optional)
+text_destroy_time_entries_question: Es wurden bereits %.02f Stunden auf dieses Ticket gebucht. Was soll mit den Aufwänden geschehen?
+text_destroy_time_entries: Gebuchte Aufwände löschen
+text_assign_time_entries_to_project: Gebuchte Aufwände dem Projekt zuweisen
+text_reassign_time_entries: 'Gebuchte Aufwände diesem Ticket zuweisen:'
 
 default_role_manager: Manager
 default_role_developper: Entwickler
@@ -566,44 +608,3 @@ default_activity_development: Entwicklung
 enumeration_issue_priorities: Ticket-Prioritäten
 enumeration_doc_categories: Dokumentenkategorien
 enumeration_activities: Aktivitäten (Zeiterfassung)
-text_status_changed_by_changeset: Applied in changeset %s.
-label_more: More
-text_issues_destroy_confirmation: 'Are you sure you want to delete the selected issue(s) ?'
-label_scm: SCM
-text_select_project_modules: 'Select modules to enable for this project:'
-label_issue_added: Issue added
-label_issue_updated: Issue updated
-label_document_added: Document added
-label_message_posted: Message added
-label_file_added: File added
-label_news_added: News added
-project_module_boards: Boards
-project_module_issue_tracking: Issue tracking
-project_module_wiki: Wiki
-project_module_files: Files
-project_module_documents: Documents
-project_module_repository: Repository
-project_module_news: News
-project_module_time_tracking: Time tracking
-text_file_repository_writable: File repository writable
-text_default_administrator_account_changed: Default administrator account changed
-text_rmagick_available: RMagick available (optional)
-button_configure: Configure
-label_plugins: Plugins
-label_ldap_authentication: LDAP authentication
-label_downloads_abbr: D/L
-label_this_month: this month
-label_last_n_days: last %d days
-label_all_time: all time
-label_this_year: this year
-label_date_range: Date range
-label_last_week: last week
-label_yesterday: yesterday
-label_last_month: last month
-label_add_another_file: Add another file
-label_optional_description: Optional description
-text_destroy_time_entries_question: %.02f hours were reported on the issues you are about to delete. What do you want to do ?
-error_issue_not_found_in_project: 'The issue was not found or does not belong to this project'
-text_assign_time_entries_to_project: Assign reported hours to the project
-text_destroy_time_entries: Delete reported hours
-text_reassign_time_entries: 'Reassign reported hours to this issue:'
diff --git a/lang/fi.yml b/lang/fi.yml
index dbcc3763c..a0f165e56 100644
--- a/lang/fi.yml
+++ b/lang/fi.yml
@@ -121,7 +121,7 @@ field_status: Tila
 field_notes: Muistiinpanot
 field_is_closed: Tapahtuma suljettu
 field_is_default: Vakio arvo
-field_tracker: Tiketti
+field_tracker: Tapahtuma
 field_subject: Aihe
 field_due_date: Määräaika
 field_assigned_to: Nimetty
@@ -163,7 +163,7 @@ field_url: URL
 field_start_page: Aloitus sivu
 field_subproject: Alaprojekti
 field_hours: Tuntia
-field_activity: Aktiviteetti
+field_activity: Historia
 field_spent_on: Päivä
 field_identifier: Tunniste
 field_is_filter: Käytetään suodattimena
@@ -206,7 +206,7 @@ setting_protocol: Protokolla
 setting_per_page_options: Sivun objektien määrän asetukset
 
 label_user: Käyttäjä
-label_user_plural: Käyttäjiä
+label_user_plural: Käyttäjät
 label_user_new: Uusi käyttäjä
 label_project: Projekti
 label_project_new: Uusi projekti
@@ -228,9 +228,9 @@ label_role_and_permissions: Roolit ja oikeudet
 label_member: Jäsen
 label_member_new: Uusi jäsen
 label_member_plural: Jäsenet
-label_tracker: Tiketti
-label_tracker_plural: Tiketit
-label_tracker_new: Uusi tiketti
+label_tracker: Tapahtuma
+label_tracker_plural: Tapahtumat
+label_tracker_new: Uusi tapahtuma
 label_workflow: Työnkulku
 label_issue_status: Tapahtuman tila
 label_issue_status_plural: Tapahtumien tilat
@@ -255,14 +255,14 @@ label_my_projects: Minun projektit
 label_administration: Ylläpito
 label_login: Kirjaudu sisään
 label_logout: Kirjaudu ulos
-label_help: Apua
+label_help: Ohjeet
 label_reported_issues: Raportoidut tapahtumat
 label_assigned_to_me_issues: Minulle nimetyt tapahtumat
 label_last_login: Viimeinen yhteys
 label_last_updates: Viimeinen päivitys
 label_last_updates_plural: %d päivitetty viimeksi
 label_registered_on: Rekisteröity
-label_activity: Aktiviteetti
+label_activity: Historia
 label_new: Uusi
 label_logged_as: Kirjauduttu nimellä
 label_environment: Ympäristö
@@ -467,10 +467,6 @@ label_display_per_page: 'Per sivu: %s'
 label_age: Ikä
 label_change_properties: Vaihda asetuksia
 label_general: Yleinen
-label_date_to: To
-label_date_from: From
-label_in: in
-label_on: 'on'
 
 button_login: Kirjaudu
 button_submit: Lähetä
@@ -497,8 +493,8 @@ button_activate: Aktivoi
 button_sort: Järjestä
 button_log_time: Seuraa aikaa
 button_rollback: Siirry takaisin tähän versioon
-button_watch: Vahdi
-button_unwatch: Älä vahdi
+button_watch: Seuraa
+button_unwatch: Älä seuraa
 button_reply: Vastaa
 button_archive: Arkistoi
 button_unarchive: Palauta
@@ -517,7 +513,7 @@ text_select_mail_notifications: Valitse tapahtumat joista tulisi lähettää sä
 text_regexp_info: esim. ^[A-Z0-9]+$
 text_min_max_length_info: 0 tarkoitta, ei rajoitusta
 text_project_destroy_confirmation: Oletko varma että haluat poistaa tämän projektin ja kaikki siihen kuuluvat tiedot?
-text_workflow_edit: Valitse rooli ja tiketti muokataksesi työnkulkua
+text_workflow_edit: Valitse rooli ja tapahtuma muokataksesi työnkulkua
 text_are_you_sure: Oletko varma?
 text_journal_changed: %s muutettu arvoksi %s
 text_journal_set_to: muutettu %s
@@ -529,7 +525,7 @@ text_project_identifier_info: 'Pienet kirjaimet (a-z), numerot ja viivat ovat sa
 text_caracters_maximum: %d merkkiä enintään.
 text_caracters_minimum: Täytyy olla vähintään %d merkkiä pitkä.
 text_length_between: Pituus välillä %d ja %d merkkiä.
-text_tracker_no_workflow: Ei työnkulkua määritelty tälle tiketille
+text_tracker_no_workflow: Ei työnkulkua määritelty tälle tapahtumalle
 text_unallowed_characters: Kiellettyjä merkkejä
 text_comma_separated: Useat arvot sallittu (pilkku eroteltuna).
 text_issues_ref_in_commit_messages: Liitän ja korjaan ongelmia syötetyssä viestissä
@@ -539,7 +535,7 @@ text_wiki_destroy_confirmation: Oletko varma että haluat poistaa tämän wiki:n
 text_issue_category_destroy_question: Jotkut tapahtumat (%d) ovat nimetty tälle luokalle. Mitä haluat tehdä?
 text_issue_category_destroy_assignments: Poista luokan tehtävät
 text_issue_category_reassign_to: Vaihda tapahtuma tähän luokkaan
-text_user_mail_option: "Valitesemattomille projekteille, saat vain muistutuksen asioista joita vahdit tai olet mukana (esim. tapahtumat joissa olet tekijä tai nimettynä)."
+text_user_mail_option: "Valitesemattomille projekteille, saat vain muistutuksen asioista joita seuraat tai olet mukana (esim. tapahtumat joissa olet tekijä tai nimettynä)."
 text_no_configuration_data: "Rooleja, tikettejä, tapahtumien tiloja ja työnkulkua ei vielä olla määritelty.\nOn erittäin suotavaa ladata vakioasetukset. Voit muuttaa sitä latauksen jälkeen."
 text_load_default_configuration: Lataa vakioasetukset
 
@@ -567,47 +563,51 @@ default_activity_development: Kehitys
 
 enumeration_issue_priorities: Tapahtuman prioriteetit
 enumeration_doc_categories: Dokumentin luokat
-enumeration_activities: Aktiviteetit (ajan seuranta)
+enumeration_activities: Historia (ajan seuranta)
 label_associated_revisions: Liittyvät versiot
 setting_user_format: Käyttäjien esitysmuoto
 text_status_changed_by_changeset: Päivitetty muutosversioon %s.
 text_issues_destroy_confirmation: 'Oletko varma että haluat poistaa valitut tapahtumat ?'
 label_more: Lisää
-label_issue_added: Issue added
-label_issue_updated: Issue updated
-label_document_added: Document added
-label_message_posted: Message added
-label_file_added: File added
+label_issue_added: Tapahtuma lisätty
+label_issue_updated: Tapahtuma päivitetty
+label_document_added: Dokumentti lisätty
+label_message_posted: Viesti lisätty
+label_file_added: Tiedosto lisätty
 label_scm: SCM
-text_select_project_modules: 'Select modules to enable for this project:'
-label_news_added: News added
-project_module_boards: Boards
-project_module_issue_tracking: Issue tracking
+text_select_project_modules: 'Valitse modulit jotka haluat käyttöön tähän projektiin:'
+label_news_added: Uutinen lisätty
+project_module_boards: Keskustelupalsta
+project_module_issue_tracking: Tapahtuman seuranta
 project_module_wiki: Wiki
-project_module_files: Files
-project_module_documents: Documents
-project_module_repository: Repository
-project_module_news: News
-project_module_time_tracking: Time tracking
-text_file_repository_writable: File repository writable
-text_default_administrator_account_changed: Default administrator account changed
-text_rmagick_available: RMagick available (optional)
-button_configure: Configure
-label_plugins: Plugins
-label_ldap_authentication: LDAP authentication
+project_module_files: Tiedostot
+project_module_documents: Dokumentit
+project_module_repository: Säiliö
+project_module_news: Uutiset
+project_module_time_tracking: Ajan seuranta
+text_file_repository_writable: Kirjoitettava tiedosto säiliö
+text_default_administrator_account_changed: Vakio hallinoijan tunnus muutettu
+text_rmagick_available: RMagick saatavilla (valinnainen)
+button_configure: Asetukset
+label_plugins: Lisäosat
+label_ldap_authentication: LDAP autentikointi
 label_downloads_abbr: D/L
+label_add_another_file: Add another file
 label_this_month: this month
+label_date_to: To
+text_destroy_time_entries_question: %.02f hours were reported on the issues you are about to delete. What do you want to do ?
+label_date_from: From
 label_last_n_days: last %d days
 label_all_time: all time
+label_in: in
+error_issue_not_found_in_project: 'The issue was not found or does not belong to this project'
 label_this_year: this year
+text_assign_time_entries_to_project: Assign reported hours to the project
 label_date_range: Date range
 label_last_week: last week
 label_yesterday: yesterday
-label_last_month: last month
-label_add_another_file: Add another file
 label_optional_description: Optional description
-text_destroy_time_entries_question: %.02f hours were reported on the issues you are about to delete. What do you want to do ?
-error_issue_not_found_in_project: 'The issue was not found or does not belong to this project'
-text_assign_time_entries_to_project: Assign reported hours to the project
+label_last_month: last month
 text_destroy_time_entries: Delete reported hours
 text_reassign_time_entries: 'Reassign reported hours to this issue:'
+label_on: 'on'
diff --git a/lang/ja.yml b/lang/ja.yml
index d652f4b19..1c25b1a3f 100644
--- a/lang/ja.yml
+++ b/lang/ja.yml
@@ -7,7 +7,7 @@ actionview_datehelper_select_month_prefix:
 actionview_datehelper_select_year_prefix:
 actionview_datehelper_select_year_suffix: 月
 actionview_datehelper_time_in_words_day: 1日
-actionview_datehelper_time_in_words_day_plural: %d日間
+actionview_datehelper_time_in_words_day_plural: %d日
 actionview_datehelper_time_in_words_hour_about: 約1時間
 actionview_datehelper_time_in_words_hour_about_plural: 約%d時間
 actionview_datehelper_time_in_words_hour_about_single: 約1時間
@@ -75,7 +75,7 @@ notice_email_error: メール送信中にエラーが発生しました(%s)
 notice_feeds_access_key_reseted: RSSアクセスキーを初期化しました。
 
 error_scm_not_found: リポジトリに、エントリ/リビジョンが存在しません。
-error_scm_command_failed: "An error occurred when trying to access the repository: %s"
+error_scm_command_failed: "リポジトリへアクセスしようとしてエラーになりました: %s"
 
 mail_subject_lost_password: Redmineパスワード
 mail_body_lost_password: 'パスワードを変更するには、以下のリンクをたどってください:'
@@ -108,10 +108,10 @@ field_value: 値
 field_category: カテゴリ
 field_title: タイトル
 field_project: プロジェクト
-field_issue: 問題
+field_issue: チケット
 field_status: ステータス
 field_notes: 注記
-field_is_closed: 終了した問題
+field_is_closed: 終了したチケット
 field_is_default: デフォルトのステータス
 field_tracker: トラッカー
 field_subject: 題名
@@ -124,8 +124,8 @@ field_role: 役割
 field_homepage: ホームページ
 field_is_public: 公開
 field_parent: 親プロジェクト名
-field_is_in_chlog: 変更記録に表示されている問題
-field_is_in_roadmap: ロードマップに表示されている問題
+field_is_in_chlog: 変更記録に表示されているチケット
+field_is_in_roadmap: ロードマップに表示されているチケット
 field_login: ログイン
 field_mail_notification: メール通知
 field_admin: 管理者
@@ -159,9 +159,9 @@ field_activity: 活動
 field_spent_on: 日付
 field_identifier: 識別子
 field_is_filter: フィルタとして使う
-field_issue_to_id: 関連する問題
+field_issue_to_id: 関連するチケット
 field_delay: 遅延
-field_assignable: 問題はこのロールに割り当てることができます
+field_assignable: チケットはこのロールに割り当てることができます
 field_redirect_existing_links: 既存のリンクをリダイレクトする
 field_estimated_hours: 予定工数
 field_default_value: デフォルトのステータス
@@ -173,7 +173,7 @@ setting_default_language: 既定の言語
 setting_login_required: 認証が必要
 setting_self_registration: ユーザは自分で登録できる
 setting_attachment_max_size: 添付の最大サイズ
-setting_issues_export_limit: 出力する問題数の上限
+setting_issues_export_limit: 出力するチケット数の上限
 setting_mail_from: 送信元メールアドレス
 setting_host_name: ホスト名
 setting_text_formatting: テキストの書式
@@ -185,7 +185,7 @@ setting_commit_ref_keywords: 参照用キーワード
 setting_commit_fix_keywords: 修正用キーワード
 setting_autologin: 自動ログイン
 setting_date_format: 日付の形式
-setting_cross_project_issue_relations: 異なるプロジェクトの問題間で関係の設定を許可
+setting_cross_project_issue_relations: 異なるプロジェクトのチケット間で関係の設定を許可
 
 label_user: ユーザ
 label_user_plural: ユーザ
@@ -195,10 +195,10 @@ label_project_new: 新しいプロジェクト
 label_project_plural: プロジェクト
 label_project_all: 全プロジェクト
 label_project_latest: 最近のプロジェクト
-label_issue: 問題
-label_issue_new: 新しい問題
-label_issue_plural: 問題
-label_issue_view_all: 問題を全て見る
+label_issue: チケット
+label_issue_new: 新しいチケット
+label_issue_plural: チケット
+label_issue_view_all: チケットを全て見る
 label_document: 文書
 label_document_new: 新しい文書
 label_document_plural: 文書
@@ -213,11 +213,11 @@ label_tracker: トラッカー
 label_tracker_plural: トラッカー
 label_tracker_new: 新しいトラッカーを作成
 label_workflow: ワークフロー
-label_issue_status: 問題のステータス
-label_issue_status_plural: 問題のステータス
+label_issue_status: チケットのステータス
+label_issue_status_plural: チケットのステータス
 label_issue_status_new: 新しいステータス
-label_issue_category: 問題のカテゴリ
-label_issue_category_plural: 問題のカテゴリ
+label_issue_category: チケットのカテゴリ
+label_issue_category_plural: チケットのカテゴリ
 label_issue_category_new: 新しいカテゴリ
 label_custom_field: カスタムフィールド
 label_custom_field_plural: カスタムフィールド
@@ -237,8 +237,8 @@ label_administration: 管理
 label_login: ログイン
 label_logout: ログアウト
 label_help: ヘルプ
-label_reported_issues: 報告した問題
-label_assigned_to_me_issues: 担当している問題
+label_reported_issues: 報告したチケット
+label_assigned_to_me_issues: 担当しているチケット
 label_last_login: 最近の接続
 label_last_updates: 最近の更新1件
 label_last_updates_plural: 最近の更新%d件
@@ -326,7 +326,7 @@ label_in_less_than: 残日数がこれより多い
 label_in_more_than: 残日数がこれより少ない
 label_in: 残日数
 label_today: 今日
-label_this_week: this week
+label_this_week: この週
 label_less_than_ago: 経過日数がこれより少ない
 label_more_than_ago: 経過日数がこれより多い
 label_ago: 日前
@@ -354,7 +354,7 @@ label_sort_lowest: 一番下へ
 label_roadmap: ロードマップ
 label_roadmap_due_in: 期日まで
 label_roadmap_overdue: %s late
-label_roadmap_no_issues: このバージョンに向けての問題はありません
+label_roadmap_no_issues: このバージョンに向けてのチケットはありません
 label_search: 検索
 label_result_plural: 結果
 label_all_words: すべての単語
@@ -363,13 +363,13 @@ label_wiki_edit: Wiki編集
 label_wiki_edit_plural: Wiki編集
 label_wiki_page: Wiki page
 label_wiki_page_plural: Wikiページ
-label_index_by_title: 索引
-label_index_by_date: Index by date
+label_index_by_title: 索引(名前順)
+label_index_by_date: 索引(日付順)
 label_current_version: 最新版
 label_preview: プレビュー
 label_feed_plural: フィード
 label_changes_details: 全変更の詳細
-label_issue_tracking: 問題トラッキング
+label_issue_tracking: チケットトラッキング
 label_spent_time: 経過時間
 label_f_hour: %.2f 時間
 label_f_hour_plural: %.2f 時間
@@ -384,8 +384,8 @@ label_diff_side_by_side: 横に並べる
 label_options: オプション
 label_copy_workflow_from: ワークフローをここからコピー
 label_permissions_report: 権限レポート
-label_watched_issues: ウォッチ中の問題
-label_related_issues: 関連する問題
+label_watched_issues: ウォッチ中のチケット
+label_related_issues: 関連するチケット
 label_applied_status: 適用されたステータス
 label_loading: ロード中...
 label_relation_new: 新しい関連
@@ -416,8 +416,8 @@ label_send_information: アカウント情報をユーザに送信
 label_year: 年
 label_month: 月
 label_week: 週
-label_date_from: から
-label_date_to: まで
+label_date_from: "日付指定: "
+label_date_to: から
 label_language_based: 既定の言語の設定に従う
 label_sort_by: %sで並び替え
 label_send_test_email: テストメールを送信
@@ -482,13 +482,13 @@ text_length_between: 長さは %d から %d 文字までです。
 text_tracker_no_workflow: このトラッカーにワークフローが定義されていません
 text_unallowed_characters: 使えない文字です
 text_comma_separated: (カンマで区切った)複数の値が使えます
-text_issues_ref_in_commit_messages: コミットメッセージ内で問題の参照/修正
-text_issue_added: 問題 %s が報告されました。 (by %s)
-text_issue_updated: 問題 %s が更新されました。 (by %s)
+text_issues_ref_in_commit_messages: コミットメッセージ内でチケットの参照/修正
+text_issue_added: チケット %s が報告されました。 (by %s)
+text_issue_updated: チケット %s が更新されました。 (by %s)
 text_wiki_destroy_confirmation: 本当にこのwikiとその内容の全てを削除しますか？
-text_issue_category_destroy_question: このカテゴリに割り当て済みの問題(%d)があります。何をしようとしていますか？
+text_issue_category_destroy_question: このカテゴリに割り当て済みのチケット(%d)があります。何をしようとしていますか？
 text_issue_category_destroy_assignments: カテゴリの割り当てを削除する
-text_issue_category_reassign_to: 問題をこのカテゴリに再割り当てする
+text_issue_category_reassign_to: チケットをこのカテゴリに再割り当てする
 
 default_role_manager: 管理者
 default_role_developper: 開発者
@@ -512,28 +512,28 @@ default_priority_immediate: 今すぐ
 default_activity_design: デザイン作業
 default_activity_development: 開発作業
 
-enumeration_issue_priorities: 問題の優先度
+enumeration_issue_priorities: チケットの優先度
 enumeration_doc_categories: 文書カテゴリ
 enumeration_activities: 作業分類 (時間トラッキング)
 label_file_plural: ファイル
 label_changeset_plural: チェンジセット
 field_column_names: 項目
 label_default_columns: 既定の項目
-setting_issue_list_default_columns: 問題の一覧で表示する項目
+setting_issue_list_default_columns: チケットの一覧で表示する項目
 setting_repositories_encodings: リポジトリのエンコーディング
-notice_no_issue_selected: "問題が選択されていません! 更新対象の問題を選択してください。"
-label_bulk_edit_selected_issues: 問題の一括編集
+notice_no_issue_selected: "チケットが選択されていません! 更新対象のチケットを選択してください。"
+label_bulk_edit_selected_issues: チケットの一括編集
 label_no_change_option: (変更無し)
-notice_failed_to_save_issues: "%d件の問題が保存できませんでした(%d件選択のうち) : %s."
+notice_failed_to_save_issues: "%d件のチケットが保存できませんでした(%d件選択のうち) : %s."
 label_theme: テーマ
 label_default: 既定
 label_search_titles_only: タイトルのみ
 label_nobody: nobody
 button_change_password: パスワード変更
-text_user_mail_option: "未選択のプロジェクトでは、ウォッチまたは関係している問題(例: 自分が報告者もしくは担当者である問題)のみメールが送信されます。"
+text_user_mail_option: "未選択のプロジェクトでは、ウォッチまたは関係しているチケット(例: 自分が報告者もしくは担当者であるチケット)のみメールが送信されます。"
 label_user_mail_option_selected: "選択したプロジェクト..."
-label_user_mail_option_all: "参加しているプロジェクトの全ての問題"
-label_user_mail_option_none: "ウォッチまたは関係している問題のみ"
+label_user_mail_option_all: "参加しているプロジェクトの全てのチケット"
+label_user_mail_option_none: "ウォッチまたは関係しているチケットのみ"
 setting_emails_footer: メールのフッタ
 label_float: 小数
 button_copy: コピー
@@ -552,59 +552,59 @@ field_time_zone: タイムゾーン
 text_caracters_minimum: 最低%d文字の長さが必要です
 setting_bcc_recipients: ブラインドカーボンコピーで受信(bcc)
 button_annotate: 注釈
-label_issues_by: %s別の問題
+label_issues_by: %s別のチケット
 field_searchable: Searchable
-label_display_per_page: 'Per page: %s'
-setting_per_page_options: Objects per page options
-label_age: Age
-notice_default_data_loaded: Default configuration successfully loaded.
-text_load_default_configuration: Load the default configuration
-text_no_configuration_data: "Roles, trackers, issue statuses and workflow have not been configured yet.\nIt is highly recommended to load the default configuration. You will be able to modify it once loaded."
-error_can_t_load_default_data: "Default configuration could not be loaded: %s"
-button_update: Update
-label_change_properties: Change properties
-label_general: General
-label_repository_plural: Repositories
-label_associated_revisions: Associated revisions
-setting_user_format: Users display format
-text_status_changed_by_changeset: Applied in changeset %s.
-label_more: More
-text_issues_destroy_confirmation: 'Are you sure you want to delete the selected issue(s) ?'
+label_display_per_page: '1ページに: %s'
+setting_per_page_options: ページ毎の表示件数
+label_age: 年齢
+notice_default_data_loaded: デフォルト設定をロードしました。
+text_load_default_configuration: デフォルト設定をロード
+text_no_configuration_data: "ロール、トラッカー、チケットのステータス、ワークフローがまだ設定されていません。\nデフォルト設定のロードを強くお勧めします。ロードした後、それを修正することができます。"
+error_can_t_load_default_data: "デフォルト設定がロードできませんでした: %s"
+button_update: 更新
+label_change_properties: プロパティの変更
+label_general: 全般
+label_repository_plural: リポジトリ
+label_associated_revisions: 関係しているリビジョン
+setting_user_format: ユーザ名の表示書式
+text_status_changed_by_changeset: チェンジセット%sで適用されました。
+label_more: 続き
+text_issues_destroy_confirmation: '本当に選択したチケットを削除しますか？'
 label_scm: SCM
-text_select_project_modules: 'Select modules to enable for this project:'
-label_issue_added: Issue added
-label_issue_updated: Issue updated
-label_document_added: Document added
-label_message_posted: Message added
-label_file_added: File added
-label_news_added: News added
-project_module_boards: Boards
-project_module_issue_tracking: Issue tracking
+text_select_project_modules: 'このプロジェクトで使用するモジュールを選択してください:'
+label_issue_added: チケットが追加されました
+label_issue_updated: チケットが更新されました
+label_document_added: 文書が追加されました
+label_message_posted: メッセージが追加されました
+label_file_added: ファイルが追加されました
+label_news_added: ニュースが追加されました
+project_module_boards: フォーラム
+project_module_issue_tracking: チケットトラッキング
 project_module_wiki: Wiki
-project_module_files: Files
-project_module_documents: Documents
-project_module_repository: Repository
-project_module_news: News
-project_module_time_tracking: Time tracking
-text_file_repository_writable: File repository writable
-text_default_administrator_account_changed: Default administrator account changed
-text_rmagick_available: RMagick available (optional)
-button_configure: Configure
-label_plugins: Plugins
-label_ldap_authentication: LDAP authentication
-label_downloads_abbr: D/L
-label_this_month: this month
-label_last_n_days: last %d days
-label_all_time: all time
-label_this_year: this year
-label_date_range: Date range
-label_last_week: last week
-label_yesterday: yesterday
-label_last_month: last month
+project_module_files: ファイル
+project_module_documents: 文書
+project_module_repository: リポジトリ
+project_module_news: ニュース
+project_module_time_tracking: 時間トラッキング
+text_file_repository_writable: ファイルリポジトリに書き込み可能
+text_default_administrator_account_changed: デフォルト管理アカウントが変更済
+text_rmagick_available: RMagickが使用可能 (オプション)
+button_configure: 設定
+label_plugins: プラグイン
+label_ldap_authentication: LDAP認証
+label_downloads_abbr: DL
+label_this_month: 今月
+label_last_n_days: 最後の%d日間
+label_all_time: 全期間
+label_this_year: 今年
+label_date_range: 日付の範囲
+label_last_week: 先週
+label_yesterday: 昨日
+label_last_month: 先月
 label_add_another_file: Add another file
-label_optional_description: Optional description
 text_destroy_time_entries_question: %.02f hours were reported on the issues you are about to delete. What do you want to do ?
 error_issue_not_found_in_project: 'The issue was not found or does not belong to this project'
 text_assign_time_entries_to_project: Assign reported hours to the project
+label_optional_description: Optional description
 text_destroy_time_entries: Delete reported hours
 text_reassign_time_entries: 'Reassign reported hours to this issue:'
diff --git a/lang/ko.yml b/lang/ko.yml
index 12fa4b8fb..267560a6d 100644
--- a/lang/ko.yml
+++ b/lang/ko.yml
@@ -73,7 +73,7 @@ notice_email_sent: %s 님에게 Email이 발송되었습니다.
 notice_email_error: 메일을 전송하는 과정에 오류가 발생했습니다. (%s)
 notice_feeds_access_key_reseted: RSS에 접근가능한 열쇠(key)가 생성되었습니다.
 notice_failed_to_save_issues: "Failed to save %d issue(s) on %d selected: %s."
-notice_no_issue_selected: "티켓이 선택되지 않았습니다. 수정하기 원하는 티켓을 선택하세요"
+notice_no_issue_selected: "이슈가 선택되지 않았습니다. 수정하기 원하는 이슈를 선택하세요"
 
 error_scm_not_found: 소스 저장소에 해당 내용이 존재하지 않습니다.
 error_scm_command_failed: "An error occurred when trying to access the repository: %s"
@@ -109,10 +109,10 @@ field_value: 값
 field_category: 카테고리
 field_title: 제목
 field_project: 프로젝트
-field_issue: 티켓
+field_issue: 이슈
 field_status: 상태
 field_notes: 노트
-field_is_closed: 완료된 티켓
+field_is_closed: 완료된 이슈
 field_is_default: 기본값
 field_tracker: 구분
 field_subject: 제목
@@ -125,8 +125,8 @@ field_role: 역할
 field_homepage: 홈페이지
 field_is_public: 공개
 field_parent: 상위 프로젝트
-field_is_in_chlog: 변경이력(changelog)에서 보여지는 티켓들
-field_is_in_roadmap: 로드맵에서 보여지는 티켓들
+field_is_in_chlog: 변경이력(changelog)에서 보여지는 이슈들
+field_is_in_roadmap: 로드맵에서 보여지는 이슈들
 field_login: 로그인
 field_mail_notification: 메일 알림
 field_admin: 관리자
@@ -160,9 +160,9 @@ field_activity: 작업종류
 field_spent_on: 작업시간
 field_identifier: 식별자
 field_is_filter: 필터로 사용됨
-field_issue_to_id: 연관된 티켓
+field_issue_to_id: 연관된 이슈
 field_delay: 지연
-field_assignable: 이 역할에 할당될수 있는 티켓
+field_assignable: 이 역할에 할당될수 있는 이슈
 field_redirect_existing_links: Redirect existing links
 field_estimated_hours: 추정시간
 field_column_names: 컬럼
@@ -183,12 +183,12 @@ setting_wiki_compression: 위키 기록(history) 압축
 setting_feeds_limit: Feed content limit
 setting_autofetch_changesets: Autofetch commits
 setting_sys_api_enabled: Enable WS for repository management
-setting_commit_ref_keywords: 티켓 참조에 사용할 키워드들
-setting_commit_fix_keywords: 티켓 해결에 사용할 키워드들 
+setting_commit_ref_keywords: 이슈 참조에 사용할 키워드들
+setting_commit_fix_keywords: 이슈 해결에 사용할 키워드들 
 setting_autologin: 자동 로그인
 setting_date_format: 날짜 형식
-setting_cross_project_issue_relations: 프로젝트 간에 이슈에 관련을 맺는 것을 허용
-setting_issue_list_default_columns: 티켓 목록에 보여줄 기본 컬럼들 
+setting_cross_project_issue_relations: 프로젝트간 이슈에 관련을 맺는 것을 허용
+setting_issue_list_default_columns: 이슈 목록에 보여줄 기본 컬럼들 
 setting_repositories_encodings:  저장소 인코딩
 setting_emails_footer: 메일 꼬리
 
@@ -200,10 +200,10 @@ label_project_new: 신규 프로젝트
 label_project_plural: 프로젝트
 label_project_all: 모든 프로젝트
 label_project_latest: 최근 프로젝트
-label_issue: 티켓 보기
-label_issue_new: 새 티켓만들기
-label_issue_plural: 티켓 보기
-label_issue_view_all: 모든 티켓 보기
+label_issue: 이슈 보기
+label_issue_new: 새 이슈만들기
+label_issue_plural: 이슈 보기
+label_issue_view_all: 모든 이슈 보기
 label_document: 문서
 label_document_new: 새로운 문서
 label_document_plural: 문서
@@ -214,13 +214,13 @@ label_role_and_permissions: 권한관리
 label_member: 담당자
 label_member_new: 새로운 담당자
 label_member_plural: 담당자
-label_tracker: 티켓 유형
-label_tracker_plural: 티켓 유형
-label_tracker_new: 새로운 티켓 유형
+label_tracker: 이슈 유형
+label_tracker_plural: 이슈 유형
+label_tracker_new: 새로운 이슈 유형
 label_workflow: 워크플로(Workflow)
-label_issue_status: 티켓 상태
-label_issue_status_plural: 티켓 상태
-label_issue_status_new: 새로운 티켓 상태
+label_issue_status: 이슈 상태
+label_issue_status_plural: 이슈 상태
+label_issue_status_new: 새로운 이슈 상태
 label_issue_category: 카테고리
 label_issue_category_plural: 카테고리
 label_issue_category_new: 새 카테고리
@@ -242,8 +242,8 @@ label_administration: 관리자
 label_login: 로그인
 label_logout: 로그아웃
 label_help: 도움말
-label_reported_issues: 보고된 티켓
-label_assigned_to_me_issues: 나에게 할당된 티켓
+label_reported_issues: 보고된 이슈
+label_assigned_to_me_issues: 나에게 할당된 이슈
 label_last_login: 최종 접속
 label_last_updates: 최종 변경 내역
 label_last_updates_plural: 최종변경 %d 
@@ -299,15 +299,15 @@ label_closed_issues: 완료됨
 label_closed_issues_plural: 완료됨
 label_total: Total
 label_permissions: 허가권한
-label_current_status: 티켓 상태
-label_new_statuses_allowed: 허용되는 티켓 상태
+label_current_status: 이슈 상태
+label_new_statuses_allowed: 허용되는 이슈 상태
 label_all: 모두
 label_none: 없음
 label_next: 다음
 label_previous: 이전
 label_used_by: 사용됨
 label_details: 상세
-label_add_note: 티켓노트 추가
+label_add_note: 이슈노트 추가
 label_per_page: 페이지별
 label_calendar: 달력
 label_months_from: 개월 동안 | 다음부터 
@@ -360,7 +360,7 @@ label_sort_lowest: 최하단으로
 label_roadmap: 로드맵
 label_roadmap_due_in: 기한 
 label_roadmap_overdue: %s 지연
-label_roadmap_no_issues: 이버전에 해당하는 티켓 없음
+label_roadmap_no_issues: 이버전에 해당하는 이슈 없음
 label_search: 검색
 label_result_plural: 결과
 label_all_words: 모든 단어
@@ -375,7 +375,7 @@ label_current_version: 현재 버전
 label_preview: 미리보기
 label_feed_plural: 피드(Feeds)
 label_changes_details: 모든 상세 변경 내역
-label_issue_tracking: 티켓 추적
+label_issue_tracking: 이슈 추적
 label_spent_time: 작업 시간
 label_f_hour: %.2f 시간
 label_f_hour_plural: %.2f 시간
@@ -390,18 +390,18 @@ label_diff_side_by_side: 두줄로
 label_options: Options
 label_copy_workflow_from: Copy workflow from
 label_permissions_report: 권한 보고서
-label_watched_issues: 감시중인 티켓
-label_related_issues: 연결된 티켓
+label_watched_issues: 감시중인 이슈
+label_related_issues: 연결된 이슈
 label_applied_status: Applied status
 label_loading: 읽는 중...
 label_relation_new: New relation
 label_relation_delete: Delete relation
-label_relates_to: 다음 티켓과 관련되어 있음
-label_duplicates: 다음 티켓과 중복됨.
-label_blocks: 다음 티켓을 해결을 막고 있음.
-label_blocked_by: 막고 있는 티켓
-label_precedes: 다음 티켓보다 앞서서 처리해야 함.
-label_follows: 선처리티켓
+label_relates_to: 다음 이슈와 관련되어 있음
+label_duplicates: 다음 이슈와 중복됨.
+label_blocks: 다음 이슈가 해결을 막고 있음.
+label_blocked_by: 막고 있는 이슈
+label_precedes: 다음 이슈보다 앞서서 처리해야 함.
+label_follows: 선처리 이슈
 label_end_to_start: end to start
 label_end_to_end: end to end
 label_start_to_start: start to start
@@ -436,7 +436,7 @@ label_file_plural: 파일
 label_changeset_plural: 변경사항
 label_default_columns: 기본 컬럼
 label_no_change_option: (수정 안함)
-label_bulk_edit_selected_issues: 선택된 티켓들을 한꺼번에 수정하기
+label_bulk_edit_selected_issues: 선택된 이슈들을 한꺼번에 수정하기
 label_theme: 테마
 label_default: 기본
 label_search_titles_only: 제목에서만 찾기
@@ -485,7 +485,7 @@ text_select_mail_notifications: 알림메일이 필요한 작업을 선택하세
 text_regexp_info: 예) ^[A-Z0-9]+$
 text_min_max_length_info: 0 는 제한이 없음을 의미함
 text_project_destroy_confirmation: 이 프로젝트를 삭제하고 모든 데이터를 지우시겠습니까?
-text_workflow_edit: 워크플로를 수정하기 위해서 역할과 티켓유형을 선택하세요.
+text_workflow_edit: 워크플로를 수정하기 위해서 역할과 이슈유형을 선택하세요.
 text_are_you_sure: 계속 진행 하시겠습니까?
 text_journal_changed: %s에서 %s(으)로 변경
 text_journal_set_to:  %s로 설정
@@ -499,14 +499,14 @@ text_length_between: %d 에서 %d 글자
 text_tracker_no_workflow: 이 추적타입(tracker)에 워크플로우가 정의되지 않았습니다.
 text_unallowed_characters: 허용되지 않는 문자열
 text_comma_separated: 복수의 값들이 허용됩니다.(구분자 ,)
-text_issues_ref_in_commit_messages: 커밋메시지에서 티켓을 참조하거나 해결하기
-text_issue_added: 티켓[%s]이 보고되었습니다 (by %s).
-text_issue_updated: 티켓[%s]이 수정되었습니다 (by %s).
+text_issues_ref_in_commit_messages: 커밋메시지에서 이슈를 참조하거나 해결하기
+text_issue_added: 이슈[%s]가 보고되었습니다.
+text_issue_updated: 이슈[%s]가 수정되었습니다.
 text_wiki_destroy_confirmation: 이 위키와 모든 내용을 지우시겠습니까?
-text_issue_category_destroy_question: 일부 티켓들(%d개)이 이 카테고리에 할당되어 있습니다. 어떻게 하시겠습니까?
+text_issue_category_destroy_question: 일부 이슈들(%d개)이 이 카테고리에 할당되어 있습니다. 어떻게 하시겠습니까?
 text_issue_category_destroy_assignments: 카테고리 할당 지우기
-text_issue_category_reassign_to: 티켓을 이 카테고리에 다시 할당하기
-text_user_mail_option: "선택하지 않은 프로젝트에서도, 모니터링 중이거나 속해있는 사항(티켓을 발행했거나 할당된 경우)이 있으면 알림메일을 받게 됩니다."
+text_issue_category_reassign_to: 이슈를 이 카테고리에 다시 할당하기
+text_user_mail_option: "선택하지 않은 프로젝트에서도, 모니터링 중이거나 속해있는 사항(이슈를 발행했거나 할당된 경우)이 있으면 알림메일을 받게 됩니다."
 
 default_role_manager: 관리자
 default_role_developper: 개발자
@@ -530,7 +530,7 @@ default_priority_immediate: 즉시
 default_activity_design: 설계
 default_activity_development: 개발
 
-enumeration_issue_priorities: 티켓 우선순위
+enumeration_issue_priorities: 이슈 우선순위
 enumeration_doc_categories: 문서 카테고리
 enumeration_activities: 진행활동(시간 추적)
 button_copy: 복사
@@ -558,7 +558,7 @@ setting_per_page_options: Objects per page options
 label_age: Age
 notice_default_data_loaded: 기본 설정을 성공적으로 로드하였습니다.
 text_load_default_configuration: 기본 설정을 로딩하기
-text_no_configuration_data: "역할, 티켓타입, 티켓 상태들과 워크플로가 아직 설정되지 않았습니다.\n기본 설정을 로딩하는 것을 권장합니다. 로드된 후에 수정할 수 있습니다."
+text_no_configuration_data: "역할, 이슈 타입, 이슈 상태들과 워크플로가 아직 설정되지 않았습니다.\n기본 설정을 로딩하는 것을 권장합니다. 로드된 후에 수정할 수 있습니다."
 error_can_t_load_default_data: "기본 설정을 로드할 수 없습니다.: %s"
 button_update: 변경사항기록
 label_change_properties: 속성 변경
@@ -568,42 +568,42 @@ label_associated_revisions: Associated revisions
 setting_user_format: Users display format
 text_status_changed_by_changeset: Applied in changeset %s.
 label_more: More
-text_issues_destroy_confirmation: 'Are you sure you want to delete the selected issue(s) ?'
+text_issues_destroy_confirmation: '선택한 이슈를 정말로 삭제하시겠습니까?'
 label_scm: SCM
-text_select_project_modules: 'Select modules to enable for this project:'
+text_select_project_modules: '이 프로젝트에서 활성화시킬 모듈을 선택하세요:'
 label_issue_added: Issue added
 label_issue_updated: Issue updated
 label_document_added: Document added
 label_message_posted: Message added
 label_file_added: File added
 label_news_added: News added
-project_module_boards: Boards
-project_module_issue_tracking: Issue tracking
-project_module_wiki: Wiki
-project_module_files: Files
-project_module_documents: Documents
-project_module_repository: Repository
-project_module_news: News
+project_module_boards: 게시판
+project_module_issue_tracking: 이슈관리
+project_module_wiki: 위키
+project_module_files: 관련파일
+project_module_documents: 문서
+project_module_repository: 저장소
+project_module_news: 뉴스
 project_module_time_tracking: Time tracking
 text_file_repository_writable: File repository writable
-text_default_administrator_account_changed: Default administrator account changed
+text_default_administrator_account_changed: 기본 관리자 계정이 변경되었습니다.
 text_rmagick_available: RMagick available (optional)
-button_configure: Configure
-label_plugins: Plugins
-label_ldap_authentication: LDAP authentication
+button_configure: 설정
+label_plugins: 플러그인
+label_ldap_authentication: LDAP 인증
 label_downloads_abbr: D/L
+label_add_another_file: Add another file
 label_this_month: this month
+text_destroy_time_entries_question: %.02f hours were reported on the issues you are about to delete. What do you want to do ?
 label_last_n_days: last %d days
 label_all_time: all time
+error_issue_not_found_in_project: 'The issue was not found or does not belong to this project'
 label_this_year: this year
+text_assign_time_entries_to_project: Assign reported hours to the project
 label_date_range: Date range
 label_last_week: last week
 label_yesterday: yesterday
-label_last_month: last month
-label_add_another_file: Add another file
 label_optional_description: Optional description
-text_destroy_time_entries_question: %.02f hours were reported on the issues you are about to delete. What do you want to do ?
-error_issue_not_found_in_project: 'The issue was not found or does not belong to this project'
-text_assign_time_entries_to_project: Assign reported hours to the project
+label_last_month: last month
 text_destroy_time_entries: Delete reported hours
 text_reassign_time_entries: 'Reassign reported hours to this issue:'
diff --git a/lang/ru.yml b/lang/ru.yml
index 93fbd3b74..a92105ca4 100644
--- a/lang/ru.yml
+++ b/lang/ru.yml
@@ -438,8 +438,8 @@ label_send_information: Отправить пользователю информ
 label_year: Год
 label_month: Месяц
 label_week: Неделя
-label_date_from: От
-label_date_to: Кому
+label_date_from: С
+label_date_to: По
 label_language_based: На основе языка
 label_sort_by: Сортировать по %s
 label_send_test_email: Послать email для проверки
@@ -581,33 +581,33 @@ label_news_added: Новость добавлена
 label_calendar_filter: Включая
 label_calendar_no_assigned: не мои
 label_timelog_today: Расход времени за сегодня
-project_module_boards: Boards
-project_module_issue_tracking: Issue tracking
+project_module_boards: Форумы 
+project_module_issue_tracking: Задачи
 project_module_wiki: Wiki
-project_module_files: Files
-project_module_documents: Documents
-project_module_repository: Repository
-project_module_news: News
-project_module_time_tracking: Time tracking
-text_file_repository_writable: File repository writable
-text_default_administrator_account_changed: Default administrator account changed
-text_rmagick_available: RMagick available (optional)
-button_configure: Configure
-label_plugins: Plugins
-label_ldap_authentication: LDAP authentication
-label_downloads_abbr: D/L
-label_this_month: this month
-label_last_n_days: last %d days
-label_all_time: all time
-label_this_year: this year
-label_date_range: Date range
-label_last_week: last week
-label_yesterday: yesterday
-label_last_month: last month
-label_add_another_file: Add another file
-label_optional_description: Optional description
-text_destroy_time_entries_question: %.02f hours were reported on the issues you are about to delete. What do you want to do ?
-error_issue_not_found_in_project: 'The issue was not found or does not belong to this project'
-text_assign_time_entries_to_project: Assign reported hours to the project
-text_destroy_time_entries: Delete reported hours
-text_reassign_time_entries: 'Reassign reported hours to this issue:'
+project_module_files: Файлы
+project_module_documents: Документы
+project_module_repository: Харнилище
+project_module_news: Новостной блок
+project_module_time_tracking: Учет времени
+text_file_repository_writable: Хранилище с доступом на запись
+text_default_administrator_account_changed: Учетная запись администратора по умолчанию изменена
+text_rmagick_available: Доступно использование RMagick (выборочно)
+button_configure: Параметры
+label_plugins: Модули
+label_ldap_authentication: Авторизация посредством LDAP
+label_downloads_abbr: Скачек
+label_this_month: этот месяц
+label_last_n_days: последние %d дней
+label_all_time: всё время
+label_this_year: этот год
+label_date_range: временной интервал
+label_last_week: последняя неделю
+label_yesterday: вчера
+label_last_month: последний месяц
+label_add_another_file: Добавить ещё один  файл
+label_optional_description: Описание (выборочно)
+text_destroy_time_entries_question: Вы собираетесь удалить %.02f часа(ов) прикрепленных за этой задачей.
+error_issue_not_found_in_project: Задача не была найдена или не прикреплена к этому проекту
+text_assign_time_entries_to_project: Прикрепить зарегистрированное время к проекту
+text_destroy_time_entries: Удалить зарегистрированное время
+text_reassign_time_entries: 'Перенести зарегистрированное время на следующую задачу:'
diff --git a/lang/zh-tw.yml b/lang/zh-tw.yml
index 070aa290c..58088d84f 100644
--- a/lang/zh-tw.yml
+++ b/lang/zh-tw.yml
@@ -80,6 +80,7 @@ notice_default_data_loaded: 預設組態已載入成功。
 error_can_t_load_default_data: "無法載入預設組態： %s"
 error_scm_not_found: SCM 儲存庫中找不到這個專案與(或)版本。
 error_scm_command_failed: "嘗試存取儲存庫時發生錯誤：: %s"
+error_issue_not_found_in_project: '該項目不存在或不屬於此專案'
 
 mail_subject_lost_password: 您的 Redmine 網站密碼
 mail_body_lost_password: '欲變更您的 Redmine 網站密碼, 請點選以下鏈結:'
@@ -206,6 +207,15 @@ setting_protocol: 協定
 setting_per_page_options: 每頁顯示個數選項
 setting_user_format: 使用者顯示格式
 
+project_module_issue_tracking: 項目追蹤
+project_module_time_tracking: 工時追蹤
+project_module_news: 新聞
+project_module_documents: 文件
+project_module_files: 檔案
+project_module_wiki: Wiki
+project_module_repository: 版本控管
+project_module_boards: 討論區
+
 label_user: 用戶
 label_user_plural: 用戶清單
 label_user_new: 建立新的帳戶
@@ -353,7 +363,15 @@ label_in_less_than: 在小於
 label_in_more_than: 在大於
 label_in: 在
 label_today: 今天
+label_all_time: all time
+label_yesterday: 昨天
 label_this_week: 本週
+label_last_week: 上週
+label_last_n_days: 過去 %d 天
+label_this_month: 這個月
+label_last_month: 上個月
+label_this_year: 今年
+label_date_range: 日期區間
 label_less_than_ago: 小於幾天之前
 label_more_than_ago: 大於幾天之前
 label_ago: 天以前
@@ -477,6 +495,11 @@ label_change_properties: 變更屬性
 label_general: 一般
 label_more: 更多 »
 label_scm: 版本控管
+label_plugins: 附加元件
+label_ldap_authentication: LDAP 認證
+label_downloads_abbr: 下載
+label_optional_description: 額外的說明
+label_add_another_file: 增加其他檔案
 
 button_login: 登入
 button_submit: 送出
@@ -514,6 +537,7 @@ button_change_password: 變更密碼
 button_copy: 複製
 button_annotate: 加注
 button_update: 更新
+button_configure: 設定
 
 status_active: 活動中
 status_registered: 註冊完成
@@ -551,6 +575,13 @@ text_load_default_configuration: 載入預設組態
 text_status_changed_by_changeset: 已套用至變更集 %s.
 text_issues_destroy_confirmation: '確定刪除已選擇的項目？'
 text_select_project_modules: '選擇此專案可使用之模組：'
+text_default_administrator_account_changed: 已變更預設管理員帳號內容
+text_file_repository_writable: 可寫入檔案
+text_rmagick_available: 可使用 RMagick (選配)
+text_destroy_time_entries_question: 您即將刪除的項目已報工 %.02f 小時. 您的選擇是？
+text_destroy_time_entries: 刪除已報工的時數
+text_assign_time_entries_to_project: 指定已報工的時數至專案中
+text_reassign_time_entries: '重新指定已報工的時數至此項目：'
 
 default_role_manager: 管理人員
 default_role_developper: 開發人員
@@ -577,33 +608,3 @@ default_activity_development: 開發
 enumeration_issue_priorities: 項目優先權
 enumeration_doc_categories: 文件分類
 enumeration_activities: 活動 (time tracking)
-project_module_boards: Boards
-project_module_issue_tracking: Issue tracking
-project_module_wiki: Wiki
-project_module_files: Files
-project_module_documents: Documents
-project_module_repository: Repository
-project_module_news: News
-project_module_time_tracking: Time tracking
-text_file_repository_writable: File repository writable
-text_default_administrator_account_changed: Default administrator account changed
-text_rmagick_available: RMagick available (optional)
-button_configure: Configure
-label_plugins: Plugins
-label_ldap_authentication: LDAP authentication
-label_downloads_abbr: D/L
-label_this_month: this month
-label_last_n_days: last %d days
-label_all_time: all time
-label_this_year: this year
-label_date_range: Date range
-label_last_week: last week
-label_yesterday: yesterday
-label_last_month: last month
-label_add_another_file: Add another file
-label_optional_description: Optional description
-text_destroy_time_entries_question: %.02f hours were reported on the issues you are about to delete. What do you want to do ?
-error_issue_not_found_in_project: 'The issue was not found or does not belong to this project'
-text_assign_time_entries_to_project: Assign reported hours to the project
-text_destroy_time_entries: Delete reported hours
-text_reassign_time_entries: 'Reassign reported hours to this issue:'
diff --git a/lang/zh.yml b/lang/zh.yml
index 6b2e64abd..3d88c8565 100644
--- a/lang/zh.yml
+++ b/lang/zh.yml
@@ -1,6 +1,3 @@
-# Originally translated by andy wu (email:andywu.zh@gmail.com)
-# new translations added by the translation team from 72pines at http://code.72pines.org/projects/show/72pines-redmine/
-
 _gloc_rule_default: '|n| n==1 ? "" : "_plural" '
 
 actionview_datehelper_select_day_prefix:
@@ -10,37 +7,37 @@ actionview_datehelper_select_month_prefix:
 actionview_datehelper_select_year_prefix:
 actionview_datehelper_time_in_words_day: 1 天
 actionview_datehelper_time_in_words_day_plural: %d 天
-actionview_datehelper_time_in_words_hour_about: 约1小时
+actionview_datehelper_time_in_words_hour_about: 约 1 小时
 actionview_datehelper_time_in_words_hour_about_plural: 约 %d 小时
-actionview_datehelper_time_in_words_hour_about_single: 约1小时
-actionview_datehelper_time_in_words_minute: 1分钟
+actionview_datehelper_time_in_words_hour_about_single: 约 1 小时
+actionview_datehelper_time_in_words_minute: 1 分钟
 actionview_datehelper_time_in_words_minute_half: 半分钟
-actionview_datehelper_time_in_words_minute_less_than: 1分钟以内
+actionview_datehelper_time_in_words_minute_less_than: 1 分钟以内
 actionview_datehelper_time_in_words_minute_plural: %d 分钟
-actionview_datehelper_time_in_words_minute_single: 1分钟
-actionview_datehelper_time_in_words_second_less_than: 1秒以内
-actionview_datehelper_time_in_words_second_less_than_plural:  %d 秒以内
+actionview_datehelper_time_in_words_minute_single: 1 分钟
+actionview_datehelper_time_in_words_second_less_than: 1 秒以内
+actionview_datehelper_time_in_words_second_less_than_plural: %d 秒以内
 actionview_instancetag_blank_option: 请选择
 
-activerecord_error_inclusion: 未包含在列表中
-activerecord_error_exclusion: 保留的
-activerecord_error_invalid: 无效的
-activerecord_error_confirmation: 和确认输入不匹配
-activerecord_error_accepted: 必需被接受
-activerecord_error_empty: 不能为空
-activerecord_error_blank: 不能是空格
-activerecord_error_too_long: 太长
-activerecord_error_too_short: 太短
-activerecord_error_wrong_length: 长度有问题
-activerecord_error_taken: 已经存在了
+activerecord_error_inclusion: 未被包含在列表中
+activerecord_error_exclusion: 是保留字
+activerecord_error_invalid: 是无效的
+activerecord_error_confirmation: 与确认栏不符
+activerecord_error_accepted: 必须被接受
+activerecord_error_empty: 不可为空
+activerecord_error_blank: 不可为空白
+activerecord_error_too_long: 过长
+activerecord_error_too_short: 过短
+activerecord_error_wrong_length: 长度不正确
+activerecord_error_taken: 已被使用
 activerecord_error_not_a_number: 不是数字
 activerecord_error_not_a_date: 不是有效的日期
-activerecord_error_greater_than_start_date: 必需大于开始日期
+activerecord_error_greater_than_start_date: 必须在起始日期之后
 activerecord_error_not_same_project: 不属于同一个项目
-activerecord_error_circular_dependency: 这个设置会造成循环关系的错误
+activerecord_error_circular_dependency: 此关联将导致循环依赖
 
-general_fmt_age: %d yr
-general_fmt_age_plural: %d yrs
+general_fmt_age: %d 年
+general_fmt_age_plural: %d 年
 general_fmt_date: %%m/%%d/%%Y
 general_fmt_datetime: %%m/%%d/%%Y %%I:%%M %%p
 general_fmt_datetime_short: %%b %%d, %%I:%%M %%p
@@ -52,37 +49,47 @@ general_text_yes: '是'
 general_lang_name: 'Simplified Chinese (简体中文)'
 general_csv_separator: ','
 general_csv_encoding: gb2312
-general_pdf_encoding: Big5
-general_day_names: 一,二,三,四,五,六,日
+general_pdf_encoding: gb2312
+general_day_names: 星期一,星期二,星期三,星期四,星期五,星期六,星期日
 general_first_day_of_week: '7'
 
-notice_account_updated: 帐户更新成功。
-notice_account_invalid_creditentials: 用户名或密码不正确
-notice_account_password_updated: 成功更新密码
-notice_account_wrong_password: 错误的密码
-notice_account_register_done: 帐户已创建成功
+notice_account_updated: 帐号更新成功
+notice_account_invalid_creditentials: 无效的用户名或密码
+notice_account_password_updated: 密码更新成功
+notice_account_wrong_password: 密码错误
+notice_account_register_done: 帐号创建成功，请使用注册确认邮件中的链接来激活您的帐号。
 notice_account_unknown_email: 未知用户
-notice_can_t_change_password: 该帐户使用了外部认证。无法更改密码。
-notice_account_lost_email_sent: 邮件已被发送，邮件中有关于选择新密码的指导
+notice_can_t_change_password: 该帐号使用了外部认证，因此无法更改密码。
+notice_account_lost_email_sent: 系统已将引导您设置新密码的邮件发送给您。
 notice_account_activated: 您的帐号已被激活。您现在可以登录了。
 notice_successful_create: 创建成功
 notice_successful_update: 更新成功
 notice_successful_delete: 删除成功
 notice_successful_connection: 连接成功
 notice_file_not_found: 您访问的页面不存在或已被删除。
-notice_locking_conflict: 数据已被另一个用户更新
-notice_not_authorized: 对不起，您无权访问此页面.
-notice_email_sent: 已经成功发送email到 %s
-notice_email_error: 发送email时发生错误 (%s)
-notice_feeds_access_key_reseted: 您的RSS访问代码已经被重置了.
+notice_locking_conflict: 数据已被另一位用户更新
+notice_not_authorized: 对不起，您无权访问此页面。
+notice_email_sent: 邮件已成功发送到 %s
+notice_email_error: 发送邮件时发生错误 (%s)
+notice_feeds_access_key_reseted: 您的RSS存取键已被重置。
+notice_failed_to_save_issues: "%d 个问题保存失败（共选择 %d 个问题）：%s."
+notice_no_issue_selected: "未选择任何问题！请选择您要编辑的问题。"
+notice_account_pending: "您的帐号已被成功创建，正在等待管理员的审核。"
+notice_default_data_loaded: 成功载入默认设置。
 
-error_scm_not_found: 在源代码库中不存在该条目或修订
-error_scm_command_failed: "访问源代码库的时候发生错误: %s"
+error_can_t_load_default_data: "无法载入默认设置：%s"
+error_scm_not_found: "版本库中不存在该条目和（或）其修订版本。"
+error_scm_command_failed: "访问版本库时发生错误：%s"
+error_issue_not_found_in_project: '问题不存在或不属于此项目'
 
-mail_subject_lost_password: 您的redMine密码
-mail_body_lost_password: '点击以下的链接来修改您在redmine系统的密码:'
-mail_subject_register: redMine帐户激活
-mail_body_register: '点击以下的链接来激活您的redMine帐号:'
+mail_subject_lost_password: 您的Redmine密码
+mail_body_lost_password: '请点击以下链接来修改您的Redmine密码：'
+mail_subject_register: Redmine帐号激活
+mail_body_register: '请点击以下链接来激活您的Redmine帐号：'
+mail_body_account_information_external: 您可以使用您的 "%s" 帐号来登录Redmine。
+mail_body_account_information: 您的Redmine帐号信息
+mail_subject_account_activation_request: Redmine帐号激活请求
+mail_body_account_activation_request: '新用户 (%s) 已完成注册，正在等候您的审核：'
 
 gui_validation_error: 1 个错误
 gui_validation_error_plural: %d 个错误
@@ -92,7 +99,7 @@ field_description: 描述
 field_summary: 摘要
 field_is_required: 必填
 field_firstname: 名字
-field_lastname: 姓
+field_lastname: 姓氏
 field_mail: 邮件地址
 field_filename: 文件
 field_filesize: 大小
@@ -107,18 +114,18 @@ field_regexp: 正则表达式
 field_min_length: 最小长度
 field_max_length: 最大长度
 field_value: 值
-field_category: 分类
+field_category: 类别
 field_title: 标题
 field_project: 项目
 field_issue: 问题
 field_status: 状态
 field_notes: 说明
 field_is_closed: 已关闭的问题
-field_is_default: 默认状态
+field_is_default: 默认值
 field_tracker: 跟踪
 field_subject: 主题
-field_due_date: 到期日
-field_assigned_to: 指派
+field_due_date: 完成日期
+field_assigned_to: 指派给
 field_priority: 优先级
 field_fixed_version: 修订版本
 field_user: 用户
@@ -138,34 +145,37 @@ field_password: 密码
 field_new_password: 新密码
 field_password_confirmation: 确认
 field_version: 版本
-field_type: 类别
+field_type: 类型
 field_host: 主机
 field_port: 端口
 field_account: 帐号
 field_base_dn: Base DN
 field_attr_login: 登录名属性
 field_attr_firstname: 名字属性
-field_attr_lastname: 姓属性
+field_attr_lastname: 姓氏属性
 field_attr_mail: 邮件属性
 field_onthefly: 即时的用户生成
 field_start_date: 开始
-field_done_ratio: %% 完成
+field_done_ratio: 完成度
 field_auth_source: 认证模式
-field_hide_mail: 隐藏我的邮件
+field_hide_mail: 隐藏我的邮件地址
 field_comments: 注释
 field_url: URL
 field_start_page: 起始页
 field_subproject: 子项目
-field_hours: Hours
+field_hours: 小时
 field_activity: 活动
 field_spent_on: 日期
 field_identifier: 标识
 field_is_filter: 作为过滤条件
-field_issue_to_id: 相关的问题报告
+field_issue_to_id: 相关问题
 field_delay: 延期
-field_assignable: 是否可以分配到问题
-field_redirect_existing_links: 重定向现有的链接
+field_assignable: 可分配给此角色的问题
+field_redirect_existing_links: 重定向到现有链接
 field_estimated_hours: 预期时间
+field_column_names: 列
+field_time_zone: 时区
+field_searchable: 可用作搜索条件
 field_default_value: 默认值
 
 setting_app_title: 应用程序标题
@@ -174,20 +184,37 @@ setting_welcome_text: 欢迎文字
 setting_default_language: 默认语言
 setting_login_required: 要求认证
 setting_self_registration: 允许自注册
-setting_attachment_max_size: 附件最大尺寸
+setting_attachment_max_size: 附件大小限制
 setting_issues_export_limit: 问题输出条目的限制
-setting_mail_from: 邮件发送人的地址
+setting_mail_from: 邮件发件人地址
+setting_bcc_recipients: 抄送地址 (bcc)
 setting_host_name: 主机名称
 setting_text_formatting: 文本格式
-setting_wiki_compression: Wiki文档的历史记录压缩
-setting_feeds_limit: RSS Feed内容条数
+setting_wiki_compression: 压缩Wiki历史文档
+setting_feeds_limit: RSS Feed内容条数限制
 setting_autofetch_changesets: 自动获取程序变动
-setting_sys_api_enabled: 启用后台的WS代码用于管理
-setting_commit_ref_keywords: 提交变动时引用问题号码的关键字
-setting_commit_fix_keywords: 提交变动时自动标志问题状态的关键字
+setting_sys_api_enabled: 启用用于版本库管理的Web Service
+setting_commit_ref_keywords: 用于引用问题的关键字
+setting_commit_fix_keywords: 用于修订问题的关键字
 setting_autologin: 自动登录
 setting_date_format: 日期格式
+setting_time_format: 时间格式
 setting_cross_project_issue_relations: 允许不同项目之间的问题关联
+setting_issue_list_default_columns: 问题列表中显示的默认列
+setting_repositories_encodings: 版本库编码
+setting_emails_footer: 邮件签名
+setting_protocol: 协议(Protocol)
+setting_per_page_options: 每页显示条目个数的设置
+setting_user_format: 用户显示格式
+
+project_module_issue_tracking: 问题跟踪
+project_module_time_tracking: 时间跟踪
+project_module_news: 新闻
+project_module_documents: 文档
+project_module_files: 文件
+project_module_wiki: Wiki
+project_module_repository: 版本库
+project_module_boards: 讨论区
 
 label_user: 用户
 label_user_plural: 用户列表
@@ -201,9 +228,13 @@ label_issue: 问题
 label_issue_new: 新建问题
 label_issue_plural: 问题列表
 label_issue_view_all: 查看所有问题
+label_issues_by: 按 %s 分组显示问题
+label_issue_added: 问题已添加
+label_issue_updated: 问题已更新
 label_document: 文档
 label_document_new: 新建文档
 label_document_plural: 文档列表
+label_document_added: 文档已添加
 label_role: 角色
 label_role_plural: 角色列表
 label_role_new: 新建角色
@@ -215,16 +246,16 @@ label_tracker: 跟踪标签
 label_tracker_plural: 跟踪标签列表
 label_tracker_new: 新建跟踪标签
 label_workflow: 工作流程
-label_issue_status: 问题状态列表
+label_issue_status: 问题状态
 label_issue_status_plural: 问题状态列表
-label_issue_status_new: 新建问题状态列表
+label_issue_status_new: 新建问题状态
 label_issue_category: 问题类别
 label_issue_category_plural: 问题类别列表
 label_issue_category_new: 新建问题类别
 label_custom_field: 自定义字段
 label_custom_field_plural: 自定义字段列表
 label_custom_field_new: 新建自定义字段
-label_enumerations: 枚举列表
+label_enumerations: 枚举值列表
 label_enumeration_new: 新建枚举值
 label_information: 信息
 label_information_plural: 信息
@@ -240,7 +271,7 @@ label_login: 登录
 label_logout: 退出
 label_help: 帮助
 label_reported_issues: 已报告的问题
-label_assigned_to_me_issues: 分配给我的问题
+label_assigned_to_me_issues: 指派给我的问题
 label_last_login: 最后登录
 label_last_updates: 最后更新
 label_last_updates_plural: %d 最后更新
@@ -258,27 +289,30 @@ label_min_max_length: 最小 - 最大 长度
 label_list: 列表
 label_date: 日期
 label_integer: 整数
-label_boolean: 是否
+label_float: 浮点数
+label_boolean: 布尔量
 label_string: 文字
 label_text: 长段文字
 label_attribute: 属性
 label_attribute_plural: 属性
-label_download: %d 个下载次数
-label_download_plural: %d 个下载次数
-label_no_data: 没有数据用于显示
-label_change_status: 改变状态
+label_download: %d 次下载
+label_download_plural: %d 次下载
+label_no_data: 没有任何数据可供显示
+label_change_status: 状态改变
 label_history: 历史记录
 label_attachment: 文件
 label_attachment_new: 新建文件
 label_attachment_delete: 删除文件
 label_attachment_plural: 文件列表
+label_file_added: 文件已添加
 label_report: 报表
-label_report_plural: 报表列表
+label_report_plural: 报表
 label_news: 新闻
-label_news_new: 增加新闻
+label_news_new: 添加新闻
 label_news_plural: 新闻列表
 label_news_latest: 最近的新闻
 label_news_view_all: 查看所有新闻
+label_news_added: 新闻已添加
 label_change_log: 更新日志
 label_settings: 配置
 label_overview: 概述
@@ -296,26 +330,27 @@ label_closed_issues_plural: 已关闭
 label_total: 合计
 label_permissions: 权限列表
 label_current_status: 当前状态
-label_new_statuses_allowed: 启用了新状态
+label_new_statuses_allowed: 可变更的新状态
 label_all: 全部
 label_none: 无
+label_nobody: 无人
 label_next: 下一个
 label_previous: 上一个
 label_used_by: 使用中
 label_details: 详情
 label_add_note: 添加说明
-label_per_page: 每面
+label_per_page: 每页
 label_calendar: 日历
 label_months_from: 个月以来
 label_gantt: 甘特图(Gantt)
 label_internal: 内部
-label_last_changes: 最近的 %d 次更改
-label_change_view_all: 查看所有更改
+label_last_changes: 最近的 %d 次更新
+label_change_view_all: 查看所有更新
 label_personalize_page: 个性化定制本页
 label_comment: 注释
 label_comment_plural: 注释列表
 label_comment_add: 添加注释
-label_comment_added: 已加入注释
+label_comment_added: 注释已添加
 label_comment_delete: 删除注释
 label_query: 自定义查询
 label_query_plural: 自定义查询列表
@@ -328,24 +363,34 @@ label_in_less_than: 剩余天数小于
 label_in_more_than: 剩余天数大于
 label_in: 剩余天数
 label_today: 今天
+label_all_time: 全部时间
+label_yesterday: 昨天
 label_this_week: 本周
+label_last_week: 下周
+label_last_n_days: 最后 %d 天
+label_this_month: 本月
+label_last_month: 下月
+label_this_year: 今年
+label_date_range: 日期范围
 label_less_than_ago: 之前天数少于
 label_more_than_ago: 之前天数大于
 label_ago: 之前天数
 label_contains: 包含
 label_not_contains: 不包含
 label_day_plural: 天数
-label_repository: 源代码库
+label_repository: 版本库
+label_repository_plural: 版本库
 label_browse: 浏览
 label_modification: %d 个更新
 label_modification_plural: %d 个更新
 label_revision: 修订
 label_revision_plural: 修订
-label_added: 已增加
+label_associated_revisions: 相关修订版本
+label_added: 已添加
 label_modified: 已修改
 label_deleted: 已删除
-label_latest_revision: 最近的版本
-label_latest_revision_plural: 最近的版本列表
+label_latest_revision: 最近的修订版本
+label_latest_revision_plural: 最近的修订版本列表
 label_view_revisions: 查看修订列表
 label_max_size: 最大尺寸
 label_on: 'on'
@@ -355,63 +400,65 @@ label_sort_lower: 下移
 label_sort_lowest: 置底
 label_roadmap: 路线图
 label_roadmap_due_in: 截止日期到 
-label_roadmap_overdue: %s late
+label_roadmap_overdue: %s 延期
 label_roadmap_no_issues: 该版本没有问题
-label_search: 查找
+label_search: 搜索
 label_result_plural: 个结果
 label_all_words: 所有单词
 label_wiki: Wiki
 label_wiki_edit: Wiki 编辑
 label_wiki_edit_plural: Wiki 编辑记录
+label_wiki_page: Wiki 页面
 label_wiki_page_plural: Wiki 页面
-label_index_by_title: 索引
-label_index_by_date: 按照日期排序的索引
+label_index_by_title: 按标题索引
+label_index_by_date: 按日期索引
 label_current_version: 当前版本
 label_preview: 预览
 label_feed_plural: Feeds
-label_changes_details: 所有更改的详情
+label_changes_details: 所有更新的详情
 label_issue_tracking: 问题跟踪
 label_spent_time: 耗时
 label_f_hour: %.2f 小时
 label_f_hour_plural: %.2f 小时
 label_time_tracking: 时间跟踪
-label_change_plural: 更改列表
+label_change_plural: 更新列表
 label_statistics: 统计
-label_commits_per_month: Commits/月
-label_commits_per_author: Commits/用户
+label_commits_per_month: 每月提交次数
+label_commits_per_author: 每用户提交次数
 label_view_diff: 查看变动
-label_diff_inline: inline
-label_diff_side_by_side: side by side
+label_diff_inline: 在一行
+label_diff_side_by_side: 并排
 label_options: 选项
 label_copy_workflow_from: 从以下项目复制工作流程
-label_permissions_report: 权限设置列表
+label_permissions_report: 权限报表
 label_watched_issues: 跟踪的问题
 label_related_issues: 相关的问题
-label_applied_status: 修改了状态
+label_applied_status: 应用后的状态
 label_loading: 载入中...
-label_relation_new: 新的关联
+label_relation_new: 新建关联
 label_relation_delete: 删除关联
 label_relates_to: 关联到
 label_duplicates: 重复
-label_blocks: blocks
-label_blocked_by: blocked by
-label_precedes: precedes
-label_follows: follows
+label_blocks: 阻挡
+label_blocked_by: 被阻挡
+label_precedes: 优先于
+label_follows: 跟随于
 label_end_to_start: end to start
 label_end_to_end: end to end
 label_start_to_start: start to start
 label_start_to_end: start to end
-label_stay_logged_in: 保持一直登录
-label_disabled: 禁用了
-label_show_completed_versions: 显示已经完成的版本
+label_stay_logged_in: 保持登录状态
+label_disabled: 禁用
+label_show_completed_versions: 显示已完成的版本
 label_me: 我
 label_board: 讨论区
-label_board_new: 新的版面
+label_board_new: 新建讨论区
 label_board_plural: 讨论区
 label_topic_plural: 主题
 label_message_plural: 帖子
 label_message_last: 最新的帖子
 label_message_new: 新贴
+label_message_posted: 发帖成功
 label_reply_plural: 回复
 label_send_information: 给用户发送帐号信息
 label_year: 年
@@ -419,14 +466,40 @@ label_month: 月
 label_week: 周
 label_date_from: 从
 label_date_to: 到
-label_language_based: 语言
-label_sort_by: 根据 %s 排序 
-label_send_test_email: 发送测试email
-label_feeds_access_key_created_on: RSS 访问代码是在 %s 之前建立的
+label_language_based: 根据用户的语言
+label_sort_by: 根据 %s 排序
+label_send_test_email: 发送测试邮件
+label_feeds_access_key_created_on: RSS 存取键是在 %s 之前建立的
 label_module_plural: 模块
 label_added_time_by: 由 %s 在 %s 之前添加
 label_updated_time:  更新于 %s 前
 label_jump_to_a_project: 选择一个项目...
+label_file_plural: 文件列表
+label_changeset_plural: 变动列表
+label_default_columns: 默认列
+label_no_change_option: (不变)
+label_bulk_edit_selected_issues: 批量修改选中的问题
+label_theme: 主题
+label_default: 默认
+label_search_titles_only: 仅在标题中搜索
+label_user_mail_option_all: "收取我所参与的项目的所有通知"
+label_user_mail_option_selected: "收取选中项目的所有通知..."
+label_user_mail_option_none: "只收取我跟踪或参与的项目的通知"
+label_user_mail_no_self_notified: "不要发送对我自己提交的修改的通知"
+label_registration_activation_by_email: 通过邮件认证激活帐号
+label_registration_manual_activation: 手动激活帐号
+label_registration_automatic_activation: 自动激活帐号
+label_display_per_page: '每页显示：%s'
+label_age: 年龄
+label_change_properties: 修改属性
+label_general: 一般
+label_more: 更多
+label_scm: SCM
+label_plugins: 插件
+label_ldap_authentication: LDAP 认证
+label_downloads_abbr: D/L
+label_optional_description: 可选的描述
+label_add_another_file: 添加其它文件
 
 button_login: 登录
 button_submit: 提交
@@ -460,8 +533,13 @@ button_archive: 存档
 button_unarchive: 取消存档
 button_reset: 重置
 button_rename: 重命名
+button_change_password: 修改密码
+button_copy: 复制
+button_annotate: 注释
+button_update: 更新
+button_configure: 配置
 
-status_active: 激活
+status_active: 已激活
 status_registered: 已注册
 status_locked: 已锁定
 
@@ -474,35 +552,49 @@ text_are_you_sure: 您确定？
 text_journal_changed: 从 %s 更改为 %s
 text_journal_set_to: 设置为 %s
 text_journal_deleted: 已删除
-text_tip_task_begin_day: 开始于此
-text_tip_task_end_day: 在此结束
-text_tip_task_begin_end_day: 开始并结束于此
-text_project_identifier_info: '只允许使用小写字母 (a-z), 数字和-短横号.<br />注意，保存以后, 标志名就不能修改了.'
-text_caracters_maximum: 最多 %d 个字符.
-text_length_between: 字符长度应该在 %d 和 %d 个之间.
-text_tracker_no_workflow: 还没有定义工作流程
-text_unallowed_characters: 有不符合规定的字符
-text_comma_separated: 可以使用多个值 (用逗号,分开).
-text_issues_ref_in_commit_messages: 信息里面直接可以使用的ref关联或者是fix修复标签设置
-text_issue_added: 问题 %s 成功提交 (by %s).
-text_issue_updated: 问题 %s 成功更新 (by %s).
-text_wiki_destroy_confirmation: 您是否确定要删除以下的 wiki 页面及其内容?
-text_issue_category_destroy_question: 有一些问题 (%d 个) 属于这个分类. 您还想继续操作吗?
-text_issue_category_destroy_assignments: 取消分类的设置
-text_issue_category_reassign_to: 重新添加到分类
+text_tip_task_begin_day: 今天开始的任务
+text_tip_task_end_day: 今天结束的任务
+text_tip_task_begin_end_day: 今天开始并结束的任务
+text_project_identifier_info: '只允许使用小写字母（a-z），数字和连字符（-）。<br />请注意，标识符保存后将不可修改。'
+text_caracters_maximum: 最多 %d 个字符。
+text_caracters_minimum: 至少需要 %d 个字符。
+text_length_between: 长度必须在 %d 和 %d 个字符之间。
+text_tracker_no_workflow: 此跟踪标签未定义工作流程
+text_unallowed_characters: 非法字符
+text_comma_separated: 可以使用多个值（用逗号,分开）。
+text_issues_ref_in_commit_messages: 在提交信息中引用和修订问题
+text_issue_added: 问题 %s 已由 %s 提交。
+text_issue_updated: 问题 %s 已由 %s 更新。
+text_wiki_destroy_confirmation: 您确定要删除这个 wiki 及其所有内容吗？
+text_issue_category_destroy_question: 有一些问题（%d 个）属于此类别。您想进行哪种操作？
+text_issue_category_destroy_assignments: 删除问题的所属类别（问题变为无类别）
+text_issue_category_reassign_to: 为问题选择其它类别
+text_user_mail_option: "对于没有选中的项目，您将只会收到您跟踪或参与的项目的通知（比如说，您是问题的报告者, 或被指派解决此问题）。"
+text_no_configuration_data: "角色、跟踪标签、问题状态列表和工作流程还没有设置。\n强烈建议您先载入默认设置，然后在此基础上进行修改。"
+text_load_default_configuration: 载入默认设置
+text_status_changed_by_changeset: 已应用到变动列表 %s.
+text_issues_destroy_confirmation: '您确定要删除选中的问题吗？'
+text_select_project_modules: '请选择此项目可以使用的模块：'
+text_default_administrator_account_changed: 默认的管理员帐号已改变
+text_file_repository_writable: 文件版本库可修改
+text_rmagick_available: RMagick 可用（可选的）
+text_destroy_time_entries_question: 您要删除的问题已经上报了 %.02f 小时的工作量。您想进行那种操作？
+text_destroy_time_entries: 删除上报的工作量
+text_assign_time_entries_to_project: 将已上报的工作量提交到项目中
+text_reassign_time_entries: '将已上报的工作量指定到此问题：'
 
-default_role_manager: 管理员
+default_role_manager: 管理人员
 default_role_developper: 开发人员
 default_role_reporter: 报告人员
-default_tracker_bug: 问题
+default_tracker_bug: Bug
 default_tracker_feature: 功能
 default_tracker_support: 支持
 default_issue_status_new: 新建
-default_issue_status_assigned: 已分配
+default_issue_status_assigned: 已指派
 default_issue_status_resolved: 已解决
-default_issue_status_feedback: 回复
+default_issue_status_feedback: 反馈
 default_issue_status_closed: 已关闭
-default_issue_status_rejected: 已打回
+default_issue_status_rejected: 已拒绝
 default_doc_category_user: 用户文档
 default_doc_category_tech: 技术文档
 default_priority_low: 低
@@ -515,98 +607,4 @@ default_activity_development: 开发
 
 enumeration_issue_priorities: 问题优先级
 enumeration_doc_categories: 文档类别
-enumeration_activities: 活动情况 (时间跟踪)
-label_wiki_page: Wiki 页面
-label_file_plural: 文件
-label_changeset_plural: 程序变动
-field_column_names: 列
-label_default_columns: 默认列
-setting_issue_list_default_columns: 问题列表中显示的默认列
-setting_repositories_encodings: 源代码库编码
-notice_no_issue_selected: "没有选择任何的问题! 请选择您要编辑的问题."
-label_bulk_edit_selected_issues: 批量修改已选择的问题
-label_no_change_option: (不变)
-notice_failed_to_save_issues: "在保存 %d 个问题时(总共 %d 个)失败: %s."
-label_theme: 主题
-label_default: 默认
-label_search_titles_only: 仅在标题中搜索
-label_nobody: nobody
-button_change_password: 修改密码
-text_user_mail_option: "对于没有选择的项目, 您将只会收到您已经跟踪或者是参与的项目的通知 (比如说，您是问题的报告者, 或是负责解决这个问题的)."
-label_user_mail_option_selected: "对于所选择的项目，收取任何相关的通知..."
-label_user_mail_option_all: "对于我参与的项目，收取任何相关的通知"
-label_user_mail_option_none: "只收取和我跟踪或者参与的项目的通知"
-setting_emails_footer: Emails 末尾的信息
-label_float: Float
-button_copy: 复制
-mail_body_account_information_external: 您可以使用 "%s" 帐号登录了.
-mail_body_account_information: 您的帐号信息
-setting_protocol: 协议(Protocol)
-label_user_mail_no_self_notified: "对于我提交的修改，不要给我发送通知"
-setting_time_format: 时间格式
-label_registration_activation_by_email: 通过email认证激活帐号
-mail_subject_account_activation_request: Redmine 帐号激活请求
-mail_body_account_activation_request: '新用户 (%s) 已经注册成功. 他的帐号需要您的认可后生效:'
-label_registration_automatic_activation: 自动激活帐号
-label_registration_manual_activation: 手动激活帐号
-notice_account_pending: "您的帐号已经成功建立, 但是还需要等待管理员的认可后才能激活."
-field_time_zone: 时区
-text_caracters_minimum: "至少需要 %d 个字符."
-setting_bcc_recipients: 抄送地址 (bcc)
-button_annotate: 注释
-label_issues_by: Issues by %s
-field_searchable: Searchable
-label_display_per_page: '每页显示: %s'
-setting_per_page_options: 每页显示条目的设置
-label_age: Age
-notice_default_data_loaded: 成功载入默认设置.
-text_load_default_configuration: 载入默认设置
-text_no_configuration_data: "用户权限，跟踪标签, 问题状态列表和工作流程还没有设置好.\n强烈推荐载入默认的设置. 载入后您可以再进行定制."
-error_can_t_load_default_data: "不能载入默认设置: %s"
-button_update: 更新
-label_change_properties: 修改属性
-label_general: 一般
-label_repository_plural: 源代码库
-label_associated_revisions: 相关的版本
-setting_user_format: 用户显示格式
-text_status_changed_by_changeset: Applied in changeset %s.
-label_more: More
-text_issues_destroy_confirmation: 'Are you sure you want to delete the selected issue(s) ?'
-label_scm: SCM
-text_select_project_modules: 'Select modules to enable for this project:'
-label_issue_added: Issue added
-label_issue_updated: Issue updated
-label_document_added: Document added
-label_message_posted: Message added
-label_file_added: File added
-label_news_added: News added
-project_module_boards: Boards
-project_module_issue_tracking: Issue tracking
-project_module_wiki: Wiki
-project_module_files: Files
-project_module_documents: Documents
-project_module_repository: Repository
-project_module_news: News
-project_module_time_tracking: Time tracking
-text_file_repository_writable: File repository writable
-text_default_administrator_account_changed: Default administrator account changed
-text_rmagick_available: RMagick available (optional)
-button_configure: Configure
-label_plugins: Plugins
-label_ldap_authentication: LDAP authentication
-label_downloads_abbr: D/L
-label_this_month: this month
-label_last_n_days: last %d days
-label_all_time: all time
-label_this_year: this year
-label_date_range: Date range
-label_last_week: last week
-label_yesterday: yesterday
-label_last_month: last month
-label_add_another_file: Add another file
-label_optional_description: Optional description
-text_destroy_time_entries_question: %.02f hours were reported on the issues you are about to delete. What do you want to do ?
-error_issue_not_found_in_project: 'The issue was not found or does not belong to this project'
-text_assign_time_entries_to_project: Assign reported hours to the project
-text_destroy_time_entries: Delete reported hours
-text_reassign_time_entries: 'Reassign reported hours to this issue:'
+enumeration_activities: 活动（时间跟踪）
diff --git a/public/javascripts/calendar/lang/calendar-fi.js b/public/javascripts/calendar/lang/calendar-fi.js
index 5b4ece30f..1e65eee42 100644
--- a/public/javascripts/calendar/lang/calendar-fi.js
+++ b/public/javascripts/calendar/lang/calendar-fi.js
@@ -120,7 +120,7 @@ Calendar._TT["TODAY"] = "Tänään";
 Calendar._TT["TIME_PART"] = "(Vaihtonäppäin-)Paina tai raahaa vaihtaaksesi arvoa";
 
 // date formats
-Calendar._TT["DEF_DATE_FORMAT"] = "%Y-%m-%d";
+Calendar._TT["DEF_DATE_FORMAT"] = "%d.%m.%Y";
 Calendar._TT["TT_DATE_FORMAT"] = "%a, %b %e";
 
 Calendar._TT["WK"] = "vko";
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-ja.js b/public/javascripts/jstoolbar/lang/jstoolbar-ja.js
index cd36a4b55..fc4d987de 100644
--- a/public/javascripts/jstoolbar/lang/jstoolbar-ja.js
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-ja.js
@@ -1,14 +1,14 @@
 jsToolBar.strings = {};
-jsToolBar.strings['Strong'] = 'Strong';
-jsToolBar.strings['Italic'] = 'Italic';
-jsToolBar.strings['Underline'] = 'Underline';
-jsToolBar.strings['Deleted'] = 'Deleted';
-jsToolBar.strings['Code'] = 'Inline Code';
-jsToolBar.strings['Heading 1'] = 'Heading 1';
-jsToolBar.strings['Heading 2'] = 'Heading 2';
-jsToolBar.strings['Heading 3'] = 'Heading 3';
-jsToolBar.strings['Unordered list'] = 'Unordered list';
-jsToolBar.strings['Ordered list'] = 'Ordered list';
-jsToolBar.strings['Preformatted text'] = 'Preformatted text';
-jsToolBar.strings['Wiki link'] = 'Link to a Wiki page';
-jsToolBar.strings['Image'] = 'Image';
+jsToolBar.strings['Strong'] = '強調';
+jsToolBar.strings['Italic'] = '斜体';
+jsToolBar.strings['Underline'] = '下線';
+jsToolBar.strings['Deleted'] = '取り消し線';
+jsToolBar.strings['Code'] = 'コード';
+jsToolBar.strings['Heading 1'] = '見出し 1';
+jsToolBar.strings['Heading 2'] = '見出し 2';
+jsToolBar.strings['Heading 3'] = '見出し 3';
+jsToolBar.strings['Unordered list'] = '順不同リスト';
+jsToolBar.strings['Ordered list'] = '番号つきリスト';
+jsToolBar.strings['Preformatted text'] = '整形済みテキスト';
+jsToolBar.strings['Wiki link'] = 'Wiki ページへのリンク';
+jsToolBar.strings['Image'] = '画像';

From d8c97b32dd3c7bacd4e05417a0a5000e4c655505 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Wed, 5 Mar 2008 09:01:37 +0000
Subject: [PATCH 246/710] Fixes #780: Redmine fails to start with a
 const_missing error on Redmine::MenuManager::MenuItem::GLoc (occurs when a
 Redmine plugin is loaded before GLoc).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1187 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 config/environment.rb       | 2 +-
 lib/redmine/menu_manager.rb | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/config/environment.rb b/config/environment.rb
index dced5993e..e203227e6 100644
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -48,7 +48,7 @@ Rails::Initializer.run do |config|
 		:port => 25,
 		:domain => "somenet.foo",
 		:authentication => :login,
-		:user_name => "redmine",
+		:user_name => "redmine@somenet.foo",
 		:password => "redmine",
 	}
 	
diff --git a/lib/redmine/menu_manager.rb b/lib/redmine/menu_manager.rb
index c645b5ce8..af54b41fe 100644
--- a/lib/redmine/menu_manager.rb
+++ b/lib/redmine/menu_manager.rb
@@ -15,6 +15,8 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
+require 'gloc'
+
 module Redmine
   module MenuManager
     module MenuController

From 4f9f3097d905e349286761123d39fd2cf81f07c5 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Wed, 5 Mar 2008 09:06:00 +0000
Subject: [PATCH 247/710] Fixes #765: Date pickers don't work on issues' bulk
 edit view.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1188 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/issues/bulk_edit.rhtml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/app/views/issues/bulk_edit.rhtml b/app/views/issues/bulk_edit.rhtml
index d19262271..e3f09befa 100644
--- a/app/views/issues/bulk_edit.rhtml
+++ b/app/views/issues/bulk_edit.rhtml
@@ -43,3 +43,10 @@
 
 <p><%= submit_tag l(:button_submit) %>
 <% end %>
+
+<% content_for :header_tags do %>
+    <%= javascript_include_tag 'calendar/calendar' %>
+    <%= javascript_include_tag "calendar/lang/calendar-#{current_language}.js" %>
+    <%= javascript_include_tag 'calendar/calendar-setup' %>
+    <%= stylesheet_link_tag 'calendar' %>
+<% end %>

From b0754ca720f6262dd3b6f16eac23082d28d6fae6 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Wed, 5 Mar 2008 09:16:19 +0000
Subject: [PATCH 248/710] Fixes migration 87 error when running MySQL with
 STRICT_TRANS_TABLES on (#771).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1189 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 db/migrate/087_change_projects_description_to_text.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/db/migrate/087_change_projects_description_to_text.rb b/db/migrate/087_change_projects_description_to_text.rb
index b06b0aa1c..132e921b3 100644
--- a/db/migrate/087_change_projects_description_to_text.rb
+++ b/db/migrate/087_change_projects_description_to_text.rb
@@ -1,6 +1,6 @@
 class ChangeProjectsDescriptionToText < ActiveRecord::Migration
   def self.up
-    change_column :projects, :description, :text, :null => true
+    change_column :projects, :description, :text, :null => true, :default => nil
   end
 
   def self.down

From c61424e57a0f41943aeda7b22ed2b206d138427e Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Wed, 5 Mar 2008 11:14:35 +0000
Subject: [PATCH 249/710] Display wiki syntax quick ref link within the
 jstoolbar (closes #629, #767). Added named links syntax on quick ref (closes
 #766, #778).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1190 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/helpers/application_helper.rb         |  7 ++++++-
 app/views/wiki/edit.rhtml                 |  6 +-----
 public/help/wiki_syntax.html              |  9 +++++++--
 public/javascripts/jstoolbar/jstoolbar.js | 13 ++++++++++++-
 public/stylesheets/jstoolbar.css          |  2 ++
 5 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index b9318a3f7..a6acafb5b 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -444,9 +444,14 @@ module ApplicationHelper
   
   def wikitoolbar_for(field_id)
     return '' unless Setting.text_formatting == 'textile'
+    
+    help_link = l(:setting_text_formatting) + ': ' +
+      link_to(l(:label_help), compute_public_path('wiki_syntax', 'help', 'html'),
+                              :onclick => "window.open(\"#{ compute_public_path('wiki_syntax', 'help', 'html') }\", \"\", \"resizable=yes, location=no, width=300, height=640, menubar=no, status=no, scrollbars=yes\"); return false;")
+
     javascript_include_tag('jstoolbar/jstoolbar') +
       javascript_include_tag("jstoolbar/lang/jstoolbar-#{current_language}") +
-      javascript_tag("var toolbar = new jsToolBar($('#{field_id}')); toolbar.draw();")
+      javascript_tag("var toolbar = new jsToolBar($('#{field_id}')); toolbar.setHelpLink('#{help_link}'); toolbar.draw();")
   end
   
   def content_for(name, content = nil, &block)
diff --git a/app/views/wiki/edit.rhtml b/app/views/wiki/edit.rhtml
index e5b0687f6..19f3bd5ae 100644
--- a/app/views/wiki/edit.rhtml
+++ b/app/views/wiki/edit.rhtml
@@ -3,11 +3,7 @@
 <% form_for :content, @content, :url => {:action => 'edit', :page => @page.title}, :html => {:id => 'wiki_form'} do |f| %>
 <%= f.hidden_field :version %>
 <%= error_messages_for 'content' %>
-<div class="contextual">
-<%= l(:setting_text_formatting) %>:
-<%= link_to l(:label_help), compute_public_path('wiki_syntax', 'help', 'html'),
-                            :onclick => "window.open('#{ compute_public_path('wiki_syntax', 'help', 'html') }', '', 'resizable=yes, location=no, width=300, height=640, menubar=no, status=no, scrollbars=yes'); return false;" %>
-</div>
+
 <p><%= f.text_area :text, :cols => 100, :rows => 25, :class => 'wiki-edit', :accesskey => accesskey(:edit) %></p>
 <p><label><%= l(:field_comments) %></label><br /><%= f.text_field :comments, :size => 120 %></p>
 <p><%= submit_tag l(:button_save) %>
diff --git a/public/help/wiki_syntax.html b/public/help/wiki_syntax.html
index 17b54a0b2..d2ca19b2c 100644
--- a/public/help/wiki_syntax.html
+++ b/public/help/wiki_syntax.html
@@ -4,10 +4,10 @@
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <meta http-equiv="Content-Style-Type" content="text/css" />
 <title>Wiki formatting</title>
-<link rel="stylesheet" href="html.css" type="text/css" />
 <style type="text/css">
 h1 { font-family: Verdana, sans-serif; font-size: 14px; text-align: center; color: #444; }
-table { font-family: Verdana, sans-serif; font-size: 12px; color: #444; }
+body { font-family: Verdana, sans-serif; font-size: 12px; color: #444; }
+table th { padding-top: 1em; }
 table td { vertical-align: top; background-color: #f5f5f5; height: 2em; vertical-align: middle;}
 table td code { font-size: 1.2em; }
 table td h1 { font-size: 1.8em; text-align: left; }
@@ -46,6 +46,9 @@ table td h3 { font-size: 1.2em; text-align: left; }
 
 <tr><th colspan="3">Links</th></tr>
 <tr><th></th><td>http://foo.bar</td><td><a href="#">http://foo.bar</a></td></tr>
+<tr><th></th><td>"Foo":http://foo.bar</td><td><a href="#">Foo</a></td></tr>
+
+<tr><th colspan="3">Redmine links</th></tr>
 <tr><th><img src="../../images/jstoolbar/bt_link.png" style="border: 1px solid #bbb;" alt="Link to a Wiki page" /></th><td>[[Wiki page]]</td><td><a href="#">Wiki page</a></td></tr>
 <tr><th></th><td>Issue #12</td><td>Issue <a href="#">#12</a></td></tr>
 <tr><th></th><td>Revision r43</td><td>Revision <a href="#">r43</a></td></tr>
@@ -55,5 +58,7 @@ table td h3 { font-size: 1.2em; text-align: left; }
 <tr><th></th><td>!<em>attached_image</em>!</td><td></td></tr>
 </table>
 
+<p><a href="http://www.redmine.org/wiki/redmine/RedmineWikiFormatting" onclick="window.open('http://www.redmine.org/wiki/redmine/RedmineWikiFormatting', '', ''); return false;">More Information</a></p>
+
 </body>
 </html>
diff --git a/public/javascripts/jstoolbar/jstoolbar.js b/public/javascripts/jstoolbar/jstoolbar.js
index 7a2a2a49e..be982d4b9 100644
--- a/public/javascripts/jstoolbar/jstoolbar.js
+++ b/public/javascripts/jstoolbar/jstoolbar.js
@@ -151,6 +151,7 @@ jsToolBar.prototype = {
 	base_url: '',
 	mode: 'wiki',
 	elements: {},
+	help_link: '',
 	
 	getMode: function() {
 		return this.mode;
@@ -165,6 +166,10 @@ jsToolBar.prototype = {
 		this.draw(mode);
 	},
 	
+	setHelpLink: function(link) {
+		this.help_link = link;
+	},
+	
 	button: function(toolName) {
 		var tool = this.elements[toolName];
 		if (typeof tool.fn[this.mode] != 'function') return null;
@@ -201,7 +206,13 @@ jsToolBar.prototype = {
 			this.toolbar.removeChild(this.toolbar.firstChild)
 		}
 		this.toolNodes = {}; // vide les raccourcis DOM/**/
-		
+
+		var h = document.createElement('div');
+		h.className = 'help'
+		h.innerHTML = this.help_link;
+		'<a href="/help/wiki_syntax.html" onclick="window.open(\'/help/wiki_syntax.html\', \'\', \'resizable=yes, location=no, width=300, height=640, menubar=no, status=no, scrollbars=yes\'); return false;">Aide</a>';
+		this.toolbar.appendChild(h);
+
 		// Draw toolbar elements
 		var b, tool, newTool;
 		
diff --git a/public/stylesheets/jstoolbar.css b/public/stylesheets/jstoolbar.css
index df5d2a633..c4ab55711 100644
--- a/public/stylesheets/jstoolbar.css
+++ b/public/stylesheets/jstoolbar.css
@@ -44,6 +44,8 @@
 	margin-right: 4px;
 }
 
+.jstElements .help { float: right; margin-right: 1em; padding-top: 8px; font-size: 0.9em; }
+
 /* Buttons
 -------------------------------------------------------- */
 .jstb_strong {

From d09f7d73b33fc29f668557b86673ce8c626476f9 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Wed, 5 Mar 2008 11:42:59 +0000
Subject: [PATCH 250/710] Added jsp mime type.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1191 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 lib/redmine/mime_type.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/redmine/mime_type.rb b/lib/redmine/mime_type.rb
index e0bc3991d..57bdbcfe1 100644
--- a/lib/redmine/mime_type.rb
+++ b/lib/redmine/mime_type.rb
@@ -22,6 +22,7 @@ module Redmine
       'text/plain' => 'txt,tpl,properties,patch,diff,ini,readme,install,upgrade',
       'text/css' => 'css',
       'text/html' => 'html,htm,xhtml',
+      'text/jsp' => 'jsp',
       'text/x-c' => 'c,cpp,h',
       'text/x-java' => 'java',
       'text/x-javascript' => 'js',

From 1eca3947a17ba2b976745bc111ef67dc81aba914 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Wed, 5 Mar 2008 11:54:54 +0000
Subject: [PATCH 251/710] Reversed versions ordering on files list (closes
 #763).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1192 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/projects_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index adb49114c..f9d6d0f0b 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -200,7 +200,7 @@ class ProjectsController < ApplicationController
   end
   
   def list_files
-    @versions = @project.versions.sort
+    @versions = @project.versions.sort.reverse
   end
   
   # Show changelog for @project

From 745fec76d0f81c6536540ebfad497b264a5bd0f0 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Wed, 5 Mar 2008 11:59:56 +0000
Subject: [PATCH 252/710] Fixes #773: Changeset block is smashing the update
 frame on issues/show.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1193 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/issues/show.rhtml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/views/issues/show.rhtml b/app/views/issues/show.rhtml
index c5efe4f25..d9727cae7 100644
--- a/app/views/issues/show.rhtml
+++ b/app/views/issues/show.rhtml
@@ -87,6 +87,7 @@ end %>
 <%= render :partial => 'history', :locals => { :journals => @journals } %>
 </div>
 <% end %>
+<div style="clear: both;"></div>
 
 <% if authorize_for('issues', 'edit') %>
   <div id="update" style="display:none;">

From a70737ad592cb6c695db29dc1c3579f616877175 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Wed, 5 Mar 2008 12:43:14 +0000
Subject: [PATCH 253/710] Fixed "LdapError: invalid binding information" when
 no username/password are set on the LDAP account (#764).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1194 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/models/auth_source_ldap.rb | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/models/auth_source_ldap.rb b/app/models/auth_source_ldap.rb
index 5a6789a3b..b4966c1e8 100644
--- a/app/models/auth_source_ldap.rb
+++ b/app/models/auth_source_ldap.rb
@@ -70,11 +70,12 @@ class AuthSourceLdap < AuthSource
   
 private
   def initialize_ldap_con(ldap_user, ldap_password)
-    Net::LDAP.new( {:host => self.host, 
-                    :port => self.port, 
-                    :auth => { :method => :simple, :username => ldap_user, :password => ldap_password },
-                    :encryption => (self.tls ? :simple_tls : nil)} 
-    ) 
+    options = { :host => self.host,
+                :port => self.port,
+                :encryption => (self.tls ? :simple_tls : nil)
+              }
+    options.merge(:auth => { :method => :simple, :username => ldap_user, :password => ldap_password }) unless ldap_user.blank? && ldap_password.blank?
+    Net::LDAP.new options
   end
   
   def self.get_attr(entry, attr_name)

From fbcdfee622729792ab58648228209bbd3c2142b6 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Wed, 5 Mar 2008 12:54:20 +0000
Subject: [PATCH 254/710] Trac importer: support database schema for Trac
 migration (#757 by John Goerzen).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1195 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 lib/tasks/migrate_from_trac.rake | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/lib/tasks/migrate_from_trac.rake b/lib/tasks/migrate_from_trac.rake
index 9ae1c550a..d61640bfb 100644
--- a/lib/tasks/migrate_from_trac.rake
+++ b/lib/tasks/migrate_from_trac.rake
@@ -513,7 +513,11 @@ namespace :redmine do
         @@trac_db_password = password
       end
       
-      mattr_reader :trac_directory, :trac_adapter, :trac_db_host, :trac_db_port, :trac_db_name, :trac_db_username, :trac_db_password
+      def self.set_trac_db_schema(schema)
+        @@trac_db_schema = schema
+      end
+
+      mattr_reader :trac_directory, :trac_adapter, :trac_db_host, :trac_db_port, :trac_db_name, :trac_db_schema, :trac_db_username, :trac_db_password
       
       def self.trac_db_path; "#{trac_directory}/db/trac.db" end
       def self.trac_attachments_directory; "#{trac_directory}/attachments" end
@@ -544,7 +548,9 @@ namespace :redmine do
            :host => trac_db_host,
            :port => trac_db_port,
            :username => trac_db_username,
-           :password => trac_db_password}
+           :password => trac_db_password,
+           :schema_search_path => trac_db_schema
+          }
         end
       end
       
@@ -580,7 +586,7 @@ namespace :redmine do
       end
     end
     
-    DEFAULT_PORTS = {'mysql' => 3306, 'postgresl' => 5432}
+    DEFAULT_PORTS = {'mysql' => 3306, 'postgresql' => 5432}
     
     prompt('Trac directory') {|directory| TracMigrate.set_trac_directory directory.strip}
     prompt('Trac database adapter (sqlite, sqlite3, mysql, postgresql)', :default => 'sqlite') {|adapter| TracMigrate.set_trac_adapter adapter}
@@ -588,6 +594,7 @@ namespace :redmine do
       prompt('Trac database host', :default => 'localhost') {|host| TracMigrate.set_trac_db_host host}
       prompt('Trac database port', :default => DEFAULT_PORTS[TracMigrate.trac_adapter]) {|port| TracMigrate.set_trac_db_port port}
       prompt('Trac database name') {|name| TracMigrate.set_trac_db_name name}
+      prompt('Trac database schema', :default => 'public') {|schema| TracMigrate.set_trac_db_schema schema}
       prompt('Trac database username') {|username| TracMigrate.set_trac_db_username username}
       prompt('Trac database password') {|password| TracMigrate.set_trac_db_password password}
     end

From bbe8ea29e8d3e6de60b96c08d60de9447bcceca9 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Wed, 5 Mar 2008 13:44:08 +0000
Subject: [PATCH 255/710] Display the last 30 days on the activity view rather
 than the current month. Number of days can be configured in the application
 settings.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1196 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/projects_controller.rb      | 23 ++++++---------------
 app/helpers/projects_helper.rb              |  4 ++++
 app/views/projects/activity.rhtml           | 18 ++++++++--------
 app/views/settings/_general.rhtml           |  3 +++
 config/settings.yml                         |  3 +++
 lang/bg.yml                                 |  1 +
 lang/cs.yml                                 |  1 +
 lang/de.yml                                 |  1 +
 lang/en.yml                                 |  1 +
 lang/es.yml                                 |  1 +
 lang/fi.yml                                 |  1 +
 lang/fr.yml                                 |  1 +
 lang/he.yml                                 |  1 +
 lang/it.yml                                 |  1 +
 lang/ja.yml                                 |  1 +
 lang/ko.yml                                 |  1 +
 lang/lt.yml                                 |  1 +
 lang/nl.yml                                 |  1 +
 lang/pl.yml                                 |  1 +
 lang/pt-br.yml                              |  1 +
 lang/pt.yml                                 |  1 +
 lang/ro.yml                                 |  1 +
 lang/ru.yml                                 |  1 +
 lang/sr.yml                                 |  1 +
 lang/sv.yml                                 |  1 +
 lang/uk.yml                                 |  1 +
 lang/zh-tw.yml                              |  1 +
 lang/zh.yml                                 |  1 +
 test/functional/projects_controller_test.rb |  4 ++--
 29 files changed, 50 insertions(+), 28 deletions(-)

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index f9d6d0f0b..b9758c810 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -218,25 +218,14 @@ class ProjectsController < ApplicationController
   end
   
   def activity
-    if params[:year] and params[:year].to_i > 1900
-      @year = params[:year].to_i
-      if params[:month] and params[:month].to_i > 0 and params[:month].to_i < 13
-        @month = params[:month].to_i
-      end    
+    @days = Setting.activity_days_default.to_i
+    
+    if params[:from]
+      begin; @date_to = params[:from].to_date; rescue; end
     end
-    @year ||= Date.today.year
-    @month ||= Date.today.month
 
-    case params[:format]
-    when 'atom'
-      # 30 last days
-      @date_from = Date.today - 30
-      @date_to = Date.today + 1
-    else
-      # current month
-      @date_from = Date.civil(@year, @month, 1)
-      @date_to = @date_from >> 1
-    end
+    @date_to ||= Date.today + 1
+    @date_from = @date_to - @days
     
     @event_types = %w(issues news files documents changesets wiki_pages messages)
     @event_types.delete('wiki_pages') unless @project.wiki
diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb
index c07bbd2c2..a16377412 100644
--- a/app/helpers/projects_helper.rb
+++ b/app/helpers/projects_helper.rb
@@ -26,6 +26,10 @@ module ProjectsHelper
                           }, options
   end
   
+  def format_activity_day(date)
+    date == Date.today ? l(:label_today).titleize : format_date(date)
+  end
+  
   def format_activity_description(text)
     h(truncate(text, 250))
   end
diff --git a/app/views/projects/activity.rhtml b/app/views/projects/activity.rhtml
index aca08fd6f..95c8d485f 100644
--- a/app/views/projects/activity.rhtml
+++ b/app/views/projects/activity.rhtml
@@ -1,8 +1,8 @@
-<h2><%= "#{month_name(@month)} #{@year}" %></h2>
+<h2><%= l(:label_activity) %></h2>
 
 <div id="activity">
-<% @events_by_day.keys.sort {|x,y| y <=> x }.each do |day| %>
-<h3><%= day_name(day.cwday) %> <%= day.day %></h3>
+<% @events_by_day.keys.sort.reverse.each do |day| %>
+<h3><%= format_activity_day(day) %></h3>
 <dl>
 <% @events_by_day[day].sort {|x,y| y.event_datetime <=> x.event_datetime }.each do |e| -%>
   <dt class="<%= e.class.name.downcase %>"><span class="time"><%= format_time(e.event_datetime, false) %></span>
@@ -19,14 +19,14 @@
 <%= content_tag('p', l(:label_no_data), :class => 'nodata') if @events_by_day.empty? %>
 
 <div style="float:left;">
-<% prev_params = params.clone.update :year => (@month==1 ? @year-1 : @year), :month =>(@month==1 ? 12 : @month-1) %>
-<%= link_to_remote ('&#171; ' + (@month==1 ? "#{month_name(12)} #{@year-1}" : "#{month_name(@month-1)}")), 
-                    {:update => "content", :url => prev_params}, {:href => url_for(prev_params)} %>
+<%= link_to_remote(('&#171; ' + l(:label_previous)), 
+                   {:update => "content", :url => params.merge(:from => @date_to - @days), :complete => 'window.scrollTo(0,0)'},
+                   {:href => url_for(params.merge(:from => @date_to - @days))}) %>
 </div>
 <div style="float:right;">
-<% next_params = params.clone.update :year => (@month==12 ? @year+1 : @year), :month =>(@month==12 ? 1 : @month+1) %>
-<%= link_to_remote ((@month==12 ? "#{month_name(1)} #{@year+1}" : "#{month_name(@month+1)}") + ' &#187;'), 
-                    {:update => "content", :url => next_params}, {:href => url_for(next_params)} %>
+<%= link_to_remote((l(:label_next) + ' &#187;'), 
+                   {:update => "content", :url => params.merge(:from => @date_to + @days), :complete => 'window.scrollTo(0,0)'},
+                   {:href => url_for(params.merge(:from => @date_to + @days))}) unless @date_to >= Date.today %>
 </div>
 &nbsp;
 <p class="other-formats">
diff --git a/app/views/settings/_general.rhtml b/app/views/settings/_general.rhtml
index 548ebbfac..bb56c43db 100644
--- a/app/views/settings/_general.rhtml
+++ b/app/views/settings/_general.rhtml
@@ -29,6 +29,9 @@
 <p><label><%= l(:setting_per_page_options) %></label>
 <%= text_field_tag 'settings[per_page_options]', Setting.per_page_options_array.join(', '), :size => 20 %><br /><em><%= l(:text_comma_separated) %></em></p>
 
+<p><label><%= l(:setting_activity_days_default) %></label>
+<%= text_field_tag 'settings[activity_days_default]', Setting.activity_days_default, :size => 6 %> <%= l(:label_day_plural) %></p>
+
 <p><label><%= l(:setting_host_name) %></label>
 <%= text_field_tag 'settings[host_name]', Setting.host_name, :size => 60 %></p>
 
diff --git a/config/settings.yml b/config/settings.yml
index 590ebee6a..bb8c1f603 100644
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -37,6 +37,9 @@ attachment_max_size:
 issues_export_limit:
   format: int
   default: 500
+activity_days_default:
+  format: int
+  default: 30
 per_page_options:
   default: '25,50,100'
 mail_from:
diff --git a/lang/bg.yml b/lang/bg.yml
index 12d5dfa5f..a99a8888a 100644
--- a/lang/bg.yml
+++ b/lang/bg.yml
@@ -607,3 +607,4 @@ error_issue_not_found_in_project: 'The issue was not found or does not belong to
 text_assign_time_entries_to_project: Assign reported hours to the project
 text_destroy_time_entries: Delete reported hours
 text_reassign_time_entries: 'Reassign reported hours to this issue:'
+setting_activity_days_default: Days displayed on project activity
diff --git a/lang/cs.yml b/lang/cs.yml
index 56b77d87b..5036b6b45 100644
--- a/lang/cs.yml
+++ b/lang/cs.yml
@@ -607,3 +607,4 @@ error_issue_not_found_in_project: 'The issue was not found or does not belong to
 text_assign_time_entries_to_project: Assign reported hours to the project
 text_destroy_time_entries: Delete reported hours
 text_reassign_time_entries: 'Reassign reported hours to this issue:'
+setting_activity_days_default: Days displayed on project activity
diff --git a/lang/de.yml b/lang/de.yml
index 6cde2d9d4..3d0db927c 100644
--- a/lang/de.yml
+++ b/lang/de.yml
@@ -608,3 +608,4 @@ default_activity_development: Entwicklung
 enumeration_issue_priorities: Ticket-Prioritäten
 enumeration_doc_categories: Dokumentenkategorien
 enumeration_activities: Aktivitäten (Zeiterfassung)
+setting_activity_days_default: Days displayed on project activity
diff --git a/lang/en.yml b/lang/en.yml
index a5da5a855..a23d1b025 100644
--- a/lang/en.yml
+++ b/lang/en.yml
@@ -206,6 +206,7 @@ setting_emails_footer: Emails footer
 setting_protocol: Protocol
 setting_per_page_options: Objects per page options
 setting_user_format: Users display format
+setting_activity_days_default: Days displayed on project activity
 
 project_module_issue_tracking: Issue tracking
 project_module_time_tracking: Time tracking
diff --git a/lang/es.yml b/lang/es.yml
index 9032d3599..66238934d 100644
--- a/lang/es.yml
+++ b/lang/es.yml
@@ -610,3 +610,4 @@ error_issue_not_found_in_project: 'The issue was not found or does not belong to
 text_assign_time_entries_to_project: Assign reported hours to the project
 text_destroy_time_entries: Delete reported hours
 text_reassign_time_entries: 'Reassign reported hours to this issue:'
+setting_activity_days_default: Days displayed on project activity
diff --git a/lang/fi.yml b/lang/fi.yml
index a0f165e56..d85629e1f 100644
--- a/lang/fi.yml
+++ b/lang/fi.yml
@@ -611,3 +611,4 @@ label_last_month: last month
 text_destroy_time_entries: Delete reported hours
 text_reassign_time_entries: 'Reassign reported hours to this issue:'
 label_on: 'on'
+setting_activity_days_default: Days displayed on project activity
diff --git a/lang/fr.yml b/lang/fr.yml
index 30c9f6cca..85e699c3c 100644
--- a/lang/fr.yml
+++ b/lang/fr.yml
@@ -206,6 +206,7 @@ setting_emails_footer: Pied-de-page des emails
 setting_protocol: Protocole
 setting_per_page_options: Options d'objets affichés par page
 setting_user_format: Format d'affichage des utilisateurs
+setting_activity_days_default: Nombre de jours affichés sur l'activité des projets
 
 project_module_issue_tracking: Suivi des demandes
 project_module_time_tracking: Suivi du temps passé
diff --git a/lang/he.yml b/lang/he.yml
index a43f1c022..fe31e860b 100644
--- a/lang/he.yml
+++ b/lang/he.yml
@@ -607,3 +607,4 @@ error_issue_not_found_in_project: 'The issue was not found or does not belong to
 text_assign_time_entries_to_project: Assign reported hours to the project
 text_destroy_time_entries: Delete reported hours
 text_reassign_time_entries: 'Reassign reported hours to this issue:'
+setting_activity_days_default: Days displayed on project activity
diff --git a/lang/it.yml b/lang/it.yml
index 80ffc5f6c..f207c2e19 100644
--- a/lang/it.yml
+++ b/lang/it.yml
@@ -607,3 +607,4 @@ error_issue_not_found_in_project: 'The issue was not found or does not belong to
 text_assign_time_entries_to_project: Assign reported hours to the project
 text_destroy_time_entries: Delete reported hours
 text_reassign_time_entries: 'Reassign reported hours to this issue:'
+setting_activity_days_default: Days displayed on project activity
diff --git a/lang/ja.yml b/lang/ja.yml
index 1c25b1a3f..f00fc4d81 100644
--- a/lang/ja.yml
+++ b/lang/ja.yml
@@ -608,3 +608,4 @@ text_assign_time_entries_to_project: Assign reported hours to the project
 label_optional_description: Optional description
 text_destroy_time_entries: Delete reported hours
 text_reassign_time_entries: 'Reassign reported hours to this issue:'
+setting_activity_days_default: Days displayed on project activity
diff --git a/lang/ko.yml b/lang/ko.yml
index 267560a6d..cf25e23ef 100644
--- a/lang/ko.yml
+++ b/lang/ko.yml
@@ -607,3 +607,4 @@ label_optional_description: Optional description
 label_last_month: last month
 text_destroy_time_entries: Delete reported hours
 text_reassign_time_entries: 'Reassign reported hours to this issue:'
+setting_activity_days_default: Days displayed on project activity
diff --git a/lang/lt.yml b/lang/lt.yml
index 5d26c7ea9..b50120764 100644
--- a/lang/lt.yml
+++ b/lang/lt.yml
@@ -608,3 +608,4 @@ error_issue_not_found_in_project: 'The issue was not found or does not belong to
 text_assign_time_entries_to_project: Assign reported hours to the project
 text_destroy_time_entries: Delete reported hours
 text_reassign_time_entries: 'Reassign reported hours to this issue:'
+setting_activity_days_default: Days displayed on project activity
diff --git a/lang/nl.yml b/lang/nl.yml
index 12563f2e4..2d8a6aa00 100644
--- a/lang/nl.yml
+++ b/lang/nl.yml
@@ -608,3 +608,4 @@ error_issue_not_found_in_project: 'The issue was not found or does not belong to
 text_assign_time_entries_to_project: Assign reported hours to the project
 text_destroy_time_entries: Delete reported hours
 text_reassign_time_entries: 'Reassign reported hours to this issue:'
+setting_activity_days_default: Days displayed on project activity
diff --git a/lang/pl.yml b/lang/pl.yml
index 575c8262a..57559aedb 100644
--- a/lang/pl.yml
+++ b/lang/pl.yml
@@ -607,3 +607,4 @@ error_issue_not_found_in_project: 'The issue was not found or does not belong to
 text_assign_time_entries_to_project: Assign reported hours to the project
 text_destroy_time_entries: Delete reported hours
 text_reassign_time_entries: 'Reassign reported hours to this issue:'
+setting_activity_days_default: Days displayed on project activity
diff --git a/lang/pt-br.yml b/lang/pt-br.yml
index d128617da..35f490b83 100644
--- a/lang/pt-br.yml
+++ b/lang/pt-br.yml
@@ -607,3 +607,4 @@ error_issue_not_found_in_project: 'The issue was not found or does not belong to
 text_assign_time_entries_to_project: Assign reported hours to the project
 text_destroy_time_entries: Delete reported hours
 text_reassign_time_entries: 'Reassign reported hours to this issue:'
+setting_activity_days_default: Days displayed on project activity
diff --git a/lang/pt.yml b/lang/pt.yml
index 33b76892b..c07364f72 100644
--- a/lang/pt.yml
+++ b/lang/pt.yml
@@ -607,3 +607,4 @@ error_issue_not_found_in_project: 'The issue was not found or does not belong to
 text_assign_time_entries_to_project: Assign reported hours to the project
 text_destroy_time_entries: Delete reported hours
 text_reassign_time_entries: 'Reassign reported hours to this issue:'
+setting_activity_days_default: Days displayed on project activity
diff --git a/lang/ro.yml b/lang/ro.yml
index b8b737e42..68de767a9 100644
--- a/lang/ro.yml
+++ b/lang/ro.yml
@@ -607,3 +607,4 @@ error_issue_not_found_in_project: 'The issue was not found or does not belong to
 text_assign_time_entries_to_project: Assign reported hours to the project
 text_destroy_time_entries: Delete reported hours
 text_reassign_time_entries: 'Reassign reported hours to this issue:'
+setting_activity_days_default: Days displayed on project activity
diff --git a/lang/ru.yml b/lang/ru.yml
index a92105ca4..39a30fd3b 100644
--- a/lang/ru.yml
+++ b/lang/ru.yml
@@ -611,3 +611,4 @@ error_issue_not_found_in_project: Задача не была найдена ил
 text_assign_time_entries_to_project: Прикрепить зарегистрированное время к проекту
 text_destroy_time_entries: Удалить зарегистрированное время
 text_reassign_time_entries: 'Перенести зарегистрированное время на следующую задачу:'
+setting_activity_days_default: Days displayed on project activity
diff --git a/lang/sr.yml b/lang/sr.yml
index 16e870b76..5e693c09e 100644
--- a/lang/sr.yml
+++ b/lang/sr.yml
@@ -608,3 +608,4 @@ error_issue_not_found_in_project: 'The issue was not found or does not belong to
 text_assign_time_entries_to_project: Assign reported hours to the project
 text_destroy_time_entries: Delete reported hours
 text_reassign_time_entries: 'Reassign reported hours to this issue:'
+setting_activity_days_default: Days displayed on project activity
diff --git a/lang/sv.yml b/lang/sv.yml
index 3375a6850..1b4698f35 100644
--- a/lang/sv.yml
+++ b/lang/sv.yml
@@ -608,3 +608,4 @@ error_issue_not_found_in_project: 'The issue was not found or does not belong to
 text_assign_time_entries_to_project: Assign reported hours to the project
 text_destroy_time_entries: Delete reported hours
 text_reassign_time_entries: 'Reassign reported hours to this issue:'
+setting_activity_days_default: Days displayed on project activity
diff --git a/lang/uk.yml b/lang/uk.yml
index 2fd3589f5..c26454189 100644
--- a/lang/uk.yml
+++ b/lang/uk.yml
@@ -609,3 +609,4 @@ error_issue_not_found_in_project: 'The issue was not found or does not belong to
 text_assign_time_entries_to_project: Assign reported hours to the project
 text_destroy_time_entries: Delete reported hours
 text_reassign_time_entries: 'Reassign reported hours to this issue:'
+setting_activity_days_default: Days displayed on project activity
diff --git a/lang/zh-tw.yml b/lang/zh-tw.yml
index 58088d84f..5d5040811 100644
--- a/lang/zh-tw.yml
+++ b/lang/zh-tw.yml
@@ -608,3 +608,4 @@ default_activity_development: 開發
 enumeration_issue_priorities: 項目優先權
 enumeration_doc_categories: 文件分類
 enumeration_activities: 活動 (time tracking)
+setting_activity_days_default: Days displayed on project activity
diff --git a/lang/zh.yml b/lang/zh.yml
index 3d88c8565..8646d47cd 100644
--- a/lang/zh.yml
+++ b/lang/zh.yml
@@ -608,3 +608,4 @@ default_activity_development: 开发
 enumeration_issue_priorities: 问题优先级
 enumeration_doc_categories: 文档类别
 enumeration_activities: 活动（时间跟踪）
+setting_activity_days_default: Days displayed on project activity
diff --git a/test/functional/projects_controller_test.rb b/test/functional/projects_controller_test.rb
index 92ac6f09a..f610469df 100644
--- a/test/functional/projects_controller_test.rb
+++ b/test/functional/projects_controller_test.rb
@@ -130,7 +130,7 @@ class ProjectsControllerTest < Test::Unit::TestCase
   end
 
   def test_activity
-    get :activity, :id => 1, :year => 2.days.ago.to_date.year, :month => 2.days.ago.to_date.month
+    get :activity, :id => 1
     assert_response :success
     assert_template 'activity'
     assert_not_nil assigns(:events_by_day)
@@ -146,7 +146,7 @@ class ProjectsControllerTest < Test::Unit::TestCase
                  }
                }
                
-    get :activity, :id => 1, :year => 3.days.ago.to_date.year, :month => 3.days.ago.to_date.month
+    get :activity, :id => 1, :from => 3.days.ago.to_date
     assert_response :success
     assert_template 'activity'
     assert_not_nil assigns(:events_by_day)

From e951d8458413f02ba613163df862d1a352ed3692 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Wed, 5 Mar 2008 15:41:54 +0000
Subject: [PATCH 256/710] Add a user preference to choose how comments/replies
 are displayed: in chronological or reverse chronological order (#589, #776).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1197 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/issues_controller.rb   |  2 ++
 app/controllers/messages_controller.rb |  2 ++
 app/controllers/news_controller.rb     |  2 ++
 app/models/journal.rb                  |  1 +
 app/models/user.rb                     |  4 ++++
 app/models/user_preference.rb          |  3 +++
 app/views/issues/_history.rhtml        |  6 ++----
 app/views/messages/edit.rhtml          |  2 +-
 app/views/messages/show.rhtml          |  6 +++---
 app/views/my/account.rhtml             | 14 +++++++++-----
 app/views/news/show.rhtml              |  9 +++++----
 lang/bg.yml                            |  4 ++++
 lang/cs.yml                            |  4 ++++
 lang/de.yml                            |  4 ++++
 lang/en.yml                            |  4 ++++
 lang/es.yml                            |  4 ++++
 lang/fi.yml                            |  4 ++++
 lang/fr.yml                            |  4 ++++
 lang/he.yml                            |  4 ++++
 lang/it.yml                            |  4 ++++
 lang/ja.yml                            |  4 ++++
 lang/ko.yml                            |  4 ++++
 lang/lt.yml                            |  4 ++++
 lang/nl.yml                            |  4 ++++
 lang/pl.yml                            |  4 ++++
 lang/pt-br.yml                         |  4 ++++
 lang/pt.yml                            |  4 ++++
 lang/ro.yml                            |  4 ++++
 lang/ru.yml                            |  4 ++++
 lang/sr.yml                            |  4 ++++
 lang/sv.yml                            |  4 ++++
 lang/uk.yml                            |  4 ++++
 lang/zh-tw.yml                         |  4 ++++
 lang/zh.yml                            |  4 ++++
 test/unit/user_test.rb                 |  8 ++++++++
 35 files changed, 134 insertions(+), 17 deletions(-)

diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index 4a44d09bc..263675040 100644
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -92,6 +92,8 @@ class IssuesController < ApplicationController
   def show
     @custom_values = @project.custom_fields_for_issues(@issue.tracker).collect { |x| @issue.custom_values.find_by_custom_field_id(x.id) || CustomValue.new(:custom_field => x, :customized => @issue) }
     @journals = @issue.journals.find(:all, :include => [:user, :details], :order => "#{Journal.table_name}.created_on ASC")
+    @journals.each_with_index {|j,i| j.indice = i+1}
+    @journals.reverse! if User.current.wants_comments_in_reverse_order?
     @allowed_statuses = @issue.new_statuses_allowed_to(User.current)
     @edit_allowed = User.current.allowed_to?(:edit_issues, @project)
     @activities = Enumeration::get_values('ACTI')
diff --git a/app/controllers/messages_controller.rb b/app/controllers/messages_controller.rb
index 49f4ba77c..64a7fa1c9 100644
--- a/app/controllers/messages_controller.rb
+++ b/app/controllers/messages_controller.rb
@@ -29,6 +29,8 @@ class MessagesController < ApplicationController
 
   # Show a topic and its replies
   def show
+    @replies = @topic.children
+    @replies.reverse! if User.current.wants_comments_in_reverse_order?
     @reply = Message.new(:subject => "RE: #{@message.subject}")
     render :action => "show", :layout => false if request.xhr?
   end
diff --git a/app/controllers/news_controller.rb b/app/controllers/news_controller.rb
index 66ed61cf4..c9ba6b991 100644
--- a/app/controllers/news_controller.rb
+++ b/app/controllers/news_controller.rb
@@ -36,6 +36,8 @@ class NewsController < ApplicationController
   end
   
   def show
+    @comments = @news.comments
+    @comments.reverse! if User.current.wants_comments_in_reverse_order?
   end
 
   def new
diff --git a/app/models/journal.rb b/app/models/journal.rb
index d757ef90d..7c5e3d3bf 100644
--- a/app/models/journal.rb
+++ b/app/models/journal.rb
@@ -23,6 +23,7 @@ class Journal < ActiveRecord::Base
   
   belongs_to :user
   has_many :details, :class_name => "JournalDetail", :dependent => :delete_all
+  attr_accessor :indice
   
   acts_as_searchable :columns => 'notes',
                      :include => :issue,
diff --git a/app/models/user.rb b/app/models/user.rb
index 22d66539d..2dd698f28 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -144,6 +144,10 @@ class User < ActiveRecord::Base
     self.pref.time_zone.nil? ? nil : TimeZone[self.pref.time_zone]
   end
   
+  def wants_comments_in_reverse_order?
+    self.pref[:comments_sorting] == 'desc'
+  end
+  
   # Return user's RSS key (a 40 chars long string), used to access feeds
   def rss_key
     token = self.rss_token || Token.create(:user => self, :action => 'feeds')
diff --git a/app/models/user_preference.rb b/app/models/user_preference.rb
index 1ed9e0fd9..73e4a50c6 100644
--- a/app/models/user_preference.rb
+++ b/app/models/user_preference.rb
@@ -46,4 +46,7 @@ class UserPreference < ActiveRecord::Base
       self.others.store attr_name, value
     end
   end
+  
+  def comments_sorting; self[:comments_sorting] end
+  def comments_sorting=(order); self[:comments_sorting]=order end
 end
diff --git a/app/views/issues/_history.rhtml b/app/views/issues/_history.rhtml
index 7c1ee2113..373758874 100644
--- a/app/views/issues/_history.rhtml
+++ b/app/views/issues/_history.rhtml
@@ -1,8 +1,7 @@
-<% note_id = 1 %>
 <% for journal in journals %>
     <div id="change-<%= journal.id %>">
-	<h4><div style="float:right;"><%= link_to "##{note_id}", :anchor => "note-#{note_id}" %></div>
-	<%= content_tag('a', '', :name => "note-#{note_id}")%>
+	<h4><div style="float:right;"><%= link_to "##{journal.indice}", :anchor => "note-#{journal.indice}" %></div>
+	<%= content_tag('a', '', :name => "note-#{journal.indice}")%>
 	<%= format_time(journal.created_on) %> - <%= journal.user.name %></h4>
 	<ul>
 	<% for detail in journal.details %>
@@ -11,5 +10,4 @@
 	</ul>
 	<%= render_notes(journal) unless journal.notes.blank? %>
 	</div>
-  	<% note_id += 1 %>
 <% end %>
diff --git a/app/views/messages/edit.rhtml b/app/views/messages/edit.rhtml
index 808b6ea27..dcc59a396 100644
--- a/app/views/messages/edit.rhtml
+++ b/app/views/messages/edit.rhtml
@@ -1,6 +1,6 @@
 <h2><%= link_to h(@board.name), :controller => 'boards', :action => 'show', :project_id => @project, :id => @board %> &#187; <%=h @message.subject %></h2>
 
 <% form_for :message, @message, :url => {:action => 'edit'}, :html => {:multipart => true} do |f| %>
-  <%= render :partial => 'form', :locals => {:f => f} %>
+  <%= render :partial => 'form', :locals => {:f => f, :replying => !@message.parent.nil?} %>
   <%= submit_tag l(:button_save) %>
 <% end %>
diff --git a/app/views/messages/show.rhtml b/app/views/messages/show.rhtml
index 7d4c9989e..b9897cb40 100644
--- a/app/views/messages/show.rhtml
+++ b/app/views/messages/show.rhtml
@@ -15,11 +15,11 @@
 <br />
 
 <h3 class="icon22 icon22-comment"><%= l(:label_reply_plural) %></h3>
-<% @topic.children.each do |message| %>
+<% @replies.each do |message| %>
   <a name="<%= "message-#{message.id}" %>"></a>
   <div class="contextual">
-    <%= link_to_if_authorized l(:button_edit), {:action => 'edit', :id => message}, :class => 'icon icon-edit' %>
-    <%= link_to_if_authorized l(:button_delete), {:action => 'destroy', :id => message}, :method => :post, :confirm => l(:text_are_you_sure), :class => 'icon icon-del' %>
+    <%= link_to_if_authorized image_tag('edit.png'), {:action => 'edit', :id => message}, :title => l(:button_edit) %>
+    <%= link_to_if_authorized image_tag('delete.png'), {:action => 'destroy', :id => message}, :method => :post, :confirm => l(:text_are_you_sure), :title => l(:button_delete) %>
   </div>
   <div class="message reply">
   <h4><%=h message.subject %> - <%= authoring message.created_on, message.author %></h4>
diff --git a/app/views/my/account.rhtml b/app/views/my/account.rhtml
index 77568836d..20210c99a 100644
--- a/app/views/my/account.rhtml
+++ b/app/views/my/account.rhtml
@@ -15,11 +15,6 @@
 <p><%= f.text_field :lastname, :required => true %></p>
 <p><%= f.text_field :mail, :required => true %></p>
 <p><%= f.select :language, lang_options_for_select %></p>
-
-<% fields_for :pref, @user.pref, :builder => TabularFormBuilder, :lang => current_language do |pref_fields| %>
-<p><%= pref_fields.select :time_zone, TimeZone.all.collect {|z| [ z.to_s, z.name ]}, :include_blank => true %></p>
-<p><%= pref_fields.check_box :hide_mail %></p>
-<% end %>
 </div>
 
 <%= submit_tag l(:button_save) %>
@@ -38,6 +33,15 @@
 <% end %>
 <p><label><%= check_box_tag 'no_self_notified', 1, @user.pref[:no_self_notified] %> <%= l(:label_user_mail_no_self_notified) %></label></p>
 </div>
+
+<h3><%=l(:label_preferences)%></h3>
+<div class="box tabular">
+<% fields_for :pref, @user.pref, :builder => TabularFormBuilder, :lang => current_language do |pref_fields| %>
+<p><%= pref_fields.check_box :hide_mail %></p>
+<p><%= pref_fields.select :time_zone, TimeZone.all.collect {|z| [ z.to_s, z.name ]}, :include_blank => true %></p>
+<p><%= pref_fields.select :comments_sorting, [[l(:label_chronological_order), 'asc'], [l(:label_reverse_chronological_order), 'desc']] %></p>
+<% end %>
+</div>
 </div>
 <% end %>
 
diff --git a/app/views/news/show.rhtml b/app/views/news/show.rhtml
index cc9eed043..6de8aa86e 100644
--- a/app/views/news/show.rhtml
+++ b/app/views/news/show.rhtml
@@ -34,14 +34,15 @@
 
 <div id="comments" style="margin-bottom:16px;">
 <h3 class="icon22 icon22-comment"><%= l(:label_comment_plural) %></h3>
-<% @news.comments.each do |comment| %>
+<% @comments.each do |comment| %>
     <% next if comment.new_record? %>
-    <h4><%= authoring comment.created_on, comment.author %></h4>
     <div class="contextual">
-        <%= link_to_if_authorized l(:button_delete), {:controller => 'news', :action => 'destroy_comment', :id => @news, :comment_id => comment}, :confirm => l(:text_are_you_sure), :method => :post, :class => 'icon icon-del' %>
+    <%= link_to_if_authorized image_tag('delete.png'), {:controller => 'news', :action => 'destroy_comment', :id => @news, :comment_id => comment},
+                                                       :confirm => l(:text_are_you_sure), :method => :post, :title => l(:button_delete) %>
     </div>
+    <h4><%= authoring comment.created_on, comment.author %></h4>
     <%= textilizable(comment.comments) %>
-<% end if @news.comments_count > 0 %>
+<% end if @comments.any? %>
 </div>
 
 <% if authorize_for 'news', 'add_comment' %>
diff --git a/lang/bg.yml b/lang/bg.yml
index a99a8888a..11e18b849 100644
--- a/lang/bg.yml
+++ b/lang/bg.yml
@@ -608,3 +608,7 @@ text_assign_time_entries_to_project: Assign reported hours to the project
 text_destroy_time_entries: Delete reported hours
 text_reassign_time_entries: 'Reassign reported hours to this issue:'
 setting_activity_days_default: Days displayed on project activity
+label_chronological_order: In chronological order
+field_comments_sorting: Afficher les commentaires
+label_reverse_chronological_order: In reverse chronological order
+label_preferences: Preferences
diff --git a/lang/cs.yml b/lang/cs.yml
index 5036b6b45..ccf93fb9c 100644
--- a/lang/cs.yml
+++ b/lang/cs.yml
@@ -608,3 +608,7 @@ text_assign_time_entries_to_project: Assign reported hours to the project
 text_destroy_time_entries: Delete reported hours
 text_reassign_time_entries: 'Reassign reported hours to this issue:'
 setting_activity_days_default: Days displayed on project activity
+label_chronological_order: In chronological order
+field_comments_sorting: Afficher les commentaires
+label_reverse_chronological_order: In reverse chronological order
+label_preferences: Preferences
diff --git a/lang/de.yml b/lang/de.yml
index 3d0db927c..bdbe549c2 100644
--- a/lang/de.yml
+++ b/lang/de.yml
@@ -609,3 +609,7 @@ enumeration_issue_priorities: Ticket-Prioritäten
 enumeration_doc_categories: Dokumentenkategorien
 enumeration_activities: Aktivitäten (Zeiterfassung)
 setting_activity_days_default: Days displayed on project activity
+label_chronological_order: In chronological order
+field_comments_sorting: Afficher les commentaires
+label_reverse_chronological_order: In reverse chronological order
+label_preferences: Preferences
diff --git a/lang/en.yml b/lang/en.yml
index a23d1b025..0445834fe 100644
--- a/lang/en.yml
+++ b/lang/en.yml
@@ -177,6 +177,7 @@ field_column_names: Columns
 field_time_zone: Time zone
 field_searchable: Searchable
 field_default_value: Default value
+field_comments_sorting: Afficher les commentaires
 
 setting_app_title: Application title
 setting_app_subtitle: Application subtitle
@@ -501,6 +502,9 @@ label_ldap_authentication: LDAP authentication
 label_downloads_abbr: D/L
 label_optional_description: Optional description
 label_add_another_file: Add another file
+label_preferences: Preferences
+label_chronological_order: In chronological order
+label_reverse_chronological_order: In reverse chronological order
 
 button_login: Login
 button_submit: Submit
diff --git a/lang/es.yml b/lang/es.yml
index 66238934d..d137054d9 100644
--- a/lang/es.yml
+++ b/lang/es.yml
@@ -611,3 +611,7 @@ text_assign_time_entries_to_project: Assign reported hours to the project
 text_destroy_time_entries: Delete reported hours
 text_reassign_time_entries: 'Reassign reported hours to this issue:'
 setting_activity_days_default: Days displayed on project activity
+label_chronological_order: In chronological order
+field_comments_sorting: Afficher les commentaires
+label_reverse_chronological_order: In reverse chronological order
+label_preferences: Preferences
diff --git a/lang/fi.yml b/lang/fi.yml
index d85629e1f..b2ad672f4 100644
--- a/lang/fi.yml
+++ b/lang/fi.yml
@@ -612,3 +612,7 @@ text_destroy_time_entries: Delete reported hours
 text_reassign_time_entries: 'Reassign reported hours to this issue:'
 label_on: 'on'
 setting_activity_days_default: Days displayed on project activity
+label_chronological_order: In chronological order
+field_comments_sorting: Afficher les commentaires
+label_reverse_chronological_order: In reverse chronological order
+label_preferences: Preferences
diff --git a/lang/fr.yml b/lang/fr.yml
index 85e699c3c..b992ceff2 100644
--- a/lang/fr.yml
+++ b/lang/fr.yml
@@ -177,6 +177,7 @@ field_column_names: Colonnes
 field_time_zone: Fuseau horaire
 field_searchable: Utilisé pour les recherches
 field_default_value: Valeur par défaut
+field_comments_sorting: Afficher les commentaires
 
 setting_app_title: Titre de l'application
 setting_app_subtitle: Sous-titre de l'application
@@ -501,6 +502,9 @@ label_ldap_authentication: Authentification LDAP
 label_downloads_abbr: D/L
 label_optional_description: Description facultative
 label_add_another_file: Ajouter un autre fichier
+label_preferences: Préférences
+label_chronological_order: Dans l'ordre chronologique
+label_reverse_chronological_order: Dans l'ordre chronologique inverse
 
 button_login: Connexion
 button_submit: Soumettre
diff --git a/lang/he.yml b/lang/he.yml
index fe31e860b..66a493bbb 100644
--- a/lang/he.yml
+++ b/lang/he.yml
@@ -608,3 +608,7 @@ text_assign_time_entries_to_project: Assign reported hours to the project
 text_destroy_time_entries: Delete reported hours
 text_reassign_time_entries: 'Reassign reported hours to this issue:'
 setting_activity_days_default: Days displayed on project activity
+label_chronological_order: In chronological order
+field_comments_sorting: Afficher les commentaires
+label_reverse_chronological_order: In reverse chronological order
+label_preferences: Preferences
diff --git a/lang/it.yml b/lang/it.yml
index f207c2e19..c47729c50 100644
--- a/lang/it.yml
+++ b/lang/it.yml
@@ -608,3 +608,7 @@ text_assign_time_entries_to_project: Assign reported hours to the project
 text_destroy_time_entries: Delete reported hours
 text_reassign_time_entries: 'Reassign reported hours to this issue:'
 setting_activity_days_default: Days displayed on project activity
+label_chronological_order: In chronological order
+field_comments_sorting: Afficher les commentaires
+label_reverse_chronological_order: In reverse chronological order
+label_preferences: Preferences
diff --git a/lang/ja.yml b/lang/ja.yml
index f00fc4d81..37392dd7e 100644
--- a/lang/ja.yml
+++ b/lang/ja.yml
@@ -609,3 +609,7 @@ label_optional_description: Optional description
 text_destroy_time_entries: Delete reported hours
 text_reassign_time_entries: 'Reassign reported hours to this issue:'
 setting_activity_days_default: Days displayed on project activity
+label_chronological_order: In chronological order
+field_comments_sorting: Afficher les commentaires
+label_reverse_chronological_order: In reverse chronological order
+label_preferences: Preferences
diff --git a/lang/ko.yml b/lang/ko.yml
index cf25e23ef..5685d063a 100644
--- a/lang/ko.yml
+++ b/lang/ko.yml
@@ -608,3 +608,7 @@ label_last_month: last month
 text_destroy_time_entries: Delete reported hours
 text_reassign_time_entries: 'Reassign reported hours to this issue:'
 setting_activity_days_default: Days displayed on project activity
+label_chronological_order: In chronological order
+field_comments_sorting: Afficher les commentaires
+label_reverse_chronological_order: In reverse chronological order
+label_preferences: Preferences
diff --git a/lang/lt.yml b/lang/lt.yml
index b50120764..c783f5768 100644
--- a/lang/lt.yml
+++ b/lang/lt.yml
@@ -609,3 +609,7 @@ text_assign_time_entries_to_project: Assign reported hours to the project
 text_destroy_time_entries: Delete reported hours
 text_reassign_time_entries: 'Reassign reported hours to this issue:'
 setting_activity_days_default: Days displayed on project activity
+label_chronological_order: In chronological order
+field_comments_sorting: Afficher les commentaires
+label_reverse_chronological_order: In reverse chronological order
+label_preferences: Preferences
diff --git a/lang/nl.yml b/lang/nl.yml
index 2d8a6aa00..6d650456d 100644
--- a/lang/nl.yml
+++ b/lang/nl.yml
@@ -609,3 +609,7 @@ text_assign_time_entries_to_project: Assign reported hours to the project
 text_destroy_time_entries: Delete reported hours
 text_reassign_time_entries: 'Reassign reported hours to this issue:'
 setting_activity_days_default: Days displayed on project activity
+label_chronological_order: In chronological order
+field_comments_sorting: Afficher les commentaires
+label_reverse_chronological_order: In reverse chronological order
+label_preferences: Preferences
diff --git a/lang/pl.yml b/lang/pl.yml
index 57559aedb..bf8f3f1ba 100644
--- a/lang/pl.yml
+++ b/lang/pl.yml
@@ -608,3 +608,7 @@ text_assign_time_entries_to_project: Assign reported hours to the project
 text_destroy_time_entries: Delete reported hours
 text_reassign_time_entries: 'Reassign reported hours to this issue:'
 setting_activity_days_default: Days displayed on project activity
+label_chronological_order: In chronological order
+field_comments_sorting: Afficher les commentaires
+label_reverse_chronological_order: In reverse chronological order
+label_preferences: Preferences
diff --git a/lang/pt-br.yml b/lang/pt-br.yml
index 35f490b83..9ddd6f94b 100644
--- a/lang/pt-br.yml
+++ b/lang/pt-br.yml
@@ -608,3 +608,7 @@ text_assign_time_entries_to_project: Assign reported hours to the project
 text_destroy_time_entries: Delete reported hours
 text_reassign_time_entries: 'Reassign reported hours to this issue:'
 setting_activity_days_default: Days displayed on project activity
+label_chronological_order: In chronological order
+field_comments_sorting: Afficher les commentaires
+label_reverse_chronological_order: In reverse chronological order
+label_preferences: Preferences
diff --git a/lang/pt.yml b/lang/pt.yml
index c07364f72..63972d042 100644
--- a/lang/pt.yml
+++ b/lang/pt.yml
@@ -608,3 +608,7 @@ text_assign_time_entries_to_project: Assign reported hours to the project
 text_destroy_time_entries: Delete reported hours
 text_reassign_time_entries: 'Reassign reported hours to this issue:'
 setting_activity_days_default: Days displayed on project activity
+label_chronological_order: In chronological order
+field_comments_sorting: Afficher les commentaires
+label_reverse_chronological_order: In reverse chronological order
+label_preferences: Preferences
diff --git a/lang/ro.yml b/lang/ro.yml
index 68de767a9..9d374af53 100644
--- a/lang/ro.yml
+++ b/lang/ro.yml
@@ -608,3 +608,7 @@ text_assign_time_entries_to_project: Assign reported hours to the project
 text_destroy_time_entries: Delete reported hours
 text_reassign_time_entries: 'Reassign reported hours to this issue:'
 setting_activity_days_default: Days displayed on project activity
+label_chronological_order: In chronological order
+field_comments_sorting: Afficher les commentaires
+label_reverse_chronological_order: In reverse chronological order
+label_preferences: Preferences
diff --git a/lang/ru.yml b/lang/ru.yml
index 39a30fd3b..d5b67f964 100644
--- a/lang/ru.yml
+++ b/lang/ru.yml
@@ -612,3 +612,7 @@ text_assign_time_entries_to_project: Прикрепить зарегистрир
 text_destroy_time_entries: Удалить зарегистрированное время
 text_reassign_time_entries: 'Перенести зарегистрированное время на следующую задачу:'
 setting_activity_days_default: Days displayed on project activity
+label_chronological_order: In chronological order
+field_comments_sorting: Afficher les commentaires
+label_reverse_chronological_order: In reverse chronological order
+label_preferences: Preferences
diff --git a/lang/sr.yml b/lang/sr.yml
index 5e693c09e..edef5f7f5 100644
--- a/lang/sr.yml
+++ b/lang/sr.yml
@@ -609,3 +609,7 @@ text_assign_time_entries_to_project: Assign reported hours to the project
 text_destroy_time_entries: Delete reported hours
 text_reassign_time_entries: 'Reassign reported hours to this issue:'
 setting_activity_days_default: Days displayed on project activity
+label_chronological_order: In chronological order
+field_comments_sorting: Afficher les commentaires
+label_reverse_chronological_order: In reverse chronological order
+label_preferences: Preferences
diff --git a/lang/sv.yml b/lang/sv.yml
index 1b4698f35..f3940759b 100644
--- a/lang/sv.yml
+++ b/lang/sv.yml
@@ -609,3 +609,7 @@ text_assign_time_entries_to_project: Assign reported hours to the project
 text_destroy_time_entries: Delete reported hours
 text_reassign_time_entries: 'Reassign reported hours to this issue:'
 setting_activity_days_default: Days displayed on project activity
+label_chronological_order: In chronological order
+field_comments_sorting: Afficher les commentaires
+label_reverse_chronological_order: In reverse chronological order
+label_preferences: Preferences
diff --git a/lang/uk.yml b/lang/uk.yml
index c26454189..d8e4a7a66 100644
--- a/lang/uk.yml
+++ b/lang/uk.yml
@@ -610,3 +610,7 @@ text_assign_time_entries_to_project: Assign reported hours to the project
 text_destroy_time_entries: Delete reported hours
 text_reassign_time_entries: 'Reassign reported hours to this issue:'
 setting_activity_days_default: Days displayed on project activity
+label_chronological_order: In chronological order
+field_comments_sorting: Afficher les commentaires
+label_reverse_chronological_order: In reverse chronological order
+label_preferences: Preferences
diff --git a/lang/zh-tw.yml b/lang/zh-tw.yml
index 5d5040811..eb1a5e305 100644
--- a/lang/zh-tw.yml
+++ b/lang/zh-tw.yml
@@ -609,3 +609,7 @@ enumeration_issue_priorities: 項目優先權
 enumeration_doc_categories: 文件分類
 enumeration_activities: 活動 (time tracking)
 setting_activity_days_default: Days displayed on project activity
+label_chronological_order: In chronological order
+field_comments_sorting: Afficher les commentaires
+label_reverse_chronological_order: In reverse chronological order
+label_preferences: Preferences
diff --git a/lang/zh.yml b/lang/zh.yml
index 8646d47cd..e7d790938 100644
--- a/lang/zh.yml
+++ b/lang/zh.yml
@@ -609,3 +609,7 @@ enumeration_issue_priorities: 问题优先级
 enumeration_doc_categories: 文档类别
 enumeration_activities: 活动（时间跟踪）
 setting_activity_days_default: Days displayed on project activity
+label_chronological_order: In chronological order
+field_comments_sorting: Afficher les commentaires
+label_reverse_chronological_order: In reverse chronological order
+label_preferences: Preferences
diff --git a/test/unit/user_test.rb b/test/unit/user_test.rb
index 845a34afd..3209f261a 100644
--- a/test/unit/user_test.rb
+++ b/test/unit/user_test.rb
@@ -144,4 +144,12 @@ class UserTest < Test::Unit::TestCase
     @jsmith.reload
     assert !@jsmith.projects.first.recipients.include?(@jsmith.mail)
   end
+  
+  def test_comments_sorting_preference
+    assert !@jsmith.wants_comments_in_reverse_order?
+    @jsmith.pref.comments_sorting = 'asc'
+    assert !@jsmith.wants_comments_in_reverse_order?
+    @jsmith.pref.comments_sorting = 'desc'
+    assert @jsmith.wants_comments_in_reverse_order?
+  end
 end

From 533994e5ea00d8273298becd612f8615fba76c0c Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Thu, 6 Mar 2008 08:32:56 +0000
Subject: [PATCH 257/710] Adds an application setting to choose whether or not
 subprojects issues should be displayed by default on the issue list, calendar
 and gantt (r1178). Default is true.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1198 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/projects_controller.rb |  4 ++--
 app/models/query.rb                    | 19 +++++++++++++------
 app/views/settings/_issues.rhtml       |  3 +++
 config/settings.yml                    |  2 ++
 lang/bg.yml                            |  1 +
 lang/cs.yml                            |  1 +
 lang/de.yml                            |  1 +
 lang/en.yml                            |  1 +
 lang/es.yml                            |  1 +
 lang/fi.yml                            |  1 +
 lang/fr.yml                            |  1 +
 lang/he.yml                            |  1 +
 lang/it.yml                            |  1 +
 lang/ja.yml                            |  1 +
 lang/ko.yml                            |  1 +
 lang/lt.yml                            |  1 +
 lang/nl.yml                            |  1 +
 lang/pl.yml                            |  1 +
 lang/pt-br.yml                         |  1 +
 lang/pt.yml                            |  1 +
 lang/ro.yml                            |  1 +
 lang/ru.yml                            |  1 +
 lang/sr.yml                            |  1 +
 lang/sv.yml                            |  1 +
 lang/uk.yml                            |  1 +
 lang/zh-tw.yml                         |  1 +
 lang/zh.yml                            |  1 +
 27 files changed, 43 insertions(+), 8 deletions(-)

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index b9758c810..af5960399 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -302,7 +302,7 @@ class ProjectsController < ApplicationController
     @year ||= Date.today.year
     @month ||= Date.today.month    
     @calendar = Redmine::Helpers::Calendar.new(Date.civil(@year, @month, 1), current_language, :month)
-    @with_subprojects = params[:with_subprojects].nil? ? true : (params[:with_subprojects] == '1')
+    @with_subprojects = params[:with_subprojects].nil? ? Setting.display_subprojects_issues? : (params[:with_subprojects] == '1')
     events = []
     @project.issues_with_subprojects(@with_subprojects) do
       events += Issue.find(:all, 
@@ -345,7 +345,7 @@ class ProjectsController < ApplicationController
     
     @date_from = Date.civil(@year_from, @month_from, 1)
     @date_to = (@date_from >> @months) - 1
-    @with_subprojects = params[:with_subprojects].nil? ? true : (params[:with_subprojects] == '1')
+    @with_subprojects = params[:with_subprojects].nil? ? Setting.display_subprojects_issues? : (params[:with_subprojects] == '1')
     
     @events = []
     @project.issues_with_subprojects(@with_subprojects) do
diff --git a/app/models/query.rb b/app/models/query.rb
index 73828f739..665280ac2 100644
--- a/app/models/query.rb
+++ b/app/models/query.rb
@@ -261,12 +261,19 @@ class Query < ActiveRecord::Base
     clause = ''
     if project && !@project.active_children.empty?
       ids = [project.id]
-      if has_filter?("subproject_id") && operator_for("subproject_id") == "="
-        # include the selected subprojects
-        ids += values_for("subproject_id").each(&:to_i)
-      else
-        # include all the subprojects unless 'none' is selected
-        ids += project.active_children.collect{|p| p.id} unless has_filter?("subproject_id") && operator_for("subproject_id") == "!*"
+      if has_filter?("subproject_id")
+        case operator_for("subproject_id")
+        when '='
+          # include the selected subprojects
+          ids += values_for("subproject_id").each(&:to_i)
+        when '!*'
+          # main project only
+        else
+          # all subprojects
+          ids += project.active_children.collect{|p| p.id}
+        end
+      elsif Setting.display_subprojects_issues?
+        ids += project.active_children.collect{|p| p.id}
       end
       clause << "#{Issue.table_name}.project_id IN (%s)" % ids.join(',')
     elsif project
diff --git a/app/views/settings/_issues.rhtml b/app/views/settings/_issues.rhtml
index 36c604fd9..bbd7356fd 100644
--- a/app/views/settings/_issues.rhtml
+++ b/app/views/settings/_issues.rhtml
@@ -4,6 +4,9 @@
 <p><label><%= l(:setting_cross_project_issue_relations) %></label>
 <%= check_box_tag 'settings[cross_project_issue_relations]', 1, Setting.cross_project_issue_relations? %><%= hidden_field_tag 'settings[cross_project_issue_relations]', 0 %></p>
 
+<p><label><%= l(:setting_display_subprojects_issues) %></label>
+<%= check_box_tag 'settings[display_subprojects_issues]', 1, Setting.display_subprojects_issues? %><%= hidden_field_tag 'settings[display_subprojects_issues]', 0 %></p>
+
 <p><label><%= l(:setting_issues_export_limit) %></label>
 <%= text_field_tag 'settings[issues_export_limit]', Setting.issues_export_limit, :size => 6 %></p>
 </div>
diff --git a/config/settings.yml b/config/settings.yml
index bb8c1f603..59f4f0437 100644
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -101,6 +101,8 @@ issue_list_default_columns:
   - subject
   - assigned_to
   - updated_on
+display_subprojects_issues:
+  default: 1
 # encodings used to convert repository files content to UTF-8
 # multiple values accepted, comma separated
 repositories_encodings:
diff --git a/lang/bg.yml b/lang/bg.yml
index 11e18b849..7e65a9d2a 100644
--- a/lang/bg.yml
+++ b/lang/bg.yml
@@ -612,3 +612,4 @@ label_chronological_order: In chronological order
 field_comments_sorting: Afficher les commentaires
 label_reverse_chronological_order: In reverse chronological order
 label_preferences: Preferences
+setting_display_subprojects_issues: Display subprojects issues on main projects by default
diff --git a/lang/cs.yml b/lang/cs.yml
index ccf93fb9c..95e597c7e 100644
--- a/lang/cs.yml
+++ b/lang/cs.yml
@@ -612,3 +612,4 @@ label_chronological_order: In chronological order
 field_comments_sorting: Afficher les commentaires
 label_reverse_chronological_order: In reverse chronological order
 label_preferences: Preferences
+setting_display_subprojects_issues: Display subprojects issues on main projects by default
diff --git a/lang/de.yml b/lang/de.yml
index bdbe549c2..09e23f4f3 100644
--- a/lang/de.yml
+++ b/lang/de.yml
@@ -613,3 +613,4 @@ label_chronological_order: In chronological order
 field_comments_sorting: Afficher les commentaires
 label_reverse_chronological_order: In reverse chronological order
 label_preferences: Preferences
+setting_display_subprojects_issues: Display subprojects issues on main projects by default
diff --git a/lang/en.yml b/lang/en.yml
index 0445834fe..be7e1eb74 100644
--- a/lang/en.yml
+++ b/lang/en.yml
@@ -208,6 +208,7 @@ setting_protocol: Protocol
 setting_per_page_options: Objects per page options
 setting_user_format: Users display format
 setting_activity_days_default: Days displayed on project activity
+setting_display_subprojects_issues: Display subprojects issues on main projects by default
 
 project_module_issue_tracking: Issue tracking
 project_module_time_tracking: Time tracking
diff --git a/lang/es.yml b/lang/es.yml
index d137054d9..fe8a419d6 100644
--- a/lang/es.yml
+++ b/lang/es.yml
@@ -615,3 +615,4 @@ label_chronological_order: In chronological order
 field_comments_sorting: Afficher les commentaires
 label_reverse_chronological_order: In reverse chronological order
 label_preferences: Preferences
+setting_display_subprojects_issues: Display subprojects issues on main projects by default
diff --git a/lang/fi.yml b/lang/fi.yml
index b2ad672f4..9b45263d2 100644
--- a/lang/fi.yml
+++ b/lang/fi.yml
@@ -616,3 +616,4 @@ label_chronological_order: In chronological order
 field_comments_sorting: Afficher les commentaires
 label_reverse_chronological_order: In reverse chronological order
 label_preferences: Preferences
+setting_display_subprojects_issues: Display subprojects issues on main projects by default
diff --git a/lang/fr.yml b/lang/fr.yml
index b992ceff2..3370ba71b 100644
--- a/lang/fr.yml
+++ b/lang/fr.yml
@@ -208,6 +208,7 @@ setting_protocol: Protocole
 setting_per_page_options: Options d'objets affichés par page
 setting_user_format: Format d'affichage des utilisateurs
 setting_activity_days_default: Nombre de jours affichés sur l'activité des projets
+setting_display_subprojects_issues: Afficher par défaut les demandes des sous-projets sur les projets principaux
 
 project_module_issue_tracking: Suivi des demandes
 project_module_time_tracking: Suivi du temps passé
diff --git a/lang/he.yml b/lang/he.yml
index 66a493bbb..b8cb9d4b6 100644
--- a/lang/he.yml
+++ b/lang/he.yml
@@ -612,3 +612,4 @@ label_chronological_order: In chronological order
 field_comments_sorting: Afficher les commentaires
 label_reverse_chronological_order: In reverse chronological order
 label_preferences: Preferences
+setting_display_subprojects_issues: Display subprojects issues on main projects by default
diff --git a/lang/it.yml b/lang/it.yml
index c47729c50..3a07a2f98 100644
--- a/lang/it.yml
+++ b/lang/it.yml
@@ -612,3 +612,4 @@ label_chronological_order: In chronological order
 field_comments_sorting: Afficher les commentaires
 label_reverse_chronological_order: In reverse chronological order
 label_preferences: Preferences
+setting_display_subprojects_issues: Display subprojects issues on main projects by default
diff --git a/lang/ja.yml b/lang/ja.yml
index 37392dd7e..84fa5e6df 100644
--- a/lang/ja.yml
+++ b/lang/ja.yml
@@ -613,3 +613,4 @@ label_chronological_order: In chronological order
 field_comments_sorting: Afficher les commentaires
 label_reverse_chronological_order: In reverse chronological order
 label_preferences: Preferences
+setting_display_subprojects_issues: Display subprojects issues on main projects by default
diff --git a/lang/ko.yml b/lang/ko.yml
index 5685d063a..9e5f5a7ce 100644
--- a/lang/ko.yml
+++ b/lang/ko.yml
@@ -612,3 +612,4 @@ label_chronological_order: In chronological order
 field_comments_sorting: Afficher les commentaires
 label_reverse_chronological_order: In reverse chronological order
 label_preferences: Preferences
+setting_display_subprojects_issues: Display subprojects issues on main projects by default
diff --git a/lang/lt.yml b/lang/lt.yml
index c783f5768..5440d6af9 100644
--- a/lang/lt.yml
+++ b/lang/lt.yml
@@ -613,3 +613,4 @@ label_chronological_order: In chronological order
 field_comments_sorting: Afficher les commentaires
 label_reverse_chronological_order: In reverse chronological order
 label_preferences: Preferences
+setting_display_subprojects_issues: Display subprojects issues on main projects by default
diff --git a/lang/nl.yml b/lang/nl.yml
index 6d650456d..43d781180 100644
--- a/lang/nl.yml
+++ b/lang/nl.yml
@@ -613,3 +613,4 @@ label_chronological_order: In chronological order
 field_comments_sorting: Afficher les commentaires
 label_reverse_chronological_order: In reverse chronological order
 label_preferences: Preferences
+setting_display_subprojects_issues: Display subprojects issues on main projects by default
diff --git a/lang/pl.yml b/lang/pl.yml
index bf8f3f1ba..7368a5a66 100644
--- a/lang/pl.yml
+++ b/lang/pl.yml
@@ -612,3 +612,4 @@ label_chronological_order: In chronological order
 field_comments_sorting: Afficher les commentaires
 label_reverse_chronological_order: In reverse chronological order
 label_preferences: Preferences
+setting_display_subprojects_issues: Display subprojects issues on main projects by default
diff --git a/lang/pt-br.yml b/lang/pt-br.yml
index 9ddd6f94b..e3b50bdb4 100644
--- a/lang/pt-br.yml
+++ b/lang/pt-br.yml
@@ -612,3 +612,4 @@ label_chronological_order: In chronological order
 field_comments_sorting: Afficher les commentaires
 label_reverse_chronological_order: In reverse chronological order
 label_preferences: Preferences
+setting_display_subprojects_issues: Display subprojects issues on main projects by default
diff --git a/lang/pt.yml b/lang/pt.yml
index 63972d042..034da0db9 100644
--- a/lang/pt.yml
+++ b/lang/pt.yml
@@ -612,3 +612,4 @@ label_chronological_order: In chronological order
 field_comments_sorting: Afficher les commentaires
 label_reverse_chronological_order: In reverse chronological order
 label_preferences: Preferences
+setting_display_subprojects_issues: Display subprojects issues on main projects by default
diff --git a/lang/ro.yml b/lang/ro.yml
index 9d374af53..52011ff76 100644
--- a/lang/ro.yml
+++ b/lang/ro.yml
@@ -612,3 +612,4 @@ label_chronological_order: In chronological order
 field_comments_sorting: Afficher les commentaires
 label_reverse_chronological_order: In reverse chronological order
 label_preferences: Preferences
+setting_display_subprojects_issues: Display subprojects issues on main projects by default
diff --git a/lang/ru.yml b/lang/ru.yml
index d5b67f964..400e48448 100644
--- a/lang/ru.yml
+++ b/lang/ru.yml
@@ -616,3 +616,4 @@ label_chronological_order: In chronological order
 field_comments_sorting: Afficher les commentaires
 label_reverse_chronological_order: In reverse chronological order
 label_preferences: Preferences
+setting_display_subprojects_issues: Display subprojects issues on main projects by default
diff --git a/lang/sr.yml b/lang/sr.yml
index edef5f7f5..c48a4e63f 100644
--- a/lang/sr.yml
+++ b/lang/sr.yml
@@ -613,3 +613,4 @@ label_chronological_order: In chronological order
 field_comments_sorting: Afficher les commentaires
 label_reverse_chronological_order: In reverse chronological order
 label_preferences: Preferences
+setting_display_subprojects_issues: Display subprojects issues on main projects by default
diff --git a/lang/sv.yml b/lang/sv.yml
index f3940759b..125e2dcc7 100644
--- a/lang/sv.yml
+++ b/lang/sv.yml
@@ -613,3 +613,4 @@ label_chronological_order: In chronological order
 field_comments_sorting: Afficher les commentaires
 label_reverse_chronological_order: In reverse chronological order
 label_preferences: Preferences
+setting_display_subprojects_issues: Display subprojects issues on main projects by default
diff --git a/lang/uk.yml b/lang/uk.yml
index d8e4a7a66..155370576 100644
--- a/lang/uk.yml
+++ b/lang/uk.yml
@@ -614,3 +614,4 @@ label_chronological_order: In chronological order
 field_comments_sorting: Afficher les commentaires
 label_reverse_chronological_order: In reverse chronological order
 label_preferences: Preferences
+setting_display_subprojects_issues: Display subprojects issues on main projects by default
diff --git a/lang/zh-tw.yml b/lang/zh-tw.yml
index eb1a5e305..7cc11c611 100644
--- a/lang/zh-tw.yml
+++ b/lang/zh-tw.yml
@@ -613,3 +613,4 @@ label_chronological_order: In chronological order
 field_comments_sorting: Afficher les commentaires
 label_reverse_chronological_order: In reverse chronological order
 label_preferences: Preferences
+setting_display_subprojects_issues: Display subprojects issues on main projects by default
diff --git a/lang/zh.yml b/lang/zh.yml
index e7d790938..0b17b4ff9 100644
--- a/lang/zh.yml
+++ b/lang/zh.yml
@@ -613,3 +613,4 @@ label_chronological_order: In chronological order
 field_comments_sorting: Afficher les commentaires
 label_reverse_chronological_order: In reverse chronological order
 label_preferences: Preferences
+setting_display_subprojects_issues: Display subprojects issues on main projects by default

From 482d9a4e82efd0466fb682a8edfc69a31cfbb297 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Thu, 6 Mar 2008 17:22:21 +0000
Subject: [PATCH 258/710] Fix LDAP authentication (#714, broken by r1194).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1199 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/models/auth_source_ldap.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/auth_source_ldap.rb b/app/models/auth_source_ldap.rb
index b4966c1e8..a438bd3c7 100644
--- a/app/models/auth_source_ldap.rb
+++ b/app/models/auth_source_ldap.rb
@@ -74,7 +74,7 @@ private
                 :port => self.port,
                 :encryption => (self.tls ? :simple_tls : nil)
               }
-    options.merge(:auth => { :method => :simple, :username => ldap_user, :password => ldap_password }) unless ldap_user.blank? && ldap_password.blank?
+    options.merge!(:auth => { :method => :simple, :username => ldap_user, :password => ldap_password }) unless ldap_user.blank? && ldap_password.blank?
     Net::LDAP.new options
   end
   

From e8035c22b28f1ac9afa2ea34ae6e45fb4317900b Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Fri, 7 Mar 2008 17:04:16 +0000
Subject: [PATCH 259/710] Fixes module names localization on projects/add
 (closes #797).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1203 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/projects/add.rhtml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/views/projects/add.rhtml b/app/views/projects/add.rhtml
index e3ee0b591..bc3d7b09a 100644
--- a/app/views/projects/add.rhtml
+++ b/app/views/projects/add.rhtml
@@ -6,7 +6,8 @@
 <fieldset class="box"><legend><%= l(:label_module_plural) %></legend>
 <% Redmine::AccessControl.available_project_modules.each do |m| %>
     <label class="floating">
-    <%= check_box_tag 'enabled_modules[]', m, @project.module_enabled?(m) %> <%= m.to_s.humanize %>
+    <%= check_box_tag 'enabled_modules[]', m, @project.module_enabled?(m) %>
+    <%= (l_has_string?("project_module_#{m}".to_sym) ? l("project_module_#{m}".to_sym) : m.to_s.humanize) %>
     </label>
 <% end %>
 </fieldset>

From 4458a7282b183939594a8a2d345235cfec459938 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Fri, 7 Mar 2008 17:15:50 +0000
Subject: [PATCH 260/710] =?UTF-8?q?Translations=20(closes=20#789,=20#790,?=
 =?UTF-8?q?=20#798,=20#803,=20#809):=20*=20Danish=20added=20(Mads=20Vester?=
 =?UTF-8?q?gaard)=20*=20Polish=20updated=20(Mariusz=20Olejnik)=20*=20Finni?=
 =?UTF-8?q?sh=20updated=20(Antti=20Perki=C3=B6m=C3=A4ki)=20*=20Simplified?=
 =?UTF-8?q?=20Chinese=20updated=20(chaoqun=20zou)=20*=20Traditional=20Chin?=
 =?UTF-8?q?ese=20updated=20(shortie=20lo)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1204 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 lang/bg.yml                                   |   2 +-
 lang/cs.yml                                   |   2 +-
 lang/da.yml                                   | 617 ++++++++++++++++++
 lang/de.yml                                   |   2 +-
 lang/en.yml                                   |   2 +-
 lang/es.yml                                   |   2 +-
 lang/fi.yml                                   |  49 +-
 lang/he.yml                                   |   2 +-
 lang/it.yml                                   |   2 +-
 lang/ja.yml                                   |   2 +-
 lang/ko.yml                                   |   2 +-
 lang/lt.yml                                   |   2 +-
 lang/nl.yml                                   |   2 +-
 lang/pl.yml                                   |  90 +--
 lang/pt-br.yml                                |   2 +-
 lang/pt.yml                                   |   2 +-
 lang/ro.yml                                   |   2 +-
 lang/ru.yml                                   |   2 +-
 lang/sr.yml                                   |   2 +-
 lang/sv.yml                                   |   2 +-
 lang/uk.yml                                   |   2 +-
 lang/zh-tw.yml                                |  12 +-
 lang/zh.yml                                   |  42 +-
 .../javascripts/calendar/lang/calendar-da.js  | 128 ++++
 .../jstoolbar/lang/jstoolbar-da.js            |  14 +
 25 files changed, 875 insertions(+), 113 deletions(-)
 create mode 100644 lang/da.yml
 create mode 100644 public/javascripts/calendar/lang/calendar-da.js
 create mode 100644 public/javascripts/jstoolbar/lang/jstoolbar-da.js

diff --git a/lang/bg.yml b/lang/bg.yml
index 7e65a9d2a..e02cb6bdd 100644
--- a/lang/bg.yml
+++ b/lang/bg.yml
@@ -609,7 +609,7 @@ text_destroy_time_entries: Delete reported hours
 text_reassign_time_entries: 'Reassign reported hours to this issue:'
 setting_activity_days_default: Days displayed on project activity
 label_chronological_order: In chronological order
-field_comments_sorting: Afficher les commentaires
+field_comments_sorting: Display comments
 label_reverse_chronological_order: In reverse chronological order
 label_preferences: Preferences
 setting_display_subprojects_issues: Display subprojects issues on main projects by default
diff --git a/lang/cs.yml b/lang/cs.yml
index 95e597c7e..b14a58a1e 100644
--- a/lang/cs.yml
+++ b/lang/cs.yml
@@ -609,7 +609,7 @@ text_destroy_time_entries: Delete reported hours
 text_reassign_time_entries: 'Reassign reported hours to this issue:'
 setting_activity_days_default: Days displayed on project activity
 label_chronological_order: In chronological order
-field_comments_sorting: Afficher les commentaires
+field_comments_sorting: Display comments
 label_reverse_chronological_order: In reverse chronological order
 label_preferences: Preferences
 setting_display_subprojects_issues: Display subprojects issues on main projects by default
diff --git a/lang/da.yml b/lang/da.yml
new file mode 100644
index 000000000..7cac84418
--- /dev/null
+++ b/lang/da.yml
@@ -0,0 +1,617 @@
+_gloc_rule_default: '|n| n==1 ? "" : "_plural" '
+
+actionview_datehelper_select_day_prefix:
+actionview_datehelper_select_month_names: Januar,Februar,Marts,April,Maj,Juni,Juli,August,September,Oktober,November,December
+actionview_datehelper_select_month_names_abbr: Jan,Feb,Mar,Apr,Maj,Jun,Jul,Aug,Sep,Okt,Nov,Dec
+actionview_datehelper_select_month_prefix:
+actionview_datehelper_select_year_prefix:
+actionview_datehelper_time_in_words_day: 1 dag
+actionview_datehelper_time_in_words_day_plural: %d dage
+actionview_datehelper_time_in_words_hour_about: cirka en time
+actionview_datehelper_time_in_words_hour_about_plural: cirka %d timer
+actionview_datehelper_time_in_words_hour_about_single: cirka en time
+actionview_datehelper_time_in_words_minute: 1 minut
+actionview_datehelper_time_in_words_minute_half: et halvt minut
+actionview_datehelper_time_in_words_minute_less_than: mindre end et minut
+actionview_datehelper_time_in_words_minute_plural: %d minutter
+actionview_datehelper_time_in_words_minute_single: 1 minut
+actionview_datehelper_time_in_words_second_less_than: mindre end et sekund
+actionview_datehelper_time_in_words_second_less_than_plural: mindre end %d sekunder
+actionview_instancetag_blank_option: Vælg venligst
+
+activerecord_error_inclusion: er ikke i listen
+activerecord_error_exclusion: er reserveret
+activerecord_error_invalid: er ugyldig
+activerecord_error_confirmation: passer ikke bekræftelsen
+activerecord_error_accepted: skal accepteres
+activerecord_error_empty: kan ikke være tom
+activerecord_error_blank: kan ikke være blank
+activerecord_error_too_long: er for lang
+activerecord_error_too_short: er for kort
+activerecord_error_wrong_length: har den forkerte længde
+activerecord_error_taken: er allerede valgt
+activerecord_error_not_a_number: er ikke et nummer
+activerecord_error_not_a_date: er en ugyldig dato
+activerecord_error_greater_than_start_date: skal være senere end start datoen
+activerecord_error_not_same_project: høre ikke til samme projekt
+activerecord_error_circular_dependency: Denne relation vil skabe et afhængigheds forhold
+
+general_fmt_age: %d år
+general_fmt_age_plural: %d år
+general_fmt_date: %%m/%%d/%%Y
+general_fmt_datetime: %%m/%%d/%%Y %%I:%%M %%p
+general_fmt_datetime_short: %%b %%d, %%I:%%M %%p
+general_fmt_time: %%I:%%M %%p
+general_text_No: 'Nej'
+general_text_Yes: 'Ja'
+general_text_no: 'nej'
+general_text_yes: 'ja'
+general_lang_name: 'Danish (Dansk)'
+general_csv_separator: ','
+general_csv_encoding: ISO-8859-1
+general_pdf_encoding: ISO-8859-1
+general_day_names: Mandag,Tirsdag,Onsdag,Torsdag,Fredag,Lørdag,Søndag
+general_first_day_of_week: '1'
+
+notice_account_updated: Kontoen er opdateret.
+notice_account_invalid_creditentials: Ugyldig bruger og kodeord
+notice_account_password_updated: Kodeordet er opdateret.
+notice_account_wrong_password: Forkert kodeord
+notice_account_register_done: Kontoen er oprettet. For at aktivere kontoen, ska du klikke på linket i den tilsendte email.
+notice_account_unknown_email: Ukendt bruger.
+notice_can_t_change_password: Denne konto benytter en ekstern sikkerheds godkendelse. Det er ikke muligt at skifte kodeord.
+notice_account_lost_email_sent: En email med instruktioner til at vælge et nyt kodeord er afsendt til dig.
+notice_account_activated: Din konto er aktiveret. Du kan nu logge ind.
+notice_successful_create: Succesfuld oprettelsen.
+notice_successful_update: Succesfuld opdatering.
+notice_successful_delete: Succesfuld sletning.
+notice_successful_connection: Succesfuld forbindelse.
+notice_file_not_found: Siden du forsøger at tilgå, eksisterer ikke eller er blevet fjernet.
+notice_locking_conflict: Data er opdateret af en anden bruger.
+notice_not_authorized: Du har ike adgang til denne side.
+notice_email_sent: En email er sendt til %s
+notice_email_error: En fejl opstod under afsendelse af email (%s)
+notice_feeds_access_key_reseted: Din RSS adgangs nøgle er nulstillet.
+notice_failed_to_save_issues: "Det mislykkedes at gemme %d sage(r) på %d valgt: %s."
+notice_no_issue_selected: "Ingen sag er valgt! vælg venligst hvilke emner du vil rette."
+notice_account_pending: "Din konto er oprettet, og afventer administratorens godkendelse."
+notice_default_data_loaded: Default konfiguration er indlæst.
+
+error_can_t_load_default_data: "Standard konfiguration kunne ikke indlæses: %s"
+error_scm_not_found: "Adgang og/eller revision blev ikke fundet i det valgte repository."
+error_scm_command_failed: "En fejl opstod under fobindelsen til det valgte repository: %s"
+
+mail_subject_lost_password: Dit Redmine kodeord
+mail_body_lost_password: 'For at ændre dit Redmine kodeord, klik på dette link:'
+mail_subject_register: Redmine konto aktivering
+mail_body_register: 'For at aktivere din Redmine konto, klik på dette link:'
+mail_body_account_information_external: Du kan bruge din "%s" konto til at logge ind på Redmine.
+mail_body_account_information: Din Redmine konto information
+mail_subject_account_activation_request: Redmine konto aktivering
+mail_body_account_activation_request: 'En ny bruger (%s) er registreret. Godkend venligst kontoen:'
+
+gui_validation_error: 1 fejl
+gui_validation_error_plural: %d fejl
+
+field_name: Navn
+field_description: Beskrivelse
+field_summary: Sammenfatning
+field_is_required: Skal udfyldes
+field_firstname: Fornavn
+field_lastname: Efternavn
+field_mail: Email
+field_filename: Fil
+field_filesize: Størrelse
+field_downloads: Downloads
+field_author: Forfatter
+field_created_on: Oprettet
+field_updated_on: Opdateret
+field_field_format: Format
+field_is_for_all: For alle projekter
+field_possible_values: Mulige værdier
+field_regexp: Regulære udtryk
+field_min_length: Minimum længde
+field_max_length: Maximal længde
+field_value: Værdi
+field_category: Kategori
+field_title: Titel
+field_project: Projekt
+field_issue: Sag
+field_status: Status
+field_notes: Noter
+field_is_closed: Sagen er lukket
+field_is_default: Standard værdi
+field_tracker: Type
+field_subject: Emne
+field_due_date: Deadline
+field_assigned_to: Tildelt til
+field_priority: Prioritet
+field_fixed_version: Retet version
+field_user: Bruger
+field_role: Rolle
+field_homepage: Hjemmeside
+field_is_public: Offentlig
+field_parent: Underprojekt af
+field_is_in_chlog: Sager vist i ændringer
+field_is_in_roadmap: Sager vist i roadmap
+field_login: Login
+field_mail_notification: Email notifikatiner
+field_admin: Administrator
+field_last_login_on: Sidste forbindelse
+field_language: Sprog
+field_effective_date: Dato
+field_password: Kodeord
+field_new_password: Nyt kodeord
+field_password_confirmation: Bekræft
+field_version: Version
+field_type: Type
+field_host: Vært
+field_port: Port
+field_account: Kode
+field_base_dn: Base DN
+field_attr_login: Login attribut
+field_attr_firstname: Fornavn attribut
+field_attr_lastname: Efternavn attribut
+field_attr_mail: Email attribut
+field_onthefly: On-the-fly bruger oprettelse
+field_start_date: Start
+field_done_ratio: %% Færdig
+field_auth_source: Sikkerheds metode
+field_hide_mail: Skjul min email
+field_comments: Kommentar
+field_url: URL
+field_start_page: Start side
+field_subproject: Underprojekt
+field_hours: Timer
+field_activity: Aktivitet
+field_spent_on: Dato
+field_identifier: Identificering
+field_is_filter: Brugt som et filter
+field_issue_to_id: Beslægtede sag
+field_delay: Udsættelse
+field_assignable: Sager kan tildeles denne rolle
+field_redirect_existing_links: Videresend eksisterende links
+field_estimated_hours: Estimeret tid
+field_column_names: Kolonner
+field_time_zone: Tids zone
+field_searchable: Søgbar
+field_default_value: Standard værdi
+
+setting_app_title: Applikations titel
+setting_app_subtitle: Applikations undertekst
+setting_welcome_text: Velkomst tekst
+setting_default_language: Standrad sporg
+setting_login_required: Sikkerhed påkrævet
+setting_self_registration: Bruger oprettelse
+setting_attachment_max_size: Vedhæftede filers max størrelse
+setting_issues_export_limit: Sags eksporterings begrænsning
+setting_mail_from: Afsender email
+setting_bcc_recipients: Blind carbon copy modtager (bcc)
+setting_host_name: Værts navn
+setting_text_formatting: Tekst formattering
+setting_wiki_compression: Wiki historik komprimering
+setting_feeds_limit: Feed indholds begrænsning
+setting_autofetch_changesets: Automatisk hent commits
+setting_sys_api_enabled: Aktiver web service for automatisk repository administration
+setting_commit_ref_keywords: Reference nøgleord
+setting_commit_fix_keywords: Afslutnings nøgleord
+setting_autologin: Autologin
+setting_date_format: Dato format
+setting_time_format: Tids format
+setting_cross_project_issue_relations: Tillad cross-projekt sags relationer
+setting_issue_list_default_columns: Standrad kolonner på sags listen
+setting_repositories_encodings: Repository tegnsæt
+setting_emails_footer: Email fodnote
+setting_protocol: Protokol
+setting_per_page_options: Objekter pr. side indstillinger
+setting_user_format: Bruger visnings format
+
+project_module_issue_tracking: Sag søgning
+project_module_time_tracking: Tids styring
+project_module_news: Nyheder
+project_module_documents: Dokumenter
+project_module_files: Filer
+project_module_wiki: Wiki
+project_module_repository: Repository
+project_module_boards: Opslagstavle
+
+label_user: Bruger
+label_user_plural: Brugere
+label_user_new: Ny bruger
+label_project: Projekt
+label_project_new: Nyt projekt
+label_project_plural: Projekter
+label_project_all: Alle projekter
+label_project_latest: Seneste projekter
+label_issue: Sag
+label_issue_new: Opret sag
+label_issue_plural: Sager
+label_issue_view_all: Vis alle sager
+label_issues_by: Sager fra %s
+label_issue_added: Sagen er oprettet
+label_issue_updated: Sagen er opdateret
+label_document: Dokument
+label_document_new: Nyt dokument
+label_document_plural: Dokumenter
+label_document_added: Dokument tilføjet
+label_role: Rolle
+label_role_plural: Roller
+label_role_new: Ny rolle
+label_role_and_permissions: Roller og rettigheder
+label_member: Medlem
+label_member_new: Nyt medlem
+label_member_plural: Medlemmer
+label_tracker: Type
+label_tracker_plural: Typer
+label_tracker_new: Ny type
+label_workflow: Arbejdsgang
+label_issue_status: Sags status
+label_issue_status_plural: Sags statuser
+label_issue_status_new: Ny status
+label_issue_category: Sags kategori
+label_issue_category_plural: Sags kategorier
+label_issue_category_new: Ny kategori
+label_custom_field: Brugerdefineret felt
+label_custom_field_plural: Brugerdefineret felt
+label_custom_field_new: Nyt brugerdefineret felt
+label_enumerations: Værdier
+label_enumeration_new: Ny værdi
+label_information: Information
+label_information_plural: Information
+label_please_login: Login
+label_register: Registrer
+label_password_lost: Glemt kodeord
+label_home: Forside
+label_my_page: Min side
+label_my_account: Min konto
+label_my_projects: Mine projekter
+label_administration: Administration
+label_login: Log ind
+label_logout: Log ud
+label_help: Hjælp
+label_reported_issues: Rapporterede sager
+label_assigned_to_me_issues: Sager tildelt til mig
+label_last_login: Sidste forbindelse
+label_last_updates: Sidst opdateret
+label_last_updates_plural: %d sidst opdateret
+label_registered_on: Registeret den
+label_activity: Aktivitet
+label_new: Ny
+label_logged_as: Registreret som
+label_environment: Miljø
+label_authentication: Sikkerhed
+label_auth_source: Sikkerheds metode
+label_auth_source_new: Ny sikkerheds metode
+label_auth_source_plural: Sikkerheds metoder
+label_subproject_plural: Underprojekter
+label_min_max_length: Min - Max længde
+label_list: Liste
+label_date: Dato
+label_integer: Heltal
+label_float: Kommatal
+label_boolean: Sand/falsk
+label_string: Tekst
+label_text: Lang tekst
+label_attribute: Attribut
+label_attribute_plural: Attributter
+label_download: %d Download
+label_download_plural: %d Downloads
+label_no_data: Ingen data at vise
+label_change_status: Ændrings status
+label_history: Historik
+label_attachment: Fil
+label_attachment_new: Ny fil
+label_attachment_delete: Slet fil
+label_attachment_plural: Filer
+label_file_added: Fil tilføjet
+label_report: Rapport
+label_report_plural: Rapporter
+label_news: Nyheder
+label_news_new: Tilføj nyheder
+label_news_plural: Nyheder
+label_news_latest: Seneste nyheder
+label_news_view_all: Vis alle nyheder
+label_news_added: Nyhed tilføjet
+label_change_log: Ændringer
+label_settings: Indstillinger
+label_overview: Oversit
+label_version: Version
+label_version_new: Ny version
+label_version_plural: Versioner
+label_confirmation: Bekræftigelser
+label_export_to: Exporter til
+label_read: Læs...
+label_public_projects: Offentlige projekter
+label_open_issues: åben
+label_open_issues_plural: åbne
+label_closed_issues: lukket
+label_closed_issues_plural: lukkede
+label_total: Total
+label_permissions: Rettigheder
+label_current_status: Nuværende status
+label_new_statuses_allowed: Ny status tilladt
+label_all: alle
+label_none: intet
+label_nobody: ingen
+label_next: Næste
+label_previous: Forrig
+label_used_by: Brugt af
+label_details: Detaljer
+label_add_note: Tilføj en note
+label_per_page: Pr. side
+label_calendar: Kalender
+label_months_from: måneder frem
+label_gantt: Gantt
+label_internal: Intern
+label_last_changes: sidste %d ændringer
+label_change_view_all: Vis alle ændringer
+label_personalize_page: Tilret denne side
+label_comment: Kommentar
+label_comment_plural: Kommentarer
+label_comment_add: Tilføj en kommentar
+label_comment_added: Kommentaren er tilføjet
+label_comment_delete: Slet kommentar
+label_query: Brugerdefineret forespørgsel
+label_query_plural: Brugerdefinerede forespørgsler
+label_query_new: Ny forespørgsel
+label_filter_add: Tilføj filter
+label_filter_plural: Filtre
+label_equals: er
+label_not_equals: er ikke
+label_in_less_than: er mindre end
+label_in_more_than: er større end
+label_in: indeholdt i
+label_today: idag
+label_all_time: altid
+label_yesterday: igår
+label_this_week: denne uge
+label_last_week: sidste uge
+label_last_n_days: sidste %d dage
+label_this_month: denne måned
+label_last_month: sidste måned
+label_this_year: dette år
+label_date_range: Dato interval
+label_less_than_ago: mindre end dage siden
+label_more_than_ago: mere end dage siden
+label_ago: days siden
+label_contains: indeholder
+label_not_contains: ikke indeholder
+label_day_plural: dage
+label_repository: Repository
+label_repository_plural: Repositories
+label_browse: Gennemse
+label_modification: %d ændring
+label_modification_plural: %d ændringer
+label_revision: Revision
+label_revision_plural: Revisions
+label_associated_revisions: Tilnyttede revisions
+label_added: tilføjet
+label_modified: ændret
+label_deleted: slettet
+label_latest_revision: Seneste revision
+label_latest_revision_plural: Seneste revisions
+label_view_revisions: Se revisions
+label_max_size: Maximal størrelse
+label_on: 'til'
+label_sort_highest: Flyt til toppen
+label_sort_higher: Flyt op
+label_sort_lower: Flyt ned
+label_sort_lowest: Flyt til bunden
+label_roadmap: Roadmap
+label_roadmap_due_in: Deadline 
+label_roadmap_overdue: %s forsinket
+label_roadmap_no_issues: Ingen sager til denne version
+label_search: Søg
+label_result_plural: Resultater
+label_all_words: Alle ord
+label_wiki: Wiki
+label_wiki_edit: Wiki ændring
+label_wiki_edit_plural: Wiki ændringer
+label_wiki_page: Wiki side
+label_wiki_page_plural: Wiki sider
+label_index_by_title: Indhold efter titel
+label_index_by_date: Indhold efter dato
+label_current_version: Nuværende version
+label_preview: Forhåndsvisning
+label_feed_plural: Feeds
+label_changes_details: Detaljer for alle ænringer
+label_issue_tracking: Sags søgning
+label_spent_time: Brugt tid
+label_f_hour: %.2f time
+label_f_hour_plural: %.2f timer
+label_time_tracking: Tids styring
+label_change_plural: Ændringer
+label_statistics: Statistik
+label_commits_per_month: Commits pr. måned
+label_commits_per_author: Commits pr. bruger
+label_view_diff: Vis forskellighed
+label_diff_inline: inline
+label_diff_side_by_side: side ved side
+label_options: Options
+label_copy_workflow_from: Kopier arbejdsgang fra
+label_permissions_report: Godkendelses rapport
+label_watched_issues: Overvågede sager
+label_related_issues: Relaterede sage
+label_applied_status: Anvendte statuser
+label_loading: Indlæser...
+label_relation_new: Ny relation
+label_relation_delete: Slet relation
+label_relates_to: relaterer til
+label_duplicates: kopierer
+label_blocks: blokerer
+label_blocked_by: blokeret af
+label_precedes: kommer før
+label_follows: følger
+label_end_to_start: slut til start
+label_end_to_end: slut til slut
+label_start_to_start: start til start
+label_start_to_end: start til slut
+label_stay_logged_in: Forblin indlogget
+label_disabled: deaktiveret
+label_show_completed_versions: Vis færdige versioner
+label_me: mig
+label_board: Forum
+label_board_new: Nyt forum
+label_board_plural: Forumer
+label_topic_plural: Emner
+label_message_plural: Beskeder
+label_message_last: Sidste besked
+label_message_new: Ny besked
+label_message_posted: Besked tilføjet
+label_reply_plural: Besvarer
+label_send_information: Send konto information til bruger
+label_year: År
+label_month: Måned
+label_week: Uge
+label_date_from: Fra
+label_date_to: Til
+label_language_based: Baseret på brugerens sprog
+label_sort_by: Sorter efter %s
+label_send_test_email: Send en test email
+label_feeds_access_key_created_on: RSS adgangsnøgle genereret %s siden
+label_module_plural: Moduler
+label_added_time_by: Tilføjet af %s for %s siden
+label_updated_time: Opdateret for %s siden
+label_jump_to_a_project: Skift til projekt...
+label_file_plural: Filer
+label_changeset_plural: Ændringer
+label_default_columns: Standard kolonner
+label_no_change_option: (Ingen ændringer)
+label_bulk_edit_selected_issues: Masse ret de valgte sager
+label_theme: Tema
+label_default: standard
+label_search_titles_only: Søg kun i titler
+label_user_mail_option_all: "For alle hændelser på mine projekter"
+label_user_mail_option_selected: "For alle hændelser, kun på de valgte projekter..."
+label_user_mail_option_none: "Kun for ting jeg overvåger, eller jeg er involveret i"
+label_user_mail_no_self_notified: "Jeg ønsker ikke besked, om ændring foretaget af mig selv"
+label_registration_activation_by_email: konto aktivering på email
+label_registration_manual_activation: manuel konto aktivering
+label_registration_automatic_activation: automatisk konto aktivering
+label_display_per_page: 'Per side: %s'
+label_age: Alder
+label_change_properties: Ændre indstillinger
+label_general: Generalt
+label_more: Mere
+label_scm: SCM
+label_plugins: Plugins
+label_ldap_authentication: LDAP godkendelse
+label_downloads_abbr: D/L
+
+button_login: Login
+button_submit: Send
+button_save: Gem
+button_check_all: Vælg alt
+button_uncheck_all: Fravælg alt
+button_delete: Slet
+button_create: Opret
+button_test: Test
+button_edit: Ret
+button_add: Tilføj
+button_change: Ændre
+button_apply: Anvend
+button_clear: Nulstil
+button_lock: Lås
+button_unlock: Lås op
+button_download: Download
+button_list: List
+button_view: Vis
+button_move: Flyt
+button_back: Tilbage
+button_cancel: Annuller
+button_activate: Aktiver
+button_sort: Sorter
+button_log_time: Log tidspunkt
+button_rollback: Tilbagefør til denne version
+button_watch: Overvåg
+button_unwatch: Stop overvågning
+button_reply: Besvar
+button_archive: Arkiver
+button_unarchive: Fjern fra arkiv
+button_reset: Nulstil
+button_rename: Omdøb
+button_change_password: Skift kodeord
+button_copy: Kopier
+button_annotate: Annotere
+button_update: Opdater
+button_configure: Konfigurer
+
+status_active: aktiv
+status_registered: registreret
+status_locked: låst
+
+text_select_mail_notifications: Vælg handlinger for hvilke, der skal sendes en email besked.
+text_regexp_info: f.eks. ^[A-ZÆØÅ0-9]+$
+text_min_max_length_info: 0 betyder ingen begrænsninger
+text_project_destroy_confirmation: Er du sikker på di vil slette dette projekt og alle relaterede data ?
+text_workflow_edit: Vælg en rolle samt en type, for at redigere arbejdsgangen
+text_are_you_sure: Er du sikker ?
+text_journal_changed: ændret fra %s til %s
+text_journal_set_to: sat til %s
+text_journal_deleted: slettet
+text_tip_task_begin_day: opgaven begynder denne dag
+text_tip_task_end_day: opaven slutter denne dag
+text_tip_task_begin_end_day: opgaven begynder og slutter denne dag
+text_project_identifier_info: 'Minuskler (a-z), numre og bindestreg er tilladt.<br />Når den er gemt, kan indifikatoren ikke rettes.'
+text_caracters_maximum: max %d karakterer.
+text_caracters_minimum: Skal være mindst %d karakterer lang.
+text_length_between: Længde skal være mellem %d og %d karakterer.
+text_tracker_no_workflow: Ingen arbejdsgang defineret for denne type
+text_unallowed_characters: Ikke tilladte karakterer
+text_comma_separated: Adskillige værdier tilladt (komma separeret).
+text_issues_ref_in_commit_messages: Referer og løser sager i commit beskeder
+text_issue_added: Sag %s er rapporteret af %s.
+text_issue_updated: Sag %s er blevet opdateret af %s.
+text_wiki_destroy_confirmation: Er du sikker på at du vil slette debbe wiki, og alt indholdet ?
+text_issue_category_destroy_question: Nogle sgaer (%d) er tildelt denne kategori. Hvad ønsker du at gøre ?
+text_issue_category_destroy_assignments: Slet kategori tildelinger
+text_issue_category_reassign_to: Tildel sager til denne kategori
+text_user_mail_option: "For ikke valgte projekter, vil du kun modtage beskeder omhandlende ting, du er involveret i, eller overvåger (f.eks. sager du ahr indberettet eller ejer)."
+text_no_configuration_data: "Roller, typer, sags statuser og arbejdsgange er endnu ikek konfigureret.\nDet er anbefalet at indlæse standard konfigurationen. Du vil kunne ændre denne når den er indlæst."
+text_load_default_configuration: Indlæs standard konfiguration
+text_status_changed_by_changeset: Anvendt i ændring %s.
+text_issues_destroy_confirmation: 'Er du sikker på du ønsker at slette den/de valgte sag(er) ?'
+text_select_project_modules: 'Vælg moduler er skal være aktiveret for dette projekt:'
+text_default_administrator_account_changed: Standard administrator konto ændret
+text_file_repository_writable: Filarkiv er skrivbar
+text_rmagick_available: RMagick tilgængelig (valgfri)
+
+default_role_manager: Leder
+default_role_developper: Udvikler
+default_role_reporter: Rapportør
+default_tracker_bug: Bug
+default_tracker_feature: Feature
+default_tracker_support: Support
+default_issue_status_new: Ny
+default_issue_status_assigned: Tildelt
+default_issue_status_resolved: Løst
+default_issue_status_feedback: Feedback
+default_issue_status_closed: Lukket
+default_issue_status_rejected: Afvist
+default_doc_category_user: Bruger dokumentation
+default_doc_category_tech: Teknisk dokumentation
+default_priority_low: Lav
+default_priority_normal: Normal
+default_priority_high: Høj
+default_priority_urgent: Akut
+default_priority_immediate: Omgående
+default_activity_design: Design
+default_activity_development: Udvikling
+
+enumeration_issue_priorities: Sags prioriteter
+enumeration_doc_categories: Dokument kategorier
+enumeration_activities: Aktiviteter (tids styring)
+
+label_add_another_file: Add another file
+label_chronological_order: In chronological order
+setting_activity_days_default: Days displayed on project activity
+text_destroy_time_entries_question: %.02f hours were reported on the issues you are about to delete. What do you want to do ?
+error_issue_not_found_in_project: 'The issue was not found or does not belong to this project'
+text_assign_time_entries_to_project: Assign reported hours to the project
+setting_display_subprojects_issues: Display subprojects issues on main projects by default
+label_optional_description: Optional description
+text_destroy_time_entries: Delete reported hours
+field_comments_sorting: Display comments
+text_reassign_time_entries: 'Reassign reported hours to this issue:'
+label_reverse_chronological_order: In reverse chronological order
+label_preferences: Preferences
diff --git a/lang/de.yml b/lang/de.yml
index 09e23f4f3..750fc2002 100644
--- a/lang/de.yml
+++ b/lang/de.yml
@@ -610,7 +610,7 @@ enumeration_doc_categories: Dokumentenkategorien
 enumeration_activities: Aktivitäten (Zeiterfassung)
 setting_activity_days_default: Days displayed on project activity
 label_chronological_order: In chronological order
-field_comments_sorting: Afficher les commentaires
+field_comments_sorting: Display comments
 label_reverse_chronological_order: In reverse chronological order
 label_preferences: Preferences
 setting_display_subprojects_issues: Display subprojects issues on main projects by default
diff --git a/lang/en.yml b/lang/en.yml
index be7e1eb74..b6bd945a0 100644
--- a/lang/en.yml
+++ b/lang/en.yml
@@ -177,7 +177,7 @@ field_column_names: Columns
 field_time_zone: Time zone
 field_searchable: Searchable
 field_default_value: Default value
-field_comments_sorting: Afficher les commentaires
+field_comments_sorting: Display comments
 
 setting_app_title: Application title
 setting_app_subtitle: Application subtitle
diff --git a/lang/es.yml b/lang/es.yml
index fe8a419d6..9c19361ff 100644
--- a/lang/es.yml
+++ b/lang/es.yml
@@ -612,7 +612,7 @@ text_destroy_time_entries: Delete reported hours
 text_reassign_time_entries: 'Reassign reported hours to this issue:'
 setting_activity_days_default: Days displayed on project activity
 label_chronological_order: In chronological order
-field_comments_sorting: Afficher les commentaires
+field_comments_sorting: Display comments
 label_reverse_chronological_order: In reverse chronological order
 label_preferences: Preferences
 setting_display_subprojects_issues: Display subprojects issues on main projects by default
diff --git a/lang/fi.yml b/lang/fi.yml
index 9b45263d2..f37c2da4e 100644
--- a/lang/fi.yml
+++ b/lang/fi.yml
@@ -347,7 +347,7 @@ label_in_less_than: pienempi kuin
 label_in_more_than: suurempi kuin
 label_in:
 label_today: tänään
-label_this_week: tämä viikko
+label_this_week: tällä viikolla
 label_less_than_ago: vähemmän kuin päivää sitten
 label_more_than_ago: enemän kuin päivää sitten
 label_ago: päiviä sitten
@@ -592,28 +592,31 @@ button_configure: Asetukset
 label_plugins: Lisäosat
 label_ldap_authentication: LDAP autentikointi
 label_downloads_abbr: D/L
-label_add_another_file: Add another file
-label_this_month: this month
-label_date_to: To
-text_destroy_time_entries_question: %.02f hours were reported on the issues you are about to delete. What do you want to do ?
-label_date_from: From
-label_last_n_days: last %d days
-label_all_time: all time
-label_in: in
-error_issue_not_found_in_project: 'The issue was not found or does not belong to this project'
-label_this_year: this year
-text_assign_time_entries_to_project: Assign reported hours to the project
-label_date_range: Date range
-label_last_week: last week
-label_yesterday: yesterday
-label_optional_description: Optional description
-label_last_month: last month
-text_destroy_time_entries: Delete reported hours
-text_reassign_time_entries: 'Reassign reported hours to this issue:'
-label_on: 'on'
-setting_activity_days_default: Days displayed on project activity
+label_add_another_file: Lisää uusi tiedosto
+label_this_month: tässä kuussa
+label_date_to:
+text_destroy_time_entries_question: %.02f tuntia on raportoitu tapahtumasta jonka aiot poistaa. Mitä haluat tehdä ?
+label_date_from: 
+label_last_n_days: viimeiset %d päivää
+label_all_time: koko ajalta
+label_in:
+error_issue_not_found_in_project: 'Tapahtumaa ei löytynyt tai se ei kuulu tähän projektiin'
+label_this_year: tänä vuonna
+text_assign_time_entries_to_project: Määritä tunnit projektille
+label_date_range: Aikaväli
+label_last_week: viime viikolla
+label_yesterday: eilen
+label_optional_description: Lisäkuvaus
+label_last_month: viime kuussa
+text_destroy_time_entries: Poista raportoidut tunnit
+text_reassign_time_entries: 'Siirrä raportoidut tunnit tälle tapahtumalle:'
+label_on: ''
 label_chronological_order: In chronological order
-field_comments_sorting: Afficher les commentaires
+label_date_to: To
+setting_activity_days_default: Days displayed on project activity
+label_date_from: From
+label_in: in
+setting_display_subprojects_issues: Display subprojects issues on main projects by default
+field_comments_sorting: Display comments
 label_reverse_chronological_order: In reverse chronological order
 label_preferences: Preferences
-setting_display_subprojects_issues: Display subprojects issues on main projects by default
diff --git a/lang/he.yml b/lang/he.yml
index b8cb9d4b6..48fdb447f 100644
--- a/lang/he.yml
+++ b/lang/he.yml
@@ -609,7 +609,7 @@ text_destroy_time_entries: Delete reported hours
 text_reassign_time_entries: 'Reassign reported hours to this issue:'
 setting_activity_days_default: Days displayed on project activity
 label_chronological_order: In chronological order
-field_comments_sorting: Afficher les commentaires
+field_comments_sorting: Display comments
 label_reverse_chronological_order: In reverse chronological order
 label_preferences: Preferences
 setting_display_subprojects_issues: Display subprojects issues on main projects by default
diff --git a/lang/it.yml b/lang/it.yml
index 3a07a2f98..41caa50a3 100644
--- a/lang/it.yml
+++ b/lang/it.yml
@@ -609,7 +609,7 @@ text_destroy_time_entries: Delete reported hours
 text_reassign_time_entries: 'Reassign reported hours to this issue:'
 setting_activity_days_default: Days displayed on project activity
 label_chronological_order: In chronological order
-field_comments_sorting: Afficher les commentaires
+field_comments_sorting: Display comments
 label_reverse_chronological_order: In reverse chronological order
 label_preferences: Preferences
 setting_display_subprojects_issues: Display subprojects issues on main projects by default
diff --git a/lang/ja.yml b/lang/ja.yml
index 84fa5e6df..2c283dca7 100644
--- a/lang/ja.yml
+++ b/lang/ja.yml
@@ -610,7 +610,7 @@ text_destroy_time_entries: Delete reported hours
 text_reassign_time_entries: 'Reassign reported hours to this issue:'
 setting_activity_days_default: Days displayed on project activity
 label_chronological_order: In chronological order
-field_comments_sorting: Afficher les commentaires
+field_comments_sorting: Display comments
 label_reverse_chronological_order: In reverse chronological order
 label_preferences: Preferences
 setting_display_subprojects_issues: Display subprojects issues on main projects by default
diff --git a/lang/ko.yml b/lang/ko.yml
index 9e5f5a7ce..64a15c4cb 100644
--- a/lang/ko.yml
+++ b/lang/ko.yml
@@ -609,7 +609,7 @@ text_destroy_time_entries: Delete reported hours
 text_reassign_time_entries: 'Reassign reported hours to this issue:'
 setting_activity_days_default: Days displayed on project activity
 label_chronological_order: In chronological order
-field_comments_sorting: Afficher les commentaires
+field_comments_sorting: Display comments
 label_reverse_chronological_order: In reverse chronological order
 label_preferences: Preferences
 setting_display_subprojects_issues: Display subprojects issues on main projects by default
diff --git a/lang/lt.yml b/lang/lt.yml
index 5440d6af9..f78032d0d 100644
--- a/lang/lt.yml
+++ b/lang/lt.yml
@@ -610,7 +610,7 @@ text_destroy_time_entries: Delete reported hours
 text_reassign_time_entries: 'Reassign reported hours to this issue:'
 setting_activity_days_default: Days displayed on project activity
 label_chronological_order: In chronological order
-field_comments_sorting: Afficher les commentaires
+field_comments_sorting: Display comments
 label_reverse_chronological_order: In reverse chronological order
 label_preferences: Preferences
 setting_display_subprojects_issues: Display subprojects issues on main projects by default
diff --git a/lang/nl.yml b/lang/nl.yml
index 43d781180..06a655b1b 100644
--- a/lang/nl.yml
+++ b/lang/nl.yml
@@ -610,7 +610,7 @@ text_destroy_time_entries: Delete reported hours
 text_reassign_time_entries: 'Reassign reported hours to this issue:'
 setting_activity_days_default: Days displayed on project activity
 label_chronological_order: In chronological order
-field_comments_sorting: Afficher les commentaires
+field_comments_sorting: Display comments
 label_reverse_chronological_order: In reverse chronological order
 label_preferences: Preferences
 setting_display_subprojects_issues: Display subprojects issues on main projects by default
diff --git a/lang/pl.yml b/lang/pl.yml
index 7368a5a66..46d9cba5c 100644
--- a/lang/pl.yml
+++ b/lang/pl.yml
@@ -433,7 +433,7 @@ button_back: Wstecz
 button_cancel: Anuluj
 button_activate: Aktywuj
 button_sort: Sortuj
-button_log_time: Logowanie czasu
+button_log_time: Log czasu
 button_rollback: Przywróc do tej wersji
 button_watch: Obserwuj
 button_unwatch: Nie obserwuj
@@ -564,52 +564,52 @@ button_update: Uaktualnij
 label_change_properties: Zmień właściwości
 label_general: Ogólne
 label_repository_plural: Repozytoria
-label_associated_revisions: Associated revisions
-setting_user_format: Users display format
-text_status_changed_by_changeset: Applied in changeset %s.
-label_more: More
-text_issues_destroy_confirmation: 'Are you sure you want to delete the selected issue(s) ?'
+label_associated_revisions: Skojarzone rewizje
+setting_user_format: Personalny format wyświetlania
+text_status_changed_by_changeset: Zastosowane w zmianach %s.
+label_more: Więcej
+text_issues_destroy_confirmation: 'Czy jestes pewien, że chcesz usunąć wskazane zagadnienia?'
 label_scm: SCM
-text_select_project_modules: 'Select modules to enable for this project:'
-label_issue_added: Issue added
-label_issue_updated: Issue updated
-label_document_added: Document added
-label_message_posted: Message added
-label_file_added: File added
-label_news_added: News added
-project_module_boards: Boards
-project_module_issue_tracking: Issue tracking
+text_select_project_modules: 'Wybierz moduły do aktywacji w tym projekcie:'
+label_issue_added: Dodano zagadnienie
+label_issue_updated: Uaktualniono zagadnienie
+label_document_added: Dodano dokument
+label_message_posted: Dodano wiadomość
+label_file_added: Dodano plik
+label_news_added: Dodano wiadomość
+project_module_boards: Fora
+project_module_issue_tracking: Śledzenie zagadnień
 project_module_wiki: Wiki
-project_module_files: Files
-project_module_documents: Documents
-project_module_repository: Repository
-project_module_news: News
-project_module_time_tracking: Time tracking
-text_file_repository_writable: File repository writable
-text_default_administrator_account_changed: Default administrator account changed
-text_rmagick_available: RMagick available (optional)
-button_configure: Configure
-label_plugins: Plugins
-label_ldap_authentication: LDAP authentication
-label_downloads_abbr: D/L
-label_this_month: this month
-label_last_n_days: last %d days
-label_all_time: all time
-label_this_year: this year
-label_date_range: Date range
-label_last_week: last week
-label_yesterday: yesterday
-label_last_month: last month
-label_add_another_file: Add another file
-label_optional_description: Optional description
-text_destroy_time_entries_question: %.02f hours were reported on the issues you are about to delete. What do you want to do ?
-error_issue_not_found_in_project: 'The issue was not found or does not belong to this project'
-text_assign_time_entries_to_project: Assign reported hours to the project
-text_destroy_time_entries: Delete reported hours
-text_reassign_time_entries: 'Reassign reported hours to this issue:'
-setting_activity_days_default: Days displayed on project activity
+project_module_files: Pliki
+project_module_documents: Dokumenty
+project_module_repository: Repozytorium
+project_module_news: Wiadomości
+project_module_time_tracking: Śledzenie czasu
+text_file_repository_writable: Zapisywalne repozytorium plików
+text_default_administrator_account_changed: Zmieniono domyślne hasło administratora
+text_rmagick_available: RMagick dostępne (opcjonalnie)
+button_configure: Konfiguruj
+label_plugins: Wtyczki
+label_ldap_authentication: Autoryzacja LDAP
+label_downloads_abbr: Pobieranie
+label_this_month: ten miesiąc
+label_last_n_days: ostatnie %d dni
+label_all_time: cały czas
+label_this_year: ten rok
+label_date_range: Zakres datowy
+label_last_week: ostatni tydzień
+label_yesterday: wczoraj
+label_last_month: ostatni miesiąc
+label_add_another_file: Dodaj kolejny plik
+label_optional_description: Opcjonalny opis
+text_destroy_time_entries_question: Zalogowano %.02f godzin przy zagadnieniu, które chcesz usunąć. Co chcesz zrobić?
+error_issue_not_found_in_project: 'Zaganienie nie zostało znalezione lub nie należy do tego projektu'
+text_assign_time_entries_to_project: Przypisz logowany czas do projektu
+text_destroy_time_entries: Usuń zalogowany czas
+text_reassign_time_entries: 'Przepnij zalogowany czas do tego zagadnienia:'
 label_chronological_order: In chronological order
-field_comments_sorting: Afficher les commentaires
+setting_activity_days_default: Days displayed on project activity
+setting_display_subprojects_issues: Display subprojects issues on main projects by default
+field_comments_sorting: Display comments
 label_reverse_chronological_order: In reverse chronological order
 label_preferences: Preferences
-setting_display_subprojects_issues: Display subprojects issues on main projects by default
diff --git a/lang/pt-br.yml b/lang/pt-br.yml
index e3b50bdb4..10452e195 100644
--- a/lang/pt-br.yml
+++ b/lang/pt-br.yml
@@ -609,7 +609,7 @@ text_destroy_time_entries: Delete reported hours
 text_reassign_time_entries: 'Reassign reported hours to this issue:'
 setting_activity_days_default: Days displayed on project activity
 label_chronological_order: In chronological order
-field_comments_sorting: Afficher les commentaires
+field_comments_sorting: Display comments
 label_reverse_chronological_order: In reverse chronological order
 label_preferences: Preferences
 setting_display_subprojects_issues: Display subprojects issues on main projects by default
diff --git a/lang/pt.yml b/lang/pt.yml
index 034da0db9..59176b2fe 100644
--- a/lang/pt.yml
+++ b/lang/pt.yml
@@ -609,7 +609,7 @@ text_destroy_time_entries: Delete reported hours
 text_reassign_time_entries: 'Reassign reported hours to this issue:'
 setting_activity_days_default: Days displayed on project activity
 label_chronological_order: In chronological order
-field_comments_sorting: Afficher les commentaires
+field_comments_sorting: Display comments
 label_reverse_chronological_order: In reverse chronological order
 label_preferences: Preferences
 setting_display_subprojects_issues: Display subprojects issues on main projects by default
diff --git a/lang/ro.yml b/lang/ro.yml
index 52011ff76..35f7d5059 100644
--- a/lang/ro.yml
+++ b/lang/ro.yml
@@ -609,7 +609,7 @@ text_destroy_time_entries: Delete reported hours
 text_reassign_time_entries: 'Reassign reported hours to this issue:'
 setting_activity_days_default: Days displayed on project activity
 label_chronological_order: In chronological order
-field_comments_sorting: Afficher les commentaires
+field_comments_sorting: Display comments
 label_reverse_chronological_order: In reverse chronological order
 label_preferences: Preferences
 setting_display_subprojects_issues: Display subprojects issues on main projects by default
diff --git a/lang/ru.yml b/lang/ru.yml
index 400e48448..bc385d942 100644
--- a/lang/ru.yml
+++ b/lang/ru.yml
@@ -613,7 +613,7 @@ text_destroy_time_entries: Удалить зарегистрированное 
 text_reassign_time_entries: 'Перенести зарегистрированное время на следующую задачу:'
 setting_activity_days_default: Days displayed on project activity
 label_chronological_order: In chronological order
-field_comments_sorting: Afficher les commentaires
+field_comments_sorting: Display comments
 label_reverse_chronological_order: In reverse chronological order
 label_preferences: Preferences
 setting_display_subprojects_issues: Display subprojects issues on main projects by default
diff --git a/lang/sr.yml b/lang/sr.yml
index c48a4e63f..cede61bcb 100644
--- a/lang/sr.yml
+++ b/lang/sr.yml
@@ -610,7 +610,7 @@ text_destroy_time_entries: Delete reported hours
 text_reassign_time_entries: 'Reassign reported hours to this issue:'
 setting_activity_days_default: Days displayed on project activity
 label_chronological_order: In chronological order
-field_comments_sorting: Afficher les commentaires
+field_comments_sorting: Display comments
 label_reverse_chronological_order: In reverse chronological order
 label_preferences: Preferences
 setting_display_subprojects_issues: Display subprojects issues on main projects by default
diff --git a/lang/sv.yml b/lang/sv.yml
index 125e2dcc7..0347ad1e8 100644
--- a/lang/sv.yml
+++ b/lang/sv.yml
@@ -610,7 +610,7 @@ text_destroy_time_entries: Delete reported hours
 text_reassign_time_entries: 'Reassign reported hours to this issue:'
 setting_activity_days_default: Days displayed on project activity
 label_chronological_order: In chronological order
-field_comments_sorting: Afficher les commentaires
+field_comments_sorting: Display comments
 label_reverse_chronological_order: In reverse chronological order
 label_preferences: Preferences
 setting_display_subprojects_issues: Display subprojects issues on main projects by default
diff --git a/lang/uk.yml b/lang/uk.yml
index 155370576..da3b456e0 100644
--- a/lang/uk.yml
+++ b/lang/uk.yml
@@ -611,7 +611,7 @@ text_destroy_time_entries: Delete reported hours
 text_reassign_time_entries: 'Reassign reported hours to this issue:'
 setting_activity_days_default: Days displayed on project activity
 label_chronological_order: In chronological order
-field_comments_sorting: Afficher les commentaires
+field_comments_sorting: Display comments
 label_reverse_chronological_order: In reverse chronological order
 label_preferences: Preferences
 setting_display_subprojects_issues: Display subprojects issues on main projects by default
diff --git a/lang/zh-tw.yml b/lang/zh-tw.yml
index 7cc11c611..905db3e42 100644
--- a/lang/zh-tw.yml
+++ b/lang/zh-tw.yml
@@ -177,6 +177,7 @@ field_column_names: Columns
 field_time_zone: 時區
 field_searchable: 可用做搜尋條件
 field_default_value: 預設值
+field_comments_sorting: 顯示註解
 
 setting_app_title: 標題
 setting_app_subtitle: 副標題
@@ -206,6 +207,8 @@ setting_emails_footer: 電子郵件附帶說明
 setting_protocol: 協定
 setting_per_page_options: 每頁顯示個數選項
 setting_user_format: 使用者顯示格式
+setting_activity_days_default: 專案活動顯示天數
+setting_display_subprojects_issues: 預設於主控專案中顯示從屬專案的項目
 
 project_module_issue_tracking: 項目追蹤
 project_module_time_tracking: 工時追蹤
@@ -500,6 +503,9 @@ label_ldap_authentication: LDAP 認證
 label_downloads_abbr: 下載
 label_optional_description: 額外的說明
 label_add_another_file: 增加其他檔案
+label_preferences: 偏好選項
+label_chronological_order: 以時間由遠至近排序
+label_reverse_chronological_order: 以時間由近至遠排序
 
 button_login: 登入
 button_submit: 送出
@@ -608,9 +614,3 @@ default_activity_development: 開發
 enumeration_issue_priorities: 項目優先權
 enumeration_doc_categories: 文件分類
 enumeration_activities: 活動 (time tracking)
-setting_activity_days_default: Days displayed on project activity
-label_chronological_order: In chronological order
-field_comments_sorting: Afficher les commentaires
-label_reverse_chronological_order: In reverse chronological order
-label_preferences: Preferences
-setting_display_subprojects_issues: Display subprojects issues on main projects by default
diff --git a/lang/zh.yml b/lang/zh.yml
index 0b17b4ff9..a6cf93c39 100644
--- a/lang/zh.yml
+++ b/lang/zh.yml
@@ -89,7 +89,7 @@ mail_body_register: '请点击以下链接来激活您的Redmine帐号：'
 mail_body_account_information_external: 您可以使用您的 "%s" 帐号来登录Redmine。
 mail_body_account_information: 您的Redmine帐号信息
 mail_subject_account_activation_request: Redmine帐号激活请求
-mail_body_account_activation_request: '新用户 (%s) 已完成注册，正在等候您的审核：'
+mail_body_account_activation_request: '新用户（%s）已完成注册，正在等候您的审核：'
 
 gui_validation_error: 1 个错误
 gui_validation_error_plural: %d 个错误
@@ -159,7 +159,7 @@ field_start_date: 开始
 field_done_ratio: 完成度
 field_auth_source: 认证模式
 field_hide_mail: 隐藏我的邮件地址
-field_comments: 注释
+field_comments: 评论
 field_url: URL
 field_start_page: 起始页
 field_subproject: 子项目
@@ -177,6 +177,7 @@ field_column_names: 列
 field_time_zone: 时区
 field_searchable: 可用作搜索条件
 field_default_value: 默认值
+field_comments_sorting: 显示评论
 
 setting_app_title: 应用程序标题
 setting_app_subtitle: 应用程序子标题
@@ -206,6 +207,8 @@ setting_emails_footer: 邮件签名
 setting_protocol: 协议(Protocol)
 setting_per_page_options: 每页显示条目个数的设置
 setting_user_format: 用户显示格式
+setting_activity_days_default: 在项目活动中显示的天数
+setting_display_subprojects_issues: 在项目页面上默认显示子项目的问题
 
 project_module_issue_tracking: 问题跟踪
 project_module_time_tracking: 时间跟踪
@@ -243,7 +246,7 @@ label_member: 成员
 label_member_new: 新建成员
 label_member_plural: 成员列表
 label_tracker: 跟踪标签
-label_tracker_plural: 跟踪标签列表
+label_tracker_plural: 跟踪标签
 label_tracker_new: 新建跟踪标签
 label_workflow: 工作流程
 label_issue_status: 问题状态
@@ -347,11 +350,11 @@ label_internal: 内部
 label_last_changes: 最近的 %d 次更新
 label_change_view_all: 查看所有更新
 label_personalize_page: 个性化定制本页
-label_comment: 注释
-label_comment_plural: 注释列表
-label_comment_add: 添加注释
-label_comment_added: 注释已添加
-label_comment_delete: 删除注释
+label_comment: 评论
+label_comment_plural: 评论列表
+label_comment_add: 添加评论
+label_comment_added: 评论已添加
+label_comment_delete: 删除评论
 label_query: 自定义查询
 label_query_plural: 自定义查询列表
 label_query_new: 新建查询
@@ -377,7 +380,7 @@ label_more_than_ago: 之前天数大于
 label_ago: 之前天数
 label_contains: 包含
 label_not_contains: 不包含
-label_day_plural: 天数
+label_day_plural: 天
 label_repository: 版本库
 label_repository_plural: 版本库
 label_browse: 浏览
@@ -403,7 +406,7 @@ label_roadmap_due_in: 截止日期到
 label_roadmap_overdue: %s 延期
 label_roadmap_no_issues: 该版本没有问题
 label_search: 搜索
-label_result_plural: 个结果
+label_result_plural: 结果
 label_all_words: 所有单词
 label_wiki: Wiki
 label_wiki_edit: Wiki 编辑
@@ -443,10 +446,10 @@ label_blocks: 阻挡
 label_blocked_by: 被阻挡
 label_precedes: 优先于
 label_follows: 跟随于
-label_end_to_start: end to start
-label_end_to_end: end to end
-label_start_to_start: start to start
-label_start_to_end: start to end
+label_end_to_start: 结束-开始
+label_end_to_end: 结束-结束
+label_start_to_start: 开始-开始
+label_start_to_end: 开始-结束
 label_stay_logged_in: 保持登录状态
 label_disabled: 禁用
 label_show_completed_versions: 显示已完成的版本
@@ -500,6 +503,9 @@ label_ldap_authentication: LDAP 认证
 label_downloads_abbr: D/L
 label_optional_description: 可选的描述
 label_add_another_file: 添加其它文件
+label_preferences: 首选项
+label_chronological_order: 按时间顺序
+label_reverse_chronological_order: 按时间顺序（倒序）
 
 button_login: 登录
 button_submit: 提交
@@ -539,7 +545,7 @@ button_annotate: 注释
 button_update: 更新
 button_configure: 配置
 
-status_active: 已激活
+status_active: 活动的
 status_registered: 已注册
 status_locked: 已锁定
 
@@ -608,9 +614,3 @@ default_activity_development: 开发
 enumeration_issue_priorities: 问题优先级
 enumeration_doc_categories: 文档类别
 enumeration_activities: 活动（时间跟踪）
-setting_activity_days_default: Days displayed on project activity
-label_chronological_order: In chronological order
-field_comments_sorting: Afficher les commentaires
-label_reverse_chronological_order: In reverse chronological order
-label_preferences: Preferences
-setting_display_subprojects_issues: Display subprojects issues on main projects by default
diff --git a/public/javascripts/calendar/lang/calendar-da.js b/public/javascripts/calendar/lang/calendar-da.js
new file mode 100644
index 000000000..2cba5f683
--- /dev/null
+++ b/public/javascripts/calendar/lang/calendar-da.js
@@ -0,0 +1,128 @@
+// ** I18N
+
+// Calendar EN language
+// Author: Mihai Bazon, <mihai_bazon@yahoo.com>
+// Encoding: any
+// Translater: Mads N. Vestergaard <mnv@coolsms.dk>
+// Distributed under the same terms as the calendar itself.
+
+// For translators: please use UTF-8 if possible.  We strongly believe that
+// Unicode is the answer to a real internationalized world.  Also please
+// include your contact information in the header, as can be seen above.
+
+// full day names
+Calendar._DN = new Array
+("Søndag",
+ "Mandag",
+ "Tirsdag",
+ "Onsdag",
+ "Torsdag",
+ "Fredag",
+ "Lørdag",
+ "Søndag");
+
+// Please note that the following array of short day names (and the same goes
+// for short month names, _SMN) isn't absolutely necessary.  We give it here
+// for exemplification on how one can customize the short day names, but if
+// they are simply the first N letters of the full name you can simply say:
+//
+//   Calendar._SDN_len = N; // short day name length
+//   Calendar._SMN_len = N; // short month name length
+//
+// If N = 3 then this is not needed either since we assume a value of 3 if not
+// present, to be compatible with translation files that were written before
+// this feature.
+
+// short day names
+Calendar._SDN = new Array
+("Søn",
+ "Man",
+ "Tir",
+ "Ons",
+ "Tor",
+ "Fre",
+ "Lør",
+ "Søn");
+
+// First day of the week. "0" means display Sunday first, "1" means display
+// Monday first, etc.
+Calendar._FD = 1;
+
+// full month names
+Calendar._MN = new Array
+("Januar",
+ "Februar",
+ "Marts",
+ "April",
+ "Maj",
+ "Juni",
+ "Juli",
+ "August",
+ "September",
+ "Oktober",
+ "November",
+ "December");
+
+// short month names
+Calendar._SMN = new Array
+("Jan",
+ "Feb",
+ "Mar",
+ "Apr",
+ "Maj",
+ "Jun",
+ "Jul",
+ "Aug",
+ "Sep",
+ "Okt",
+ "Nov",
+ "Dec");
+
+// tooltips
+Calendar._TT = {};
+Calendar._TT["INFO"] = "Om denne kalender";
+
+Calendar._TT["ABOUT"] =
+"DHTML Date/Time Selector\n" +
+"(c) dynarch.com 2002-2005 / Author: Mihai Bazon\n" + // don't translate this this ;-)
+"For seneste version, besøg: http://www.dynarch.com/projects/calendar/\n" +
+"Distribueret under GNU LGPL.  Se http://gnu.org/licenses/lgpl.html for detaljer." +
+"\n\n" +
+"Dato valg:\n" +
+"- Benyt \xab, \xbb tasterne til at vælge år\n" +
+"- Benyt " + String.fromCharCode(0x2039) + ", " + String.fromCharCode(0x203a) + " tasterne til at vælge måned\n" +
+"- Hold muse tasten inde på punkterne for at vælge hurtigere.";
+Calendar._TT["ABOUT_TIME"] = "\n\n" +
+"Tids valg:\n" +
+"- Klik på en af tidsramerne for at forhøje det\n" +
+"- eller Shift-klik for at mindske det\n" +
+"- eller klik og træk for hurtigere valg.";
+
+Calendar._TT["PREV_YEAR"] = "Forrige år (hold for menu)";
+Calendar._TT["PREV_MONTH"] = "Forrige måned (hold for menu)";
+Calendar._TT["GO_TODAY"] = "Gå til idag";
+Calendar._TT["NEXT_MONTH"] = "Næste måned (hold for menu)";
+Calendar._TT["NEXT_YEAR"] = "Næste år (hold for menu)";
+Calendar._TT["SEL_DATE"] = "Vælg dato";
+Calendar._TT["DRAG_TO_MOVE"] = "Træk for at flytte";
+Calendar._TT["PART_TODAY"] = " (idag)";
+
+// the following is to inform that "%s" is to be the first day of week
+// %s will be replaced with the day name.
+Calendar._TT["DAY_FIRST"] = "Vis %s først";
+
+// This may be locale-dependent.  It specifies the week-end days, as an array
+// of comma-separated numbers.  The numbers are from 0 to 6: 0 means Sunday, 1
+// means Monday, etc.
+Calendar._TT["WEEKEND"] = "6,7";
+
+Calendar._TT["CLOSE"] = "Luk";
+Calendar._TT["TODAY"] = "Idag";
+Calendar._TT["TIME_PART"] = "(Shift-)Klik eller træk for at ændre værdi";
+
+// date formats
+Calendar._TT["DEF_DATE_FORMAT"] = "%Y-%m-%d";
+Calendar._TT["TT_DATE_FORMAT"] = "%a, %b %e";
+
+Calendar._TT["WK"] = "uge";
+Calendar._TT["TIME"] = "Tid:";
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-da.js b/public/javascripts/jstoolbar/lang/jstoolbar-da.js
new file mode 100644
index 000000000..9996acaf3
--- /dev/null
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-da.js
@@ -0,0 +1,14 @@
+jsToolBar.strings = {};
+jsToolBar.strings['Strong'] = 'Fed';
+jsToolBar.strings['Italic'] = 'Kursiv';
+jsToolBar.strings['Underline'] = 'Underskrevet';
+jsToolBar.strings['Deleted'] = 'Slettet';
+jsToolBar.strings['Code'] = 'Inline Kode';
+jsToolBar.strings['Heading 1'] = 'Overskrift 1';
+jsToolBar.strings['Heading 2'] = 'Overskrift 2';
+jsToolBar.strings['Heading 3'] = 'Overskrift 3';
+jsToolBar.strings['Unordered list'] = 'Unummereret list';
+jsToolBar.strings['Ordered list'] = 'Nummereret list';
+jsToolBar.strings['Preformatted text'] = 'Preformatteret tekst';
+jsToolBar.strings['Wiki link'] = 'Link til en Wiki side';
+jsToolBar.strings['Image'] = 'Billede';

From a4c6c62c8b13db7987d115cbaf0011186e9f056e Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Fri, 7 Mar 2008 17:49:44 +0000
Subject: [PATCH 261/710] Added preview for forum messages.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1205 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/messages_controller.rb | 13 ++++++++++---
 app/views/boards/show.rhtml            | 10 +++++++++-
 app/views/messages/edit.rhtml          | 10 +++++++++-
 app/views/messages/new.rhtml           | 11 ++++++++++-
 app/views/messages/show.rhtml          | 14 +++++++++++---
 5 files changed, 49 insertions(+), 9 deletions(-)

diff --git a/app/controllers/messages_controller.rb b/app/controllers/messages_controller.rb
index 64a7fa1c9..97cb2c3bf 100644
--- a/app/controllers/messages_controller.rb
+++ b/app/controllers/messages_controller.rb
@@ -18,9 +18,9 @@
 class MessagesController < ApplicationController
   layout 'base'
   menu_item :boards
-  before_filter :find_board, :only => :new
-  before_filter :find_message, :except => :new
-  before_filter :authorize
+  before_filter :find_board, :only => [:new, :preview]
+  before_filter :find_message, :except => [:new, :preview]
+  before_filter :authorize, :except => :preview
 
   verify :method => :post, :only => [ :reply, :destroy ], :redirect_to => { :action => :show }
 
@@ -83,6 +83,13 @@ class MessagesController < ApplicationController
       { :action => 'show', :id => @message.parent }
   end
   
+  def preview
+    message = @board.messages.find_by_id(params[:id])
+    @attachements = message.attachments if message
+    @text = (params[:message] || params[:reply])[:content]
+    render :partial => 'common/preview'
+  end
+  
 private
   def find_message
     find_board
diff --git a/app/views/boards/show.rhtml b/app/views/boards/show.rhtml
index 01db0854c..54645622e 100644
--- a/app/views/boards/show.rhtml
+++ b/app/views/boards/show.rhtml
@@ -8,11 +8,19 @@
 
 <div id="add-message" style="display:none;">
 <h2><%= link_to h(@board.name), :controller => 'boards', :action => 'show', :project_id => @project, :id => @board %> &#187; <%= l(:label_message_new) %></h2>
-<% form_for :message, @message, :url => {:controller => 'messages', :action => 'new', :board_id => @board}, :html => {:multipart => true} do |f| %>
+<% form_for :message, @message, :url => {:controller => 'messages', :action => 'new', :board_id => @board}, :html => {:multipart => true, :id => 'message-form'} do |f| %>
   <%= render :partial => 'messages/form', :locals => {:f => f} %>
   <p><%= submit_tag l(:button_create) %>
+  <%= link_to_remote l(:label_preview), 
+                     { :url => { :controller => 'messages', :action => 'preview', :board_id => @board },
+                       :method => 'post',
+                       :update => 'preview',
+                       :with => "Form.serialize('message-form')",
+                       :complete => "Element.scrollTo('preview')"
+                     }, :accesskey => accesskey(:preview) %> |
   <%= link_to l(:button_cancel), "#", :onclick => 'Element.hide("add-message")' %></p>
 <% end %>
+<div id="preview" class="wiki"></div>
 </div>
 
 <h2><%=h @board.name %></h2>
diff --git a/app/views/messages/edit.rhtml b/app/views/messages/edit.rhtml
index dcc59a396..56e708620 100644
--- a/app/views/messages/edit.rhtml
+++ b/app/views/messages/edit.rhtml
@@ -1,6 +1,14 @@
 <h2><%= link_to h(@board.name), :controller => 'boards', :action => 'show', :project_id => @project, :id => @board %> &#187; <%=h @message.subject %></h2>
 
-<% form_for :message, @message, :url => {:action => 'edit'}, :html => {:multipart => true} do |f| %>
+<% form_for :message, @message, :url => {:action => 'edit'}, :html => {:multipart => true, :id => 'message-form'} do |f| %>
   <%= render :partial => 'form', :locals => {:f => f, :replying => !@message.parent.nil?} %>
   <%= submit_tag l(:button_save) %>
+  <%= link_to_remote l(:label_preview), 
+                     { :url => { :controller => 'messages', :action => 'preview', :board_id => @board },
+                       :method => 'post',
+                       :update => 'preview',
+                       :with => "Form.serialize('message-form')",
+                       :complete => "Element.scrollTo('preview')"
+                     }, :accesskey => accesskey(:preview) %>
 <% end %>
+<div id="preview" class="wiki"></div>
diff --git a/app/views/messages/new.rhtml b/app/views/messages/new.rhtml
index 5c688f465..050c13284 100644
--- a/app/views/messages/new.rhtml
+++ b/app/views/messages/new.rhtml
@@ -1,6 +1,15 @@
 <h2><%= link_to h(@board.name), :controller => 'boards', :action => 'show', :project_id => @project, :id => @board %> &#187; <%= l(:label_message_new) %></h2>
 
-<% form_for :message, @message, :url => {:action => 'new'}, :html => {:multipart => true} do |f| %>
+<% form_for :message, @message, :url => {:action => 'new'}, :html => {:multipart => true, :id => 'message-form'} do |f| %>
   <%= render :partial => 'form', :locals => {:f => f} %>
   <%= submit_tag l(:button_create) %>
+  <%= link_to_remote l(:label_preview), 
+                     { :url => { :controller => 'messages', :action => 'preview', :board_id => @board },
+                       :method => 'post',
+                       :update => 'preview',
+                       :with => "Form.serialize('message-form')",
+                       :complete => "Element.scrollTo('preview')"
+                     }, :accesskey => accesskey(:preview) %>
 <% end %>
+
+<div id="preview" class="wiki"></div>
diff --git a/app/views/messages/show.rhtml b/app/views/messages/show.rhtml
index b9897cb40..632f603ff 100644
--- a/app/views/messages/show.rhtml
+++ b/app/views/messages/show.rhtml
@@ -31,9 +31,17 @@
 <% if !@topic.locked? && authorize_for('messages', 'reply') %>
 <p><%= toggle_link l(:button_reply), "reply", :focus => 'message_content' %></p>
 <div id="reply" style="display:none;">
-<% form_for :reply, @reply, :url => {:action => 'reply', :id => @topic}, :html => {:multipart => true} do |f| %>
-    <%= render :partial => 'form', :locals => {:f => f, :replying => true} %>
-    <%= submit_tag l(:button_submit) %>
+<% form_for :reply, @reply, :url => {:action => 'reply', :id => @topic}, :html => {:multipart => true, :id => 'message-form'} do |f| %>
+  <%= render :partial => 'form', :locals => {:f => f, :replying => true} %>
+  <%= submit_tag l(:button_submit) %>
+  <%= link_to_remote l(:label_preview), 
+                     { :url => { :controller => 'messages', :action => 'preview', :board_id => @board },
+                       :method => 'post',
+                       :update => 'preview',
+                       :with => "Form.serialize('message-form')",
+                       :complete => "Element.scrollTo('preview')"
+                     }, :accesskey => accesskey(:preview) %>
 <% end %>
+<div id="preview" class="wiki"></div>
 </div>
 <% end %>

From 1830064918cdd134a48dbe9c702c20240177df57 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sat, 8 Mar 2008 09:06:16 +0000
Subject: [PATCH 262/710] Changes 'Fixed version' label to 'Target version'
 (closes #723, #808).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1206 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 lang/bg.yml    | 2 +-
 lang/cs.yml    | 2 +-
 lang/da.yml    | 2 +-
 lang/de.yml    | 2 +-
 lang/en.yml    | 2 +-
 lang/es.yml    | 2 +-
 lang/fi.yml    | 2 +-
 lang/fr.yml    | 2 +-
 lang/he.yml    | 2 +-
 lang/it.yml    | 2 +-
 lang/ja.yml    | 2 +-
 lang/ko.yml    | 2 +-
 lang/lt.yml    | 2 +-
 lang/nl.yml    | 2 +-
 lang/pl.yml    | 2 +-
 lang/pt-br.yml | 2 +-
 lang/pt.yml    | 2 +-
 lang/ro.yml    | 2 +-
 lang/ru.yml    | 2 +-
 lang/sr.yml    | 2 +-
 lang/sv.yml    | 2 +-
 lang/uk.yml    | 2 +-
 lang/zh-tw.yml | 2 +-
 lang/zh.yml    | 2 +-
 24 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/lang/bg.yml b/lang/bg.yml
index e02cb6bdd..87808230e 100644
--- a/lang/bg.yml
+++ b/lang/bg.yml
@@ -117,7 +117,7 @@ field_subject: Тема
 field_due_date: Крайна дата
 field_assigned_to: Възложена на
 field_priority: Приоритет
-field_fixed_version: Версия
+field_fixed_version: Target version
 field_user: Потребител
 field_role: Роля
 field_homepage: Начална страница
diff --git a/lang/cs.yml b/lang/cs.yml
index b14a58a1e..c5cef3777 100644
--- a/lang/cs.yml
+++ b/lang/cs.yml
@@ -117,7 +117,7 @@ field_subject: Předmět
 field_due_date: Po lhůtě
 field_assigned_to: Přiřazeno
 field_priority: Priorita
-field_fixed_version: Pevná verze
+field_fixed_version: Target version
 field_user: Uživatel
 field_role: Role
 field_homepage: Úvodní
diff --git a/lang/da.yml b/lang/da.yml
index 7cac84418..ed2eb26a7 100644
--- a/lang/da.yml
+++ b/lang/da.yml
@@ -126,7 +126,7 @@ field_subject: Emne
 field_due_date: Deadline
 field_assigned_to: Tildelt til
 field_priority: Prioritet
-field_fixed_version: Retet version
+field_fixed_version: Target version
 field_user: Bruger
 field_role: Rolle
 field_homepage: Hjemmeside
diff --git a/lang/de.yml b/lang/de.yml
index 750fc2002..aa4938534 100644
--- a/lang/de.yml
+++ b/lang/de.yml
@@ -127,7 +127,7 @@ field_subject: Thema
 field_due_date: Abgabedatum
 field_assigned_to: Zugewiesen an
 field_priority: Priorität
-field_fixed_version: Erledigt in Version
+field_fixed_version: Target version
 field_user: Benutzer
 field_role: Rolle
 field_homepage: Projekt-Homepage
diff --git a/lang/en.yml b/lang/en.yml
index b6bd945a0..af6c8faa9 100644
--- a/lang/en.yml
+++ b/lang/en.yml
@@ -127,7 +127,7 @@ field_subject: Subject
 field_due_date: Due date
 field_assigned_to: Assigned to
 field_priority: Priority
-field_fixed_version: Fixed version
+field_fixed_version: Target version
 field_user: User
 field_role: Role
 field_homepage: Homepage
diff --git a/lang/es.yml b/lang/es.yml
index 9c19361ff..47ee41524 100644
--- a/lang/es.yml
+++ b/lang/es.yml
@@ -114,7 +114,7 @@ field_subject: Tema
 field_due_date: Fecha fin
 field_assigned_to: Asignado a
 field_priority: Prioridad
-field_fixed_version: Versión
+field_fixed_version: Target version
 field_user: Usuario
 field_role: Perfil
 field_homepage: Sitio web
diff --git a/lang/fi.yml b/lang/fi.yml
index f37c2da4e..b84d6cd78 100644
--- a/lang/fi.yml
+++ b/lang/fi.yml
@@ -126,7 +126,7 @@ field_subject: Aihe
 field_due_date: Määräaika
 field_assigned_to: Nimetty
 field_priority: Prioriteetti
-field_fixed_version: Määrätty versio
+field_fixed_version: Target version
 field_user: Käyttäjä
 field_role: Rooli
 field_homepage: Kotisivu
diff --git a/lang/fr.yml b/lang/fr.yml
index 3370ba71b..243088f04 100644
--- a/lang/fr.yml
+++ b/lang/fr.yml
@@ -127,7 +127,7 @@ field_subject: Sujet
 field_due_date: Date d'échéance
 field_assigned_to: Assigné à
 field_priority: Priorité
-field_fixed_version: Version corrigée
+field_fixed_version: Version cible
 field_user: Utilisateur
 field_role: Rôle
 field_homepage: Site web
diff --git a/lang/he.yml b/lang/he.yml
index 48fdb447f..972b1134a 100644
--- a/lang/he.yml
+++ b/lang/he.yml
@@ -119,7 +119,7 @@ field_subject: שם נושא
 field_due_date: תאריך סיום
 field_assigned_to: מוצב ל
 field_priority: עדיפות
-field_fixed_version: גירסא מקובעת
+field_fixed_version: Target version
 field_user: מתשמש
 field_role: תפקיד
 field_homepage: דף הבית
diff --git a/lang/it.yml b/lang/it.yml
index 41caa50a3..c3250ebbc 100644
--- a/lang/it.yml
+++ b/lang/it.yml
@@ -117,7 +117,7 @@ field_subject: Oggetto
 field_due_date: Data ultima
 field_assigned_to: Assegnato a
 field_priority: Priorita'
-field_fixed_version: Versione di fix
+field_fixed_version: Target version
 field_user: Utente
 field_role: Ruolo
 field_homepage: Homepage
diff --git a/lang/ja.yml b/lang/ja.yml
index 2c283dca7..79bb572a8 100644
--- a/lang/ja.yml
+++ b/lang/ja.yml
@@ -118,7 +118,7 @@ field_subject: 題名
 field_due_date: 期限日
 field_assigned_to: 担当者
 field_priority: 優先度
-field_fixed_version: 修正されたバージョン
+field_fixed_version: Target version
 field_user: ユーザ
 field_role: 役割
 field_homepage: ホームページ
diff --git a/lang/ko.yml b/lang/ko.yml
index 64a15c4cb..3ca077631 100644
--- a/lang/ko.yml
+++ b/lang/ko.yml
@@ -119,7 +119,7 @@ field_subject: 제목
 field_due_date: 완료 기한
 field_assigned_to: 담당자
 field_priority: 우선순위
-field_fixed_version: 마일스톤
+field_fixed_version: Target version
 field_user: 유저
 field_role: 역할
 field_homepage: 홈페이지
diff --git a/lang/lt.yml b/lang/lt.yml
index f78032d0d..93f48580f 100644
--- a/lang/lt.yml
+++ b/lang/lt.yml
@@ -125,7 +125,7 @@ field_subject: Tema
 field_due_date: Užbaigimo data 
 field_assigned_to: Paskirtas 
 field_priority: Prioritetas 
-field_fixed_version: Pastovi versija
+field_fixed_version: Target version
 field_user: Vartotojas 
 field_role: Vaidmuo 
 field_homepage: Pagrindinis puslapis 
diff --git a/lang/nl.yml b/lang/nl.yml
index 06a655b1b..e90665878 100644
--- a/lang/nl.yml
+++ b/lang/nl.yml
@@ -117,7 +117,7 @@ field_subject: Onderwerp
 field_due_date: Verwachte datum gereed
 field_assigned_to: Toegewezen aan
 field_priority: Prioriteit
-field_fixed_version: Opgeloste versie
+field_fixed_version: Target version
 field_user: Gebruiker
 field_role: Rol
 field_homepage: Homepage
diff --git a/lang/pl.yml b/lang/pl.yml
index 46d9cba5c..7003fb871 100644
--- a/lang/pl.yml
+++ b/lang/pl.yml
@@ -114,7 +114,7 @@ field_subject: Temat
 field_due_date: Data oddania
 field_assigned_to: Przydzielony do
 field_priority: Priorytet
-field_fixed_version: Wersja
+field_fixed_version: Target version
 field_user: Użytkownik
 field_role: Rola
 field_homepage: Strona www
diff --git a/lang/pt-br.yml b/lang/pt-br.yml
index 10452e195..10836d336 100644
--- a/lang/pt-br.yml
+++ b/lang/pt-br.yml
@@ -117,7 +117,7 @@ field_subject: Titulo
 field_due_date: Data devida
 field_assigned_to: Atribuido para
 field_priority: Prioridade
-field_fixed_version: Versao corrigida
+field_fixed_version: Target version
 field_user: Usuario
 field_role: Regra
 field_homepage: Pagina inicial
diff --git a/lang/pt.yml b/lang/pt.yml
index 59176b2fe..f59e3b06a 100644
--- a/lang/pt.yml
+++ b/lang/pt.yml
@@ -117,7 +117,7 @@ field_subject: Assunto
 field_due_date: Data final
 field_assigned_to: Atribuído para
 field_priority: Prioridade
-field_fixed_version: Versão corrigida
+field_fixed_version: Target version
 field_user: Usuário
 field_role: Regra
 field_homepage: Página inicial
diff --git a/lang/ro.yml b/lang/ro.yml
index 35f7d5059..cb7bb69be 100644
--- a/lang/ro.yml
+++ b/lang/ro.yml
@@ -117,7 +117,7 @@ field_subject: Subiect
 field_due_date: Data finalizarii 
 field_assigned_to: Atribuit pentru
 field_priority: Prioritate
-field_fixed_version: Versiune rezolvata 
+field_fixed_version: Target version
 field_user: Utilizator
 field_role: Rol
 field_homepage: Pagina principala
diff --git a/lang/ru.yml b/lang/ru.yml
index bc385d942..f12b2264f 100644
--- a/lang/ru.yml
+++ b/lang/ru.yml
@@ -127,7 +127,7 @@ field_subject: Тема
 field_due_date: Дата выполнения
 field_assigned_to: Назначена
 field_priority: Приоритет
-field_fixed_version: Фиксированная версия
+field_fixed_version: Target version
 field_user: Пользователь
 field_role: Роль
 field_homepage: Стартовая страница
diff --git a/lang/sr.yml b/lang/sr.yml
index cede61bcb..e59b3cba9 100644
--- a/lang/sr.yml
+++ b/lang/sr.yml
@@ -121,7 +121,7 @@ field_subject: Subjekat
 field_due_date: Do datuma
 field_assigned_to: Dodeljeno
 field_priority: Prioritet
-field_fixed_version: Ispravljena verzija
+field_fixed_version: Target version
 field_user: Korisnik
 field_role: Uloga
 field_homepage: Homepage
diff --git a/lang/sv.yml b/lang/sv.yml
index 0347ad1e8..5ff3f8f17 100644
--- a/lang/sv.yml
+++ b/lang/sv.yml
@@ -117,7 +117,7 @@ field_subject: Rubrik
 field_due_date: Färdigdatum
 field_assigned_to: Tilldelad
 field_priority: Prioritet
-field_fixed_version: Fixed version
+field_fixed_version: Target version
 field_user: Användare
 field_role: Roll
 field_homepage: Hemsida
diff --git a/lang/uk.yml b/lang/uk.yml
index da3b456e0..8c33c7806 100644
--- a/lang/uk.yml
+++ b/lang/uk.yml
@@ -122,7 +122,7 @@ field_subject: Тема
 field_due_date: Дата виконання
 field_assigned_to: Призначена до
 field_priority: Пріоритет
-field_fixed_version: Фіксована версія
+field_fixed_version: Target version
 field_user: Користувач
 field_role: Роль
 field_homepage: Домашня сторінка
diff --git a/lang/zh-tw.yml b/lang/zh-tw.yml
index 905db3e42..9334c72bb 100644
--- a/lang/zh-tw.yml
+++ b/lang/zh-tw.yml
@@ -127,7 +127,7 @@ field_subject: 主旨
 field_due_date: 完成日期
 field_assigned_to: 分派給
 field_priority: 優先權
-field_fixed_version: 版本
+field_fixed_version: Target version
 field_user: 用戶
 field_role: 角色
 field_homepage: 網站首頁
diff --git a/lang/zh.yml b/lang/zh.yml
index a6cf93c39..a917f0da7 100644
--- a/lang/zh.yml
+++ b/lang/zh.yml
@@ -127,7 +127,7 @@ field_subject: 主题
 field_due_date: 完成日期
 field_assigned_to: 指派给
 field_priority: 优先级
-field_fixed_version: 修订版本
+field_fixed_version: Target version
 field_user: 用户
 field_role: 角色
 field_homepage: 主页

From 9b59ea7256580c2f0d8322b1f3f526d5f0628963 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sat, 8 Mar 2008 11:17:03 +0000
Subject: [PATCH 263/710] Version details view changes: * display related
 issues on the version detail view * display total estimated and spent hours
 on the version detail view * fixed wiki headings size (same as r1168)

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1207 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/helpers/projects_helper.rb     |  7 +-----
 app/models/version.rb              | 10 +++++++++
 app/views/versions/show.rhtml      | 35 ++++++++++++++++++++++++++++++
 public/stylesheets/application.css | 10 +++++----
 4 files changed, 52 insertions(+), 10 deletions(-)

diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb
index a16377412..ffbf25e83 100644
--- a/app/helpers/projects_helper.rb
+++ b/app/helpers/projects_helper.rb
@@ -18,12 +18,7 @@
 module ProjectsHelper
   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
+    link_to h(version.name), { :controller => 'versions', :action => 'show', :id => version }, options
   end
   
   def format_activity_day(date)
diff --git a/app/models/version.rb b/app/models/version.rb
index 266346c7b..f9395c5d9 100644
--- a/app/models/version.rb
+++ b/app/models/version.rb
@@ -34,6 +34,16 @@ class Version < ActiveRecord::Base
     effective_date
   end
   
+  # Returns the total estimated time for this version
+  def estimated_hours
+    @estimated_hours ||= fixed_issues.sum(:estimated_hours).to_f
+  end
+  
+  # Returns the total reported time for this version
+  def spent_hours
+    @spent_hours ||= TimeEntry.sum(:hours, :include => :issue, :conditions => ["#{Issue.table_name}.fixed_version_id = ?", id]).to_f
+  end
+  
   # Returns true if the version is completed: due date reached and no open issues
   def completed?
     effective_date && (effective_date <= Date.today) && (open_issues_count == 0)
diff --git a/app/views/versions/show.rhtml b/app/views/versions/show.rhtml
index 1c2a0be44..873354e0d 100644
--- a/app/views/versions/show.rhtml
+++ b/app/views/versions/show.rhtml
@@ -4,11 +4,46 @@
 
 <h2><%= h(@version.name) %></h2>
 
+<div id="version-summary">
+<% if @version.estimated_hours > 0 || User.current.allowed_to?(:view_time_entries, @project) %>
+<fieldset><legend><%= l(:label_time_tracking) %></legend>
+<table>
+<tr>
+    <td width="130px" align="right"><%= l(:field_estimated_hours) %></td>
+    <td width="240px" class="total-hours"width="130px" align="right"><%= html_hours(lwr(:label_f_hour, @version.estimated_hours)) %></td>
+</tr>
+<% if User.current.allowed_to?(:view_time_entries, @project) %>
+<tr>
+    <td width="130px" align="right"><%= l(:label_spent_time) %></td>
+    <td width="240px" class="total-hours"><%= html_hours(lwr(:label_f_hour, @version.spent_hours)) %></td>
+</tr>
+<% end %>
+</table>
+</fieldset>
+<% end %>
+
 <div id="status_by">
 <%= render_issue_status_by(@version, params[:status_by]) if @version.fixed_issues.count > 0 %>
 </div>
+</div>
 
+<div id="roadmap">
 <%= render :partial => 'versions/overview', :locals => {:version => @version} %>
 <%= render(:partial => "wiki/content", :locals => {:content => @version.wiki_page.content}) if @version.wiki_page %>
 
+<% issues = @version.fixed_issues.find(:all,
+                                       :include => [:status, :tracker],
+                                       :order => "#{Tracker.table_name}.position, #{Issue.table_name}.id") %>
+<% if issues.size > 0 %>
+<fieldset class="related-issues"><legend><%= l(:label_related_issues) %></legend>
+<ul>
+<% issues.each do |issue| -%>
+    <li><%= link = link_to_issue(issue)
+            issue.status.is_closed? ? content_tag("del", link) : link %>: <%=h issue.subject %></li>
+<% end -%>
+</ul>
+</fieldset>
+<% end %>
+</div>
+
 <% html_title @version.name %>
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index cd875c7f7..d855348dc 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -174,14 +174,18 @@ div#roadmap .wiki h1:first-child { display: none; }
 div#roadmap .wiki h1 { font-size: 120%; }
 div#roadmap .wiki h2 { font-size: 110%; }
 
+div#version-summary { float:right; width:380px; margin-left: 16px; margin-bottom: 16px; background-color: #fff; }
+div#version-summary fieldset { margin-bottom: 1em; }
+div#version-summary .total-hours { text-align: right; }
+
 table#time-report td.hours { text-align: right; padding-right: 0.5em; }
 table#time-report tbody tr { font-style: italic; color: #777; }
 table#time-report tbody tr.last-level { font-style: normal; color: #555; }
 table#time-report tbody tr.total { font-style: normal; font-weight: bold; color: #555; background-color:#EEEEEE; }
 table#time-report .hours-dec { font-size: 0.9em; }
 
-div.total-hours { text-align: left; font-size: 110%; font-weight: bold; }
-div.total-hours span.hours-int { font-size: 120%; }
+.total-hours { font-size: 110%; font-weight: bold; }
+.total-hours span.hours-int { font-size: 120%; }
 
 .autoscroll {overflow-x: auto; padding:1px; width:100%; margin-bottom: 1.2em;}
 #user_firstname, #user_lastname, #user_mail, #my_account_form select { width: 90%; }
@@ -337,8 +341,6 @@ table.progress td.open { background: #FFF none repeat scroll 0%; }
 p.pourcent {font-size: 80%;}
 p.progress-info {clear: left; font-style: italic; font-size: 80%;}
 
-div#status_by { float:right; width:380px; margin-left: 16px; margin-bottom: 16px; }
-
 /***** Tabs *****/
 #content .tabs {height: 2.6em; border-bottom: 1px solid #bbbbbb; margin-bottom:1.2em; position:relative;}
 #content .tabs ul {margin:0; position:absolute; bottom:-2px; padding-left:1em;}

From 07882590bb50c8eba35fa5f70cb987a34f51e4a3 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sat, 8 Mar 2008 13:46:07 +0000
Subject: [PATCH 264/710] Strip out email address from authors in repository
 screens (#814).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1208 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/repositories/_dir_list_content.rhtml | 2 +-
 app/views/repositories/_revisions.rhtml        | 2 +-
 app/views/repositories/annotate.rhtml          | 2 +-
 app/views/repositories/revision.rhtml          | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/views/repositories/_dir_list_content.rhtml b/app/views/repositories/_dir_list_content.rhtml
index 352575259..a7b83e817 100644
--- a/app/views/repositories/_dir_list_content.rhtml
+++ b/app/views/repositories/_dir_list_content.rhtml
@@ -25,7 +25,7 @@ end %>
 <td class="size"><%= (entry.size ? number_to_human_size(entry.size) : "?") unless entry.is_dir? %></td>
 <td class="revision"><%= link_to(entry.lastrev.name, :action => 'revision', :id => @project, :rev => entry.lastrev.identifier) if entry.lastrev && entry.lastrev.identifier %></td>
 <td class="age"><%= distance_of_time_in_words(entry.lastrev.time, Time.now) if entry.lastrev && entry.lastrev.time %></td>
-<td class="author"><%=h(entry.lastrev.author) if entry.lastrev %></td>
+<td class="author"><%=h(entry.lastrev.author.to_s.split('<').first) if entry.lastrev %></td>
 <% changeset = @project.repository.changesets.find_by_revision(entry.lastrev.identifier) if entry.lastrev %>
 <td class="comments"><%=h truncate(changeset.comments, 50) unless changeset.nil? %></td>
 </tr>
diff --git a/app/views/repositories/_revisions.rhtml b/app/views/repositories/_revisions.rhtml
index ea722329f..52992bb89 100644
--- a/app/views/repositories/_revisions.rhtml
+++ b/app/views/repositories/_revisions.rhtml
@@ -17,7 +17,7 @@
 <td class="checkbox"><%= radio_button_tag('rev', changeset.revision, (line_num==1), :id => "cb-#{line_num}", :onclick => "$('cbto-#{line_num+1}').checked=true;") if show_diff && (line_num < revisions.size) %></td>
 <td class="checkbox"><%= radio_button_tag('rev_to', changeset.revision, (line_num==2), :id => "cbto-#{line_num}", :onclick => "if ($('cb-#{line_num}').checked==true) {$('cb-#{line_num-1}').checked=true;}") if show_diff && (line_num > 1) %></td>
 <td class="committed_on"><%= format_time(changeset.committed_on) %></td>
-<td class="author"><%=h changeset.committer %></td>
+<td class="author"><%=h changeset.committer.to_s.split('<').first %></td>
 <td class="comments"><%= textilizable(changeset.comments) %></td>
 </tr>
 <% line_num += 1 %>
diff --git a/app/views/repositories/annotate.rhtml b/app/views/repositories/annotate.rhtml
index 3aa884104..28d99a393 100644
--- a/app/views/repositories/annotate.rhtml
+++ b/app/views/repositories/annotate.rhtml
@@ -12,7 +12,7 @@
       <th class="line-num"><%= line_num %></th>
       <td class="revision">
       <%= (revision.identifier ? link_to(revision.identifier, :action => 'revision', :id => @project, :rev => revision.identifier) : revision.revision) if revision %></td>
-      <td class="author"><%= h(revision.author) if revision %></td>
+      <td class="author"><%= h(revision.author.to_s.split('<').first) if revision %></td>
       <td class="line-code"><pre><%= line %></pre></td>
     </tr>
     <% line_num += 1 %>
diff --git a/app/views/repositories/revision.rhtml b/app/views/repositories/revision.rhtml
index 80cfdf2b7..d60c0b0b7 100644
--- a/app/views/repositories/revision.rhtml
+++ b/app/views/repositories/revision.rhtml
@@ -22,7 +22,7 @@
 <h2><%= l(:label_revision) %> <%= @changeset.revision %></h2>
 
 <p><% if @changeset.scmid %>ID: <%= @changeset.scmid %><br /><% end %>
-<em><%= @changeset.committer %>, <%= format_time(@changeset.committed_on) %></em></p>
+<em><%= @changeset.committer.to_s.split('<').first %>, <%= format_time(@changeset.committed_on) %></em></p>
 
 <%= textilizable @changeset.comments %>
 

From 522b9e6b5b1bf4f38d33b153eaa72249f2c0e507 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 9 Mar 2008 11:39:00 +0000
Subject: [PATCH 265/710] Display date/time instead of date on files list
 (#817).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1215 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/projects/list_files.rhtml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/app/views/projects/list_files.rhtml b/app/views/projects/list_files.rhtml
index e02077d8e..ec4a3619b 100644
--- a/app/views/projects/list_files.rhtml
+++ b/app/views/projects/list_files.rhtml
@@ -25,15 +25,13 @@
     <td></td>
     <td><%= link_to(file.filename, {:controller => 'versions', :action => 'download', :id => version, :attachment_id => file},
                                    :title => file.description) %></td>
-    <td align="center"><%= format_date(file.created_on) %></td>
+    <td align="center"><%= format_time(file.created_on) %></td>
     <td align="center"><%= number_to_human_size(file.filesize) %></td>
     <td align="center"><%= file.downloads %></td>
     <td align="center"><small><%= file.digest %></small></td>
     <% if delete_allowed %>
     <td align="center">
-        <div class="contextual">
         <%= link_to_if_authorized image_tag('delete.png'), {:controller => 'versions', :action => 'destroy_file', :id => version, :attachment_id => file}, :confirm => l(:text_are_you_sure), :method => :post %>
-        </div>
     </td>
     <% end %>
   </tr>		

From a92cce385105d0f40d9bd80c73578ade42958ee3 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 9 Mar 2008 11:47:36 +0000
Subject: [PATCH 266/710] Textile formatting: * escape html tags, except pre
 tags (#807, #795) * try to avoid unwanted quick phrase modifiers

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1216 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 lib/redcloth.rb | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/lib/redcloth.rb b/lib/redcloth.rb
index b614614c4..7e88007a6 100644
--- a/lib/redcloth.rb
+++ b/lib/redcloth.rb
@@ -295,6 +295,7 @@ class RedCloth < String
         @pre_list = []
         rip_offtags text
         no_textile text
+        escape_html_tags text
         hard_break text 
         unless @lite_mode
             refs text
@@ -375,18 +376,18 @@ class RedCloth < String
         re =
             case rtype
             when :limit
-                /(\W)
+                /(^|[>\s])
                 (#{rcq})
                 (#{C})
                 (?::(\S+?))?
-                (\S.*?\S|\S)
+                ([^\s\-].*?[^\s\-]|\w)
                 #{rcq}
-                (?=\W)/x
+                (?=[[:punct:]]|\s|$)/x
             else
                 /(#{rcq})
                 (#{C})
                 (?::(\S+))?
-                (\S.*?\S|\S)
+                ([^\s\-].*?[^\s\-]|\w)
                 #{rcq}/xm 
             end
         [rc, ht, re, rtype]
@@ -1128,5 +1129,11 @@ class RedCloth < String
             end
         end
     end
+    
+    ALLOWED_TAGS = %w(redpre pre)
+    
+    def escape_html_tags(text)
+      text.gsub!(%r{<((\/?)(\w+))}) {|m| ALLOWED_TAGS.include?($3) ? "<#{$1}" : "&lt;#{$1}" }
+    end
 end
 

From 0ec13848b0ca16291ddd9c2959efca2241456b0a Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 9 Mar 2008 12:15:27 +0000
Subject: [PATCH 267/710] Show replies as well when choosing to display
 messages in the activity.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1217 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/projects_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index af5960399..7e4cc81f3 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -278,7 +278,7 @@ class ProjectsController < ApplicationController
     if @scope.include?('messages')
       @events += Message.find(:all, 
                               :include => [:board, :author], 
-                              :conditions => ["#{Board.table_name}.project_id=? AND #{Message.table_name}.parent_id IS NULL AND #{Message.table_name}.created_on BETWEEN ? AND ?", @project.id, @date_from, @date_to])
+                              :conditions => ["#{Board.table_name}.project_id=? AND #{Message.table_name}.created_on BETWEEN ? AND ?", @project.id, @date_from, @date_to])
     end
     
     @events_by_day = @events.group_by(&:event_date)

From 66594d46b20d5d30ca7820cc69c1652ee9884ad9 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 9 Mar 2008 15:36:47 +0000
Subject: [PATCH 268/710] Allow longer version names (#711, closes #712).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1220 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/models/version.rb                        | 2 +-
 app/views/versions/_form.rhtml               | 2 +-
 db/migrate/090_change_versions_name_limit.rb | 9 +++++++++
 3 files changed, 11 insertions(+), 2 deletions(-)
 create mode 100644 db/migrate/090_change_versions_name_limit.rb

diff --git a/app/models/version.rb b/app/models/version.rb
index f9395c5d9..183500485 100644
--- a/app/models/version.rb
+++ b/app/models/version.rb
@@ -23,7 +23,7 @@ class Version < ActiveRecord::Base
 
   validates_presence_of :name
   validates_uniqueness_of :name, :scope => [:project_id]
-  validates_length_of :name, :maximum => 30
+  validates_length_of :name, :maximum => 60
   validates_format_of :effective_date, :with => /^\d{4}-\d{2}-\d{2}$/, :message => :activerecord_error_not_a_date, :allow_nil => true
   
   def start_date
diff --git a/app/views/versions/_form.rhtml b/app/views/versions/_form.rhtml
index cd3afcccd..e18f912bf 100644
--- a/app/views/versions/_form.rhtml
+++ b/app/views/versions/_form.rhtml
@@ -1,7 +1,7 @@
 <%= error_messages_for 'version' %>
 
 <div class="box">
-<p><%= f.text_field :name, :size => 20, :required => true %></p>
+<p><%= f.text_field :name, :size => 60, :required => true %></p>
 <p><%= f.text_field :description, :size => 60 %></p>
 <p><%= f.text_field :wiki_page_title, :label => :label_wiki_page, :size => 60, :disabled => @project.wiki.nil? %></p>
 <p><%= f.text_field :effective_date, :size => 10 %><%= calendar_for('version_effective_date') %></p>
diff --git a/db/migrate/090_change_versions_name_limit.rb b/db/migrate/090_change_versions_name_limit.rb
new file mode 100644
index 000000000..276429727
--- /dev/null
+++ b/db/migrate/090_change_versions_name_limit.rb
@@ -0,0 +1,9 @@
+class ChangeVersionsNameLimit < ActiveRecord::Migration
+  def self.up
+    change_column :versions, :name, :string, :limit => nil
+  end
+
+  def self.down
+    change_column :versions, :name, :string, :limit => 30
+  end
+end

From 494a6ecfb0a90bb3ddf46f3ee5a886a3496bea30 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 9 Mar 2008 17:23:22 +0000
Subject: [PATCH 269/710] Trac and Mantis importers: check that default
 configuration is loaded before processing.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1221 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 lib/tasks/migrate_from_mantis.rake | 8 ++++++++
 lib/tasks/migrate_from_trac.rake   | 8 ++++++++
 2 files changed, 16 insertions(+)

diff --git a/lib/tasks/migrate_from_mantis.rake b/lib/tasks/migrate_from_mantis.rake
index 5f9663a39..bf3c32ccd 100644
--- a/lib/tasks/migrate_from_mantis.rake
+++ b/lib/tasks/migrate_from_mantis.rake
@@ -460,6 +460,14 @@ task :migrate_from_mantis => :environment do
   end
   
   puts
+  if Redmine::DefaultData::Loader.no_data?
+    puts "Redmine configuration need to be loaded before importing data."
+    puts "Please, run this first:"
+    puts
+    puts "  rake redmine:load_default_data RAILS_ENV=\"#{ENV['RAILS_ENV']}\""
+    exit
+  end
+  
   puts "WARNING: Your Redmine data will be deleted during this process."
   print "Are you sure you want to continue ? [y/N] "
   break unless STDIN.gets.match(/^y$/i)
diff --git a/lib/tasks/migrate_from_trac.rake b/lib/tasks/migrate_from_trac.rake
index d61640bfb..9ece2cf39 100644
--- a/lib/tasks/migrate_from_trac.rake
+++ b/lib/tasks/migrate_from_trac.rake
@@ -571,6 +571,14 @@ namespace :redmine do
     end
     
     puts
+    if Redmine::DefaultData::Loader.no_data?
+      puts "Redmine configuration need to be loaded before importing data."
+      puts "Please, run this first:"
+      puts
+      puts "  rake redmine:load_default_data RAILS_ENV=\"#{ENV['RAILS_ENV']}\""
+      exit
+    end
+    
     puts "WARNING: a new project will be added to Redmine during this process."
     print "Are you sure you want to continue ? [y/N] "
     break unless STDIN.gets.match(/^y$/i)  

From 8195f95464bed5dd08305589f305a23bbd6ad245 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 9 Mar 2008 18:25:37 +0000
Subject: [PATCH 270/710] Fixes migrations that change string limits for
 sqlite.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1222 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 db/migrate/060_change_changesets_committer_limit.rb     | 2 +-
 db/migrate/070_change_attachments_content_type_limit.rb | 2 +-
 db/migrate/084_change_auth_sources_account_limit.rb     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/db/migrate/060_change_changesets_committer_limit.rb b/db/migrate/060_change_changesets_committer_limit.rb
index 5cc2f0d1d..b05096379 100644
--- a/db/migrate/060_change_changesets_committer_limit.rb
+++ b/db/migrate/060_change_changesets_committer_limit.rb
@@ -1,6 +1,6 @@
 class ChangeChangesetsCommitterLimit < ActiveRecord::Migration
   def self.up
-    change_column :changesets, :committer, :string
+    change_column :changesets, :committer, :string, :limit => nil
   end
 
   def self.down
diff --git a/db/migrate/070_change_attachments_content_type_limit.rb b/db/migrate/070_change_attachments_content_type_limit.rb
index e3dfacc3c..ebf6d08c3 100644
--- a/db/migrate/070_change_attachments_content_type_limit.rb
+++ b/db/migrate/070_change_attachments_content_type_limit.rb
@@ -1,6 +1,6 @@
 class ChangeAttachmentsContentTypeLimit < ActiveRecord::Migration
   def self.up
-    change_column :attachments, :content_type, :string
+    change_column :attachments, :content_type, :string, :limit => nil
   end
 
   def self.down
diff --git a/db/migrate/084_change_auth_sources_account_limit.rb b/db/migrate/084_change_auth_sources_account_limit.rb
index 6a933b894..cc127b439 100644
--- a/db/migrate/084_change_auth_sources_account_limit.rb
+++ b/db/migrate/084_change_auth_sources_account_limit.rb
@@ -1,6 +1,6 @@
 class ChangeAuthSourcesAccountLimit < ActiveRecord::Migration
   def self.up
-    change_column :auth_sources, :account, :string
+    change_column :auth_sources, :account, :string, :limit => nil
   end
 
   def self.down

From 4f35ec97e88c4ad2017d2797d097430eaceaa427 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 9 Mar 2008 18:27:55 +0000
Subject: [PATCH 271/710] Replaces del tags by a css style (a.issue.closed) for
 closed issue links.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1223 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/helpers/application_helper.rb  |  2 +-
 app/views/projects/roadmap.rhtml   | 10 +++-------
 app/views/versions/show.rhtml      |  3 +--
 public/stylesheets/application.css |  2 ++
 4 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index a6acafb5b..f21b43a23 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -296,7 +296,7 @@ module ApplicationHelper
           when nil
             if issue = Issue.find_by_id(oid, :include => [:project, :status], :conditions => Project.visible_by(User.current))        
               link = link_to("##{oid}", {:only_path => only_path, :controller => 'issues', :action => 'show', :id => oid},
-                                        :class => 'issue',
+                                        :class => (issue.closed? ? 'issue closed' : 'issue'),
                                         :title => "#{truncate(issue.subject, 100)} (#{issue.status.name})")
               link = content_tag('del', link) if issue.closed?
             end
diff --git a/app/views/projects/roadmap.rhtml b/app/views/projects/roadmap.rhtml
index 6a1b6b099..d9329d109 100644
--- a/app/views/projects/roadmap.rhtml
+++ b/app/views/projects/roadmap.rhtml
@@ -19,13 +19,9 @@
     <% if issues.size > 0 %>
     <fieldset class="related-issues"><legend><%= l(:label_related_issues) %></legend>
     <ul>
-        <% issues.each do |issue| %>
-          <li>
-            <%= link = link_to_issue(issue)
-                issue.status.is_closed? ? content_tag("del", link) : link %>: <%=h issue.subject %>
-            <%= content_tag "em", "(#{l(:label_closed_issues)})" if issue.status.is_closed? %>
-          </li>
-        <% end %>
+    <%- issues.each do |issue| -%>
+        <li class="issue <%= 'closed' if issue.closed? %>"><%= link_to_issue(issue) %>: <%=h issue.subject %></li>
+    <%- end -%>
     </ul>
     </fieldset>
     <% end %>
diff --git a/app/views/versions/show.rhtml b/app/views/versions/show.rhtml
index 873354e0d..7f81cf503 100644
--- a/app/views/versions/show.rhtml
+++ b/app/views/versions/show.rhtml
@@ -38,8 +38,7 @@
 <fieldset class="related-issues"><legend><%= l(:label_related_issues) %></legend>
 <ul>
 <% issues.each do |issue| -%>
-    <li><%= link = link_to_issue(issue)
-            issue.status.is_closed? ? content_tag("del", link) : link %>: <%=h issue.subject %></li>
+    <li class="issue <%= 'closed' if issue.closed? %>"><%= link_to_issue(issue) %>: <%=h issue.subject %></li>
 <% end -%>
 </ul>
 </fieldset>
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index d855348dc..b3a472720 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -77,6 +77,8 @@ a, a:link, a:visited{ color: #2A5685; text-decoration: none; }
 a:hover, a:active{ color: #c61a1a; text-decoration: underline;}
 a img{ border: 0; }
 
+a.issue.closed, .issue.closed a { text-decoration: line-through; }
+
 /***** Tables *****/
 table.list { border: 1px solid #e4e4e4;  border-collapse: collapse; width: 100%; margin-bottom: 4px; }
 table.list th {  background-color:#EEEEEE; padding: 4px; white-space:nowrap; }

From 76a29ae33719739586b18d465ba5d88358184655 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 9 Mar 2008 20:16:48 +0000
Subject: [PATCH 272/710] Adds atom feed link on boards index.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1224 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/boards/index.rhtml | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/app/views/boards/index.rhtml b/app/views/boards/index.rhtml
index cd4e85e9a..8d4560653 100644
--- a/app/views/boards/index.rhtml
+++ b/app/views/boards/index.rhtml
@@ -1,6 +1,6 @@
 <h2><%= l(:label_board_plural) %></h2>
 
-<table class="list">
+<table class="list boards">
   <thead><tr>
     <th><%= l(:label_board) %></th>
     <th><%= l(:label_topic_plural) %></th>
@@ -28,3 +28,13 @@
 <% end %>
   </tbody>
 </table>
+
+<p class="other-formats">
+<%= l(:label_export_to) %>
+<span><%= link_to 'Atom', {:controller => 'projects', :action => 'activity', :id => @project, :format => 'atom', :show_messages => 1, :key => User.current.rss_key},
+                          :class => 'feed' %></span>
+</p>
+
+<% content_for :header_tags do %>
+  <%= auto_discovery_link_tag(:atom, {:controller => 'projects', :action => 'activity', :id => @project, :format => 'atom', :show_messages => 1, :key => User.current.rss_key}) %>
+<% end %>

From 64fb0a561aebbc7583695deba29697f84c620dfb Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 9 Mar 2008 22:24:38 +0000
Subject: [PATCH 273/710] Removes the Redmine version from the footer (closes
 #794). It can still be viewed on admin -> info.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1225 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/layouts/base.rhtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/layouts/base.rhtml b/app/views/layouts/base.rhtml
index 820a8e700..0b9d31512 100644
--- a/app/views/layouts/base.rhtml
+++ b/app/views/layouts/base.rhtml
@@ -58,7 +58,7 @@
 <div id="ajax-indicator" style="display:none;"><span><%= l(:label_loading) %></span></div>
 	
 <div id="footer">
-    Powered by <%= link_to Redmine::Info.app_name, Redmine::Info.url %> <%= Redmine::VERSION %> &copy; 2006-2008 Jean-Philippe Lang
+    Powered by <%= link_to Redmine::Info.app_name, Redmine::Info.url %> &copy; 2006-2008 Jean-Philippe Lang
 </div>
 </div>
 </body>

From 624723d0cef9bd8a9528745f4b75ee22f6b1ad2e Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Tue, 11 Mar 2008 19:33:38 +0000
Subject: [PATCH 274/710] Activity enhancements: * overall activity view and
 feed added, link is available on the project list (#423, #494) * switch added
 on the project activity view to include subprojects (closes #530)

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1227 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/projects_controller.rb      | 80 +++++++++++++++------
 app/models/attachment.rb                    |  1 -
 app/models/changeset.rb                     |  4 ++
 app/models/project.rb                       | 27 ++++---
 app/models/wiki_content.rb                  |  4 ++
 app/views/common/feed.atom.rxml             |  5 +-
 app/views/projects/activity.rhtml           | 12 ++--
 app/views/projects/list.rhtml               |  5 ++
 app/views/welcome/index.rhtml               |  5 +-
 lang/bg.yml                                 |  1 +
 lang/cs.yml                                 |  1 +
 lang/da.yml                                 |  1 +
 lang/de.yml                                 |  1 +
 lang/en.yml                                 |  1 +
 lang/es.yml                                 |  1 +
 lang/fi.yml                                 |  1 +
 lang/fr.yml                                 |  3 +-
 lang/he.yml                                 |  1 +
 lang/it.yml                                 |  1 +
 lang/ja.yml                                 |  1 +
 lang/ko.yml                                 |  1 +
 lang/lt.yml                                 |  1 +
 lang/nl.yml                                 |  1 +
 lang/pl.yml                                 |  1 +
 lang/pt-br.yml                              |  1 +
 lang/pt.yml                                 |  1 +
 lang/ro.yml                                 |  1 +
 lang/ru.yml                                 |  1 +
 lang/sr.yml                                 |  1 +
 lang/sv.yml                                 |  1 +
 lang/uk.yml                                 |  1 +
 lang/zh-tw.yml                              |  1 +
 lang/zh.yml                                 |  1 +
 lib/ar_condition.rb                         |  2 +-
 public/stylesheets/application.css          |  1 +
 test/fixtures/issues.yml                    | 18 ++++-
 test/fixtures/messages.yml                  |  4 +-
 test/functional/projects_controller_test.rb | 58 ++++++++++++++-
 test/unit/project_test.rb                   |  9 ---
 39 files changed, 198 insertions(+), 63 deletions(-)

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 7e4cc81f3..9268a19ea 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -24,8 +24,9 @@ class ProjectsController < ApplicationController
   menu_item :settings, :only => :settings
   menu_item :issues, :only => [:changelog]
   
-  before_filter :find_project, :except => [ :index, :list, :add ]
-  before_filter :authorize, :except => [ :index, :list, :add, :archive, :unarchive, :destroy ]
+  before_filter :find_project, :except => [ :index, :list, :add, :activity ]
+  before_filter :find_optional_project, :only => :activity
+  before_filter :authorize, :except => [ :index, :list, :add, :archive, :unarchive, :destroy, :activity ]
   before_filter :require_admin, :only => [ :add, :archive, :unarchive, :destroy ]
   accept_key_auth :activity, :calendar
   
@@ -228,12 +229,14 @@ class ProjectsController < ApplicationController
     @date_from = @date_to - @days
     
     @event_types = %w(issues news files documents changesets wiki_pages messages)
-    @event_types.delete('wiki_pages') unless @project.wiki
-    @event_types.delete('changesets') unless @project.repository
-    @event_types.delete('messages') unless @project.boards.any?
-    # only show what the user is allowed to view
-    @event_types = @event_types.select {|o| User.current.allowed_to?("view_#{o}".to_sym, @project)}
-    
+    if @project
+      @event_types.delete('wiki_pages') unless @project.wiki
+      @event_types.delete('changesets') unless @project.repository
+      @event_types.delete('messages') unless @project.boards.any?
+      # only show what the user is allowed to view
+      @event_types = @event_types.select {|o| User.current.allowed_to?("view_#{o}".to_sym, @project)}
+      @with_subprojects = params[:with_subprojects].nil? ? Setting.display_subprojects_issues? : (params[:with_subprojects] == '1')
+    end
     @scope = @event_types.select {|t| params["show_#{t}"]}
     # default events if none is specified in parameters
     @scope = (@event_types - %w(wiki_pages messages))if @scope.empty?
@@ -241,21 +244,41 @@ class ProjectsController < ApplicationController
     @events = []    
     
     if @scope.include?('issues')
-      @events += @project.issues.find(:all, :include => [:author, :tracker], :conditions => ["#{Issue.table_name}.created_on>=? and #{Issue.table_name}.created_on<=?", @date_from, @date_to] )
-      @events += @project.issues_status_changes(@date_from, @date_to)
+      cond = ARCondition.new(Project.allowed_to_condition(User.current, :view_issues, :project => @project, :with_subprojects => @with_subprojects))
+      cond.add(["#{Issue.table_name}.created_on BETWEEN ? AND ?", @date_from, @date_to])
+      @events += Issue.find(:all, :include => [:project, :author, :tracker], :conditions => cond.conditions)
+      
+      cond = ARCondition.new(Project.allowed_to_condition(User.current, :view_issues, :project => @project, :with_subprojects => @with_subprojects))
+      cond.add(["#{Journal.table_name}.journalized_type = 'Issue' AND #{JournalDetail.table_name}.prop_key = 'status_id' AND #{Journal.table_name}.created_on BETWEEN ? AND ?", @date_from, @date_to])
+      @events += Journal.find(:all, :include => [{:issue => :project}, :details, :user], :conditions => cond.conditions)
     end
     
     if @scope.include?('news')
-      @events += @project.news.find(:all, :conditions => ["#{News.table_name}.created_on>=? and #{News.table_name}.created_on<=?", @date_from, @date_to], :include => :author )
+      cond = ARCondition.new(Project.allowed_to_condition(User.current, :view_news, :project => @project, :with_subprojects => @with_subprojects))
+      cond.add(["#{News.table_name}.created_on BETWEEN ? AND ?", @date_from, @date_to])
+      @events += News.find(:all, :include => [:project, :author], :conditions => cond.conditions)
     end
     
     if @scope.include?('files')
-      @events += Attachment.find(:all, :select => "#{Attachment.table_name}.*", :joins => "LEFT JOIN #{Version.table_name} ON #{Version.table_name}.id = #{Attachment.table_name}.container_id", :conditions => ["#{Attachment.table_name}.container_type='Version' and #{Version.table_name}.project_id=? and #{Attachment.table_name}.created_on>=? and #{Attachment.table_name}.created_on<=?", @project.id, @date_from, @date_to], :include => :author )
+      cond = ARCondition.new(Project.allowed_to_condition(User.current, :view_files, :project => @project, :with_subprojects => @with_subprojects))
+      cond.add(["#{Attachment.table_name}.created_on BETWEEN ? AND ?", @date_from, @date_to])
+      @events += Attachment.find(:all, :select => "#{Attachment.table_name}.*", 
+                                       :joins => "LEFT JOIN #{Version.table_name} ON #{Attachment.table_name}.container_type='Version' AND #{Version.table_name}.id = #{Attachment.table_name}.container_id " +
+                                                 "LEFT JOIN #{Project.table_name} ON #{Version.table_name}.project_id = #{Project.table_name}.id",
+                                       :conditions => cond.conditions)
     end
     
     if @scope.include?('documents')
-      @events += @project.documents.find(:all, :conditions => ["#{Document.table_name}.created_on>=? and #{Document.table_name}.created_on<=?", @date_from, @date_to] )
-      @events += Attachment.find(:all, :select => "attachments.*", :joins => "LEFT JOIN #{Document.table_name} ON #{Document.table_name}.id = #{Attachment.table_name}.container_id", :conditions => ["#{Attachment.table_name}.container_type='Document' and #{Document.table_name}.project_id=? and #{Attachment.table_name}.created_on>=? and #{Attachment.table_name}.created_on<=?", @project.id, @date_from, @date_to], :include => :author )
+      cond = ARCondition.new(Project.allowed_to_condition(User.current, :view_documents, :project => @project, :with_subprojects => @with_subprojects))
+      cond.add(["#{Document.table_name}.created_on BETWEEN ? AND ?", @date_from, @date_to])
+      @events += Document.find(:all, :include => :project, :conditions => cond.conditions)
+      
+      cond = ARCondition.new(Project.allowed_to_condition(User.current, :view_documents, :project => @project, :with_subprojects => @with_subprojects))
+      cond.add(["#{Attachment.table_name}.created_on BETWEEN ? AND ?", @date_from, @date_to])
+      @events += Attachment.find(:all, :select => "#{Attachment.table_name}.*", 
+                                       :joins => "LEFT JOIN #{Document.table_name} ON #{Attachment.table_name}.container_type='Document' AND #{Document.table_name}.id = #{Attachment.table_name}.container_id " +
+                                                 "LEFT JOIN #{Project.table_name} ON #{Document.table_name}.project_id = #{Project.table_name}.id",
+                                       :conditions => cond.conditions)
     end
     
     if @scope.include?('wiki_pages')
@@ -264,28 +287,31 @@ class ProjectsController < ApplicationController
                "#{WikiContent.versioned_table_name}.page_id, #{WikiContent.versioned_table_name}.author_id, " +
                "#{WikiContent.versioned_table_name}.id"
       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 "
-      conditions = ["#{Wiki.table_name}.project_id = ? AND #{WikiContent.versioned_table_name}.updated_on BETWEEN ? AND ?",
-                    @project.id, @date_from, @date_to]
+              "LEFT JOIN #{Wiki.table_name} ON #{Wiki.table_name}.id = #{WikiPage.table_name}.wiki_id " +
+              "LEFT JOIN #{Project.table_name} ON #{Project.table_name}.id = #{Wiki.table_name}.project_id"
 
-      @events += WikiContent.versioned_class.find(:all, :select => select, :joins => joins, :conditions => conditions)
+      cond = ARCondition.new(Project.allowed_to_condition(User.current, :view_wiki_pages, :project => @project, :with_subprojects => @with_subprojects))
+      cond.add(["#{WikiContent.versioned_table_name}.updated_on BETWEEN ? AND ?", @date_from, @date_to])
+      @events += WikiContent.versioned_class.find(:all, :select => select, :joins => joins, :conditions => cond.conditions)
     end
 
     if @scope.include?('changesets')
-      @events += Changeset.find(:all, :include => :repository, :conditions => ["#{Repository.table_name}.project_id = ? AND #{Changeset.table_name}.committed_on BETWEEN ? AND ?", @project.id, @date_from, @date_to])
+      cond = ARCondition.new(Project.allowed_to_condition(User.current, :view_changesets, :project => @project, :with_subprojects => @with_subprojects))
+      cond.add(["#{Changeset.table_name}.committed_on BETWEEN ? AND ?", @date_from, @date_to])
+      @events += Changeset.find(:all, :include => {:repository => :project}, :conditions => cond.conditions)
     end
     
     if @scope.include?('messages')
-      @events += Message.find(:all, 
-                              :include => [:board, :author], 
-                              :conditions => ["#{Board.table_name}.project_id=? AND #{Message.table_name}.created_on BETWEEN ? AND ?", @project.id, @date_from, @date_to])
+      cond = ARCondition.new(Project.allowed_to_condition(User.current, :view_messages, :project => @project, :with_subprojects => @with_subprojects))
+      cond.add(["#{Message.table_name}.created_on BETWEEN ? AND ?", @date_from, @date_to])
+      @events += Message.find(:all, :include => [{:board => :project}, :author], :conditions => cond.conditions)
     end
     
     @events_by_day = @events.group_by(&:event_date)
     
     respond_to do |format|
       format.html { render :layout => false if request.xhr? }
-      format.atom { render_feed(@events, :title => "#{@project.name}: #{l(:label_activity)}") }
+      format.atom { render_feed(@events, :title => "#{@project || Setting.app_title}: #{l(:label_activity)}") }
     end
   end
   
@@ -381,6 +407,14 @@ private
     render_404
   end
   
+  def find_optional_project
+    return true unless params[:id]
+    @project = Project.find(params[:id])
+    authorize
+  rescue ActiveRecord::RecordNotFound
+    render_404
+  end
+
   def retrieve_selected_tracker_ids(selectable_trackers)
     if ids = params[:tracker_ids]
       @selected_tracker_ids = (ids.is_a? Array) ? ids.collect { |id| id.to_i.to_s } : ids.split('/').collect { |id| id.to_i.to_s }
diff --git a/app/models/attachment.rb b/app/models/attachment.rb
index c9783b9ce..cdcb8d231 100644
--- a/app/models/attachment.rb
+++ b/app/models/attachment.rb
@@ -26,7 +26,6 @@ class Attachment < ActiveRecord::Base
   validates_length_of :disk_filename, :maximum => 255
 
   acts_as_event :title => :filename,
-                :description => :filename,
                 :url => Proc.new {|o| {:controller => 'attachments', :action => 'download', :id => o.id}}
 
   cattr_accessor :storage_path
diff --git a/app/models/changeset.rb b/app/models/changeset.rb
index 6bd15b158..dbe06935d 100644
--- a/app/models/changeset.rb
+++ b/app/models/changeset.rb
@@ -45,6 +45,10 @@ class Changeset < ActiveRecord::Base
     super
   end
   
+  def project
+    repository.project
+  end
+  
   def after_create
     scan_comment_for_issue_ids
   end
diff --git a/app/models/project.rb b/app/models/project.rb
index 95a201454..ad2f1fb81 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -84,16 +84,6 @@ class Project < ActiveRecord::Base
     end 
   end
 
-  # Return all issues status changes for the project between the 2 given dates
-  def issues_status_changes(from, to)
-    Journal.find(:all, :include => [:issue, :details, :user],
-                       :conditions => ["#{Journal.table_name}.journalized_type = 'Issue'" +
-                                       " AND #{Issue.table_name}.project_id = ?" +
-                                       " AND #{JournalDetail.table_name}.prop_key = 'status_id'" +
-                                       " AND #{Journal.table_name}.created_on BETWEEN ? AND ?",
-                                       id, from, to+1])
-  end
-
   # returns latest created projects
   # non public projects will be returned only if user is a member of those
   def self.latest(user=nil, count=5)
@@ -110,19 +100,28 @@ class Project < ActiveRecord::Base
     end
   end
   
-  def self.allowed_to_condition(user, permission)
+  def self.allowed_to_condition(user, permission, options={})
     statements = []
-    active_statement = "#{Project.table_name}.status=#{Project::STATUS_ACTIVE}"
+    base_statement = "#{Project.table_name}.status=#{Project::STATUS_ACTIVE}"
+    if options[:project]
+      project_statement = "#{Project.table_name}.id = #{options[:project].id}"
+      project_statement << " OR #{Project.table_name}.parent_id = #{options[:project].id}" if options[:with_subprojects]
+      base_statement = "(#{project_statement}) AND (#{base_statement})"
+    end
     if user.admin?
       # no restriction
     elsif user.logged?
       statements << "#{Project.table_name}.is_public = #{connection.quoted_true}" if Role.non_member.allowed_to?(permission)
       allowed_project_ids = user.memberships.select {|m| m.role.allowed_to?(permission)}.collect {|m| m.project_id}
       statements << "#{Project.table_name}.id IN (#{allowed_project_ids.join(',')})" if allowed_project_ids.any?
+    elsif Role.anonymous.allowed_to?(permission)
+      # anonymous user allowed on public project
+      statements << "#{Project.table_name}.is_public = #{connection.quoted_true}" 
     else
-      statements << "#{Project.table_name}.is_public = #{connection.quoted_true}" if Role.anonymous.allowed_to?(permission)
+      # anonymous user is not authorized
+      statements << "1=0"
     end
-    statements.empty? ? active_statement : "(#{active_statement} AND (#{statements.join(' OR ')}))"
+    statements.empty? ? base_statement : "((#{base_statement}) AND (#{statements.join(' OR ')}))"
   end
   
   def self.find(*args)
diff --git a/app/models/wiki_content.rb b/app/models/wiki_content.rb
index c307beb1d..13915c274 100644
--- a/app/models/wiki_content.rb
+++ b/app/models/wiki_content.rb
@@ -61,6 +61,10 @@ class WikiContent < ActiveRecord::Base
       end      
     end
     
+    def project
+      page.project
+    end
+    
     # Returns the previous version or nil
     def previous
       @previous ||= WikiContent::Version.find(:first, 
diff --git a/app/views/common/feed.atom.rxml b/app/views/common/feed.atom.rxml
index 6695565f4..b5cbeeed9 100644
--- a/app/views/common/feed.atom.rxml
+++ b/app/views/common/feed.atom.rxml
@@ -9,9 +9,10 @@ xml.feed "xmlns" => "http://www.w3.org/2005/Atom" do
   xml.generator(:uri => Redmine::Info.url, :version => Redmine::VERSION) { xml.text! Redmine::Info.versioned_name; }
   @items.each do |item|
     xml.entry do
+      url = url_for(item.event_url(:only_path => false))
       xml.title truncate(item.event_title, 100)
-      xml.link "rel" => "alternate", "href" => url_for(item.event_url(:only_path => false))
-      xml.id url_for(item.event_url(:only_path => false))
+      xml.link "rel" => "alternate", "href" => url
+      xml.id url
       xml.updated item.event_datetime.xmlschema
       author = item.event_author if item.respond_to?(:author)
       xml.author do
diff --git a/app/views/projects/activity.rhtml b/app/views/projects/activity.rhtml
index 95c8d485f..e8832fccc 100644
--- a/app/views/projects/activity.rhtml
+++ b/app/views/projects/activity.rhtml
@@ -6,7 +6,7 @@
 <dl>
 <% @events_by_day[day].sort {|x,y| y.event_datetime <=> x.event_datetime }.each do |e| -%>
   <dt class="<%= e.class.name.downcase %>"><span class="time"><%= format_time(e.event_datetime, false) %></span>
-  <%= link_to h(truncate(e.event_title, 100)), e.event_url %></dt>
+  <%= content_tag('span', h(e.project), :class => 'project') if @project.nil? || @project != e.project %> <%= link_to h(truncate(e.event_title, 100)), e.event_url %></dt>
   <dd><% unless e.event_description.blank? -%>
   <span class="description"><%= format_activity_description(e.event_description) %></span><br />
   <% end %>
@@ -35,16 +35,20 @@
 </p>
 
 <% content_for :header_tags do %>
-<%= auto_discovery_link_tag(:atom, params.merge(:format => 'atom', :year => nil, :month => nil, :key => User.current.rss_key).delete_if{|k,v|k=="commit"}) %>
+<%= auto_discovery_link_tag(:atom, params.merge(:format => 'atom', :year => nil, :month => nil, :key => User.current.rss_key)) %>
 <% end %>
 
 <% content_for :sidebar do %>
-<% form_tag do %>
+<% form_tag({}, :method => :get) do %>
 <h3><%= l(:label_activity) %></h3>
 <p><% @event_types.each do |t| %>
 <label><%= check_box_tag "show_#{t}", 1, @scope.include?(t) %> <%= l("label_#{t.singularize}_plural")%></label><br />
 <% end %></p>
-<p><%= submit_tag l(:button_apply), :class => 'button-small' %></p>
+<% if @project && @project.active_children.any? %>
+    <p><label><%= check_box_tag 'with_subprojects', 1, @with_subprojects %> <%=l(:label_subproject_plural)%></label></p>
+    <%= hidden_field_tag 'with_subprojects', 0 %>
+<% end %>
+<p><%= submit_tag l(:button_apply), :class => 'button-small', :name => nil %></p>
 <% end %>
 <% end %>
 
diff --git a/app/views/projects/list.rhtml b/app/views/projects/list.rhtml
index 15ea06483..b8bb62ebb 100644
--- a/app/views/projects/list.rhtml
+++ b/app/views/projects/list.rhtml
@@ -1,3 +1,8 @@
+<div class="contextual">
+    <%= link_to l(:label_issue_view_all), { :controller => 'issues' } %> |
+    <%= link_to l(:label_overall_activity), { :controller => 'projects', :action => 'activity' }%>
+</div>
+
 <h2><%=l(:label_project_plural)%></h2>
 
 <% @project_tree.keys.sort.each do |project| %>
diff --git a/app/views/welcome/index.rhtml b/app/views/welcome/index.rhtml
index d618fa6e1..5da5a1ed3 100644
--- a/app/views/welcome/index.rhtml
+++ b/app/views/welcome/index.rhtml
@@ -26,5 +26,8 @@
 </div>	
 
 <% content_for :header_tags do %>
-<%= auto_discovery_link_tag(:atom, {:controller => 'news', :action => 'index', :key => User.current.rss_key, :format => 'atom'}, {:title => l(:label_news_latest)}) %>
+<%= auto_discovery_link_tag(:atom, {:controller => 'news', :action => 'index', :key => User.current.rss_key, :format => 'atom'},
+                                   :title => "#{Setting.app_title}: #{l(:label_news_latest)}") %>
+<%= auto_discovery_link_tag(:atom, {:controller => 'projects', :action => 'activity', :key => User.current.rss_key, :format => 'atom'},
+                                   :title => "#{Setting.app_title}: #{l(:label_activity)}") %>
 <% end %>
diff --git a/lang/bg.yml b/lang/bg.yml
index 87808230e..99c8eb296 100644
--- a/lang/bg.yml
+++ b/lang/bg.yml
@@ -613,3 +613,4 @@ field_comments_sorting: Display comments
 label_reverse_chronological_order: In reverse chronological order
 label_preferences: Preferences
 setting_display_subprojects_issues: Display subprojects issues on main projects by default
+label_overall_activity: Overall activity
diff --git a/lang/cs.yml b/lang/cs.yml
index c5cef3777..7d11bb6a8 100644
--- a/lang/cs.yml
+++ b/lang/cs.yml
@@ -613,3 +613,4 @@ field_comments_sorting: Display comments
 label_reverse_chronological_order: In reverse chronological order
 label_preferences: Preferences
 setting_display_subprojects_issues: Display subprojects issues on main projects by default
+label_overall_activity: Overall activity
diff --git a/lang/da.yml b/lang/da.yml
index ed2eb26a7..825f15ecc 100644
--- a/lang/da.yml
+++ b/lang/da.yml
@@ -615,3 +615,4 @@ field_comments_sorting: Display comments
 text_reassign_time_entries: 'Reassign reported hours to this issue:'
 label_reverse_chronological_order: In reverse chronological order
 label_preferences: Preferences
+label_overall_activity: Overall activity
diff --git a/lang/de.yml b/lang/de.yml
index aa4938534..eeb851018 100644
--- a/lang/de.yml
+++ b/lang/de.yml
@@ -614,3 +614,4 @@ field_comments_sorting: Display comments
 label_reverse_chronological_order: In reverse chronological order
 label_preferences: Preferences
 setting_display_subprojects_issues: Display subprojects issues on main projects by default
+label_overall_activity: Overall activity
diff --git a/lang/en.yml b/lang/en.yml
index af6c8faa9..26c7b4766 100644
--- a/lang/en.yml
+++ b/lang/en.yml
@@ -280,6 +280,7 @@ label_last_updates: Last updated
 label_last_updates_plural: %d last updated
 label_registered_on: Registered on
 label_activity: Activity
+label_overall_activity: Overall activity
 label_new: New
 label_logged_as: Logged as
 label_environment: Environment
diff --git a/lang/es.yml b/lang/es.yml
index 47ee41524..554020155 100644
--- a/lang/es.yml
+++ b/lang/es.yml
@@ -616,3 +616,4 @@ field_comments_sorting: Display comments
 label_reverse_chronological_order: In reverse chronological order
 label_preferences: Preferences
 setting_display_subprojects_issues: Display subprojects issues on main projects by default
+label_overall_activity: Overall activity
diff --git a/lang/fi.yml b/lang/fi.yml
index b84d6cd78..4923440fd 100644
--- a/lang/fi.yml
+++ b/lang/fi.yml
@@ -620,3 +620,4 @@ setting_display_subprojects_issues: Display subprojects issues on main projects
 field_comments_sorting: Display comments
 label_reverse_chronological_order: In reverse chronological order
 label_preferences: Preferences
+label_overall_activity: Overall activity
diff --git a/lang/fr.yml b/lang/fr.yml
index 243088f04..c7cfc54e5 100644
--- a/lang/fr.yml
+++ b/lang/fr.yml
@@ -165,6 +165,7 @@ field_start_page: Page de démarrage
 field_subproject: Sous-projet
 field_hours: Heures
 field_activity: Activité
+label_overall_activity: Activité globale
 field_spent_on: Date
 field_identifier: Identifiant
 field_is_filter: Utilisé comme filtre
@@ -452,7 +453,7 @@ label_start_to_start: début à début
 label_start_to_end: début à fin
 label_stay_logged_in: Rester connecté
 label_disabled: désactivé
-label_show_completed_versions: Voire les versions passées
+label_show_completed_versions: Voir les versions passées
 label_me: moi
 label_board: Forum
 label_board_new: Nouveau forum
diff --git a/lang/he.yml b/lang/he.yml
index 972b1134a..5d585eb61 100644
--- a/lang/he.yml
+++ b/lang/he.yml
@@ -613,3 +613,4 @@ field_comments_sorting: Display comments
 label_reverse_chronological_order: In reverse chronological order
 label_preferences: Preferences
 setting_display_subprojects_issues: Display subprojects issues on main projects by default
+label_overall_activity: Overall activity
diff --git a/lang/it.yml b/lang/it.yml
index c3250ebbc..1d2cb742d 100644
--- a/lang/it.yml
+++ b/lang/it.yml
@@ -613,3 +613,4 @@ field_comments_sorting: Display comments
 label_reverse_chronological_order: In reverse chronological order
 label_preferences: Preferences
 setting_display_subprojects_issues: Display subprojects issues on main projects by default
+label_overall_activity: Overall activity
diff --git a/lang/ja.yml b/lang/ja.yml
index 79bb572a8..de883fe58 100644
--- a/lang/ja.yml
+++ b/lang/ja.yml
@@ -614,3 +614,4 @@ field_comments_sorting: Display comments
 label_reverse_chronological_order: In reverse chronological order
 label_preferences: Preferences
 setting_display_subprojects_issues: Display subprojects issues on main projects by default
+label_overall_activity: Overall activity
diff --git a/lang/ko.yml b/lang/ko.yml
index 3ca077631..bfe7be912 100644
--- a/lang/ko.yml
+++ b/lang/ko.yml
@@ -613,3 +613,4 @@ field_comments_sorting: Display comments
 label_reverse_chronological_order: In reverse chronological order
 label_preferences: Preferences
 setting_display_subprojects_issues: Display subprojects issues on main projects by default
+label_overall_activity: Overall activity
diff --git a/lang/lt.yml b/lang/lt.yml
index 93f48580f..b5bb15df0 100644
--- a/lang/lt.yml
+++ b/lang/lt.yml
@@ -614,3 +614,4 @@ field_comments_sorting: Display comments
 label_reverse_chronological_order: In reverse chronological order
 label_preferences: Preferences
 setting_display_subprojects_issues: Display subprojects issues on main projects by default
+label_overall_activity: Overall activity
diff --git a/lang/nl.yml b/lang/nl.yml
index e90665878..65d13ddab 100644
--- a/lang/nl.yml
+++ b/lang/nl.yml
@@ -614,3 +614,4 @@ field_comments_sorting: Display comments
 label_reverse_chronological_order: In reverse chronological order
 label_preferences: Preferences
 setting_display_subprojects_issues: Display subprojects issues on main projects by default
+label_overall_activity: Overall activity
diff --git a/lang/pl.yml b/lang/pl.yml
index 7003fb871..10a8885d1 100644
--- a/lang/pl.yml
+++ b/lang/pl.yml
@@ -613,3 +613,4 @@ setting_display_subprojects_issues: Display subprojects issues on main projects
 field_comments_sorting: Display comments
 label_reverse_chronological_order: In reverse chronological order
 label_preferences: Preferences
+label_overall_activity: Overall activity
diff --git a/lang/pt-br.yml b/lang/pt-br.yml
index 10836d336..3bd38a557 100644
--- a/lang/pt-br.yml
+++ b/lang/pt-br.yml
@@ -613,3 +613,4 @@ field_comments_sorting: Display comments
 label_reverse_chronological_order: In reverse chronological order
 label_preferences: Preferences
 setting_display_subprojects_issues: Display subprojects issues on main projects by default
+label_overall_activity: Overall activity
diff --git a/lang/pt.yml b/lang/pt.yml
index f59e3b06a..65d26b1e3 100644
--- a/lang/pt.yml
+++ b/lang/pt.yml
@@ -613,3 +613,4 @@ field_comments_sorting: Display comments
 label_reverse_chronological_order: In reverse chronological order
 label_preferences: Preferences
 setting_display_subprojects_issues: Display subprojects issues on main projects by default
+label_overall_activity: Overall activity
diff --git a/lang/ro.yml b/lang/ro.yml
index cb7bb69be..8e91d277f 100644
--- a/lang/ro.yml
+++ b/lang/ro.yml
@@ -613,3 +613,4 @@ field_comments_sorting: Display comments
 label_reverse_chronological_order: In reverse chronological order
 label_preferences: Preferences
 setting_display_subprojects_issues: Display subprojects issues on main projects by default
+label_overall_activity: Overall activity
diff --git a/lang/ru.yml b/lang/ru.yml
index f12b2264f..f08271e45 100644
--- a/lang/ru.yml
+++ b/lang/ru.yml
@@ -617,3 +617,4 @@ field_comments_sorting: Display comments
 label_reverse_chronological_order: In reverse chronological order
 label_preferences: Preferences
 setting_display_subprojects_issues: Display subprojects issues on main projects by default
+label_overall_activity: Overall activity
diff --git a/lang/sr.yml b/lang/sr.yml
index e59b3cba9..82d06f93b 100644
--- a/lang/sr.yml
+++ b/lang/sr.yml
@@ -614,3 +614,4 @@ field_comments_sorting: Display comments
 label_reverse_chronological_order: In reverse chronological order
 label_preferences: Preferences
 setting_display_subprojects_issues: Display subprojects issues on main projects by default
+label_overall_activity: Overall activity
diff --git a/lang/sv.yml b/lang/sv.yml
index 5ff3f8f17..cc9fcd212 100644
--- a/lang/sv.yml
+++ b/lang/sv.yml
@@ -614,3 +614,4 @@ field_comments_sorting: Display comments
 label_reverse_chronological_order: In reverse chronological order
 label_preferences: Preferences
 setting_display_subprojects_issues: Display subprojects issues on main projects by default
+label_overall_activity: Overall activity
diff --git a/lang/uk.yml b/lang/uk.yml
index 8c33c7806..08a36e352 100644
--- a/lang/uk.yml
+++ b/lang/uk.yml
@@ -615,3 +615,4 @@ field_comments_sorting: Display comments
 label_reverse_chronological_order: In reverse chronological order
 label_preferences: Preferences
 setting_display_subprojects_issues: Display subprojects issues on main projects by default
+label_overall_activity: Overall activity
diff --git a/lang/zh-tw.yml b/lang/zh-tw.yml
index 9334c72bb..95e5afbb4 100644
--- a/lang/zh-tw.yml
+++ b/lang/zh-tw.yml
@@ -614,3 +614,4 @@ default_activity_development: 開發
 enumeration_issue_priorities: 項目優先權
 enumeration_doc_categories: 文件分類
 enumeration_activities: 活動 (time tracking)
+label_overall_activity: Overall activity
diff --git a/lang/zh.yml b/lang/zh.yml
index a917f0da7..39ed5fc44 100644
--- a/lang/zh.yml
+++ b/lang/zh.yml
@@ -614,3 +614,4 @@ default_activity_development: 开发
 enumeration_issue_priorities: 问题优先级
 enumeration_doc_categories: 文档类别
 enumeration_activities: 活动（时间跟踪）
+label_overall_activity: Overall activity
diff --git a/lib/ar_condition.rb b/lib/ar_condition.rb
index b08e90761..30c5572ed 100644
--- a/lib/ar_condition.rb
+++ b/lib/ar_condition.rb
@@ -20,7 +20,7 @@ class ARCondition
   
   def initialize(condition=nil)
     @conditions = ['1=1']
-    @conditions.add(condition) if condition
+    add(condition) if condition
   end
   
   def add(condition)
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index b3a472720..26f8408d6 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -169,6 +169,7 @@ div#activity dd { margin-bottom: 1em; }
 div#activity dt { margin-bottom: 1px; }
 div#activity dt .time { color: #777; font-size: 80%; }
 div#activity dd .description { font-style: italic; }
+div#activity span.project:after { content: " -"; }
 
 div#roadmap fieldset.related-issues { margin-bottom: 1em; }
 div#roadmap fieldset.related-issues ul { margin-top: 0.3em; margin-bottom: 0.3em; }
diff --git a/test/fixtures/issues.yml b/test/fixtures/issues.yml
index b3c662039..4f42d93c4 100644
--- a/test/fixtures/issues.yml
+++ b/test/fixtures/issues.yml
@@ -44,9 +44,9 @@ issues_003:
   start_date: <%= 1.day.from_now.to_date.to_s(:db) %>
   due_date: <%= 40.day.ago.to_date.to_s(:db) %>
 issues_004: 
-  created_on: 2006-07-19 21:07:27 +02:00
+  created_on: <%= 5.days.ago.to_date.to_s(:db) %>
   project_id: 2
-  updated_on: 2006-07-19 21:07:27 +02:00
+  updated_on: <%= 2.days.ago.to_date.to_s(:db) %>
   priority_id: 4
   subject: Issue on project 2
   id: 4
@@ -57,4 +57,18 @@ issues_004:
   assigned_to_id: 
   author_id: 2
   status_id: 1
+issues_005: 
+  created_on: <%= 5.days.ago.to_date.to_s(:db) %>
+  project_id: 3
+  updated_on: <%= 2.days.ago.to_date.to_s(:db) %>
+  priority_id: 4
+  subject: Subproject issue
+  id: 5
+  fixed_version_id: 
+  category_id: 
+  description: This is an issue on a cookbook subproject
+  tracker_id: 1
+  assigned_to_id: 
+  author_id: 2
+  status_id: 1
   
diff --git a/test/fixtures/messages.yml b/test/fixtures/messages.yml
index 5bb2438dd..f82f376c1 100644
--- a/test/fixtures/messages.yml
+++ b/test/fixtures/messages.yml
@@ -45,8 +45,8 @@ messages_004:
   parent_id: 
   board_id: 1
 messages_005: 
-  created_on: 2007-09-12 17:18:00 +02:00
-  updated_on: 2007-09-12 17:18:00 +02:00
+  created_on: <%= 3.days.ago.to_date.to_s(:db) %>
+  updated_on: <%= 3.days.ago.to_date.to_s(:db) %>
   subject: 'RE: post 2'
   id: 5
   replies_count: 0
diff --git a/test/functional/projects_controller_test.rb b/test/functional/projects_controller_test.rb
index f610469df..75b4673a1 100644
--- a/test/functional/projects_controller_test.rb
+++ b/test/functional/projects_controller_test.rb
@@ -22,7 +22,8 @@ require 'projects_controller'
 class ProjectsController; def rescue_action(e) raise e end; end
 
 class ProjectsControllerTest < Test::Unit::TestCase
-  fixtures :projects, :versions, :users, :roles, :members, :issues, :journals, :journal_details, :trackers, :projects_trackers, :issue_statuses, :enabled_modules, :enumerations
+  fixtures :projects, :versions, :users, :roles, :members, :issues, :journals, :journal_details,
+           :trackers, :projects_trackers, :issue_statuses, :enabled_modules, :enumerations, :boards, :messages
 
   def setup
     @controller = ProjectsController.new
@@ -129,11 +130,15 @@ class ProjectsControllerTest < Test::Unit::TestCase
     assert assigns(:versions).include?(Version.find(1))
   end
 
-  def test_activity
-    get :activity, :id => 1
+  def test_project_activity
+    get :activity, :id => 1, :with_subprojects => 0
     assert_response :success
     assert_template 'activity'
     assert_not_nil assigns(:events_by_day)
+    assert_not_nil assigns(:events)
+
+    # subproject issue not included by default
+    assert !assigns(:events).include?(Issue.find(5))
     
     assert_tag :tag => "h3", 
                :content => /#{2.days.ago.to_date.day}/,
@@ -163,6 +168,53 @@ class ProjectsControllerTest < Test::Unit::TestCase
                }
   end
   
+  def test_activity_with_subprojects
+    get :activity, :id => 1, :with_subprojects => 1
+    assert_response :success
+    assert_template 'activity'
+    assert_not_nil assigns(:events)
+    
+    assert assigns(:events).include?(Issue.find(1))
+    assert !assigns(:events).include?(Issue.find(4))
+    # subproject issue
+    assert assigns(:events).include?(Issue.find(5))
+  end
+  
+  def test_global_activity_anonymous
+    get :activity
+    assert_response :success
+    assert_template 'activity'
+    assert_not_nil assigns(:events)
+    
+    assert assigns(:events).include?(Issue.find(1))
+    # Issue of a private project
+    assert !assigns(:events).include?(Issue.find(4))
+  end
+  
+  def test_global_activity_logged_user
+    @request.session[:user_id] = 2 # manager
+    get :activity
+    assert_response :success
+    assert_template 'activity'
+    assert_not_nil assigns(:events)
+    
+    assert assigns(:events).include?(Issue.find(1))
+    # Issue of a private project the user belongs to
+    assert assigns(:events).include?(Issue.find(4))
+  end
+
+  
+  def test_global_activity_with_all_types
+    get :activity, :show_issues => 1, :show_news => 1, :show_files => 1, :show_documents => 1, :show_changesets => 1, :show_wiki_pages => 1, :show_messages => 1
+    assert_response :success
+    assert_template 'activity'
+    assert_not_nil assigns(:events)
+    
+    assert assigns(:events).include?(Issue.find(1))
+    assert !assigns(:events).include?(Issue.find(4))
+    assert assigns(:events).include?(Message.find(5))
+  end
+
   def test_calendar
     get :calendar, :id => 1
     assert_response :success
diff --git a/test/unit/project_test.rb b/test/unit/project_test.rb
index b05b7b09f..f7da6ecb5 100644
--- a/test/unit/project_test.rb
+++ b/test/unit/project_test.rb
@@ -126,13 +126,4 @@ class ProjectTest < Test::Unit::TestCase
     assert_equal [1, 2, 3], parent.rolled_up_trackers.collect(&:id)
     assert_equal [2, 3], child.rolled_up_trackers.collect(&:id)
   end
-
-  def test_issues_status_changes
-    journals = @ecookbook.issues_status_changes 3.days.ago.to_date, Date.today
-    assert_equal 1, journals.size
-    assert_kind_of Journal, journals.first
-    
-    journals = @ecookbook.issues_status_changes 30.days.ago.to_date, 10.days.ago.to_date
-    assert_equal 0, journals.size
-  end
 end

From 71d3bb2f7b9788264c1b110a4eee3be46c2d5f49 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Tue, 11 Mar 2008 20:06:25 +0000
Subject: [PATCH 275/710] Fixes Mercurial browsing under unix-like os and for
 directory depth > 2 and (patch #826 by Frederic Moulins, slightly edited to
 preserve win32 compatibility).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1228 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 lib/redmine/scm/adapters/mercurial_adapter.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/redmine/scm/adapters/mercurial_adapter.rb b/lib/redmine/scm/adapters/mercurial_adapter.rb
index 3c905fc0f..40d570d05 100644
--- a/lib/redmine/scm/adapters/mercurial_adapter.rb
+++ b/lib/redmine/scm/adapters/mercurial_adapter.rb
@@ -43,12 +43,12 @@ module Redmine
         def entries(path=nil, identifier=nil)
           path ||= ''
           entries = Entries.new
-          cmd = "#{HG_BIN} -R #{target('')} --cwd #{target(path)} locate -X */*/*"
+          cmd = "#{HG_BIN} -R #{target('')} --cwd #{target(path)} locate"
           cmd << " -r #{identifier.to_i}" if identifier
-          cmd << " * */*"
+          cmd << " glob:**"
           shellout(cmd) do |io|
             io.each_line do |line|
-              e = line.chomp.split('\\')
+              e = line.chomp.split(%r{[\/\\]})
               entries << Entry.new({:name => e.first,
                                     :path => (path.empty? ? e.first : "#{path}/#{e.first}"),
                                     :kind => (e.size > 1 ? 'dir' : 'file'),

From a9c972fbb3c7379fc251b8779d7dc1acd6e48f8f Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Tue, 11 Mar 2008 20:15:05 +0000
Subject: [PATCH 276/710] Quotes Mercurial entries command depending on the OS.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1229 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 lib/redmine/scm/adapters/mercurial_adapter.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/redmine/scm/adapters/mercurial_adapter.rb b/lib/redmine/scm/adapters/mercurial_adapter.rb
index 40d570d05..26bf01140 100644
--- a/lib/redmine/scm/adapters/mercurial_adapter.rb
+++ b/lib/redmine/scm/adapters/mercurial_adapter.rb
@@ -45,7 +45,7 @@ module Redmine
           entries = Entries.new
           cmd = "#{HG_BIN} -R #{target('')} --cwd #{target(path)} locate"
           cmd << " -r #{identifier.to_i}" if identifier
-          cmd << " glob:**"
+          cmd << " " + shell_quote('glob:**')
           shellout(cmd) do |io|
             io.each_line do |line|
               e = line.chomp.split(%r{[\/\\]})

From 3a75b6771fa1bb6ba79895312ee9d1325be6663d Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Wed, 12 Mar 2008 17:56:19 +0000
Subject: [PATCH 277/710] Prevent LDAP authentication with empty password
 related problems.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1231 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/models/user.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/models/user.rb b/app/models/user.rb
index 2dd698f28..ae81d46d2 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -83,6 +83,8 @@ class User < ActiveRecord::Base
   
   # Returns the user that matches provided login and password, or nil
   def self.try_to_login(login, password)
+    # Make sure no one can sign in with an empty password
+    return nil if password.to_s.empty?
     user = find(:first, :conditions => ["login=?", login])
     if user
       # user is already in local database

From 6fcc512cb77a0851ab8c3c693fd178b564a600dd Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Wed, 12 Mar 2008 19:58:19 +0000
Subject: [PATCH 278/710] Adds a setting for whether new projects should be
 public by default (closes #842, #839). Patch by Rocco Stanzione, slightly
 edited.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1235 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/projects_controller.rb | 3 ++-
 app/views/settings/_general.rhtml      | 3 +++
 config/settings.yml                    | 4 +++-
 lang/bg.yml                            | 1 +
 lang/cs.yml                            | 1 +
 lang/da.yml                            | 1 +
 lang/de.yml                            | 1 +
 lang/en.yml                            | 1 +
 lang/es.yml                            | 1 +
 lang/fi.yml                            | 1 +
 lang/fr.yml                            | 1 +
 lang/he.yml                            | 1 +
 lang/it.yml                            | 1 +
 lang/ja.yml                            | 1 +
 lang/ko.yml                            | 1 +
 lang/lt.yml                            | 1 +
 lang/nl.yml                            | 1 +
 lang/pl.yml                            | 1 +
 lang/pt-br.yml                         | 1 +
 lang/pt.yml                            | 1 +
 lang/ro.yml                            | 1 +
 lang/ru.yml                            | 1 +
 lang/sr.yml                            | 1 +
 lang/sv.yml                            | 1 +
 lang/uk.yml                            | 1 +
 lang/zh-tw.yml                         | 1 +
 lang/zh.yml                            | 1 +
 27 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 9268a19ea..dbd36f6e4 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -70,6 +70,7 @@ class ProjectsController < ApplicationController
     if request.get?
       @custom_values = ProjectCustomField.find(:all, :order => "#{CustomField.table_name}.position").collect { |x| CustomValue.new(:custom_field => x, :customized => @project) }
       @project.trackers = Tracker.all
+      @project.is_public = Setting.default_projects_public?
     else
       @project.custom_fields = CustomField.find(params[:custom_field_ids]) if params[:custom_field_ids]
       @custom_values = ProjectCustomField.find(:all, :order => "#{CustomField.table_name}.position").collect { |x| CustomValue.new(:custom_field => x, :customized => @project, :value => (params[:custom_fields] ? params["custom_fields"][x.id.to_s] : nil)) }
@@ -78,7 +79,7 @@ class ProjectsController < ApplicationController
         @project.enabled_module_names = params[:enabled_modules]
         flash[:notice] = l(:notice_successful_create)
         redirect_to :controller => 'admin', :action => 'projects'
-	  end		
+	    end		
     end	
   end
 	
diff --git a/app/views/settings/_general.rhtml b/app/views/settings/_general.rhtml
index bb56c43db..1d17a003e 100644
--- a/app/views/settings/_general.rhtml
+++ b/app/views/settings/_general.rhtml
@@ -46,6 +46,9 @@
 
 <p><label><%= l(:setting_feeds_limit) %></label>
 <%= text_field_tag 'settings[feeds_limit]', Setting.feeds_limit, :size => 6 %></p>
+
+<p><label><%= l(:setting_default_projects_public) %></label>
+<%= check_box_tag 'settings[default_projects_public]', 1, Setting.default_projects_public? %><%= hidden_field_tag 'settings[default_projects_public]', 0 %></p>
 </div>
 
 <%= submit_tag l(:button_save) %>
diff --git a/config/settings.yml b/config/settings.yml
index 59f4f0437..bb501823e 100644
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -103,6 +103,8 @@ issue_list_default_columns:
   - updated_on
 display_subprojects_issues:
   default: 1
+default_projects_public:
+  default: 1
 # encodings used to convert repository files content to UTF-8
 # multiple values accepted, comma separated
 repositories_encodings:
@@ -113,4 +115,4 @@ emails_footer:
   default: |-
     You have received this notification because you have either subscribed to it, or are involved in it.
     To change your notification preferences, please click here: http://hostname/my/account
-  
\ No newline at end of file
+  
diff --git a/lang/bg.yml b/lang/bg.yml
index 99c8eb296..362421fa6 100644
--- a/lang/bg.yml
+++ b/lang/bg.yml
@@ -614,3 +614,4 @@ label_reverse_chronological_order: In reverse chronological order
 label_preferences: Preferences
 setting_display_subprojects_issues: Display subprojects issues on main projects by default
 label_overall_activity: Overall activity
+setting_default_projects_public: New projects are public by default
diff --git a/lang/cs.yml b/lang/cs.yml
index 7d11bb6a8..60bb0e022 100644
--- a/lang/cs.yml
+++ b/lang/cs.yml
@@ -614,3 +614,4 @@ label_reverse_chronological_order: In reverse chronological order
 label_preferences: Preferences
 setting_display_subprojects_issues: Display subprojects issues on main projects by default
 label_overall_activity: Overall activity
+setting_default_projects_public: New projects are public by default
diff --git a/lang/da.yml b/lang/da.yml
index 825f15ecc..042666b43 100644
--- a/lang/da.yml
+++ b/lang/da.yml
@@ -616,3 +616,4 @@ text_reassign_time_entries: 'Reassign reported hours to this issue:'
 label_reverse_chronological_order: In reverse chronological order
 label_preferences: Preferences
 label_overall_activity: Overall activity
+setting_default_projects_public: New projects are public by default
diff --git a/lang/de.yml b/lang/de.yml
index eeb851018..7ef41fe46 100644
--- a/lang/de.yml
+++ b/lang/de.yml
@@ -615,3 +615,4 @@ label_reverse_chronological_order: In reverse chronological order
 label_preferences: Preferences
 setting_display_subprojects_issues: Display subprojects issues on main projects by default
 label_overall_activity: Overall activity
+setting_default_projects_public: New projects are public by default
diff --git a/lang/en.yml b/lang/en.yml
index 26c7b4766..8a08507bb 100644
--- a/lang/en.yml
+++ b/lang/en.yml
@@ -193,6 +193,7 @@ setting_host_name: Host name
 setting_text_formatting: Text formatting
 setting_wiki_compression: Wiki history compression
 setting_feeds_limit: Feed content limit
+setting_default_projects_public: New projects are public by default
 setting_autofetch_changesets: Autofetch commits
 setting_sys_api_enabled: Enable WS for repository management
 setting_commit_ref_keywords: Referencing keywords
diff --git a/lang/es.yml b/lang/es.yml
index 554020155..1453534e8 100644
--- a/lang/es.yml
+++ b/lang/es.yml
@@ -617,3 +617,4 @@ label_reverse_chronological_order: In reverse chronological order
 label_preferences: Preferences
 setting_display_subprojects_issues: Display subprojects issues on main projects by default
 label_overall_activity: Overall activity
+setting_default_projects_public: New projects are public by default
diff --git a/lang/fi.yml b/lang/fi.yml
index 4923440fd..99b2ebb14 100644
--- a/lang/fi.yml
+++ b/lang/fi.yml
@@ -621,3 +621,4 @@ field_comments_sorting: Display comments
 label_reverse_chronological_order: In reverse chronological order
 label_preferences: Preferences
 label_overall_activity: Overall activity
+setting_default_projects_public: New projects are public by default
diff --git a/lang/fr.yml b/lang/fr.yml
index c7cfc54e5..c11db5cbf 100644
--- a/lang/fr.yml
+++ b/lang/fr.yml
@@ -194,6 +194,7 @@ setting_host_name: Nom d'hôte
 setting_text_formatting: Formatage du texte
 setting_wiki_compression: Compression historique wiki
 setting_feeds_limit: Limite du contenu des flux RSS
+setting_default_projects_public: Définir les nouveaux projects comme publics par défaut
 setting_autofetch_changesets: Récupération auto. des commits
 setting_sys_api_enabled: Activer les WS pour la gestion des dépôts
 setting_commit_ref_keywords: Mot-clés de référencement
diff --git a/lang/he.yml b/lang/he.yml
index 5d585eb61..5828e6fb4 100644
--- a/lang/he.yml
+++ b/lang/he.yml
@@ -614,3 +614,4 @@ label_reverse_chronological_order: In reverse chronological order
 label_preferences: Preferences
 setting_display_subprojects_issues: Display subprojects issues on main projects by default
 label_overall_activity: Overall activity
+setting_default_projects_public: New projects are public by default
diff --git a/lang/it.yml b/lang/it.yml
index 1d2cb742d..f407cc764 100644
--- a/lang/it.yml
+++ b/lang/it.yml
@@ -614,3 +614,4 @@ label_reverse_chronological_order: In reverse chronological order
 label_preferences: Preferences
 setting_display_subprojects_issues: Display subprojects issues on main projects by default
 label_overall_activity: Overall activity
+setting_default_projects_public: New projects are public by default
diff --git a/lang/ja.yml b/lang/ja.yml
index de883fe58..3e74c5582 100644
--- a/lang/ja.yml
+++ b/lang/ja.yml
@@ -615,3 +615,4 @@ label_reverse_chronological_order: In reverse chronological order
 label_preferences: Preferences
 setting_display_subprojects_issues: Display subprojects issues on main projects by default
 label_overall_activity: Overall activity
+setting_default_projects_public: New projects are public by default
diff --git a/lang/ko.yml b/lang/ko.yml
index bfe7be912..73f7e3cc3 100644
--- a/lang/ko.yml
+++ b/lang/ko.yml
@@ -614,3 +614,4 @@ label_reverse_chronological_order: In reverse chronological order
 label_preferences: Preferences
 setting_display_subprojects_issues: Display subprojects issues on main projects by default
 label_overall_activity: Overall activity
+setting_default_projects_public: New projects are public by default
diff --git a/lang/lt.yml b/lang/lt.yml
index b5bb15df0..fc242f6dd 100644
--- a/lang/lt.yml
+++ b/lang/lt.yml
@@ -615,3 +615,4 @@ label_reverse_chronological_order: In reverse chronological order
 label_preferences: Preferences
 setting_display_subprojects_issues: Display subprojects issues on main projects by default
 label_overall_activity: Overall activity
+setting_default_projects_public: New projects are public by default
diff --git a/lang/nl.yml b/lang/nl.yml
index 65d13ddab..25827e454 100644
--- a/lang/nl.yml
+++ b/lang/nl.yml
@@ -615,3 +615,4 @@ label_reverse_chronological_order: In reverse chronological order
 label_preferences: Preferences
 setting_display_subprojects_issues: Display subprojects issues on main projects by default
 label_overall_activity: Overall activity
+setting_default_projects_public: New projects are public by default
diff --git a/lang/pl.yml b/lang/pl.yml
index 10a8885d1..0a25ba10e 100644
--- a/lang/pl.yml
+++ b/lang/pl.yml
@@ -614,3 +614,4 @@ field_comments_sorting: Display comments
 label_reverse_chronological_order: In reverse chronological order
 label_preferences: Preferences
 label_overall_activity: Overall activity
+setting_default_projects_public: New projects are public by default
diff --git a/lang/pt-br.yml b/lang/pt-br.yml
index 3bd38a557..e84a45de3 100644
--- a/lang/pt-br.yml
+++ b/lang/pt-br.yml
@@ -614,3 +614,4 @@ label_reverse_chronological_order: In reverse chronological order
 label_preferences: Preferences
 setting_display_subprojects_issues: Display subprojects issues on main projects by default
 label_overall_activity: Overall activity
+setting_default_projects_public: New projects are public by default
diff --git a/lang/pt.yml b/lang/pt.yml
index 65d26b1e3..a8f5110eb 100644
--- a/lang/pt.yml
+++ b/lang/pt.yml
@@ -614,3 +614,4 @@ label_reverse_chronological_order: In reverse chronological order
 label_preferences: Preferences
 setting_display_subprojects_issues: Display subprojects issues on main projects by default
 label_overall_activity: Overall activity
+setting_default_projects_public: New projects are public by default
diff --git a/lang/ro.yml b/lang/ro.yml
index 8e91d277f..f2f831eee 100644
--- a/lang/ro.yml
+++ b/lang/ro.yml
@@ -614,3 +614,4 @@ label_reverse_chronological_order: In reverse chronological order
 label_preferences: Preferences
 setting_display_subprojects_issues: Display subprojects issues on main projects by default
 label_overall_activity: Overall activity
+setting_default_projects_public: New projects are public by default
diff --git a/lang/ru.yml b/lang/ru.yml
index f08271e45..ec5132a30 100644
--- a/lang/ru.yml
+++ b/lang/ru.yml
@@ -618,3 +618,4 @@ label_reverse_chronological_order: In reverse chronological order
 label_preferences: Preferences
 setting_display_subprojects_issues: Display subprojects issues on main projects by default
 label_overall_activity: Overall activity
+setting_default_projects_public: New projects are public by default
diff --git a/lang/sr.yml b/lang/sr.yml
index 82d06f93b..79992f9d3 100644
--- a/lang/sr.yml
+++ b/lang/sr.yml
@@ -615,3 +615,4 @@ label_reverse_chronological_order: In reverse chronological order
 label_preferences: Preferences
 setting_display_subprojects_issues: Display subprojects issues on main projects by default
 label_overall_activity: Overall activity
+setting_default_projects_public: New projects are public by default
diff --git a/lang/sv.yml b/lang/sv.yml
index cc9fcd212..8594dc4d3 100644
--- a/lang/sv.yml
+++ b/lang/sv.yml
@@ -615,3 +615,4 @@ label_reverse_chronological_order: In reverse chronological order
 label_preferences: Preferences
 setting_display_subprojects_issues: Display subprojects issues on main projects by default
 label_overall_activity: Overall activity
+setting_default_projects_public: New projects are public by default
diff --git a/lang/uk.yml b/lang/uk.yml
index 08a36e352..7bd22acaf 100644
--- a/lang/uk.yml
+++ b/lang/uk.yml
@@ -616,3 +616,4 @@ label_reverse_chronological_order: In reverse chronological order
 label_preferences: Preferences
 setting_display_subprojects_issues: Display subprojects issues on main projects by default
 label_overall_activity: Overall activity
+setting_default_projects_public: New projects are public by default
diff --git a/lang/zh-tw.yml b/lang/zh-tw.yml
index 95e5afbb4..5a93d8653 100644
--- a/lang/zh-tw.yml
+++ b/lang/zh-tw.yml
@@ -615,3 +615,4 @@ enumeration_issue_priorities: 項目優先權
 enumeration_doc_categories: 文件分類
 enumeration_activities: 活動 (time tracking)
 label_overall_activity: Overall activity
+setting_default_projects_public: New projects are public by default
diff --git a/lang/zh.yml b/lang/zh.yml
index 39ed5fc44..fa0674137 100644
--- a/lang/zh.yml
+++ b/lang/zh.yml
@@ -615,3 +615,4 @@ enumeration_issue_priorities: 问题优先级
 enumeration_doc_categories: 文档类别
 enumeration_activities: 活动（时间跟踪）
 label_overall_activity: Overall activity
+setting_default_projects_public: New projects are public by default

From 3a9b0988c7515371531e47f9eef9f8e60ce352aa Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Wed, 12 Mar 2008 20:28:49 +0000
Subject: [PATCH 279/710] Merged Git support branch (r1200 to r1226).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1236 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/repositories_controller.rb    |   4 +-
 app/helpers/application_helper.rb             |   7 +-
 app/helpers/repositories_helper.rb            |   8 +
 app/models/changeset.rb                       |  11 +-
 app/models/repository.rb                      |   4 +-
 app/models/repository/bazaar.rb               |   2 +-
 app/models/repository/cvs.rb                  |  40 ++-
 app/models/repository/darcs.rb                |   9 +-
 app/models/repository/git.rb                  |  70 +++++
 app/models/repository/subversion.rb           |   2 +-
 .../repositories/_dir_list_content.rhtml      |   2 +-
 app/views/repositories/_revisions.rhtml       |   2 +-
 app/views/repositories/annotate.rhtml         |   2 +-
 app/views/repositories/diff.rhtml             |  10 +-
 app/views/repositories/revision.rhtml         |   2 +-
 ...91_change_changesets_revision_to_string.rb |   9 +
 ..._change_changes_from_revision_to_string.rb |   9 +
 doc/RUNNING_TESTS                             |  16 ++
 lib/redmine.rb                                |   2 +-
 lib/redmine/scm/adapters/darcs_adapter.rb     |   8 +-
 lib/redmine/scm/adapters/git_adapter.rb       | 261 ++++++++++++++++++
 .../repositories/darcs_repository.tar.gz      | Bin 0 -> 8075 bytes
 .../repositories/git_repository.tar.gz        | Bin 0 -> 12445 bytes
 .../repositories_darcs_controller_test.rb     |  94 +++++++
 .../repositories_git_controller_test.rb       | 123 +++++++++
 test/unit/repository_cvs_test.rb              |   6 +-
 test/unit/repository_darcs_test.rb            |  55 ++++
 test/unit/repository_git_test.rb              |  56 ++++
 28 files changed, 762 insertions(+), 52 deletions(-)
 create mode 100644 app/models/repository/git.rb
 create mode 100644 db/migrate/091_change_changesets_revision_to_string.rb
 create mode 100644 db/migrate/092_change_changes_from_revision_to_string.rb
 create mode 100644 lib/redmine/scm/adapters/git_adapter.rb
 create mode 100644 test/fixtures/repositories/darcs_repository.tar.gz
 create mode 100644 test/fixtures/repositories/git_repository.tar.gz
 create mode 100644 test/functional/repositories_darcs_controller_test.rb
 create mode 100644 test/functional/repositories_git_controller_test.rb
 create mode 100644 test/unit/repository_darcs_test.rb
 create mode 100644 test/unit/repository_git_test.rb

diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb
index 13d3eaa32..bce5f66a9 100644
--- a/app/controllers/repositories_controller.rb
+++ b/app/controllers/repositories_controller.rb
@@ -134,7 +134,7 @@ class RepositoriesController < ApplicationController
   end
   
   def diff
-    @rev_to = params[:rev_to] ? params[:rev_to].to_i : (@rev - 1)
+    @rev_to = params[:rev_to]
     @diff_type = params[:type] || User.current.pref[:diff_type] || 'inline'
     @diff_type = 'inline' unless %w(inline sbs).include?(@diff_type)
     
@@ -185,7 +185,7 @@ private
     render_404 and return false unless @repository
     @path = params[:path].join('/') unless params[:path].nil?
     @path ||= ''
-    @rev = params[:rev].to_i if params[:rev]
+    @rev = params[:rev]
   rescue ActiveRecord::RecordNotFound
     render_404
   end
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index f21b43a23..be0b808d2 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -270,6 +270,7 @@ module ApplicationHelper
     #     #52 -> Link to issue #52
     #   Changesets:
     #     r52 -> Link to revision 52
+    #     commit:a85130f -> Link to scmid starting with a85130f
     #   Documents:
     #     document#17 -> Link to document with id 17
     #     document:Greetings -> Link to the document with title "Greetings"
@@ -280,7 +281,7 @@ module ApplicationHelper
     #     version:"1.0 beta 2" -> Link to version named "1.0 beta 2"
     #   Attachments:
     #     attachment:file.zip -> Link to the attachment of the current object named file.zip
-    text = text.gsub(%r{([\s\(,-^])(!)?(attachment|document|version)?((#|r)(\d+)|(:)([^"][^\s<>]+|"[^"]+"))(?=[[:punct:]]|\s|<|$)}) do |m|
+    text = text.gsub(%r{([\s\(,-^])(!)?(attachment|document|version|commit)?((#|r)(\d+)|(:)([^"][^\s<>]+|"[^"]+"))(?=[[:punct:]]|\s|<|$)}) do |m|
       leading, esc, prefix, sep, oid = $1, $2, $3, $5 || $7, $6 || $8
       link = nil
       if esc.nil?
@@ -325,6 +326,10 @@ module ApplicationHelper
               link = link_to h(version.name), {:only_path => only_path, :controller => 'versions', :action => 'show', :id => version},
                                               :class => 'version'
             end
+          when 'commit'
+            if project && (changeset = project.changesets.find(:first, :conditions => ["scmid LIKE ?", "#{name}%"]))
+              link = link_to h("#{name}"), {:only_path => only_path, :controller => 'repositories', :action => 'revision', :id => project.id, :rev => changeset.revision}, :class => 'changeset', :title => truncate(changeset.comments, 100)
+            end
           when 'attachment'
             if attachments && attachment = attachments.detect {|a| a.filename == name }
               link = link_to h(attachment.filename), {:only_path => only_path, :controller => 'attachments', :action => 'download', :id => attachment},
diff --git a/app/helpers/repositories_helper.rb b/app/helpers/repositories_helper.rb
index d7d7f4349..31daf1bd8 100644
--- a/app/helpers/repositories_helper.rb
+++ b/app/helpers/repositories_helper.rb
@@ -25,6 +25,10 @@ module RepositoriesHelper
     type ? CodeRay.scan(content, type).html : h(content)
   end
   
+  def format_revision(txt)
+    txt.to_s[0,8]
+  end
+  
   def to_utf8(str)
     return str if /\A[\r\n\t\x20-\x7e]*\Z/n.match(str) # for us-ascii
     @encodings ||= Setting.repositories_encodings.split(',').collect(&:strip)
@@ -76,6 +80,10 @@ module RepositoriesHelper
       content_tag('p', form.text_field(:url, :label => 'Root directory', :size => 60, :required => true, :disabled => (repository && !repository.root_url.blank?)))
   end
 
+  def git_field_tags(form, repository)
+      content_tag('p', form.text_field(:url, :label => 'Path to .git 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?))
diff --git a/app/models/changeset.rb b/app/models/changeset.rb
index dbe06935d..ce9ea28ca 100644
--- a/app/models/changeset.rb
+++ b/app/models/changeset.rb
@@ -32,7 +32,6 @@ class Changeset < ActiveRecord::Base
                      :date_column => 'committed_on'
   
   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
   
@@ -89,7 +88,11 @@ class Changeset < ActiveRecord::Base
           # don't change the status is the issue is closed
           next if issue.status.is_closed?
           user = committer_user || User.anonymous
-          journal = issue.init_journal(user, l(:text_status_changed_by_changeset, "r#{self.revision}"))
+          csettext = "r#{self.revision}"
+          if self.scmid && (! (csettext =~ /^r[0-9]+$/))
+            csettext = "commit:\"#{self.scmid}\""
+          end
+          journal = issue.init_journal(user, l(:text_status_changed_by_changeset, csettext))
           issue.status = fix_status
           issue.done_ratio = done_ratio if done_ratio
           issue.save
@@ -114,11 +117,11 @@ class Changeset < ActiveRecord::Base
   
   # Returns the previous changeset
   def previous
-    @previous ||= Changeset.find(:first, :conditions => ['revision < ? AND repository_id = ?', self.revision, self.repository_id], :order => 'revision DESC')
+    @previous ||= Changeset.find(:first, :conditions => ['id < ? AND repository_id = ?', self.id, self.repository_id], :order => 'id DESC')
   end
 
   # Returns the next changeset
   def next
-    @next ||= Changeset.find(:first, :conditions => ['revision > ? AND repository_id = ?', self.revision, self.repository_id], :order => 'revision ASC')
+    @next ||= Changeset.find(:first, :conditions => ['id > ? AND repository_id = ?', self.id, self.repository_id], :order => 'id ASC')
   end
 end
diff --git a/app/models/repository.rb b/app/models/repository.rb
index be31ac2e5..229c8dae4 100644
--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -17,7 +17,7 @@
 
 class Repository < ActiveRecord::Base
   belongs_to :project
-  has_many :changesets, :dependent => :destroy, :order => "#{Changeset.table_name}.revision DESC"
+  has_many :changesets, :dependent => :destroy, :order => "#{Changeset.table_name}.committed_on DESC, #{Changeset.table_name}.id DESC"
   has_many :changes, :through => :changesets
     
   def scm
@@ -51,7 +51,7 @@ class Repository < ActiveRecord::Base
     path = "/#{path}" unless path.starts_with?('/')
     Change.find(:all, :include => :changeset, 
       :conditions => ["repository_id = ? AND path = ?", id, path],
-      :order => "committed_on DESC, #{Changeset.table_name}.revision DESC").collect(&:changeset)
+      :order => "committed_on DESC, #{Changeset.table_name}.id DESC").collect(&:changeset)
   end
   
   def latest_changeset
diff --git a/app/models/repository/bazaar.rb b/app/models/repository/bazaar.rb
index 6e387f957..1b75066c2 100644
--- a/app/models/repository/bazaar.rb
+++ b/app/models/repository/bazaar.rb
@@ -51,7 +51,7 @@ class Repository::Bazaar < Repository
     scm_info = scm.info
     if scm_info
       # latest revision found in database
-      db_revision = latest_changeset ? latest_changeset.revision : 0
+      db_revision = latest_changeset ? latest_changeset.revision.to_i : 0
       # latest revision in the repository
       scm_revision = scm_info.lastrev.identifier.to_i
       if db_revision < scm_revision
diff --git a/app/models/repository/cvs.rb b/app/models/repository/cvs.rb
index 16d906316..a78b60806 100644
--- a/app/models/repository/cvs.rb
+++ b/app/models/repository/cvs.rb
@@ -82,9 +82,6 @@ class Repository::Cvs < Repository
   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.
@@ -94,8 +91,10 @@ class Repository::Cvs < Repository
     # we use a small delta here, to merge all changes belonging to _one_ changeset
     time_delta=10.seconds
     
+    fetch_since = latest_changeset ? latest_changeset.committed_on : nil
     transaction do
-      scm.revisions('', last_commit, nil, :with_paths => true) do |revision|
+      tmp_rev_num = 1
+      scm.revisions('', fetch_since, 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])
@@ -107,18 +106,16 @@ class Repository::Cvs < Repository
           })
         
           # create a new changeset.... 
-          unless cs 
-            # we use a negative changeset-number here (just for inserting)
+          unless cs
+            # we use a temporaray revision 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)
+            latest = changesets.find(:first, :order => 'id DESC')
+            cs = Changeset.create(:repository => self,
+                                  :revision => "_#{tmp_rev_num}", 
+                                  :committer => revision.author, 
+                                  :committed_on => revision.time,
+                                  :comments => revision.message)
+            tmp_rev_num += 1
           end
         
           #convert CVS-File-States to internal Action-abbrevations
@@ -139,12 +136,13 @@ class Repository::Cvs < Repository
         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!
+      # Renumber new changesets in chronological order
+      c = changesets.find(:first, :order => 'committed_on DESC, id DESC', :conditions => "revision NOT LIKE '_%'")
+      next_rev = c.nil? ? 1 : (c.revision.to_i + 1)
+      changesets.find(:all, :order => 'committed_on ASC, id ASC', :conditions => "revision LIKE '_%'").each do |changeset|
+        changeset.update_attribute :revision, next_rev
+        next_rev += 1
       end
-    end
+    end # transaction
   end
 end
diff --git a/app/models/repository/darcs.rb b/app/models/repository/darcs.rb
index 48cc246fb..cc608d370 100644
--- a/app/models/repository/darcs.rb
+++ b/app/models/repository/darcs.rb
@@ -47,18 +47,19 @@ class Repository::Darcs < Repository
   
   def diff(path, rev, rev_to, type)
     patch_from = changesets.find_by_revision(rev)
+    return nil if patch_from.nil?
     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)
+    patch_from ? scm.diff(path, patch_from.scmid, patch_to ? patch_to.scmid : nil, type) : nil
   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      
+      next_rev = latest_changeset ? latest_changeset.revision.to_i + 1 : 1      
       # latest revision in the repository
       scm_revision = scm_info.lastrev.scmid      
       unless changesets.find_by_scmid(scm_revision)
@@ -71,9 +72,7 @@ class Repository::Darcs < Repository
                                          :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],
diff --git a/app/models/repository/git.rb b/app/models/repository/git.rb
new file mode 100644
index 000000000..7213588ac
--- /dev/null
+++ b/app/models/repository/git.rb
@@ -0,0 +1,70 @@
+# redMine - project management software
+# Copyright (C) 2006-2007  Jean-Philippe Lang
+# Copyright (C) 2007  Patrick Aljord patcito@ŋmail.com
+# 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/git_adapter'
+
+class Repository::Git < Repository
+  attr_protected :root_url
+  validates_presence_of :url
+
+  def scm_adapter
+    Redmine::Scm::Adapters::GitAdapter
+  end
+  
+  def self.scm_name
+    'Git'
+  end
+
+  def changesets_for_path(path)
+    Change.find(:all, :include => :changeset, 
+                :conditions => ["repository_id = ? AND path = ?", id, path],
+                :order => "committed_on DESC, #{Changeset.table_name}.revision DESC").collect(&:changeset)
+  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.scmid
+
+      unless changesets.find_by_scmid(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
diff --git a/app/models/repository/subversion.rb b/app/models/repository/subversion.rb
index a0485608d..0c2239c43 100644
--- a/app/models/repository/subversion.rb
+++ b/app/models/repository/subversion.rb
@@ -39,7 +39,7 @@ class Repository::Subversion < Repository
     scm_info = scm.info
     if scm_info
       # latest revision found in database
-      db_revision = latest_changeset ? latest_changeset.revision : 0
+      db_revision = latest_changeset ? latest_changeset.revision.to_i : 0
       # latest revision in the repository
       scm_revision = scm_info.lastrev.identifier.to_i
       if db_revision < scm_revision
diff --git a/app/views/repositories/_dir_list_content.rhtml b/app/views/repositories/_dir_list_content.rhtml
index a7b83e817..3564e52ab 100644
--- a/app/views/repositories/_dir_list_content.rhtml
+++ b/app/views/repositories/_dir_list_content.rhtml
@@ -23,7 +23,7 @@ else
 end %>
 </td>
 <td class="size"><%= (entry.size ? number_to_human_size(entry.size) : "?") unless entry.is_dir? %></td>
-<td class="revision"><%= link_to(entry.lastrev.name, :action => 'revision', :id => @project, :rev => entry.lastrev.identifier) if entry.lastrev && entry.lastrev.identifier %></td>
+<td class="revision"><%= link_to(format_revision(entry.lastrev.name), :action => 'revision', :id => @project, :rev => entry.lastrev.identifier) if entry.lastrev && entry.lastrev.identifier %></td>
 <td class="age"><%= distance_of_time_in_words(entry.lastrev.time, Time.now) if entry.lastrev && entry.lastrev.time %></td>
 <td class="author"><%=h(entry.lastrev.author.to_s.split('<').first) if entry.lastrev %></td>
 <% changeset = @project.repository.changesets.find_by_revision(entry.lastrev.identifier) if entry.lastrev %>
diff --git a/app/views/repositories/_revisions.rhtml b/app/views/repositories/_revisions.rhtml
index 52992bb89..1bcf0208c 100644
--- a/app/views/repositories/_revisions.rhtml
+++ b/app/views/repositories/_revisions.rhtml
@@ -13,7 +13,7 @@
 <% line_num = 1 %>
 <% revisions.each do |changeset| %>
 <tr class="changeset <%= cycle 'odd', 'even' %>">
-<td class="id"><%= link_to changeset.revision, :action => 'revision', :id => project, :rev => changeset.revision %></td>
+<td class="id"><%= link_to format_revision(changeset.revision), :action => 'revision', :id => project, :rev => changeset.revision %></td>
 <td class="checkbox"><%= radio_button_tag('rev', changeset.revision, (line_num==1), :id => "cb-#{line_num}", :onclick => "$('cbto-#{line_num+1}').checked=true;") if show_diff && (line_num < revisions.size) %></td>
 <td class="checkbox"><%= radio_button_tag('rev_to', changeset.revision, (line_num==2), :id => "cbto-#{line_num}", :onclick => "if ($('cb-#{line_num}').checked==true) {$('cb-#{line_num-1}').checked=true;}") if show_diff && (line_num > 1) %></td>
 <td class="committed_on"><%= format_time(changeset.committed_on) %></td>
diff --git a/app/views/repositories/annotate.rhtml b/app/views/repositories/annotate.rhtml
index 28d99a393..b5669ef76 100644
--- a/app/views/repositories/annotate.rhtml
+++ b/app/views/repositories/annotate.rhtml
@@ -11,7 +11,7 @@
     <tr class="bloc-<%= revision.nil? ? 0 : colors[revision.identifier || revision.revision] %>">
       <th class="line-num"><%= line_num %></th>
       <td class="revision">
-      <%= (revision.identifier ? link_to(revision.identifier, :action => 'revision', :id => @project, :rev => revision.identifier) : revision.revision) if revision %></td>
+      <%= (revision.identifier ? link_to(format_revision(revision.identifier), :action => 'revision', :id => @project, :rev => revision.identifier) : format_revision(revision.revision)) if revision %></td>
       <td class="author"><%= h(revision.author.to_s.split('<').first) if revision %></td>
       <td class="line-code"><pre><%= line %></pre></td>
     </tr>
diff --git a/app/views/repositories/diff.rhtml b/app/views/repositories/diff.rhtml
index 88c5f17a0..eaef1abf5 100644
--- a/app/views/repositories/diff.rhtml
+++ b/app/views/repositories/diff.rhtml
@@ -1,4 +1,4 @@
-<h2><%= l(:label_revision) %> <%= @rev %>: <%= @path.gsub(/^.*\//, '') %></h2>
+<h2><%= l(:label_revision) %> <%= format_revision(@rev) %> <%= @path.gsub(/^.*\//, '') %></h2>
 
 <!-- Choose view type -->
 <% form_tag({ :controller => 'repositories', :action => 'diff'}, :method => 'get') do %>
@@ -23,8 +23,8 @@
           </th>
         </tr>
         <tr>
-          <th colspan="2">@<%= @rev %></th>
-          <th colspan="2">@<%= @rev_to %></th>
+          <th colspan="2">@<%= format_revision @rev %></th>
+          <th colspan="2">@<%= format_revision @rev_to %></th>
         </tr>
       </thead>
       <tbody>
@@ -56,8 +56,8 @@
           </th>
         </tr>
         <tr>
-          <th>@<%= @rev %></th>
-          <th>@<%= @rev_to %></th>
+          <th>@<%= format_revision @rev %></th>
+          <th>@<%= format_revision @rev_to %></th>
           <th></th>
         </tr>
       </thead>
diff --git a/app/views/repositories/revision.rhtml b/app/views/repositories/revision.rhtml
index d60c0b0b7..5a7ef1fd5 100644
--- a/app/views/repositories/revision.rhtml
+++ b/app/views/repositories/revision.rhtml
@@ -19,7 +19,7 @@
   <% end %>
 </div>
 
-<h2><%= l(:label_revision) %> <%= @changeset.revision %></h2>
+<h2><%= l(:label_revision) %> <%= format_revision(@changeset.revision) %></h2>
 
 <p><% if @changeset.scmid %>ID: <%= @changeset.scmid %><br /><% end %>
 <em><%= @changeset.committer.to_s.split('<').first %>, <%= format_time(@changeset.committed_on) %></em></p>
diff --git a/db/migrate/091_change_changesets_revision_to_string.rb b/db/migrate/091_change_changesets_revision_to_string.rb
new file mode 100644
index 000000000..e621a3909
--- /dev/null
+++ b/db/migrate/091_change_changesets_revision_to_string.rb
@@ -0,0 +1,9 @@
+class ChangeChangesetsRevisionToString < ActiveRecord::Migration
+  def self.up
+    change_column :changesets, :revision, :string, :null => false
+  end
+
+  def self.down
+    change_column :changesets, :revision, :integer, :null => false
+  end
+end
diff --git a/db/migrate/092_change_changes_from_revision_to_string.rb b/db/migrate/092_change_changes_from_revision_to_string.rb
new file mode 100644
index 000000000..b298a3f45
--- /dev/null
+++ b/db/migrate/092_change_changes_from_revision_to_string.rb
@@ -0,0 +1,9 @@
+class ChangeChangesFromRevisionToString < ActiveRecord::Migration
+  def self.up
+    change_column :changes, :from_revision, :string
+  end
+
+  def self.down
+    change_column :changes, :from_revision, :integer
+  end
+end
diff --git a/doc/RUNNING_TESTS b/doc/RUNNING_TESTS
index fde24413b..7a5e2b992 100644
--- a/doc/RUNNING_TESTS
+++ b/doc/RUNNING_TESTS
@@ -19,3 +19,19 @@ gunzip < test/fixtures/repositories/bazaar_repository.tar.gz | tar -xv -C tmp/te
 Mercurial
 ---------
 gunzip < test/fixtures/repositories/mercurial_repository.tar.gz | tar -xv -C tmp/test
+
+Git
+---
+gunzip < test/fixtures/repositories/git_repository.tar.gz | tar -xv -C tmp/test
+
+
+Running Tests
+=============
+
+Run 
+
+  rake --tasks | grep test
+
+to see available tests.
+
+RAILS_ENV=test rake test will run tests.
diff --git a/lib/redmine.rb b/lib/redmine.rb
index e76d77e9e..4c5cbdaae 100644
--- a/lib/redmine.rb
+++ b/lib/redmine.rb
@@ -10,7 +10,7 @@ rescue LoadError
   # RMagick is not available
 end
 
-REDMINE_SUPPORTED_SCM = %w( Subversion Darcs Mercurial Cvs Bazaar )
+REDMINE_SUPPORTED_SCM = %w( Subversion Darcs Mercurial Cvs Bazaar Git )
 
 # Permissions
 Redmine::AccessControl.map do |map|
diff --git a/lib/redmine/scm/adapters/darcs_adapter.rb b/lib/redmine/scm/adapters/darcs_adapter.rb
index 2955b26dc..cd8610121 100644
--- a/lib/redmine/scm/adapters/darcs_adapter.rb
+++ b/lib/redmine/scm/adapters/darcs_adapter.rb
@@ -102,8 +102,12 @@ module Redmine
         def diff(path, identifier_from, identifier_to=nil, type="inline")
           path = '*' if path.blank?
           cmd = "#{DARCS_BIN} diff --repodir #{@url}"
-          cmd << " --to-match \"hash #{identifier_from}\""
-          cmd << " --from-match \"hash #{identifier_to}\"" if identifier_to
+          if identifier_to.nil?
+            cmd << " --match \"hash #{identifier_from}\""
+          else
+            cmd << " --to-match \"hash #{identifier_from}\""
+            cmd << " --from-match \"hash #{identifier_to}\""
+          end
           cmd << " -u #{path}"
           diff = []
           shellout(cmd) do |io|
diff --git a/lib/redmine/scm/adapters/git_adapter.rb b/lib/redmine/scm/adapters/git_adapter.rb
new file mode 100644
index 000000000..b6b1b858d
--- /dev/null
+++ b/lib/redmine/scm/adapters/git_adapter.rb
@@ -0,0 +1,261 @@
+# 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/abstract_adapter'
+
+module Redmine
+  module Scm
+    module Adapters    
+      class GitAdapter < AbstractAdapter
+        
+        # Git executable name
+        GIT_BIN = "git"
+
+        # Get the revision of a particuliar file
+        def get_rev (rev,path)
+          cmd="git --git-dir #{target('')} show #{shell_quote rev} -- #{shell_quote path}" if rev!='latest' and (! rev.nil?)
+          cmd="git --git-dir #{target('')} log -1 master -- #{shell_quote path}" if 
+            rev=='latest' or rev.nil?
+          rev=[]
+          i=0
+          shellout(cmd) do |io|
+            files=[]
+            changeset = {}
+            parsing_descr = 0  #0: not parsing desc or files, 1: parsing desc, 2: parsing files
+
+            io.each_line do |line|
+              if line =~ /^commit ([0-9a-f]{40})$/
+                key = "commit"
+                value = $1
+                if (parsing_descr == 1 || parsing_descr == 2)
+                  parsing_descr = 0
+                  rev = Revision.new({:identifier => changeset[:commit],
+                                      :scmid => changeset[:commit],
+                                      :author => changeset[:author],
+                                      :time => Time.parse(changeset[:date]),
+                                      :message => changeset[:description],
+                                      :paths => files
+                                     })
+                  changeset = {}
+                  files = []
+                end
+                changeset[:commit] = $1
+              elsif (parsing_descr == 0) && line =~ /^(\w+):\s*(.*)$/
+                key = $1
+                value = $2
+                if key == "Author"
+                  changeset[:author] = value
+                elsif key == "Date"
+                  changeset[:date] = value
+                end
+              elsif (parsing_descr == 0) && line.chomp.to_s == ""
+                parsing_descr = 1
+                changeset[:description] = ""
+              elsif (parsing_descr == 1 || parsing_descr == 2) && line =~ /^:\d+\s+\d+\s+[0-9a-f.]+\s+[0-9a-f.]+\s+(\w)\s+(.+)$/
+                parsing_descr = 2
+                fileaction = $1
+                filepath = $2
+                files << {:action => fileaction, :path => filepath}
+              elsif (parsing_descr == 1) && line.chomp.to_s == ""
+                parsing_descr = 2
+              elsif (parsing_descr == 1)
+                changeset[:description] << line
+              end
+            end	
+            rev = Revision.new({:identifier => changeset[:commit],
+                                :scmid => changeset[:commit],
+                                :author => changeset[:author],
+                                :time => Time.parse(changeset[:date]),
+                                :message => changeset[:description],
+                                :paths => files
+                               })
+
+          end
+
+          get_rev('latest',path) if rev == []
+
+          return nil if $? && $?.exitstatus != 0
+          return rev
+        end
+
+
+        def info
+          root_url = target('')
+          info = Info.new({:root_url => target(''),
+                            :lastrev => revisions(root_url,nil,nil,{:limit => 1}).first
+                          })
+          info
+        rescue Errno::ENOENT => e
+          return nil
+        end
+        
+        def entries(path=nil, identifier=nil)
+          path ||= ''
+          entries = Entries.new
+          cmd = "#{GIT_BIN} --git-dir #{target('')} ls-tree -l "
+          cmd << shell_quote("HEAD:" + path) if identifier.nil?
+          cmd << shell_quote(identifier + ":" + path) if identifier
+          shellout(cmd)  do |io|
+            io.each_line do |line|
+              e = line.chomp.to_s
+              if e =~ /^\d+\s+(\w+)\s+([0-9a-f]{40})\s+([0-9-]+)\s+(.+)$/
+                type = $1
+                sha = $2
+                size = $3
+                name = $4
+                entries << Entry.new({:name => name,
+                                       :path => (path.empty? ? name : "#{path}/#{name}"),
+                                       :kind => ((type == "tree") ? 'dir' : 'file'),
+                                       :size => ((type == "tree") ? nil : size),
+                                       :lastrev => get_rev(identifier,(path.empty? ? name : "#{path}/#{name}")) 
+                                                                  
+                                     }) unless entries.detect{|entry| entry.name == name}
+              end
+            end
+          end
+          return nil if $? && $?.exitstatus != 0
+          entries.sort_by_name
+        end
+        
+        def entry(path=nil, identifier=nil)
+          path ||= ''
+          search_path = path.split('/')[0..-2].join('/')
+          entry_name = path.split('/').last
+          e = entries(search_path, identifier)
+          e ? e.detect{|entry| entry.name == entry_name} : nil
+        end
+        
+        def revisions(path, identifier_from, identifier_to, options={})
+          revisions = Revisions.new
+          cmd = "#{GIT_BIN} --git-dir #{target('')} log --raw "
+          cmd << " -n #{options[:limit].to_i} " if (!options.nil?) && options[:limit]
+          cmd << " #{shell_quote(identifier_from + '..')} " if identifier_from
+          cmd << " #{shell_quote identifier_to} " if identifier_to
+          #cmd << " HEAD " if !identifier_to
+          shellout(cmd) do |io|
+            files=[]
+            changeset = {}
+            parsing_descr = 0  #0: not parsing desc or files, 1: parsing desc, 2: parsing files
+            revno = 1
+
+            io.each_line do |line|
+              if line =~ /^commit ([0-9a-f]{40})$/
+                key = "commit"
+                value = $1
+                if (parsing_descr == 1 || parsing_descr == 2)
+                  parsing_descr = 0
+                  revisions << Revision.new({:identifier => changeset[:commit],
+                                             :scmid => changeset[:commit],
+                                             :author => changeset[:author],
+                                             :time => Time.parse(changeset[:date]),
+                                             :message => changeset[:description],
+                                             :paths => files
+                                            })
+                  changeset = {}
+                  files = []
+                  revno = revno + 1
+                end
+                changeset[:commit] = $1
+              elsif (parsing_descr == 0) && line =~ /^(\w+):\s*(.*)$/
+                key = $1
+                value = $2
+                if key == "Author"
+                  changeset[:author] = value
+                elsif key == "Date"
+                  changeset[:date] = value
+                end
+              elsif (parsing_descr == 0) && line.chomp.to_s == ""
+                parsing_descr = 1
+                changeset[:description] = ""
+              elsif (parsing_descr == 1 || parsing_descr == 2) && line =~ /^:\d+\s+\d+\s+[0-9a-f.]+\s+[0-9a-f.]+\s+(\w)\s+(.+)$/
+                parsing_descr = 2
+                fileaction = $1
+                filepath = $2
+                files << {:action => fileaction, :path => filepath}
+              elsif (parsing_descr == 1) && line.chomp.to_s == ""
+                parsing_descr = 2
+              elsif (parsing_descr == 1)
+                changeset[:description] << line[4..-1]
+              end
+            end	
+
+            revisions << Revision.new({:identifier => changeset[:commit],
+                                       :scmid => changeset[:commit],
+                                       :author => changeset[:author],
+                                       :time => Time.parse(changeset[:date]),
+                                       :message => changeset[:description],
+                                       :paths => files
+                                      }) if changeset[:commit]
+
+          end
+
+          return nil if $? && $?.exitstatus != 0
+          revisions
+        end
+        
+        def diff(path, identifier_from, identifier_to=nil, type="inline")
+          path ||= ''
+          if !identifier_to
+            identifier_to = nil
+          end
+          
+          cmd = "#{GIT_BIN} --git-dir #{target('')} show #{shell_quote identifier_from}" if identifier_to.nil?
+          cmd = "#{GIT_BIN} --git-dir #{target('')} diff #{shell_quote identifier_to} #{shell_quote identifier_from}" if !identifier_to.nil?
+          cmd << " -- #{shell_quote path}" unless path.empty?
+          diff = []
+          shellout(cmd) do |io|
+            io.each_line do |line|
+              diff << line
+            end
+          end
+          return nil if $? && $?.exitstatus != 0
+          DiffTableList.new diff, type
+        end
+        
+        def annotate(path, identifier=nil)
+          identifier = 'HEAD' if identifier.blank?
+          cmd = "#{GIT_BIN} --git-dir #{target('')} blame -l #{shell_quote identifier} -- #{shell_quote path}"
+          blame = Annotate.new
+          shellout(cmd) do |io|
+            io.each_line do |line|
+              next unless line =~ /([0-9a-f]{39,40})\s\((\w*)[^\)]*\)(.*)$/
+              blame.add_line($3.rstrip, Revision.new(:identifier => $1, :author => $2.strip))
+            end
+          end
+          return nil if $? && $?.exitstatus != 0
+          blame
+        end
+        
+        def cat(path, identifier=nil)
+          if identifier.nil?
+            identifier = 'HEAD'
+          end
+          cmd = "#{GIT_BIN} --git-dir #{target('')} show #{shell_quote(identifier + ':' + path)}"
+          cat = nil
+          shellout(cmd) do |io|
+            io.binmode
+            cat = io.read
+          end
+          return nil if $? && $?.exitstatus != 0
+          cat
+        end
+      end
+    end
+  end
+
+end
+
diff --git a/test/fixtures/repositories/darcs_repository.tar.gz b/test/fixtures/repositories/darcs_repository.tar.gz
new file mode 100644
index 0000000000000000000000000000000000000000..ba4d8d04c466eab54f26fa7fffd2927a44b15fb1
GIT binary patch
literal 8075
zcmV;6A9Ua!iwFqk8Pi7q3uIw(V{>0}WpHnEX>@OLc`kHeascc(2V4_p`%z1gWl?cp
z9fyE`gqWRxS_ufUHwZ4gB$sfK<>eR=aUxZQ;6SBPt0)%KsHlh_I1q7FidCVG(t#F5
z1wn17qxs$oi0iY~|K}fn|L@NOm-pWBjQ4r&8TXzL#stbp3{l9HC@#lT<47MKASRW=
z;Xova0P1UPXNN}Ru$gQclS8LN5RJ}eFi8;We?gWvAV!J97zBY9!TxTY7?Z~+x<jDu
z1>x)VN2RbBQGU?J;C<}RU^9UInKUZB$Nt>`Z?nG;ksvriQOLyqIS(3@%4W0QZht0?
z_QL*54zNF)MrV;A>VMAq-SGe1{wo6frkEHGGX%FLo*t8fK>HcEjQjQhzbQFGYC%KB
z-NJEK41sY}E`vf)DMC`hQVPU^q%aE6sZ<UypA((t#AHGCRAB9uu4w@PPapU6b<?lY
z)9X8!+IOkLK`>;X@Q6^7NJayQtJe=dEqDqBKN0hMc_dO{hS5`4j}RchC&W!lB55?5
zw6vVY#zw7HJ7wfkfJf?u2l)k)oPYmO1Ug*L$-I#GtBL8nek5w&icd6J&i8H`t{^ur
zEw{*pjhR0n?VCau86}Nc+s+-^FgxsS!3_D`n#bAK5NWUeUvH?nK`6k}&2RE<m)T1`
ziuOM~yv_d+A&P$(?|-NN)0rIRYyQt-GZ{Vp-yQI8{NI$gbpCJa@L4cuC~xt9HZ%v8
z#Zo#V0C0aA-HAo-hya5OypEH)B0w*FV;VDk=hrhyT@k?WK5_MO*~Q#IdLsh#ArTQE
zFDa-zZ*5goRdrr;b$LQ{b#*O?R+}WKt*xz3BGu=3)t5)t*Vi`&nKmk28r4CKwFw|r
zw5VNL)LtzuEt+Xbnw$hpm0DB1R#Tm$sa9)h(=@efHMKdK+B{8*8iW^ZUYfR?q^$z~
zrrKHyZM~hgzFyntqHXljHcrzvwrDkKt)@t;snTkywVGP328?L5+G?$~R;#VoYFo5g
z(CvX9_|O1y-8y?1{E~>2_pzn<$Uq9#=v#w0q3X!^g7%D0hboLb>{8~AHacApo!U0q
zz@y20`TkamPplq3Vuk)_@@sGBBgy+REv^R`B+g_Zu;n3#0gs(_cvZL?jvj3|yO(Pp
zhJ*D2-bfxVe^F9)A!&%ce#Yj$Ax5baIE;Z`Zti_O&p6Fzf}yS7)ML#<X7nbRsEb@p
zLWjzTnEBsSGQ5%hgWPzNece7Nk9XDobTIim|Fd=Pe+)L2)|3Cc1AGxo5QCwx1i}#|
z4!w8~Obks7UreG(2!@2H630+}42}q)SOilN)qp@Q!!fx8QmT|V0&0R+P=uh06u`uC
zTn;G}2)Kb|LI@FwPyvd_1S%*F#iIaaB`iZA!U7N~!x2mb3lNHlp(jodiNjDFM`U0I
z3Q*xuav7NU*joGVfj9hLDUZPfANBy~ea?SaR5o$`!=Q0`&VRZC-fI6i7#BnVCy(s(
za0!A@F#i9D$GhJDIBd?V@t;nkGMPQ`zdOJZgnXed3c{}gq`>5J5CINJVHqq&q=*cM
zlyVUs2V;ndp(W%hSEw*l9EC%+u6D#rAKO9q<_CEpu*@MK3YDM=1p@iNGBH?AV1z`0
z_zkFvF<453auJ3gT_ndtDtQbffMtXPU6}<!aUw^IlVbz{sa%MPRK!?}ObD_A9)*BB
zg-Ml=T%_wv@e75fATk642`3<iFF^&64=O-pN}a?o;7$xGqd?~2t8^Idgbcx*GC=Nf
zKv?%)J03znE&@EBXEr)Pp_5G~O)@0MAX^wGB*!4Rg21x_;;JAC$Z}n%6aw?#?f>Nj
z3ep)tIZ6&xhDQOKV3TpEL;~@3nNSoXArmCPVrZ&oh=+e@2*mS?fTr?-f_Q!*5#x2K
zQx0a4Sfqm#Dpg2OKpAWdgJrl12v1P(bqjL!04O{cPan^a2x1HFo*{m2!NHKbe-Olj
z0(e0op01%jydWqbG$_D7*o^`~!3ZIiPK$5XF(d-Sq;jA~A%erGMA^0T2w++z5Kkh6
zqTpBrm{@?Iu|)m{6@x<c56vf$%fuZe0{)UF$3v(HlF4zht~5Z1+Tsnv66h~%ONKmU
z0ty*o(ZDKL7A*nF55~cIK*Jps0s8I|xf~-yE^;MKEcfMs07a+Ks17s+l}3g_gLxF9
zAQDJmr4pLj85&)?A|o^b;wgak1v+*w#!U<%@Mx$AGuiNAC1OJi@DZRkBvOP*h-bzL
zL*~Yypf8b&QNY?sgvx}GovsMFfRiBlc^|ZBEG$qFWQa?Mh=6LP@>nFYGhP#;5Y*X$
zCPJYgtWiKkh5>Kxm~-x!6jEMAwC!x|I#ywbQXvO|0Obnh(0m}V6vpRw%t25`mlB0b
zB~Subt8-2#9Er!FiC;iAoeJs{O-Qi;`{+~yn8vXf1WJ63)Es3OAzP;y1+W`p2PMo`
zfIu`KB7T9m3JItSBXvw|I;91aJMSWaQKN02Z?0?DF7Y`lK%2PHH715SMdHYFCBCfm
zj^)uhQ%{8a`NS9nWI-h!DMoNx1q_}+<#Z>xZXyy_DUg|6O2cC?S;q!rWD*1r(2=3M
z(B>rDPSJ&te3gyet0n>LI@S~7yv_&}K4;_nJWx-3Va%6g2h0R9$a9GZjYcx5%&xub
ze!AlS8~Hy{H}cWG|8;!-Wm4Ha^<THZ+w70ZKw1F<=m&Tecpv-I*;L~DA9w-iv43~K
zyX>#}06gAx{=))3|EmA9Y4o1&KivY;J!L3P9M=fsQYng44Cg386Xh(D%PD*q8#@-1
z_*^Q3%B9m;bQX6eWH_BC6oOPm2RRdDINgDcu1qINPq_^FTMA4XgP`F1(s~`4zr|rO
z37nvgTH+s}06qkYYZQ1D0VukIrC1n4VZKCHE_T)ie@B8%=MW^G@ACN$|8{ra*#$Ts
z+oJCWZ}WeJPDLN44tW3k&tlQoJ@LOg;9d5A)%_hDxpc0h1BXo$u~|$Zo9#$tvJjY$
zAdXbNBaP2uz;v1bVX+(;0$3=bi02VJ-gW-NqQ3O~pFtx=I2?LU{O=AJmD;!C#^`*g
zRDO+Z`j>38_SZ#;9=|#EvksP@*?0N;YPM_rY#aL}xzwmOA!C(WM(&znzS<`%_wmIu
zIS<b*iby_f*|O<yLbFFA*P-ZQE(sMe?v<(!rzGFLbA3Z|_>ZyUg=A#nx@6eQ{q~gh
z>jS)QmO9^RHd*=P=%!Im^zt0e%o{T%ygVS>;jSII29BHM$1cr^2>)})O%c)($aQp^
zp1#fQYnI#MgVCqdw{y!PpCoO5)NrB2RT1vEm&?hDt)fI0Rh62>{^?t{Js|k$r8&i3
z^LN>xgJ~-#z$q)7smH@6on&mnMlMUw;cVTtB7b4QX<=r5y!A4=#iOwCUg%wGc=$<P
zMFY87U>tEnJa*+!?|E}gcV^bk`@}Drmvdpl-Tvh4!dcE+A;--ec~N;7w^>~qky5t)
zY`#IV^$q)mlquvugVbA|OE*+_U!0X+<trq65B1+l-jW`+@y6V}XU}FVHq7#(u1}|A
z3><07-y7tiWLG1@_lnm$7Ft`LW$rOYiyl-?D)2$Z&|3XxY2yc&&iO%ca(SxljiIZ)
zGp`z(zVX&PJLH(kwACs!_p)C|Q@P~>=C^cV&ix0oMk_}m1!sTjYkBe_(|EGS+%qGm
zR>o`+4Ry0ymeU4(AHV639|C6Yxx6yMY^zy>Rm1Q+e#vQi?wFK8MoXaJq%)b526`1v
zzGN~3`b^NIX-s~iIruQWy-&<$r#kBj%6IA#*W0tlcr_h0U)OK!n!{7z)~vb-^apvD
z*Ay(hw{^s3e&ykZUZe%Cfz7jgW41IZlNf=1WecRriI=nVH-*#seD(X_x#{yr-up>*
zUZawB=Ui@B=33Kla={;I>i#14+w*S^8ItE>Bul~ZySsX?sjIk_`gwe+^|Vrh-Gduk
zytx+#oSQSK2+}Sn`YLxx>pr$)YoPH)+g~b8_bINf)n9}!&RnBEI#t*=dU;jg(yP4$
z@O18|GChVSdAwQc0K;F|2Y<TyaHEw33*CHfSi+p;jvVU{uZMv{^wRnd9`t)^Zm=Me
zT{fwFL7Yly@+@_F{LiC|9}lT3*57t-dva`Ruc_hl*yEVIU@UB{%(J!5wDHu^t#QJO
z3zhR?=Ox~`$aO3~!X4S~*Bclq@lexeyZtj{)sOoeDm9-mvtPzxlIz38>O)V(J1lGt
zWLvNYIc-U8a(i4HawElsZ02*aPf($ClfGd<&H0Iu3*;k=g8iC=o(U%!d)*rD)!=kL
zip9!cEZn1z9xcH1{k*T-b2iKT%C^O5$MKp~y%y)(${C(xR`p}QGFsMyrp83l;7@y9
z%ezLtb?p4!mWx}Dk|&2AfAV|$2(|x^r=L7?4CU4K<J=MUzBI-=a*w(&U$JwRx#fi~
zEgx@a|MY5c`ze<-Gd8Rkqj^$7xt#C#wbklzDlPe9{-~rGwcJPEaKDGhj>caSPFGl5
zuc^s0ioPAf8NX+0@sg(1ZTTe@2g@J(ZJk~C)#q(KYsdESH~Y=!(6^$2v#sO4m4zJ>
z2krK6JaWRnU%!RP>SVJ~hJXH;duU@Bdhv>0#ri#~ns>0O|M-jVcd}wc`%~t(=WZE1
zJ?tHM&c$Q+<u8iA+F($cou0p1bM1RoOw;waBfCcQ$0jC>tdm6KWa~d&P!aZ6YazDR
z*G{Ru70Jmt!Acl+cz<EZo{W<gGgdz1uRr3H^|^12^n1M#SDH>7Dd4!v98YD;v=fDU
zI2nIF;HQdpnW;-C>)axs#g{XGGATbQ;biAuh%YI65W3>D=Ik+jP0>{K7rP&Qb5!-^
z#-<}a%buRm+kK+VDudfFu5ZE5k<%9T{$c2<nza98_1^379{C>>@16OdPUCYCCY{S-
zB5W$m;Zo_2OukS=ry+D2%y8txTmh4Vi2iZ@r!l(nKa<YV<$r2V{_hrek^k>aoeuK9
z*#b_DR<UT}0p-B;+u~Q%nB;G?mL`ue!6E{UPdK*@*qLSRx_Zs96MsGV;;d)z=6h7L
zgj=qa?EzMw9aUPGCq7MVPP}hr8y0ix413c$^&bAR>VpRR&m3M5VUj8?l#282Z4W*k
zUQJ(Tw8iTCzcwEoQ~QLOE%M)yS8n`l%`ZFQgL5d8%x_<dX{6#K=G0M6e6w4cyjy*z
z=6or(FPzh|1uvbXy&3gQyD+Y$m@&*{QoxWfX{3p?SVdLMH*+d(9y@*E7hz%P_t=q&
zE$U~Z=Wp<_@jWy$vdx8Nz75_KA<IUtojT|8d(hZIDfUO9--VSKr<aKXe>%8i@nhi*
z>{53BX{c-)1;50jX4RL4rDgjl@990JJ8U=@rMLCe!PBJlg4^lh!INm&xnbF+K5K_I
zcrLXM^SC3MN#8rwW85G{{W0E&;SYt)(unw*@&kq^gu7GDT#`I1T9vq~#H<$CcUq3;
zu~+w*dmx}~!almw`Rrj+Xrs)Ph8Lz)ZnT_|SG*(BFT*-K&wGfM913n7w&qY>$))T%
zfkDaS6xUz3J*v56{l{=G>gjKOArD>SX?1Cy-t8j0rRLrTMn3brY8t%4{mKmYU~aH`
z!+}ScTQaxe{p0WJC+=-t?PHnQa5!}C<TMfa!q{7t1I$zV#@Rb=t6SpwX<#Kcd(0$3
zB|kOrs?}xN3nmK}=|}9a`g$ZXY*D#YvD2AhHLexj?FBbaZ3(Qr*IqoqphY{sxwYf(
z$O!q9E93*VtfSA8hRtUP1FmR(`FUc!X0d+QDz_790h|NdNjq1qwnv>2e6aGq>BQ`|
z>x<T&o?%wP8eW-?mpI_r>jO9I)ea_)Yb*P1w0>5mi@U+<?Q7c{ZS}=2`{*}H&GZHi
z|5^F%fbqS9&xZUa8Et?3&Y|V({k2QP1_jxJ46Zd*W;q|<=M%rhCo`wPrsTYG-ML)b
z#rlIRy+mz&$7b6PU20EZn0rLXYHZ5(r<7dxT<-`qat*2qO%DaGv_5iMJ#Nt5_`IMp
zr@hnpVIF$B4cjc2eR}hV^;zxN?Z>|vr6pl^Gj@!rp{Ps$n5pRFAnh}!%=o->;^$vR
zUt6Z{soXPDTH1usYPSBXy)%Jp;#dQ?S`WZ-UmmDf5D_FMAt!xm0Rg$Z0F@)^Cc6oN
zgoGqSPC)?=5VeAefGvm=6hXWIMZ^mcFI2ROC?Z}cic%<o3clS<Jf8hkL~ML*_piU5
z{dQ(&Co_EC%+Bt7TRKL$+jr~2Xufo&o(Cgu?$QM{_leurJbDnnV`lQEEex#%Ed65+
zN3!>EuioV)KAzWg!Q)=2lDq0dX3MrG_AxC>b~|oqI=N!aa=U&RPd859AILjIJDjec
zp*$+NyYk>pbBA4K`YB7A3Szr1*G>{TOrYLLioRQ3lb|oTFrY@wqxL^pQME%?`^4ru
zq@GX;WHk;BT5)~N=$f(gTeC}?v?F6GM(%hbq%Nk+=wfO$Gk<p{8?|q>yT5$UEX~Fs
zkE`y3y`GQFZ`z{y&GokX&tBbYiWjGhDa)d^R#$hnbk=5H7_Dbvf8665)8mZC796OQ
zzxQ0h($_{OE_Oexb3VIy>eTR{;BHE6pfGsJp-8FykX<vmGsd@8w;nHzpV#VUb$~WG
zB%*Mtk=4-3-F#fxPkwPfco&}fMLjz2QFr3ATg)HBisy%UUCWIsmu4JX7QN9xS{=!#
zILOCUEXs)3RF&;+=XV`gkzb;c%JH4L@OEJLO|z#LfIIB(x6v;1S`VKbk*1p5Z(X$6
zu_M+u3va4T7Q7t0eayL4&u&HSW!xy}P-CQ>a|`Ye?|%{&x_9#YurXD-UDH~1^^PXA
zH@_f67dTV62S#r!R97#;$LzG@4H`3LwZ&FWaa4Po<*3Y*tcci=kL}iK$D8w4*oNdv
z#XgCTD%*e0y`IsM<Iws1?ifkGO@5W?U)PL(HofWp$s~FIPr@^aRQRr+N@vlDWEuqk
z02)AmhXQc-O(fzec#z42@O1L0_5X$>D*0XiPo*IJKbeZX|Dh1x_5TU8tOJhWH4Zs6
zsE0YHU!K<AIA+?JA)z}%b9S6Mk!rH&u`fT@E~f0NvRYnfLj%K~&5=InvWq{sb9U5R
zCCGwsJ(b1J<!>j~2Bx^|Au+OAB^#hK<)W7U4{}70`tjKNG6$S{9ACTDh8U8uVVuP{
zt;|uNXPc5?!9d)JoTmP1*2`26y*Q@g5OaDk80MjQHnBB5S<)70sF7lC{-d|5jjgwz
zm8f>GM*R!UhRIH}usvFJTz*UKvHQvmMY+tPxaTXg3pT#m#!&YXDQ$Y~6eg~A{54<m
zM#Hf4{Nq!1$2LPT33mtGFXb3W+b?CDf%4QUg;)2LMT8$19&+#S$VZLm=Rb%atKKx-
zx-!dJ=(Lp}Tz6wwd+KGe)~{Nf%{niQ$8@{2b8dYfylP3mF5T#3W&^%%!+jxoq5tp=
zfL#A6ECPkd#1lwl5WoWvL<13XKxEO#EIdFav*-j01kwS^Pt$(_k@#->PbMSde+nLZ
z{-YS)(|`A;{v)h4x^Qig!57p!myRI2Dqpj~X=%q3L}u1b6Pj+O6;;;dKW^q`wM9OC
z%w=V$S{N)Y2@}+vJ+!%|ilEDOov_*joHP4LrS7E%^EMOC#TH~|Z<*V)C#de=V+jsd
zx4*1D%wp2-mMNU`NtCgR3&(CqUUt~TKFmMqyV`w2_xUFj6(rR;n*=O^&S{Su9eaW4
zIEbsxA(m-wtQ!bc?JS&&6R*8fr+n=}SiQFL&0!DbR9=b0>x2$Z*9}i`)~9Wnt5XlL
zS1nK~xt5}}>cY`7N!@9?hsu|18{5uai_5@oKU;Xa;PM2|j<otpJvEbDN>S$U0LMgK
zl{=yga9M`S^b*FAWnC-WHth|L=R=p&XS=k|P8TG526H9)C)V#tBzsnbNzCF(Gbj6x
zI@vJ4L*r1a=b+=-Yl4T4dv&zXb91*xjBWmeZTZFG<EJ~*Jn0t`+*O9!JTx`;C~a6o
z8a<@CWJQh6Mc*|QrfV`UO6s6}RjRME$WMyF-E-D&r_;^%-4eahE$?!@QNl`X48<F`
zJQ$nMy~yg|W|s?*D>VUw@@i`VWi@j(r=<fBRSz`L8BojZJb3w3avpvs+iAh{drO=n
z&)Z22wmSV7PY&Fzy*^{ZAg$(KUgu>JLp{fxX^j4faq8Ra9afaNqSoM6POSM$+YL>_
z8n<~?*rftCQ_b^_p4i(zu?;$@_Tuy~?~46_Q;s|}O25J_@=j<E$z@dVv|`&j9Fv4<
zYfFwkDm|+^#n3BIbN%UCx6>?+F!re4v+`1MaQJ>if#2{V8>d@4MhUaHcb;h)b(3rt
z(${Xjv&z-UKg2ZhX#1TJ>344a=0SRxRCc9S@Alx%t5;^doc&VyqP<nKbl}%jhkqTt
zu>TYyRc`++K{lR9g&;Zrl8AJW2oXR68>Ax7egHPerhz1Q0LTLApE~{{ynFsfu|(eg
zg?F*}ABFJF{_kJs>USKkVgG#j4M4go(Vbw%x5?0G9DdNO{8T$l`kgb|IBRId;$4x(
zraDg48sByHt%t`)9P+T)QqYgHuHGz1Z}YT*5r<>WnQv?4rCgs|F~@(Sve&MV^#<!J
z?jGr^w!9T-qwg_;5%pxXG%2&D(>n3Km*=H9-w{qnwKn!oKcb~HGNQb^IF|lgw{FET
z5j+ljaXxUcF7NQqq0N42EA=nlA3u?l%~EPED^4vdKCIRlImLHs*np&z5kO7N57dqv
zW>jf$p@tr-F(8k2TlHknbY9jeLLScuczECp|CuY4hs&)m+R|;(obkNj`B0UaKks?b
zIC5J5{kL`h8AG|xq8Iv4B@*8}|E1&UOaci{gFq^gMW;|8c<e_4=}abt3@foE3!(yS
z8VmeX{U?6#{2!VBrC|E62;S-chBdCv$A8dR{<Qz=;|BZ7`PU3LE=ymeK02;pe-gfC
zOENd{<{r!416#^UHZ1s$RknWJ+K@s$uV%+ZD}VAf5yX{#yYnV%WF{AXj$Jr$6Xb!*
zD=jIK4q0eNUH(mS`O6m%L-r2#KD#TfbNTv_+AQ^nQT3jrKufcbj%~&U-xLocm5&Cs
zvW_14Ic|KFT2)|zp~L9`(L?;ar7lNZg{R#^Jn<T<ZIo%IS$d;3zj|#~WuARvht8fs
zf<!3+Y_c&AbXfxi+5|C7c1)s89+x;GXGeqHZ=*tWmJSK#x8J>dcb#vSb!fzim}uU-
zma92IR+rAx400BmN)k1@8C6+N8;1PqeV}?-|F7E?UxS|XUkC+&+&;R2=t=)!3-H1F
zKU6$6|DzbfR3iT7PcSk1!k_BD2x5P!RRF#6|AoB&MIaL~|6hvX<LwUwNqhw#t(H%r
zNBd8pe9->LE@uA~!T-L_{IyGip=ds?|4eQGfGh#(+ckR9e+r5E!TKL69=rcj3`T}F
zNE?Ts>l_S45C;ktimg<95Z`aca4>6z0}^mTk*$LlvK4}CG-jGT68H(xbWXDzWD+D7
z?PTY1(X<YZXj+L(a(^qm5m8wfz?WUo6_uDW$wnq|WRinS63V1msKn$8k-)}v783Af
z<#v^o8*W?l64rCjl%Yg4r575YKMDOsp<FZvFGn;7KiN4>vU9`&Wa~B)*#gMM8qHT$
zA?~so;mhj4RaOUlc^$aQ>wqiE!cmq76bvDO-F!PF00k^0m^RZEjpLz`oeL@nLr`g!
zCoKJC?cam`3q*ar`Rmv7^FK=h@x%3hWIP_ze?<W6KibBB(0^a9F}k&23Iq~lSMY8R
z-T2^Ge9&0M$j}VuFL<*UOaujtml(?aY!HtNAjAfOc<>R31;90oEYuG%<ReZb5Z?xn
zp|d~)0mzDJAVADR7tf0gMF8rDLE;NX_(P%qh=(k{3WD>;!6*5^S3|Dv|E2)2!U;fl
z-&n<TLHMKzux|2&3+0{|#HPmZAz6g&TsN5nr<IDioB;UJ#wrVZa7MEDIkxiniPE=O
ziKPK=&S8d%<cHmC-=th3KO)naw<!UC)XG>pqxB@>qSinJ`N>mD#bUU4aONyjzr~A%
z@(5S=_loNi2IuMP6Y<_59CE~h3%>uWCL)GHBw)WS@-(-FZW8pTp$BZZ5@!e!LZbI;
z0$ms921(wOSQz5X5-{GgK&YPsct>6}?!G~MrWm$XOnI*GeSv^al0a}ufaMFlmp4lg
zz~*v%aHc!~CmdESNsxE~TFW4WOeM+BH<bV!ak#s+gBu)aBrm!5f=LWCI@|{b=OaSx
zq^W@E7Y>BORx?~I2<O570eOB%m0L(4zR-dXaCv{BiTp?Nar@5~NWi{dqv!d*Kdk@8
z=KmDLpSM3(Ea3(~Ut$XAGuD4niJ1R?h0tUBe}V4-^rrpM^&bQ({10n?MewQZ-<R(J
z^xFSFkw7G1{{IyM=Kud6<jnUo_*DJx%l80!?f;*Mr&?m~|0)E`|3BvcALIWJ%>Vy;
zVE+IADtheyzrgnZdhh?ALZM>M{}lq}|Nq}jkNW=wz6a3z`9CUr1~&hr2tK*}`|v%0
z-uwS25iGI!e}#bg|Hu6QWB&g!|Nof(|9_|de+&!^3=9km3=9km3=9km3=9km3=9km
Z3=9km3=9km42-`w{{;gOQ;h(i006{M#a;ja

literal 0
HcmV?d00001

diff --git a/test/fixtures/repositories/git_repository.tar.gz b/test/fixtures/repositories/git_repository.tar.gz
new file mode 100644
index 0000000000000000000000000000000000000000..84de88aa7d08d0f58ba6f07bcc4b876fcaab23a3
GIT binary patch
literal 12445
zcmV;OFk;UiiwFQgc+f`z1MFQ1kQ~){UJ*xO8kNi70_?=VV|JvS*`1zi=h#Dg=@yr;
z4zNmlsHgk&Orx3ZQFqU-25IA?IDL>n5z3?pPGaK}sf2PRA&H=jF(lju3RlGmhJ--C
zF58I-4k1pA$^XCidZuS)R}x~i5_lS~cBcEi|NZy--v3^&3x+#m(~9L7u4UKaT_@s7
zz?I8n@OLtoN%((zS64ET%cc{#bRw1RN+i?$xpWuFbS=YGbzH?Jr0c4JMeVDpxmdfS
zJ%68Gg=YKPRCnSh-~O5Y{{D{rPnP|QRMD2w3*No`v*~26WB-$D|FYt^)Ltt4XVdA$
z?Vm}u*gu!;Pj-<+$Nne$$|m#KfsCG~nT(Q8WbzqB%?^MSv`j9QP?JhlQ3rGVT2kuj
zTpz@1q4;-|!jgi3<H-N1T(Xn@PlEmPwqmM9y0jSZIP4Gqb?ko<>|eC3eM`OoI1c=u
z>EOSUXn&<rDb*^9s}|+5Q#j%HFPm$@f2l-&F4w_-%W-vI7|$DK+$l=kQa70}2|b{c
zD<w+M6NsbQM#UwrMPO1;_Yt>9iE5S0hD%CTft0D^C<RJfWgj(3z6KN;u0wR&DiZ}L
z%4NkUd5vRipq)i;grZd~X)r2~oHN`aF)dTRn%WitySP<{C_1b{h~YR@!z=(fK89^o
zY(sHrodrWDNI@}O2ibL8tK#D}Mj9g;4w5L9tU0P-Q>sBnpI{zE-6(m?LL*bjgHqh0
z;V>#uQU;m%cWej(P_^n}qnISc2!xgF6lI6H)r#a&$0hOs5)5tLx^rg3*6kw9_<$H<
zL9%9z6hInBY!o_}><fm*gY(jmbRy%wG3Jux|0BeIGM!AfuKzO0Y$yKTFYymiLe@h>
zK|JMa%=JYZ7SNVSiDDP3Woo)nM!{6dlvq0ZjKKrl-J;@>qT(zNi2m4JG+O|PMe@bF
z$reCmp?q<Ivqd-AWg<1u52Ku?FdB}fXc|$-4x?aFO}2Dh2JMy%P$xXYhCcQ0*tTvY
z6b99kS@34eAQQWGZrQedX6uHHm+d5nhy(1)Ch2kF)05#?@91PC)*Fg9(H<g`$#|tF
z0^|yi5{SItA;IYokPbptN(RZHLxieD3%;;>qoeG$#L_uP=6Q~a*`GQ@t5!;eifV5c
z!2!8hS_}rs2#^W05qqXv80rxNO9A3owhMApO=CZiRZk*Hdg9Z2NMNcriT}p6o(SXf
zAY@Zyb#zUNY&bF>0p?9fY5rHT#Ia!hhp%1?FGu|^)!&N$bGc-qlmAbh{EyigB3$K3
zo~KxaI8{}J6r@*6^~8y-%8GWpsc?u~X2Bz~&?z^b^!Tq<G{~9D5&!+L*zd&usg3_C
z;3SF-NRCt#bsr>whSLz;vPsneNH<GuAfi>vdE(lN=~Q6Oc8(_%AdU>G#j>T5z5~SP
zjzLHgY?*{8liz|xmJI{ThN)Yfw6QetZ&SIkkU#PDpG1Fq{U_Cl|5GXcA;Jv3M&<+(
zQ1Vul-Oqa~A(v`E0OIx(tpJ_SN)84LALj^_9Dkz|P{~>1_+L8sf3*1TPi0bV^`BH{
z{(s-a|B>rJrd2NkIqfwa=z8oKV3GI-8cUx6L~#TD=ah^>(Jj>oz!F0@KuVV1CQQwy
zbL3LMI+oevkjts9Q`IGxV+ur-T!M85QnRYWFkRcysw(x8o@rs#YnCEhGD;}iT+x6e
z0~m{ybtX!VS9(K`1(F-41`1SM!!jF1vmKX%9iRcivz-&`fNMyGsDGQz$^hE{o5`}U
z;FgUO8%Sz2uF=`JSuK?$(2ywwur)}f%Q(ORB3FofDRfd57+vF?WLcsmhf0BNa@od>
z8+Kf|ZTrPTWUekuMaZTQB*ZO=$-i82Yak#6dsCZr2kxL78Vc>C@oJWXRYAri7Hd#G
z6d9iwrr{b&i5O)BlrbqVB<Th@Bvq(gVkIDnz*Vl1kZx5?Z6>d1WP~J!8@Iu#SafXM
z!IWo%%g%U@unHAyJjdFQY4Pt)HBW%#3@g1IlmhTP9GWZEqP$rIx{l8bO97B7d|`uy
z2)4!k;HMzyj-4AeZr@IVy^|)4v(N*w8(f5WgJS_hPSvRxs$qfu^VyWutA-Zs-gwZY
zh9uma=gci2HAqy~&SDIct!AT<Z<K{}=u<V0+DZx4M#4;yLd6kIu(@HK%8+Qqf3v1I
z^gR0)LIr{~ympi^jslhsO*7Y%WvqlM@o=m+Lh|v+Wav;`xR9UQq>#m=2i%69;?v{f
zM4sHyM<)BilUiRS-ssKwVSR~A7VA&idi3=z*c8jLeeuOxt3|6^5uX|9Nhicx2RxSy
z2Ny^lL2%BQi0C-)>pwl|^pZ)pjRwyvm`QX?RJ#$&VLDlyR(Q|a(W%H}@?dtJ9GV_E
zn452Bu4>xUu}ZT*uuSa&W@A$?8LHb#cHU=NoC?CeP#TtcI!n9d#eX)<D-K--{FemC
zmu<y=>CXD^WZ=K`R;6Ym${}GjLQ-Hha#7VZEV7<#QOb&GK`W_J&6f<PID(l>LMP#e
z#zxp?5F`e^uM_IVot>0`7XZZ!btLFJUK~mV1)Si|_F~F*YUR8I$pO4iXP{#*%=D6^
z!XQAgF;+ChIt2k5Nc@~~)JJ-3EZ!TD0>i@+{$j8)L58~#a{$&r%mtGTwe2cETMPKJ
zaTf?$Q%6w|@LgujVOuPBX;k5vm4O+;MkSmFfL!>5#|h$BL}Y+CEuC<d0OW3U5Rq=X
z7-0@?2;awWjIE9!rUM46@zlsR7<u0@3D}%5%o+ZbX@{XX&^)X_Wr$GMt&LbFWs~VN
zZw5Nzdf8jIgM2mIY@!tuCaLd_iB1S{7iMM{M0Jt8P0Q9SiVzEW+h#(qDno#5pA;TP
zNxsVVGC_kt73Rx|1uBm*WBO#L0QY>Op+k*<(sTeo3@`goGORP00#W6N<t?*Ro52n<
z$rk0*busNZN$8+(*?HVH1kAG6*FCjJ_r|qA_lB4I_~1L4KFXe^h58$Q-WaXHBp-G!
zg9UAt<82^R7`+8er<81P{u-%PWY?0hFv^|QGkV~-3>M%aDuPG~fC2d(!59j9ROj?5
zu;HMA26_)5q!y9@u$tJu`HDS>sbO)y>=aP3y<Q7k@bDE~L+FMNv5~wG6=0bm_SHU)
z5we$+3PUOZgfR(uP?7biz6gn9`#>1b-N-0OB0LGq6Q@!FJQANY<59t0a*92|6$<i5
zOSBB|(<9kJ6JcnG6AtX*ltU>d--5JLQxOiL_=*Bl?|`TwAO8p0fbuA4X<jtt03USa
zeQ$=;_=GbM089nRwQ*x!YHJ-N-T=udp+eRSetPOAY<MTK6l_m3-o`oxz3?BY`#oNg
z#8%^uzeb_xv`|%S&1p){)bZBGvv{Ne;zl^3w{G{+_Z*_k7!rnvvFv?1hJ@lc)iSgc
z5iul5q?c?n+3L1w5&#d_=Wv2SA$YX@iNz8oIRv%BM?uXNP6|pvF-#Js21XsMm~E<J
zZ2=q#pt$%Ji7h&AJz1-u1Kg7}wWbm3%;3;`UseN~VwHwvSWK@b<uQ}58juSb)0e?d
z{8%<}f&HmsmkdnR;EBpU>O_GXlg_nqq(U^heC2?8VZ|Co09Wy@QSlD_c+9af5HGG^
zj(1$!U`jA4?kg*HjpZdF0TyZ4bV^|s0A_&2eUw&E5}N=OwiV?V=onmWS3<I6GmKwW
zmRdo{!WnpPwWyc{%8EuzBplK6qNrH50N-VyTJG<>fp8pND2ocGQtD;2DEObPsg_3h
z(I#(Lp)*{EO1z53sq#e3?FHJH#j*#Rhxg&M%hpatp=z@N7Ce;dC1(Bvctu$Zrwn{u
ziRqtJwLG_uGF8m6)bCYa_L<fkxOX@iA+cBt7j`Y4hWVDM5rfE=X*t7S!rc%+1-5K!
zi9Z$e!0Q=qwPI*>_wjLIE9m~Lvs$9izFP50SwdBy&nWY5b}qml)EpK-V3U^UVwkR(
z4Nx$;4fvM8Yix3~xN{Lj$BG?Vj(4q43%!Vtbzlq&qmNspo<V$yWCV~EPoa=eAc7f4
zk;17XX_YCo6>`;MgAoSbGTB%t1P@@sj;CFUD&hq(7`If5wg4v9dx5}~<t7=yvugEO
zR7k+B!9v1Qx=l+gu*JbME{P%vQ=np&%pkBZnppQnE(9oN_|lDDwb}3@<f1~e0$_^4
zF?sj~3IkLqDiwzVntH8}*Q^xXrjFQZ!Xtdl4|%F-s8YIwx;+jl;e4UEJSaqjg6{{g
z1YyateAFM|^sGl*z{9u?DmHz_R(L~!p7@g|6ALzqx7=Hxjqfi0s6eg$L)NvojQf5X
z*JN8mf4e+maeY%u(Jp=zl5wW>V^Ls3kseBrq=_hqfDyi)ExDSL2v6k`EMD*=scsyA
zBrig84sMFbfxOYkNvzL0)<-u?7O^<%xr;=d=<7||$co6uC>MS;Fa$6}c&_$lQZ~+d
zMinzaYi>kW1B8vKn6_kH4!qY3dLk!9;e(C`DJFQvqb8tqTPaX!UE9Drae^*as*n#L
zb)yq6xQdzP+GI=hz>(HDtOZ|ufYvcDKx9Wr19JNW1l)qn8{+wyNwqU0mcubVw~9gd
zw9hsNyd<!AD(uwhmbL!3bVt9AW&bym>2Iz7Wpn+RPW|sx+W*a$EEN_yRZ}q`6L2t~
z6vWDhVmS?fLi+|VtRSc{OJzJXCW>g@9`F!mJGK$y6qTfGL3U&xU}5o|PmI+Mi}9i+
zLSy(KvkN{jFORVt>=Otci1kR`vKSb3C@j3^ij*OiHqqydQVEl?_jUlop8PEW;yWIP
zFtP@jTUV+jR$~F6WtlyQU1QC>@azt>kHQIShiG*XHkN=1KK&jmA9bj`1iVPxP++xk
z87Dz3AxXkhc!?Q21*R7GoC-?dEc|nS(CfHE(WzVGyXIJ^+rukqVxbfyQ^Ukp01a+n
zL)%r8yOr>G4^Fa5lgCCZh($NABMA#!i*q`M-@K^iRPh895d*TpkbZM#5=xM@Al4{Z
z%jJO&T$s^_*RoMQX^0^-5hQ@2*bUyh@tqTC6LS}ykr+C{sO^J#c3{!d8Z6>%6S3?B
z<OmM3NL)pvHpe<zZ-3jS?%?sq))yK^P=v<e3DW|f<K{IiQ>xh3Rj}y8TR_o!nIyTt
z$9Hba*FG5W8Nt_=DZb^-2&mgcEBQ~!4tuW-dASP<-kAO1Cb9=I&Cz_U&2YWFz2tIE
z-OoR#0l<t04rQUas15ncTeS+scOO9x;Ux&Va0Z4YD*i$o2CF2+JIjw}Gx(BI!CW2V
z8fdr}$eB3C%O@7^J%ikgaPnSB+4q3iSXLERW^&4|$8yBKA>;)^)Z>YDX1hXx#$U4N
zjdFP+u-58^G%h#gakvSqW*bou&oQBc;!}5bg9cVVh4iiN9V8cmB3!#leL@C&*2DTx
z>!?u@Y8o}_)xerECtG%S4kV20r@RZa(1XDM6wx;oa)`(dnd;$3XK;4#5)?nfZB<~U
z?$#5Tw<my=Yy<uo9&XkfHxJjF@C2?gzbfkSc2q@d@a7AJG5jthJ|dSa)RDzjyVe`>
zZNX+g5Hs8Ytrn2F-nd<G{^;Gv-l&(pH}P>d&ZVt#xi&zp#-zM(hlLE=)^90fZK3*}
zgzn}1PM9@Tl_HomU=nu3zLny?KNgXi0)^p0HcJdaEMm>mWcd)wL>w&g(w$Dcq{3>|
z*rGYLaPI2N`F4#l(QXpe25-OP{rvuqfbPri{!cEKZ9V^=$aenz*QvAq^A2MA{Q~y{
zOjjJ`ZvbZuX28<?#BS5-4~s~Os?rK3X#N_JsO#eb!S^~*y-3FcQ<Uzo{H{2N)9Nco
zo<3}=S|}37)eL+yfUh`^<1#Kg+F&k&zZl=6@OTr*RWAcWYeh+C`cuiQmdy9l^dQaY
zS$%LIolfdXCOeqUYMQELl~jUc2lSkh*V7c9r&0rn+`zz~o=N4^M7p1<T7NR18`KAq
zY0~!h^q9gN%8tRgwviVR=N<2L#I6y(QPuQPI4iiZ?ewsPI{|q^F(bHIlDcCgUUh6R
zp<>gxW~p(0@*2K0kKwnTO!18jsV)BTC8|^6?|-H`fB)xX<bP&=dO$5zwPmaSCHk{%
zfB!3&=$!vsp8U_sbR~zavm5|1{6HLh5MCf-DP$xDt(u&p{$2yyk3}7dcQ<;vd)PLP
zNM88*C(E-65o=^phCEcNVWwUm70DXmAUkHq3Mg1WA_dFRa7_z1jJ+GeM#T+BNTQ}g
z!cFP1OnkK%L~^)`g7+hs*L!1oEM*Em{B~z2;mGmtt1xseTl^<-t?z$jv*`~0TbAp%
z3ss#+`XI(Xp1EG~F^(Glsn);$kVzyvfB$b;E?A%pEwD=I1jess{PSIvWsd)3BGvZy
zUo)Nk|7E%MV4+|N3&freVCh70XJHY5+e{<;)PISVEe&6p#Immx$RolRUpg`L0g8Vs
zk4v;A{tM8@UjNDF(zzt!{{)`@>C}Htn*Fgl8()6=XVRJe9IO9iQXTuBZ2RLsa%MnF
zCDU1TFiTT;HL21}QX9yn1`|5XYXgHyBCX`~fkZlntrxd{dhz#v`}^zjzp#HQo5cVB
zug?5`;;+jm)?W<2PJ^HG?_F`=4(G#XToK+X$37XpNPaB-boBA~pZ?pcr*&;V`!}@1
zA31Qxk5|3!{NUAFUe52``_h~LRSBH-+%LwTdidL`LifLR!_2R3A6k9SnX8}Pc=wH~
zZ~u8sy72bHcdz>U8xLPCeO)?y<L%O>l`CJ9u3LG<rt7X)^L6R@mDjCYIsf#?it+iM
ztiJPsdw%l0-Ma_>Zq>l=SN~?kwF76Y4SwO{AN$*D$G`la&%Jox*!aY4?&g`zE3f;~
z+b?|jtlbkIKK=E;{<oib@b$O<@2xxU9DL?0WAD84&bRJ=;etOLUHQl@<Xd}JUSG&P
z_nA+evF+SPfA{ly?)~OXhgPlp#Py$g;GNvqPlsO7fArnH^FIHDvuc;b?)v4I&wc*E
z7lUK3UVrUBymHMqa((I>|1$YMnV-#G75nN-FMRymJG;KK_jUJ8XZH_oefC3L_Y|)P
z{Pq3=cYJ5p_s#Eb`pA6lrB4rxpC4M0>OO3o@mO`wrf-~e_5-Ki_h904<Da^D{r*>8
zjom-_#OjxSaj>xUqKm$J&SMvUX6+3xym<Sd^V(C<H&46m<=?tHP<ZUme?ETm`Za&`
zkJ~pr|3`@%51w_~W!t9rmfm>ciSm!0J@2i`=*NEHKJq(X`Rv%1AO7X;-rsx5dFb9}
z_sqU^=94?mIlsDZ<I3qZxBalI_Sq+Hz2TbwUZwr(pS^JFP2{|5ZkqYcAFoJ#^vSQi
zQMl`-#~-@uLz}aGdvCe=XRpm(oBP`1(zUw}e=_yZy<gmNZbtp~KfSHoy#0%p?%I6G
z+Uqwyx#FV_Klsqrug1r3`S){%|Kitwy8l1Ud_FDf7d-OEeRmX0#lGNs>V0S5T6y%@
z2RHxn%C{d)savMH|Kz&WPDHhD-nKnbI-O2zz59R9|J)z!ADepMn|tIl|9SMK(L0`b
z`2X8G51=NueeKh`^d=ny1Q8(+Afb1pD!nNsgx-6kSEZwbB29`E5v4=uNGCL<OOYlZ
zT|lHGU)*<}Gy9y`_kQ=ByT85fH<RDYGnskkU72^aXZ^EE-r3boT#2UfiWHx5S>$cQ
zq-PC+d^M%dn^o!?G7=X&?w<JhNj;Q4q2wN0-I;)dB0n*)+bjiunaj&M!8WC*+b-@j
z7{muP4m4NhR-7cM*CzqoHw$i&rpUNC5*HOi3Lq+T%TX%{NJ2$PW%Fri>%+P-cy^+i
znJo8*p6~lmu6uF9S1xbJWRB_*OA^AQgP5w)J|xC;n}d#Q<Dxa_gY)Am1Di!7zwL^#
z3xZfl@ohU<@j9gqVxOu@NJS^}5X}+O?H5p6z04L-bN>=7_q_T{J9`%v<cGx)-;XG%
zroi>SXn$-ZYI0NOH2u2qS#@%=p$#ASJI^z5GlbzYL>8~#+}BfnUyj$3aaY~RvR#$t
z9rxn9xeP9d@<&Zt+v1mwi!<DqDz+MpXUmRvMSRqiTtK|U*BK>+n>6ab^xy$!*}T&`
zRF2*XEccC=lcu%hkHsw6yFDfqb|JQTS<SUHMkmV}gRSAKw>HPVx%Am{I48^Y#MXk>
zkR#tayK0QmX2qv=?MTY!Sn2y#qkqoPBl?d5GgD@q>gm%XQ=8+kVBr#mldqa@#^8SS
zOgkdy0pyIwy?z%0?udO`IjGmtq^ZZJ2YW5I=i@b;jhb#1AIotH=}_Fel#?(tiC5(L
z;gM`YVKoueu065P=uEipr|a!^wM}g6av@bM;Msq2IUjf><MU{H-PYQz>Q#XhSNZnY
z#Nve9<FkD+_c|?;A}m;zF!1O9fok7X9a802o#5+Jw<Rw#OWEIi$H|^{q?aDsP3$$=
zR_29)aY91cosa$Z1U&a{s}A4gzm;%r_&pzQ|9hk=|0tgt<W-t<9%827tKnI(va8u;
zVX*j&*iB4~rfDjJLcG5xCh+j~+V{5Z^BN_OP8)99*D9);8BVGO%H{9AiN+-7fv#~E
z71IhI@`&H@brA>mS_Qh)j^^{0?|!6pj^yDP7T{OId+jzYZk(}tI9;&OBe`{6Bo0V<
z)SZoq@fwda8%_etN*RzM?GPl9U6Lx^OV9($bj3uF^GVR%HC4IhuyqT7jlhql5^P!Z
zpLvccH4<gHqDZ|ad<L~jh>ZERZk16SlEq{TH*dTfZoBaMj@#*X1I5Px1fNkRPoo90
zosd629ePf*DnskJP&(Nx|B2LI{CRK3hm)sf`ZJ8&(;`zX;ZJl7cf(IH?D!<_HtWK&
zcJwqIskEsBRbSh4U&B)}dDzEkVn;{_uc;(&bUVmXwNtpOGY-j9Ak<N?5|K;JjlyYT
zh>m3=qG-In=NNGdSB%0NP@l1?TR>9px7eYrT^8jQcu6KNCN<|tdi*Z3x)E{EV8vqD
zCQGmn9YtdKe&s%AexMT86f-CPeLUK4Il#C?;KkdR!tO$$5?*!o{R)_Ji5WpOg=z-*
zjU^)xWvp^n2z6>fOWC$*(8e3vBHdv!(J!*Fi{Y^+o{}E?#rGx&C|aFIX@f<Ba-IYh
zuiB?St*tvRuL>u}N8U@(aj5>FE74fS=+M0`LeiPbsgX&XtW&Kz=rXyjuQ3M26)5da
zH?XK_r?0N5FSO<#2%F~iV$5~4@Orl%mWSz#xr4ETrQbe^fiXdQM6emqd^gZ8A>W=O
z_Qn85rjiZ29l;iXcvz?`1q>?+k3$Ja!LQirV#RpH81Zozm%6OLtd9oKI7Ayx-3}hS
z>MGRGx%2R%X0NHm({4JOr6q9qYtU7F)j{W1wcu&rZ>zrM3wb$h`NFJHIXfz5=E3e$
zh-bbJU&N-SgqMdkU3I;HE-=$v1X<3fy2ar>DeuFFo{mhcg^LK$yVV(<tM8^DqbsGv
z40aedWgQ)K=#k99-@Nydvtc#gBW!J6^{YSCxRn;blGAoXb}N%Nx<Lw-6|bx5IwMQo
za$}$MMX~}VGVkf@mJe#)_wT+UkgL<~a<A-#&3-SdZF+pN;5#X|^g(&Edp=Rjbv`q_
zC8Tg!)uH1WgJY2Pt~N3MkskcWt>{q2(jHX*ZV;HAa^C;h!6$xp|AcQ39?@!SsDmtG
zza2R*EEH0$)+k$#$j1{<S3evURkAf%k$<u>`iRf>?ajMnd9n9;@WN)OtF}9gONp!Y
zXxia#nKh<eSqvB@pK|k2Pwr?TnbgzaJ}pM=)17&xuilky-B^=T@EZ+ju!JlXj_5vJ
z@sGte?)9I;d#sy5Ws76w&J}Rq#WI83cgRD6XX$<3OY&2JE89%mg57k!POfh>o>j<~
zdPEZPTd$n-sd?z*(v*%)nvvw?b+BkSr<wIEZ+M{fNh;}~GS`-}s*R16f!#vo$-6zT
zoIw^aXRGOLx@l3P=K@s|ff<k=S!_MxT2<Xn)p1mB#E@s;7FJANT;o6*nKFPHcj>jM
zN;ZK4kFUdsIg{Q4y-+o#DAO#sWCbWR>*l)5Y;oNDvGnzTvK8v82vO;d5w#ceu0LFy
z2xN{$JLJE-BrxZWqdY?_FBiYq9|WXveS4n*5belzmwuN6u?Ubzk8|bD>4g(y0&N^S
z<;o&FVeBcH88*uPj>*eC!3uM3``@HzPXj<0_mt@xy&9+z?qK8B8*w4pa;GXVgY3k`
z1A1eEUkctGw))(ca4=~S6nt}h!xC@h%=wh!xfg)xFh?d2DQnS$3J$+%@~hq9@7EaA
z{+$pJPDI4CffXYU%hLUpky`|@v#_v%<Uh?wGR`-Anl}7S&rf$ar_(DhaVp2P$aX7X
z?%XB_4+GDfY<~?qMg`@?YA-CHcK?y;{)-HFR!$~EPF9YgPI3+$Zc<>F+_fj-v0Tz3
zU=Db!l9udEU@qfC>jELhpdY01_#HE!c61Y+4jD09jC`Q<IFjT`KW{Zl20ccoyp0RQ
z&jFy|JkdCG1p#OC2Y%hw2(~y71-(UH&(8(5)$m+@#c>R<9j61gG8&4M9}UrX@|v8K
zXJBG%?{Etzk)q5zR*tAckR0Rdqwe|0q)(a*#2jbIP~UKx*}IHauI+R%26~$_8$5l%
zdks7Q<<V#m=RsJcdIei(go-9rwf~o)Nzx6Tg8MP8aSs%3)p92kQ3fjSg9V9|B%3Za
z66@MM&DVZ}3?w3EX6_&O;CAuGQ}eK8N&0;);8z*hN$mcluNj&<EHKMnPNY88F#N=+
z^x7`5L5BQsg*mEk>!Bi35P2Zk(_nfwvN}u^M_Yf)tfAf4%5#l<-Fvul6+Ac@48~48
zI$XTP^6=oVPm^}c>SS5Hu6wKvf^B)SL)s5bcp`Lp;(tWV$+c6@T7>q8PNe%o@e&iY
zEZz*vL}~8kO6;~zTkLHnyOd+j-_R|tesEVimB3KLndg(?ZBI+7&7KOZbrInx|31%G
z-nd!3?`4f_yBa+RIxuxNSZ81%^2HpbmnMZez(o(7Cq)&x)#S}B#_gthcF!Y>Yg5BI
zQx;!2Sq#2vGOqy_Rg@`ocX=AsFj?diJ_qMbfOB&Lu}y)g5YRUQ=S<pavKiSl@cX%t
zJAn@q*C*N1C6bj}53UYbp+#(Zvcn?AYaSh(&l2U;jBe=BR;wLJ;c#_+@;cr1sf{>U
zW7%Ckm25Sh&(W<K5ZPI#W#rLL)*%-n6xL|S=<|=*8aO>+PU&(jG8|iNNfS)J<9dgV
z`1#y0`(tBCbFJReQW$CVM1W6IeH;eux;-vk@D2cqV_<gxQ0k4S@n1a#ny4Q_iNLcQ
z@y}m=qy*z-C5*Tx+;gZU6z4r%TmeUsB>M!yfMHs3V=`ouX{<K0PfC`xS<Og!V@vQ=
z*94eWsd^Nl5i-wAGNqeGCQlEy=q=ntnMk#s1d~1vG~$OO`2=)vRnzW1|Lmo+ZNz6=
zlMFm<W4nV4WSL=}OiT<(P~PbsHx`a%ZmUqPx(3&{8*HPDC!-$*DG>`ZNfgQ(Ex4rS
zEzr8Kq#M(9x?V07*QPVrHzV&lqOwSq5K3$`a$`9Ka7ZY|cqNTDY(EaYscF~PnmbiM
zUsG5#3AKH_6b+&sloIjB(4=22d%73t(fI}BaWdWBz3{=F-yT_@{p2~K!+tiMXz3LH
zRiY2sII}*NCXxT%YDt0ld#V!&cYdzV&m)SmQ-#<Ou7vUXc}=>LWXt~Vo1}5J%{xAy
z@SLo<eVInEh;5KrR?)dN9XV1=^*2Jp%S?sDJ&xL*kupY?s$Y=18|1D4KeYIk3B4XM
z=8eXo!FU;7a^+=;YhP6+(ekxdK0Y(x-ga*)$7O~3!eyQSDfXo@uE=MaUHV5>aJq0h
zf4YtxzI3a7wr$KPLRgl%)(f_qRoODO8ABVo#GAB^UZQT}3xRyWncn%&*fA;zNsKly
zpSYrK)XXO5f!t>IpFH>a)=E?U^+Y5hLt~*Rpb#4)9*=lF`=?XHX*+ZZk}F<$$6N{|
zr&ue|CMPlFKKb}?r-!Ig-)Z#+#Uaim!}CY3XL&?mD*jZR{S0+Qq`dG=D}ZowMP(vH
zh<`VY^pnJGg}q8a%iMSD90JB+-A}!246=IIl&W4Dn$Kb;dX@%8mbW#VIOb^diotTm
ztTQ?z_Ci@kRA=!<zO%-h+ZUQlU^yFBoaudW@!#44J(|=O3D<lN-`$+Y*;R!>Lwr%0
z5zVl`!N7)LqB0lq@Yl?Fxa(Rxsc;@I>uqrtNQpp96*fPRA;y45l8C{t{j@>TUu^Ko
zGv<;GI_6}?wtT(0y=eMFjI&zYi-nMzdye$aH#Bh~Kz{1Fi=5IcPByoARTv*;JmbHX
zW~Xa_FE%YfFJ{lI`X!{Jb%h<GBRdcptCb+az~M^WcCN!HX*N4USAPNHt9?O*;EQ|T
z6s_UrCLjN5tua1-fHk&pz(6J`Zx_otFy;*Fyj1$j3U*X5EbIK;r@rbXoNBj#M-WvH
zWd{m@G%WHEFkC=zt6JVD?shTTn;~1{<m;HrB@`Q|%m$!_4xtRTo6Ekpz>Uu~J~Bso
zE_<@v5u1MozWO1K5ynY8uz?v$^|vBv`Iff7^4+BO>lP1j6Hb;kfa-e-CI;M#s22W9
zeXIX064_&L_ckuF2F@Bq@B*5o;ndBbs@u|vdv9^mdEUPzTGqV?79L00<Agl1s})Pu
z^)M#8fh+NJC3HMCQ&NJwNid13X#ImOeIO}-Xe-HHwr(bJSx~v#G{+(Qym2rvY%DQN
zXA9sVfempxpRtPwSAMJidcei&^oI6SbdDIZ;;sMDny6<0!66aru6<HbYu2cuRUI)b
zOFvGIs8f&x=PTxwrTNp~L-KXH2mT5;B}|-!?QP|ryoYsy64f92?UQ_Qq%0&e)PY;}
zYGViC%YCnwEf2)QX;?GVb(4!MouBxUwc1|rrs%7+ejQoF@9i^b_fFv$A9YuCdbw>J
zJ!VgSZ6<^G3s7n~;Q=?rxZK`$r3mv1@z}bYCE{;m)Nf`_s%|yd6ZLsB_WW)3Bu4&k
zvnNf->RqSDgGtHB1^gfI&DMO@2GhCB+jTtnM3zV*MOb-{`XXsf`&Iox@H1P>jl&h1
zG7W9xh9SvDL#ZsXC$7UMN5Xp&gn^<11xZSB^%Q;s8+nj)Rl55KgO$apaY|-3f&1x{
zl^;Swz2^HhHwZ@+)>rVYuw`8+(+%1UHzRHbDDOc%@!^v_=S?*8a8xL2v#N}w7Zc*%
zap(za!Y>}+X)k)s#~s?4zZw#4X@Lqw>DZ9&vCPK3qQltovqjz8okm`fWP|(~6q|k;
zh%m|@M&bl1SE5($gE%@<ed(6SfS%`)E7f{LjPe^i{Q5GoZbB?Y17ydgT=`8Zl8WCR
zc_9Lt7oj=V6Gjslc+%<AgoMa!B9Ca`WCVz*Z>3}pC|fe;HPR9-BamK?d|QkxJY-ZN
zjDhA_<pyFSOg{&xwt5x}VxpfDC#F^fB&m#(0CrS3`UJ`Ps5W7v1SkC?MLCGO!O8;*
z!20s4;pfE33po7e#7WVIp5uKdt{hZ6+VJsy(3~@?E;HHLiG7!`ybLdG@Dex&z%68b
z5iQhnv_A}D9d*570h4C9_Fh?rR3-2YEk&Y_A0^)s6H7$mX+b^T%N7x}{k32@y^1sU
zPrK_fQkbmqx89UgQzVGDSF)$ZPnPH{4aV_b>Z{eIOsly_X%%Ws?iBZN`^MxPiOQ^M
zb?Ju?8p`vkXJ#_L&0*AOC$7P}Q|ST4cem#c9@5-)rqaM$p!J!xEk{<Z5OpdV&2=qC
zUjNe31_a~+@YCPZNV~gSx+h3o?zo@wiNBTQuZ4bC0-Ib1Z9A);TriKT_+o4(41^sk
zO9lAxo~Rs#x!E>GQUcy?p#~`a8wgiNvrS!JnYs2)=gqF&AD0S)vR;hK`_06j)UIou
z>9%aD&$))Vk~8jH_^G#=5=e*dCRUbUJDSrRevt#3n|vZMa!?|<-$|0-@MF@s<mQ&<
z#71BfrOVU`zW9Pz60&t@_A>G8pnkBt-m|*CK<Z`g`q}rr@0LerN4O5Xhj%tGqj-Nc
zDj`0_A9+i2_@XpImku{=TnHK*ME5B$0;`DmcCdfmg(-#6ab<1I0r+LzolQqcPEk_{
zqe07V`x;0#)l>LAmcuAH(e013WzRSSsLkloVmAB~u!ErIcb99!6%{s1DSZv-9wh(b
z@N%RbY^XrDIjl()I}%qE&{KYUI|=fJKIRG$EwBgle4ehLXv!*-*Gp7v*`Iy`oI@x{
z=Vqyydd)CuQ&YiAx11&xV5g3A&#pwdW7&$54nzJZoy)yMd&JfyaJ{z@(Xg?Vcsz5S
zWItC^OCOGpZ(trLqMXv2)153sTe~^)!ehO~vs4qNZBE@SeOl`3cLFs?oDSByT^u#%
zst+#|h(@pB{_j}-v4_Gi{+;z7L1AGr!GB)=5d@;&|M+Kv`Rh8+|3ug*;rxlh{U_o5
zM)?1x2>ufh{*#FQha&!sNd7On_8XC+MD{x({})8@t0@1QqWX=f{|(WgMEe(r?pM+O
zKi2jCL=69i82<n<{VL|)5z9Xc_Yli_n&lpWNS=n;#gWKRP}lsC*dVHVoniY{sBidc
z-Urhb9UlmaW_OV$ZKBffQTe~N+kBTqsrba2X~Z-4w(a*4SyUCjr*<q+{Z4Hk+u{do
z)SJ_Vgnn2sL^U%Ffh>$?y?P}K$0c2`&(;PtE$ef~s3v<&n4Wn^eIUH`)z+L=h(0i_
z?#6f&>iPpw_Um#VNsBKjUPy$P#O&AQVJmu~o~K2z7S4z>Fa${xCMi!yk;n2;GebQm
zIauuxFsJ}QuL_!O+9VriFT&4pZ$e!k((1P|4aMr2V;iQ+S}GQ<x6fH9Lp^87?*%-l
z=E7)M7kR#FQekS+6M;41LBimG^c?xw|Lo;?sLdH&KkhOG`b&cey)Ed2hEQFY*QrHt
z$Vw1XhJ2j`W(Q&-EJ@B-LS2t={!D0c$U^#Yf_EYzn^w^y?}z_Sd$RTb4&1z7C!^AK
zEV9#0#6+YZ$%Se=L|TD<Wz|0(5-NZ-=NfDmfjhc3VG1Za1_m?s-6<6pDHc-YiFXMe
z{c)RbItgVLLeUvCv$^6DBE-?1-^Es%7H?q>AyMTM7soDFtPqCGx?Aq-&yk<JIVa^&
ziz-ji^w){LBO4PWSp|sm_g8prl@Bg>P~F-iLyvU{ki94gV@l-iORvzI5Pi0c`u<@A
znNzCdK!0w~OP=Tug5Xa(tg|R@rP%tt01{QsI3rcsQB+bUji2MqHaMsdLC}rzjGy*0
z6@4ZQFTd5haQg<8;{8ERQ5wyUsQal_O1$M`T4A3g@3o|)HWTSdYNfQGtoPu%@w5Jx
zjZI8LQ!k$=s;N#<L!cDud$^CyBN<rWlS;7`k(z^nSin@y9Zpoa^<FS!wA`TKPXc<7
zFiL1?$agwF68^miag`!=F?@1!?n|T|dq*<a`!>D41a##0U&eob=sD1TZU2|ZFZ;hl
z(fj}Y%K8@p|AAXT|Ml~~qC%qR{eORP{ex{p!2pQ0wUDToB@kpS3;|hN3W2O3BGwR)
zFhB$d0YO1l!vEd+2mV*@e-`@9{$Etb7Zef}MW6rubAVy$$N$Haus`Vv*?E|(zz&rf
zS!7Uqr8URhLN?xOKLWF@T#2izCCbG=`?Wn}VInvP87Ugho9wY<GJ`%6)8hO1?Ec42
z*nBuqD|Gl)-!03=j!gVO?hD>XqAy;P3QLUNpB98TtPXNEEG-(HRo!IY*1}6=E9D&n
zlD-E8lYJ&g(%N&WeC2h3-JvcgjUJKzSM-1IU+({+X#f9f>mOnRvat~n1_@aTL2QI9
zfi{95kQf9i0u-~hghDK>L_k(zV89>Y|ETKzXa5%iqW6FQN&e5rtEQ<h2o!`0{=@#6
zsH_~`ORcy4pZ60C8Hzvq&_CX;cmLRhK|n3!Nj0V$d)=XQ()kD7z=qR?zpd>VHXPAz
zuQ^PP+kIN7gp{RmUmj~RGXM)u6<!>{YHFvuPbVDMF%WP*8?@*Cf6)Ieh5uUr7Zw&o
z`~P2C|Dq5G0BUV1CL{>8L0N+(2ndGQpgzDhR>D9i>KA}D01USLL*jo_+xUm`f2jCh
z2<`uWlK*EXm^#P<$Yn2wZ`ok;Bj+?&*p%{gcn*sfvAB_neDj&=Q8Hz%VG?^^-z~jE
zI={HWTU5*(QDW=SQ+Nx+g=)}D8!(66i+n?OCt5gi`=vIYuQ477{vbCaA_`ulnDwxN
zf%wt*bj4?;OTD<|SrCGBVW;_>Av`Dzw=QiA?$a=|rT@4Y5p;$TK7$uae-k#Q<@o(W
z;sAU3(Plj@i_YS4#nlD)RWP(&T?K8|XwaZRg9Z&6G-%MEL4yVj8Z>Coph1HM4H`6P
b(4aws1`QfCXwaZR^LPFaIec>z0LTCUkCs<U

literal 0
HcmV?d00001

diff --git a/test/functional/repositories_darcs_controller_test.rb b/test/functional/repositories_darcs_controller_test.rb
new file mode 100644
index 000000000..fc77b8747
--- /dev/null
+++ b/test/functional/repositories_darcs_controller_test.rb
@@ -0,0 +1,94 @@
+# redMine - project management software
+# Copyright (C) 2006-2008  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 File.dirname(__FILE__) + '/../test_helper'
+require 'repositories_controller'
+
+# Re-raise errors caught by the controller.
+class RepositoriesController; def rescue_action(e) raise e end; end
+
+class RepositoriesDarcsControllerTest < Test::Unit::TestCase
+  fixtures :projects, :users, :roles, :members, :repositories, :enabled_modules
+
+  # No '..' in the repository path
+  REPOSITORY_PATH = RAILS_ROOT.gsub(%r{config\/\.\.}, '') + '/tmp/test/darcs_repository'
+
+  def setup
+    @controller = RepositoriesController.new
+    @request    = ActionController::TestRequest.new
+    @response   = ActionController::TestResponse.new
+    User.current = nil
+    Repository::Darcs.create(:project => Project.find(3), :url => REPOSITORY_PATH)
+  end
+  
+  if File.directory?(REPOSITORY_PATH)
+    def test_show
+      get :show, :id => 3
+      assert_response :success
+      assert_template 'show'
+      assert_not_nil assigns(:entries)
+      assert_not_nil assigns(:changesets)
+    end
+    
+    def test_browse_root
+      get :browse, :id => 3
+      assert_response :success
+      assert_template 'browse'
+      assert_not_nil assigns(:entries)
+      assert_equal 3, assigns(:entries).size
+      assert assigns(:entries).detect {|e| e.name == 'images' && e.kind == 'dir'}
+      assert assigns(:entries).detect {|e| e.name == 'sources' && e.kind == 'dir'}
+      assert assigns(:entries).detect {|e| e.name == 'README' && e.kind == 'file'}
+    end
+    
+    def test_browse_directory
+      get :browse, :id => 3, :path => ['images']
+      assert_response :success
+      assert_template 'browse'
+      assert_not_nil assigns(:entries)
+      assert_equal 2, assigns(:entries).size
+      entry = assigns(:entries).detect {|e| e.name == 'edit.png'}
+      assert_not_nil entry
+      assert_equal 'file', entry.kind
+      assert_equal 'images/edit.png', entry.path
+    end
+    
+    def test_changes
+      get :changes, :id => 3, :path => ['images', 'edit.png']
+      assert_response :success
+      assert_template 'changes'
+      assert_tag :tag => 'h2', :content => 'edit.png'
+    end
+  
+    def test_diff
+      Project.find(3).repository.fetch_changesets
+      # Full diff of changeset 5
+      get :diff, :id => 3, :rev => 5
+      assert_response :success
+      assert_template 'diff'
+      # Line 22 removed
+      assert_tag :tag => 'th',
+                 :content => /22/,
+                 :sibling => { :tag => 'td', 
+                               :attributes => { :class => /diff_out/ },
+                               :content => /def remove/ }
+    end
+  else
+    puts "Darcs test repository NOT FOUND. Skipping functional tests !!!"
+    def test_fake; assert true end
+  end
+end
diff --git a/test/functional/repositories_git_controller_test.rb b/test/functional/repositories_git_controller_test.rb
new file mode 100644
index 000000000..fec0bbaa0
--- /dev/null
+++ b/test/functional/repositories_git_controller_test.rb
@@ -0,0 +1,123 @@
+# 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 File.dirname(__FILE__) + '/../test_helper'
+require 'repositories_controller'
+
+# Re-raise errors caught by the controller.
+class RepositoriesController; def rescue_action(e) raise e end; end
+
+class RepositoriesGitControllerTest < Test::Unit::TestCase
+  fixtures :projects, :users, :roles, :members, :repositories, :enabled_modules
+
+  # No '..' in the repository path
+  REPOSITORY_PATH = RAILS_ROOT.gsub(%r{config\/\.\.}, '') + '/tmp/test/git_repository'
+  REPOSITORY_PATH.gsub!(/\//, "\\") if RUBY_PLATFORM =~ /mswin/
+
+  def setup
+    @controller = RepositoriesController.new
+    @request    = ActionController::TestRequest.new
+    @response   = ActionController::TestResponse.new
+    User.current = nil
+    Repository::Git.create(:project => Project.find(3), :url => REPOSITORY_PATH)
+  end
+  
+  if File.directory?(REPOSITORY_PATH)
+    def test_show
+      get :show, :id => 3
+      assert_response :success
+      assert_template 'show'
+      assert_not_nil assigns(:entries)
+      assert_not_nil assigns(:changesets)
+    end
+    
+    def test_browse_root
+      get :browse, :id => 3
+      assert_response :success
+      assert_template 'browse'
+      assert_not_nil assigns(:entries)
+      assert_equal 3, assigns(:entries).size
+      assert assigns(:entries).detect {|e| e.name == 'images' && e.kind == 'dir'}
+      assert assigns(:entries).detect {|e| e.name == 'sources' && e.kind == 'dir'}
+      assert assigns(:entries).detect {|e| e.name == 'README' && e.kind == 'file'}
+    end
+    
+    def test_browse_directory
+      get :browse, :id => 3, :path => ['images']
+      assert_response :success
+      assert_template 'browse'
+      assert_not_nil assigns(:entries)
+      assert_equal 2, assigns(:entries).size
+      entry = assigns(:entries).detect {|e| e.name == 'edit.png'}
+      assert_not_nil entry
+      assert_equal 'file', entry.kind
+      assert_equal 'images/edit.png', entry.path
+    end
+    
+    def test_changes
+      get :changes, :id => 3, :path => ['images', 'edit.png']
+      assert_response :success
+      assert_template 'changes'
+      assert_tag :tag => 'h2', :content => 'edit.png'
+    end
+    
+    def test_entry_show
+      get :entry, :id => 3, :path => ['sources', 'watchers_controller.rb']
+      assert_response :success
+      assert_template 'entry'
+      # Line 19
+      assert_tag :tag => 'th',
+                 :content => /10/,
+                 :attributes => { :class => /line-num/ },
+                 :sibling => { :tag => 'td', :content => /WITHOUT ANY WARRANTY/ }
+    end
+    
+    def test_entry_download
+      get :entry, :id => 3, :path => ['sources', 'watchers_controller.rb'], :format => 'raw'
+      assert_response :success
+      # File content
+      assert @response.body.include?('WITHOUT ANY WARRANTY')
+    end
+  
+    def test_diff
+      # Full diff of changeset 2f9c0091
+      get :diff, :id => 3, :rev => '2f9c0091c754a91af7a9c478e36556b4bde8dcf7'
+      assert_response :success
+      assert_template 'diff'
+      # Line 22 removed
+      assert_tag :tag => 'th',
+                 :content => /22/,
+                 :sibling => { :tag => 'td', 
+                               :attributes => { :class => /diff_out/ },
+                               :content => /def remove/ }
+    end
+
+    def test_annotate
+      get :annotate, :id => 3, :path => ['sources', 'watchers_controller.rb']
+      assert_response :success
+      assert_template 'annotate'
+      # Line 23, changeset 2f9c0091
+      assert_tag :tag => 'th', :content => /23/,
+                 :sibling => { :tag => 'td', :child => { :tag => 'a', :content => /2f9c0091/ } },
+                 :sibling => { :tag => 'td', :content => /jsmith/ },
+                 :sibling => { :tag => 'td', :content => /watcher =/ }
+    end
+  else
+    puts "Git test repository NOT FOUND. Skipping functional tests !!!"
+    def test_fake; assert true end
+  end
+end
diff --git a/test/unit/repository_cvs_test.rb b/test/unit/repository_cvs_test.rb
index 3f6db06eb..b14d9d964 100644
--- a/test/unit/repository_cvs_test.rb
+++ b/test/unit/repository_cvs_test.rb
@@ -40,13 +40,13 @@ class RepositoryCvsTest < Test::Unit::TestCase
       
       assert_equal 5, @repository.changesets.count
       assert_equal 14, @repository.changes.count
-      assert_equal 'Two files changed', @repository.changesets.find_by_revision(3).comments
+      assert_not_nil @repository.changesets.find_by_comments('Two files changed')
     end
     
     def test_fetch_changesets_incremental
       @repository.fetch_changesets
-      # Remove changesets with revision > 2
-      @repository.changesets.find(:all, :conditions => 'revision > 2').each(&:destroy)
+      # Remove the 3 latest changesets
+      @repository.changesets.find(:all, :order => 'committed_on DESC', :limit => 3).each(&:destroy)
       @repository.reload
       assert_equal 2, @repository.changesets.count
       
diff --git a/test/unit/repository_darcs_test.rb b/test/unit/repository_darcs_test.rb
new file mode 100644
index 000000000..1228976f1
--- /dev/null
+++ b/test/unit/repository_darcs_test.rb
@@ -0,0 +1,55 @@
+# redMine - project management software
+# Copyright (C) 2006-2008  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 File.dirname(__FILE__) + '/../test_helper'
+
+class RepositoryDarcsTest < Test::Unit::TestCase
+  fixtures :projects
+  
+  # No '..' in the repository path
+  REPOSITORY_PATH = RAILS_ROOT.gsub(%r{config\/\.\.}, '') + '/tmp/test/darcs_repository'
+  
+  def setup
+    @project = Project.find(1)
+    assert @repository = Repository::Darcs.create(:project => @project, :url => REPOSITORY_PATH)
+  end
+  
+  if File.directory?(REPOSITORY_PATH)  
+    def test_fetch_changesets_from_scratch
+      @repository.fetch_changesets
+      @repository.reload
+      
+      assert_equal 6, @repository.changesets.count
+      assert_equal 13, @repository.changes.count
+      assert_equal "Initial commit.", @repository.changesets.find_by_revision(1).comments
+    end
+    
+    def test_fetch_changesets_incremental
+      @repository.fetch_changesets
+      # Remove changesets with revision > 3
+      @repository.changesets.find(:all, :conditions => 'revision > 3').each(&:destroy)
+      @repository.reload
+      assert_equal 3, @repository.changesets.count
+      
+      @repository.fetch_changesets
+      assert_equal 6, @repository.changesets.count
+    end
+  else
+    puts "Darcs test repository NOT FOUND. Skipping unit tests !!!"
+    def test_fake; assert true end
+  end
+end
diff --git a/test/unit/repository_git_test.rb b/test/unit/repository_git_test.rb
new file mode 100644
index 000000000..c7bd84a6e
--- /dev/null
+++ b/test/unit/repository_git_test.rb
@@ -0,0 +1,56 @@
+# 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 File.dirname(__FILE__) + '/../test_helper'
+
+class RepositoryGitTest < Test::Unit::TestCase
+  fixtures :projects
+  
+  # No '..' in the repository path
+  REPOSITORY_PATH = RAILS_ROOT.gsub(%r{config\/\.\.}, '') + '/tmp/test/git_repository'
+  REPOSITORY_PATH.gsub!(/\//, "\\") if RUBY_PLATFORM =~ /mswin/
+  
+  def setup
+    @project = Project.find(1)
+    assert @repository = Repository::Git.create(:project => @project, :url => REPOSITORY_PATH)
+  end
+  
+  if File.directory?(REPOSITORY_PATH)  
+    def test_fetch_changesets_from_scratch
+      @repository.fetch_changesets
+      @repository.reload
+      
+      assert_equal 6, @repository.changesets.count
+      assert_equal 11, @repository.changes.count
+      assert_equal "Initial import.\nThe repository contains 3 files.", @repository.changesets.find(:first, :order => 'id ASC').comments
+    end
+    
+    def test_fetch_changesets_incremental
+      @repository.fetch_changesets
+      # Remove the 3 latest changesets
+      @repository.changesets.find(:all, :order => 'id DESC', :limit => 3).each(&:destroy)
+      @repository.reload
+      assert_equal 3, @repository.changesets.count
+      
+      @repository.fetch_changesets
+      assert_equal 6, @repository.changesets.count
+    end
+  else
+    puts "Git test repository NOT FOUND. Skipping unit tests !!!"
+    def test_fake; assert true end
+  end
+end

From d4429a544c50c908d85259eb3706a6960b0a604d Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Wed, 12 Mar 2008 20:50:48 +0000
Subject: [PATCH 280/710] Fixes #820: invalid project id causes a NoMethodError
 in SearchController (Angel Dobbs-Sciortino).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1237 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/application.rb            | 12 ++++++++----
 app/controllers/search_controller.rb      | 11 +++++------
 test/functional/search_controller_test.rb |  6 ++++++
 3 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/app/controllers/application.rb b/app/controllers/application.rb
index 7510d503e..98cb4a827 100644
--- a/app/controllers/application.rb
+++ b/app/controllers/application.rb
@@ -102,13 +102,17 @@ class ApplicationController < ActionController::Base
   # 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?
+    if @project && @project.active?
+      if @project.is_public? || User.current.member_of?(@project) || User.current.admin?
+        true
+      else
+        User.current.logged? ? render_403 : require_login
+      end
+    else
       @project = nil
       render_404
-      return false
+      false
     end
-    return true if @project.is_public? || User.current.member_of?(@project) || User.current.admin?
-    User.current.logged? ? render_403 : require_login
   end
 
   # store current uri in session.
diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb
index 69e1ee503..f15653b63 100644
--- a/app/controllers/search_controller.rb
+++ b/app/controllers/search_controller.rb
@@ -17,6 +17,8 @@
 
 class SearchController < ApplicationController
   layout 'base'
+  
+  before_filter :find_optional_project
 
   helper :messages
   include MessagesHelper
@@ -36,11 +38,6 @@ class SearchController < ApplicationController
       return
     end
     
-    if params[:id]
-      find_project
-      return unless check_project_privacy
-    end
-    
     if @project
       # only show what the user is allowed to view
       @object_types = %w(issues news documents changesets wiki_pages messages)
@@ -104,8 +101,10 @@ class SearchController < ApplicationController
   end
 
 private  
-  def find_project
+  def find_optional_project
+    return true unless params[:id]
     @project = Project.find(params[:id])
+    check_project_privacy
   rescue ActiveRecord::RecordNotFound
     render_404
   end
diff --git a/test/functional/search_controller_test.rb b/test/functional/search_controller_test.rb
index 63f1097d6..49004c7e6 100644
--- a/test/functional/search_controller_test.rb
+++ b/test/functional/search_controller_test.rb
@@ -78,6 +78,12 @@ class SearchControllerTest < Test::Unit::TestCase
     assert_equal 2, results.size
   end
   
+  def test_search_with_invalid_project_id
+    get :index, :id => 195, :q => 'recipe'
+    assert_response 404
+    assert_nil assigns(:results)
+  end
+
   def test_quick_jump_to_issue
     # issue of a public project
     get :index, :q => "3"

From 2c1e63720ec972837b1bae3fde1acc3902ec23b0 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Wed, 12 Mar 2008 23:00:11 +0000
Subject: [PATCH 281/710] SCM AbstractAdapter use shell_quote to more properly
 escape path (closes #838 by John Goerzen).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1238 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 lib/redmine/scm/adapters/abstract_adapter.rb   | 6 +++---
 lib/redmine/scm/adapters/subversion_adapter.rb | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/redmine/scm/adapters/abstract_adapter.rb b/lib/redmine/scm/adapters/abstract_adapter.rb
index 5db4964e9..41edf00ad 100644
--- a/lib/redmine/scm/adapters/abstract_adapter.rb
+++ b/lib/redmine/scm/adapters/abstract_adapter.rb
@@ -101,9 +101,9 @@ module Redmine
         end
         
         def target(path)
-          path ||= ""
-          base = path.match(/^\//) ? root_url : url    
-          " \"" << "#{base}/#{path}".gsub(/["?<>\*]/, '') << "\""
+          path ||= ''
+          base = path.match(/^\//) ? root_url : url
+          shell_quote("#{base}/#{path}".gsub(/[?<>\*]/, ''))
         end
             
         def logger
diff --git a/lib/redmine/scm/adapters/subversion_adapter.rb b/lib/redmine/scm/adapters/subversion_adapter.rb
index 5b6bfa97c..1e0320e2c 100644
--- a/lib/redmine/scm/adapters/subversion_adapter.rb
+++ b/lib/redmine/scm/adapters/subversion_adapter.rb
@@ -100,7 +100,7 @@ module Redmine
           cmd = "#{SVN_BIN} log --xml -r #{identifier_from}:#{identifier_to}"
           cmd << credentials_string
           cmd << " --verbose " if  options[:with_paths]
-          cmd << target(path)
+          cmd << ' ' + target(path)
           shellout(cmd) do |io|
             begin
               doc = REXML::Document.new(io)
@@ -139,7 +139,7 @@ module Redmine
           cmd = "#{SVN_BIN} diff -r "
           cmd << "#{identifier_to}:"
           cmd << "#{identifier_from}"
-          cmd << "#{target(path)}@#{identifier_from}"
+          cmd << " #{target(path)}@#{identifier_from}"
           cmd << credentials_string
           diff = []
           shellout(cmd) do |io|

From ea161c9ea408ea47ccef67f1a712c51194e9084f Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Wed, 12 Mar 2008 23:09:11 +0000
Subject: [PATCH 282/710] Prevent unexpected nil error in GitAdapter#info if
 the repository path is invalid.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1239 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 lib/redmine/scm/adapters/git_adapter.rb | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/lib/redmine/scm/adapters/git_adapter.rb b/lib/redmine/scm/adapters/git_adapter.rb
index b6b1b858d..088f83af7 100644
--- a/lib/redmine/scm/adapters/git_adapter.rb
+++ b/lib/redmine/scm/adapters/git_adapter.rb
@@ -94,11 +94,12 @@ module Redmine
 
 
         def info
-          root_url = target('')
-          info = Info.new({:root_url => target(''),
-                            :lastrev => revisions(root_url,nil,nil,{:limit => 1}).first
-                          })
-          info
+          revs = revisions(url,nil,nil,{:limit => 1})
+          if revs && revs.any?
+            Info.new(:root_url => url, :lastrev => revs.first)
+          else
+            nil
+          end
         rescue Errno::ENOENT => e
           return nil
         end

From 4f16dc53a44750c1744411ce27b4a381614ab0c7 Mon Sep 17 00:00:00 2001
From: John Goerzen <jgoerzen@complete.org>
Date: Thu, 13 Mar 2008 05:41:28 +0000
Subject: [PATCH 283/710] Add commit: link type feature to wiki_syntax.html

The commit: feature merged to trunk in r1236


git-svn-id: http://redmine.rubyforge.org/svn/trunk@1240 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 public/help/wiki_syntax.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/public/help/wiki_syntax.html b/public/help/wiki_syntax.html
index d2ca19b2c..a3cc40326 100644
--- a/public/help/wiki_syntax.html
+++ b/public/help/wiki_syntax.html
@@ -52,6 +52,7 @@ table td h3 { font-size: 1.2em; text-align: left; }
 <tr><th><img src="../../images/jstoolbar/bt_link.png" style="border: 1px solid #bbb;" alt="Link to a Wiki page" /></th><td>[[Wiki page]]</td><td><a href="#">Wiki page</a></td></tr>
 <tr><th></th><td>Issue #12</td><td>Issue <a href="#">#12</a></td></tr>
 <tr><th></th><td>Revision r43</td><td>Revision <a href="#">r43</a></td></tr>
+<tr><th></th><td>commit:"f30e13e43"</td><td><a href="#">f30e13e4</a></td></tr>
 
 <tr><th colspan="3">Inline images</th></tr>
 <tr><th><img src="../../images/jstoolbar/bt_img.png" style="border: 1px solid #bbb;" alt="Image" /></th><td>!<em>image_url</em>!</td><td></td></tr>

From eafaae73b75fefd91891d990efe91b908db43e36 Mon Sep 17 00:00:00 2001
From: John Goerzen <jgoerzen@complete.org>
Date: Thu, 13 Mar 2008 05:41:31 +0000
Subject: [PATCH 284/710] Updated zh-tw lang file from shortie lo.

Closes #847.


git-svn-id: http://redmine.rubyforge.org/svn/trunk@1241 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 lang/zh-tw.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lang/zh-tw.yml b/lang/zh-tw.yml
index 5a93d8653..c14c26a34 100644
--- a/lang/zh-tw.yml
+++ b/lang/zh-tw.yml
@@ -127,7 +127,7 @@ field_subject: 主旨
 field_due_date: 完成日期
 field_assigned_to: 分派給
 field_priority: 優先權
-field_fixed_version: Target version
+field_fixed_version: 版本
 field_user: 用戶
 field_role: 角色
 field_homepage: 網站首頁
@@ -194,6 +194,7 @@ setting_text_formatting: 文字格式
 setting_wiki_compression: 壓縮 Wiki 歷史文章
 setting_feeds_limit: Feed content limit
 setting_autofetch_changesets: 自動取得送交版次
+setting_default_projects_public: 新建立之專案預設為「公開」
 setting_sys_api_enabled: 啟用管理版本庫之網頁服務 (Web Service)
 setting_commit_ref_keywords: 用於參照項目之關鍵字
 setting_commit_fix_keywords: 用於修正項目之關鍵字
@@ -280,6 +281,7 @@ label_last_updates: 最近更新
 label_last_updates_plural: %d 個最近更新
 label_registered_on: 註冊於
 label_activity: 活動
+label_overall_activity: 檢視所有活動
 label_new: 建立新的...
 label_logged_as: 目前登入
 label_environment: 環境
@@ -613,6 +615,4 @@ default_activity_development: 開發
 
 enumeration_issue_priorities: 項目優先權
 enumeration_doc_categories: 文件分類
-enumeration_activities: 活動 (time tracking)
-label_overall_activity: Overall activity
-setting_default_projects_public: New projects are public by default
+enumeration_activities: 活動 (時間追蹤)

From 87fb78be0b48fb86ce1cc823f836ffe5a7bf3ad2 Mon Sep 17 00:00:00 2001
From: John Goerzen <jgoerzen@complete.org>
Date: Thu, 13 Mar 2008 05:48:37 +0000
Subject: [PATCH 285/710] Support WikiCaps for Trac migrations

Trac wikis support WikiCaps for links to pages.  They also use
!WikiCaps syntax to prevent links.  Support both.

Uses patch from and closes #758.


git-svn-id: http://redmine.rubyforge.org/svn/trunk@1242 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 lib/tasks/migrate_from_trac.rake | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/lib/tasks/migrate_from_trac.rake b/lib/tasks/migrate_from_trac.rake
index 9ece2cf39..b07be03b8 100644
--- a/lib/tasks/migrate_from_trac.rake
+++ b/lib/tasks/migrate_from_trac.rake
@@ -216,6 +216,12 @@ namespace :redmine do
         text = text.gsub(/\[wiki:\"(.+)\".*\]/) {|s| "[[#{$1.delete(',./?;|:')}]]"}
         text = text.gsub(/\[wiki:\"(.+)\".*\]/) {|s| "[[#{$1.delete(',./?;|:')}]]"}
         text = text.gsub(/\[wiki:([^\s\]]+).*\]/) {|s| "[[#{$1.delete(',./?;|:')}]]"}
+
+	# Links to pages UsingJustCaps
+	text = text.gsub(/[^!]\b([A-Z][a-z]+[A-Z][a-zA-Z]+)/, '[[\1]]')
+	# Normalize things that were supposed to not be links
+	# like !NotALink
+	text = text.gsub(/(^| )!([A-Z][A-Za-z]+)/, '\1\2')
         # Revisions links
         text = text.gsub(/\[(\d+)\]/, 'r\1')
         # Ticket number re-writing

From c67c375357ffe8560ebe161a67d1ce6c481f5055 Mon Sep 17 00:00:00 2001
From: John Goerzen <jgoerzen@complete.org>
Date: Thu, 13 Mar 2008 13:59:21 +0000
Subject: [PATCH 286/710] Redirect to issue page after creating a new issue

Previous behavior was to redirect to the issue list with a "successful
creation" message.  This patch will redirect to the page for the
newly-created issue, still with the "successful creation" message.

This matches the behavior after editing an issue and also provides
instant feedback for the user to see if anything went wrong.

Closes #261 and uses the patch contained therein


git-svn-id: http://redmine.rubyforge.org/svn/trunk@1243 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/issues_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index 263675040..04ff51ce9 100644
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -142,7 +142,7 @@ class IssuesController < ApplicationController
         attach_files(@issue, params[:attachments])
         flash[:notice] = l(:notice_successful_create)
         Mailer.deliver_issue_add(@issue) if Setting.notified_events.include?('issue_added')
-        redirect_to :controller => 'issues', :action => 'index', :project_id => @project
+        redirect_to :controller => 'issues', :action => 'show', :id => @issue,  :project_id => @project
         return
       end		
     end	

From 076d9e7ade1b04c0bacd390fa6f1d7e4c492ef6b Mon Sep 17 00:00:00 2001
From: John Goerzen <jgoerzen@complete.org>
Date: Thu, 13 Mar 2008 14:14:32 +0000
Subject: [PATCH 287/710] This patch takes the RedmineWikiFormatting page and
 makes it available as a static HTML file locally. This way, intranet
 deployments, or other deployments do not need to be dependent upon
 redmine.org in order to display this help.

Closes #815.


git-svn-id: http://redmine.rubyforge.org/svn/trunk@1244 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 public/help/wiki_syntax.html          |   2 +-
 public/help/wiki_syntax_detailed.html | 240 ++++++++++++++++++++++++++
 2 files changed, 241 insertions(+), 1 deletion(-)
 create mode 100644 public/help/wiki_syntax_detailed.html

diff --git a/public/help/wiki_syntax.html b/public/help/wiki_syntax.html
index a3cc40326..caafacec4 100644
--- a/public/help/wiki_syntax.html
+++ b/public/help/wiki_syntax.html
@@ -59,7 +59,7 @@ table td h3 { font-size: 1.2em; text-align: left; }
 <tr><th></th><td>!<em>attached_image</em>!</td><td></td></tr>
 </table>
 
-<p><a href="http://www.redmine.org/wiki/redmine/RedmineWikiFormatting" onclick="window.open('http://www.redmine.org/wiki/redmine/RedmineWikiFormatting', '', ''); return false;">More Information</a></p>
+<p><a href="wiki_syntax_detailed.html" onclick="window.open('wiki_syntax_detailed.html', '', ''); return false;">More Information</a></p>
 
 </body>
 </html>
diff --git a/public/help/wiki_syntax_detailed.html b/public/help/wiki_syntax_detailed.html
new file mode 100644
index 000000000..deb15aca9
--- /dev/null
+++ b/public/help/wiki_syntax_detailed.html
@@ -0,0 +1,240 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<head>
+<title>RedmineWikiFormatting</title>
+<meta http-equiv="content-type" content="text/html; charset=utf-8" />
+<style>
+body { font:80% Verdana,Tahoma,Arial,sans-serif; }
+h1, h2, h3, h4 {  font-family: Trebuchet MS,Georgia,"Times New Roman",serif; }
+</style>
+</head>
+<body>
+<h1><a name="1" class="wiki-page"></a>Wiki formatting</h1>
+
+
+
+	<h2><a name="2" class="wiki-page"></a>Links</h2>
+
+
+	<h3><a name="3" class="wiki-page"></a>Redmine links</h3>
+
+
+	<p>Redmine allows hyperlinking between issues, changesets and wiki pages from anywhere wiki formatting is used.</p>
+
+
+	<ul>
+	<li>Link to an issue: <strong>#124</strong> (displays <del><a href="/issues/show/124" class="issue" title="bulk edit doesn't change the category or fixed version properties (Closed)">#124</a></del>, link is striked-through if the issue is closed)</li>
+		<li>Link to a changeset: <strong>r758</strong> (displays <a href="/repositories/revision/1?rev=758" class="changeset" title="Search engine now only searches objects the user is allowed to view.">r758</a>)</li>
+	</ul>
+
+
+	<p>Wiki links:</p>
+
+
+	<ul>
+	<li><strong>&#91;&#91;Guide&#93;&#93;</strong> displays a link to the page named 'Guide': <a href="Guide.html" class="wiki-page">Guide</a></li>
+		<li><strong>&#91;&#91;Guide|User manual&#93;&#93;</strong> displays a link to the same page but with a different text: <a href="Guide.html" class="wiki-page">User manual</a></li>
+	</ul>
+
+
+	<p>You can also link to pages of an other project wiki:</p>
+
+
+	<ul>
+	<li><strong>&#91;&#91;sandbox:some page&#93;&#93;</strong> displays a link to the page named 'Some page' of the Sandbox wiki</li>
+		<li><strong>&#91;&#91;sandbox:&#93;&#93;</strong> displays a link to the Sandbox wiki main page</li>
+	</ul>
+
+
+	<p>Wiki links are displayed in red if the page doesn't exist yet, eg: <a href="Nonexistent_page.html" class="wiki-page new">Nonexistent page</a>.</p>
+
+
+	<p>Links to others resources (0.6.devel.1064 and above):</p>
+
+
+	<ul>
+	<li>Documents:
+
+	<ul>
+	<li><strong>document#17</strong> (link to document with id 17)</li>
+		<li><strong>document:Greetings</strong> (link to the document with title "Greetings")</li>
+		<li><strong>document:"Some document"</strong> (double quotes can be used when document title contains spaces)</li>
+	</ul></li>
+	</ul>
+
+
+	<ul>
+	<li>Versions:
+
+	<ul>
+	<li><strong>version#3</strong> (link to version with id 3)</li>
+		<li><strong>version:1.0.0</strong> (link to version named "1.0.0")</li>
+		<li><strong>version:"1.0 beta 2"</strong></li>
+	</ul></li>
+	</ul>
+
+
+	<ul>
+	<li>Attachments:
+
+	<ul>
+	<li><strong>attachment:file.zip</strong> (link to the attachment of the current object named file.zip)</li>
+		<li>For now, attachments of the current object can be referenced only (if you're on an issue, it's possible to reference attachments of this issue only)</li>
+	</ul></li>
+	</ul>
+
+
+	<p>Escaping (0.6.devel.1064 and above):</p>
+
+
+	<ul>
+	<li>You can prevent Redmine links from being parsed by preceding them with an exclamation mark: !</li>
+	</ul>
+
+
+	<h3><a name="4" class="wiki-page"></a>External links</h3>
+
+
+	<p>HTTP URLs and email addresses are automatically turned into clickable links:</p>
+
+
+<pre>
+http://www.redmine.org, someone@foo.bar
+</pre>
+
+	<p>displays: <a class="external" href="http://www.redmine.org">http://www.redmine.org</a>, <a href="mailto:someone@foo.bar" class="email">someone@foo.bar</a></p>
+
+
+	<p>If you want to display a specific text instead of the URL, you can use the standard textile syntax:</p>
+
+
+<pre>
+"Redmine web site":http://www.redmine.org
+</pre>
+
+	<p>displays: <a href="http://www.redmine.org" class="external">Redmine web site</a></p>
+
+
+	<h2><a name="5" class="wiki-page"></a>Text formatting</h2>
+
+
+	<p>For things such as headlines, bold, tables, lists, Redmine supports Textile syntax.  See <a class="external" href="http://hobix.com/textile/">http://hobix.com/textile/</a> for information on using any of these features.  A few samples are included below, but the engine is capable of much more of that.</p>
+
+
+	<h3><a name="6" class="wiki-page"></a>Font style</h3>
+
+
+<pre><code>* *bold*
+* _italic_
+* _*bold italic*_
+* +underline+
+* -strike-through-
+&lt;/code></pre>
+
+	<p>Display:</p>
+
+
+	<ul>
+	<li><strong>bold</strong></li>
+		<li><em>italic</em></li>
+		<li><em>*bold italic*</em></li>
+		<li><ins>underline</ins></li>
+		<li><del>strike-through</del></li>
+	</ul>
+
+
+	<h3><a name="7" class="wiki-page"></a>Inline images</h3>
+
+
+	<ul>
+	<li><strong>&#33;image_url&#33;</strong> displays an image located at image_url (textile syntax)</li>
+		<li><strong>&#33;>image_url&#33;</strong> right floating image</li>
+		<li>If you have an image attached to your wiki page, it can be displayed inline using its filename: <strong>&#33;attached_image.png&#33;</strong></li>
+	</ul>
+
+
+	<h3><a name="8" class="wiki-page"></a>Headings</h3>
+
+
+<pre><code>h1. Heading
+h2. Subheading
+h3. Subheading
+&lt;/code></pre>
+
+	<h3><a name="9" class="wiki-page"></a>Paragraphs</h3>
+
+
+<pre><code>p&gt;. right aligned
+p=. centered
+&lt;/code></pre>
+
+	<p style="text-align:center;">This is centered paragraph.</p>
+
+
+	<h3><a name="10" class="wiki-page"></a>Blockquotes</h3>
+
+
+	<p>Start the paragraph with <strong>bq.</strong></p>
+
+
+<pre><code>bq. Rails is a full-stack framework for developing database-backed web applications according to the Model-View-Control pattern.
+To go live, all you need to add is a database and a web server.
+&lt;/code></pre>
+
+	<p>Display:</p>
+
+
+	<blockquote>
+		<p>Rails is a full-stack framework for developing database-backed web applications according to the Model-View-Control pattern.<br />To go live, all you need to add is a database and a web server.</p>
+	</blockquote>
+
+
+	<h3><a name="11" class="wiki-page"></a>Table of content</h3>
+
+
+<pre><code>{{toc}} =&gt; left aligned toc
+{{&gt;toc}} =&gt; right aligned toc
+&lt;/code></pre>
+
+	<h2><a name="12" class="wiki-page"></a>Macros</h2>
+
+
+	<p>Redmine has the following builtin macros:</p>
+
+
+	<p><dl><dt><code>hello_world</code></dt><dd><p>Sample macro.</p></dd><dt><code>include</code></dt><dd><p>Include a wiki page. Example:</p>
+
+
+	<pre><code>{{include(Foo)}}</code></pre></dd><dt><code>macro_list</code></dt><dd><p>Displays a list of all available macros, including description if available.</p></dd></dl></p>
+
+
+	<h2><a name="13" class="wiki-page"></a>Code highlighting</h2>
+
+
+	<p>Code highlightment relies on <a href="http://coderay.rubychan.de/" class="external">CodeRay</a>, a fast syntax highlighting library written completely in Ruby. It currently supports c, html, javascript, rhtml, ruby, scheme, xml languages.</p>
+
+
+	<p>You can highlight code in your wiki page using this syntax:</p>
+
+
+<pre><code>&lt;pre&gt;&lt;code class="ruby"&gt;
+  Place you code here.
+&lt;/code&gt;&lt;/pre&gt;
+</pre>&lt;/code>
+
+	<p>Example:</p>
+
+
+<pre><code class="ruby CodeRay"><span class="no"> 1</span> <span class="c"># The Greeter class</span>
+<span class="no"> 2</span> <span class="r">class</span> <span class="cl">Greeter</span>
+<span class="no"> 3</span>   <span class="r">def</span> <span class="fu">initialize</span>(name)
+<span class="no"> 4</span>     <span class="iv">@name</span> = name.capitalize
+<span class="no"> 5</span>   <span class="r">end</span>
+<span class="no"> 6</span> 
+<span class="no"> 7</span>   <span class="r">def</span> <span class="fu">salute</span>
+<span class="no"> 8</span>     puts <span class="s"><span class="dl">"</span><span class="k">Hello </span><span class="il"><span class="idl">#{</span><span class="iv">@name</span><span class="idl">}</span></span><span class="k">!</span><span class="dl">"</span></span> 
+<span class="no"> 9</span>   <span class="r">end</span>
+<span class="no"><strong>10</strong></span> <span class="r">end</span>
+</pre>&lt;/code>
+</body>
+</html>

From 84d2ea054d1dffdae57ec9c97f8251dde353f9b2 Mon Sep 17 00:00:00 2001
From: John Goerzen <jgoerzen@complete.org>
Date: Thu, 13 Mar 2008 21:46:31 +0000
Subject: [PATCH 288/710] Update Simplified Chinese lang file

Closes #840 and uses patch from chaoqun zou contained therein, updated
to trunk


git-svn-id: http://redmine.rubyforge.org/svn/trunk@1245 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 lang/zh.yml | 104 ++++++++++++++++++++++++++--------------------------
 1 file changed, 52 insertions(+), 52 deletions(-)

diff --git a/lang/zh.yml b/lang/zh.yml
index fa0674137..836241f90 100644
--- a/lang/zh.yml
+++ b/lang/zh.yml
@@ -108,7 +108,7 @@ field_author: 作者
 field_created_on: 创建于
 field_updated_on: 更新于
 field_field_format: 格式
-field_is_for_all: 应用于所有项目
+field_is_for_all: 用于所有项目
 field_possible_values: 可能的值
 field_regexp: 正则表达式
 field_min_length: 最小长度
@@ -127,7 +127,7 @@ field_subject: 主题
 field_due_date: 完成日期
 field_assigned_to: 指派给
 field_priority: 优先级
-field_fixed_version: Target version
+field_fixed_version: 目标版本
 field_user: 用户
 field_role: 角色
 field_homepage: 主页
@@ -154,12 +154,12 @@ field_attr_login: 登录名属性
 field_attr_firstname: 名字属性
 field_attr_lastname: 姓氏属性
 field_attr_mail: 邮件属性
-field_onthefly: 即时的用户生成
+field_onthefly: 即时用户生成
 field_start_date: 开始
 field_done_ratio: 完成度
 field_auth_source: 认证模式
 field_hide_mail: 隐藏我的邮件地址
-field_comments: 评论
+field_comments: 注释
 field_url: URL
 field_start_page: 起始页
 field_subproject: 子项目
@@ -170,14 +170,14 @@ field_identifier: 标识
 field_is_filter: 作为过滤条件
 field_issue_to_id: 相关问题
 field_delay: 延期
-field_assignable: 可分配给此角色的问题
+field_assignable: 问题可指派给此角色
 field_redirect_existing_links: 重定向到现有链接
 field_estimated_hours: 预期时间
 field_column_names: 列
 field_time_zone: 时区
 field_searchable: 可用作搜索条件
 field_default_value: 默认值
-field_comments_sorting: 显示评论
+field_comments_sorting: 显示注释
 
 setting_app_title: 应用程序标题
 setting_app_subtitle: 应用程序子标题
@@ -188,12 +188,12 @@ setting_self_registration: 允许自注册
 setting_attachment_max_size: 附件大小限制
 setting_issues_export_limit: 问题输出条目的限制
 setting_mail_from: 邮件发件人地址
-setting_bcc_recipients: 抄送地址 (bcc)
+setting_bcc_recipients: 使用密件抄送 (bcc)
 setting_host_name: 主机名称
 setting_text_formatting: 文本格式
 setting_wiki_compression: 压缩Wiki历史文档
 setting_feeds_limit: RSS Feed内容条数限制
-setting_autofetch_changesets: 自动获取程序变动
+setting_autofetch_changesets: 自动获取程序变更
 setting_sys_api_enabled: 启用用于版本库管理的Web Service
 setting_commit_ref_keywords: 用于引用问题的关键字
 setting_commit_fix_keywords: 用于修订问题的关键字
@@ -204,7 +204,7 @@ setting_cross_project_issue_relations: 允许不同项目之间的问题关联
 setting_issue_list_default_columns: 问题列表中显示的默认列
 setting_repositories_encodings: 版本库编码
 setting_emails_footer: 邮件签名
-setting_protocol: 协议(Protocol)
+setting_protocol: 协议
 setting_per_page_options: 每页显示条目个数的设置
 setting_user_format: 用户显示格式
 setting_activity_days_default: 在项目活动中显示的天数
@@ -220,45 +220,45 @@ project_module_repository: 版本库
 project_module_boards: 讨论区
 
 label_user: 用户
-label_user_plural: 用户列表
+label_user_plural: 用户
 label_user_new: 新建用户
 label_project: 项目
 label_project_new: 新建项目
-label_project_plural: 项目列表
+label_project_plural: 项目
 label_project_all: 所有的项目
 label_project_latest: 最近更新的项目
 label_issue: 问题
 label_issue_new: 新建问题
-label_issue_plural: 问题列表
+label_issue_plural: 问题
 label_issue_view_all: 查看所有问题
 label_issues_by: 按 %s 分组显示问题
 label_issue_added: 问题已添加
 label_issue_updated: 问题已更新
 label_document: 文档
 label_document_new: 新建文档
-label_document_plural: 文档列表
+label_document_plural: 文档
 label_document_added: 文档已添加
 label_role: 角色
-label_role_plural: 角色列表
+label_role_plural: 角色
 label_role_new: 新建角色
 label_role_and_permissions: 角色和权限
 label_member: 成员
 label_member_new: 新建成员
-label_member_plural: 成员列表
+label_member_plural: 成员
 label_tracker: 跟踪标签
 label_tracker_plural: 跟踪标签
 label_tracker_new: 新建跟踪标签
 label_workflow: 工作流程
 label_issue_status: 问题状态
-label_issue_status_plural: 问题状态列表
+label_issue_status_plural: 问题状态
 label_issue_status_new: 新建问题状态
 label_issue_category: 问题类别
-label_issue_category_plural: 问题类别列表
+label_issue_category_plural: 问题类别
 label_issue_category_new: 新建问题类别
 label_custom_field: 自定义字段
-label_custom_field_plural: 自定义字段列表
+label_custom_field_plural: 自定义字段
 label_custom_field_new: 新建自定义字段
-label_enumerations: 枚举值列表
+label_enumerations: 枚举值
 label_enumeration_new: 新建枚举值
 label_information: 信息
 label_information_plural: 信息
@@ -268,7 +268,7 @@ label_password_lost: 忘记密码
 label_home: 主页
 label_my_page: 我的工作台
 label_my_account: 我的帐号
-label_my_projects: 我的项目列表
+label_my_projects: 我的项目
 label_administration: 管理
 label_login: 登录
 label_logout: 退出
@@ -280,14 +280,15 @@ label_last_updates: 最后更新
 label_last_updates_plural: %d 最后更新
 label_registered_on: 注册于
 label_activity: 活动
+label_overall_activity: 全部活动
 label_new: 新建
 label_logged_as: 登录为
 label_environment: 环境
 label_authentication: 认证
 label_auth_source: 认证模式
 label_auth_source_new: 新建认证模式
-label_auth_source_plural: 认证模式列表
-label_subproject_plural: 子项目列表
+label_auth_source_plural: 认证模式
+label_subproject_plural: 子项目
 label_min_max_length: 最小 - 最大 长度
 label_list: 列表
 label_date: 日期
@@ -301,18 +302,18 @@ label_attribute_plural: 属性
 label_download: %d 次下载
 label_download_plural: %d 次下载
 label_no_data: 没有任何数据可供显示
-label_change_status: 状态改变
+label_change_status: 变更状态
 label_history: 历史记录
 label_attachment: 文件
 label_attachment_new: 新建文件
 label_attachment_delete: 删除文件
-label_attachment_plural: 文件列表
+label_attachment_plural: 文件
 label_file_added: 文件已添加
 label_report: 报表
 label_report_plural: 报表
 label_news: 新闻
 label_news_new: 添加新闻
-label_news_plural: 新闻列表
+label_news_plural: 新闻
 label_news_latest: 最近的新闻
 label_news_view_all: 查看所有新闻
 label_news_added: 新闻已添加
@@ -321,17 +322,17 @@ label_settings: 配置
 label_overview: 概述
 label_version: 版本
 label_version_new: 新建版本
-label_version_plural: 版本列表
+label_version_plural: 版本
 label_confirmation: 确认
 label_export_to: 导出
 label_read: 读取...
-label_public_projects: 公开的项目列表
+label_public_projects: 公开的项目
 label_open_issues: 打开
 label_open_issues_plural: 打开
 label_closed_issues: 已关闭
 label_closed_issues_plural: 已关闭
 label_total: 合计
-label_permissions: 权限列表
+label_permissions: 权限
 label_current_status: 当前状态
 label_new_statuses_allowed: 可变更的新状态
 label_all: 全部
@@ -345,21 +346,21 @@ label_add_note: 添加说明
 label_per_page: 每页
 label_calendar: 日历
 label_months_from: 个月以来
-label_gantt: 甘特图(Gantt)
+label_gantt: 甘特图
 label_internal: 内部
-label_last_changes: 最近的 %d 次更新
-label_change_view_all: 查看所有更新
+label_last_changes: 最近的 %d 次变更
+label_change_view_all: 查看所有变更
 label_personalize_page: 个性化定制本页
 label_comment: 评论
-label_comment_plural: 评论列表
+label_comment_plural: 评论
 label_comment_add: 添加评论
 label_comment_added: 评论已添加
 label_comment_delete: 删除评论
 label_query: 自定义查询
-label_query_plural: 自定义查询列表
+label_query_plural: 自定义查询
 label_query_new: 新建查询
 label_filter_add: 增加过滤器
-label_filter_plural: 过滤器列表
+label_filter_plural: 过滤器
 label_equals: 等于
 label_not_equals: 不等于
 label_in_less_than: 剩余天数小于
@@ -393,8 +394,8 @@ label_added: 已添加
 label_modified: 已修改
 label_deleted: 已删除
 label_latest_revision: 最近的修订版本
-label_latest_revision_plural: 最近的修订版本列表
-label_view_revisions: 查看修订列表
+label_latest_revision_plural: 最近的修订版本
+label_view_revisions: 查看修订
 label_max_size: 最大尺寸
 label_on: 'on'
 label_sort_highest: 置顶
@@ -418,18 +419,18 @@ label_index_by_date: 按日期索引
 label_current_version: 当前版本
 label_preview: 预览
 label_feed_plural: Feeds
-label_changes_details: 所有更新的详情
+label_changes_details: 所有变更的详情
 label_issue_tracking: 问题跟踪
 label_spent_time: 耗时
 label_f_hour: %.2f 小时
 label_f_hour_plural: %.2f 小时
 label_time_tracking: 时间跟踪
-label_change_plural: 更新列表
+label_change_plural: 变更
 label_statistics: 统计
 label_commits_per_month: 每月提交次数
 label_commits_per_author: 每用户提交次数
-label_view_diff: 查看变动
-label_diff_inline: 在一行
+label_view_diff: 查看差别
+label_diff_inline: 直列
 label_diff_side_by_side: 并排
 label_options: 选项
 label_copy_workflow_from: 从以下项目复制工作流程
@@ -477,15 +478,15 @@ label_module_plural: 模块
 label_added_time_by: 由 %s 在 %s 之前添加
 label_updated_time:  更新于 %s 前
 label_jump_to_a_project: 选择一个项目...
-label_file_plural: 文件列表
-label_changeset_plural: 变动列表
+label_file_plural: 文件
+label_changeset_plural: 变更
 label_default_columns: 默认列
 label_no_change_option: (不变)
 label_bulk_edit_selected_issues: 批量修改选中的问题
 label_theme: 主题
 label_default: 默认
 label_search_titles_only: 仅在标题中搜索
-label_user_mail_option_all: "收取我所参与的项目的所有通知"
+label_user_mail_option_all: "收取我的项目的所有通知"
 label_user_mail_option_selected: "收取选中项目的所有通知..."
 label_user_mail_option_none: "只收取我跟踪或参与的项目的通知"
 label_user_mail_no_self_notified: "不要发送对我自己提交的修改的通知"
@@ -541,7 +542,7 @@ button_reset: 重置
 button_rename: 重命名
 button_change_password: 修改密码
 button_copy: 复制
-button_annotate: 注释
+button_annotate: 追溯
 button_update: 更新
 button_configure: 配置
 
@@ -549,13 +550,13 @@ status_active: 活动的
 status_registered: 已注册
 status_locked: 已锁定
 
-text_select_mail_notifications: 选择需要发送邮件通知的动作。
+text_select_mail_notifications: 选择需要发送邮件通知的动作
 text_regexp_info: eg. ^[A-Z0-9]+$
 text_min_max_length_info: 0 表示没有限制
 text_project_destroy_confirmation: 您确信要删除这个项目以及所有相关的数据吗？
-text_workflow_edit: 选择一个角色和跟踪标签来编辑这个工作流程
+text_workflow_edit: 选择角色和跟踪标签来编辑工作流程
 text_are_you_sure: 您确定？
-text_journal_changed: 从 %s 更改为 %s
+text_journal_changed: 从 %s 变更为 %s
 text_journal_set_to: 设置为 %s
 text_journal_deleted: 已删除
 text_tip_task_begin_day: 今天开始的任务
@@ -564,7 +565,7 @@ text_tip_task_begin_end_day: 今天开始并结束的任务
 text_project_identifier_info: '只允许使用小写字母（a-z），数字和连字符（-）。<br />请注意，标识符保存后将不可修改。'
 text_caracters_maximum: 最多 %d 个字符。
 text_caracters_minimum: 至少需要 %d 个字符。
-text_length_between: 长度必须在 %d 和 %d 个字符之间。
+text_length_between: 长度必须在 %d 到 %d 个字符之间。
 text_tracker_no_workflow: 此跟踪标签未定义工作流程
 text_unallowed_characters: 非法字符
 text_comma_separated: 可以使用多个值（用逗号,分开）。
@@ -576,9 +577,9 @@ text_issue_category_destroy_question: 有一些问题（%d 个）属于此类别
 text_issue_category_destroy_assignments: 删除问题的所属类别（问题变为无类别）
 text_issue_category_reassign_to: 为问题选择其它类别
 text_user_mail_option: "对于没有选中的项目，您将只会收到您跟踪或参与的项目的通知（比如说，您是问题的报告者, 或被指派解决此问题）。"
-text_no_configuration_data: "角色、跟踪标签、问题状态列表和工作流程还没有设置。\n强烈建议您先载入默认设置，然后在此基础上进行修改。"
+text_no_configuration_data: "角色、跟踪标签、问题状态和工作流程还没有设置。\n强烈建议您先载入默认设置，然后在此基础上进行修改。"
 text_load_default_configuration: 载入默认设置
-text_status_changed_by_changeset: 已应用到变动列表 %s.
+text_status_changed_by_changeset: 已应用到变更列表 %s.
 text_issues_destroy_confirmation: '您确定要删除选中的问题吗？'
 text_select_project_modules: '请选择此项目可以使用的模块：'
 text_default_administrator_account_changed: 默认的管理员帐号已改变
@@ -592,7 +593,7 @@ text_reassign_time_entries: '将已上报的工作量指定到此问题：'
 default_role_manager: 管理人员
 default_role_developper: 开发人员
 default_role_reporter: 报告人员
-default_tracker_bug: Bug
+default_tracker_bug: 错误
 default_tracker_feature: 功能
 default_tracker_support: 支持
 default_issue_status_new: 新建
@@ -614,5 +615,4 @@ default_activity_development: 开发
 enumeration_issue_priorities: 问题优先级
 enumeration_doc_categories: 文档类别
 enumeration_activities: 活动（时间跟踪）
-label_overall_activity: Overall activity
 setting_default_projects_public: New projects are public by default

From cdf3e2b6ef0f2c2bd79c79417a7ae7c9e5280046 Mon Sep 17 00:00:00 2001
From: John Goerzen <jgoerzen@complete.org>
Date: Fri, 14 Mar 2008 00:52:26 +0000
Subject: [PATCH 289/710] Fix trac converter WikiCaps to put a space before
 converted WikiCaps words

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1246 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 lib/tasks/migrate_from_trac.rake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/tasks/migrate_from_trac.rake b/lib/tasks/migrate_from_trac.rake
index b07be03b8..51d85fe0f 100644
--- a/lib/tasks/migrate_from_trac.rake
+++ b/lib/tasks/migrate_from_trac.rake
@@ -218,7 +218,7 @@ namespace :redmine do
         text = text.gsub(/\[wiki:([^\s\]]+).*\]/) {|s| "[[#{$1.delete(',./?;|:')}]]"}
 
 	# Links to pages UsingJustCaps
-	text = text.gsub(/[^!]\b([A-Z][a-z]+[A-Z][a-zA-Z]+)/, '[[\1]]')
+	text = text.gsub(/[^!]\b([A-Z][a-z]+[A-Z][a-zA-Z]+)/, ' [[\1]]')
 	# Normalize things that were supposed to not be links
 	# like !NotALink
 	text = text.gsub(/(^| )!([A-Z][A-Za-z]+)/, '\1\2')

From b8b991a7dc3f253e1fbcb359e8280e7d0ff69b29 Mon Sep 17 00:00:00 2001
From: John Goerzen <jgoerzen@complete.org>
Date: Fri, 14 Mar 2008 13:48:32 +0000
Subject: [PATCH 290/710] Added documentation of commit: syntax to detailed
 wiki syntax screen

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1247 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 public/help/wiki_syntax_detailed.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/public/help/wiki_syntax_detailed.html b/public/help/wiki_syntax_detailed.html
index deb15aca9..03e787ad8 100644
--- a/public/help/wiki_syntax_detailed.html
+++ b/public/help/wiki_syntax_detailed.html
@@ -25,6 +25,7 @@ h1, h2, h3, h4 {  font-family: Trebuchet MS,Georgia,"Times New Roman",serif; }
 	<ul>
 	<li>Link to an issue: <strong>#124</strong> (displays <del><a href="/issues/show/124" class="issue" title="bulk edit doesn't change the category or fixed version properties (Closed)">#124</a></del>, link is striked-through if the issue is closed)</li>
 		<li>Link to a changeset: <strong>r758</strong> (displays <a href="/repositories/revision/1?rev=758" class="changeset" title="Search engine now only searches objects the user is allowed to view.">r758</a>)</li>
+		<li>Link to a changeset with a non-numeric hash: <strong>commit:"c6f4d0fd"</strong> (displays c6f4d0fd).  Added in <a href="/repositories/revision/1?rev=1236" class="changeset" title="Merged Git support branch (r1200 to r1226).">r1236</a>.</li>
 	</ul>
 
 

From 4957752d122388f15738b47b2872465da81a6d32 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Fri, 14 Mar 2008 18:59:10 +0000
Subject: [PATCH 291/710] Strip repository urls (closes #852).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1248 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/models/repository.rb     | 19 +++++++++++++++++++
 test/unit/repository_test.rb |  9 +++++++++
 2 files changed, 28 insertions(+)

diff --git a/app/models/repository.rb b/app/models/repository.rb
index 229c8dae4..8b1f8d0af 100644
--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -20,6 +20,16 @@ class Repository < ActiveRecord::Base
   has_many :changesets, :dependent => :destroy, :order => "#{Changeset.table_name}.committed_on DESC, #{Changeset.table_name}.id DESC"
   has_many :changes, :through => :changesets
     
+  # Removes leading and trailing whitespace
+  def url=(arg)
+    write_attribute(:url, arg ? arg.to_s.strip : nil)
+  end
+  
+  # Removes leading and trailing whitespace
+  def root_url=(arg)
+    write_attribute(:root_url, arg ? arg.to_s.strip : nil)
+  end
+
   def scm
     @scm ||= self.scm_adapter.new url, root_url, login, password
     update_attribute(:root_url, @scm.root_url) if root_url.blank?
@@ -88,4 +98,13 @@ class Repository < ActiveRecord::Base
   rescue
     nil
   end
+  
+  private
+  
+  def before_save
+    # Strips url and root_url
+    url.strip!
+    root_url.strip!
+    true
+  end
 end
diff --git a/test/unit/repository_test.rb b/test/unit/repository_test.rb
index 21fb00b80..7764ee04a 100644
--- a/test/unit/repository_test.rb
+++ b/test/unit/repository_test.rb
@@ -98,4 +98,13 @@ class RepositoryTest < Test::Unit::TestCase
     assert_not_equal( comment, changeset.comments )
     assert_equal( 'This is a loooooooooooooooooooooooooooong comment', changeset.comments )
   end
+  
+  def test_for_urls_strip
+    repository = Repository::Cvs.create(:project => Project.find(4), :url => ' :pserver:login:password@host:/path/to/the/repository',
+                                                                     :root_url => 'foo  ')
+    assert repository.save
+    repository.reload
+    assert_equal ':pserver:login:password@host:/path/to/the/repository', repository.url
+    assert_equal 'foo', repository.root_url
+  end
 end

From 993b60d61eb927cff21ea0b06c1631eb986f6a51 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Fri, 14 Mar 2008 21:17:09 +0000
Subject: [PATCH 292/710] Adds 2 permissions (closes #859): *
 edit_time_entries: lets a user edit/delete any time entry *
 edit_own_time_entries: lets a user edit/delete its own time entries only

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1249 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/timelog_controller.rb      | 16 +++++++-
 app/models/time_entry.rb                   |  2 +-
 app/views/issues/show.rhtml                |  2 +-
 app/views/timelog/_list.rhtml              | 13 +++++--
 config/routes.rb                           |  1 +
 lib/redmine.rb                             |  2 +
 test/fixtures/roles.yml                    |  3 ++
 test/functional/timelog_controller_test.rb | 45 +++++++++++++++++++++-
 8 files changed, 76 insertions(+), 8 deletions(-)

diff --git a/app/controllers/timelog_controller.rb b/app/controllers/timelog_controller.rb
index d672ac577..38c1fb04c 100644
--- a/app/controllers/timelog_controller.rb
+++ b/app/controllers/timelog_controller.rb
@@ -20,6 +20,8 @@ class TimelogController < ApplicationController
   menu_item :issues
   before_filter :find_project, :authorize
 
+  verify :method => :post, :only => :destroy, :redirect_to => { :action => :details }
+  
   helper :sort
   include SortHelper
   helper :issues
@@ -198,16 +200,24 @@ class TimelogController < ApplicationController
   end
   
   def edit
-    render_404 and return if @time_entry && @time_entry.user != User.current
+    render_403 and return if @time_entry && !@time_entry.editable_by?(User.current)
     @time_entry ||= TimeEntry.new(:project => @project, :issue => @issue, :user => User.current, :spent_on => Date.today)
     @time_entry.attributes = params[:time_entry]
     if request.post? and @time_entry.save
       flash[:notice] = l(:notice_successful_update)
-      redirect_to :action => 'details', :project_id => @time_entry.project, :issue_id => @time_entry.issue
+      redirect_to :action => 'details', :project_id => @time_entry.project
       return
     end    
     @activities = Enumeration::get_values('ACTI')
   end
+  
+  def destroy
+    render_404 and return unless @time_entry
+    render_403 and return unless @time_entry.editable_by?(User.current)
+    @time_entry.destroy
+    flash[:notice] = l(:notice_successful_delete)
+    redirect_to :action => 'details', :project_id => @time_entry.project
+  end
 
 private
   def find_project
@@ -223,5 +233,7 @@ private
       render_404
       return false
     end
+  rescue ActiveRecord::RecordNotFound
+    render_404
   end
 end
diff --git a/app/models/time_entry.rb b/app/models/time_entry.rb
index 0f8f62889..bcf6d1223 100644
--- a/app/models/time_entry.rb
+++ b/app/models/time_entry.rb
@@ -50,7 +50,7 @@ class TimeEntry < ActiveRecord::Base
   
   # Returns true if the time entry can be edited by usr, otherwise false
   def editable_by?(usr)
-    usr == self.user
+    (usr == user && usr.allowed_to?(:edit_own_time_entries, project)) || usr.allowed_to?(:edit_time_entries, project)
   end
   
   def self.visible_by(usr)
diff --git a/app/views/issues/show.rhtml b/app/views/issues/show.rhtml
index d9727cae7..77d9ce640 100644
--- a/app/views/issues/show.rhtml
+++ b/app/views/issues/show.rhtml
@@ -33,7 +33,7 @@
     <td><b><%=l(:field_category)%> :</b></td><td><%=h @issue.category ? @issue.category.name : "-" %></td>
     <% if User.current.allowed_to?(:view_time_entries, @project) %>
     <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>
+    <td><%= @issue.spent_hours > 0 ? (link_to lwr(:label_f_hour, @issue.spent_hours), {:controller => 'timelog', :action => 'details', :project_id => @project, :issue_id => @issue}, :class => 'icon icon-time') : "-" %></td>
     <% end %>
 </tr>
 <tr>
diff --git a/app/views/timelog/_list.rhtml b/app/views/timelog/_list.rhtml
index ae5b6376a..67e3c67d5 100644
--- a/app/views/timelog/_list.rhtml
+++ b/app/views/timelog/_list.rhtml
@@ -23,9 +23,16 @@
 </td>
 <td class="comments"><%=h entry.comments %></td>
 <td class="hours"><%= html_hours("%.2f" % entry.hours) %></td>
-<td align="center"><%= link_to_if_authorized(l(:button_edit), 
-                                             {:controller => 'timelog', :action => 'edit', :id => entry},
-                                             :class => 'icon icon-edit') if entry.editable_by?(User.current) %></td>
+<td align="center">
+<% if entry.editable_by?(User.current) -%>
+    <%= link_to image_tag('edit.png'), {:controller => 'timelog', :action => 'edit', :id => entry},
+                                       :title => l(:button_edit) %>
+    <%= link_to image_tag('delete.png'), {:controller => 'timelog', :action => 'destroy', :id => entry},
+                                         :confirm => l(:text_are_you_sure),
+                                         :method => :post,
+                                         :title => l(:button_delete) %>
+<% end -%>
+</td>
 </tr>
 <% end -%>
 </tbdoy>
diff --git a/config/routes.rb b/config/routes.rb
index 2610c2623..0edb71a06 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -20,6 +20,7 @@ ActionController::Routing::Routes.draw do |map|
   map.connect 'projects/:project_id/news/:action', :controller => 'news'
   map.connect 'projects/:project_id/documents/:action', :controller => 'documents'
   map.connect 'projects/:project_id/boards/:action/:id', :controller => 'boards'
+  map.connect 'projects/:project_id/timelog/:action/:id', :controller => 'timelog'
   map.connect 'boards/:board_id/topics/:action/:id', :controller => 'messages'
 
   map.with_options :controller => 'repositories' do |omap|
diff --git a/lib/redmine.rb b/lib/redmine.rb
index 4c5cbdaae..5443eef4a 100644
--- a/lib/redmine.rb
+++ b/lib/redmine.rb
@@ -49,6 +49,8 @@ Redmine::AccessControl.map do |map|
   map.project_module :time_tracking do |map|
     map.permission :log_time, {:timelog => :edit}, :require => :loggedin
     map.permission :view_time_entries, :timelog => [:details, :report]
+    map.permission :edit_time_entries, {:timelog => [:edit, :destroy]}, :require => :member
+    map.permission :edit_own_time_entries, {:timelog => [:edit, :destroy]}, :require => :loggedin
   end
   
   map.project_module :news do |map|
diff --git a/test/fixtures/roles.yml b/test/fixtures/roles.yml
index c4d417a09..c834828c6 100644
--- a/test/fixtures/roles.yml
+++ b/test/fixtures/roles.yml
@@ -66,6 +66,8 @@ roles_001:
     - :view_calendar
     - :log_time
     - :view_time_entries
+    - :edit_time_entries
+    - :delete_time_entries
     - :manage_news
     - :comment_news
     - :view_documents
@@ -106,6 +108,7 @@ roles_002:
     - :view_calendar
     - :log_time
     - :view_time_entries
+    - :edit_own_time_entries
     - :manage_news
     - :comment_news
     - :view_documents
diff --git a/test/functional/timelog_controller_test.rb b/test/functional/timelog_controller_test.rb
index 4163ce548..66247e569 100644
--- a/test/functional/timelog_controller_test.rb
+++ b/test/functional/timelog_controller_test.rb
@@ -22,13 +22,56 @@ require 'timelog_controller'
 class TimelogController; def rescue_action(e) raise e end; end
 
 class TimelogControllerTest < Test::Unit::TestCase
-  fixtures :projects, :issues, :time_entries, :users, :trackers, :enumerations, :issue_statuses
+  fixtures :projects, :roles, :members, :issues, :time_entries, :users, :trackers, :enumerations, :issue_statuses
 
   def setup
     @controller = TimelogController.new
     @request    = ActionController::TestRequest.new
     @response   = ActionController::TestResponse.new
   end
+  
+  def test_create
+    @request.session[:user_id] = 3
+    post :edit, :project_id => 1,
+                :time_entry => {:comments => 'Some work on TimelogControllerTest',
+                                :activity_id => '10',
+                                :spent_on => '2008-03-14',
+                                :issue_id => '1',
+                                :hours => '7.3'}
+    assert_redirected_to 'projects/ecookbook/timelog/details'
+    
+    i = Issue.find(1)
+    t = TimeEntry.find_by_comments('Some work on TimelogControllerTest')
+    assert_not_nil t
+    assert_equal 7.3, t.hours
+    assert_equal 3, t.user_id
+    assert_equal i, t.issue
+    assert_equal i.project, t.project
+  end
+  
+  def test_update
+    entry = TimeEntry.find(1)
+    assert_equal 1, entry.issue_id
+    assert_equal 2, entry.user_id
+    
+    @request.session[:user_id] = 1
+    post :edit, :id => 1,
+                :time_entry => {:issue_id => '2',
+                                :hours => '8'}
+    assert_redirected_to 'projects/ecookbook/timelog/details'
+    entry.reload
+    
+    assert_equal 8, entry.hours
+    assert_equal 2, entry.issue_id
+    assert_equal 2, entry.user_id
+  end
+  
+  def destroy
+    @request.session[:user_id] = 2
+    post :destroy, :id => 1
+    assert_redirected_to 'projects/ecookbook/timelog/details'
+    assert_nil TimeEntry.find_by_id(1)
+  end
 
   def test_report_no_criteria
     get :report, :project_id => 1

From aec989707edc47161192eba74f1a88123b12360a Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sat, 15 Mar 2008 08:27:38 +0000
Subject: [PATCH 293/710] Workflow copy: * added the ability the copy an
 existing workflow when creating a new role (closes #841) * use a single raw
 insert statement to copy tracker/role workflow rather than instantiating
 hundreds/thousands of objects

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1252 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/roles_controller.rb      |  5 ++
 app/controllers/trackers_controller.rb   |  8 +--
 app/models/role.rb                       | 13 +++-
 app/models/tracker.rb                    | 13 +++-
 app/views/roles/_form.rhtml              |  4 ++
 app/views/trackers/_form.rhtml           |  5 +-
 test/functional/roles_controller_test.rb | 92 ++++++++++++++++++++++++
 test/unit/role_test.rb                   | 33 +++++++++
 test/unit/tracker_test.rb                | 33 +++++++++
 9 files changed, 196 insertions(+), 10 deletions(-)
 create mode 100644 test/functional/roles_controller_test.rb
 create mode 100644 test/unit/role_test.rb
 create mode 100644 test/unit/tracker_test.rb

diff --git a/app/controllers/roles_controller.rb b/app/controllers/roles_controller.rb
index 4796bb7f0..9fdd9701b 100644
--- a/app/controllers/roles_controller.rb
+++ b/app/controllers/roles_controller.rb
@@ -36,10 +36,15 @@ class RolesController < ApplicationController
     # Prefills the form with 'Non member' role permissions
     @role = Role.new(params[:role] || {:permissions => Role.non_member.permissions})
     if request.post? && @role.save
+      # workflow copy
+      if !params[:copy_workflow_from].blank? && (copy_from = Role.find_by_id(params[:copy_workflow_from]))
+        @role.workflows.copy(copy_from)
+      end
       flash[:notice] = l(:notice_successful_create)
       redirect_to :action => 'list'
     end
     @permissions = @role.setable_permissions
+    @roles = Role.find :all, :order => 'builtin, position'
   end
 
   def edit
diff --git a/app/controllers/trackers_controller.rb b/app/controllers/trackers_controller.rb
index 46edea548..3d7dbd5c5 100644
--- a/app/controllers/trackers_controller.rb
+++ b/app/controllers/trackers_controller.rb
@@ -37,16 +37,12 @@ class TrackersController < ApplicationController
     if request.post? and @tracker.save
       # workflow copy
       if !params[:copy_workflow_from].blank? && (copy_from = Tracker.find_by_id(params[:copy_workflow_from]))
-        Workflow.transaction do
-          copy_from.workflows.find(:all, :include => [:role, :old_status, :new_status]).each do |w|
-            Workflow.create(:tracker_id => @tracker.id, :role => w.role, :old_status => w.old_status, :new_status => w.new_status)
-          end
-        end
+        @tracker.workflows.copy(copy_from)
       end
       flash[:notice] = l(:notice_successful_create)
       redirect_to :action => 'list'
     end
-    @trackers = Tracker.find :all
+    @trackers = Tracker.find :all, :order => 'position'
   end
 
   def edit
diff --git a/app/models/role.rb b/app/models/role.rb
index 015146dc4..6f1fb4768 100644
--- a/app/models/role.rb
+++ b/app/models/role.rb
@@ -21,7 +21,18 @@ class Role < ActiveRecord::Base
   BUILTIN_ANONYMOUS  = 2
   
   before_destroy :check_deletable
-  has_many :workflows, :dependent => :delete_all
+  has_many :workflows, :dependent => :delete_all do
+    def copy(role)
+      raise "Can not copy workflow from a #{role.class}" unless role.is_a?(Role)
+      raise "Can not copy workflow from/to an unsaved role" if proxy_owner.new_record? || role.new_record?
+      clear
+      connection.insert "INSERT INTO workflows (tracker_id, old_status_id, new_status_id, role_id)" +
+                        " SELECT tracker_id, old_status_id, new_status_id, #{proxy_owner.id}" +
+                        " FROM workflows" +
+                        " WHERE role_id = #{role.id}"
+    end
+  end
+  
   has_many :members
   acts_as_list
   
diff --git a/app/models/tracker.rb b/app/models/tracker.rb
index 07253a227..ecee908eb 100644
--- a/app/models/tracker.rb
+++ b/app/models/tracker.rb
@@ -18,7 +18,18 @@
 class Tracker < ActiveRecord::Base
   before_destroy :check_integrity  
   has_many :issues
-  has_many :workflows, :dependent => :delete_all
+  has_many :workflows, :dependent => :delete_all do
+    def copy(tracker)
+      raise "Can not copy workflow from a #{tracker.class}" unless tracker.is_a?(Tracker)
+      raise "Can not copy workflow from/to an unsaved tracker" if proxy_owner.new_record? || tracker.new_record?
+      clear
+      connection.insert "INSERT INTO workflows (tracker_id, old_status_id, new_status_id, role_id)" +
+                        " SELECT #{proxy_owner.id}, old_status_id, new_status_id, role_id" +
+                        " FROM workflows" +
+                        " WHERE tracker_id = #{tracker.id}"
+    end
+  end
+  
   has_and_belongs_to_many :projects
   has_and_belongs_to_many :custom_fields, :class_name => 'IssueCustomField', :join_table => "#{table_name_prefix}custom_fields_trackers#{table_name_suffix}", :association_foreign_key => 'custom_field_id'
   acts_as_list
diff --git a/app/views/roles/_form.rhtml b/app/views/roles/_form.rhtml
index b77cbacdf..58dc2af41 100644
--- a/app/views/roles/_form.rhtml
+++ b/app/views/roles/_form.rhtml
@@ -4,6 +4,10 @@
 <div class="box">
 <p><%= f.text_field :name, :required => true %></p>
 <p><%= f.check_box :assignable %></p>
+<% if @role.new_record? && @roles.any? %>
+<p><label><%= l(:label_copy_workflow_from) %></label>
+<%= select_tag(:copy_workflow_from, content_tag("option") + options_from_collection_for_select(@roles, :id, :name)) %></p>
+<% end %>
 </div>
 <% end %>
 
diff --git a/app/views/trackers/_form.rhtml b/app/views/trackers/_form.rhtml
index 26a34443c..856b70bbc 100644
--- a/app/views/trackers/_form.rhtml
+++ b/app/views/trackers/_form.rhtml
@@ -4,8 +4,9 @@
 <p><%= f.text_field :name, :required => true %></p>
 <p><%= f.check_box :is_in_chlog %></p>
 <p><%= f.check_box :is_in_roadmap %></p>
-<% if @tracker.new_record? %>
-<p><label><%= l(:label_copy_workflow_from) %></label> <%= select_tag(:copy_workflow_from, content_tag("option") + options_from_collection_for_select(@trackers, :id, :name)) %></p>
+<% if @tracker.new_record? && @trackers.any? %>
+<p><label><%= l(:label_copy_workflow_from) %></label>
+<%= select_tag(:copy_workflow_from, content_tag("option") + options_from_collection_for_select(@trackers, :id, :name)) %></p>
 <% end %>
 <!--[eoform:tracker]-->
 </div>
diff --git a/test/functional/roles_controller_test.rb b/test/functional/roles_controller_test.rb
new file mode 100644
index 000000000..3c245edf7
--- /dev/null
+++ b/test/functional/roles_controller_test.rb
@@ -0,0 +1,92 @@
+# 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 File.dirname(__FILE__) + '/../test_helper'
+require 'roles_controller'
+
+# Re-raise errors caught by the controller.
+class RolesController; def rescue_action(e) raise e end; end
+
+class RolesControllerTest < Test::Unit::TestCase
+  fixtures :roles, :users, :members, :workflows
+  
+  def setup
+    @controller = RolesController.new
+    @request    = ActionController::TestRequest.new
+    @response   = ActionController::TestResponse.new
+    User.current = nil
+    @request.session[:user_id] = 1 # admin
+  end
+  
+  def test_get_new
+    get :new
+    assert_response :success
+    assert_template 'new'
+  end
+  
+  def test_post_new_with_validaton_failure
+    post :new, :role => {:name => '',
+                         :permissions => ['add_issues', 'edit_issues', 'log_time', ''],
+                         :assignable => '0'}
+    
+    assert_response :success
+    assert_template 'new'
+    assert_tag :tag => 'div', :attributes => { :id => 'errorExplanation' }
+  end
+  
+  def test_post_new_without_workflow_copy
+    post :new, :role => {:name => 'RoleWithoutWorkflowCopy',
+                         :permissions => ['add_issues', 'edit_issues', 'log_time', ''],
+                         :assignable => '0'}
+    
+    assert_redirected_to 'roles/list'
+    role = Role.find_by_name('RoleWithoutWorkflowCopy')
+    assert_not_nil role
+    assert_equal [:add_issues, :edit_issues, :log_time], role.permissions
+    assert !role.assignable?
+  end
+
+  def test_post_new_with_workflow_copy
+    post :new, :role => {:name => 'RoleWithWorkflowCopy',
+                         :permissions => ['add_issues', 'edit_issues', 'log_time', ''],
+                         :assignable => '0'},
+               :copy_workflow_from => '1'
+    
+    assert_redirected_to 'roles/list'
+    role = Role.find_by_name('RoleWithWorkflowCopy')
+    assert_not_nil role
+    assert_equal Role.find(1).workflows.size, role.workflows.size
+  end
+  
+  def test_get_edit
+    get :edit, :id => 1
+    assert_response :success
+    assert_template 'edit'
+    assert_equal Role.find(1), assigns(:role)
+  end
+
+  def test_post_edit
+    post :edit, :id => 1,
+                :role => {:name => 'Manager',
+                          :permissions => ['edit_project', ''],
+                          :assignable => '0'}
+    
+    assert_redirected_to 'roles/list'
+    role = Role.find(1)
+    assert_equal [:edit_project], role.permissions
+  end
+end
diff --git a/test/unit/role_test.rb b/test/unit/role_test.rb
new file mode 100644
index 000000000..5e0d16753
--- /dev/null
+++ b/test/unit/role_test.rb
@@ -0,0 +1,33 @@
+# redMine - project management software
+# Copyright (C) 2006-2008  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 File.dirname(__FILE__) + '/../test_helper'
+
+class RoleTest < Test::Unit::TestCase
+  fixtures :roles, :workflows
+
+  def test_copy_workflows
+    source = Role.find(1)
+    assert_equal 90, source.workflows.size
+    
+    target = Role.new(:name => 'Target')
+    assert target.save
+    assert target.workflows.copy(source)
+    target.reload
+    assert_equal 90, target.workflows.size
+  end
+end
diff --git a/test/unit/tracker_test.rb b/test/unit/tracker_test.rb
new file mode 100644
index 000000000..7adacef3c
--- /dev/null
+++ b/test/unit/tracker_test.rb
@@ -0,0 +1,33 @@
+# redMine - project management software
+# Copyright (C) 2006-2008  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 File.dirname(__FILE__) + '/../test_helper'
+
+class TrackerTest < Test::Unit::TestCase
+  fixtures :trackers, :workflows
+
+  def test_copy_workflows
+    source = Tracker.find(1)
+    assert_equal 90, source.workflows.size
+    
+    target = Tracker.new(:name => 'Target')
+    assert target.save
+    assert target.workflows.copy(source)
+    target.reload
+    assert_equal 90, target.workflows.size
+  end
+end

From 185ecd585438fe4a08dcede971dcbafc9b513524 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sat, 15 Mar 2008 09:25:35 +0000
Subject: [PATCH 294/710] =?UTF-8?q?Translations=20update=20(close=20#845,?=
 =?UTF-8?q?=20#822):=20*=20Finnish=20(Antti=20Perki=C3=B6m=C3=A4ki)=20*=20?=
 =?UTF-8?q?Czech=20(Maxim=20Kru=C5=A1ina)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1253 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 lang/cs.yml | 456 ++++++++++++++++++++++++++--------------------------
 lang/fi.yml |  35 ++--
 2 files changed, 243 insertions(+), 248 deletions(-)

diff --git a/lang/cs.yml b/lang/cs.yml
index 60bb0e022..2b215bec0 100644
--- a/lang/cs.yml
+++ b/lang/cs.yml
@@ -1,10 +1,10 @@
 _gloc_rule_default: '|n| n==1 ? "" : "_plural" '
 
-actionview_datehelper_select_day_prefix:
+actionview_datehelper_select_day_prefix: 
 actionview_datehelper_select_month_names: Leden,Únor,Březen,Duben,Květen,Červen,Červenec,Srpen,Září,Říjen,Listopad,Prosinec
 actionview_datehelper_select_month_names_abbr: Led,Úno,Bře,Dub,Kvě,Čer,Čvc,Srp,Zář,Říj,Lis,Pro
-actionview_datehelper_select_month_prefix:
-actionview_datehelper_select_year_prefix:
+actionview_datehelper_select_month_prefix: 
+actionview_datehelper_select_year_prefix: 
 actionview_datehelper_time_in_words_day: 1 den
 actionview_datehelper_time_in_words_day_plural: %d dny
 actionview_datehelper_time_in_words_hour_about: asi hodinu
@@ -22,16 +22,16 @@ actionview_instancetag_blank_option: Prosím vyberte
 activerecord_error_inclusion: není zahrnuto v seznamu
 activerecord_error_exclusion: je rezervováno
 activerecord_error_invalid: je neplatné
-activerecord_error_confirmation: doesn't match confirmation
-activerecord_error_accepted: must be accepted
+activerecord_error_confirmation: se neshoduje s potvrzením
+activerecord_error_accepted: musí být akceptováno
 activerecord_error_empty: nemůže být prázdný
 activerecord_error_blank: nemůže být prázdný
 activerecord_error_too_long: je příliš dlouhý
 activerecord_error_too_short: je příliš krátký
 activerecord_error_wrong_length: má chybnou délku
-activerecord_error_taken: has already been taken
+activerecord_error_taken: je již použito
 activerecord_error_not_a_number: není číslo
-activerecord_error_not_a_date: není platný datum
+activerecord_error_not_a_date: není platné datum
 activerecord_error_greater_than_start_date: musí být větší než počáteční datum
 activerecord_error_not_same_project: nepatří stejnému projektu
 activerecord_error_circular_dependency: Tento vztah by vytvořil cyklickou závislost
@@ -45,7 +45,7 @@ general_fmt_time: %%I:%%M %%p
 general_text_No: 'Ne'
 general_text_Yes: 'Ano'
 general_text_no: 'ne'
-general_text_yes: 'Ano'
+general_text_yes: 'ano'
 general_lang_name: 'Čeština'
 general_csv_separator: ','
 general_csv_encoding: UTF-8
@@ -62,31 +62,42 @@ notice_account_unknown_email: Neznámý uživatel.
 notice_can_t_change_password: Tento účet používá externí autentifikaci. Zde heslo změnit nemůžete.
 notice_account_lost_email_sent: Byl vám zaslán email s intrukcemi jak si nastavíte nové heslo.
 notice_account_activated: Váš účet byl aktivován. Nyní se můžete přihlásit.
-notice_successful_create: Úspěšné vytvoření.
-notice_successful_update: Úspěšná aktualizace.
-notice_successful_delete: Úspěšné smazání.
+notice_successful_create: Úspěšně vytvořeno.
+notice_successful_update: Úspěšně aktualizováno.
+notice_successful_delete: Úspěšně odstraněno.
 notice_successful_connection: Úspěšné připojení.
 notice_file_not_found: Stránka na kterou se snažíte zobrazit neexistuje nebo byla smazána.
 notice_locking_conflict: Údaje byly změněny jiným uživatelem.
+notice_scm_error: Entry and/or revision doesn't exist in the repository.
 notice_not_authorized: Nemáte dostatečná práva pro zobrazení této stránky.
 notice_email_sent: Na adresu %s byl odeslán email
 notice_email_error: Při odesílání emailu nastala chyba (%s)
 notice_feeds_access_key_reseted: Váš klíč pro přístup k RSS byl resetován.
+notice_failed_to_save_issues: "Failed to save %d issue(s) on %d selected: %s."
+notice_no_issue_selected: "Nebyl zvolen žádný úkol. Prosím, zvolte úkoly, které chcete editovat"
+notice_account_pending: "Váš účet byl vytvořen, nyní čeká na schválení administrátorem."
+notice_default_data_loaded: Výchozí konfigurace úspěšně nahrána.
 
-error_scm_not_found: "Entry and/or revision doesn't exist in the repository."
-error_scm_command_failed: "An error occurred when trying to access the repository: %s"
+error_can_t_load_default_data: "Výchozí konfigurace nebyla nahrána: %s"
+error_scm_not_found: "Položka a/nebo revize neexistují v repository."
+error_scm_command_failed: "Při pokusu o přístup k repository došlo k chybě: %s"
+error_issue_not_found_in_project: 'Úkol nebyl nalezen nebo nepatří k tomuto projektu'
 
 mail_subject_lost_password: Vaše heslo
-mail_body_lost_password: 'To change your Redmine password, click on the following link:'
+mail_body_lost_password: 'Pro změnu vašeho hesla klikněte na následující odkaz:'
 mail_subject_register: aktivace účtu
-mail_body_register: 'To activate your Redmine account, click on the following link:'
+mail_body_register: 'Pro aktivaci vašeho účtu klikněte na následující odkaz:'
+mail_body_account_information_external: Pomocí vašeho účtu "%s" se můžete přihlásit do Redmine.
+mail_body_account_information: Informace o vašem Redmine účtu
+mail_subject_account_activation_request: Aktivace Redmine účtu
+mail_body_account_activation_request: Byl zaregistrován nový uživatel "%s". Aktivace jeho účtu závisí na vašem potvrzení.
 
 gui_validation_error: 1 chyba
 gui_validation_error_plural: %d chyb(y)
 
 field_name: Jméno
 field_description: Popis
-field_summary: Shrnutí
+field_summary: Přehled
 field_is_required: Požadovaný
 field_firstname: Jméno
 field_lastname: Příjmení
@@ -105,30 +116,30 @@ field_min_length: Minimální délka
 field_max_length: Maximální délka
 field_value: Hodnota
 field_category: Kategorie
-field_title: Titulek
+field_title: Název
 field_project: Projekt
-field_issue: Požadavek
+field_issue: Úkol
 field_status: Stav
 field_notes: Poznámka
-field_is_closed: Požadavek uzavřen
+field_is_closed: Úkol uzavřen
 field_is_default: Výchozí stav
 field_tracker: Fronta
 field_subject: Předmět
-field_due_date: Po lhůtě
+field_due_date: Uzavřít do
 field_assigned_to: Přiřazeno
 field_priority: Priorita
-field_fixed_version: Target version
+field_fixed_version: Přiřazeno k verzi
 field_user: Uživatel
 field_role: Role
 field_homepage: Úvodní
 field_is_public: Veřejný
-field_parent: Podprojekt
-field_is_in_chlog: Požadavky zobrazené v změnovém logu
-field_is_in_roadmap: Požadavky zobrazené v roadmapě
+field_parent: Nadřazený projekt
+field_is_in_chlog: Úkoly zobrazené v změnovém logu
+field_is_in_roadmap: Úkoly zobrazené v plánu
 field_login: Přihlášení
-field_mail_notification: Emailové oznámení
+field_mail_notification: Emailová oznámení
 field_admin: Administrátor
-field_last_login_on: Poslední připojení
+field_last_login_on: Poslední přihlášení
 field_language: Jazyk
 field_effective_date: Datum
 field_password: Heslo
@@ -140,12 +151,12 @@ field_host: Host
 field_port: Port
 field_account: Účet
 field_base_dn: Base DN
-field_attr_login: Login attribute
-field_attr_firstname: Firstname attribute
-field_attr_lastname: Lastname attribute
-field_attr_mail: Email attribute
+field_attr_login: Přihlášení (atribut)
+field_attr_firstname: Jméno (atribut)
+field_attr_lastname: Příjemní (atribut)
+field_attr_mail: Email (atribut)
 field_onthefly: Automatické vytváření uživatelů
-field_start_date: Start
+field_start_date: Začátek
 field_done_ratio: %% Hotovo
 field_auth_source: Autentifikační mód
 field_hide_mail: Nezobrazovat můj email
@@ -157,32 +168,58 @@ field_hours: Hodiny
 field_activity: Aktivita
 field_spent_on: Datum
 field_identifier: Identifikátor
-field_is_filter: Used as a filter
-field_issue_to_id: Vztažený požadavek
+field_is_filter: Použít jako filtr
+field_issue_to_id: Související úkol
 field_delay: Zpoždění
-field_assignable: Požadavky mohou být přiřazeny této roli
-field_default_value: Výchozí stav
+field_assignable: Úkoly mohou být přiřazeny této roli
+field_redirect_existing_links: Přesměrovat stvávající odkazy
+field_estimated_hours: Odhadovaná doba
+field_column_names: Sloupce
+field_time_zone: Časové pásmo
+field_searchable: Umožnit vyhledávání
+field_default_value: Výchozí hodnota
+field_comments_sorting: Zobrazit komentáře
 
-setting_app_title: Titulek aplikace
+setting_app_title: Název aplikace
 setting_app_subtitle: Podtitulek aplikace
 setting_welcome_text: Uvítací text
 setting_default_language: Výchozí jazyk
 setting_login_required: Auten. vyžadována
 setting_self_registration: Povolena automatická registrace
 setting_attachment_max_size: Maximální velikost přílohy
-setting_issues_export_limit: Limit pro export požadavků
-setting_mail_from: Emission mail adresa
+setting_issues_export_limit: Limit pro export úkolů
+setting_mail_from: Odesílat emaily z adresy
+setting_bcc_recipients: Příjemci skryté kopie (bcc)
 setting_host_name: Host name
 setting_text_formatting: Formátování textu
 setting_wiki_compression: Komperese historie Wiki
 setting_feeds_limit: Feed content limit
+setting_default_projects_public: Nové projekty nastavovat jako veřejné
 setting_autofetch_changesets: Autofetch commits
 setting_sys_api_enabled: Povolit WS pro správu repozitory
-setting_commit_ref_keywords: Referencing keywords
-setting_commit_fix_keywords: Fixing keywords
+setting_commit_ref_keywords: Klíčová slova pro odkazy
+setting_commit_fix_keywords: Klíčová slova pro uzavření
 setting_autologin: Automatické přihlašování
-setting_date_format: Formát datumu
-setting_cross_project_issue_relations: Povolit vztahy požadavků mezi projekty
+setting_date_format: Formát data
+setting_time_format: Formát času
+setting_cross_project_issue_relations: Povolit vazby úkolů napříč projekty
+setting_issue_list_default_columns: Výchozí sloupce zobrazené v seznamu úkolů
+setting_repositories_encodings: Repositories encodings
+setting_emails_footer: Patička emailů
+setting_protocol: Protokol
+setting_per_page_options: Objects per page options
+setting_user_format: Users display format
+setting_activity_days_default: Days displayed on project activity
+setting_display_subprojects_issues: Display subprojects issues on main projects by default
+
+project_module_issue_tracking: Sledování úkolů
+project_module_time_tracking: Sledování času
+project_module_news: Novinky
+project_module_documents: Dokumenty
+project_module_files: Soubory
+project_module_wiki: Wiki
+project_module_repository: Repository
+project_module_boards: Diskuse
 
 label_user: Uživatel
 label_user_plural: Uživatelé
@@ -192,13 +229,17 @@ label_project_new: Nový projekt
 label_project_plural: Projekty
 label_project_all: Všechny projekty
 label_project_latest: Poslední projekty
-label_issue: Požadavek
-label_issue_new: Nový požadavek
-label_issue_plural: Požadavky
-label_issue_view_all: Všechny požadavky
+label_issue: Úkol
+label_issue_new: Nový úkol
+label_issue_plural: Úkoly
+label_issue_view_all: Všechny úkoly
+label_issues_by: Úkoly od uživatele %s
+label_issue_added: Úkol přidán
+label_issue_updated: Úkol aktualizován
 label_document: Dokument
 label_document_new: Nový dokument
 label_document_plural: Dokumenty
+label_document_added: Dokument přidán
 label_role: Role
 label_role_plural: Role
 label_role_new: Nová role
@@ -210,16 +251,16 @@ label_tracker: Fronta
 label_tracker_plural: Fronty
 label_tracker_new: Nová fronta
 label_workflow: Workflow
-label_issue_status: Stav požadavku
-label_issue_status_plural: Stavy požadavku
+label_issue_status: Stav úkolu
+label_issue_status_plural: Stavy úkolů
 label_issue_status_new: Nový stav
-label_issue_category: Kategorie požadavku
-label_issue_category_plural: Kategorie požadavku
+label_issue_category: Kategorie úkolu
+label_issue_category_plural: Kategorie úkolů
 label_issue_category_new: Nová kategorie
 label_custom_field: Uživatelské pole
-label_custom_field_plural: Uživatelské pole
+label_custom_field_plural: Uživatelská pole
 label_custom_field_new: Nové uživatelské pole
-label_enumerations: Číselníky
+label_enumerations: Seznamy
 label_enumeration_new: Nová hodnota
 label_information: Informace
 label_information_plural: Informace
@@ -234,13 +275,14 @@ label_administration: Administrace
 label_login: Přihlášení
 label_logout: Odhlášení
 label_help: Nápověda
-label_reported_issues: Nahlášené požadavky
-label_assigned_to_me_issues: Moje požadavky
+label_reported_issues: Nahlášené úkoly
+label_assigned_to_me_issues: Mé úkoly
 label_last_login: Poslední přihlášení
 label_last_updates: Poslední změna
 label_last_updates_plural: %d poslední změny
-label_registered_on: Registered on
+label_registered_on: Registrován
 label_activity: Aktivita
+label_overall_activity: Celková aktivita
 label_new: Nový
 label_logged_as: Přihlášen jako
 label_environment: Prostředí
@@ -252,8 +294,9 @@ label_subproject_plural: Podprojekty
 label_min_max_length: Min - Max délka
 label_list: Seznam
 label_date: Datum
-label_integer: Integer
-label_boolean: Boolean
+label_integer: Celé číslo
+label_float: Desetiné číslo
+label_boolean: Ano/Ne
 label_string: Text
 label_text: Dlouhý text
 label_attribute: Atribut
@@ -265,23 +308,25 @@ label_change_status: Změnit stav
 label_history: Historie
 label_attachment: Soubor
 label_attachment_new: Nový soubor
-label_attachment_delete: Smazat soubor
+label_attachment_delete: Odstranit soubor
 label_attachment_plural: Soubory
-label_report: Report
-label_report_plural: Reporty
+label_file_added: Soubor přidán
+label_report: Přeheled
+label_report_plural: Přehledy
 label_news: Novinky
 label_news_new: Přidat novinku
 label_news_plural: Novinky
 label_news_latest: Poslední novinky
 label_news_view_all: Zobrazit všechny novinky
-label_change_log: Change log
+label_news_added: Novinka přidána
+label_change_log: Protokol změn
 label_settings: Nastavení
 label_overview: Přehled
 label_version: Verze
 label_version_new: Nová verze
 label_version_plural: Verze
 label_confirmation: Potvrzení
-label_export_to: Exportovat do
+label_export_to: 'Také k dispozici:'
 label_read: Načítá se...
 label_public_projects: Veřejné projekty
 label_open_issues: otevřený
@@ -294,15 +339,16 @@ label_current_status: Aktuální stav
 label_new_statuses_allowed: Nové povolené stavy
 label_all: vše
 label_none: nic
-label_next: Další 
+label_nobody: nikdo
+label_next: Další
 label_previous: Předchozí
 label_used_by: Použito
 label_details: Detaily
-label_add_note: Přidat poznánku
+label_add_note: Přidat poznámku
 label_per_page: Na stránku
 label_calendar: Kalendář
 label_months_from: měsíců od
-label_gantt: Gantův graf
+label_gantt: Ganttův graf
 label_internal: Interní
 label_last_changes: posledních %d změn
 label_change_view_all: Zobrazit všechny změny
@@ -311,7 +357,7 @@ label_comment: Komentář
 label_comment_plural: Komentáře
 label_comment_add: Přidat komentáře
 label_comment_added: Komentář přidán
-label_comment_delete: Smazat komentář
+label_comment_delete: Odstranit komentář
 label_query: Uživatelský dotaz
 label_query_plural: Uživatelské dotazy
 label_query_new: Nový dotaz
@@ -323,7 +369,15 @@ label_in_less_than: je měší než
 label_in_more_than: je větší než
 label_in: v
 label_today: dnes
+label_all_time: veškerý čas
+label_yesterday: včera
 label_this_week: tento týden
+label_last_week: minulý týden
+label_last_n_days: posledních %d dnů
+label_this_month: tento měsíc
+label_last_month: minulý měsíc
+label_this_year: tento rok
+label_date_range: Rozsah dat
 label_less_than_ago: před méně jak (dny)
 label_more_than_ago: před více jak (dny)
 label_ago: před (dny)
@@ -331,28 +385,30 @@ label_contains: obsahuje
 label_not_contains: neobsahuje
 label_day_plural: dny
 label_repository: Repository
+label_repository_plural: Repository
 label_browse: Procházet
 label_modification: %d změna
 label_modification_plural: %d změn
 label_revision: Revize
 label_revision_plural: Revizí
+label_associated_revisions: Související verze
 label_added: přidáno
 label_modified: změněno
-label_deleted: smazáno
+label_deleted: odstraněno
 label_latest_revision: Poslední revize
 label_latest_revision_plural: Poslední revize
 label_view_revisions: Zobrazit revize
 label_max_size: Maximální velikost
-label_on: 'on'
-label_sort_highest: Posunout na vrchol
-label_sort_higher: Posunout nahoru
-label_sort_lower: Posunout dolů
-label_sort_lowest: Posunout dospod
+label_on: 'zapnuto'
+label_sort_highest: Přesunout na začátek
+label_sort_higher: Přesunout nahoru
+label_sort_lower: Přesunout dolů
+label_sort_lowest: Přesunout na konec
 label_roadmap: Plán
-label_roadmap_due_in: Due in 
+label_roadmap_due_in: Zbývá
 label_roadmap_overdue: %s pozdě
-label_roadmap_no_issues: Pro tuto verzi nejsou žádné požadavky
-label_search: Hledej
+label_roadmap_no_issues: Pro tuto verzi nejsou žádné úkoly
+label_search: Hledat
 label_result_plural: Výsledky
 label_all_words: Všechna slova
 label_wiki: Wiki
@@ -360,37 +416,37 @@ label_wiki_edit: Wiki úprava
 label_wiki_edit_plural: Wiki úpravy
 label_wiki_page: Wiki stránka
 label_wiki_page_plural: Wiki stránky
-label_index_by_title: Rejstřík
-label_index_by_date: Index by date
+label_index_by_title: Index dle názvu
+label_index_by_date: Index dle data
 label_current_version: Aktuální verze
 label_preview: Náhled
-label_feed_plural: Feeds
+label_feed_plural: Příspěvky
 label_changes_details: Detail všech změn
-label_issue_tracking: Sledování požadavků
+label_issue_tracking: Sledování úkolů
 label_spent_time: Strávený čas
 label_f_hour: %.2f hodina
 label_f_hour_plural: %.2f hodin
 label_time_tracking: Sledování času
 label_change_plural: Změny
-label_statistics: Statistika
-label_commits_per_month: Pořízení za měsíc
-label_commits_per_author: Pořízení za autora
+label_statistics: Statistiky
+label_commits_per_month: Commitů za měsíc
+label_commits_per_author: Commitů za autora
 label_view_diff: Zobrazit rozdíly
 label_diff_inline: uvnitř
 label_diff_side_by_side: vedle sebe
 label_options: Nastavení
 label_copy_workflow_from: Kopírovat workflow z
-label_permissions_report: Opis práv
-label_watched_issues: Prohlédnuté požadavky
-label_related_issues: Vztažené požadavky
+label_permissions_report: Přehled práv
+label_watched_issues: Sledované úkoly
+label_related_issues: Související úkoly
 label_applied_status: Použitý stav
 label_loading: Nahrávám...
-label_relation_new: Nový vztah
-label_relation_delete: Smazat vztah
-label_relates_to: vztažený k
+label_relation_new: Nová souvislost
+label_relation_delete: Odstranit souvislost
+label_relates_to: související s
 label_duplicates: duplicity
-label_blocks: zámků
-label_blocked_by: zamčeno
+label_blocks: bloků
+label_blocked_by: zablokován
 label_precedes: předchází
 label_follows: následuje
 label_end_to_start: od konce do začátku
@@ -398,16 +454,17 @@ label_end_to_end: od konce do konce
 label_start_to_start: od začátku do začátku
 label_start_to_end: od začátku do konce
 label_stay_logged_in: Zůstat přihlášený
-label_disabled: zakázáno
-label_show_completed_versions: Ukaž dokončené verze
-label_me: já
+label_disabled: zakázán
+label_show_completed_versions: Ukázat dokončené verze
+label_me: mě
 label_board: Fórum
 label_board_new: Nové fórum
-label_board_plural: Fora
+label_board_plural: Fóra
 label_topic_plural: Témata
 label_message_plural: Zprávy
 label_message_last: Poslední zpráva
-label_message_new: Nové zprávy
+label_message_new: Nová zpráva
+label_message_posted: Zpráva přidána
 label_reply_plural: Odpovědi
 label_send_information: Zaslat informace o účtu uživateli
 label_year: Rok
@@ -415,24 +472,57 @@ label_month: Měsíc
 label_week: Týden
 label_date_from: Od
 label_date_to: Do
-label_language_based: Language based
+label_language_based: Podle výchozího jazyku
 label_sort_by: Seřadit podle %s
 label_send_test_email: Poslat testovací email
 label_feeds_access_key_created_on: Přístupový klíč pro RSS byl vytvořen před %s
+label_module_plural: Moduly
+label_added_time_by: 'Přidáno před: %s %s'
+label_updated_time: 'Aktualizováno před: %s'
+label_jump_to_a_project: Zvolit projekt...
+label_file_plural: Soubory
+label_changeset_plural: Changesety
+label_default_columns: Výchozí sloupce
+label_no_change_option: (beze změny)
+label_bulk_edit_selected_issues: Bulk edit selected issues
+label_theme: Téma
+label_default: Výchozí
+label_search_titles_only: Vyhledávat pouze v názvech
+label_user_mail_option_all: "Pro všechny události všech mých projektů"
+label_user_mail_option_selected: "Pro všechny události vybraných projektů..."
+label_user_mail_option_none: "Pouze pro události které sleduji nebo které se mne týkají"
+label_user_mail_no_self_notified: "Nezasílat informace o mnou vytvořených změnách"
+label_registration_activation_by_email: aktivace účtu emailem
+label_registration_manual_activation: manuální aktivace účtu
+label_registration_automatic_activation: automatická aktivace účtu
+label_display_per_page: '%s na stránku'
+label_age: Věk
+label_change_properties: Změnit vlastnosti
+label_general: Obecné
+label_more: Více
+label_scm: SCM
+label_plugins: Doplňky
+label_ldap_authentication: Autentifikace LDAP
+label_downloads_abbr: D/L
+label_optional_description: Volitelný popis
+label_add_another_file: Přidat další soubor
+label_preferences: Nastavení
+label_chronological_order: V chronologickém pořadí
+label_reverse_chronological_order: V obrácaném chronologickém pořadí
 
 button_login: Přihlásit
 button_submit: Potvrdit
 button_save: Uložit
 button_check_all: Zašrtnout vše
 button_uncheck_all: Odšrtnout vše
-button_delete: Smazat
+button_delete: Odstranit
 button_create: Vytvořit
 button_test: Test
 button_edit: Upravit
 button_add: Přidat
 button_change: Změnit
 button_apply: Použít
-button_clear: Odstranit
+button_clear: Smazat
 button_lock: Zamknout
 button_unlock: Odemknout
 button_download: Stáhnout
@@ -441,16 +531,22 @@ button_view: Zobrazit
 button_move: Přesunout
 button_back: Zpět
 button_cancel: Storno
-button_activate: Activovat
+button_activate: Aktivovat
 button_sort: Seřadit
-button_log_time: Čas přihlášení
+button_log_time: Přidat čas
 button_rollback: Zpět k této verzi
 button_watch: Sledovat
-button_unwatch: Unwatch
+button_unwatch: Nesledovat
 button_reply: Odpovědět
 button_archive: Archivovat
 button_unarchive: Odarchivovat
 button_reset: Reset
+button_rename: Přejmenovat
+button_change_password: Změnit heslo
+button_copy: Kopírovat
+button_annotate: Komentovat
+button_update: Aktualizovat
+button_configure: Konfigurovat
 
 status_active: aktivní
 status_registered: registrovaný
@@ -459,29 +555,49 @@ status_locked: uzamčený
 text_select_mail_notifications: Vyberte akci při které bude zasláno upozornění emailem.
 text_regexp_info: např. ^[A-Z0-9]+$
 text_min_max_length_info: 0 znamená bez limitu
-text_project_destroy_confirmation: Jste si jistí, že chcete smazat tento projekt a všechna související data ?
+text_project_destroy_confirmation: Jste si jisti, že chcete odstranit tento projekt a všechna související data ?
 text_workflow_edit: Vyberte roli a frontu k editaci workflow
-text_are_you_sure: Jste si jist ?
+text_are_you_sure: Jste si jisti?
 text_journal_changed: změněno z %s na %s
 text_journal_set_to: nastaveno na %s
-text_journal_deleted: smazáno
+text_journal_deleted: odstraněno
 text_tip_task_begin_day: úkol začíná v tento den
 text_tip_task_end_day: úkol končí v tento den
 text_tip_task_begin_end_day: úkol začíná a končí v tento den
 text_project_identifier_info: 'Jsou povolena malá písmena (a-z), čísla a pomlčky.<br />Po uložení již není možné identifikátor změnit.'
 text_caracters_maximum: %d znaků maximálně.
+text_caracters_minimum: Musí být alespoň %d znaků dlouhé.
 text_length_between: Délka mezi %d a %d znaky.
-text_tracker_no_workflow: Pro tuto frontu není definováno žádné workflow
+text_tracker_no_workflow: Pro tuto frontu není definován žádný workflow
 text_unallowed_characters: Nepovolené znaky
 text_comma_separated: Povoleno více hodnot (oddělěné čárkou).
 text_issues_ref_in_commit_messages: Referencing and fixing issues in commit messages
+text_issue_added: Úkol %s byl vytvořen uživatelem %s.
+text_issue_updated: Úkol %s byl aktualizován uživatelem %s.
+text_wiki_destroy_confirmation: Opravdu si přejete odstranit tuto WIKI a celý její obsah?
+text_issue_category_destroy_question: Některé úkoly (%d) jsou přiřazeny k této kategorii. Co s nimi chtete udělat?
+text_issue_category_destroy_assignments: Zrušit přiřazení ke kategorii
+text_issue_category_reassign_to: Přiřadit úkoly do této kategorie
+text_user_mail_option: "U projektů, které nebyly vybrány, budete dostávat oznámení pouze o vašich či o sledovaných položkách (např. o položkách jejichž jste autor nebo ke kterým jste přiřazen(a))."
+text_no_configuration_data: "Role, fronty, stavy úkolů ani workflow nebyly zatím nakonfigurovány.\nVelice doporučujeme nahrát výchozí konfiguraci.Po té si můžete vše upravit"
+text_load_default_configuration: Nahrát výchozí konfiguraci
+text_status_changed_by_changeset: Použito v changesetu %s.
+text_issues_destroy_confirmation: 'Opravdu si přejete odstranit všechny zvolené úkoly?'
+text_select_project_modules: 'Zvolte moduly aktivní v tomto projektu:'
+text_default_administrator_account_changed: Výchozí nastavení administrátorského účtu změněno
+text_file_repository_writable: Povolen zápis do repository
+text_rmagick_available: RMagick k dispozici (volitelné)
+text_destroy_time_entries_question: U úkolů, které chcete odstranit je evidováno %.02f práce. Co chete udělat?
+text_destroy_time_entries: Odstranit evidované hodiny.
+text_assign_time_entries_to_project: Přiřadit evidované hodiny projektu
+text_reassign_time_entries: 'Přeřadit evidované hodiny k tomuto úkolu:'
 
 default_role_manager: Manažer
-default_role_developper: Agent
-default_role_reporter: Reporter
-default_tracker_bug: Reklamace
-default_tracker_feature: Vlastnost
-default_tracker_support: Požadavek
+default_role_developper: Vývojář
+default_role_reporter: Reportér
+default_tracker_bug: Chyba
+default_tracker_feature: Požadavek
+default_tracker_support: Podpora
 default_issue_status_new: Nový
 default_issue_status_assigned: Přiřazený
 default_issue_status_resolved: Vyřešený
@@ -494,124 +610,10 @@ default_priority_low: Nízká
 default_priority_normal: Normální
 default_priority_high: Vysoká
 default_priority_urgent: Urgentní
-default_priority_immediate: Bezodkladné
-default_activity_design: Návrh
+default_priority_immediate: Okamžitá
+default_activity_design: Design
 default_activity_development: Vývoj
 
-enumeration_issue_priorities: Priority požadavků
+enumeration_issue_priorities: Priority úkolů
 enumeration_doc_categories: Kategorie dokumentů
 enumeration_activities: Aktivity (sledování času)
-button_rename: Rename
-text_issue_category_destroy_question: Some issues (%d) are assigned to this category. What do you want to do ?
-label_module_plural: Modules
-label_jump_to_a_project: Jump to a project...
-text_issue_updated: Issue %s has been updated by %s.
-field_redirect_existing_links: Redirect existing links
-text_issue_category_reassign_to: Reassing issues to this category
-text_issue_added: Issue %s has been reported by %s.
-label_file_plural: Files
-text_wiki_destroy_confirmation: Are you sure you want to delete this wiki and all its content ?
-label_updated_time: Updated %s ago
-text_issue_category_destroy_assignments: Remove category assignments
-label_added_time_by: Added by %s %s ago
-field_estimated_hours: Estimated time
-label_changeset_plural: Changesets
-field_column_names: Columns
-label_default_columns: Default columns
-setting_issue_list_default_columns: Default columns displayed on the issue list
-setting_repositories_encodings: Repositories encodings
-notice_no_issue_selected: "No issue is selected! Please, check the issues you want to edit."
-label_bulk_edit_selected_issues: Bulk edit selected issues
-label_no_change_option: (No change)
-notice_failed_to_save_issues: "Failed to save %d issue(s) on %d selected: %s."
-label_theme: Theme
-label_default: Default
-label_search_titles_only: Search titles only
-label_nobody: nobody
-button_change_password: Change password
-text_user_mail_option: "For unselected projects, you will only receive notifications about things you watch or you're involved in (eg. issues you're the author or assignee)."
-label_user_mail_option_selected: "For any event on the selected projects only..."
-label_user_mail_option_all: "For any event on all my projects"
-label_user_mail_option_none: "Only for things I watch or I'm involved in"
-setting_emails_footer: Emails footer
-label_float: Float
-button_copy: Copy
-mail_body_account_information_external: You can use your "%s" account to log into Redmine.
-mail_body_account_information: Your Redmine account information
-setting_protocol: Protocol
-label_user_mail_no_self_notified: "I don't want to be notified of changes that I make myself"
-setting_time_format: Time format
-label_registration_activation_by_email: account activation by email
-mail_subject_account_activation_request: Redmine account activation request
-mail_body_account_activation_request: 'A new user (%s) has registered. His account his pending your approval:'
-label_registration_automatic_activation: automatic account activation
-label_registration_manual_activation: manual account activation
-notice_account_pending: "Your account was created and is now pending administrator approval."
-field_time_zone: Time zone
-text_caracters_minimum: Must be at least %d characters long.
-setting_bcc_recipients: Blind carbon copy recipients (bcc)
-button_annotate: Annotate
-label_issues_by: Issues by %s
-field_searchable: Searchable
-label_display_per_page: 'Per page: %s'
-setting_per_page_options: Objects per page options
-label_age: Age
-notice_default_data_loaded: Default configuration successfully loaded.
-text_load_default_configuration: Load the default configuration
-text_no_configuration_data: "Roles, trackers, issue statuses and workflow have not been configured yet.\nIt is highly recommended to load the default configuration. You will be able to modify it once loaded."
-error_can_t_load_default_data: "Default configuration could not be loaded: %s"
-button_update: Update
-label_change_properties: Change properties
-label_general: General
-label_repository_plural: Repositories
-label_associated_revisions: Associated revisions
-setting_user_format: Users display format
-text_status_changed_by_changeset: Applied in changeset %s.
-label_more: More
-text_issues_destroy_confirmation: 'Are you sure you want to delete the selected issue(s) ?'
-label_scm: SCM
-text_select_project_modules: 'Select modules to enable for this project:'
-label_issue_added: Issue added
-label_issue_updated: Issue updated
-label_document_added: Document added
-label_message_posted: Message added
-label_file_added: File added
-label_news_added: News added
-project_module_boards: Boards
-project_module_issue_tracking: Issue tracking
-project_module_wiki: Wiki
-project_module_files: Files
-project_module_documents: Documents
-project_module_repository: Repository
-project_module_news: News
-project_module_time_tracking: Time tracking
-text_file_repository_writable: File repository writable
-text_default_administrator_account_changed: Default administrator account changed
-text_rmagick_available: RMagick available (optional)
-button_configure: Configure
-label_plugins: Plugins
-label_ldap_authentication: LDAP authentication
-label_downloads_abbr: D/L
-label_this_month: this month
-label_last_n_days: last %d days
-label_all_time: all time
-label_this_year: this year
-label_date_range: Date range
-label_last_week: last week
-label_yesterday: yesterday
-label_last_month: last month
-label_add_another_file: Add another file
-label_optional_description: Optional description
-text_destroy_time_entries_question: %.02f hours were reported on the issues you are about to delete. What do you want to do ?
-error_issue_not_found_in_project: 'The issue was not found or does not belong to this project'
-text_assign_time_entries_to_project: Assign reported hours to the project
-text_destroy_time_entries: Delete reported hours
-text_reassign_time_entries: 'Reassign reported hours to this issue:'
-setting_activity_days_default: Days displayed on project activity
-label_chronological_order: In chronological order
-field_comments_sorting: Display comments
-label_reverse_chronological_order: In reverse chronological order
-label_preferences: Preferences
-setting_display_subprojects_issues: Display subprojects issues on main projects by default
-label_overall_activity: Overall activity
-setting_default_projects_public: New projects are public by default
diff --git a/lang/fi.yml b/lang/fi.yml
index 99b2ebb14..fe16fd7e0 100644
--- a/lang/fi.yml
+++ b/lang/fi.yml
@@ -126,7 +126,7 @@ field_subject: Aihe
 field_due_date: Määräaika
 field_assigned_to: Nimetty
 field_priority: Prioriteetti
-field_fixed_version: Target version
+field_fixed_version: Kohde versio
 field_user: Käyttäjä
 field_role: Rooli
 field_homepage: Kotisivu
@@ -345,7 +345,6 @@ label_equals: yhtä kuin
 label_not_equals: epäsuuri kuin
 label_in_less_than: pienempi kuin
 label_in_more_than: suurempi kuin
-label_in:
 label_today: tänään
 label_this_week: tällä viikolla
 label_less_than_ago: vähemmän kuin päivää sitten
@@ -353,9 +352,9 @@ label_more_than_ago: enemän kuin päivää sitten
 label_ago: päiviä sitten
 label_contains: sisältää
 label_not_contains: ei sisällä
-label_day_plural: päivät
+label_day_plural: päivää
 label_repository: Säiliö
-label_repository_plural: Säiliötä
+label_repository_plural: Säiliöt
 label_browse: Selaus
 label_modification: %d muutos
 label_modification_plural: %d muutettu
@@ -368,7 +367,6 @@ label_latest_revision: Viimeisin versio
 label_latest_revision_plural: Viimeisimmät versiot
 label_view_revisions: Näytä versiot
 label_max_size: Maksimi koko
-label_on:
 label_sort_highest: Siirrä ylimmäiseksi
 label_sort_higher: Siirrä ylös
 label_sort_lower: Siirrä alas
@@ -438,8 +436,6 @@ label_send_information: Lähetä tilin tiedot käyttäjälle
 label_year: Vuosi
 label_month: Kuukausi
 label_week: Viikko
-label_date_from:
-label_date_to:
 label_language_based: Pohjautuen käyttäjän kieleen
 label_sort_by: Lajittele %s
 label_send_test_email: Lähetä testi sähköposti
@@ -455,7 +451,7 @@ label_no_change_option: (Ei muutosta)
 label_bulk_edit_selected_issues: Perusmuotoile valitut tapahtumat
 label_theme: Teema
 label_default: Vakio
-label_search_titles_only: Haek vain otsikot
+label_search_titles_only: Hae vain otsikot
 label_user_mail_option_all: "Kaikista tapahtumista kaikissa projekteistani"
 label_user_mail_option_selected: "Kaikista tapahtumista vain valitsemistani projekteista..."
 label_user_mail_option_none: "Vain tapahtumista joita valvon tai olen mukana"
@@ -594,12 +590,9 @@ label_ldap_authentication: LDAP autentikointi
 label_downloads_abbr: D/L
 label_add_another_file: Lisää uusi tiedosto
 label_this_month: tässä kuussa
-label_date_to:
 text_destroy_time_entries_question: %.02f tuntia on raportoitu tapahtumasta jonka aiot poistaa. Mitä haluat tehdä ?
-label_date_from: 
 label_last_n_days: viimeiset %d päivää
 label_all_time: koko ajalta
-label_in:
 error_issue_not_found_in_project: 'Tapahtumaa ei löytynyt tai se ei kuulu tähän projektiin'
 label_this_year: tänä vuonna
 text_assign_time_entries_to_project: Määritä tunnit projektille
@@ -611,14 +604,14 @@ label_last_month: viime kuussa
 text_destroy_time_entries: Poista raportoidut tunnit
 text_reassign_time_entries: 'Siirrä raportoidut tunnit tälle tapahtumalle:'
 label_on: ''
-label_chronological_order: In chronological order
-label_date_to: To
-setting_activity_days_default: Days displayed on project activity
-label_date_from: From
-label_in: in
-setting_display_subprojects_issues: Display subprojects issues on main projects by default
-field_comments_sorting: Display comments
-label_reverse_chronological_order: In reverse chronological order
-label_preferences: Preferences
-label_overall_activity: Overall activity
+label_chronological_order: Aikajärjestyksessä
+label_date_to: ''
+setting_activity_days_default: Päivien esittäminen projektien historiassa
+label_date_from: ''
+label_in: ''
+setting_display_subprojects_issues: Näytä alaprojektien tapahtumat pääprojektissa oletusarvoisesti
+field_comments_sorting: Näytä kommentit
+label_reverse_chronological_order: Käänteisessä aikajärjestyksessä
+label_preferences: Asetukset
 setting_default_projects_public: New projects are public by default
+label_overall_activity: Overall activity

From a59e6bfb020f51ec2ae586e2e0e238b9827b7e9a Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sat, 15 Mar 2008 09:40:16 +0000
Subject: [PATCH 295/710] Remove hardcoded "Redmine" strings in account related
 emails. And use application title instead.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1254 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/models/mailer.rb |  8 ++++----
 lang/bg.yml          | 10 +++++-----
 lang/cs.yml          | 10 +++++-----
 lang/da.yml          | 14 +++++++-------
 lang/de.yml          | 10 +++++-----
 lang/en.yml          | 14 +++++++-------
 lang/es.yml          | 14 +++++++-------
 lang/fi.yml          | 14 +++++++-------
 lang/fr.yml          | 14 +++++++-------
 lang/he.yml          | 10 +++++-----
 lang/it.yml          | 12 ++++++------
 lang/ja.yml          | 12 ++++++------
 lang/ko.yml          |  8 ++++----
 lang/lt.yml          | 14 +++++++-------
 lang/nl.yml          | 12 ++++++------
 lang/pl.yml          | 12 ++++++------
 lang/pt-br.yml       | 12 ++++++------
 lang/pt.yml          | 12 ++++++------
 lang/ro.yml          | 14 +++++++-------
 lang/ru.yml          | 14 +++++++-------
 lang/sr.yml          | 14 +++++++-------
 lang/sv.yml          | 12 ++++++------
 lang/uk.yml          | 14 +++++++-------
 lang/zh-tw.yml       | 14 +++++++-------
 lang/zh.yml          | 14 +++++++-------
 25 files changed, 154 insertions(+), 154 deletions(-)

diff --git a/app/models/mailer.rb b/app/models/mailer.rb
index ad5a3647b..2f23c1c8f 100644
--- a/app/models/mailer.rb
+++ b/app/models/mailer.rb
@@ -86,7 +86,7 @@ class Mailer < ActionMailer::Base
   def account_information(user, password)
     set_language_if_valid user.language
     recipients user.mail
-    subject l(:mail_subject_register)
+    subject l(:mail_subject_register, Setting.app_title)
     body :user => user,
          :password => password,
          :login_url => url_for(:controller => 'account', :action => 'login')
@@ -95,7 +95,7 @@ class Mailer < ActionMailer::Base
   def account_activation_request(user)
     # Send the email to all active administrators
     recipients User.find_active(:all, :conditions => {:admin => true}).collect { |u| u.mail }.compact
-    subject l(:mail_subject_account_activation_request)
+    subject l(:mail_subject_account_activation_request, Setting.app_title)
     body :user => user,
          :url => url_for(:controller => 'users', :action => 'index', :status => User::STATUS_REGISTERED, :sort_key => 'created_on', :sort_order => 'desc')
   end
@@ -103,7 +103,7 @@ class Mailer < ActionMailer::Base
   def lost_password(token)
     set_language_if_valid(token.user.language)
     recipients token.user.mail
-    subject l(:mail_subject_lost_password)
+    subject l(:mail_subject_lost_password, Setting.app_title)
     body :token => token,
          :url => url_for(:controller => 'account', :action => 'lost_password', :token => token.value)
   end  
@@ -111,7 +111,7 @@ class Mailer < ActionMailer::Base
   def register(token)
     set_language_if_valid(token.user.language)
     recipients token.user.mail
-    subject l(:mail_subject_register)
+    subject l(:mail_subject_register, Setting.app_title)
     body :token => token,
          :url => url_for(:controller => 'account', :action => 'activate', :token => token.value)
   end
diff --git a/lang/bg.yml b/lang/bg.yml
index 362421fa6..7b4e15720 100644
--- a/lang/bg.yml
+++ b/lang/bg.yml
@@ -76,9 +76,9 @@ notice_feeds_access_key_reseted: Вашия ключ за RSS достъп бе
 error_scm_not_found: Несъществуващ обект в хранилището.
 error_scm_command_failed: "Грешка при опит за комуникация с хранилище: %s"
 
-mail_subject_lost_password: Вашата парола
+mail_subject_lost_password: Вашата парола (%s)
 mail_body_lost_password: 'За да смените паролата си, използвайте следния линк:'
-mail_subject_register: Активация на акаунт
+mail_subject_register: Активация на акаунт (%s)
 mail_body_register: 'За да активирате акаунта си използвайте следния линк:'
 
 gui_validation_error: 1 грешка
@@ -536,13 +536,13 @@ label_user_mail_option_none: "Само за наблюдавани или в к
 setting_emails_footer: Подтекст за e-mail
 label_float: Дробно
 button_copy: Копиране
-mail_body_account_information_external: Можете да използвате вашия "%s" акаунт за вход в Redmine.
-mail_body_account_information: Информацията за акаунта ви в Redmine
+mail_body_account_information_external: Можете да използвате вашия "%s" акаунт за вход.
+mail_body_account_information: Информацията за акаунта
 setting_protocol: Протокол
 label_user_mail_no_self_notified: "Не искам известия за извършени от мен промени"
 setting_time_format: Формат на часа
 label_registration_activation_by_email: активиране на акаунта по email
-mail_subject_account_activation_request: Заявка за активиране на акаунт в Redmine
+mail_subject_account_activation_request: Заявка за активиране на акаунт в %s
 mail_body_account_activation_request: 'Има новорегистриран потребител (%s), очакващ вашето одобрение:'
 label_registration_automatic_activation: автоматично активиране
 label_registration_manual_activation: ръчно активиране
diff --git a/lang/cs.yml b/lang/cs.yml
index 2b215bec0..52ee9e451 100644
--- a/lang/cs.yml
+++ b/lang/cs.yml
@@ -83,13 +83,13 @@ error_scm_not_found: "Položka a/nebo revize neexistují v repository."
 error_scm_command_failed: "Při pokusu o přístup k repository došlo k chybě: %s"
 error_issue_not_found_in_project: 'Úkol nebyl nalezen nebo nepatří k tomuto projektu'
 
-mail_subject_lost_password: Vaše heslo
+mail_subject_lost_password: Vaše heslo (%s)
 mail_body_lost_password: 'Pro změnu vašeho hesla klikněte na následující odkaz:'
-mail_subject_register: aktivace účtu
+mail_subject_register: Aktivace účtu (%s)
 mail_body_register: 'Pro aktivaci vašeho účtu klikněte na následující odkaz:'
-mail_body_account_information_external: Pomocí vašeho účtu "%s" se můžete přihlásit do Redmine.
-mail_body_account_information: Informace o vašem Redmine účtu
-mail_subject_account_activation_request: Aktivace Redmine účtu
+mail_body_account_information_external: Pomocí vašeho účtu "%s" se můžete přihlásit.
+mail_body_account_information: Informace o vašem účtu
+mail_subject_account_activation_request: Aktivace %s účtu
 mail_body_account_activation_request: Byl zaregistrován nový uživatel "%s". Aktivace jeho účtu závisí na vašem potvrzení.
 
 gui_validation_error: 1 chyba
diff --git a/lang/da.yml b/lang/da.yml
index 042666b43..d80124520 100644
--- a/lang/da.yml
+++ b/lang/da.yml
@@ -81,13 +81,13 @@ error_can_t_load_default_data: "Standard konfiguration kunne ikke indlæses: %s"
 error_scm_not_found: "Adgang og/eller revision blev ikke fundet i det valgte repository."
 error_scm_command_failed: "En fejl opstod under fobindelsen til det valgte repository: %s"
 
-mail_subject_lost_password: Dit Redmine kodeord
-mail_body_lost_password: 'For at ændre dit Redmine kodeord, klik på dette link:'
-mail_subject_register: Redmine konto aktivering
-mail_body_register: 'For at aktivere din Redmine konto, klik på dette link:'
-mail_body_account_information_external: Du kan bruge din "%s" konto til at logge ind på Redmine.
-mail_body_account_information: Din Redmine konto information
-mail_subject_account_activation_request: Redmine konto aktivering
+mail_subject_lost_password: Dit %s kodeord
+mail_body_lost_password: 'For at ændre dit kodeord, klik på dette link:'
+mail_subject_register: %s konto aktivering
+mail_body_register: 'For at aktivere din konto, klik på dette link:'
+mail_body_account_information_external: Du kan bruge din "%s" konto til at logge ind.
+mail_body_account_information: Din konto information
+mail_subject_account_activation_request: %s konto aktivering
 mail_body_account_activation_request: 'En ny bruger (%s) er registreret. Godkend venligst kontoen:'
 
 gui_validation_error: 1 fejl
diff --git a/lang/de.yml b/lang/de.yml
index 7ef41fe46..36ae228b5 100644
--- a/lang/de.yml
+++ b/lang/de.yml
@@ -82,13 +82,13 @@ error_scm_not_found: Eintrag und/oder Revision besteht nicht im Projektarchiv.
 error_scm_command_failed: "Beim Zugriff auf das Projektarchiv ist ein Fehler aufgetreten: %s"
 error_issue_not_found_in_project: 'Das Ticket wurde nicht gefunden oder gehört nicht zu diesem Projekt.'
 
-mail_subject_lost_password: Ihr Redmine-Kennwort
+mail_subject_lost_password: Ihr %s Kennwort
 mail_body_lost_password: 'Benutzen Sie den folgenden Link, um Ihr Kennwort zu ändern:'
-mail_subject_register: Redmine Kontoaktivierung
+mail_subject_register: %s Kontoaktivierung
 mail_body_register: 'Um Ihr Konto zu aktivieren, benutzen Sie folgenden Link:'
-mail_body_account_information_external: Sie können sich mit Ihrem Konto "%s" an Redmine anmelden.
-mail_body_account_information: Ihre Redmine Konto-Informationen
-mail_subject_account_activation_request: Antrag auf Redmine Kontoaktivierung
+mail_body_account_information_external: Sie können sich mit Ihrem Konto "%s" an anmelden.
+mail_body_account_information: Ihre Konto-Informationen
+mail_subject_account_activation_request: Antrag auf %s Kontoaktivierung
 mail_body_account_activation_request: 'Ein neuer Benutzer (%s) hat sich registriert. Sein Konto wartet auf Ihre Genehmigung:'
 
 gui_validation_error: 1 Fehler
diff --git a/lang/en.yml b/lang/en.yml
index 8a08507bb..2646e22a6 100644
--- a/lang/en.yml
+++ b/lang/en.yml
@@ -82,13 +82,13 @@ error_scm_not_found: "Entry and/or revision doesn't exist in the repository."
 error_scm_command_failed: "An error occurred when trying to access the repository: %s"
 error_issue_not_found_in_project: 'The issue was not found or does not belong to this project'
 
-mail_subject_lost_password: Your Redmine password
-mail_body_lost_password: 'To change your Redmine password, click on the following link:'
-mail_subject_register: Redmine account activation
-mail_body_register: 'To activate your Redmine account, click on the following link:'
-mail_body_account_information_external: You can use your "%s" account to log into Redmine.
-mail_body_account_information: Your Redmine account information
-mail_subject_account_activation_request: Redmine account activation request
+mail_subject_lost_password: Your %s password
+mail_body_lost_password: 'To change your password, click on the following link:'
+mail_subject_register: Your %s account activation
+mail_body_register: 'To activate your account, click on the following link:'
+mail_body_account_information_external: You can use your "%s" account to log in.
+mail_body_account_information: Your account information
+mail_subject_account_activation_request: %s account activation request
 mail_body_account_activation_request: 'A new user (%s) has registered. His account is pending your approval:'
 
 gui_validation_error: 1 error
diff --git a/lang/es.yml b/lang/es.yml
index 1453534e8..4a5eff1c9 100644
--- a/lang/es.yml
+++ b/lang/es.yml
@@ -73,10 +73,10 @@ notice_not_authorized: No tiene autorización para acceder a esta página.
 error_scm_not_found: "La entrada y/o la revisión no existe en el repositorio."
 error_scm_command_failed: "An error occurred when trying to access the repository: %s"
 
-mail_subject_lost_password: Tu contraseña del CIYAT - Gestor de Solicitudes
-mail_body_lost_password: 'Para cambiar su contraseña de Redmine, haga click en el siguiente enlace:'
-mail_subject_register: Activación de la cuenta del CIYAT - Gestor de Solicitudes
-mail_body_register: 'Para activar su cuenta Redmine, haga click en el siguiente enlace:'
+mail_subject_lost_password: Tu contraseña del %s
+mail_body_lost_password: 'Para cambiar su contraseña, haga click en el siguiente enlace:'
+mail_subject_register: Activación de la cuenta del %s
+mail_body_register: 'Para activar su cuenta, haga click en el siguiente enlace:'
 
 gui_validation_error: 1 error
 gui_validation_error_plural: %d errores
@@ -539,14 +539,14 @@ label_user_mail_option_none: "Sólo para elementos monitorizados o relacionados
 setting_emails_footer: Pie de mensajes
 label_float: Flotante
 button_copy: Copiar
-mail_body_account_information_external: Puede usar su cuenta "%s" para conectarse a Redmine.
-mail_body_account_information: Información sobre su cuenta de Redmine
+mail_body_account_information_external: Puede usar su cuenta "%s" para conectarse.
+mail_body_account_information: Información sobre su cuenta
 setting_protocol: Protocolo
 text_caracters_minimum: %d carácteres como mínimo
 field_time_zone: Zona horaria
 label_registration_activation_by_email: activación de cuenta por correo
 label_user_mail_no_self_notified: "No quiero ser avisado de cambios hechos por mí"
-mail_subject_account_activation_request: Petición de activación de cuenta Redmine
+mail_subject_account_activation_request: Petición de activación de cuenta %s
 mail_body_account_activation_request: "Un nuevo usuario (%s) ha sido registrado. Esta cuenta está pendiende de aprobación"
 label_registration_automatic_activation: activación automática de cuenta
 label_registration_manual_activation: activación manual de cuenta
diff --git a/lang/fi.yml b/lang/fi.yml
index fe16fd7e0..5ff496985 100644
--- a/lang/fi.yml
+++ b/lang/fi.yml
@@ -81,13 +81,13 @@ error_can_t_load_default_data: "Vakio asetuksia ei voitu ladata: %s"
 error_scm_not_found: "Syötettä ja/tai versiota ei löydy säiliöstä."
 error_scm_command_failed: "Säiliöön pääsyssä tapahtui virhe: %s"
 
-mail_subject_lost_password: Sinun Redmine salasanasi
-mail_body_lost_password: 'Vaihtaaksesi Redmine salasanasi, paina seuraavaa linkkiä:'
-mail_subject_register: Redmine tilin aktivointi
-mail_body_register: 'Aktivoidaksesi Redmine tilisi, paina seuraavaa linkkiä:'
-mail_body_account_information_external: Voit nyt käyttää "%s" tiliäsi kirjautuaksesi Redmine järjestelmään.
-mail_body_account_information: Sinun Redmine tilin tiedot
-mail_subject_account_activation_request: Redmine tilin aktivointi pyyntö
+mail_subject_lost_password: Sinun %s salasanasi
+mail_body_lost_password: 'Vaihtaaksesi salasanasi, paina seuraavaa linkkiä:'
+mail_subject_register: %s tilin aktivointi
+mail_body_register: 'Aktivoidaksesi tilisi, paina seuraavaa linkkiä:'
+mail_body_account_information_external: Voit nyt käyttää "%s" tiliäsi kirjautuaksesi järjestelmään.
+mail_body_account_information: Sinun tilin tiedot
+mail_subject_account_activation_request: %s tilin aktivointi pyyntö
 mail_body_account_activation_request: 'Uusi käyttäjä (%s) on rekisteröitynyt. Hänen tili odottaa hyväksyntääsi:'
 
 gui_validation_error: 1 virhe
diff --git a/lang/fr.yml b/lang/fr.yml
index c11db5cbf..136f3b0b8 100644
--- a/lang/fr.yml
+++ b/lang/fr.yml
@@ -82,13 +82,13 @@ error_scm_not_found: "L'entrée et/ou la révision demandée n'existe pas dans l
 error_scm_command_failed: "Une erreur s'est produite lors de l'accès au dépôt: %s"
 error_issue_not_found_in_project: "La demande n'existe pas ou n'appartient pas à ce projet"
 
-mail_subject_lost_password: Votre mot de passe redMine
-mail_body_lost_password: 'Pour changer votre mot de passe Redmine, cliquez sur le lien suivant:'
-mail_subject_register: Activation de votre compte redMine
-mail_body_register: 'Pour activer votre compte Redmine, cliquez sur le lien suivant:'
-mail_body_account_information_external: Vous pouvez utiliser votre compte "%s" pour vous connecter à Redmine.
-mail_body_account_information: Paramètres de connexion de votre compte Redmine
-mail_subject_account_activation_request: "Demande d'activation d'un compte Redmine"
+mail_subject_lost_password: Votre mot de passe %s
+mail_body_lost_password: 'Pour changer votre mot de passe, cliquez sur le lien suivant:'
+mail_subject_register: Activation de votre compte %s
+mail_body_register: 'Pour activer votre compte, cliquez sur le lien suivant:'
+mail_body_account_information_external: Vous pouvez utiliser votre compte "%s" pour vous connecter.
+mail_body_account_information: Paramètres de connexion de votre compte
+mail_subject_account_activation_request: "Demande d'activation d'un compte %s"
 mail_body_account_activation_request: "Un nouvel utilisateur (%s) s'est inscrit. Son compte nécessite votre approbation:"
 
 gui_validation_error: 1 erreur
diff --git a/lang/he.yml b/lang/he.yml
index 5828e6fb4..7450f04da 100644
--- a/lang/he.yml
+++ b/lang/he.yml
@@ -78,9 +78,9 @@ notice_no_issue_selected: "לא נבחר אף נושא! בחר בבקשה את 
 error_scm_not_found: כניסה ו\או גירסא אינם קיימים במאגר.
 error_scm_command_failed: "An error occurred when trying to access the repository: %s"
 
-mail_subject_lost_password: סיסמת ה-Redmine שלך
+mail_subject_lost_password: סיסמת ה-%s שלך
 mail_body_lost_password: 'לשינו סיסמת ה-Redmine שלך,לחץ על הקישור הבא:'
-mail_subject_register: הפעלת חשבון Redmine
+mail_subject_register: הפעלת חשבון %s
 mail_body_register: 'להפעלת חשבון ה-Redmine שלך, לחץ על הקישור הבא:'
 
 gui_validation_error: שגיאה 1
@@ -536,13 +536,13 @@ label_user_mail_option_none: "Only for things I watch or I'm involved in"
 setting_emails_footer: Emails footer
 label_float: Float
 button_copy: Copy
-mail_body_account_information_external: You can use your "%s" account to log into Redmine.
-mail_body_account_information: Your Redmine account information
+mail_body_account_information_external: You can use your "%s" account to log in.
+mail_body_account_information: Your account information
 setting_protocol: Protocol
 label_user_mail_no_self_notified: "I don't want to be notified of changes that I make myself"
 setting_time_format: Time format
 label_registration_activation_by_email: account activation by email
-mail_subject_account_activation_request: Redmine account activation request
+mail_subject_account_activation_request: %s account activation request
 mail_body_account_activation_request: 'A new user (%s) has registered. His account his pending your approval:'
 label_registration_automatic_activation: automatic account activation
 label_registration_manual_activation: manual account activation
diff --git a/lang/it.yml b/lang/it.yml
index f407cc764..2a35740ac 100644
--- a/lang/it.yml
+++ b/lang/it.yml
@@ -76,10 +76,10 @@ notice_feeds_access_key_reseted: Your RSS access key was reseted.
 error_scm_not_found: "La risorsa e/o la versione non esistono nel repository."
 error_scm_command_failed: "An error occurred when trying to access the repository: %s"
 
-mail_subject_lost_password: Password redMine
+mail_subject_lost_password: Password %s
 mail_body_lost_password: 'Per cambiare la password, usate il seguente collegamento:'
-mail_subject_register: Attivazione utenza redMine
-mail_body_register: 'Per attivare la vostra utenza Redmine, usate il seguente collegamento:'
+mail_subject_register: Attivazione utenza %s
+mail_body_register: 'Per attivare la vostra utenza, usate il seguente collegamento:'
 
 gui_validation_error: 1 errore
 gui_validation_error_plural: %d errori
@@ -536,13 +536,13 @@ label_user_mail_option_none: "Only for things I watch or I'm involved in"
 setting_emails_footer: Emails footer
 label_float: Float
 button_copy: Copy
-mail_body_account_information_external: You can use your "%s" account to log into Redmine.
-mail_body_account_information: Your Redmine account information
+mail_body_account_information_external: You can use your "%s" account to log in.
+mail_body_account_information: Your account information
 setting_protocol: Protocol
 label_user_mail_no_self_notified: "I don't want to be notified of changes that I make myself"
 setting_time_format: Time format
 label_registration_activation_by_email: account activation by email
-mail_subject_account_activation_request: Redmine account activation request
+mail_subject_account_activation_request: %s account activation request
 mail_body_account_activation_request: 'A new user (%s) has registered. His account his pending your approval:'
 label_registration_automatic_activation: automatic account activation
 label_registration_manual_activation: manual account activation
diff --git a/lang/ja.yml b/lang/ja.yml
index 3e74c5582..1b5427be4 100644
--- a/lang/ja.yml
+++ b/lang/ja.yml
@@ -77,10 +77,10 @@ notice_feeds_access_key_reseted: RSSアクセスキーを初期化しました
 error_scm_not_found: リポジトリに、エントリ/リビジョンが存在しません。
 error_scm_command_failed: "リポジトリへアクセスしようとしてエラーになりました: %s"
 
-mail_subject_lost_password: Redmineパスワード
+mail_subject_lost_password: %sパスワード
 mail_body_lost_password: 'パスワードを変更するには、以下のリンクをたどってください:'
-mail_subject_register: Redmineアカウントが有効になりました
-mail_body_register: 'Redmineアカウントをアクティブにするには、以下のリンクをたどってください:'
+mail_subject_register: %sアカウントが有効になりました
+mail_body_register: 'アカウントをアクティブにするには、以下のリンクをたどってください:'
 
 gui_validation_error: 1件のエラー
 gui_validation_error_plural: %d件のエラー
@@ -537,13 +537,13 @@ label_user_mail_option_none: "ウォッチまたは関係しているチケッ
 setting_emails_footer: メールのフッタ
 label_float: 小数
 button_copy: コピー
-mail_body_account_information_external: 「%s」アカウントを使ってRedmineにログインできます。
-mail_body_account_information: Redmineアカウント情報
+mail_body_account_information_external: 「%s」アカウントを使ってにログインできます。
+mail_body_account_information: アカウント情報
 setting_protocol: プロトコル
 label_user_mail_no_self_notified: 自分自身による変更の通知は不要です
 setting_time_format: 時刻の形式
 label_registration_activation_by_email: メールでアカウントを有効化
-mail_subject_account_activation_request: Redminアカウントの有効化要求
+mail_subject_account_activation_request: %sアカウントの有効化要求
 mail_body_account_activation_request: 新しいユーザ(%s)が登録しています。このアカウントはあなたの承認待ちです：
 label_registration_automatic_activation: 自動でアカウントを有効化
 label_registration_manual_activation: 手動でアカウントを有効化
diff --git a/lang/ko.yml b/lang/ko.yml
index 73f7e3cc3..f53274ec6 100644
--- a/lang/ko.yml
+++ b/lang/ko.yml
@@ -78,9 +78,9 @@ notice_no_issue_selected: "이슈가 선택되지 않았습니다. 수정하기
 error_scm_not_found: 소스 저장소에 해당 내용이 존재하지 않습니다.
 error_scm_command_failed: "An error occurred when trying to access the repository: %s"
 
-mail_subject_lost_password: 당신의 비밀번호
+mail_subject_lost_password: 당신의 비밀번호 (%s)
 mail_body_lost_password: '비밀번호를 변경하기 위해서 링크를 이용하세요'
-mail_subject_register: 당신의 계정 활성화
+mail_subject_register: 당신의 계정 활성화 (%s)
 mail_body_register: '계정을 활성화 하기 위해서 링크를 이용하세요 :'
 
 gui_validation_error: 1 에러
@@ -538,11 +538,11 @@ mail_body_account_information_external: 레드마인에 로그인할 때 "%s" 
 button_change_password: 비밀번호 변경
 label_nobody: nobody
 setting_protocol: 프로토콜
-mail_body_account_information: Redmine 계정 정보
+mail_body_account_information: 계정 정보
 label_user_mail_no_self_notified: "내가 만든 변경사항들에 대해서는 알림메일을 받지 않습니다."
 setting_time_format: 시간 형식
 label_registration_activation_by_email: 메일로 계정을 활성화하기
-mail_subject_account_activation_request: 레드마인 계정 활성화 요청
+mail_subject_account_activation_request: 레드마인 계정 활성화 요청 (%s)
 mail_body_account_activation_request: '새 계정(%s)이 등록되었습니다. 관리자님의 승인을 기다리고 있습니다.:'
 label_registration_automatic_activation: 자동 계정 활성화
 label_registration_manual_activation: 수동 계정 활성화
diff --git a/lang/lt.yml b/lang/lt.yml
index fc242f6dd..957b8cc9c 100644
--- a/lang/lt.yml
+++ b/lang/lt.yml
@@ -80,13 +80,13 @@ notice_account_pending: "Jūsų paskyra buvo sukūrta ir dabar laukiama administ
 error_scm_not_found: "Duomenys ir/ar pakeitimai saugykloje(repozitorojoje) neegzistuoja."
 error_scm_command_failed: "Įvyko klaida jungiantis prie saugyklos: %s"
 
-mail_subject_lost_password: Jūsų Redmine slaptažodis
-mail_body_lost_password: 'Norėdami pakeisti Redmine slaptažodį, spauskite nuorodą:'
-mail_subject_register: 'Redmine paskyros aktyvavymas'
-mail_body_register: 'Norėdami aktyvuoti Redmine paskyrą, spauskite nuorodą:'
-mail_body_account_information_external: Jūs galite naudoti Jūsų "%s" paskyrą, norėdami prisijungti prie Redmine.
-mail_body_account_information: Informacija apie Jūsų Redmine paskyrą
-mail_subject_account_activation_request: Redmine paskyros aktyvavimo prašymas
+mail_subject_lost_password: Jūsų %s slaptažodis
+mail_body_lost_password: 'Norėdami pakeisti slaptažodį, spauskite nuorodą:'
+mail_subject_register: '%s paskyros aktyvavymas'
+mail_body_register: 'Norėdami aktyvuoti paskyrą, spauskite nuorodą:'
+mail_body_account_information_external: Jūs galite naudoti Jūsų "%s" paskyrą, norėdami prisijungti.
+mail_body_account_information: Informacija apie Jūsų paskyrą
+mail_subject_account_activation_request: %s paskyros aktyvavimo prašymas
 mail_body_account_activation_request: 'Užsiregistravo naujas vartotojas (%s). Jo paskyra laukia jūsų patvirtinimo:'
  
 gui_validation_error: 1 klaida
diff --git a/lang/nl.yml b/lang/nl.yml
index 25827e454..c197e05f9 100644
--- a/lang/nl.yml
+++ b/lang/nl.yml
@@ -76,10 +76,10 @@ notice_feeds_access_key_reseted: Your RSS access key was reseted.
 error_scm_not_found: "Deze ingang of revisie bestaat niet in de repository."
 error_scm_command_failed: "An error occurred when trying to access the repository: %s"
 
-mail_subject_lost_password: Uw redMine wachtwoord
+mail_subject_lost_password: Uw %s wachtwoord
 mail_body_lost_password: 'Gebruik de volgende link om Uw wachtwoord te wijzigen:'
-mail_subject_register: redMine account activatie
-mail_body_register: 'Gebruik de volgende link om Uw Redmine account te activeren:'
+mail_subject_register: Uw %s account activatie
+mail_body_register: 'Gebruik de volgende link om Uw account te activeren:'
 
 gui_validation_error: 1 fout
 gui_validation_error_plural: %d fouten
@@ -537,13 +537,13 @@ label_user_mail_option_none: "Only for things I watch or I'm involved in"
 setting_emails_footer: Emails footer
 label_float: Float
 button_copy: Copy
-mail_body_account_information_external: You can use your "%s" account to log into Redmine.
-mail_body_account_information: Your Redmine account information
+mail_body_account_information_external: You can use your "%s" account to log in.
+mail_body_account_information: Your account information
 setting_protocol: Protocol
 label_user_mail_no_self_notified: "I don't want to be notified of changes that I make myself"
 setting_time_format: Time format
 label_registration_activation_by_email: account activation by email
-mail_subject_account_activation_request: Redmine account activation request
+mail_subject_account_activation_request: %s account activation request
 mail_body_account_activation_request: 'A new user (%s) has registered. His account his pending your approval:'
 label_registration_automatic_activation: automatic account activation
 label_registration_manual_activation: manual account activation
diff --git a/lang/pl.yml b/lang/pl.yml
index 0a25ba10e..0ba187ff3 100644
--- a/lang/pl.yml
+++ b/lang/pl.yml
@@ -73,10 +73,10 @@ notice_not_authorized: Nie jesteś autoryzowany by zobaczyć stronę.
 error_scm_not_found: "Wejście i/lub zmiana nie istnieje w repozytorium."
 error_scm_command_failed: "An error occurred when trying to access the repository: %s"
 
-mail_subject_lost_password: Twoje hasło do redMine
+mail_subject_lost_password: Twoje hasło do %s
 mail_body_lost_password: 'W celu zmiany swojego hasła użyj poniższego odnośnika:'
-mail_subject_register: Aktywacja konta w redMine
-mail_body_register: 'W celu aktywacji Twojego konta w Redmine, użyj poniższego odnośnika:'
+mail_subject_register: Aktywacja konta w %s
+mail_body_register: 'W celu aktywacji Twojego konta, użyj poniższego odnośnika:'
 
 gui_validation_error: 1 błąd
 gui_validation_error_plural: %d błędów
@@ -536,13 +536,13 @@ label_user_mail_option_none: "Tylko to co obserwuje lub w czym biorę udział"
 setting_emails_footer: Stopka e-mail
 label_float: Liczba rzeczywista
 button_copy: Kopia
-mail_body_account_information_external: Możesz użyć twojego "%s" konta do zalogowania do Redmine.
-mail_body_account_information: Twoje konto w Redmine
+mail_body_account_information_external: Możesz użyć twojego "%s" konta do zalogowania.
+mail_body_account_information: Twoje konto
 setting_protocol: Protokoł
 label_user_mail_no_self_notified: "Nie chcę powiadomień o zmianach, które sam wprowadzam."
 setting_time_format: Format czasu
 label_registration_activation_by_email: aktywacja konta przez e-mail
-mail_subject_account_activation_request: Zapytanie aktywacyjne konta Redmine
+mail_subject_account_activation_request: Zapytanie aktywacyjne konta %s
 mail_body_account_activation_request: 'Zarejestrowano nowego użytkownika: (%s). Konto oczekuje na twoje zatwierdzenie:'
 label_registration_automatic_activation: automatyczna aktywacja kont
 label_registration_manual_activation: manualna aktywacja kont
diff --git a/lang/pt-br.yml b/lang/pt-br.yml
index e84a45de3..fbb82ea4a 100644
--- a/lang/pt-br.yml
+++ b/lang/pt-br.yml
@@ -76,10 +76,10 @@ notice_feeds_access_key_reseted: Your RSS access key was reseted.
 error_scm_not_found: "A entrada e/ou a revisao nao existem no repositorio."
 error_scm_command_failed: "An error occurred when trying to access the repository: %s"
 
-mail_subject_lost_password: Sua senha do redMine.
+mail_subject_lost_password: Sua senha do %s.
 mail_body_lost_password: 'Para mudar sua senha, clique no link abaixo:'
-mail_subject_register: Ativacao de conta do redMine.
-mail_body_register: 'Para ativar sua conta do Redmine, clique no link abaixo:'
+mail_subject_register: Ativacao de conta do %s.
+mail_body_register: 'Para ativar sua conta, clique no link abaixo:'
 
 gui_validation_error: 1 erro
 gui_validation_error_plural: %d erros
@@ -536,13 +536,13 @@ label_user_mail_option_none: "Only for things I watch or I'm involved in"
 setting_emails_footer: Emails footer
 label_float: Float
 button_copy: Copy
-mail_body_account_information_external: You can use your "%s" account to log into Redmine.
-mail_body_account_information: Your Redmine account information
+mail_body_account_information_external: You can use your "%s" account to log in.
+mail_body_account_information: Your account information
 setting_protocol: Protocol
 label_user_mail_no_self_notified: "I don't want to be notified of changes that I make myself"
 setting_time_format: Time format
 label_registration_activation_by_email: account activation by email
-mail_subject_account_activation_request: Redmine account activation request
+mail_subject_account_activation_request: %s account activation request
 mail_body_account_activation_request: 'A new user (%s) has registered. His account his pending your approval:'
 label_registration_automatic_activation: automatic account activation
 label_registration_manual_activation: manual account activation
diff --git a/lang/pt.yml b/lang/pt.yml
index a8f5110eb..d177a0775 100644
--- a/lang/pt.yml
+++ b/lang/pt.yml
@@ -76,10 +76,10 @@ notice_feeds_access_key_reseted: Your RSS access key was reseted.
 error_scm_not_found: "A entrada e/ou a revisão não existem no repositório."
 error_scm_command_failed: "An error occurred when trying to access the repository: %s"
 
-mail_subject_lost_password: Sua senha do redMine.
+mail_subject_lost_password: Sua senha do %s.
 mail_body_lost_password: 'Para mudar sua senha, clique no link abaixo:'
-mail_subject_register: Ativação de conta do redMine.
-mail_body_register: 'Para ativar sua conta do Redmine, clique no link abaixo:'
+mail_subject_register: Ativação de conta do %s.
+mail_body_register: 'Para ativar sua conta, clique no link abaixo:'
 
 gui_validation_error: 1 erro
 gui_validation_error_plural: %d erros
@@ -536,13 +536,13 @@ label_user_mail_option_none: "Only for things I watch or I'm involved in"
 setting_emails_footer: Emails footer
 label_float: Float
 button_copy: Copy
-mail_body_account_information_external: You can use your "%s" account to log into Redmine.
-mail_body_account_information: Your Redmine account information
+mail_body_account_information_external: You can use your "%s" account to log in.
+mail_body_account_information: Your account information
 setting_protocol: Protocol
 label_user_mail_no_self_notified: "I don't want to be notified of changes that I make myself"
 setting_time_format: Time format
 label_registration_activation_by_email: account activation by email
-mail_subject_account_activation_request: Redmine account activation request
+mail_subject_account_activation_request: %s account activation request
 mail_body_account_activation_request: 'A new user (%s) has registered. His account his pending your approval:'
 label_registration_automatic_activation: automatic account activation
 label_registration_manual_activation: manual account activation
diff --git a/lang/ro.yml b/lang/ro.yml
index f2f831eee..d99b53a53 100644
--- a/lang/ro.yml
+++ b/lang/ro.yml
@@ -76,10 +76,10 @@ notice_feeds_access_key_reseted: Parola de acces RSS a fost resetat.
 error_scm_not_found: "Articolul sau reviziunea nu exista in stoc (Repository)."
 error_scm_command_failed: "An error occurred when trying to access the repository: %s"
 
-mail_subject_lost_password: Your Redmine password
-mail_body_lost_password: 'To change your Redmine password, click on the following link:'
-mail_subject_register: Redmine account activation
-mail_body_register: 'To activate your Redmine account, click on the following link:'
+mail_subject_lost_password: Your %s password
+mail_body_lost_password: 'To change your password, click on the following link:'
+mail_subject_register: Your %s account activation
+mail_body_register: 'To activate your account, click on the following link:'
 
 gui_validation_error: 1 eroare
 gui_validation_error_plural: %d erori
@@ -536,13 +536,13 @@ label_user_mail_option_none: "Only for things I watch or I'm involved in"
 setting_emails_footer: Emails footer
 label_float: Float
 button_copy: Copy
-mail_body_account_information_external: You can use your "%s" account to log into Redmine.
-mail_body_account_information: Your Redmine account information
+mail_body_account_information_external: You can use your "%s" account to log in.
+mail_body_account_information: Your account information
 setting_protocol: Protocol
 label_user_mail_no_self_notified: "I don't want to be notified of changes that I make myself"
 setting_time_format: Time format
 label_registration_activation_by_email: account activation by email
-mail_subject_account_activation_request: Redmine account activation request
+mail_subject_account_activation_request: %s account activation request
 mail_body_account_activation_request: 'A new user (%s) has registered. His account his pending your approval:'
 label_registration_automatic_activation: automatic account activation
 label_registration_manual_activation: manual account activation
diff --git a/lang/ru.yml b/lang/ru.yml
index ec5132a30..7b11b781f 100644
--- a/lang/ru.yml
+++ b/lang/ru.yml
@@ -81,13 +81,13 @@ error_scm_not_found: Хранилилище не содержит записи 
 error_scm_command_failed: "Ошибка доступа к хранилищу: %s"
 error_can_t_load_default_data: "Конфигурация по умолчанию не была загружена: %s"
 
-mail_subject_lost_password: Ваш Redmine пароль
-mail_body_lost_password: 'Для изменения Redmine пароля, зайдите по следующей ссылке:'
-mail_subject_register: Активация учетной записи Redmine
-mail_body_register: 'Для активации учетной записи Redmine, зайдите по следующей ссылке:'
-mail_body_account_information_external: Вы можете использовать вашу "%s" учетную запись для входа в Redmine.
-mail_body_account_information: Информация по Вашей учетной записи Redmine
-mail_subject_account_activation_request: Запрос на активацию пользователя в системе Redmine
+mail_subject_lost_password: Ваш %s пароль
+mail_body_lost_password: 'Для изменения пароля, зайдите по следующей ссылке:'
+mail_subject_register: Активация учетной записи %s
+mail_body_register: 'Для активации учетной записи, зайдите по следующей ссылке:'
+mail_body_account_information_external: Вы можете использовать вашу "%s" учетную запись для входа.
+mail_body_account_information: Информация по Вашей учетной записи
+mail_subject_account_activation_request: Запрос на активацию пользователя в системе %s
 mail_body_account_activation_request: 'Новый пользователь (%s) зарегистрирован. Учетная запись ожидает вашего утверждения:'
 
 
diff --git a/lang/sr.yml b/lang/sr.yml
index 79992f9d3..3584d823d 100644
--- a/lang/sr.yml
+++ b/lang/sr.yml
@@ -78,12 +78,12 @@ notice_no_issue_selected: "Nijedna kartica nije izabrana! Molim, izaberite karti
 error_scm_not_found: "Unos i/ili revizija ne postoji u spremištu."
 error_scm_command_failed: "An error occurred when trying to access the repository: %s"
 
-mail_subject_lost_password: Vaša redMine lozinka
-mail_body_lost_password: 'Da biste izmenili vašu Redmine lozinku, kliknite na sledeći link:'
-mail_subject_register: aktivacija redMine naloga
-mail_body_register: 'Da biste aktivirali vaš Redmine nalog, kliknite na sledeći link:'
-mail_body_account_information_external: Mozete koristiti vas "%s" nalog da bi ste se prikljucili na Redmine.
-mail_body_account_information: Informacije o vasem Redmine nalogu
+mail_subject_lost_password: Vaša %s lozinka
+mail_body_lost_password: 'Da biste izmenili vašu lozinku, kliknite na sledeći link:'
+mail_subject_register: Aktivacija %s naloga
+mail_body_register: 'Da biste aktivirali vaš nalog, kliknite na sledeći link:'
+mail_body_account_information_external: Mozete koristiti vas "%s" nalog da bi ste se prikljucili.
+mail_body_account_information: Informacije o vasem nalogu
 
 gui_validation_error: 1 greška
 gui_validation_error_plural: %d grešaka
@@ -543,7 +543,7 @@ setting_protocol: Protocol
 label_user_mail_no_self_notified: "Ne želim da budem obaveštavan o izmenama koje sam pravim"
 setting_time_format: Format vremena
 label_registration_activation_by_email: aktivacija naloga putem email-a
-mail_subject_account_activation_request: Redmine zahtev za aktivacijom naloga
+mail_subject_account_activation_request: %s zahtev za aktivacijom naloga
 mail_body_account_activation_request: 'Novi korisnik (%s) se registrovao. Njegov nalog čeka vaše odobrenje:'
 label_registration_automatic_activation: automatska aktivacija naloga
 label_registration_manual_activation: ručna aktivacija naloga
diff --git a/lang/sv.yml b/lang/sv.yml
index 8594dc4d3..ab16af51d 100644
--- a/lang/sv.yml
+++ b/lang/sv.yml
@@ -76,10 +76,10 @@ notice_feeds_access_key_reseted: Your RSS access key was reseted.
 error_scm_not_found: "Inlägg och/eller revision finns inte i repositoriet."
 error_scm_command_failed: "An error occurred when trying to access the repository: %s"
 
-mail_subject_lost_password: Ditt redMine lösenord
+mail_subject_lost_password: Ditt %s lösenord
 mail_body_lost_password: 'För att ändra lösenord, följ denna länk:'
-mail_subject_register: redMine kontoaktivering
-mail_body_register: 'För att aktivera ditt Redmine-konto, använd följande länk.'
+mail_subject_register: Ditt %s kontoaktivering
+mail_body_register: 'För att aktivera ditt konto, använd följande länk.'
 
 gui_validation_error: 1 fel
 gui_validation_error_plural: %d fel
@@ -537,13 +537,13 @@ label_user_mail_option_none: "Only for things I watch or I'm involved in"
 setting_emails_footer: Emails footer
 label_float: Float
 button_copy: Copy
-mail_body_account_information_external: You can use your "%s" account to log into Redmine.
-mail_body_account_information: Your Redmine account information
+mail_body_account_information_external: You can use your "%s" account to log in.
+mail_body_account_information: Your account information
 setting_protocol: Protocol
 label_user_mail_no_self_notified: "I don't want to be notified of changes that I make myself"
 setting_time_format: Time format
 label_registration_activation_by_email: account activation by email
-mail_subject_account_activation_request: Redmine account activation request
+mail_subject_account_activation_request: %s account activation request
 mail_body_account_activation_request: 'A new user (%s) has registered. His account his pending your approval:'
 label_registration_automatic_activation: automatic account activation
 label_registration_manual_activation: manual account activation
diff --git a/lang/uk.yml b/lang/uk.yml
index 7bd22acaf..7038640f2 100644
--- a/lang/uk.yml
+++ b/lang/uk.yml
@@ -77,13 +77,13 @@ notice_failed_to_save_issues: "Не вдалося зберегти %d пунк
 notice_no_issue_selected: "Не вибрано жодної задачі! Будь ласка, відзначте задачу, яку ви хочете відредагувати."
 notice_account_pending: "Ваш обліковий запис створено і він чекає на підтвердження адміністратором."
 
-mail_subject_lost_password: Ваш Redmine пароль
-mail_body_lost_password: 'Для зміни Redmine пароля, зайдіть за наступним посиланням:'
-mail_subject_register: Активація облікового запису Redmine
-mail_body_register: 'Для активації облікового запису Redmine, зайдіть за наступним посиланням:'
-mail_body_account_information_external: Ви можете використовувати ваш "%s" обліковий запис для входу в Redmine.
-mail_body_account_information: Інформація по Вашому обліковому запису Redmine
-mail_subject_account_activation_request: Запит на активацію облікового запису Redmine
+mail_subject_lost_password: Ваш %s пароль
+mail_body_lost_password: 'Для зміни пароля, зайдіть за наступним посиланням:'
+mail_subject_register: Активація облікового запису %s
+mail_body_register: 'Для активації облікового запису, зайдіть за наступним посиланням:'
+mail_body_account_information_external: Ви можете використовувати ваш "%s" обліковий запис для входу.
+mail_body_account_information: Інформація по Вашому обліковому запису
+mail_subject_account_activation_request: Запит на активацію облікового запису %s
 mail_body_account_activation_request: 'Новий користувач (%s) зареєструвався. Його обліковий запис чекає на ваше підтвердження:'
 
 gui_validation_error: 1 помилка
diff --git a/lang/zh-tw.yml b/lang/zh-tw.yml
index c14c26a34..32bcd8419 100644
--- a/lang/zh-tw.yml
+++ b/lang/zh-tw.yml
@@ -82,13 +82,13 @@ error_scm_not_found: SCM 儲存庫中找不到這個專案與(或)版本。
 error_scm_command_failed: "嘗試存取儲存庫時發生錯誤：: %s"
 error_issue_not_found_in_project: '該項目不存在或不屬於此專案'
 
-mail_subject_lost_password: 您的 Redmine 網站密碼
-mail_body_lost_password: '欲變更您的 Redmine 網站密碼, 請點選以下鏈結:'
-mail_subject_register: 啟用您的 Redmine 帳號
-mail_body_register: '欲啟用您的 Redmine 帳號, 請點選以下鏈結:'
-mail_body_account_information_external: 您可以使用 "%s" 帳號登入 Redmine 網站。
-mail_body_account_information: 您的 Redmine 帳號資訊
-mail_subject_account_activation_request: Redmine 帳號啟用需求通知
+mail_subject_lost_password: 您的 %s 網站密碼
+mail_body_lost_password: '欲變更您的 網站密碼, 請點選以下鏈結:'
+mail_subject_register: 啟用您的 %s 帳號
+mail_body_register: '欲啟用您的 帳號, 請點選以下鏈結:'
+mail_body_account_information_external: 您可以使用 "%s" 帳號登入 網站。
+mail_body_account_information: 您的 帳號資訊
+mail_subject_account_activation_request: %s 帳號啟用需求通知
 mail_body_account_activation_request: '有位新用戶 (%s) 已經完成註冊，正等候您的審核：'
 
 gui_validation_error: 1 個錯誤
diff --git a/lang/zh.yml b/lang/zh.yml
index 836241f90..e2d555fbf 100644
--- a/lang/zh.yml
+++ b/lang/zh.yml
@@ -82,13 +82,13 @@ error_scm_not_found: "版本库中不存在该条目和（或）其修订版本
 error_scm_command_failed: "访问版本库时发生错误：%s"
 error_issue_not_found_in_project: '问题不存在或不属于此项目'
 
-mail_subject_lost_password: 您的Redmine密码
-mail_body_lost_password: '请点击以下链接来修改您的Redmine密码：'
-mail_subject_register: Redmine帐号激活
-mail_body_register: '请点击以下链接来激活您的Redmine帐号：'
-mail_body_account_information_external: 您可以使用您的 "%s" 帐号来登录Redmine。
-mail_body_account_information: 您的Redmine帐号信息
-mail_subject_account_activation_request: Redmine帐号激活请求
+mail_subject_lost_password: 您的 %s 密码
+mail_body_lost_password: '请点击以下链接来修改您的密码：'
+mail_subject_register: %s帐号激活
+mail_body_register: '请点击以下链接来激活您的帐号：'
+mail_body_account_information_external: 您可以使用您的 "%s" 帐号来登录。
+mail_body_account_information: 您的帐号信息
+mail_subject_account_activation_request: %s帐号激活请求
 mail_body_account_activation_request: '新用户（%s）已完成注册，正在等候您的审核：'
 
 gui_validation_error: 1 个错误

From 01fdaf5977429d8a40682af915d95bf742c97588 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sat, 15 Mar 2008 10:30:56 +0000
Subject: [PATCH 296/710] Mercurial adapter: * fetch changesets by batches of
 100 (rather than in a single transaction) * fix: fetch_changesets tries to
 re-insert the last revision that exists in the db (#860)

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1255 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/models/repository/mercurial.rb            | 46 +++++++++++--------
 lib/redmine/scm/adapters/mercurial_adapter.rb |  6 ++-
 2 files changed, 31 insertions(+), 21 deletions(-)

diff --git a/app/models/repository/mercurial.rb b/app/models/repository/mercurial.rb
index 5d9ea9cd4..27a8eaea9 100644
--- a/app/models/repository/mercurial.rb
+++ b/app/models/repository/mercurial.rb
@@ -51,29 +51,35 @@ class Repository::Mercurial < Repository
     scm_info = scm.info
     if scm_info
       # latest revision found in database
-      db_revision = latest_changeset ? latest_changeset.revision : nil
+      db_revision = latest_changeset ? latest_changeset.revision.to_i : -1
       # 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])
+      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 100
+          identifier_to = [identifier_from + 99, scm_revision].min
+          revisions = scm.revisions('', identifier_from, identifier_to, :with_paths => true)
+          transaction do
+            revisions.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 unless revisions.nil?
+          identifier_from = identifier_to + 1
         end
       end
     end
diff --git a/lib/redmine/scm/adapters/mercurial_adapter.rb b/lib/redmine/scm/adapters/mercurial_adapter.rb
index 26bf01140..f4dffd905 100644
--- a/lib/redmine/scm/adapters/mercurial_adapter.rb
+++ b/lib/redmine/scm/adapters/mercurial_adapter.rb
@@ -71,7 +71,11 @@ module Redmine
         def revisions(path=nil, identifier_from=nil, identifier_to=nil, options={})
           revisions = Revisions.new
           cmd = "#{HG_BIN} -v -R #{target('')} log"
-          cmd << " -r #{identifier_from.to_i}:" if identifier_from
+          if identifier_from && identifier_to
+            cmd << " -r #{identifier_from.to_i}:#{identifier_to.to_i}"
+          elsif identifier_from
+            cmd << " -r #{identifier_from.to_i}:"
+          end
           cmd << " --limit #{options[:limit].to_i}" if options[:limit]
           shellout(cmd) do |io|
             changeset = {}

From 451aa6ba4e2478fe7a914d8606c5eba5f53fb887 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sat, 15 Mar 2008 11:05:22 +0000
Subject: [PATCH 297/710] Add "--encoding utf8" option to the Mercurial "hg
 log" command in order to get utf8 encoded commit logs (#834).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1256 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 lib/redmine/scm/adapters/mercurial_adapter.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/redmine/scm/adapters/mercurial_adapter.rb b/lib/redmine/scm/adapters/mercurial_adapter.rb
index f4dffd905..003e4a5df 100644
--- a/lib/redmine/scm/adapters/mercurial_adapter.rb
+++ b/lib/redmine/scm/adapters/mercurial_adapter.rb
@@ -70,7 +70,7 @@ module Redmine
           
         def revisions(path=nil, identifier_from=nil, identifier_to=nil, options={})
           revisions = Revisions.new
-          cmd = "#{HG_BIN} -v -R #{target('')} log"
+          cmd = "#{HG_BIN} -v --encoding utf8 -R #{target('')} log"
           if identifier_from && identifier_to
             cmd << " -r #{identifier_from.to_i}:#{identifier_to.to_i}"
           elsif identifier_from

From 83061e9ca29ac224da3385f930508f89ad04a5bf Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sat, 15 Mar 2008 11:27:46 +0000
Subject: [PATCH 298/710] Fix tests broken by r1243 (Redirect to issue page
 after creating a new issue).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1257 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 test/functional/issues_controller_test.rb | 2 +-
 test/integration/issues_test.rb           | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/functional/issues_controller_test.rb b/test/functional/issues_controller_test.rb
index 4f644d522..f80110aa2 100644
--- a/test/functional/issues_controller_test.rb
+++ b/test/functional/issues_controller_test.rb
@@ -171,7 +171,7 @@ class IssuesControllerTest < Test::Unit::TestCase
                           :description => 'This is the description',
                           :priority_id => 5},
                :custom_fields => {'2' => 'Value for field 2'}
-    assert_redirected_to 'projects/ecookbook/issues'
+    assert_redirected_to 'issues/show'
     
     issue = Issue.find_by_subject('This is the test_new issue')
     assert_not_nil issue
diff --git a/test/integration/issues_test.rb b/test/integration/issues_test.rb
index facd7c630..b9e21719c 100644
--- a/test/integration/issues_test.rb
+++ b/test/integration/issues_test.rb
@@ -34,9 +34,9 @@ class IssuesTest < ActionController::IntegrationTest
     assert_kind_of Issue, issue
 
     # check redirection
-    assert_redirected_to "projects/ecookbook/issues"
+    assert_redirected_to "issues/show"
     follow_redirect!
-    assert assigns(:issues).include?(issue)
+    assert_equal issue, assigns(:issue)
 
     # check issue attributes    
     assert_equal 'jsmith', issue.author.login

From 888b254844092cc4b007fd6e40db719c6ed8dfc8 Mon Sep 17 00:00:00 2001
From: John Goerzen <jgoerzen@complete.org>
Date: Sat, 15 Mar 2008 13:24:08 +0000
Subject: [PATCH 299/710] Further refine WikiCaps processing for Trac to
 eliminate problems in some corner cases

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1258 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 lib/tasks/migrate_from_trac.rake | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/tasks/migrate_from_trac.rake b/lib/tasks/migrate_from_trac.rake
index 51d85fe0f..f1d754109 100644
--- a/lib/tasks/migrate_from_trac.rake
+++ b/lib/tasks/migrate_from_trac.rake
@@ -217,8 +217,8 @@ namespace :redmine do
         text = text.gsub(/\[wiki:\"(.+)\".*\]/) {|s| "[[#{$1.delete(',./?;|:')}]]"}
         text = text.gsub(/\[wiki:([^\s\]]+).*\]/) {|s| "[[#{$1.delete(',./?;|:')}]]"}
 
-	# Links to pages UsingJustCaps
-	text = text.gsub(/[^!]\b([A-Z][a-z]+[A-Z][a-zA-Z]+)/, ' [[\1]]')
+	# Links to pages UsingJustWikiCaps
+	text = text.gsub(/([^!]|^)(^| )([A-Z][a-z]+[A-Z][a-zA-Z]+)/, '\\1\\2[[\3]]')
 	# Normalize things that were supposed to not be links
 	# like !NotALink
 	text = text.gsub(/(^| )!([A-Z][A-Za-z]+)/, '\1\2')

From 5b6978a1f3f8d4aa6da9607d06217e4322b7feb8 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 16 Mar 2008 10:09:35 +0000
Subject: [PATCH 300/710] Add a margin to the bottom of wiki tables (#843).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1259 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 public/stylesheets/application.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 26f8408d6..1fd7881df 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -391,6 +391,7 @@ background-color: #fff;
 div.wiki table {
     border: 1px solid #505050;
     border-collapse: collapse;
+    margin-bottom: 1em;
 }
 
 div.wiki table, div.wiki td, div.wiki th {

From a8fcf8487d4165741cf8bffe71ce6302c6aab4e2 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 16 Mar 2008 12:21:54 +0000
Subject: [PATCH 301/710] Add a time tracking block for 'My page' (#615). It
 lists current user's time entries for the last 7 days across all projects,
 grouped by day with subtotals for each day, and a grand total.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1260 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/my_controller.rb      |  3 +-
 app/controllers/timelog_controller.rb |  2 ++
 app/helpers/application_helper.rb     |  4 +--
 app/views/my/blocks/_timelog.rhtml    | 52 +++++++++++++++++++++++++++
 public/stylesheets/application.css    |  6 ++--
 5 files changed, 61 insertions(+), 6 deletions(-)
 create mode 100644 app/views/my/blocks/_timelog.rhtml

diff --git a/app/controllers/my_controller.rb b/app/controllers/my_controller.rb
index cb326bc93..ff3393e90 100644
--- a/app/controllers/my_controller.rb
+++ b/app/controllers/my_controller.rb
@@ -26,7 +26,8 @@ class MyController < ApplicationController
              'issueswatched' => :label_watched_issues,
              'news' => :label_news_latest,
              'calendar' => :label_calendar,
-             'documents' => :label_document_plural
+             'documents' => :label_document_plural,
+             'timelog' => :label_spent_time
            }.freeze
 
   DEFAULT_LAYOUT = {  'left' => ['issuesassignedtome'], 
diff --git a/app/controllers/timelog_controller.rb b/app/controllers/timelog_controller.rb
index 38c1fb04c..d767037eb 100644
--- a/app/controllers/timelog_controller.rb
+++ b/app/controllers/timelog_controller.rb
@@ -216,6 +216,8 @@ class TimelogController < ApplicationController
     render_403 and return unless @time_entry.editable_by?(User.current)
     @time_entry.destroy
     flash[:notice] = l(:notice_successful_delete)
+    redirect_to :back
+  rescue RedirectBackError
     redirect_to :action => 'details', :project_id => @time_entry.project
   end
 
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index be0b808d2..aa19ce7d4 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -37,8 +37,8 @@ module ApplicationHelper
     user ? link_to(user, :controller => 'account', :action => 'show', :id => user) : 'Anonymous'
   end
   
-  def link_to_issue(issue)
-    link_to "#{issue.tracker.name} ##{issue.id}", :controller => "issues", :action => "show", :id => issue
+  def link_to_issue(issue, options={})
+    link_to "#{issue.tracker.name} ##{issue.id}", {:controller => "issues", :action => "show", :id => issue}, options
   end
   
   def toggle_link(name, id, options={})
diff --git a/app/views/my/blocks/_timelog.rhtml b/app/views/my/blocks/_timelog.rhtml
new file mode 100644
index 000000000..a3f74e54d
--- /dev/null
+++ b/app/views/my/blocks/_timelog.rhtml
@@ -0,0 +1,52 @@
+<h3><%=l(:label_spent_time)%> (<%= l(:label_last_n_days, 7) %>)</h3>
+<% 
+entries = TimeEntry.find(:all,
+				:conditions => ["#{TimeEntry.table_name}.user_id = ? AND #{TimeEntry.table_name}.spent_on BETWEEN ? AND ?", @user.id, Date.today - 6, Date.today],
+				:include => [:activity, :project, {:issue => [:tracker, :status]}],
+				:order => "#{TimeEntry.table_name}.spent_on DESC, #{Project.table_name}.name ASC, #{Tracker.table_name}.position ASC, #{Issue.table_name}.id ASC")
+entries_by_day = entries.group_by(&:spent_on)
+%>
+
+<div class="total-hours">
+<p><%= l(:label_total) %>: <%= html_hours("%.2f" % entries.sum(&:hours).to_f) %></p>
+</div>
+
+<% if entries.any? %>
+<table class="list time-entries">
+<thead>
+<th><%= l(:label_activity) %></th>
+<th><%= l(:label_project) %></th>
+<th><%= l(:field_comments) %></th>
+<th><%= l(:field_hours) %></th>
+<th></th>
+</thead>
+<tbody>
+<% entries_by_day.keys.sort.reverse.each do |day| %>
+    <tr class="odd">
+    <td><strong><%= day == Date.today ? l(:label_today).titleize : format_date(day) %></strong></td>
+    <td colspan="2"></td>
+    <td class="hours"><em><%= html_hours("%.2f" % entries_by_day[day].sum(&:hours).to_f) %></em></td>
+    <td></td>
+    </tr>
+    <% entries_by_day[day].each do |entry| -%>
+    <tr class="time-entry" style="border-bottom: 1px solid #f5f5f5;">
+    <td class="activity"><%=h entry.activity %></td>
+    <td class="subject"><%=h entry.project %> <%= ' - ' + link_to_issue(entry.issue, :title => h("#{entry.issue.subject} (#{entry.issue.status})")) if entry.issue %></td>
+    <td class="comments"><%=h entry.comments %></td>
+    <td class="hours"><%= html_hours("%.2f" % entry.hours) %></td>
+    <td align="center">
+    <% if entry.editable_by?(@user) -%>
+        <%= link_to image_tag('edit.png'), {:controller => 'timelog', :action => 'edit', :id => entry},
+                                           :title => l(:button_edit) %>
+        <%= link_to image_tag('delete.png'), {:controller => 'timelog', :action => 'destroy', :id => entry},
+                                             :confirm => l(:text_are_you_sure),
+                                             :method => :post,
+                                             :title => l(:button_delete) %>
+    <% end -%>
+    </td>
+    </tr>
+    <% end -%>
+<% end -%>
+</tbdoy>
+</table>
+<% end %>
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 1fd7881df..816cd05a2 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -113,9 +113,9 @@ tr.user.locked, tr.user.registered { color: #aaa; }
 tr.user.locked a, tr.user.registered a { color: #aaa; }
 
 tr.time-entry { text-align: center; white-space: nowrap; }
-tr.time-entry td.subject, tr.time-entry td.comments { text-align: left; }
-tr.time-entry td.hours { text-align: right; font-weight: bold; padding-right: 0.5em; }
-tr.time-entry .hours-dec { font-size: 0.9em; }
+tr.time-entry td.subject, tr.time-entry td.comments { text-align: left; white-space: normal; }
+td.hours { text-align: right; font-weight: bold; padding-right: 0.5em; }
+td.hours .hours-dec { font-size: 0.9em; }
 
 table.list tbody tr:hover { background-color:#ffffdd; }
 table td {padding:2px;}

From 2eb085506b49bc460deaed8959cb905bfccbeaa6 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 16 Mar 2008 14:18:36 +0000
Subject: [PATCH 302/710] Adds a title attribute to the next/previous links on
 the activity view, containing the corresponding date range (#837).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1261 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/projects/activity.rhtml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/views/projects/activity.rhtml b/app/views/projects/activity.rhtml
index e8832fccc..bb3f16da3 100644
--- a/app/views/projects/activity.rhtml
+++ b/app/views/projects/activity.rhtml
@@ -21,12 +21,14 @@
 <div style="float:left;">
 <%= link_to_remote(('&#171; ' + l(:label_previous)), 
                    {:update => "content", :url => params.merge(:from => @date_to - @days), :complete => 'window.scrollTo(0,0)'},
-                   {:href => url_for(params.merge(:from => @date_to - @days))}) %>
+                   {:href => url_for(params.merge(:from => @date_to - @days)),
+                    :title => "#{l(:label_date_from)} #{format_date(@date_to - 2*@days)} #{l(:label_date_to).downcase} #{format_date(@date_to - @days - 1)}"}) %>
 </div>
 <div style="float:right;">
 <%= link_to_remote((l(:label_next) + ' &#187;'), 
                    {:update => "content", :url => params.merge(:from => @date_to + @days), :complete => 'window.scrollTo(0,0)'},
-                   {:href => url_for(params.merge(:from => @date_to + @days))}) unless @date_to >= Date.today %>
+                   {:href => url_for(params.merge(:from => @date_to + @days)),
+                    :title => "#{l(:label_date_from)} #{format_date(@date_to)} #{l(:label_date_to).downcase} #{format_date(@date_to + @days - 1)}"}) unless @date_to >= Date.today %>
 </div>
 &nbsp;
 <p class="other-formats">

From f5b5688e8ad80dbfc3b2da13ac0ae245f541da48 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 16 Mar 2008 14:31:17 +0000
Subject: [PATCH 303/710] Move the filters buttons inside the filters fieldset
 on the issue list (closes #614).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1262 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/issues/index.rhtml       | 6 +++---
 app/views/queries/_columns.rhtml   | 4 ++--
 app/views/queries/_filters.rhtml   | 2 --
 app/views/queries/_form.rhtml      | 3 +++
 public/stylesheets/application.css | 3 +++
 5 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/app/views/issues/index.rhtml b/app/views/issues/index.rhtml
index d3408fa99..d212ab6bb 100644
--- a/app/views/issues/index.rhtml
+++ b/app/views/issues/index.rhtml
@@ -4,8 +4,9 @@
     
     <% form_tag({ :controller => 'queries', :action => 'new' }, :id => 'query_form') do %>
     <%= hidden_field_tag('project_id', @project.id) if @project %>
+    <fieldset id="filters"><legend><%= l(:label_filter_plural) %></legend>
     <%= render :partial => 'queries/filters', :locals => {:query => @query} %>
-    <div class="contextual">
+    <div class="buttons">
     <%= link_to_remote l(:button_apply), 
                        { :url => { :set_filter => 1 },
                          :update => "content",
@@ -21,8 +22,7 @@
     <%= link_to l(:button_save), {}, :onclick => "$('query_form').submit(); return false;", :class => 'icon icon-save' %>
     <% end %>
     </div>
-    <br />
-    &nbsp;
+    </fieldset>
     <% end %>
 <% else %>
     <div class="contextual">
diff --git a/app/views/queries/_columns.rhtml b/app/views/queries/_columns.rhtml
index 8d3da7f6a..1a481adae 100644
--- a/app/views/queries/_columns.rhtml
+++ b/app/views/queries/_columns.rhtml
@@ -1,8 +1,8 @@
 <% content_tag 'fieldset', :id => 'columns', :style => (query.has_default_columns? ? 'display:none;' : nil) do %>
 <legend><%= l(:field_column_names) %></legend>
 
-<%= hidden_field_tag 'query[column_names][]', '' %>
-<table margin=0>
+<%= hidden_field_tag 'query[column_names][]', '', :id => nil %>
+<table>
 	<tr>
 		<td><%= select_tag 'available_columns',
 		          options_for_select((query.available_columns - query.columns).collect {|column| [column.caption, column.name]}),
diff --git a/app/views/queries/_filters.rhtml b/app/views/queries/_filters.rhtml
index 2465818d8..458d7139e 100644
--- a/app/views/queries/_filters.rhtml
+++ b/app/views/queries/_filters.rhtml
@@ -56,7 +56,6 @@ function toggle_multi_select(field) {
 //]]>
 </script>
 
-<fieldset><legend><%= l(:label_filter_plural) %></legend>
 <table width="100%">
 <tr>
 <td>
@@ -100,4 +99,3 @@ function toggle_multi_select(field) {
 </td>
 </tr>
 </table>
-</fieldset>
\ No newline at end of file
diff --git a/app/views/queries/_form.rhtml b/app/views/queries/_form.rhtml
index 1620d9b05..2d4b96fd1 100644
--- a/app/views/queries/_form.rhtml
+++ b/app/views/queries/_form.rhtml
@@ -16,6 +16,9 @@
       :onclick => 'if (this.checked) {Element.hide("columns")} else {Element.show("columns")}' %></p>
 </div>
 
+<fieldset><legend><%= l(:label_filter_plural) %></legend>
 <%= render :partial => 'queries/filters', :locals => {:query => query}%>
+</fieldset>
+
 <%= render :partial => 'queries/columns', :locals => {:query => query}%>
 </div>
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 816cd05a2..a0d5deb28 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -159,6 +159,9 @@ textarea.wiki-edit { width: 99%; }
 li p {margin-top: 0;}
 div.issue {background:#ffffdd; padding:6px; margin-bottom:6px;border: 1px solid #d7d7d7;}
 
+#filters { margin-bottom: 1em; }
+#filters .buttons { text-align: right; font-size: 0.9em; }
+
 div#issue-changesets {float:right; width:45%; margin-left: 1em; margin-bottom: 1em; background: #fff; padding-left: 1em; font-size: 90%;}
 div#issue-changesets .changeset { padding: 4px;}
 div#issue-changesets .changeset { border-bottom: 1px solid #ddd; }

From 2d01398d67dd43b594445a7fca31243585b22172 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 16 Mar 2008 14:54:36 +0000
Subject: [PATCH 304/710] Trac importer: * prevent duplication of associated
 trackers when the target project already exists (closes #829) * warn user if
 the target project already exists

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1263 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 lib/tasks/migrate_from_trac.rake | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/lib/tasks/migrate_from_trac.rake b/lib/tasks/migrate_from_trac.rake
index f1d754109..2308e787b 100644
--- a/lib/tasks/migrate_from_trac.rake
+++ b/lib/tasks/migrate_from_trac.rake
@@ -538,9 +538,14 @@ namespace :redmine do
           puts "Unable to create a project with identifier '#{identifier}'!" unless project.save
           # enable issues and wiki for the created project
           project.enabled_module_names = ['issue_tracking', 'wiki']
-        end        
-        project.trackers << TRACKER_BUG
-        project.trackers << TRACKER_FEATURE          
+        else
+          puts
+          puts "This project already exists in your Redmine database."
+          print "Are you sure you want to append data to this project ? [Y/n] "
+          exit if STDIN.gets.match(/^n$/i)  
+        end
+        project.trackers << TRACKER_BUG unless project.trackers.include?(TRACKER_BUG)
+        project.trackers << TRACKER_FEATURE unless project.trackers.include?(TRACKER_FEATURE)
         @target_project = project.new_record? ? nil : project
       end
       

From 4bd35dae8da525c7a283020897eaa0d8608c1d1c Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 16 Mar 2008 15:04:33 +0000
Subject: [PATCH 305/710] Allow issue list to be sorted by target version
 (#832).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1264 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/models/query.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/query.rb b/app/models/query.rb
index 665280ac2..2b708ddda 100644
--- a/app/models/query.rb
+++ b/app/models/query.rb
@@ -101,7 +101,7 @@ class Query < ActiveRecord::Base
     QueryColumn.new(:assigned_to, :sortable => "#{User.table_name}.lastname"),
     QueryColumn.new(:updated_on, :sortable => "#{Issue.table_name}.updated_on", :default_order => 'desc'),
     QueryColumn.new(:category, :sortable => "#{IssueCategory.table_name}.name"),
-    QueryColumn.new(:fixed_version),
+    QueryColumn.new(:fixed_version, :sortable => "#{Version.table_name}.effective_date", :default_order => 'desc'),
     QueryColumn.new(:start_date, :sortable => "#{Issue.table_name}.start_date"),
     QueryColumn.new(:due_date, :sortable => "#{Issue.table_name}.due_date"),
     QueryColumn.new(:estimated_hours, :sortable => "#{Issue.table_name}.estimated_hours"),

From f271e772afba181fa61cfbac4e5259fd8e4275b3 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 16 Mar 2008 16:52:49 +0000
Subject: [PATCH 306/710] Add the following headers to email notifications
 (#830, #247): * X-Redmine-Host: host name defined in application settings *
 X-Redmine-Site: application title defined in settings * X-Redmine-Project:
 identifier of the project that the notification is related to, if any *
 X-Redmine-Issue-Id, -Author, -Assignee: ticket related info *
 X-Redmine-Topic-Id: identifies the thread a message belongs to

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1265 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/models/mailer.rb | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/app/models/mailer.rb b/app/models/mailer.rb
index 2f23c1c8f..6fc879a15 100644
--- a/app/models/mailer.rb
+++ b/app/models/mailer.rb
@@ -23,6 +23,10 @@ class Mailer < ActionMailer::Base
   include ActionController::UrlWriter
   
   def issue_add(issue)    
+    redmine_headers 'Project' => issue.project.identifier,
+                    'Issue-Id' => issue.id,
+                    'Issue-Author' => issue.author.login
+    redmine_headers 'Issue-Assignee' => issue.assigned_to.login if issue.assigned_to
     recipients issue.recipients    
     subject "[#{issue.project.name} - #{issue.tracker.name} ##{issue.id}] (#{issue.status.name}) #{issue.subject}"
     body :issue => issue,
@@ -31,6 +35,10 @@ class Mailer < ActionMailer::Base
 
   def issue_edit(journal)
     issue = journal.journalized
+    redmine_headers 'Project' => issue.project.identifier,
+                    'Issue-Id' => issue.id,
+                    'Issue-Author' => issue.author.login
+    redmine_headers 'Issue-Assignee' => issue.assigned_to.login if issue.assigned_to
     recipients issue.recipients
     # Watchers in cc
     cc(issue.watcher_recipients - @recipients)
@@ -44,6 +52,7 @@ class Mailer < ActionMailer::Base
   end
   
   def document_added(document)
+    redmine_headers 'Project' => document.project.identifier
     recipients document.project.recipients
     subject "[#{document.project.name}] #{l(:label_document_new)}: #{document.title}"
     body :document => document,
@@ -62,6 +71,7 @@ class Mailer < ActionMailer::Base
       added_to_url = url_for(:controller => 'documents', :action => 'show', :id => container.id)
       added_to = "#{l(:label_document)}: #{container.title}"
     end
+    redmine_headers 'Project' => container.project.identifier
     recipients container.project.recipients
     subject "[#{container.project.name}] #{l(:label_attachment_new)}"
     body :attachments => attachments,
@@ -70,6 +80,7 @@ class Mailer < ActionMailer::Base
   end
 
   def news_added(news)
+    redmine_headers 'Project' => news.project.identifier
     recipients news.project.recipients
     subject "[#{news.project.name}] #{l(:label_news)}: #{news.title}"
     body :news => news,
@@ -77,6 +88,8 @@ class Mailer < ActionMailer::Base
   end
 
   def message_posted(message, recipients)
+    redmine_headers 'Project' => message.project.identifier,
+                    'Topic-Id' => (message.parent_id || message.id)
     recipients(recipients)
     subject "[#{message.board.project.name} - #{message.board.name}] #{message.subject}"
     body :message => message,
@@ -139,6 +152,15 @@ class Mailer < ActionMailer::Base
     from Setting.mail_from
     default_url_options[:host] = Setting.host_name
     default_url_options[:protocol] = Setting.protocol
+    # Common headers
+    headers 'X-Mailer' => 'Redmine',
+            'X-Redmine-Host' => Setting.host_name,
+            'X-Redmine-Site' => Setting.app_title
+  end
+  
+  # Appends a Redmine header field (name is prepended with 'X-Redmine-')
+  def redmine_headers(h)
+    h.each { |k,v| headers["X-Redmine-#{k}"] = v }
   end
   
   # Overrides the create_mail method

From cab300e65045e53afe858f52bfbf5b81488f7ea0 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 16 Mar 2008 21:41:36 +0000
Subject: [PATCH 307/710] Prevent page reloading if something goes wrong in the
 'add more file' javascript.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1266 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/attachments/_form.rhtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/attachments/_form.rhtml b/app/views/attachments/_form.rhtml
index 094668f9d..c98528b85 100644
--- a/app/views/attachments/_form.rhtml
+++ b/app/views/attachments/_form.rhtml
@@ -4,6 +4,6 @@
 <em><%= l(:label_optional_description) %></em>
 </span>
 <br />
-<small><%= link_to l(:label_add_another_file), {}, :onclick => 'addFileField(); return false;' %>
+<small><%= link_to l(:label_add_another_file), '#', :onclick => 'addFileField(); return false;' %>
 (<%= l(:label_max_size) %>: <%= number_to_human_size(Setting.attachment_max_size.to_i.kilobytes) %>)
 </small>

From 93d1b2e0a43982f37b60f6b15b36bc46e3c79f9b Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Mon, 17 Mar 2008 17:45:01 +0000
Subject: [PATCH 308/710] Add Redmine links for repository files using source:
 and export: keyworkds (#867).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1267 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/repositories_controller.rb   |  3 +-
 app/helpers/application_helper.rb            | 22 ++++++++--
 app/views/repositories/entry.rhtml           | 17 ++++----
 test/unit/helpers/application_helper_test.rb | 43 +++++++++++++-------
 test/unit/mailer_test.rb                     |  2 +-
 5 files changed, 57 insertions(+), 30 deletions(-)

diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb
index bce5f66a9..349d0a505 100644
--- a/app/controllers/repositories_controller.rb
+++ b/app/controllers/repositories_controller.rb
@@ -97,7 +97,8 @@ class RepositoriesController < ApplicationController
   def entry
     @content = @repository.scm.cat(@path, @rev)
     show_error_not_found and return unless @content
-    if 'raw' == params[:format]      
+    if 'raw' == params[:format] || @content.is_binary_data?
+      # Force the download if it's a binary file
       send_data @content, :filename => @path.split('/').last
     else
       # Prevent empty lines when displaying a file with Windows style eol
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index aa19ce7d4..4e2a10445 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -281,13 +281,19 @@ module ApplicationHelper
     #     version:"1.0 beta 2" -> Link to version named "1.0 beta 2"
     #   Attachments:
     #     attachment:file.zip -> Link to the attachment of the current object named file.zip
-    text = text.gsub(%r{([\s\(,-^])(!)?(attachment|document|version|commit)?((#|r)(\d+)|(:)([^"][^\s<>]+|"[^"]+"))(?=[[:punct:]]|\s|<|$)}) do |m|
+    #   Source files:
+    #     source:some/file -> Link to the file located at /some/file in the project's repository
+    #     source:some/file@52 -> Link to the file's revision 52
+    #     source:some/file#L120 -> Link to line 120 of the file
+    #     source:some/file@52#L120 -> Link to line 120 of the file's revision 52
+    #     export:some/file -> Force the download of the file
+    text = text.gsub(%r{([\s\(,-^])(!)?(attachment|document|version|commit|source|export)?((#|r)(\d+)|(:)([^"][^\s<>]+|"[^"]+"))(?=[[:punct:]]|\s|<|$)}) do |m|
       leading, esc, prefix, sep, oid = $1, $2, $3, $5 || $7, $6 || $8
       link = nil
       if esc.nil?
         if prefix.nil? && sep == 'r'
           if project && (changeset = project.changesets.find_by_revision(oid))
-            link = link_to("r#{oid}", {:only_path => only_path, :controller => 'repositories', :action => 'revision', :id => project.id, :rev => oid},
+            link = link_to("r#{oid}", {:only_path => only_path, :controller => 'repositories', :action => 'revision', :id => project, :rev => oid},
                                       :class => 'changeset',
                                       :title => truncate(changeset.comments, 100))
           end
@@ -328,7 +334,17 @@ module ApplicationHelper
             end
           when 'commit'
             if project && (changeset = project.changesets.find(:first, :conditions => ["scmid LIKE ?", "#{name}%"]))
-              link = link_to h("#{name}"), {:only_path => only_path, :controller => 'repositories', :action => 'revision', :id => project.id, :rev => changeset.revision}, :class => 'changeset', :title => truncate(changeset.comments, 100)
+              link = link_to h("#{name}"), {:only_path => only_path, :controller => 'repositories', :action => 'revision', :id => project, :rev => changeset.revision}, :class => 'changeset', :title => truncate(changeset.comments, 100)
+            end
+          when 'source', 'export'
+            if project && project.repository
+              name =~ %r{^[/\\]*(.*?)(@([0-9a-f]+))?(#(L\d+))?$}
+              path, rev, anchor = $1, $3, $5
+              link = link_to h("#{prefix}:#{name}"), {:controller => 'repositories', :action => 'entry', :id => project, :path => path,
+                                                      :rev => rev,
+                                                      :anchor => anchor,
+                                                      :format => (prefix == 'export' ? 'raw' : nil)},
+                                                     :class => (prefix == 'export' ? 'source download' : 'source')
             end
           when 'attachment'
             if attachments && attachment = attachments.detect {|a| a.filename == name }
diff --git a/app/views/repositories/entry.rhtml b/app/views/repositories/entry.rhtml
index 41565a232..309da76fc 100644
--- a/app/views/repositories/entry.rhtml
+++ b/app/views/repositories/entry.rhtml
@@ -2,16 +2,13 @@
 
 <div class="autoscroll">
 <table class="filecontent CodeRay">
-  <tbody>
-    <% line_num = 1 %>
-    <% syntax_highlight(@path, to_utf8(@content)).each_line do |line| %>
-    <tr>
-      <th class="line-num"><%= line_num %></th>
-      <td class="line-code"><pre><%= line %></pre></td>
-    </tr>
-    <% line_num += 1 %>
-    <% end %>
-  </tbody>
+<tbody>
+<% line_num = 1 %>
+<% syntax_highlight(@path, to_utf8(@content)).each_line do |line| %>
+<tr><th class="line-num" id="L<%= line_num %>"><%= line_num %></th><td class="line-code"><pre><%= line %></pre></td></tr>
+<% line_num += 1 %>
+<% end %>
+</tbody>
 </table>
 </div>
 
diff --git a/test/unit/helpers/application_helper_test.rb b/test/unit/helpers/application_helper_test.rb
index 4e617f699..f34a587a2 100644
--- a/test/unit/helpers/application_helper_test.rb
+++ b/test/unit/helpers/application_helper_test.rb
@@ -67,7 +67,7 @@ class ApplicationHelperTest < HelperTestCase
     issue_link = link_to('#3', {:controller => 'issues', :action => 'show', :id => 3}, 
                                :class => 'issue', :title => 'Error 281 when updating a recipe (New)')
     
-    changeset_link = link_to('r1', {:controller => 'repositories', :action => 'revision', :id => 1, :rev => 1},
+    changeset_link = link_to('r1', {:controller => 'repositories', :action => 'revision', :id => 'ecookbook', :rev => 1},
                                    :class => 'changeset', :title => 'My very first commit')
     
     document_link = link_to('Test document', {:controller => 'documents', :action => 'show', :id => 1},
@@ -75,23 +75,36 @@ class ApplicationHelperTest < HelperTestCase
     
     version_link = link_to('1.0', {:controller => 'versions', :action => 'show', :id => 2},
                                   :class => 'version')
+
+    source_url = {:controller => 'repositories', :action => 'entry', :id => 'ecookbook', :path => 'some/file'}
     
     to_test = {
-      '#3, #3 and #3.' => "#{issue_link}, #{issue_link} and #{issue_link}.",
-      'r1' => changeset_link,
-      'document#1' => document_link,
-      'document:"Test document"' => document_link,
-      'version#2' => version_link,
-      'version:1.0' => version_link,
-      'version:"1.0"' => version_link,
+      # tickets
+      '#3, #3 and #3.'              => "#{issue_link}, #{issue_link} and #{issue_link}.",
+      # changesets
+      'r1'                          => changeset_link,
+      # documents
+      'document#1'                  => document_link,
+      'document:"Test document"'    => document_link,
+      # versions
+      'version#2'                   => version_link,
+      'version:1.0'                 => version_link,
+      'version:"1.0"'               => version_link,
+      # source
+      'source:/some/file'           => link_to('source:/some/file', source_url, :class => 'source'),
+      'source:/some/file@52'        => link_to('source:/some/file@52', source_url.merge(:rev => 52), :class => 'source'),
+      'source:/some/file#L110'      => link_to('source:/some/file#L110', source_url.merge(:anchor => 'L110'), :class => 'source'),
+      'source:/some/file@52#L110'   => link_to('source:/some/file@52#L110', source_url.merge(:rev => 52, :anchor => 'L110'), :class => 'source'),
+      'export:/some/file'           => link_to('export:/some/file', source_url.merge(:format => 'raw'), :class => 'source download'),
       # escaping
-      '!#3.' => '#3.',
-      '!r1' => 'r1',
-      '!document#1' => 'document#1',
-      '!document:"Test document"' => 'document:"Test document"',
-      '!version#2' => 'version#2',
-      '!version:1.0' => 'version:1.0',
-      '!version:"1.0"' => 'version:"1.0"',
+      '!#3.'                        => '#3.',
+      '!r1'                         => 'r1',
+      '!document#1'                 => 'document#1',
+      '!document:"Test document"'   => 'document:"Test document"',
+      '!version#2'                  => 'version#2',
+      '!version:1.0'                => 'version:1.0',
+      '!version:"1.0"'              => 'version:"1.0"',
+      '!source:/some/file'          => 'source:/some/file',
     }
     @project = Project.find(1)
     to_test.each { |text, result| assert_equal "<p>#{result}</p>", textilizable(text) }
diff --git a/test/unit/mailer_test.rb b/test/unit/mailer_test.rb
index dc3fde414..64648b94c 100644
--- a/test/unit/mailer_test.rb
+++ b/test/unit/mailer_test.rb
@@ -36,7 +36,7 @@ class MailerTest < Test::Unit::TestCase
     # link to a referenced ticket
     assert mail.body.include?('<a href="https://mydomain.foo/issues/show/2" class="issue" title="Add ingredients categories (Assigned)">#2</a>')
     # link to a changeset
-    assert mail.body.include?('<a href="https://mydomain.foo/repositories/revision/1?rev=2" class="changeset" title="This commit fixes #1, #2 and references #1 &amp; #3">r2</a>')
+    assert mail.body.include?('<a href="https://mydomain.foo/repositories/revision/ecookbook?rev=2" class="changeset" title="This commit fixes #1, #2 and references #1 &amp; #3">r2</a>')
   end
   
   # test mailer methods for each language

From 030afe74281672852836f6688093a9a988a60e72 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Mon, 17 Mar 2008 18:01:26 +0000
Subject: [PATCH 309/710] Small fix to the Redmine links regexp.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1268 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/helpers/application_helper.rb            | 2 +-
 test/unit/helpers/application_helper_test.rb | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 4e2a10445..f3b16bb26 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -287,7 +287,7 @@ module ApplicationHelper
     #     source:some/file#L120 -> Link to line 120 of the file
     #     source:some/file@52#L120 -> Link to line 120 of the file's revision 52
     #     export:some/file -> Force the download of the file
-    text = text.gsub(%r{([\s\(,-^])(!)?(attachment|document|version|commit|source|export)?((#|r)(\d+)|(:)([^"][^\s<>]+|"[^"]+"))(?=[[:punct:]]|\s|<|$)}) do |m|
+    text = text.gsub(%r{([\s\(,-^])(!)?(attachment|document|version|commit|source|export)?((#|r)(\d+)|(:)([^"\s<>][^\s<>]*|"[^"]+"))(?=[[:punct:]]|\s|<|$)}) do |m|
       leading, esc, prefix, sep, oid = $1, $2, $3, $5 || $7, $6 || $8
       link = nil
       if esc.nil?
diff --git a/test/unit/helpers/application_helper_test.rb b/test/unit/helpers/application_helper_test.rb
index f34a587a2..0a63c811e 100644
--- a/test/unit/helpers/application_helper_test.rb
+++ b/test/unit/helpers/application_helper_test.rb
@@ -105,6 +105,8 @@ class ApplicationHelperTest < HelperTestCase
       '!version:1.0'                => 'version:1.0',
       '!version:"1.0"'              => 'version:"1.0"',
       '!source:/some/file'          => 'source:/some/file',
+      # invalid expressions
+      'source:'                     => 'source:'
     }
     @project = Project.find(1)
     to_test.each { |text, result| assert_equal "<p>#{result}</p>", textilizable(text) }

From 8cb5acf4537141292dd785f66b48acd6dba3b4de Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Mon, 17 Mar 2008 20:02:51 +0000
Subject: [PATCH 310/710] Add some tests on RolesController.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1269 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/roles/list.rhtml               |   1 +
 test/fixtures/roles.yml                  |  96 ++++++++---------
 test/fixtures/workflows.yml              |   6 --
 test/functional/roles_controller_test.rb | 128 +++++++++++++++++++++++
 test/unit/tracker_test.rb                |   4 +-
 5 files changed, 179 insertions(+), 56 deletions(-)

diff --git a/app/views/roles/list.rhtml b/app/views/roles/list.rhtml
index 202fdf41c..93b821387 100644
--- a/app/views/roles/list.rhtml
+++ b/app/views/roles/list.rhtml
@@ -24,6 +24,7 @@
   </td>
   <td align="center" style="width:10%;">
     <%= button_to(l(:button_delete), { :action => 'destroy', :id => role }, :confirm => l(:text_are_you_sure), :class => "button-small", :disabled => role.builtin? ) %>
+  </td>
   </tr>
 <% end %>
   </tbody>
diff --git a/test/fixtures/roles.yml b/test/fixtures/roles.yml
index c834828c6..0aabbb619 100644
--- a/test/fixtures/roles.yml
+++ b/test/fixtures/roles.yml
@@ -1,49 +1,4 @@
 --- 
-roles_004: 
-  name: Non member
-  id: 4
-  builtin: 1
-  permissions: |
-    --- 
-    - :add_issues
-    - :edit_issues
-    - :manage_issue_relations
-    - :add_issue_notes
-    - :move_issues
-    - :save_queries
-    - :view_gantt
-    - :view_calendar
-    - :log_time
-    - :view_time_entries
-    - :comment_news
-    - :view_documents
-    - :manage_documents
-    - :view_wiki_pages
-    - :edit_wiki_pages
-    - :add_messages
-    - :view_files
-    - :manage_files
-    - :browse_repository
-    - :view_changesets
-
-  position: 5
-roles_005: 
-  name: Anonymous
-  id: 5
-  builtin: 2
-  permissions: |
-    --- 
-    - :add_issue_notes
-    - :view_gantt
-    - :view_calendar
-    - :view_time_entries
-    - :view_documents
-    - :view_wiki_pages
-    - :view_files
-    - :browse_repository
-    - :view_changesets
-
-  position: 6
 roles_001: 
   name: Manager
   id: 1
@@ -85,7 +40,7 @@ roles_001:
     - :browse_repository
     - :view_changesets
 
-  position: 2
+  position: 1
 roles_002: 
   name: Developer
   id: 2
@@ -123,7 +78,7 @@ roles_002:
     - :browse_repository
     - :view_changesets
 
-  position: 3
+  position: 2
 roles_003: 
   name: Reporter
   id: 3
@@ -139,7 +94,6 @@ roles_003:
     - :manage_issue_relations
     - :add_issue_notes
     - :move_issues
-    - :delete_issues
     - :manage_public_queries
     - :save_queries
     - :view_gantt
@@ -160,4 +114,50 @@ roles_003:
     - :browse_repository
     - :view_changesets
 
+  position: 3
+roles_004: 
+  name: Non member
+  id: 4
+  builtin: 1
+  permissions: |
+    --- 
+    - :add_issues
+    - :edit_issues
+    - :manage_issue_relations
+    - :add_issue_notes
+    - :move_issues
+    - :save_queries
+    - :view_gantt
+    - :view_calendar
+    - :log_time
+    - :view_time_entries
+    - :comment_news
+    - :view_documents
+    - :manage_documents
+    - :view_wiki_pages
+    - :edit_wiki_pages
+    - :add_messages
+    - :view_files
+    - :manage_files
+    - :browse_repository
+    - :view_changesets
+
   position: 4
+roles_005: 
+  name: Anonymous
+  id: 5
+  builtin: 2
+  permissions: |
+    --- 
+    - :add_issue_notes
+    - :view_gantt
+    - :view_calendar
+    - :view_time_entries
+    - :view_documents
+    - :view_wiki_pages
+    - :view_files
+    - :browse_repository
+    - :view_changesets
+
+  position: 5
+  
\ No newline at end of file
diff --git a/test/fixtures/workflows.yml b/test/fixtures/workflows.yml
index 47e95e6e3..bef5ae016 100644
--- a/test/fixtures/workflows.yml
+++ b/test/fixtures/workflows.yml
@@ -245,12 +245,6 @@ workflows_225:
   old_status_id: 3
   id: 225
   tracker_id: 3
-workflows_037: 
-  new_status_id: 3
-  role_id: 2
-  old_status_id: 2
-  id: 37
-  tracker_id: 1
 workflows_063: 
   new_status_id: 4
   role_id: 3
diff --git a/test/functional/roles_controller_test.rb b/test/functional/roles_controller_test.rb
index 3c245edf7..d70a4f0c3 100644
--- a/test/functional/roles_controller_test.rb
+++ b/test/functional/roles_controller_test.rb
@@ -32,6 +32,18 @@ class RolesControllerTest < Test::Unit::TestCase
     @request.session[:user_id] = 1 # admin
   end
   
+  def test_get_index
+    get :index
+    assert_response :success
+    assert_template 'list'
+
+    assert_not_nil assigns(:roles)
+    assert_equal Role.find(:all, :order => 'builtin, position'), assigns(:roles)
+
+    assert_tag :tag => 'a', :attributes => { :href => '/roles/edit/1' },
+                            :content => 'Manager'
+  end
+  
   def test_get_new
     get :new
     assert_response :success
@@ -89,4 +101,120 @@ class RolesControllerTest < Test::Unit::TestCase
     role = Role.find(1)
     assert_equal [:edit_project], role.permissions
   end
+  
+  def test_destroy
+    r = Role.new(:name => 'ToBeDestroyed', :permissions => [:view_wiki_pages])
+    assert r.save
+    
+    post :destroy, :id => r
+    assert_redirected_to 'roles/list'
+    assert_nil Role.find_by_id(r.id)
+  end
+  
+  def test_destroy_role_in_use
+    post :destroy, :id => 1
+    assert_redirected_to 'roles'
+    assert flash[:error] == 'This role is in use and can not be deleted.'
+    assert_not_nil Role.find_by_id(1)
+  end
+  
+  def test_get_workflow
+    get :workflow
+    assert_response :success
+    assert_template 'workflow'
+    assert_not_nil assigns(:roles)
+    assert_not_nil assigns(:trackers)
+  end
+  
+  def test_get_workflow_with_role_and_tracker
+    get :workflow, :role_id => 2, :tracker_id => 1
+    assert_response :success
+    assert_template 'workflow'
+    # allowed transitions
+    assert_tag :tag => 'input', :attributes => { :type => 'checkbox',
+                                                 :name => 'issue_status[2][]',
+                                                 :value => '1',
+                                                 :checked => 'checked' }
+    # not allowed
+    assert_tag :tag => 'input', :attributes => { :type => 'checkbox',
+                                                 :name => 'issue_status[2][]',
+                                                 :value => '3',
+                                                 :checked => nil }
+  end
+  
+  def test_post_workflow
+    post :workflow, :role_id => 2, :tracker_id => 1, :issue_status => {'4' => ['5'], '3' => ['1', '2']}
+    assert_redirected_to 'roles/workflow'
+    
+    assert_equal 3, Workflow.count(:conditions => {:tracker_id => 1, :role_id => 2})
+    assert_not_nil  Workflow.find(:first, :conditions => {:role_id => 2, :tracker_id => 1, :old_status_id => 3, :new_status_id => 2})
+    assert_nil      Workflow.find(:first, :conditions => {:role_id => 2, :tracker_id => 1, :old_status_id => 5, :new_status_id => 4})
+  end
+  
+  def test_clear_workflow
+    assert Workflow.count(:conditions => {:tracker_id => 1, :role_id => 2}) > 0
+
+    post :workflow, :role_id => 2, :tracker_id => 1
+    assert_equal 0, Workflow.count(:conditions => {:tracker_id => 1, :role_id => 2})
+  end
+  
+  def test_get_report
+    get :report
+    assert_response :success
+    assert_template 'report'
+    
+    assert_not_nil assigns(:roles)
+    assert_equal Role.find(:all, :order => 'builtin, position'), assigns(:roles)
+    
+    assert_tag :tag => 'input', :attributes => { :type => 'checkbox',
+                                                 :name => 'permissions[3][]',
+                                                 :value => 'add_issues',
+                                                 :checked => 'checked' }
+    
+    assert_tag :tag => 'input', :attributes => { :type => 'checkbox',
+                                                 :name => 'permissions[3][]',
+                                                 :value => 'delete_issues',
+                                                 :checked => nil }
+  end
+  
+  def test_post_report
+    post :report, :permissions => { '0' => '', '1' => ['edit_issues'], '3' => ['add_issues', 'delete_issues']}
+    assert_redirected_to 'roles/list'
+    
+    assert_equal [:edit_issues], Role.find(1).permissions
+    assert_equal [:add_issues, :delete_issues], Role.find(3).permissions
+    assert Role.find(2).permissions.empty?
+  end
+  
+  def test_clear_all_permissions
+    post :report, :permissions => { '0' => '' }
+    assert_redirected_to 'roles/list'
+    assert Role.find(1).permissions.empty?
+  end
+  
+  def test_move_highest
+    post :move, :id => 3, :position => 'highest'
+    assert_redirected_to 'roles/list'
+    assert_equal 1, Role.find(3).position
+  end
+
+  def test_move_higher
+    position = Role.find(3).position
+    post :move, :id => 3, :position => 'higher'
+    assert_redirected_to 'roles/list'
+    assert_equal position - 1, Role.find(3).position
+  end
+
+  def test_move_lower
+    position = Role.find(2).position
+    post :move, :id => 2, :position => 'lower'
+    assert_redirected_to 'roles/list'
+    assert_equal position + 1, Role.find(2).position
+  end
+
+  def test_move_lowest
+    post :move, :id => 2, :position => 'lowest'
+    assert_redirected_to 'roles/list'
+    assert_equal Role.count, Role.find(2).position
+  end
 end
diff --git a/test/unit/tracker_test.rb b/test/unit/tracker_test.rb
index 7adacef3c..406bdd6db 100644
--- a/test/unit/tracker_test.rb
+++ b/test/unit/tracker_test.rb
@@ -22,12 +22,12 @@ class TrackerTest < Test::Unit::TestCase
 
   def test_copy_workflows
     source = Tracker.find(1)
-    assert_equal 90, source.workflows.size
+    assert_equal 89, source.workflows.size
     
     target = Tracker.new(:name => 'Target')
     assert target.save
     assert target.workflows.copy(source)
     target.reload
-    assert_equal 90, target.workflows.size
+    assert_equal 89, target.workflows.size
   end
 end

From 1c4bcc5b558e6dd89456edf80811c9e701168845 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Mon, 17 Mar 2008 20:48:22 +0000
Subject: [PATCH 311/710] Add NewsController and TimelogController tests.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1270 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 test/fixtures/comments.yml                 |  8 ++
 test/functional/news_controller_test.rb    | 90 +++++++++++++++++++++-
 test/functional/timelog_controller_test.rb |  8 ++
 3 files changed, 105 insertions(+), 1 deletion(-)

diff --git a/test/fixtures/comments.yml b/test/fixtures/comments.yml
index b60a68b84..538f67ed3 100644
--- a/test/fixtures/comments.yml
+++ b/test/fixtures/comments.yml
@@ -7,4 +7,12 @@ comments_001:
   comments: my first comment
   created_on: 2006-12-10 18:10:10 +01:00
   updated_on: 2006-12-10 18:10:10 +01:00
+comments_002: 
+  commented_type: News
+  commented_id: 1
+  id: 2
+  author_id: 2
+  comments: This is an other comment
+  created_on: 2006-12-10 18:12:10 +01:00
+  updated_on: 2006-12-10 18:12:10 +01:00
   
\ No newline at end of file
diff --git a/test/functional/news_controller_test.rb b/test/functional/news_controller_test.rb
index 397e928f1..01f8015b9 100644
--- a/test/functional/news_controller_test.rb
+++ b/test/functional/news_controller_test.rb
@@ -22,7 +22,7 @@ require 'news_controller'
 class NewsController; def rescue_action(e) raise e end; end
 
 class NewsControllerTest < Test::Unit::TestCase
-  fixtures :projects, :users, :roles, :members, :enabled_modules
+  fixtures :projects, :users, :roles, :members, :enabled_modules, :news, :comments
   
   def setup
     @controller = NewsController.new
@@ -46,6 +46,94 @@ class NewsControllerTest < Test::Unit::TestCase
     assert_not_nil assigns(:newss)
   end
   
+  def test_show
+    get :show, :id => 1
+    assert_response :success
+    assert_template 'show'
+    assert_tag :tag => 'h2', :content => /eCookbook first release/
+  end
+  
+  def test_show_not_found
+    get :show, :id => 999
+    assert_response 404
+  end
+  
+  def test_get_new
+    @request.session[:user_id] = 2
+    get :new, :project_id => 1
+    assert_response :success
+    assert_template 'new'
+  end
+  
+  def test_post_new
+    @request.session[:user_id] = 2
+    post :new, :project_id => 1, :news => { :title => 'NewsControllerTest',
+                                            :description => 'This is the description',
+                                            :summary => '' }
+    assert_redirected_to 'projects/ecookbook/news'
+    
+    news = News.find_by_title('NewsControllerTest')
+    assert_not_nil news
+    assert_equal 'This is the description', news.description
+    assert_equal User.find(2), news.author
+    assert_equal Project.find(1), news.project
+  end
+  
+  def test_get_edit
+    @request.session[:user_id] = 2
+    get :edit, :id => 1
+    assert_response :success
+    assert_template 'edit'
+  end
+  
+  def test_post_edit
+    @request.session[:user_id] = 2
+    post :edit, :id => 1, :news => { :description => 'Description changed by test_post_edit' }
+    assert_redirected_to 'news/show/1'
+    news = News.find(1)
+    assert_equal 'Description changed by test_post_edit', news.description
+  end
+
+  def test_post_new_with_validation_failure
+    @request.session[:user_id] = 2
+    post :new, :project_id => 1, :news => { :title => '',
+                                            :description => 'This is the description',
+                                            :summary => '' }
+    assert_response :success
+    assert_template 'new'
+    assert_not_nil assigns(:news)
+    assert assigns(:news).new_record?
+    assert_tag :tag => 'div', :attributes => { :id => 'errorExplanation' },
+                              :content => /1 error/
+  end
+  
+  def test_add_comment
+    @request.session[:user_id] = 2
+    post :add_comment, :id => 1, :comment => { :comments => 'This is a NewsControllerTest comment' }
+    assert_redirected_to 'news/show/1'
+    
+    comment = News.find(1).comments.find(:first, :order => 'created_on DESC')
+    assert_not_nil comment
+    assert_equal 'This is a NewsControllerTest comment', comment.comments
+    assert_equal User.find(2), comment.author
+  end
+  
+  def test_destroy_comment
+    comments_count = News.find(1).comments.size
+    @request.session[:user_id] = 2
+    post :destroy_comment, :id => 1, :comment_id => 2
+    assert_redirected_to 'news/show/1'
+    assert_nil Comment.find_by_id(2)
+    assert_equal comments_count - 1, News.find(1).comments.size
+  end
+  
+  def test_destroy
+    @request.session[:user_id] = 2
+    post :destroy, :id => 1
+    assert_redirected_to 'projects/ecookbook/news'
+    assert_nil News.find_by_id(1)
+  end
+  
   def test_preview
     get :preview, :project_id => 1,
                   :news => {:title => '',
diff --git a/test/functional/timelog_controller_test.rb b/test/functional/timelog_controller_test.rb
index 66247e569..fa4432295 100644
--- a/test/functional/timelog_controller_test.rb
+++ b/test/functional/timelog_controller_test.rb
@@ -152,4 +152,12 @@ class TimelogControllerTest < Test::Unit::TestCase
     assert_nil assigns(:from)
     assert_nil assigns(:to)
   end
+  
+  def test_details_csv_export
+    get :details, :project_id => 1, :format => 'csv'
+    assert_response :success
+    assert_equal 'text/csv', @response.content_type
+    assert @response.body.include?("Date,User,Activity,Project,Issue,Tracker,Subject,Hours,Comment\n")
+    assert @response.body.include?("\n04/21/2007,redMine Admin,Design,eCookbook,2,Feature request,Add ingredients categories,1.0,\"\"\n")
+  end
 end

From 7673d69b96cff840b0b6bce748fdb4887883aeb0 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Mon, 17 Mar 2008 23:01:35 +0000
Subject: [PATCH 312/710] Fixes #880: code tags not formatted correctly in the
 wiki (broken by r1216).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1271 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 lib/redcloth.rb                              |  2 +-
 test/unit/helpers/application_helper_test.rb | 13 +++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/lib/redcloth.rb b/lib/redcloth.rb
index 7e88007a6..14940cb88 100644
--- a/lib/redcloth.rb
+++ b/lib/redcloth.rb
@@ -1130,7 +1130,7 @@ class RedCloth < String
         end
     end
     
-    ALLOWED_TAGS = %w(redpre pre)
+    ALLOWED_TAGS = %w(redpre pre code)
     
     def escape_html_tags(text)
       text.gsub!(%r{<((\/?)(\w+))}) {|m| ALLOWED_TAGS.include?($3) ? "<#{$1}" : "&lt;#{$1}" }
diff --git a/test/unit/helpers/application_helper_test.rb b/test/unit/helpers/application_helper_test.rb
index 0a63c811e..2b90b8f4b 100644
--- a/test/unit/helpers/application_helper_test.rb
+++ b/test/unit/helpers/application_helper_test.rb
@@ -132,6 +132,19 @@ class ApplicationHelperTest < HelperTestCase
     to_test.each { |text, result| assert_equal "<p>#{result}</p>", textilizable(text) }
   end
   
+  def test_html_tags
+    to_test = {
+      "<div>content</div>" => "<p>&lt;div>content&lt;/div></p>",
+      "<script>some script;</script>" => "<p>&lt;script>some script;&lt;/script></p>",
+      # do not escape pre/code tags
+      "<pre>\nline 1\nline2</pre>" => "<pre>\nline 1\nline2</pre>",
+      "<pre><code>\nline 1\nline2</code></pre>" => "<pre><code>\nline 1\nline2</code></pre>",
+      "<pre><div>content</div></pre>" => "<pre>&lt;div&gt;content&lt;/div&gt;</pre>",
+    }
+    to_test.each { |text, result| assert_equal result, textilizable(text) }
+
+  end
+  
   def test_macro_hello_world
     text = "{{hello_world}}"
     assert textilizable(text).match(/Hello world!/)

From 3e102f281da906745fe1c78a603ad747db497d68 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Tue, 18 Mar 2008 17:39:12 +0000
Subject: [PATCH 313/710] Add a simple java scanner.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1272 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 .../lib/coderay/helpers/file_type.rb          |   1 +
 .../lib/coderay/scanners/java.rb              | 130 ++++++++++++++++++
 2 files changed, 131 insertions(+)
 create mode 100644 vendor/plugins/coderay-0.7.6.227/lib/coderay/scanners/java.rb

diff --git a/vendor/plugins/coderay-0.7.6.227/lib/coderay/helpers/file_type.rb b/vendor/plugins/coderay-0.7.6.227/lib/coderay/helpers/file_type.rb
index 5177a9353..7e65fe425 100644
--- a/vendor/plugins/coderay-0.7.6.227/lib/coderay/helpers/file_type.rb
+++ b/vendor/plugins/coderay-0.7.6.227/lib/coderay/helpers/file_type.rb
@@ -84,6 +84,7 @@ module FileType
     'cpp' => :c,
     'c' => :c,
     'h' => :c,
+    'java' => :java,
     'js' => :javascript,
     'xml' => :xml,
     'htm' => :html,
diff --git a/vendor/plugins/coderay-0.7.6.227/lib/coderay/scanners/java.rb b/vendor/plugins/coderay-0.7.6.227/lib/coderay/scanners/java.rb
new file mode 100644
index 000000000..4c9ac0060
--- /dev/null
+++ b/vendor/plugins/coderay-0.7.6.227/lib/coderay/scanners/java.rb
@@ -0,0 +1,130 @@
+module CodeRay
+  module Scanners
+    class Java < Scanner
+    
+      register_for :java
+    
+      RESERVED_WORDS = %w(abstract assert break case catch class
+      const continue default do else enum extends final finally for
+      goto if implements import instanceof interface native new
+      package private protected public return static strictfp super switch
+      synchronized this throw throws transient try void volatile while)
+    
+      PREDEFINED_TYPES = %w(boolean byte char double float int long short)
+    
+      PREDEFINED_CONSTANTS = %w(true false null)
+    
+      IDENT_KIND = WordList.new(:ident).
+        add(RESERVED_WORDS, :reserved).
+        add(PREDEFINED_TYPES, :pre_type).
+        add(PREDEFINED_CONSTANTS, :pre_constant)
+    
+      ESCAPE = / [rbfnrtv\n\\'"] | x[a-fA-F0-9]{1,2} | [0-7]{1,3} /x
+      UNICODE_ESCAPE =  / u[a-fA-F0-9]{4} | U[a-fA-F0-9]{8} /x
+    
+      def scan_tokens tokens, options
+        state = :initial
+  
+        until eos?
+          kind = nil
+          match = nil
+  
+          case state
+          when :initial
+  
+            if scan(/ \s+ | \\\n /x)
+              kind = :space
+              
+            elsif scan(%r! // [^\n\\]* (?: \\. [^\n\\]* )* | /\* (?: .*? \*/ | .* ) !mx)
+              kind = :comment
+  
+            elsif match = scan(/ \# \s* if \s* 0 /x)
+              match << scan_until(/ ^\# (?:elif|else|endif) .*? $ | \z /xm) unless eos?
+              kind = :comment
+  
+            elsif scan(/ [-+*\/=<>?:;,!&^|()\[\]{}~%]+ | \.(?!\d) /x)
+              kind = :operator
+  
+            elsif match = scan(/ [A-Za-z_][A-Za-z_0-9]* /x)
+              kind = IDENT_KIND[match]
+              if kind == :ident and check(/:(?!:)/)
+                match << scan(/:/)
+                kind = :label
+              end
+  
+            elsif match = scan(/L?"/)
+              tokens << [:open, :string]
+              if match[0] == ?L
+                tokens << ['L', :modifier]
+                match = '"'
+              end
+              state = :string
+              kind = :delimiter
+  
+            elsif scan(%r! \@ .* !x)
+              kind = :preprocessor
+  
+            elsif scan(/ L?' (?: [^\'\n\\] | \\ #{ESCAPE} )? '? /ox)
+              kind = :char
+  
+            elsif scan(/0[xX][0-9A-Fa-f]+/)
+              kind = :hex
+  
+            elsif scan(/(?:0[0-7]+)(?![89.eEfF])/)
+              kind = :oct
+  
+            elsif scan(/(?:\d+)(?![.eEfF])/)
+              kind = :integer
+  
+            elsif scan(/\d[fF]?|\d*\.\d+(?:[eE][+-]?\d+)?[fF]?|\d+[eE][+-]?\d+[fF]?/)
+              kind = :float
+  
+            else
+              getch
+              kind = :error
+  
+            end
+  
+          when :string
+            if scan(/[^\\\n"]+/)
+              kind = :content
+            elsif scan(/"/)
+              tokens << ['"', :delimiter]
+              tokens << [:close, :string]
+              state = :initial
+              next
+            elsif scan(/ \\ (?: #{ESCAPE} | #{UNICODE_ESCAPE} ) /mox)
+              kind = :char
+            elsif scan(/ \\ | $ /x)
+              tokens << [:close, :string]
+              kind = :error
+              state = :initial
+            else
+              raise_inspect "else case \" reached; %p not handled." % peek(1), tokens
+            end
+  
+          else
+            raise_inspect 'Unknown state', tokens
+  
+          end
+  
+          match ||= matched
+          if $DEBUG and not kind
+            raise_inspect 'Error token %p in line %d' %
+              [[match, kind], line], tokens
+          end
+          raise_inspect 'Empty token', tokens unless match
+  
+          tokens << [match, kind]
+  
+        end
+  
+        if state == :string
+          tokens << [:close, :string]
+        end
+  
+        tokens
+      end
+    end
+  end
+end

From 93a33c62862d723722106fd7c624bb3e830085f6 Mon Sep 17 00:00:00 2001
From: John Goerzen <jgoerzen@complete.org>
Date: Tue, 18 Mar 2008 18:50:52 +0000
Subject: [PATCH 314/710] Added line under tracker name to make clear what is
 going on here

Partially implements the patch given in r730


git-svn-id: http://redmine.rubyforge.org/svn/trunk@1273 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/issues/_form.rhtml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/views/issues/_form.rhtml b/app/views/issues/_form.rhtml
index 1742d1391..5034e0a29 100644
--- a/app/views/issues/_form.rhtml
+++ b/app/views/issues/_form.rhtml
@@ -3,6 +3,7 @@
 <%= observe_field :issue_tracker_id, :url => { :action => :new },
                                      :update => :content,
                                      :with => "Form.serialize('issue-form')" %>
+<hr />
 <% end %>
 
 <div id="issue_descr_fields" <%= 'style="display:none"' unless @issue.new_record? || @issue.errors.any? %>>

From f162337e1b3625da7eedb747f1b2bb4752c27646 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Wed, 19 Mar 2008 17:51:13 +0000
Subject: [PATCH 315/710] Always show 'View' and 'Annotate' links on repository
 files (download will be forced when clicking 'View' if the file is binary).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1274 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/repositories_controller.rb         |  2 +-
 app/views/repositories/changes.rhtml               | 12 +++++-------
 lang/bg.yml                                        |  1 +
 lang/cs.yml                                        |  1 +
 lang/da.yml                                        |  1 +
 lang/de.yml                                        |  1 +
 lang/en.yml                                        |  3 ++-
 lang/es.yml                                        |  1 +
 lang/fi.yml                                        |  1 +
 lang/fr.yml                                        |  1 +
 lang/he.yml                                        |  1 +
 lang/it.yml                                        |  1 +
 lang/ja.yml                                        |  1 +
 lang/ko.yml                                        |  1 +
 lang/lt.yml                                        |  1 +
 lang/nl.yml                                        |  1 +
 lang/pl.yml                                        |  1 +
 lang/pt-br.yml                                     |  1 +
 lang/pt.yml                                        |  1 +
 lang/ro.yml                                        |  1 +
 lang/ru.yml                                        |  1 +
 lang/sr.yml                                        |  1 +
 lang/sv.yml                                        |  1 +
 lang/uk.yml                                        |  1 +
 lang/zh-tw.yml                                     |  1 +
 lang/zh.yml                                        |  1 +
 lib/redmine/mime_type.rb                           |  2 +-
 lib/redmine/scm/adapters/git_adapter.rb            | 14 ++++++++------
 .../functional/repositories_cvs_controller_test.rb |  2 +-
 .../functional/repositories_git_controller_test.rb |  7 +++++++
 .../repositories_subversion_controller_test.rb     |  2 +-
 31 files changed, 49 insertions(+), 18 deletions(-)

diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb
index 349d0a505..10c235d65 100644
--- a/app/controllers/repositories_controller.rb
+++ b/app/controllers/repositories_controller.rb
@@ -110,7 +110,7 @@ class RepositoriesController < ApplicationController
   
   def annotate
     @annotate = @repository.scm.annotate(@path, @rev)
-    show_error_not_found and return if @annotate.nil? || @annotate.empty?
+    render_error l(:error_scm_annotate) and return if @annotate.nil? || @annotate.empty?
   rescue Redmine::Scm::Adapters::CommandFailed => e
     show_error_command_failed(e.message)
   end
diff --git a/app/views/repositories/changes.rhtml b/app/views/repositories/changes.rhtml
index 55842a28b..2d7462b29 100644
--- a/app/views/repositories/changes.rhtml
+++ b/app/views/repositories/changes.rhtml
@@ -3,13 +3,11 @@
 <h3><%=h @entry.name %></h3>
 
 <p>
-<% if @entry.is_text? %>
-    <% if @repository.supports_cat? %>
-        <%= link_to l(:button_view), {:action => 'entry', :id => @project, :path => @path, :rev => @rev } %> |
-    <% end %>
-    <% if @repository.supports_annotate? %>
-        <%= link_to l(:button_annotate), {:action => 'annotate', :id => @project, :path => @path, :rev => @rev } %> |
-    <% end %>
+<% if @repository.supports_cat? %>
+    <%= link_to l(:button_view), {:action => 'entry', :id => @project, :path => @path, :rev => @rev } %> |
+<% end %>
+<% if @repository.supports_annotate? %>
+    <%= link_to l(:button_annotate), {:action => 'annotate', :id => @project, :path => @path, :rev => @rev } %> |
 <% end %>
 <%= link_to(l(:button_download), {:action => 'entry', :id => @project, :path => @path, :rev => @rev, :format => 'raw' }) if @repository.supports_cat? %>
 <%= "(#{number_to_human_size(@entry.size)})" if @entry.size %>
diff --git a/lang/bg.yml b/lang/bg.yml
index 7b4e15720..70d5d7b20 100644
--- a/lang/bg.yml
+++ b/lang/bg.yml
@@ -615,3 +615,4 @@ label_preferences: Preferences
 setting_display_subprojects_issues: Display subprojects issues on main projects by default
 label_overall_activity: Overall activity
 setting_default_projects_public: New projects are public by default
+error_scm_annotate: "The entry does not exist or can not be annotated."
diff --git a/lang/cs.yml b/lang/cs.yml
index 52ee9e451..28d52e3da 100644
--- a/lang/cs.yml
+++ b/lang/cs.yml
@@ -617,3 +617,4 @@ default_activity_development: Vývoj
 enumeration_issue_priorities: Priority úkolů
 enumeration_doc_categories: Kategorie dokumentů
 enumeration_activities: Aktivity (sledování času)
+error_scm_annotate: "The entry does not exist or can not be annotated."
diff --git a/lang/da.yml b/lang/da.yml
index d80124520..8d70087b1 100644
--- a/lang/da.yml
+++ b/lang/da.yml
@@ -617,3 +617,4 @@ label_reverse_chronological_order: In reverse chronological order
 label_preferences: Preferences
 label_overall_activity: Overall activity
 setting_default_projects_public: New projects are public by default
+error_scm_annotate: "The entry does not exist or can not be annotated."
diff --git a/lang/de.yml b/lang/de.yml
index 36ae228b5..e9edbf8cc 100644
--- a/lang/de.yml
+++ b/lang/de.yml
@@ -616,3 +616,4 @@ label_preferences: Preferences
 setting_display_subprojects_issues: Display subprojects issues on main projects by default
 label_overall_activity: Overall activity
 setting_default_projects_public: New projects are public by default
+error_scm_annotate: "The entry does not exist or can not be annotated."
diff --git a/lang/en.yml b/lang/en.yml
index 2646e22a6..a37207e74 100644
--- a/lang/en.yml
+++ b/lang/en.yml
@@ -78,8 +78,9 @@ notice_account_pending: "Your account was created and is now pending administrat
 notice_default_data_loaded: Default configuration successfully loaded.
 
 error_can_t_load_default_data: "Default configuration could not be loaded: %s"
-error_scm_not_found: "Entry and/or revision doesn't exist in the repository."
+error_scm_not_found: "The entry or revision was not found in the repository."
 error_scm_command_failed: "An error occurred when trying to access the repository: %s"
+error_scm_annotate: "The entry does not exist or can not be annotated."
 error_issue_not_found_in_project: 'The issue was not found or does not belong to this project'
 
 mail_subject_lost_password: Your %s password
diff --git a/lang/es.yml b/lang/es.yml
index 4a5eff1c9..8db240dfd 100644
--- a/lang/es.yml
+++ b/lang/es.yml
@@ -618,3 +618,4 @@ label_preferences: Preferences
 setting_display_subprojects_issues: Display subprojects issues on main projects by default
 label_overall_activity: Overall activity
 setting_default_projects_public: New projects are public by default
+error_scm_annotate: "The entry does not exist or can not be annotated."
diff --git a/lang/fi.yml b/lang/fi.yml
index 5ff496985..9e8cfee2b 100644
--- a/lang/fi.yml
+++ b/lang/fi.yml
@@ -615,3 +615,4 @@ label_reverse_chronological_order: Käänteisessä aikajärjestyksessä
 label_preferences: Asetukset
 setting_default_projects_public: New projects are public by default
 label_overall_activity: Overall activity
+error_scm_annotate: "The entry does not exist or can not be annotated."
diff --git a/lang/fr.yml b/lang/fr.yml
index 136f3b0b8..2ecafdcc5 100644
--- a/lang/fr.yml
+++ b/lang/fr.yml
@@ -80,6 +80,7 @@ notice_default_data_loaded: Paramétrage par défaut chargé avec succès.
 error_can_t_load_default_data: "Une erreur s'est produite lors du chargement du paramétrage: %s"
 error_scm_not_found: "L'entrée et/ou la révision demandée n'existe pas dans le dépôt."
 error_scm_command_failed: "Une erreur s'est produite lors de l'accès au dépôt: %s"
+error_scm_annotate: "L'entrée n'existe pas ou ne peut pas être annotée."
 error_issue_not_found_in_project: "La demande n'existe pas ou n'appartient pas à ce projet"
 
 mail_subject_lost_password: Votre mot de passe %s
diff --git a/lang/he.yml b/lang/he.yml
index 7450f04da..e4b0cb41f 100644
--- a/lang/he.yml
+++ b/lang/he.yml
@@ -615,3 +615,4 @@ label_preferences: Preferences
 setting_display_subprojects_issues: Display subprojects issues on main projects by default
 label_overall_activity: Overall activity
 setting_default_projects_public: New projects are public by default
+error_scm_annotate: "The entry does not exist or can not be annotated."
diff --git a/lang/it.yml b/lang/it.yml
index 2a35740ac..5d6e5f365 100644
--- a/lang/it.yml
+++ b/lang/it.yml
@@ -615,3 +615,4 @@ label_preferences: Preferences
 setting_display_subprojects_issues: Display subprojects issues on main projects by default
 label_overall_activity: Overall activity
 setting_default_projects_public: New projects are public by default
+error_scm_annotate: "The entry does not exist or can not be annotated."
diff --git a/lang/ja.yml b/lang/ja.yml
index 1b5427be4..7e39db695 100644
--- a/lang/ja.yml
+++ b/lang/ja.yml
@@ -616,3 +616,4 @@ label_preferences: Preferences
 setting_display_subprojects_issues: Display subprojects issues on main projects by default
 label_overall_activity: Overall activity
 setting_default_projects_public: New projects are public by default
+error_scm_annotate: "The entry does not exist or can not be annotated."
diff --git a/lang/ko.yml b/lang/ko.yml
index f53274ec6..28db1d000 100644
--- a/lang/ko.yml
+++ b/lang/ko.yml
@@ -615,3 +615,4 @@ label_preferences: Preferences
 setting_display_subprojects_issues: Display subprojects issues on main projects by default
 label_overall_activity: Overall activity
 setting_default_projects_public: New projects are public by default
+error_scm_annotate: "The entry does not exist or can not be annotated."
diff --git a/lang/lt.yml b/lang/lt.yml
index 957b8cc9c..97210ad1c 100644
--- a/lang/lt.yml
+++ b/lang/lt.yml
@@ -616,3 +616,4 @@ label_preferences: Preferences
 setting_display_subprojects_issues: Display subprojects issues on main projects by default
 label_overall_activity: Overall activity
 setting_default_projects_public: New projects are public by default
+error_scm_annotate: "The entry does not exist or can not be annotated."
diff --git a/lang/nl.yml b/lang/nl.yml
index c197e05f9..2c92dd30c 100644
--- a/lang/nl.yml
+++ b/lang/nl.yml
@@ -616,3 +616,4 @@ label_preferences: Preferences
 setting_display_subprojects_issues: Display subprojects issues on main projects by default
 label_overall_activity: Overall activity
 setting_default_projects_public: New projects are public by default
+error_scm_annotate: "The entry does not exist or can not be annotated."
diff --git a/lang/pl.yml b/lang/pl.yml
index 0ba187ff3..377f1438c 100644
--- a/lang/pl.yml
+++ b/lang/pl.yml
@@ -615,3 +615,4 @@ label_reverse_chronological_order: In reverse chronological order
 label_preferences: Preferences
 label_overall_activity: Overall activity
 setting_default_projects_public: New projects are public by default
+error_scm_annotate: "The entry does not exist or can not be annotated."
diff --git a/lang/pt-br.yml b/lang/pt-br.yml
index fbb82ea4a..898431ff3 100644
--- a/lang/pt-br.yml
+++ b/lang/pt-br.yml
@@ -615,3 +615,4 @@ label_preferences: Preferences
 setting_display_subprojects_issues: Display subprojects issues on main projects by default
 label_overall_activity: Overall activity
 setting_default_projects_public: New projects are public by default
+error_scm_annotate: "The entry does not exist or can not be annotated."
diff --git a/lang/pt.yml b/lang/pt.yml
index d177a0775..99a60f350 100644
--- a/lang/pt.yml
+++ b/lang/pt.yml
@@ -615,3 +615,4 @@ label_preferences: Preferences
 setting_display_subprojects_issues: Display subprojects issues on main projects by default
 label_overall_activity: Overall activity
 setting_default_projects_public: New projects are public by default
+error_scm_annotate: "The entry does not exist or can not be annotated."
diff --git a/lang/ro.yml b/lang/ro.yml
index d99b53a53..55e8ec372 100644
--- a/lang/ro.yml
+++ b/lang/ro.yml
@@ -615,3 +615,4 @@ label_preferences: Preferences
 setting_display_subprojects_issues: Display subprojects issues on main projects by default
 label_overall_activity: Overall activity
 setting_default_projects_public: New projects are public by default
+error_scm_annotate: "The entry does not exist or can not be annotated."
diff --git a/lang/ru.yml b/lang/ru.yml
index 7b11b781f..4ba184828 100644
--- a/lang/ru.yml
+++ b/lang/ru.yml
@@ -619,3 +619,4 @@ label_preferences: Preferences
 setting_display_subprojects_issues: Display subprojects issues on main projects by default
 label_overall_activity: Overall activity
 setting_default_projects_public: New projects are public by default
+error_scm_annotate: "The entry does not exist or can not be annotated."
diff --git a/lang/sr.yml b/lang/sr.yml
index 3584d823d..9eaacb4dd 100644
--- a/lang/sr.yml
+++ b/lang/sr.yml
@@ -616,3 +616,4 @@ label_preferences: Preferences
 setting_display_subprojects_issues: Display subprojects issues on main projects by default
 label_overall_activity: Overall activity
 setting_default_projects_public: New projects are public by default
+error_scm_annotate: "The entry does not exist or can not be annotated."
diff --git a/lang/sv.yml b/lang/sv.yml
index ab16af51d..67a8c55e2 100644
--- a/lang/sv.yml
+++ b/lang/sv.yml
@@ -616,3 +616,4 @@ label_preferences: Preferences
 setting_display_subprojects_issues: Display subprojects issues on main projects by default
 label_overall_activity: Overall activity
 setting_default_projects_public: New projects are public by default
+error_scm_annotate: "The entry does not exist or can not be annotated."
diff --git a/lang/uk.yml b/lang/uk.yml
index 7038640f2..be6b57d04 100644
--- a/lang/uk.yml
+++ b/lang/uk.yml
@@ -617,3 +617,4 @@ label_preferences: Preferences
 setting_display_subprojects_issues: Display subprojects issues on main projects by default
 label_overall_activity: Overall activity
 setting_default_projects_public: New projects are public by default
+error_scm_annotate: "The entry does not exist or can not be annotated."
diff --git a/lang/zh-tw.yml b/lang/zh-tw.yml
index 32bcd8419..3514f4c49 100644
--- a/lang/zh-tw.yml
+++ b/lang/zh-tw.yml
@@ -616,3 +616,4 @@ default_activity_development: 開發
 enumeration_issue_priorities: 項目優先權
 enumeration_doc_categories: 文件分類
 enumeration_activities: 活動 (時間追蹤)
+error_scm_annotate: "The entry does not exist or can not be annotated."
diff --git a/lang/zh.yml b/lang/zh.yml
index e2d555fbf..48f6fc695 100644
--- a/lang/zh.yml
+++ b/lang/zh.yml
@@ -616,3 +616,4 @@ enumeration_issue_priorities: 问题优先级
 enumeration_doc_categories: 文档类别
 enumeration_activities: 活动（时间跟踪）
 setting_default_projects_public: New projects are public by default
+error_scm_annotate: "The entry does not exist or can not be annotated."
diff --git a/lib/redmine/mime_type.rb b/lib/redmine/mime_type.rb
index 57bdbcfe1..dfdfff407 100644
--- a/lib/redmine/mime_type.rb
+++ b/lib/redmine/mime_type.rb
@@ -23,7 +23,7 @@ module Redmine
       'text/css' => 'css',
       'text/html' => 'html,htm,xhtml',
       'text/jsp' => 'jsp',
-      'text/x-c' => 'c,cpp,h',
+      'text/x-c' => 'c,cpp,cc,h,hh',
       'text/x-java' => 'java',
       'text/x-javascript' => 'js',
       'text/x-html-template' => 'rhtml',
diff --git a/lib/redmine/scm/adapters/git_adapter.rb b/lib/redmine/scm/adapters/git_adapter.rb
index 088f83af7..f1d076360 100644
--- a/lib/redmine/scm/adapters/git_adapter.rb
+++ b/lib/redmine/scm/adapters/git_adapter.rb
@@ -231,13 +231,15 @@ module Redmine
           identifier = 'HEAD' if identifier.blank?
           cmd = "#{GIT_BIN} --git-dir #{target('')} blame -l #{shell_quote identifier} -- #{shell_quote path}"
           blame = Annotate.new
-          shellout(cmd) do |io|
-            io.each_line do |line|
-              next unless line =~ /([0-9a-f]{39,40})\s\((\w*)[^\)]*\)(.*)$/
-              blame.add_line($3.rstrip, Revision.new(:identifier => $1, :author => $2.strip))
-            end
-          end
+          content = nil
+          shellout(cmd) { |io| io.binmode; content = io.read }
           return nil if $? && $?.exitstatus != 0
+          # git annotates binary files
+          return nil if content.is_binary_data?
+          content.split("\n").each do |line|
+            next unless line =~ /([0-9a-f]{39,40})\s\((\w*)[^\)]*\)(.*)/
+            blame.add_line($3.rstrip, Revision.new(:identifier => $1, :author => $2.strip))
+          end
           blame
         end
         
diff --git a/test/functional/repositories_cvs_controller_test.rb b/test/functional/repositories_cvs_controller_test.rb
index 059823707..1e101f59a 100644
--- a/test/functional/repositories_cvs_controller_test.rb
+++ b/test/functional/repositories_cvs_controller_test.rb
@@ -83,7 +83,7 @@ class RepositoriesCvsControllerTest < Test::Unit::TestCase
     def test_entry_not_found
       get :entry, :id => 1, :path => ['sources', 'zzz.c']
       assert_tag :tag => 'div', :attributes => { :class => /error/ },
-                                :content => /Entry and\/or revision doesn't exist/
+                                :content => /The entry or revision was not found in the repository/
     end
   
     def test_entry_download
diff --git a/test/functional/repositories_git_controller_test.rb b/test/functional/repositories_git_controller_test.rb
index fec0bbaa0..f8b3cb2bb 100644
--- a/test/functional/repositories_git_controller_test.rb
+++ b/test/functional/repositories_git_controller_test.rb
@@ -116,6 +116,13 @@ class RepositoriesGitControllerTest < Test::Unit::TestCase
                  :sibling => { :tag => 'td', :content => /jsmith/ },
                  :sibling => { :tag => 'td', :content => /watcher =/ }
     end
+    
+    def test_annotate_binary_file
+      get :annotate, :id => 3, :path => ['images', 'delete.png']
+      assert_response 500
+      assert_tag :tag => 'div', :attributes => { :class => /error/ },
+                                :content => /can not be annotated/
+    end
   else
     puts "Git test repository NOT FOUND. Skipping functional tests !!!"
     def test_fake; assert true end
diff --git a/test/functional/repositories_subversion_controller_test.rb b/test/functional/repositories_subversion_controller_test.rb
index a70682818..9b21a13e8 100644
--- a/test/functional/repositories_subversion_controller_test.rb
+++ b/test/functional/repositories_subversion_controller_test.rb
@@ -72,7 +72,7 @@ class RepositoriesSubversionControllerTest < Test::Unit::TestCase
     def test_entry_not_found
       get :entry, :id => 1, :path => ['subversion_test', 'zzz.c']
       assert_tag :tag => 'div', :attributes => { :class => /error/ },
-                                :content => /Entry and\/or revision doesn't exist/
+                                :content => /The entry or revision was not found in the repository/
     end
   
     def test_entry_download

From 43fc812e0ebc029b4c959e517125d2baef23c26c Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Wed, 19 Mar 2008 18:22:16 +0000
Subject: [PATCH 316/710] Default theme: smaller font in top menu and new style
 for main menu.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1275 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 public/images/contentbg.png                    | Bin 152 -> 0 bytes
 public/images/mainbg.png                       | Bin 150 -> 0 bytes
 public/stylesheets/application.css             |  17 +++++++++--------
 .../alternate/stylesheets/application.css      |   1 +
 .../themes/classic/stylesheets/application.css |   3 ++-
 5 files changed, 12 insertions(+), 9 deletions(-)
 delete mode 100644 public/images/contentbg.png
 delete mode 100644 public/images/mainbg.png

diff --git a/public/images/contentbg.png b/public/images/contentbg.png
deleted file mode 100644
index eb6d75080751e2091709c6e900617763b1b00589..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 152
zcmeAS@N?(olHy`uVBq!ia0vp^0zk~l!2~1^cm0+FQtTz3zOL-oIR%8JOw%MLZ~%ok
z3p^r=85p=efH0%e8j~47L6&q!Uq=Rpjs4tz5?O(Kbx#+^kcwN$duo51F>5xsdU$lG
t@b=u_U$5?ac)oqT$E5=<ld=>T7~&E*R&Dmm`v}y+;OXk;vd$@?2>>0PDIx#>

diff --git a/public/images/mainbg.png b/public/images/mainbg.png
deleted file mode 100644
index 29713c3c14b318084efac8e10d807107a093d856..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 150
zcmeAS@N?(olHy`uVBq!ia0vp^0zk~l!2~1^cm0+FQtTz3zOL-oIR%6zwYOXSTLBc}
zEbxddW?<m@0K$w;YfNSU1zFM^eH|GXHuiJ>Nn{1`RXtrCLn>}1@2UN5#;n=U+S}V}
r!fRt=vm`SiB}K)PS=e(`BLl-6Nv2zK+h*SZYGCkm^>bP0l+XkKD!3>;

diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index a0d5deb28..0681247cb 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -9,7 +9,7 @@ h4, .wiki h3 {font-size: 12px;padding: 2px 10px 1px 0px;margin-bottom: 5px; bord
 /***** Layout *****/
 #wrapper {background: white;}
 
-#top-menu {background: #2C4056;color: #fff;height:1.5em; padding: 2px 6px 0px 6px;}
+#top-menu {background: #2C4056; color: #fff; height:1.8em; font-size: 0.8em; padding: 2px 2px 0px 6px;}
 #top-menu ul {margin: 0;  padding: 0;}
 #top-menu li {
   float:left;
@@ -18,7 +18,7 @@ h4, .wiki h3 {font-size: 12px;padding: 2px 10px 1px 0px;margin-bottom: 5px; bord
   padding: 0px 0px 0px 0px;
   white-space:nowrap;
 }
-#top-menu a {color: #fff; padding-right: 4px;}
+#top-menu a {color: #fff; padding-right: 8px; font-weight: bold;}
 #top-menu #loggedas { float: right; margin-right: 0.5em; color: #fff; }
 
 #account {float:right;}
@@ -32,7 +32,7 @@ h4, .wiki h3 {font-size: 12px;padding: 2px 10px 1px 0px;margin-bottom: 5px; bord
 #main-menu li {
   float:left;
   list-style-type:none;
-  margin: 0px 10px 0px 0px;
+  margin: 0px 2px 0px 0px;
   padding: 0px 0px 0px 0px;
   white-space:nowrap;
 }
@@ -40,13 +40,14 @@ h4, .wiki h3 {font-size: 12px;padding: 2px 10px 1px 0px;margin-bottom: 5px; bord
   display: block;
   color: #fff;
   text-decoration: none;
+  font-weight: bold;
   margin: 0;
-  padding: 4px 4px 4px 4px;
-  background: #2C4056;
+  padding: 4px 10px 4px 10px;
 }
-#main-menu li a:hover, #main-menu li a.selected {background:#759FCF;}
+#main-menu li a:hover {background:#759FCF; color:#fff;}
+#main-menu li a.selected, #main-menu li a.selected:hover {background:#fff; color:#555;}
 
-#main {background: url(../images/mainbg.png) repeat-x; background-color:#EEEEEE;}
+#main {background-color:#EEEEEE;}
 
 #sidebar{ float: right; width: 17%; position: relative; z-index: 9; min-height: 600px; padding: 0; margin: 0;}
 * html #sidebar{ width: 17%; }
@@ -54,7 +55,7 @@ h4, .wiki h3 {font-size: 12px;padding: 2px 10px 1px 0px;margin-bottom: 5px; bord
 #sidebar hr{ width: 100%; margin: 0 auto; height: 1px; background: #ccc; border: 0; }
 * html #sidebar hr{ width: 95%; position: relative; left: -6px; color: #ccc; }
 
-#content { width: 80%; background: url(../images/contentbg.png) repeat-x; background-color: #fff; margin: 0px; border-right: 1px solid #ddd; padding: 6px 10px 10px 10px; z-index: 10; height:600px; min-height: 600px;}
+#content { width: 80%; background-color: #fff; margin: 0px; border-right: 1px solid #ddd; padding: 6px 10px 10px 10px; z-index: 10; height:600px; min-height: 600px;}
 * html #content{ width: 80%; padding-left: 0; margin-top: 0px; padding: 6px 10px 10px 10px;}
 html>body #content {
 height: auto;
diff --git a/public/themes/alternate/stylesheets/application.css b/public/themes/alternate/stylesheets/application.css
index 06d38b96f..19cbc0061 100644
--- a/public/themes/alternate/stylesheets/application.css
+++ b/public/themes/alternate/stylesheets/application.css
@@ -12,6 +12,7 @@ h2, h3, h4, .wiki h1, .wiki h2, .wiki h3 {border-bottom: 0px;}
 /* Menu */
 #main-menu li a { background-color: #507AAA; font-weight: bold;}
 #main-menu li a:hover { background: #507AAA; text-decoration: underline; }
+#main-menu li a.selected, #main-menu li a.selected:hover { background-color:#EEEEEE; }
 
 /* Tables */
 table.list tbody td, table.list tbody tr:hover td { border: solid 1px #d7d7d7; }
diff --git a/public/themes/classic/stylesheets/application.css b/public/themes/classic/stylesheets/application.css
index 11654cc88..57f911da6 100644
--- a/public/themes/classic/stylesheets/application.css
+++ b/public/themes/classic/stylesheets/application.css
@@ -9,8 +9,9 @@ body{ color:#303030; background:#e8eaec; }
 #quick-search { margin-right: 6px; }
 #main-menu { background-color: #578bb8; left: 0; border-top: 1px solid #fff; width: 100%; }
 #main-menu li { margin: 0; padding: 0; }
-#main-menu li a { background-color: #578bb8; border-right: 1px solid #fff; font-size: 80%; padding: 4px 8px 4px 8px; font-weight: bold; }
+#main-menu li a { background-color: #578bb8; border-right: 1px solid #fff; font-size: 90%; padding: 4px 8px 4px 8px; font-weight: bold; }
 #main-menu li a:hover { background-color: #80b0da; color: #ffffff; }
+#main-menu li a.selected, #main-menu li a.selected:hover { background-color: #80b0da; color: #ffffff; }
 
 #footer { background-color: #578bb8; border: 0; color: #fff;}
 #footer a { color: #fff; font-weight: bold; }

From 0cccce0c4327c5a6bc05c36263c4c474f54b6b34 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Wed, 19 Mar 2008 21:39:21 +0000
Subject: [PATCH 317/710] Change the tick image and replace the issue selection
 pencil with a small tick.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1276 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/issues/_list.rhtml   |   3 ++-
 public/images/toggle_check.png | Bin 0 -> 318 bytes
 public/images/true.png         | Bin 1094 -> 365 bytes
 3 files changed, 2 insertions(+), 1 deletion(-)
 create mode 100644 public/images/toggle_check.png

diff --git a/app/views/issues/_list.rhtml b/app/views/issues/_list.rhtml
index 91390ac67..000f79853 100644
--- a/app/views/issues/_list.rhtml
+++ b/app/views/issues/_list.rhtml
@@ -1,7 +1,8 @@
 <% form_tag({}) do -%>	
 <table class="list issues">
     <thead><tr>
-        <th><%= link_to image_tag('edit.png'), {}, :onclick => 'toggleIssuesSelection(this.up("form")); return false;' %>
+        <th><%= link_to image_tag('toggle_check.png'), {}, :onclick => 'toggleIssuesSelection(this.up("form")); return false;',
+                                                           :title => "#{l(:button_check_all)}/#{l(:button_uncheck_all)}" %>
         </th>
 		<%= sort_header_tag("#{Issue.table_name}.id", :caption => '#', :default_order => 'desc') %>
         <% query.columns.each do |column| %>
diff --git a/public/images/toggle_check.png b/public/images/toggle_check.png
new file mode 100644
index 0000000000000000000000000000000000000000..aca5e4321c4b04c3140348479fbc5d52f378084c
GIT binary patch
literal 318
zcmeAS@N?(olHy`uVBq!ia0vp^+#t-s3?%0jwTl2L_7YEDSN0ps!lJ?kS$WHz0fjgV
zJR*yM%7j3e@zUM8KR`j2bVpxD28NCO+<y{Tf&7F3pAgso3=H?4-#d5jT-1~xrxvHZ
z*Y-Yt|2%3=P}EW&*K+T*t;Jijlh;O7A1lt@n%r`(I(cc7SC7-2Yg3B%CRgvx?%CTi
z=h&2%W5wV9e_wiS&XjXKOV7<&dTwd)*5tM4mae_FHc|Nt&`t)%k|4ie28U-i(tw;0
zPZ!6Kid)GE2biAheBhHADQBq>+}0o8Fxk;5h)d&?`Z?tjrxa9ll(dei>m4|B>cD}s
z$IqWVuC2gv>C~~ahfkko6k;vBVQFEJ$Yx~Z?0Qf}jf0or!DD7UlV}@vp!p1*u6{1-
HoD!M<5V3r%

literal 0
HcmV?d00001

diff --git a/public/images/true.png b/public/images/true.png
index 7cac1eb8c08c72dc7c3a03f364fe3dc668a4468e..cecf618d8ac756e91a8c92608fad4fef894dd0da 100644
GIT binary patch
delta 319
zcmV-F0l@yo2<-xpH-BwqaxNe-IUsFea&sUuFfceEGBP?dGCDLlAS*C2FffWhN{j#i
z00(qQO+^RT0}~Y^He5?JAOHXW32;bRa{vGf5&!@T5&_cPe*6Fc00d`2O+f$vv5yP<
zVFdsH083CzR7L*)05Oa)F@z~Xlrd7RN=l_dTD?+))@ys#YkyLuN@KlRgw}Iw#$$}u
zd)D{XjMj6t-nEp@lyk;ooX(8K@4aiiQe&-3rOuSC)}_e<Xp;Z{00DGTPE!Ct=GbNc
z003S|L_t(|+Lg{h4uBvG1i+#Nv;_eb^#3naBO2gf;+}STXcpjC!rqu-by>)A+6qVO
zlDOKm-gcaAW;lOZF=IA6^x-vtGM0(7#_sus#9SIcDm{!{xu8c`89+4t%mMnH15|ES
R7i$0j002ovPDHLkV1nB+d@TR~

literal 1094
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbL!UWsc&iE~kEVo7Fxo<c}wZYo1@
zVy>QonL<`#UYVYPk%57^f{~$>k%^Uwg@U$$p@G3medchWPWBQ{Usv|)+=7A{jM*v|
zmIH-23p^r=85p=efH0%e8j~47L6&q!Uq=Rpjs4tz5?L7-m>B|mLR|kdFg*YM{QLLs
z=f0nl*ehYU*U;&hlj1c+iDMG)zrVlt{hs16MZ<fBn%6Wf_gY4si?Y0DY5CmJ@VTMH
zISI{UnqJSnoSr**9rG%_R_t`oDd>5S<~hx%V^N0343pm{8=f=lx!1Gx`PSrf$xELv
z^}6R(e6HB?nB|mvQ>w33_gw2a_WT&oVWVI)1O_SuW;AC-0PSWh3GxeOaCmkj4ajNo
zba4!+xRso6fZrl;XHU+Zt`jw-f{b~(DVdpudA@9HdZwiY@sTbL6P%fk1WXKPkW$mr
zRnu6*H7Rk@)XCuiEMDAP+J=o+y*#`;nU}V<q|R6n*4@$7$@z(++xTG5b8!KYM}le1
zpCxzfsI0L3G2!lsW9JTbJxWUx3v)BEH!ys_#_)C*+uj*7Z{&i4#naW#Wt~$(69B#n
Br_KNX


From 4ff77cc6242603b33778fe961bce7e8bf05f3f94 Mon Sep 17 00:00:00 2001
From: John Goerzen <jgoerzen@complete.org>
Date: Thu, 20 Mar 2008 17:41:03 +0000
Subject: [PATCH 318/710] Make an issue's done_ratio field adjustable from the
 right-click context menu.

Uses patch from, and fixes #641.  Patch by Dov Murik.


git-svn-id: http://redmine.rubyforge.org/svn/trunk@1277 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/issues/context_menu.rhtml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/app/views/issues/context_menu.rhtml b/app/views/issues/context_menu.rhtml
index b3a03b05d..adb3960ca 100644
--- a/app/views/issues/context_menu.rhtml
+++ b/app/views/issues/context_menu.rhtml
@@ -31,6 +31,15 @@
 		                              :selected => @issue.assigned_to.nil?, :disabled => !@can[:update] %></li>
 		</ul>
 	</li>
+	<li class="folder">
+		<a href="#" class="submenu"><%= l(:field_done_ratio) %></a>
+		<ul>
+		<% (0..10).map{|x|x*10}.each do |p| -%>
+		    <li><%= context_menu_link "#{p.to_s}%", {:controller => 'issues', :action => 'edit', :id => @issue, 'issue[done_ratio]' => p, :back_to => back_to}, :method => :post,
+		                                  :selected => (p == @issue.done_ratio), :disabled => !@can[:edit] %></li>
+		<% end -%>
+		</ul>
+	</li>
 	<li><%= context_menu_link l(:button_copy), {:controller => 'issues', :action => 'new', :project_id => @project, :copy_from => @issue},
 	        :class => 'icon-copy', :disabled => !@can[:copy] %></li>
 <% else -%>

From 8ed97f43d2dbef9e64f474d584861b3aae8253b7 Mon Sep 17 00:00:00 2001
From: John Goerzen <jgoerzen@complete.org>
Date: Thu, 20 Mar 2008 19:25:18 +0000
Subject: [PATCH 319/710] Revert "Make an issue's done_ratio field adjustable
 from the right-click"

Reverts commit r1277
fixes #904
refs #641

This had been working for me in testing for some time, but received
issue #904 saying it broke the context menu.  I was able to make it do
so on a new project as well.  Will revert and comment in #641 about this.


git-svn-id: http://redmine.rubyforge.org/svn/trunk@1278 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/issues/context_menu.rhtml | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/app/views/issues/context_menu.rhtml b/app/views/issues/context_menu.rhtml
index adb3960ca..b3a03b05d 100644
--- a/app/views/issues/context_menu.rhtml
+++ b/app/views/issues/context_menu.rhtml
@@ -31,15 +31,6 @@
 		                              :selected => @issue.assigned_to.nil?, :disabled => !@can[:update] %></li>
 		</ul>
 	</li>
-	<li class="folder">
-		<a href="#" class="submenu"><%= l(:field_done_ratio) %></a>
-		<ul>
-		<% (0..10).map{|x|x*10}.each do |p| -%>
-		    <li><%= context_menu_link "#{p.to_s}%", {:controller => 'issues', :action => 'edit', :id => @issue, 'issue[done_ratio]' => p, :back_to => back_to}, :method => :post,
-		                                  :selected => (p == @issue.done_ratio), :disabled => !@can[:edit] %></li>
-		<% end -%>
-		</ul>
-	</li>
 	<li><%= context_menu_link l(:button_copy), {:controller => 'issues', :action => 'new', :project_id => @project, :copy_from => @issue},
 	        :class => 'icon-copy', :disabled => !@can[:copy] %></li>
 <% else -%>

From bbf422e22933c286e0779e51fd0cc797f339e134 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Fri, 21 Mar 2008 17:32:15 +0000
Subject: [PATCH 320/710] Add done_ratio to the right-click context menu.
 Closes #904 (back_to variable used in patch #641 and in r1277 is no longer
 defined).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1279 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/issues/context_menu.rhtml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/app/views/issues/context_menu.rhtml b/app/views/issues/context_menu.rhtml
index b3a03b05d..f42f254e8 100644
--- a/app/views/issues/context_menu.rhtml
+++ b/app/views/issues/context_menu.rhtml
@@ -31,6 +31,15 @@
 		                              :selected => @issue.assigned_to.nil?, :disabled => !@can[:update] %></li>
 		</ul>
 	</li>
+	<li class="folder">
+		<a href="#" class="submenu"><%= l(:field_done_ratio) %></a>
+		<ul>
+		<% (0..10).map{|x|x*10}.each do |p| -%>
+		    <li><%= context_menu_link "#{p}%", {:controller => 'issues', :action => 'edit', :id => @issue, 'issue[done_ratio]' => p, :back_to => @back}, :method => :post,
+		                                  :selected => (p == @issue.done_ratio), :disabled => !@can[:edit] %></li>
+		<% end -%>
+		</ul>
+	</li>
 	<li><%= context_menu_link l(:button_copy), {:controller => 'issues', :action => 'new', :project_id => @project, :copy_from => @issue},
 	        :class => 'icon-copy', :disabled => !@can[:copy] %></li>
 <% else -%>

From 35a14cbfdc9fb65e046d22af02dbf95398284b5d Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Fri, 21 Mar 2008 17:39:02 +0000
Subject: [PATCH 321/710] Wiki links: * fixes wiki links with pipe in table
 (closes #893, #870, #894) * prevent wiki link matching on multiple lines

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1280 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/helpers/application_helper.rb            |  2 +-
 lib/redcloth.rb                              |  3 ++-
 test/unit/helpers/application_helper_test.rb | 16 +++++++++++++++-
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index f3b16bb26..510ecd15e 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -239,7 +239,7 @@ module ApplicationHelper
     #   [[project:|mytext]]
     #   [[project:mypage]]
     #   [[project:mypage|mytext]]
-    text = text.gsub(/(!)?(\[\[([^\]\|]+)(\|([^\]\|]+))?\]\])/) do |m|
+    text = text.gsub(/(!)?(\[\[([^\]\n\|]+)(\|([^\]\n\|]+))?\]\])/) do |m|
       link_project = project
       esc, all, page, title = $1, $2, $3, $5
       if esc.nil?
diff --git a/lib/redcloth.rb b/lib/redcloth.rb
index 14940cb88..9452c2670 100644
--- a/lib/redcloth.rb
+++ b/lib/redcloth.rb
@@ -510,7 +510,8 @@ class RedCloth < String
                 ratts, row = pba( $1, 'tr' ), $2 if row =~ /^(#{A}#{C}\. )(.*)/m
                 
                 cells = []
-                row.split( '|' ).each do |cell|
+                #row.split( /\(?!\[\[[^\]])|(?![^\[]\]\])/ ).each do |cell|
+                row.split( /\|(?![^\[\|]*\]\])/ ).each do |cell|
                     ctyp = 'd'
                     ctyp = 'h' if cell =~ /^_/
 
diff --git a/test/unit/helpers/application_helper_test.rb b/test/unit/helpers/application_helper_test.rb
index 2b90b8f4b..66499c003 100644
--- a/test/unit/helpers/application_helper_test.rb
+++ b/test/unit/helpers/application_helper_test.rb
@@ -142,7 +142,21 @@ class ApplicationHelperTest < HelperTestCase
       "<pre><div>content</div></pre>" => "<pre>&lt;div&gt;content&lt;/div&gt;</pre>",
     }
     to_test.each { |text, result| assert_equal result, textilizable(text) }
-
+  end
+  
+  def test_wiki_links_in_tables
+    to_test = {"|Cell 11|Cell 12|Cell 13|\n|Cell 21|Cell 22||\n|Cell 31||Cell 33|" => 
+                 '<tr><td>Cell 11</td><td>Cell 12</td><td>Cell 13</td></tr>' +
+                 '<tr><td>Cell 21</td><td>Cell 22</td></tr>' +
+                 '<tr><td>Cell 31</td><td>Cell 33</td></tr>',
+                 
+               "|[[Page|Link title]]|[[Other Page|Other title]]|\n|Cell 21|[[Last page]]|" =>
+                 '<tr><td><a href="/wiki/ecookbook/Page" class="wiki-page new">Link title</a></td>' +
+                 '<td><a href="/wiki/ecookbook/Other_Page" class="wiki-page new">Other title</a></td>' +
+                 '</tr><tr><td>Cell 21</td><td><a href="/wiki/ecookbook/Last_page" class="wiki-page new">Last page</a></td></tr>'
+    }
+    @project = Project.find(1)
+    to_test.each { |text, result| assert_equal "<table>#{result}</table>", textilizable(text).gsub(/[\t\n]/, '') }
   end
   
   def test_macro_hello_world

From 09bf503fd2d46bcc17fbf84faaf16e651a28583c Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Fri, 21 Mar 2008 19:59:43 +0000
Subject: [PATCH 322/710] Load Engines plugin if available (closes #180).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1281 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 config/environment.rb | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/config/environment.rb b/config/environment.rb
index e203227e6..2d581168b 100644
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -7,6 +7,13 @@
 # Bootstrap the Rails environment, frameworks, and default configuration
 require File.join(File.dirname(__FILE__), 'boot')
 
+# Load Engine plugin if available
+begin
+  require File.join(File.dirname(__FILE__), '../vendor/plugins/engines/boot')
+rescue LoadError
+  # Not available
+end
+
 Rails::Initializer.run do |config|
   # Settings in config/environments/* take precedence those specified here
   

From 27cf6d8d641ccdc25edd706033f441351cf23ad8 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Fri, 21 Mar 2008 20:02:41 +0000
Subject: [PATCH 323/710] Add unloadable to the sample plugin controller
 (http://dev.rubyonrails.org/ticket/6001).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1282 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 extra/sample_plugin/app/controllers/example_controller.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/extra/sample_plugin/app/controllers/example_controller.rb b/extra/sample_plugin/app/controllers/example_controller.rb
index 9bdaf448e..0c6cd5b91 100644
--- a/extra/sample_plugin/app/controllers/example_controller.rb
+++ b/extra/sample_plugin/app/controllers/example_controller.rb
@@ -1,5 +1,7 @@
 # Sample plugin controller
 class ExampleController < ApplicationController
+  unloadable
+  
   layout 'base'  
   before_filter :find_project, :authorize
     

From a8e6f68aaf3b7a9e47a041ecdcf57dbd5637c0e1 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Fri, 21 Mar 2008 20:17:09 +0000
Subject: [PATCH 324/710] Add unloadable to the sample plugin controller
 (http://dev.rubyonrails.org/ticket/6001).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1283 e93f8b46-1217-0410-a6f0-8f06a7374b81

From 60c12ca3ab7508a5b8ea3d367d1cd697d2e2c481 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Fri, 21 Mar 2008 20:24:10 +0000
Subject: [PATCH 325/710] Doc update before 0.7-rc1 release.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1284 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 doc/CHANGELOG          | 142 ++++++++++++++++++++++++++++++++++++++++-
 doc/INSTALL            |   2 +-
 doc/UPGRADING          |  19 ++----
 lib/redmine/version.rb |   2 +-
 4 files changed, 150 insertions(+), 15 deletions(-)

diff --git a/doc/CHANGELOG b/doc/CHANGELOG
index 051105a04..39586b8d1 100644
--- a/doc/CHANGELOG
+++ b/doc/CHANGELOG
@@ -1,10 +1,150 @@
 == Redmine changelog
 
 Redmine - project management software
-Copyright (C) 2006-2007  Jean-Philippe Lang
+Copyright (C) 2006-2008  Jean-Philippe Lang
 http://www.redmine.org/
 
 
+== 2008-03-xx v0.7-rc1
+
+* Overall activity view and feed added, link is available on the project list
+* Git VCS support
+* Rails 2.0 sessions cookie store compatibility
+* Use project identifiers in urls instead of ids
+* Default configuration data can now be loaded from the administration screen
+* Administration settings screen split to tabs (email notifications options moved to 'Settings')
+* Project description is now unlimited and optional
+* Wiki annotate view
+* Escape HTML tag in textile content
+* Add Redmine links to documents, versions, attachments and repository files
+* New setting to specify how many objects should be displayed on paginated lists. There are 2 ways to select a set of issues on the issue list:
+    * by using checkbox and/or the little pencil that will select/unselect all issues
+    * by clicking on the rows (but not on the links), Ctrl and Shift keys can be used to select multiple issues
+* Context menu disabled on links so that the default context menu of the browser is displayed when right-clicking on a link (click anywhere else on the row to display the context menu)
+* User display format is now configurable in administration settings
+* Issue list now supports bulk edit/move/delete (for a set of issues that belong to the same project)
+* Merged 'change status', 'edit issue' and 'add note' actions:
+    * Users with 'edit issues' permission can now update any property including custom fields when adding a note or changing the status
+    * 'Change issue status' permission removed. To change an issue status, a user just needs to have either 'Edit' or 'Add note' permissions and some workflow transitions allowed
+* Details by assignees on issue summary view
+* 'New issue' link in the main menu (accesskey 7). The drop-down lists to add an issue on the project overview and the issue list are removed
+* Change status select box default to current status
+* Preview for issue notes, news and messages
+* Optional description for attachments
+* 'Fixed version' label changed to 'Target version'
+* Let the user choose when deleting issues with reported hours to:
+    * delete the hours
+    * assign the hours to the project
+    * reassign the hours to another issue
+* Date range filter and pagination on time entries detail view
+* Propagate time tracking to the parent project
+* Switch added on the project activity view to include subprojects
+* Display total estimated and spent hours on the version detail view
+* Weekly time tracking block for 'My page'
+* Permissions to edit time entries
+* Include subprojects on the issue list, calendar and gantt by default (can be turned off is administration settings)
+* Roadmap enhancements (separate related issues from wiki contents, leading h1 in version wiki pages is hidden, smaller wiki headings)
+* Allow issue list to be sorted by target version
+* Related changesets messages displayed on the issue details view
+* Create a journal and send an email when an issue is closed by commit
+* Add 'Author' to the available columns for the issue list
+* More appropriate default sort order on sortable columns
+* Add issue subject to the time entries view and issue subject + tracker to the csv export
+* Permissions to edit issue notes
+* Display date/time instead of date on files list
+* Do not show Roadmap menu item if the project doesn't define any versions
+* Allow longer version names (60 chars)
+* Ability to copy an existing workflow when creating a new role
+* Display custom fields in two columns on the issue form
+* Added 'estimated time' in the csv export of the issue list
+* Display the last 30 days on the activity view rather than the current month (number of days can be configured in the application settings)
+* Setting for whether new projects should be public by default
+* User preference to choose how comments/replies are displayed: in chronological or reverse chronological order
+* Added default value for custom fields
+* Added tabindex property on wiki toolbar buttons (to easily move from field to field using the tab key)
+* Redirect to issue page after creating a new issue
+* Wiki toolbar improvements (mainly for Firefox)
+* Display wiki syntax quick ref link on all wiki textareas
+* Display links to Atom feeds
+* Show replies when choosing to display messages in the activity
+* Added 'include' macro to include another wiki page
+* RedmineWikiFormatting page available as a static HTML file locally
+* Wrap diff content
+* Strip out email address from authors in repository screens
+* Highlight the current item of the main menu
+* Added simple syntax highlighters for php and java languages
+* Do not show empty diffs
+* Show explicit error message when the scm command failed (eg. when svn binary is not available)
+* Lithuanian translation added (Sergej Jegorov)
+* Ukrainan translation added (Natalia Konovka & Mykhaylo Sorochan)
+* Danish translation added (Mads Vestergaard)
+* Added i18n support to the jstoolbar and various settings screen
+* RedCloth's glyphs no longer user
+* New icons for the wiki toolbar (from http://www.famfamfam.com/lab/icons/silk/)
+* The following menus can now be extended by plugins: top_menu, account_menu, application_menu
+* Added a simple rake task to fetch changesets from the repositories: rake redmine:fetch_changesets
+* Remove hardcoded "Redmine" strings in account related emails and use application title instead
+* Mantis importer preserve bug ids
+* Trac importer: Trac guide wiki pages skipped
+* Trac importer: wiki attachments migration added
+* Trac importer: support database schema for Trac migration
+* Trac importer: support CamelCase links
+* Removes the Redmine version from the footer (can be viewed on admin -> info)
+* Rescue and display an error message when trying to delete a role that is in use
+* Add various 'X-Redmine' headers to email notifications: X-Redmine-Host, X-Redmine-Site, X-Redmine-Project, X-Redmine-Issue-Id, -Author, -Assignee, X-Redmine-Topic-Id
+* Add "--encoding utf8" option to the Mercurial "hg log" command in order to get utf8 encoded commit logs
+* Fixed: Gantt and calendar not properly refreshed (fragment caching removed)
+* Fixed: Textile image with style attribute cause internal server error
+* Fixed: wiki TOC not rendered properly when used in an issue or document description
+* Fixed: 'has already been taken' error message on username and email fields if left empty
+* Fixed: non-ascii attachement filename with IE
+* Fixed: wrong url for wiki syntax pop-up when Redmine urls are prefixed
+* Fixed: search for all words doesn't work
+* Fixed: Do not show sticky and locked checkboxes when replying to a message
+* Fixed: Mantis importer: do not duplicate Mantis username in firstname and lastname if realname is blank
+* Fixed: Date custom fields not displayed as specified in application settings
+* Fixed: titles not escaped in the activity view
+* Fixed: issue queries can not use custom fields marked as 'for all projects' in a project context
+* Fixed: on calendar, gantt and in the tracker filter on the issue list, only active trackers of the project (and its sub projects) should be available
+* Fixed: locked users should not receive email notifications
+* Fixed: custom field selection is not saved when unchecking them all on project settings
+* Fixed: can not lock a topic when creating it
+* Fixed: Incorrect filtering for unset values when using 'is not' filter
+* Fixed: PostgreSQL issues_seq_id not updated when using Trac importer
+* Fixed: ajax pagination does not scroll up
+* Fixed: error when uploading a file with no content-type specified by the browser
+* Fixed: wiki and changeset links not displayed when previewing issue description or notes
+* Fixed: 'LdapError: no bind result' error when authenticating
+* Fixed: 'LdapError: invalid binding information' when no username/password are set on the LDAP account
+* Fixed: CVS repository doesn't work if port is used in the url
+* Fixed: Email notifications: host name is missing in generated links
+* Fixed: Email notifications: referenced changesets, wiki pages, attachments... are not turned into links
+* Fixed: Do not clear issue relations when moving an issue to another project if cross-project issue relations are allowed
+* Fixed: "undefined method 'textilizable'" error on email notification when running Repository#fetch_changesets from the console
+* Fixed: Do not send an email with no recipient, cc or bcc
+* Fixed: fetch_changesets fails on commit comments that close 2 duplicates issues.
+* Fixed: Mercurial browsing under unix-like os and for directory depth > 2
+* Fixed: Wiki links with pipe can not be used in wiki tables
+
+
+== 2008-03-12 v0.6.4
+
+* Fixed: private projects name are displayed on account/show even if the current user doesn't have access to these private projects
+* Fixed: potential LDAP authentication security flaw
+* Fixed: context submenus on the issue list don't show up with IE6.
+* Fixed: Themes are not applied with Rails 2.0
+* Fixed: crash when fetching Mercurial changesets if changeset[:files] is nil
+* Fixed: Mercurial repository browsing
+* Fixed: undefined local variable or method 'log' in CvsAdapter when a cvs command fails
+* Fixed: not null constraints not removed with Postgresql
+* Doctype set to transitional
+
+
+== 2007-12-18 v0.6.3
+
+* Fixed: upload doesn't work in 'Files' section
+
+
 == 2007-12-16 v0.6.2
 
 * Search engine: issue custom fields can now be searched
diff --git a/doc/INSTALL b/doc/INSTALL
index 035e97cab..7a00b9367 100644
--- a/doc/INSTALL
+++ b/doc/INSTALL
@@ -7,7 +7,7 @@ http://www.redmine.org/
 
 == Requirements
 
-* Ruby on Rails 1.2.5 or 2.0.1
+* Ruby on Rails 2.0.2
 * A database (see compatibility below)
 
 Optional:
diff --git a/doc/UPGRADING b/doc/UPGRADING
index 7cd085fa7..2edb2952a 100644
--- a/doc/UPGRADING
+++ b/doc/UPGRADING
@@ -1,11 +1,11 @@
 == Redmine upgrade procedure
 
 Redmine - project management software
-Copyright (C) 2006-2007  Jean-Philippe Lang
+Copyright (C) 2006-2008  Jean-Philippe Lang
 http://www.redmine.org/
 
 
-== Upgrading from 0.3.0 and above
+== Upgrading
 
 1. Uncompress the program archive in a new directory
    
@@ -19,17 +19,12 @@ http://www.redmine.org/
    rake db:migrate RAILS_ENV="production"
 
 6. Copy the RAILS_ROOT/files directory content into your new installation
+   This directory contains all the attached files
 
-Note 1: Rails 1.2.2 or higher is required for version 0.4.2 and later.
 
-Note 2: when upgrading your code with svn update, don't forget to clear
-the application cache (RAILS_ROOT/tmp/cache) before restarting.
+== Notes
 
-Note 3: settings previously defined in custom_config.rb are now stored
-in database, as of version 0.4.2. Go to "Admin -> Settings" to edit them.
+1. Rails 2.0.2 is required for version 0.7 and later.
 
-   
-== From 0.2.x and below
-
-Due to major database changes since 0.2.x, there is no migration support
-from 0.2.x and previous versions.
+2. When upgrading your code with svn update, don't forget to clear
+   the application cache (RAILS_ROOT/tmp/cache) before restarting.
diff --git a/lib/redmine/version.rb b/lib/redmine/version.rb
index 87611811f..81006fe2d 100644
--- a/lib/redmine/version.rb
+++ b/lib/redmine/version.rb
@@ -3,7 +3,7 @@ require 'rexml/document'
 module Redmine
   module VERSION #:nodoc:
     MAJOR = 0
-    MINOR = 6
+    MINOR = 7
     TINY  = 'devel'
 
     def self.revision

From 180fe8f6a47e85357bda2e6b22832c0635d209e4 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Fri, 21 Mar 2008 21:08:00 +0000
Subject: [PATCH 326/710] Fix IE6 display bug on the issue list.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1285 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/issues/index.rhtml       | 4 ++--
 public/stylesheets/application.css | 5 ++---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/app/views/issues/index.rhtml b/app/views/issues/index.rhtml
index d212ab6bb..094c49ff2 100644
--- a/app/views/issues/index.rhtml
+++ b/app/views/issues/index.rhtml
@@ -6,7 +6,7 @@
     <%= hidden_field_tag('project_id', @project.id) if @project %>
     <fieldset id="filters"><legend><%= l(:label_filter_plural) %></legend>
     <%= render :partial => 'queries/filters', :locals => {:query => @query} %>
-    <div class="buttons">
+    <p class="buttons">
     <%= link_to_remote l(:button_apply), 
                        { :url => { :set_filter => 1 },
                          :update => "content",
@@ -21,7 +21,7 @@
     <% if current_role && current_role.allowed_to?(:save_queries) %>
     <%= link_to l(:button_save), {}, :onclick => "$('query_form').submit(); return false;", :class => 'icon icon-save' %>
     <% end %>
-    </div>
+    </p>
     </fieldset>
     <% end %>
 <% else %>
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 0681247cb..9446f1019 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -87,6 +87,7 @@ table.list td { overflow: hidden; vertical-align: top;}
 table.list td.id { width: 2%; text-align: center;}
 table.list td.checkbox { width: 15px; padding: 0px;}
 
+table.list.issues { margin-top: 10px; }
 tr.issue { text-align: center; white-space: nowrap; }
 tr.issue td.subject, tr.issue td.category { white-space: normal; }
 tr.issue td.subject { text-align: left; }
@@ -145,7 +146,6 @@ div.square {
  overflow: hidden;
  width: .6em; height: .6em;
 }
-
 .contextual {float:right; white-space: nowrap; line-height:1.4em;margin-top:5px; padding-left: 10px; font-size:0.9em;}
 .contextual input {font-size:0.9em;}
 
@@ -160,8 +160,7 @@ textarea.wiki-edit { width: 99%; }
 li p {margin-top: 0;}
 div.issue {background:#ffffdd; padding:6px; margin-bottom:6px;border: 1px solid #d7d7d7;}
 
-#filters { margin-bottom: 1em; }
-#filters .buttons { text-align: right; font-size: 0.9em; }
+fieldset#filters .buttons { text-align: right; font-size: 0.9em; margin: 0 4px 0px 0; }
 
 div#issue-changesets {float:right; width:45%; margin-left: 1em; margin-bottom: 1em; background: #fff; padding-left: 1em; font-size: 90%;}
 div#issue-changesets .changeset { padding: 4px;}

From 7fb72e671b867eefd4ce57ba6b4e69564cbce7a9 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Fri, 21 Mar 2008 21:37:40 +0000
Subject: [PATCH 327/710] Trac importer: prevent validation failure due to the
 default value when saving the Resolution custom field if it already exists
 (#869).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1286 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 lib/tasks/migrate_from_trac.rake | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/tasks/migrate_from_trac.rake b/lib/tasks/migrate_from_trac.rake
index 2308e787b..0f116328f 100644
--- a/lib/tasks/migrate_from_trac.rake
+++ b/lib/tasks/migrate_from_trac.rake
@@ -324,8 +324,9 @@ namespace :redmine do
                                  :is_filter => true) if r.nil?
         r.trackers = Tracker.find(:all)
         r.projects << @target_project
-        r.possible_values = %w(fixed invalid wontfix duplicate worksforme)
-        custom_field_map['resolution'] = r if r.save
+        r.possible_values = (r.possible_values + %w(fixed invalid wontfix duplicate worksforme)).flatten.compact.uniq
+        r.save!
+        custom_field_map['resolution'] = r
             
         # Tickets
         print "Migrating tickets"

From 5f78b8a9a0f335a01b1b3e6810314cfbcee42da0 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Fri, 21 Mar 2008 22:05:23 +0000
Subject: [PATCH 328/710] Added links to repository files in wiki syntax help.
 Styles added and small fixes to the detailed wiki syntax help.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1287 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 public/help/wiki_syntax.html          |   1 +
 public/help/wiki_syntax_detailed.html | 143 +++++++++++++++++++++++---
 2 files changed, 128 insertions(+), 16 deletions(-)

diff --git a/public/help/wiki_syntax.html b/public/help/wiki_syntax.html
index caafacec4..6a0e10022 100644
--- a/public/help/wiki_syntax.html
+++ b/public/help/wiki_syntax.html
@@ -53,6 +53,7 @@ table td h3 { font-size: 1.2em; text-align: left; }
 <tr><th></th><td>Issue #12</td><td>Issue <a href="#">#12</a></td></tr>
 <tr><th></th><td>Revision r43</td><td>Revision <a href="#">r43</a></td></tr>
 <tr><th></th><td>commit:"f30e13e43"</td><td><a href="#">f30e13e4</a></td></tr>
+<tr><th></th><td>source:some/file</td><td><a href="#">source:some/file</a></td></tr>
 
 <tr><th colspan="3">Inline images</th></tr>
 <tr><th><img src="../../images/jstoolbar/bt_img.png" style="border: 1px solid #bbb;" alt="Image" /></th><td>!<em>image_url</em>!</td><td></td></tr>
diff --git a/public/help/wiki_syntax_detailed.html b/public/help/wiki_syntax_detailed.html
index 03e787ad8..6e23594f6 100644
--- a/public/help/wiki_syntax_detailed.html
+++ b/public/help/wiki_syntax_detailed.html
@@ -3,11 +3,99 @@
 <head>
 <title>RedmineWikiFormatting</title>
 <meta http-equiv="content-type" content="text/html; charset=utf-8" />
-<style>
+<style type="text/css">
 body { font:80% Verdana,Tahoma,Arial,sans-serif; }
 h1, h2, h3, h4 {  font-family: Trebuchet MS,Georgia,"Times New Roman",serif; }
+pre, code { font-size:120%; }
+pre code { font-size:100%; }
+pre {
+    margin: 1em 1em 1em 1.6em;
+    padding: 2px;
+    background-color: #fafafa;
+    border: 1px solid #dadada;
+    width:95%;
+    overflow-x: auto;
+}
+a.new { color: #b73535; }
+
+.CodeRay .af { color:#00C }
+.CodeRay .an { color:#007 }
+.CodeRay .av { color:#700 }
+.CodeRay .aw { color:#C00 }
+.CodeRay .bi { color:#509; font-weight:bold }
+.CodeRay .c  { color:#666; }
+
+.CodeRay .ch { color:#04D }
+.CodeRay .ch .k { color:#04D }
+.CodeRay .ch .dl { color:#039 }
+
+.CodeRay .cl { color:#B06; font-weight:bold }
+.CodeRay .co { color:#036; font-weight:bold }
+.CodeRay .cr { color:#0A0 }
+.CodeRay .cv { color:#369 }
+.CodeRay .df { color:#099; font-weight:bold }
+.CodeRay .di { color:#088; font-weight:bold }
+.CodeRay .dl { color:black }
+.CodeRay .do { color:#970 }
+.CodeRay .ds { color:#D42; font-weight:bold }
+.CodeRay .e  { color:#666; font-weight:bold }
+.CodeRay .en { color:#800; font-weight:bold }
+.CodeRay .er { color:#F00; background-color:#FAA }
+.CodeRay .ex { color:#F00; font-weight:bold }
+.CodeRay .fl { color:#60E; font-weight:bold }
+.CodeRay .fu { color:#06B; font-weight:bold }
+.CodeRay .gv { color:#d70; font-weight:bold }
+.CodeRay .hx { color:#058; font-weight:bold }
+.CodeRay .i  { color:#00D; font-weight:bold }
+.CodeRay .ic { color:#B44; font-weight:bold }
+
+.CodeRay .il { background: #eee }
+.CodeRay .il .il { background: #ddd }
+.CodeRay .il .il .il { background: #ccc }
+.CodeRay .il .idl { font-weight: bold; color: #888 }
+
+.CodeRay .in { color:#B2B; font-weight:bold }
+.CodeRay .iv { color:#33B }
+.CodeRay .la { color:#970; font-weight:bold }
+.CodeRay .lv { color:#963 }
+.CodeRay .oc { color:#40E; font-weight:bold }
+.CodeRay .of { color:#000; font-weight:bold }
+.CodeRay .op { }
+.CodeRay .pc { color:#038; font-weight:bold }
+.CodeRay .pd { color:#369; font-weight:bold }
+.CodeRay .pp { color:#579 }
+.CodeRay .pt { color:#339; font-weight:bold }
+.CodeRay .r  { color:#080; font-weight:bold }
+
+.CodeRay .rx { background-color:#fff0ff }
+.CodeRay .rx .k { color:#808 }
+.CodeRay .rx .dl { color:#404 }
+.CodeRay .rx .mod { color:#C2C }
+.CodeRay .rx .fu  { color:#404; font-weight: bold }
+
+.CodeRay .s  { background-color:#fff0f0 }
+.CodeRay .s  .s { background-color:#ffe0e0 }
+.CodeRay .s  .s  .s { background-color:#ffd0d0 }
+.CodeRay .s  .k { color:#D20 }
+.CodeRay .s  .dl { color:#710 }
+
+.CodeRay .sh { background-color:#f0fff0 }
+.CodeRay .sh .k { color:#2B2 }
+.CodeRay .sh .dl { color:#161 }
+
+.CodeRay .sy { color:#A60 }
+.CodeRay .sy .k { color:#A60 }
+.CodeRay .sy .dl { color:#630 }
+
+.CodeRay .ta { color:#070 }
+.CodeRay .tf { color:#070; font-weight:bold }
+.CodeRay .ts { color:#D70; font-weight:bold }
+.CodeRay .ty { color:#339; font-weight:bold }
+.CodeRay .v  { color:#036 }
+.CodeRay .xt { color:#444 }
 </style>
 </head>
+
 <body>
 <h1><a name="1" class="wiki-page"></a>Wiki formatting</h1>
 
@@ -50,7 +138,7 @@ h1, h2, h3, h4 {  font-family: Trebuchet MS,Georgia,"Times New Roman",serif; }
 	<p>Wiki links are displayed in red if the page doesn't exist yet, eg: <a href="Nonexistent_page.html" class="wiki-page new">Nonexistent page</a>.</p>
 
 
-	<p>Links to others resources (0.6.devel.1064 and above):</p>
+	<p>Links to others resources (0.7):</p>
 
 
 	<ul>
@@ -85,7 +173,23 @@ h1, h2, h3, h4 {  font-family: Trebuchet MS,Georgia,"Times New Roman",serif; }
 	</ul>
 
 
-	<p>Escaping (0.6.devel.1064 and above):</p>
+    <ul>
+	<li>Repository files
+
+	<ul>
+	<li><strong>source:some/file</strong>          -- Link to the file located at /some/file in the project's repository</li>
+		<li><strong>source:some/file@52</strong>       -- Link to the file's revision 52</li>
+
+		<li><strong>source:some/file#L120</strong>     -- Link to line 120 of the file</li>
+		<li><strong>source:some/file@52#L120</strong>  -- Link to line 120 of the file's revision 52</li>
+		<li><strong>export:some/file</strong>          -- Force the download of the file</li>
+	</ul></li>
+
+	</ul>
+	
+	
+	
+	<p>Escaping (0.7):</p>
 
 
 	<ul>
@@ -125,12 +229,13 @@ http://www.redmine.org, someone@foo.bar
 	<h3><a name="6" class="wiki-page"></a>Font style</h3>
 
 
-<pre><code>* *bold*
+<pre>
+* *bold*
 * _italic_
 * _*bold italic*_
 * +underline+
 * -strike-through-
-&lt;/code></pre>
+</pre>
 
 	<p>Display:</p>
 
@@ -157,17 +262,19 @@ http://www.redmine.org, someone@foo.bar
 	<h3><a name="8" class="wiki-page"></a>Headings</h3>
 
 
-<pre><code>h1. Heading
+<pre>
+h1. Heading
 h2. Subheading
 h3. Subheading
-&lt;/code></pre>
+</pre>
 
 	<h3><a name="9" class="wiki-page"></a>Paragraphs</h3>
 
 
-<pre><code>p&gt;. right aligned
+<pre>
+p&gt;. right aligned
 p=. centered
-&lt;/code></pre>
+</pre>
 
 	<p style="text-align:center;">This is centered paragraph.</p>
 
@@ -178,9 +285,10 @@ p=. centered
 	<p>Start the paragraph with <strong>bq.</strong></p>
 
 
-<pre><code>bq. Rails is a full-stack framework for developing database-backed web applications according to the Model-View-Control pattern.
+<pre>
+bq. Rails is a full-stack framework for developing database-backed web applications according to the Model-View-Control pattern.
 To go live, all you need to add is a database and a web server.
-&lt;/code></pre>
+</pre>
 
 	<p>Display:</p>
 
@@ -193,9 +301,10 @@ To go live, all you need to add is a database and a web server.
 	<h3><a name="11" class="wiki-page"></a>Table of content</h3>
 
 
-<pre><code>{{toc}} =&gt; left aligned toc
+<pre>
+{{toc}} =&gt; left aligned toc
 {{&gt;toc}} =&gt; right aligned toc
-&lt;/code></pre>
+</pre>
 
 	<h2><a name="12" class="wiki-page"></a>Macros</h2>
 
@@ -218,10 +327,11 @@ To go live, all you need to add is a database and a web server.
 	<p>You can highlight code in your wiki page using this syntax:</p>
 
 
-<pre><code>&lt;pre&gt;&lt;code class="ruby"&gt;
+<pre>
+&lt;pre&gt;&lt;code class="ruby"&gt;
   Place you code here.
 &lt;/code&gt;&lt;/pre&gt;
-</pre>&lt;/code>
+</pre>
 
 	<p>Example:</p>
 
@@ -236,6 +346,7 @@ To go live, all you need to add is a database and a web server.
 <span class="no"> 8</span>     puts <span class="s"><span class="dl">"</span><span class="k">Hello </span><span class="il"><span class="idl">#{</span><span class="iv">@name</span><span class="idl">}</span></span><span class="k">!</span><span class="dl">"</span></span> 
 <span class="no"> 9</span>   <span class="r">end</span>
 <span class="no"><strong>10</strong></span> <span class="r">end</span>
-</pre>&lt;/code>
+</code>
+</pre>
 </body>
 </html>

From 472654aebea0f262de0cc8234fe0c3934af515a1 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Fri, 21 Mar 2008 22:19:37 +0000
Subject: [PATCH 329/710] Fixed: revision is ignored in MercurialAdapter#cat.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1288 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 lib/redmine/scm/adapters/mercurial_adapter.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/redmine/scm/adapters/mercurial_adapter.rb b/lib/redmine/scm/adapters/mercurial_adapter.rb
index 003e4a5df..ff52ab893 100644
--- a/lib/redmine/scm/adapters/mercurial_adapter.rb
+++ b/lib/redmine/scm/adapters/mercurial_adapter.rb
@@ -143,7 +143,9 @@ module Redmine
         end
         
         def cat(path, identifier=nil)
-          cmd = "#{HG_BIN} -R #{target('')} cat #{target(path)}"
+          cmd = "#{HG_BIN} -R #{target('')} cat"
+          cmd << " -r #{identifier.to_i}" if identifier
+          cmd << " #{target(path)}"
           cat = nil
           shellout(cmd) do |io|
             io.binmode

From de5b0ad0a83c078df67e3cb056e821a1732df0d6 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 23 Mar 2008 08:34:13 +0000
Subject: [PATCH 330/710] =?UTF-8?q?Translations=20(closes=20#875,=20#876,?=
 =?UTF-8?q?=20#889,=20#891,=20#909):=20*=20Norwegian=20added=20(Kai=20Olav?=
 =?UTF-8?q?=20Fredriksen)=20*=20Finnish=20updated=20(Antti=20Perki=C3=B6m?=
 =?UTF-8?q?=C3=A4ki)=20*=20Czech=20updated=20(Maxim=20Kru=C5=A1ina)=20*=20?=
 =?UTF-8?q?Russian=20updated=20(Michael=20Pirogov)=20*=20Polish=20updated?=
 =?UTF-8?q?=20(Mariusz=20Olejnik)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1289 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 lang/cs.yml                                   |  17 +-
 lang/fi.yml                                   |   4 +-
 lang/no.yml                                   | 619 ++++++++++++++++++
 lang/pl.yml                                   |  18 +-
 lang/ru.yml                                   |  28 +-
 .../javascripts/calendar/lang/calendar-no.js  |  86 +++
 .../jstoolbar/lang/jstoolbar-no.js            |  14 +
 7 files changed, 754 insertions(+), 32 deletions(-)
 create mode 100644 lang/no.yml
 create mode 100644 public/javascripts/calendar/lang/calendar-no.js
 create mode 100644 public/javascripts/jstoolbar/lang/jstoolbar-no.js

diff --git a/lang/cs.yml b/lang/cs.yml
index 28d52e3da..088603335 100644
--- a/lang/cs.yml
+++ b/lang/cs.yml
@@ -1,3 +1,6 @@
+# CZ translation by Maxim Krušina | Massimo Filippi, s.r.o. | maxim@mxm.cz
+# Based on original CZ translation by Jan Kadleček
+
 _gloc_rule_default: '|n| n==1 ? "" : "_plural" '
 
 actionview_datehelper_select_day_prefix: 
@@ -98,7 +101,7 @@ gui_validation_error_plural: %d chyb(y)
 field_name: Jméno
 field_description: Popis
 field_summary: Přehled
-field_is_required: Požadovaný
+field_is_required: Povinné pole
 field_firstname: Jméno
 field_lastname: Příjmení
 field_mail: Email
@@ -131,7 +134,7 @@ field_priority: Priorita
 field_fixed_version: Přiřazeno k verzi
 field_user: Uživatel
 field_role: Role
-field_homepage: Úvodní
+field_homepage: Homepage
 field_is_public: Veřejný
 field_parent: Nadřazený projekt
 field_is_in_chlog: Úkoly zobrazené v změnovém logu
@@ -204,11 +207,11 @@ setting_date_format: Formát data
 setting_time_format: Formát času
 setting_cross_project_issue_relations: Povolit vazby úkolů napříč projekty
 setting_issue_list_default_columns: Výchozí sloupce zobrazené v seznamu úkolů
-setting_repositories_encodings: Repositories encodings
+setting_repositories_encodings: Kódování 
 setting_emails_footer: Patička emailů
 setting_protocol: Protokol
-setting_per_page_options: Objects per page options
-setting_user_format: Users display format
+setting_per_page_options: Povolené počty řádků na stránce
+setting_user_format: Formát zobrazení uživatele
 setting_activity_days_default: Days displayed on project activity
 setting_display_subprojects_issues: Display subprojects issues on main projects by default
 
@@ -369,7 +372,7 @@ label_in_less_than: je měší než
 label_in_more_than: je větší než
 label_in: v
 label_today: dnes
-label_all_time: veškerý čas
+label_all_time: vše
 label_yesterday: včera
 label_this_week: tento týden
 label_last_week: minulý týden
@@ -377,7 +380,7 @@ label_last_n_days: posledních %d dnů
 label_this_month: tento měsíc
 label_last_month: minulý měsíc
 label_this_year: tento rok
-label_date_range: Rozsah dat
+label_date_range: Časový rozsah
 label_less_than_ago: před méně jak (dny)
 label_more_than_ago: před více jak (dny)
 label_ago: před (dny)
diff --git a/lang/fi.yml b/lang/fi.yml
index 9e8cfee2b..e71ee74d4 100644
--- a/lang/fi.yml
+++ b/lang/fi.yml
@@ -613,6 +613,6 @@ setting_display_subprojects_issues: Näytä alaprojektien tapahtumat pääprojek
 field_comments_sorting: Näytä kommentit
 label_reverse_chronological_order: Käänteisessä aikajärjestyksessä
 label_preferences: Asetukset
-setting_default_projects_public: New projects are public by default
-label_overall_activity: Overall activity
+setting_default_projects_public: Uudet projektit ovat oletuksena julkisia
+label_overall_activity: Kokonaisaktiviteetti
 error_scm_annotate: "The entry does not exist or can not be annotated."
diff --git a/lang/no.yml b/lang/no.yml
new file mode 100644
index 000000000..0cdf8369f
--- /dev/null
+++ b/lang/no.yml
@@ -0,0 +1,619 @@
+_gloc_rule_default: '|n| n==1 ? "" : "_plural" '
+
+actionview_datehelper_select_day_prefix:
+actionview_datehelper_select_month_names: Januar,Februar,Mars,April,Mai,Juni,Juli,August,September,Oktober,November,Desember
+actionview_datehelper_select_month_names_abbr: Jan,Feb,Mar,Apr,Mai,Jun,Jul,Aug,Sep,Okt,Nov,Des
+actionview_datehelper_select_month_prefix:
+actionview_datehelper_select_year_prefix:
+actionview_datehelper_time_in_words_day: 1 dag
+actionview_datehelper_time_in_words_day_plural: %d dager
+actionview_datehelper_time_in_words_hour_about: ca. en time
+actionview_datehelper_time_in_words_hour_about_plural: ca. %d timer
+actionview_datehelper_time_in_words_hour_about_single: ca. en time
+actionview_datehelper_time_in_words_minute: 1 minutt
+actionview_datehelper_time_in_words_minute_half: et halvt minutt
+actionview_datehelper_time_in_words_minute_less_than: mindre enn et minutt
+actionview_datehelper_time_in_words_minute_plural: %d minutter
+actionview_datehelper_time_in_words_minute_single: 1 minutt
+actionview_datehelper_time_in_words_second_less_than: mindre enn et sekund
+actionview_datehelper_time_in_words_second_less_than_plural: mindre enn %d sekunder
+actionview_instancetag_blank_option: Vennligst velg
+
+activerecord_error_inclusion: finnes ikke i listen
+activerecord_error_exclusion: er reservert
+activerecord_error_invalid: er ugyldig
+activerecord_error_confirmation: stemmer ikke med bekreftelsen
+activerecord_error_accepted: må aksepteres
+activerecord_error_empty: kan ikke være tom
+activerecord_error_blank: kan ikke være blank
+activerecord_error_too_long: er for lang
+activerecord_error_too_short: er for kort
+activerecord_error_wrong_length: har feil lengde
+activerecord_error_taken: er opptatt
+activerecord_error_not_a_number: er ikke et nummer
+activerecord_error_not_a_date: er ikke en gyldig dato
+activerecord_error_greater_than_start_date: må være større enn startdato
+activerecord_error_not_same_project: hører ikke til samme prosjekt
+activerecord_error_circular_dependency: Denne relasjonen ville lagd en sirkulær avhengighet
+
+general_fmt_age: %d år
+general_fmt_age_plural: %d år
+general_fmt_date: %%d. %%B %%Y
+general_fmt_datetime: %%d. %%B %%H:%%M
+general_fmt_datetime_short: %%d.%%m.%%Y, %%H:%%M
+general_fmt_time: %%H:%%M
+general_text_No: 'Nei'
+general_text_Yes: 'Ja'
+general_text_no: 'nei'
+general_text_yes: 'ja'
+general_lang_name: 'Norwegian (Norsk bokmål)'
+general_csv_separator: ','
+general_csv_encoding: ISO-8859-1
+general_pdf_encoding: ISO-8859-1
+general_day_names: Mandag,Tirsdag,Onsdag,Torsdag,Fredag,Lørdag,Søndag
+general_first_day_of_week: '1'
+
+notice_account_updated: Kontoen er oppdatert.
+notice_account_invalid_creditentials: Feil brukernavn eller passord
+notice_account_password_updated: Passordet er oppdatert.
+notice_account_wrong_password: Feil passord
+notice_account_register_done: Kontoen er opprettet. Klikk lenken som er sendt deg i e-post for å aktivere kontoen.
+notice_account_unknown_email: Ukjent bruker.
+notice_can_t_change_password: Denne kontoen bruker ekstern godkjenning. Passordet kan ikke endres.
+notice_account_lost_email_sent: En e-post med instruksjoner for å velge et nytt passord er sendt til deg.
+notice_account_activated: Din konto er aktivert. Du kan nå logge inn.
+notice_successful_create: Opprettet.
+notice_successful_update: Oppdatert.
+notice_successful_delete: Slettet.
+notice_successful_connection: Koblet opp.
+notice_file_not_found: Siden du forsøkte å vise eksisterer ikke, eller er slettet.
+notice_locking_conflict: Data har blitt oppdatert av en annen bruker.
+notice_scm_error: Elementet og/eller revisjonen eksisterer ikke i depoet.
+notice_not_authorized: Du har ikke adgang til denne siden.
+notice_email_sent: En e-post er sendt til %s
+notice_email_error: En feil oppstod under sending av e-post (%s)
+notice_feeds_access_key_reseted: Din RSS-tilgangsnøkkel er nullstilt.
+notice_failed_to_save_issues: "Lykkes ikke å lagre %d sak(er) på %d valgt: %s."
+notice_no_issue_selected: "Ingen sak valgt! Vennligst merk sakene du vil endre."
+notice_account_pending: "Din konto ble opprettet og avventer nå administrativ godkjenning."
+
+mail_subject_lost_password: Ditt %s passord
+mail_body_lost_password: 'Klikk følgende lenke for å endre ditt passord:'
+mail_subject_register: %s kontoaktivering
+mail_body_register: 'Klikk følgende lenke for å aktivere din konto:'
+mail_body_account_information_external: Du kan bruke din "%s"-konto for å logge inn.
+mail_body_account_information: Informasjon om din konto
+mail_subject_account_activation_request: %s kontoaktivering
+mail_body_account_activation_request: 'En ny bruker (%s) er registrert, og avventer din godkjenning:'
+
+gui_validation_error: 1 feil
+gui_validation_error_plural: %d feil
+
+field_name: Navn
+field_description: Beskrivelse
+field_summary: Oppsummering
+field_is_required: Kreves
+field_firstname: Fornavn
+field_lastname: Etternavn
+field_mail: E-post
+field_filename: Fil
+field_filesize: Størrelse
+field_downloads: Nedlastinger
+field_author: Forfatter
+field_created_on: Opprettet
+field_updated_on: Oppdatert
+field_field_format: Format
+field_is_for_all: For alle prosjekter
+field_possible_values: Lovlige verdier
+field_regexp: Regular expression
+field_min_length: Minimum lengde
+field_max_length: Maksimum lengde
+field_value: Verdi
+field_category: Kategori
+field_title: Tittel
+field_project: Prosjekt
+field_issue: Sak
+field_status: Status
+field_notes: Notater
+field_is_closed: Saken er lukket
+field_is_default: Standardverdi
+field_tracker: Sakstype
+field_subject: Emne
+field_due_date: Frist
+field_assigned_to: Tildelt til
+field_priority: Prioritet
+field_fixed_version: Mål-versjon
+field_user: Bruker
+field_role: Rolle
+field_homepage: Hjemmeside
+field_is_public: Offentlig
+field_parent: Underprosjekt til
+field_is_in_chlog: Saker vist i endringslogg
+field_is_in_roadmap: Saker vist i veikart
+field_login: Brukernavn
+field_mail_notification: E-post varsling
+field_admin: Administrator
+field_last_login_on: Sist innlogget
+field_language: Språk
+field_effective_date: Dato
+field_password: Passord
+field_new_password: Nytt passord
+field_password_confirmation: Bekreft passord
+field_version: Versjon
+field_type: Saksype
+field_host: Vert
+field_port: Port
+field_account: Konto
+field_base_dn: Base DN
+field_attr_login: Brukernavnsattributt
+field_attr_firstname: Fornavnsattributt
+field_attr_lastname: Etternavnsattributt
+field_attr_mail: E-post-attributt
+field_onthefly: On-the-fly brukeropprettelse
+field_start_date: Start
+field_done_ratio: %% Ferdig
+field_auth_source: Autentifikasjonsmodus
+field_hide_mail: Skjul min e-post-adresse
+field_comments: Kommentarer
+field_url: URL
+field_start_page: Startside
+field_subproject: Underprosjekt
+field_hours: Timer
+field_activity: Activitet
+field_spent_on: Dato
+field_identifier: Identifikasjon
+field_is_filter: Brukt som et filter
+field_issue_to_id: Relatert saker
+field_delay: Forsinkelse
+field_assignable: Saker kan tildeles denne rollen
+field_redirect_existing_links: Viderekoble eksisterende lenker
+field_estimated_hours: Estimert tid
+field_column_names: Kolonner
+field_time_zone: Tidssone
+field_searchable: Søkbar
+
+setting_app_title: Appliksjonstittel
+setting_app_subtitle: Applikasjonens undertittel
+setting_welcome_text: Velkomstekst
+setting_default_language: Standardspråk
+setting_login_required: Krever innlogging
+setting_self_registration: Selv-registrering
+setting_attachment_max_size: Maks. størrelse vedlegg
+setting_issues_export_limit: Eksportgrense for saker
+setting_mail_from: Avsenders e-post
+setting_bcc_recipients: Blindkopi (bcc) til mottakere
+setting_host_name: Vertsnavn
+setting_text_formatting: Tekstformattering
+setting_wiki_compression: Komprimering av Wiki-historikk
+setting_feeds_limit: Innholdsgrense for Feed
+setting_autofetch_changesets: Autohenting av innsendinger
+setting_sys_api_enabled: Aktiver webservice for depot-administrasjon
+setting_commit_ref_keywords: Nøkkelord for referanse
+setting_commit_fix_keywords: Nøkkelord for retting
+setting_autologin: Autoinnloging
+setting_date_format: Datoformat
+setting_time_format: Tidsformat
+setting_cross_project_issue_relations: Tillat saksrelasjoner mellom prosjekter
+setting_issue_list_default_columns: Standardkolonner vist i sakslisten
+setting_repositories_encodings: Depot-tegnsett
+setting_emails_footer: E-post-signatur
+setting_protocol: Protokoll
+
+label_user: Bruker
+label_user_plural: Brukere
+label_user_new: Ny bruker
+label_project: Prosjekt
+label_project_new: Nytt prosjekt
+label_project_plural: Prosjekter
+label_project_all: Alle prosjekter
+label_project_latest: Siste prosjekter
+label_issue: Sak
+label_issue_new: Ny sak
+label_issue_plural: Saker
+label_issue_view_all: Vis alle saker
+label_issues_by: Saker etter %s
+label_document: Dokument
+label_document_new: Nytt dokument
+label_document_plural: Dokumenter
+label_role: Rolle
+label_role_plural: Roller
+label_role_new: Ny rolle
+label_role_and_permissions: Roller og tillatelser
+label_member: Medlem
+label_member_new: Nytt medlem
+label_member_plural: Medlemmer
+label_tracker: Sakstype
+label_tracker_plural: Sakstyper
+label_tracker_new: Ny sakstype
+label_workflow: Arbeidsflyt
+label_issue_status: Saksstatus
+label_issue_status_plural: Saksstatuser
+label_issue_status_new: Ny status
+label_issue_category: Sakskategori
+label_issue_category_plural: Sakskategorier
+label_issue_category_new: Ny kategori
+label_custom_field: Eget felt
+label_custom_field_plural: Egne felt
+label_custom_field_new: Nytt eget felt
+label_enumerations: Kodelister
+label_enumeration_new: Ny verdi
+label_information: Informasjon
+label_information_plural: Informasjon
+label_please_login: Vennlist logg inn
+label_register: Registrer
+label_password_lost: Mistet passord
+label_home: Hjem
+label_my_page: Min side
+label_my_account: Min konto
+label_my_projects: Mine prosjekter
+label_administration: Administrasjon
+label_login: Logg inn
+label_logout: Logg ut
+label_help: Hjelp
+label_reported_issues: Rapporterte saker
+label_assigned_to_me_issues: Saker tildelt meg 
+label_last_login: Sist innlogget
+label_last_updates: Sist oppdatert
+label_last_updates_plural: %d siste oppdaterte
+label_registered_on: Registrert
+label_activity: Aktivitet
+label_new: Ny
+label_logged_as: Innlogget som
+label_environment: Miljø
+label_authentication: Autentifikasjon
+label_auth_source: Autentifikasjonsmodus
+label_auth_source_new: Ny autentifikasjonmodus
+label_auth_source_plural: Autentifikasjonsmoduser
+label_subproject_plural: Underprosjekter
+label_min_max_length: Min.-maks. lengde
+label_list: Liste
+label_date: Dato
+label_integer: Heltall
+label_float: Kommatall
+label_boolean: Sann/usann
+label_string: Tekst
+label_text: Lang tekst
+label_attribute: Attributt
+label_attribute_plural: Attributter
+label_download: %d Nedlasting
+label_download_plural: %d Nedlastinger
+label_no_data: Ingen data å vise
+label_change_status: Endre status
+label_history: Historikk
+label_attachment: Fil
+label_attachment_new: Ny fil
+label_attachment_delete: Slett fil
+label_attachment_plural: Filer
+label_report: Rapport
+label_report_plural: Rapporter
+label_news: Nyheter
+label_news_new: Legg til nyhet
+label_news_plural: Nyheter
+label_news_latest: Siste nyheter
+label_news_view_all: Vis alle nyheter
+label_change_log: Endringslogg
+label_settings: Innstillinger
+label_overview: Oversikt
+label_version: Versjon
+label_version_new: Ny versjon
+label_version_plural: Versjoner
+label_confirmation: Bekreftelse
+label_export_to: Eksporter til
+label_read: Leser...
+label_public_projects: Offentlige prosjekt
+label_open_issues: åpen
+label_open_issues_plural: åpne
+label_closed_issues: lukket
+label_closed_issues_plural: lukkede
+label_total: Total
+label_permissions: Godkjenninger
+label_current_status: Nåværende status
+label_new_statuses_allowed: Nye statuser tillat
+label_all: alle
+label_none: ingen
+label_nobody: ingen
+label_next: Neste
+label_previous: Forrige
+label_used_by: Brukt av
+label_details: Detaljer
+label_add_note: Legg til notis
+label_per_page: Pr. side
+label_calendar: Kalender
+label_months_from: måneder fra
+label_gantt: Gantt
+label_internal: Intern
+label_last_changes: siste %d endringer
+label_change_view_all: Vis alle endringer
+label_personalize_page: Personaliser denne siden
+label_comment: Kommentar
+label_comment_plural: Kommentarer
+label_comment_add: Legg til kommentar
+label_comment_added: Kommentar lagt til
+label_comment_delete: Slett kommentar
+label_query: Egen spørring
+label_query_plural: Egne spørringer
+label_query_new: Ny spørring
+label_filter_add: Legg til filter
+label_filter_plural: Filtre
+label_equals: er
+label_not_equals: er ikke
+label_in_less_than: er mindre enn
+label_in_more_than: in mer enn
+label_in: i
+label_today: idag
+label_this_week: denne uken
+label_less_than_ago: mindre enn dager siden
+label_more_than_ago: mer enn dager siden
+label_ago: dager siden
+label_contains: inneholder
+label_not_contains: ikke inneholder
+label_day_plural: dager
+label_repository: Depot
+label_browse: Utforsk
+label_modification: %d endring
+label_modification_plural: %d endringer
+label_revision: Revisjon
+label_revision_plural: Revisjoner
+label_added: lagt til
+label_modified: endret
+label_deleted: slettet
+label_latest_revision: Siste revisjon
+label_latest_revision_plural: Siste revisjoner
+label_view_revisions: Vis revisjoner
+label_max_size: Maksimum størrelse
+label_on: 'av'
+label_sort_highest: Flytt til toppen
+label_sort_higher: Flytt opp
+label_sort_lower: Flytt ned
+label_sort_lowest: Flytt til bunnen
+label_roadmap: Veikart
+label_roadmap_due_in: Frist om
+label_roadmap_overdue: %s forsinket
+label_roadmap_no_issues: Ingen saker for denne versjonen
+label_search: Søk
+label_result_plural: Resultater
+label_all_words: Alle ord
+label_wiki: Wiki
+label_wiki_edit: Wiki endring
+label_wiki_edit_plural: Wiki endringer
+label_wiki_page: Wiki-side
+label_wiki_page_plural: Wiki-sider
+label_index_by_title: Indekser etter tittel
+label_index_by_date: Indekser etter dato
+label_current_version: Gjeldende versjon
+label_preview: Forhåndsvis
+label_feed_plural: Feeder
+label_changes_details: Detaljer om alle endringer
+label_issue_tracking: Sakssporing
+label_spent_time: Brukt tid
+label_f_hour: %.2f time
+label_f_hour_plural: %.2f timer
+label_time_tracking: Tidssporing
+label_change_plural: Endringer
+label_statistics: Statistikk
+label_commits_per_month: Innsendinger pr. måned
+label_commits_per_author: Innsendinger pr. forfatter
+label_view_diff: Vis forskjeller
+label_diff_inline: i teksten
+label_diff_side_by_side: side ved side
+label_options: Valg
+label_copy_workflow_from: Kopier arbeidsflyt fra
+label_permissions_report: Godkjenningsrapport
+label_watched_issues: Overvåkede saker
+label_related_issues: Relaterte saker
+label_applied_status: Gitt status
+label_loading: Laster...
+label_relation_new: Ny relasjon
+label_relation_delete: Slett relasjon
+label_relates_to: relatert til
+label_duplicates: duplikater
+label_blocks: blokkerer
+label_blocked_by: blokkert av
+label_precedes: kommer før
+label_follows: følger
+label_end_to_start: slutt til start
+label_end_to_end: slutt til slutt
+label_start_to_start: start til start
+label_start_to_end: start til slutt
+label_stay_logged_in: Logg meg inn automatisk
+label_disabled: avslått
+label_show_completed_versions: Vis ferdige versjoner
+label_me: meg
+label_board: Forum
+label_board_new: Nytt forum
+label_board_plural: Forumer
+label_topic_plural: Emner
+label_message_plural: Meldinger
+label_message_last: Siste melding
+label_message_new: Ny melding
+label_reply_plural: Svar
+label_send_information: Send kontoinformasjon til brukeren
+label_year: År
+label_month: Måned
+label_week: Uke
+label_date_from: Fra
+label_date_to: Til
+label_language_based: Basert på brukerens språk
+label_sort_by: Sorter etter %s
+label_send_test_email: Send en e-post-test
+label_feeds_access_key_created_on: RSS tilgangsnøkkel opprettet for %s siden
+label_module_plural: Moduler
+label_added_time_by: Lagt til av %s for %s siden
+label_updated_time: Oppdatert for %s siden
+label_jump_to_a_project: Gå til et prosjekt...
+label_file_plural: Filer
+label_changeset_plural: Endringssett
+label_default_columns: Standardkolonner
+label_no_change_option: (Ingen endring)
+label_bulk_edit_selected_issues: Samlet endring av valgte saker
+label_theme: Tema
+label_default: Standard
+label_search_titles_only: Søk bare i titler
+label_user_mail_option_all: "For alle hendelser på mine prosjekter"
+label_user_mail_option_selected: "For alle hendelser på valgte prosjekt..."
+label_user_mail_option_none: "Bare for ting jeg overvåker eller er involvert i"
+label_user_mail_no_self_notified: "Jeg vil ikke bli varslet om endringer jeg selv gjør"
+label_registration_activation_by_email: kontoaktivering pr. e-post
+label_registration_manual_activation: manuell kontoaktivering
+label_registration_automatic_activation: automatisk kontoaktivering
+
+button_login: Logg inn
+button_submit: Send
+button_save: Lagre
+button_check_all: Merk alle
+button_uncheck_all: Avmerk alle
+button_delete: Slett
+button_create: Opprett
+button_test: Test
+button_edit: Endre
+button_add: Legg til
+button_change: Endre
+button_apply: Bruk
+button_clear: Nullstill
+button_lock: Lås
+button_unlock: Lås opp
+button_download: Last ned
+button_list: Liste
+button_view: Vis
+button_move: Flytt
+button_back: Tilbake
+button_cancel: Avbryt
+button_activate: Aktiver
+button_sort: Sorter
+button_log_time: Logg tid
+button_rollback: Rull tilbake til denne versjonen
+button_watch: Overvåk
+button_unwatch: Stopp overvåkning
+button_reply: Svar
+button_archive: Arkiver
+button_unarchive: Gjør om arkivering
+button_reset: Nullstill
+button_rename: Endre navn
+button_change_password: Endre passord
+button_copy: Kopier
+button_annotate: Annotér
+
+status_active: aktiv
+status_registered: registrert
+status_locked: låst
+
+text_select_mail_notifications: Velg hendelser som skal varsles med e-post.
+text_regexp_info: eg. ^[A-Z0-9]+$
+text_min_max_length_info: 0 betyr ingen begrensning
+text_project_destroy_confirmation: Er du sikker på at du vil slette dette prosjekter og alle relatert data ?
+text_workflow_edit: Velg en rolle og en sakstype for å endre arbeidsflyten
+text_are_you_sure: Er du sikker ?
+text_journal_changed: endret fra %s til %s
+text_journal_set_to: satt til %s
+text_journal_deleted: slettet
+text_tip_task_begin_day: oppgaven starter denne dagen
+text_tip_task_end_day: oppgaven avsluttes denne dagen
+text_tip_task_begin_end_day: oppgaven starter og avsluttes denne dagen
+text_project_identifier_info: 'Små bokstaver (a-z), nummer og binde-/understrek tillat.<br />Identifikatoren kan ikke endres etter den er lagret.'
+text_caracters_maximum: %d tegn maksimum.
+text_caracters_minimum: Må være minst %d tegn lang.
+text_length_between: Lengde mellom %d og %d tegn.
+text_tracker_no_workflow: Ingen arbeidsflyt definert for denne sakstypen
+text_unallowed_characters: Ugyldige tegn
+text_comma_separated: Flere verdier tillat (kommaseparert).
+text_issues_ref_in_commit_messages: Refererer og retter saker i innsendingsmeldinger
+text_issue_added: Sak %s er rapportert.
+text_issue_updated: Sak %s er oppdatert.
+text_wiki_destroy_confirmation: Er du sikker på at du vil slette denne wikien og alt innholdet ?
+text_issue_category_destroy_question: Noen saker (%d) er lagt til i denne kategorien. Hva vil du gjøre ?
+text_issue_category_destroy_assignments: Fjern bruk av kategorier
+text_issue_category_reassign_to: Bruk kategorien på sakene på nytt
+text_user_mail_option: "For ikke-valgte prosjekter vil du bare motta varsling om ting du overvåker eller er involveret i (eks. saker du er forfatter av eller er tildelt)."
+
+default_role_manager: Leder
+default_role_developper: Utvikler
+default_role_reporter: Rapportør
+default_tracker_bug: Feil
+default_tracker_feature: Funksjon
+default_tracker_support: Support
+default_issue_status_new: Ny
+default_issue_status_assigned: Tildelt
+default_issue_status_resolved: Avklart
+default_issue_status_feedback: Tilbakemelding
+default_issue_status_closed: Lukket
+default_issue_status_rejected: Avvist
+default_doc_category_user: Bruker-dokumentasjon
+default_doc_category_tech: Teknisk dokumentasjon
+default_priority_low: Lav
+default_priority_normal: Normal
+default_priority_high: Høy
+default_priority_urgent: Haster
+default_priority_immediate: Omgående
+default_activity_design: Design
+default_activity_development: Utvikling
+
+enumeration_issue_priorities: Sakssprioriteringer
+enumeration_doc_categories: Dokument-kategorier
+enumeration_activities: Aktiviteter (tidssporing)
+
+text_status_changed_by_changeset: Applied in changeset %s.
+label_add_another_file: Add another file
+label_downloads_abbr: D/L
+label_this_month: this month
+label_chronological_order: In chronological order
+label_display_per_page: 'Per page: %s'
+label_issue_added: Issue added
+button_configure: Configure
+project_module_boards: Boards
+setting_activity_days_default: Days displayed on project activity
+project_module_issue_tracking: Issue tracking
+label_issue_updated: Issue updated
+text_destroy_time_entries_question: %.02f hours were reported on the issues you are about to delete. What do you want to do ?
+project_module_wiki: Wiki
+setting_per_page_options: Objects per page options
+label_last_n_days: last %d days
+label_all_time: all time
+notice_default_data_loaded: Default configuration successfully loaded.
+project_module_files: Files
+project_module_documents: Documents
+error_issue_not_found_in_project: 'The issue was not found or does not belong to this project'
+text_file_repository_writable: File repository writable
+label_this_year: this year
+error_scm_not_found: "The entry or revision was not found in the repository."
+text_assign_time_entries_to_project: Assign reported hours to the project
+project_module_repository: Repository
+label_associated_revisions: Associated revisions
+label_date_range: Date range
+label_document_added: Document added
+label_last_week: last week
+label_message_posted: Message added
+text_issues_destroy_confirmation: 'Are you sure you want to delete the selected issue(s) ?'
+error_scm_command_failed: "An error occurred when trying to access the repository: %s"
+label_ldap_authentication: LDAP authentication
+setting_default_projects_public: New projects are public by default
+project_module_news: News
+setting_user_format: Users display format
+setting_display_subprojects_issues: Display subprojects issues on main projects by default
+label_age: Age
+label_file_added: File added
+label_yesterday: yesterday
+label_optional_description: Optional description
+label_last_month: last month
+text_destroy_time_entries: Delete reported hours
+label_more: More
+field_default_value: Default value
+project_module_time_tracking: Time tracking
+label_scm: SCM
+label_general: General
+field_comments_sorting: Display comments
+button_update: Update
+error_scm_annotate: "The entry does not exist or can not be annotated."
+text_reassign_time_entries: 'Reassign reported hours to this issue:'
+text_default_administrator_account_changed: Default administrator account changed
+text_select_project_modules: 'Select modules to enable for this project:'
+label_reverse_chronological_order: In reverse chronological order
+label_preferences: Preferences
+label_plugins: Plugins
+label_change_properties: Change properties
+label_overall_activity: Overall activity
+text_load_default_configuration: Load the default configuration
+text_rmagick_available: RMagick available (optional)
+text_no_configuration_data: "Roles, trackers, issue statuses and workflow have not been configured yet.\nIt is highly recommended to load the default configuration. You will be able to modify it once loaded."
+label_news_added: News added
+label_repository_plural: Repositories
+error_can_t_load_default_data: "Default configuration could not be loaded: %s"
diff --git a/lang/pl.yml b/lang/pl.yml
index 377f1438c..f4cd9266b 100644
--- a/lang/pl.yml
+++ b/lang/pl.yml
@@ -607,12 +607,12 @@ error_issue_not_found_in_project: 'Zaganienie nie zostało znalezione lub nie na
 text_assign_time_entries_to_project: Przypisz logowany czas do projektu
 text_destroy_time_entries: Usuń zalogowany czas
 text_reassign_time_entries: 'Przepnij zalogowany czas do tego zagadnienia:'
-label_chronological_order: In chronological order
-setting_activity_days_default: Days displayed on project activity
-setting_display_subprojects_issues: Display subprojects issues on main projects by default
-field_comments_sorting: Display comments
-label_reverse_chronological_order: In reverse chronological order
-label_preferences: Preferences
-label_overall_activity: Overall activity
-setting_default_projects_public: New projects are public by default
-error_scm_annotate: "The entry does not exist or can not be annotated."
+label_chronological_order: W kolejności chronologicznej
+setting_activity_days_default: Dni wyświetlane w aktywności projektu
+setting_display_subprojects_issues: Domyślnie pokazuj zagadnienia podprojektów w głównym projekcie
+field_comments_sorting: Pokazuj komentarze
+label_reverse_chronological_order: W kolejności odwrotnej do chronologicznej
+label_preferences: Preferencje
+label_overall_activity: Ogólna aktywność
+setting_default_projects_public: Nowe projekty są domyślnie publiczne
+error_scm_annotate: "Wpis nie istnieje lub nie można do niego dodawać adnotacji."
diff --git a/lang/ru.yml b/lang/ru.yml
index 4ba184828..fbdf4aaf4 100644
--- a/lang/ru.yml
+++ b/lang/ru.yml
@@ -127,7 +127,7 @@ field_subject: Тема
 field_due_date: Дата выполнения
 field_assigned_to: Назначена
 field_priority: Приоритет
-field_fixed_version: Target version
+field_fixed_version: Версия
 field_user: Пользователь
 field_role: Роль
 field_homepage: Стартовая страница
@@ -316,9 +316,9 @@ label_total: Всего
 label_permissions: Права доступа
 label_current_status: Текущий статус
 label_new_statuses_allowed: Разрешены новые статусы
-label_all: Все
-label_none: Никому
-label_nobody: Никто
+label_all: все
+label_none: отсутствует 
+label_nobody: никто
 label_next: Следующий
 label_previous: Предыдущий
 label_used_by: Используется
@@ -342,8 +342,8 @@ label_query_plural: Запросы клиентов
 label_query_new: Новый запрос
 label_filter_add: Добавить фильтр
 label_filter_plural: Фильтры
-label_equals: есть
-label_not_equals: нет
+label_equals: является
+label_not_equals: не является
 label_in_less_than: Менее чем
 label_in_more_than: более чем
 label_in: в
@@ -611,12 +611,12 @@ error_issue_not_found_in_project: Задача не была найдена ил
 text_assign_time_entries_to_project: Прикрепить зарегистрированное время к проекту
 text_destroy_time_entries: Удалить зарегистрированное время
 text_reassign_time_entries: 'Перенести зарегистрированное время на следующую задачу:'
-setting_activity_days_default: Days displayed on project activity
-label_chronological_order: In chronological order
-field_comments_sorting: Display comments
-label_reverse_chronological_order: In reverse chronological order
-label_preferences: Preferences
-setting_display_subprojects_issues: Display subprojects issues on main projects by default
-label_overall_activity: Overall activity
-setting_default_projects_public: New projects are public by default
+setting_activity_days_default: Кол-во дней, отображаемых в Активности
+label_chronological_order: В хронологическом порядке 
+field_comments_sorting: Отображение комментариев
+label_reverse_chronological_order: В обратном порядке
+label_preferences: Предпочтения
+setting_display_subprojects_issues: Отображение подпроектов по умолчанию
+label_overall_activity: Сводная активность
+setting_default_projects_public: Новые проекты являются публичными
 error_scm_annotate: "The entry does not exist or can not be annotated."
diff --git a/public/javascripts/calendar/lang/calendar-no.js b/public/javascripts/calendar/lang/calendar-no.js
new file mode 100644
index 000000000..f6b7f3eca
--- /dev/null
+++ b/public/javascripts/calendar/lang/calendar-no.js
@@ -0,0 +1,86 @@
+// ** I18N
+
+// Calendar NO language (Norwegian/Norsk bokmål)
+// Author: Kai Olav Fredriksen <k@i.fredriksen.net>
+
+// full day names
+Calendar._DN = new Array
+("Søndag",
+ "Mandag",
+ "Tirsdag",
+ "Onsdag",
+ "Torsdag",
+ "Fredag",
+ "Lørdag",
+ "Søndag");
+
+Calendar._SDN_len = 3; // short day name length
+Calendar._SMN_len = 3; // short month name length
+
+// First day of the week. "0" means display Sunday first, "1" means display
+// Monday first, etc.
+Calendar._FD = 1;
+
+// full month names
+Calendar._MN = new Array
+("Januar",
+ "Februar",
+ "Mars",
+ "April",
+ "Mai",
+ "Juni",
+ "Juli",
+ "August",
+ "September",
+ "Oktober",
+ "November",
+ "Desember");
+
+// tooltips
+Calendar._TT = {};
+Calendar._TT["INFO"] = "Om kalenderen";
+
+Calendar._TT["ABOUT"] =
+"DHTML Date/Time Selector\n" +
+"(c) dynarch.com 2002-2005 / Author: Mihai Bazon\n" + // don't translate this this ;-)
+"For latest version visit: http://www.dynarch.com/projects/calendar/\n" +
+"Distributed under GNU LGPL.  See http://gnu.org/licenses/lgpl.html for details." +
+"\n\n" +
+"Date selection:\n" +
+"- Use the \xab, \xbb buttons to select year\n" +
+"- Use the " + String.fromCharCode(0x2039) + ", " + String.fromCharCode(0x203a) + " buttons to select month\n" +
+"- Hold mouse button on any of the above buttons for faster selection.";
+Calendar._TT["ABOUT_TIME"] = "\n\n" +
+"Time selection:\n" +
+"- Click on any of the time parts to increase it\n" +
+"- or Shift-click to decrease it\n" +
+"- or click and drag for faster selection.";
+
+Calendar._TT["PREV_YEAR"] = "Forrige år (hold for meny)";
+Calendar._TT["PREV_MONTH"] = "Forrige måned (hold for meny)";
+Calendar._TT["GO_TODAY"] = "Gå til idag";
+Calendar._TT["NEXT_MONTH"] = "Neste måned (hold for meny)";
+Calendar._TT["NEXT_YEAR"] = "Neste år (hold for meny)";
+Calendar._TT["SEL_DATE"] = "Velg dato";
+Calendar._TT["DRAG_TO_MOVE"] = "Dra for å flytte";
+Calendar._TT["PART_TODAY"] = " (idag)";
+
+// the following is to inform that "%s" is to be the first day of week
+// %s will be replaced with the day name.
+Calendar._TT["DAY_FIRST"] = "Vis %s først";
+
+// This may be locale-dependent.  It specifies the week-end days, as an array
+// of comma-separated numbers.  The numbers are from 0 to 6: 0 means Sunday, 1
+// means Monday, etc.
+Calendar._TT["WEEKEND"] = "6,0";
+
+Calendar._TT["CLOSE"] = "Lukk";
+Calendar._TT["TODAY"] = "Idag";
+Calendar._TT["TIME_PART"] = "(Shift-)Klikk eller dra for å endre verdi";
+
+// date formats
+Calendar._TT["DEF_DATE_FORMAT"] = "%%d.%m.%Y";
+Calendar._TT["TT_DATE_FORMAT"] = "%a, %b %e";
+
+Calendar._TT["WK"] = "uke";
+Calendar._TT["TIME"] = "Tid:";
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-no.js b/public/javascripts/jstoolbar/lang/jstoolbar-no.js
new file mode 100644
index 000000000..cd36a4b55
--- /dev/null
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-no.js
@@ -0,0 +1,14 @@
+jsToolBar.strings = {};
+jsToolBar.strings['Strong'] = 'Strong';
+jsToolBar.strings['Italic'] = 'Italic';
+jsToolBar.strings['Underline'] = 'Underline';
+jsToolBar.strings['Deleted'] = 'Deleted';
+jsToolBar.strings['Code'] = 'Inline Code';
+jsToolBar.strings['Heading 1'] = 'Heading 1';
+jsToolBar.strings['Heading 2'] = 'Heading 2';
+jsToolBar.strings['Heading 3'] = 'Heading 3';
+jsToolBar.strings['Unordered list'] = 'Unordered list';
+jsToolBar.strings['Ordered list'] = 'Ordered list';
+jsToolBar.strings['Preformatted text'] = 'Preformatted text';
+jsToolBar.strings['Wiki link'] = 'Link to a Wiki page';
+jsToolBar.strings['Image'] = 'Image';

From 6936eb10222c95b15b9303c5c1089b30ef78c0f3 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 23 Mar 2008 09:04:21 +0000
Subject: [PATCH 331/710] Make 'Planning' string translatable (closes #890).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1290 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/projects/show.rhtml | 2 +-
 lang/bg.yml                   | 1 +
 lang/cs.yml                   | 1 +
 lang/da.yml                   | 1 +
 lang/de.yml                   | 1 +
 lang/en.yml                   | 1 +
 lang/es.yml                   | 1 +
 lang/fi.yml                   | 1 +
 lang/fr.yml                   | 1 +
 lang/he.yml                   | 1 +
 lang/it.yml                   | 1 +
 lang/ja.yml                   | 1 +
 lang/ko.yml                   | 1 +
 lang/lt.yml                   | 1 +
 lang/nl.yml                   | 1 +
 lang/no.yml                   | 1 +
 lang/pl.yml                   | 1 +
 lang/pt-br.yml                | 1 +
 lang/pt.yml                   | 1 +
 lang/ro.yml                   | 1 +
 lang/ru.yml                   | 1 +
 lang/sr.yml                   | 1 +
 lang/sv.yml                   | 1 +
 lang/uk.yml                   | 1 +
 lang/zh-tw.yml                | 1 +
 lang/zh.yml                   | 1 +
 26 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/app/views/projects/show.rhtml b/app/views/projects/show.rhtml
index eb80bf9fa..62b911937 100644
--- a/app/views/projects/show.rhtml
+++ b/app/views/projects/show.rhtml
@@ -61,7 +61,7 @@
       planning_links << link_to_if_authorized(l(:label_gantt), :action => 'gantt', :id => @project)
       planning_links.compact!
       unless planning_links.empty? %>
-    <h3>Planning</h3>
+    <h3><%= l(:label_planning) %></h3>
     <p><%= planning_links.join(' | ') %></p>
     <% end %>
     
diff --git a/lang/bg.yml b/lang/bg.yml
index 70d5d7b20..a49365d20 100644
--- a/lang/bg.yml
+++ b/lang/bg.yml
@@ -616,3 +616,4 @@ setting_display_subprojects_issues: Display subprojects issues on main projects
 label_overall_activity: Overall activity
 setting_default_projects_public: New projects are public by default
 error_scm_annotate: "The entry does not exist or can not be annotated."
+label_planning: Planning
diff --git a/lang/cs.yml b/lang/cs.yml
index 088603335..03702eaa2 100644
--- a/lang/cs.yml
+++ b/lang/cs.yml
@@ -621,3 +621,4 @@ enumeration_issue_priorities: Priority úkolů
 enumeration_doc_categories: Kategorie dokumentů
 enumeration_activities: Aktivity (sledování času)
 error_scm_annotate: "The entry does not exist or can not be annotated."
+label_planning: Planning
diff --git a/lang/da.yml b/lang/da.yml
index 8d70087b1..939ee5f5c 100644
--- a/lang/da.yml
+++ b/lang/da.yml
@@ -618,3 +618,4 @@ label_preferences: Preferences
 label_overall_activity: Overall activity
 setting_default_projects_public: New projects are public by default
 error_scm_annotate: "The entry does not exist or can not be annotated."
+label_planning: Planning
diff --git a/lang/de.yml b/lang/de.yml
index e9edbf8cc..f8c747cac 100644
--- a/lang/de.yml
+++ b/lang/de.yml
@@ -617,3 +617,4 @@ setting_display_subprojects_issues: Display subprojects issues on main projects
 label_overall_activity: Overall activity
 setting_default_projects_public: New projects are public by default
 error_scm_annotate: "The entry does not exist or can not be annotated."
+label_planning: Planning
diff --git a/lang/en.yml b/lang/en.yml
index a37207e74..41e2eaceb 100644
--- a/lang/en.yml
+++ b/lang/en.yml
@@ -509,6 +509,7 @@ label_add_another_file: Add another file
 label_preferences: Preferences
 label_chronological_order: In chronological order
 label_reverse_chronological_order: In reverse chronological order
+label_planning: Planning
 
 button_login: Login
 button_submit: Submit
diff --git a/lang/es.yml b/lang/es.yml
index 8db240dfd..5d5492833 100644
--- a/lang/es.yml
+++ b/lang/es.yml
@@ -619,3 +619,4 @@ setting_display_subprojects_issues: Display subprojects issues on main projects
 label_overall_activity: Overall activity
 setting_default_projects_public: New projects are public by default
 error_scm_annotate: "The entry does not exist or can not be annotated."
+label_planning: Planning
diff --git a/lang/fi.yml b/lang/fi.yml
index e71ee74d4..f345be139 100644
--- a/lang/fi.yml
+++ b/lang/fi.yml
@@ -616,3 +616,4 @@ label_preferences: Asetukset
 setting_default_projects_public: Uudet projektit ovat oletuksena julkisia
 label_overall_activity: Kokonaisaktiviteetti
 error_scm_annotate: "The entry does not exist or can not be annotated."
+label_planning: Planning
diff --git a/lang/fr.yml b/lang/fr.yml
index 2ecafdcc5..602b3c8e1 100644
--- a/lang/fr.yml
+++ b/lang/fr.yml
@@ -509,6 +509,7 @@ label_add_another_file: Ajouter un autre fichier
 label_preferences: Préférences
 label_chronological_order: Dans l'ordre chronologique
 label_reverse_chronological_order: Dans l'ordre chronologique inverse
+label_planning: Planning
 
 button_login: Connexion
 button_submit: Soumettre
diff --git a/lang/he.yml b/lang/he.yml
index e4b0cb41f..018281581 100644
--- a/lang/he.yml
+++ b/lang/he.yml
@@ -616,3 +616,4 @@ setting_display_subprojects_issues: Display subprojects issues on main projects
 label_overall_activity: Overall activity
 setting_default_projects_public: New projects are public by default
 error_scm_annotate: "The entry does not exist or can not be annotated."
+label_planning: Planning
diff --git a/lang/it.yml b/lang/it.yml
index 5d6e5f365..7e9345b30 100644
--- a/lang/it.yml
+++ b/lang/it.yml
@@ -616,3 +616,4 @@ setting_display_subprojects_issues: Display subprojects issues on main projects
 label_overall_activity: Overall activity
 setting_default_projects_public: New projects are public by default
 error_scm_annotate: "The entry does not exist or can not be annotated."
+label_planning: Planning
diff --git a/lang/ja.yml b/lang/ja.yml
index 7e39db695..64b858ccb 100644
--- a/lang/ja.yml
+++ b/lang/ja.yml
@@ -617,3 +617,4 @@ setting_display_subprojects_issues: Display subprojects issues on main projects
 label_overall_activity: Overall activity
 setting_default_projects_public: New projects are public by default
 error_scm_annotate: "The entry does not exist or can not be annotated."
+label_planning: Planning
diff --git a/lang/ko.yml b/lang/ko.yml
index 28db1d000..a8b105855 100644
--- a/lang/ko.yml
+++ b/lang/ko.yml
@@ -616,3 +616,4 @@ setting_display_subprojects_issues: Display subprojects issues on main projects
 label_overall_activity: Overall activity
 setting_default_projects_public: New projects are public by default
 error_scm_annotate: "The entry does not exist or can not be annotated."
+label_planning: Planning
diff --git a/lang/lt.yml b/lang/lt.yml
index 97210ad1c..5db73d300 100644
--- a/lang/lt.yml
+++ b/lang/lt.yml
@@ -617,3 +617,4 @@ setting_display_subprojects_issues: Display subprojects issues on main projects
 label_overall_activity: Overall activity
 setting_default_projects_public: New projects are public by default
 error_scm_annotate: "The entry does not exist or can not be annotated."
+label_planning: Planning
diff --git a/lang/nl.yml b/lang/nl.yml
index 2c92dd30c..6494eae07 100644
--- a/lang/nl.yml
+++ b/lang/nl.yml
@@ -617,3 +617,4 @@ setting_display_subprojects_issues: Display subprojects issues on main projects
 label_overall_activity: Overall activity
 setting_default_projects_public: New projects are public by default
 error_scm_annotate: "The entry does not exist or can not be annotated."
+label_planning: Planning
diff --git a/lang/no.yml b/lang/no.yml
index 0cdf8369f..497c4a147 100644
--- a/lang/no.yml
+++ b/lang/no.yml
@@ -617,3 +617,4 @@ text_no_configuration_data: "Roles, trackers, issue statuses and workflow have n
 label_news_added: News added
 label_repository_plural: Repositories
 error_can_t_load_default_data: "Default configuration could not be loaded: %s"
+label_planning: Planning
diff --git a/lang/pl.yml b/lang/pl.yml
index f4cd9266b..fdb8afaa2 100644
--- a/lang/pl.yml
+++ b/lang/pl.yml
@@ -616,3 +616,4 @@ label_preferences: Preferencje
 label_overall_activity: Ogólna aktywność
 setting_default_projects_public: Nowe projekty są domyślnie publiczne
 error_scm_annotate: "Wpis nie istnieje lub nie można do niego dodawać adnotacji."
+label_planning: Planning
diff --git a/lang/pt-br.yml b/lang/pt-br.yml
index 898431ff3..218cbab51 100644
--- a/lang/pt-br.yml
+++ b/lang/pt-br.yml
@@ -616,3 +616,4 @@ setting_display_subprojects_issues: Display subprojects issues on main projects
 label_overall_activity: Overall activity
 setting_default_projects_public: New projects are public by default
 error_scm_annotate: "The entry does not exist or can not be annotated."
+label_planning: Planning
diff --git a/lang/pt.yml b/lang/pt.yml
index 99a60f350..e82176c56 100644
--- a/lang/pt.yml
+++ b/lang/pt.yml
@@ -616,3 +616,4 @@ setting_display_subprojects_issues: Display subprojects issues on main projects
 label_overall_activity: Overall activity
 setting_default_projects_public: New projects are public by default
 error_scm_annotate: "The entry does not exist or can not be annotated."
+label_planning: Planning
diff --git a/lang/ro.yml b/lang/ro.yml
index 55e8ec372..4d26ab103 100644
--- a/lang/ro.yml
+++ b/lang/ro.yml
@@ -616,3 +616,4 @@ setting_display_subprojects_issues: Display subprojects issues on main projects
 label_overall_activity: Overall activity
 setting_default_projects_public: New projects are public by default
 error_scm_annotate: "The entry does not exist or can not be annotated."
+label_planning: Planning
diff --git a/lang/ru.yml b/lang/ru.yml
index fbdf4aaf4..e488c35e1 100644
--- a/lang/ru.yml
+++ b/lang/ru.yml
@@ -620,3 +620,4 @@ setting_display_subprojects_issues: Отображение подпроекто
 label_overall_activity: Сводная активность
 setting_default_projects_public: Новые проекты являются публичными
 error_scm_annotate: "The entry does not exist or can not be annotated."
+label_planning: Planning
diff --git a/lang/sr.yml b/lang/sr.yml
index 9eaacb4dd..fa4ecd8de 100644
--- a/lang/sr.yml
+++ b/lang/sr.yml
@@ -617,3 +617,4 @@ setting_display_subprojects_issues: Display subprojects issues on main projects
 label_overall_activity: Overall activity
 setting_default_projects_public: New projects are public by default
 error_scm_annotate: "The entry does not exist or can not be annotated."
+label_planning: Planning
diff --git a/lang/sv.yml b/lang/sv.yml
index 67a8c55e2..e1ac6b4bc 100644
--- a/lang/sv.yml
+++ b/lang/sv.yml
@@ -617,3 +617,4 @@ setting_display_subprojects_issues: Display subprojects issues on main projects
 label_overall_activity: Overall activity
 setting_default_projects_public: New projects are public by default
 error_scm_annotate: "The entry does not exist or can not be annotated."
+label_planning: Planning
diff --git a/lang/uk.yml b/lang/uk.yml
index be6b57d04..8fc418e67 100644
--- a/lang/uk.yml
+++ b/lang/uk.yml
@@ -618,3 +618,4 @@ setting_display_subprojects_issues: Display subprojects issues on main projects
 label_overall_activity: Overall activity
 setting_default_projects_public: New projects are public by default
 error_scm_annotate: "The entry does not exist or can not be annotated."
+label_planning: Planning
diff --git a/lang/zh-tw.yml b/lang/zh-tw.yml
index 3514f4c49..e018f24bb 100644
--- a/lang/zh-tw.yml
+++ b/lang/zh-tw.yml
@@ -617,3 +617,4 @@ enumeration_issue_priorities: 項目優先權
 enumeration_doc_categories: 文件分類
 enumeration_activities: 活動 (時間追蹤)
 error_scm_annotate: "The entry does not exist or can not be annotated."
+label_planning: Planning
diff --git a/lang/zh.yml b/lang/zh.yml
index 48f6fc695..6ebcb9588 100644
--- a/lang/zh.yml
+++ b/lang/zh.yml
@@ -617,3 +617,4 @@ enumeration_doc_categories: 文档类别
 enumeration_activities: 活动（时间跟踪）
 setting_default_projects_public: New projects are public by default
 error_scm_annotate: "The entry does not exist or can not be annotated."
+label_planning: Planning

From 051875429eee26c964208c683ad1f131f6a8c054 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 23 Mar 2008 16:16:55 +0000
Subject: [PATCH 332/710] Fixed: 'This week' condition in filter consider
 monday as the first day of the week even if language sets otherwise (closes
 #913).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1291 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/models/query.rb | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/models/query.rb b/app/models/query.rb
index 2b708ddda..99d13aa6a 100644
--- a/app/models/query.rb
+++ b/app/models/query.rb
@@ -339,7 +339,12 @@ class Query < ActiveRecord::Base
       when "t"
         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 "w"
-        sql = sql + "#{db_table}.#{db_field} BETWEEN '%s' AND '%s'" % [connection.quoted_date(Time.now.at_beginning_of_week), connection.quoted_date(Time.now.next_week.yesterday)]
+        from = l(:general_first_day_of_week) == '7' ?
+          # week starts on sunday
+          ((Date.today.cwday == 7) ? Time.now.at_beginning_of_day : Time.now.at_beginning_of_week - 1.day) :
+          # week starts on monday (Rails default)
+          Time.now.at_beginning_of_week
+        sql = sql + "#{db_table}.#{db_field} BETWEEN '%s' AND '%s'" % [connection.quoted_date(from), connection.quoted_date(from + 7.days)]
       when "~"
         sql = sql + "#{db_table}.#{db_field} LIKE '%#{connection.quote_string(v.first)}%'"
       when "!~"

From 1c49bd4258422bed77cb86ef97a868e8cbb6f12b Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Wed, 26 Mar 2008 18:08:24 +0000
Subject: [PATCH 333/710] Add the description field to the issue csv export
 (#753).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1292 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/helpers/issues_helper.rb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/helpers/issues_helper.rb b/app/helpers/issues_helper.rb
index e5a557f31..17889fadd 100644
--- a/app/helpers/issues_helper.rb
+++ b/app/helpers/issues_helper.rb
@@ -131,6 +131,8 @@ module IssuesHelper
       # otherwise export custom fields marked as "For all projects"
       custom_fields = project.nil? ? IssueCustomField.for_all : project.all_custom_fields
       custom_fields.each {|f| headers << f.name}
+      # Description in the last column
+      headers << l(:field_description)
       csv << headers.collect {|c| begin; ic.iconv(c.to_s); rescue; c.to_s; end }
       # csv lines
       issues.each do |issue|
@@ -152,6 +154,7 @@ module IssuesHelper
                   format_time(issue.updated_on)
                   ]
         custom_fields.each {|f| fields << show_value(issue.custom_value_for(f)) }
+        fields << issue.description
         csv << fields.collect {|c| begin; ic.iconv(c.to_s); rescue; c.to_s; end }
       end
     end

From 805864590a4988ae457b0e5d4196f11065abdb9b Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Wed, 26 Mar 2008 18:49:12 +0000
Subject: [PATCH 334/710] Do not use javascript to hide tabs content on page
 loading and make tabs work with javascript disabled.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1293 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/helpers/custom_fields_helper.rb |  7 +++++++
 app/views/custom_fields/list.rhtml  | 27 +++++++++++++++------------
 app/views/projects/settings.rhtml   | 24 +++++++++++++++---------
 app/views/settings/edit.rhtml       | 27 ++++++++++++++++-----------
 4 files changed, 53 insertions(+), 32 deletions(-)

diff --git a/app/helpers/custom_fields_helper.rb b/app/helpers/custom_fields_helper.rb
index 8792c8c6e..61c8d6b36 100644
--- a/app/helpers/custom_fields_helper.rb
+++ b/app/helpers/custom_fields_helper.rb
@@ -17,6 +17,13 @@
 
 module CustomFieldsHelper
 
+  def custom_fields_tabs
+    tabs = [{:name => 'IssueCustomField', :label => :label_issue_plural},
+            {:name => 'ProjectCustomField', :label => :label_project_plural},
+            {:name => 'UserCustomField', :label => :label_user_plural}
+            ]
+  end
+  
   # Return custom field html tag corresponding to its format
   def custom_field_tag(custom_value)	
     custom_field = custom_value.custom_field
diff --git a/app/views/custom_fields/list.rhtml b/app/views/custom_fields/list.rhtml
index 4fd381a17..43ddd99c8 100644
--- a/app/views/custom_fields/list.rhtml
+++ b/app/views/custom_fields/list.rhtml
@@ -1,21 +1,26 @@
 <h2><%=l(:label_custom_field_plural)%></h2>
 
+<% selected_tab = params[:tab] ? params[:tab].to_s : custom_fields_tabs.first[:name] %>
+
 <div class="tabs">
 <ul>
-<li><%= link_to l(:label_issue_plural), {}, :id=> "tab-IssueCustomField", :onclick => "showTab('IssueCustomField'); this.blur(); return false;" %></li>
-<li><%= link_to l(:label_project_plural), {}, :id=> "tab-ProjectCustomField", :onclick => "showTab('ProjectCustomField'); this.blur(); return false;" %></li>
-<li><%= link_to l(:label_user_plural), {}, :id=> "tab-UserCustomField", :onclick => "showTab('UserCustomField'); this.blur(); return false;" %></li>
+<% custom_fields_tabs.each do |tab| -%>
+    <li><%= link_to l(tab[:label]), { :tab => tab[:name] },
+                                    :id => "tab-#{tab[:name]}",
+                                    :class => (tab[:name] != selected_tab ? nil : 'selected'),
+                                    :onclick => "showTab('#{tab[:name]}'); this.blur(); return false;" %></li>
+<% end -%>
 </ul>
 </div>
 
-<% %w(IssueCustomField ProjectCustomField UserCustomField).each do |type| %>
-<div id="tab-content-<%= type %>" class="tab-content">
+<% custom_fields_tabs.each do |tab| %>
+<div id="tab-content-<%= tab[:name] %>" class="tab-content" style="<%= tab[:name] != selected_tab ? 'display:none' : nil %>">
 <table class="list">		
   <thead><tr>	
 	<th width="30%"><%=l(:field_name)%></th>
 	<th><%=l(:field_field_format)%></th>
 	<th><%=l(:field_is_required)%></th>
-	<% if type == 'IssueCustomField' %>
+	<% if tab[:name] == 'IssueCustomField' %>
 	<th><%=l(:field_is_for_all)%></th>
 	<th><%=l(:label_used_by)%></th>
 	<% end %>
@@ -23,12 +28,12 @@
 	<th width="10%"></th>
   </tr></thead>
   <tbody>
-<% for custom_field in (@custom_fields_by_type[type] || []).sort %>
+<% (@custom_fields_by_type[tab[:name]] || []).sort.each do |custom_field| -%>
   <tr class="<%= cycle("odd", "even") %>">
 	<td><%= link_to custom_field.name, :action => 'edit', :id => custom_field %></td>
 	<td align="center"><%= l(CustomField::FIELD_FORMATS[custom_field.field_format][:name]) %></td>
 	<td align="center"><%= image_tag 'true.png' if custom_field.is_required? %></td>
-	<% if type == 'IssueCustomField' %>
+	<% if tab[:name] == 'IssueCustomField' %>
 	<td align="center"><%= image_tag 'true.png' if custom_field.is_for_all? %></td>
 	<td align="center"><%= custom_field.projects.count.to_s + ' ' + lwr(:label_project, custom_field.projects.count) if custom_field.is_a? IssueCustomField and !custom_field.is_for_all? %></td>
 	<% end %>
@@ -45,11 +50,9 @@
 <% end; reset_cycle %>
   </tbody>
 </table>
-<br />
-<%= link_to l(:label_custom_field_new), {:action => 'new', :type => type}, :class => 'icon icon-add' %>
+
+<p><%= link_to l(:label_custom_field_new), {:action => 'new', :type => tab[:name]}, :class => 'icon icon-add' %></p>
 </div>
 <% end %>
 
-<%= javascript_tag "showTab('#{@tab}');" %>
-
 <% html_title(l(:label_custom_field_plural)) -%>
diff --git a/app/views/projects/settings.rhtml b/app/views/projects/settings.rhtml
index 5516623a3..c7b0f5006 100644
--- a/app/views/projects/settings.rhtml
+++ b/app/views/projects/settings.rhtml
@@ -1,18 +1,24 @@
 <h2><%=l(:label_settings)%></h2>
 
+<% tabs = project_settings_tabs %>
+<% selected_tab = params[:tab] ? params[:tab].to_s : tabs.first[:name] %>
+
 <div class="tabs">
 <ul>
-<% project_settings_tabs.each do |tab| %>
-  <li><%= link_to l(tab[:label]), {}, :id => "tab-#{tab[:name]}", :onclick => "showTab('#{tab[:name]}'); this.blur(); return false;" %></li>
-<% end %>
+<% tabs.each do |tab| -%>
+    <li><%= link_to l(tab[:label]), { :tab => tab[:name] },
+                                    :id => "tab-#{tab[:name]}",
+                                    :class => (tab[:name] != selected_tab ? nil : 'selected'),
+                                    :onclick => "showTab('#{tab[:name]}'); this.blur(); return false;" %></li>
+<% end -%>
 </ul>
 </div>
 
-<% project_settings_tabs.each do |tab| %>
-<%= content_tag('div', render(:partial => tab[:partial]), :id => "tab-content-#{tab[:name]}", :class => 'tab-content') %>
-<% end %>
-
-<%= tab = params[:tab] ? h(params[:tab]) : project_settings_tabs.first[:name]
-javascript_tag "showTab('#{tab}');" %>
+<% tabs.each do |tab| -%>
+<%= content_tag('div', render(:partial => tab[:partial]), 
+                       :id => "tab-content-#{tab[:name]}",
+                       :style => (tab[:name] != selected_tab ? 'display:none' : nil),
+                       :class => 'tab-content') %>
+<% end -%>
 
 <% html_title(l(:label_settings)) -%>
diff --git a/app/views/settings/edit.rhtml b/app/views/settings/edit.rhtml
index c7b47b6d0..c99a13960 100644
--- a/app/views/settings/edit.rhtml
+++ b/app/views/settings/edit.rhtml
@@ -1,18 +1,23 @@
 <h2><%= l(:label_settings) %></h2>
 
+<% selected_tab = params[:tab] ? params[:tab].to_s : administration_settings_tabs.first[:name] %>
+
 <div class="tabs">
-    <ul>
-    <% administration_settings_tabs.each do |tab| -%>
-        <li><%= link_to l(tab[:label]), {}, :id => "tab-#{tab[:name]}", :onclick => "showTab('#{tab[:name]}'); this.blur(); return false;" %></li>
-    <% end -%>
-    </ul>
+<ul>
+<% administration_settings_tabs.each do |tab| -%>
+    <li><%= link_to l(tab[:label]), { :tab => tab[:name] },
+                                    :id => "tab-#{tab[:name]}",
+                                    :class => (tab[:name] != selected_tab ? nil : 'selected'),
+                                    :onclick => "showTab('#{tab[:name]}'); this.blur(); return false;" %></li>
+<% end -%>
+</ul>
 </div>
 
-<% administration_settings_tabs.each do |tab| %>
-    <%= content_tag('div', render(:partial => tab[:partial]), :id => "tab-content-#{tab[:name]}", :class => 'tab-content') %>
-<% end %>
-
-<%= tab = params[:tab] ? h(params[:tab]) : administration_settings_tabs.first[:name]
-javascript_tag "showTab('#{tab}');" %>
+<% administration_settings_tabs.each do |tab| -%>
+<%= content_tag('div', render(:partial => tab[:partial]), 
+                       :id => "tab-content-#{tab[:name]}",
+                       :style => (tab[:name] != selected_tab ? 'display:none' : nil),
+                       :class => 'tab-content') %>
+<% end -%>
 
 <% html_title(l(:label_settings), l(:label_administration)) -%>

From d37a30846f2c8a25645151df81900d19edd268a2 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Wed, 26 Mar 2008 22:22:45 +0000
Subject: [PATCH 335/710] Fixed: when bulk editing, setting "Assigned to" to
 "nobody" causes an sql error with Postgresql (#935).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1294 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/issues_controller.rb      | 10 +++++-----
 app/views/issues/bulk_edit.rhtml          |  8 ++++++--
 test/functional/issues_controller_test.rb | 10 ++++++++++
 3 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index 04ff51ce9..dbc3161d7 100644
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -206,17 +206,17 @@ class IssuesController < ApplicationController
     if request.post?
       status = params[:status_id].blank? ? nil : IssueStatus.find_by_id(params[:status_id])
       priority = params[:priority_id].blank? ? nil : Enumeration.find_by_id(params[:priority_id])
-      assigned_to = params[:assigned_to_id].blank? ? nil : User.find_by_id(params[:assigned_to_id])
-      category = params[:category_id].blank? ? nil : @project.issue_categories.find_by_id(params[:category_id])
-      fixed_version = params[:fixed_version_id].blank? ? nil : @project.versions.find_by_id(params[:fixed_version_id])
+      assigned_to = (params[:assigned_to_id].blank? || params[:assigned_to_id] == 'none') ? nil : User.find_by_id(params[:assigned_to_id])
+      category = (params[:category_id].blank? || params[:category_id] == 'none') ? nil : @project.issue_categories.find_by_id(params[:category_id])
+      fixed_version = (params[:fixed_version_id].blank? || params[:fixed_version_id] == 'none') ? nil : @project.versions.find_by_id(params[:fixed_version_id])
       
       unsaved_issue_ids = []      
       @issues.each do |issue|
         journal = issue.init_journal(User.current, params[:notes])
         issue.priority = priority if priority
         issue.assigned_to = assigned_to if assigned_to || params[:assigned_to_id] == 'none'
-        issue.category = category if category
-        issue.fixed_version = fixed_version if fixed_version
+        issue.category = category if category || params[:category_id] == 'none'
+        issue.fixed_version = fixed_version if fixed_version || params[:fixed_version_id] == 'none'
         issue.start_date = params[:start_date] unless params[:start_date].blank?
         issue.due_date = params[:due_date] unless params[:due_date].blank?
         issue.done_ratio = params[:done_ratio] unless params[:done_ratio].blank?
diff --git a/app/views/issues/bulk_edit.rhtml b/app/views/issues/bulk_edit.rhtml
index e3f09befa..31ed7ee56 100644
--- a/app/views/issues/bulk_edit.rhtml
+++ b/app/views/issues/bulk_edit.rhtml
@@ -15,7 +15,9 @@
 <label><%= l(:field_priority) %>: 
 <%= select_tag('priority_id', "<option value=\"\">#{l(:label_no_change_option)}</option>" + options_from_collection_for_select(Enumeration.get_values('IPRI'), :id, :name)) %></label>
 <label><%= l(:field_category) %>: 
-<%= select_tag('category_id', "<option value=\"\">#{l(:label_no_change_option)}</option>" + options_from_collection_for_select(@project.issue_categories, :id, :name)) %></label>
+<%= select_tag('category_id', content_tag('option', l(:label_no_change_option), :value => '') +
+                                content_tag('option', l(:label_none), :value => 'none') +
+                                options_from_collection_for_select(@project.issue_categories, :id, :name)) %></label>
 </p>
 <p>
 <label><%= l(:field_assigned_to) %>: 
@@ -23,7 +25,9 @@
                                  content_tag('option', l(:label_nobody), :value => 'none') +
                                  options_from_collection_for_select(@project.assignable_users, :id, :name)) %></label>
 <label><%= l(:field_fixed_version) %>: 
-<%= select_tag('fixed_version_id', "<option value=\"\">#{l(:label_no_change_option)}</option>" + options_from_collection_for_select(@project.versions, :id, :name)) %></label>
+<%= select_tag('fixed_version_id', content_tag('option', l(:label_no_change_option), :value => '') +
+                                   content_tag('option', l(:label_none), :value => 'none') +
+                                   options_from_collection_for_select(@project.versions, :id, :name)) %></label>
 </p>
 
 <p>
diff --git a/test/functional/issues_controller_test.rb b/test/functional/issues_controller_test.rb
index f80110aa2..7d49f088d 100644
--- a/test/functional/issues_controller_test.rb
+++ b/test/functional/issues_controller_test.rb
@@ -339,6 +339,16 @@ class IssuesControllerTest < Test::Unit::TestCase
     assert_equal 'Bulk editing', Issue.find(1).journals.find(:first, :order => 'created_on DESC').notes
   end
 
+  def test_bulk_unassign
+    assert_not_nil Issue.find(2).assigned_to
+    @request.session[:user_id] = 2
+    # unassign issues
+    post :bulk_edit, :ids => [1, 2], :notes => 'Bulk unassigning', :assigned_to_id => 'none'
+    assert_response 302
+    # check that the issues were updated
+    assert_nil Issue.find(2).assigned_to
+  end
+  
   def test_move_one_issue_to_another_project
     @request.session[:user_id] = 1
     post :move, :id => 1, :new_project_id => 2

From 7a434c902a7c91c7245e5978bc951cc6b4a813d9 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Wed, 26 Mar 2008 22:46:18 +0000
Subject: [PATCH 336/710] Bigger wiki h3 headings.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1295 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 public/stylesheets/application.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 9446f1019..c30367903 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -4,7 +4,7 @@ h1, h2, h3, h4 { font-family: "Trebuchet MS", Verdana, sans-serif;}
 h1 {margin:0; padding:0; font-size: 24px;}
 h2, .wiki h1 {font-size: 20px;padding: 2px 10px 1px 0px;margin: 0 0 10px 0; border-bottom: 1px solid #bbbbbb; color: #444;}
 h3, .wiki h2 {font-size: 16px;padding: 2px 10px 1px 0px;margin: 0 0 10px 0; border-bottom: 1px solid #bbbbbb; color: #444;}
-h4, .wiki h3 {font-size: 12px;padding: 2px 10px 1px 0px;margin-bottom: 5px; border-bottom: 1px dotted #bbbbbb; color: #444;}
+h4, .wiki h3 {font-size: 13px;padding: 2px 10px 1px 0px;margin-bottom: 5px; border-bottom: 1px dotted #bbbbbb; color: #444;}
 
 /***** Layout *****/
 #wrapper {background: white;}

From ecc742f3ce33fdea03c5d163a58aa32b62fc2567 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Wed, 26 Mar 2008 22:56:30 +0000
Subject: [PATCH 337/710] Make the versions with the same date sorted by name
 (#864).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1296 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/models/version.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/models/version.rb b/app/models/version.rb
index 183500485..dc618af0f 100644
--- a/app/models/version.rb
+++ b/app/models/version.rb
@@ -89,11 +89,11 @@ class Version < ActiveRecord::Base
   
   def to_s; name end
   
-  # Versions are sorted by effective_date 
+  # Versions are sorted by effective_date and name
   # 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
+      version.effective_date ? (self.effective_date == version.effective_date ? self.name <=> version.name : self.effective_date <=> version.effective_date) : -1
     else
       version.effective_date ? 1 : (self.name <=> version.name)
     end

From ef80597c39e02d5e209f5c3dadcf27096b21120b Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Wed, 26 Mar 2008 23:22:33 +0000
Subject: [PATCH 338/710] Trac importer: exclude more Trac wiki pages (#933).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1297 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 lib/tasks/migrate_from_trac.rake | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/tasks/migrate_from_trac.rake b/lib/tasks/migrate_from_trac.rake
index 0f116328f..996a5f937 100644
--- a/lib/tasks/migrate_from_trac.rake
+++ b/lib/tasks/migrate_from_trac.rake
@@ -149,10 +149,10 @@ namespace :redmine do
         def time; Time.at(read_attribute(:time)) end
       end
       
-      TRAC_WIKI_PAGES = %w(TracAccessibility TracAdmin TracBackup TracBrowser TracCgi TracChangeset \
+      TRAC_WIKI_PAGES = %w(InterMapTxt InterTrac InterWiki RecentChanges SandBox TracAccessibility TracAdmin TracBackup TracBrowser TracCgi TracChangeset \
                            TracEnvironment TracFastCgi TracGuide TracImport TracIni TracInstall TracInterfaceCustomization \
                            TracLinks TracLogging TracModPython TracNotification TracPermissions TracPlugins TracQuery \
-                           TracReports TracRoadmap TracRss TracSearch TracStandalone TracSupport TracSyntaxColoring TracTickets \
+                           TracReports TracRevisionLog TracRoadmap TracRss TracSearch TracStandalone TracSupport TracSyntaxColoring TracTickets \
                            TracTicketsCustomFields TracTimeline TracUnicode TracUpgrade TracWiki WikiDeletePage WikiFormatting \
                            WikiHtml WikiMacros WikiNewPage WikiPageNames WikiProcessors WikiRestructuredText WikiRestructuredTextLinks \
                            CamelCase TitleIndex)

From 89602004098de22c59e668ad814969f5f12cd80b Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Thu, 27 Mar 2008 18:22:12 +0000
Subject: [PATCH 339/710] If 'Display subprojects issues on main projects' is
 set to false: * do not include subprojects in the issue count of the parent
 project overview (#939) * do not include subproject timelogs on the parent
 project (#848)

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1298 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/projects_controller.rb | 8 +++++---
 app/controllers/timelog_controller.rb  | 4 ++--
 app/models/project.rb                  | 6 ++++++
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index dbd36f6e4..199b2f0c5 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -90,18 +90,20 @@ class ProjectsController < ApplicationController
     @subprojects = @project.active_children
     @news = @project.news.find(:all, :limit => 5, :include => [ :author, :project ], :order => "#{News.table_name}.created_on DESC")
     @trackers = @project.rolled_up_trackers
+    
+    cond = @project.project_condition(Setting.display_subprojects_issues?)
     Issue.visible_by(User.current) do
       @open_issues_by_tracker = Issue.count(:group => :tracker,
                                             :include => [:project, :status, :tracker],
-                                            :conditions => ["(#{Project.table_name}.id=? OR #{Project.table_name}.parent_id=?) and #{IssueStatus.table_name}.is_closed=?", @project.id, @project.id, false])
+                                            :conditions => ["(#{cond}) AND #{IssueStatus.table_name}.is_closed=?", false])
       @total_issues_by_tracker = Issue.count(:group => :tracker,
                                             :include => [:project, :status, :tracker],
-                                            :conditions => ["#{Project.table_name}.id=? OR #{Project.table_name}.parent_id=?", @project.id, @project.id])
+                                            :conditions => cond)
     end
     TimeEntry.visible_by(User.current) do
       @total_hours = TimeEntry.sum(:hours, 
                                    :include => :project,
-                                   :conditions => ["(#{Project.table_name}.id = ? OR #{Project.table_name}.parent_id = ?)", @project.id, @project.id]).to_f
+                                   :conditions => cond).to_f
     end
     @key = User.current.rss_key
   end
diff --git a/app/controllers/timelog_controller.rb b/app/controllers/timelog_controller.rb
index d767037eb..8cfe225d1 100644
--- a/app/controllers/timelog_controller.rb
+++ b/app/controllers/timelog_controller.rb
@@ -72,7 +72,7 @@ class TimelogController < ApplicationController
       sql << " FROM #{TimeEntry.table_name}"
       sql << " LEFT JOIN #{Issue.table_name} ON #{TimeEntry.table_name}.issue_id = #{Issue.table_name}.id"
       sql << " LEFT JOIN #{Project.table_name} ON #{TimeEntry.table_name}.project_id = #{Project.table_name}.id"
-      sql << " WHERE (#{Project.table_name}.id = %s OR #{Project.table_name}.parent_id = %s)" % [@project.id, @project.id]
+      sql << " WHERE (%s)" % @project.project_condition(Setting.display_subprojects_issues?)
       sql << " AND (%s)" % Project.allowed_to_condition(User.current, :view_time_entries)
       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"
@@ -159,7 +159,7 @@ class TimelogController < ApplicationController
     @from, @to = @to, @from if @from && @to && @from > @to
     
     cond = ARCondition.new
-    cond << (@issue.nil? ? ["(#{Project.table_name}.id = ? OR #{Project.table_name}.parent_id = ?)", @project.id, @project.id] :
+    cond << (@issue.nil? ? @project.project_condition(Setting.display_subprojects_issues?) :
                            ["#{TimeEntry.table_name}.issue_id = ?", @issue.id])
     
     if @from
diff --git a/app/models/project.rb b/app/models/project.rb
index ad2f1fb81..a223b35f0 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -124,6 +124,12 @@ class Project < ActiveRecord::Base
     statements.empty? ? base_statement : "((#{base_statement}) AND (#{statements.join(' OR ')}))"
   end
   
+  def project_condition(with_subprojects)
+    cond = "#{Project.table_name}.id = #{id}"
+    cond = "(#{cond} OR #{Project.table_name}.parent_id = #{id})" if with_subprojects
+    cond
+  end
+  
   def self.find(*args)
     if args.first && args.first.is_a?(String) && !args.first.match(/^\d*$/)
       project = find_by_identifier(*args)

From b9e380c9febe08a0332e785299f6dcc495463a3e Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Thu, 27 Mar 2008 18:41:42 +0000
Subject: [PATCH 340/710] Add breadcrumb nav for the forums (#892).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1299 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/helpers/application_helper.rb  | 4 ++++
 app/views/boards/show.rhtml        | 2 ++
 app/views/messages/show.rhtml      | 5 ++++-
 public/stylesheets/application.css | 1 +
 4 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 510ecd15e..77019eba3 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -156,6 +156,10 @@ module ApplicationHelper
     links.size > 1 ? l(:label_display_per_page, links.join(', ')) : nil
   end
   
+  def breadcrumb(*args)
+    content_tag('p', args.join(' &#187; ') + ' &#187; ', :class => 'breadcrumb')
+  end
+  
   def html_title(*args)
     if args.empty?
       title = []
diff --git a/app/views/boards/show.rhtml b/app/views/boards/show.rhtml
index 54645622e..26d17ae56 100644
--- a/app/views/boards/show.rhtml
+++ b/app/views/boards/show.rhtml
@@ -1,3 +1,5 @@
+<%= breadcrumb link_to(l(:label_board_plural), {:controller => 'boards', :action => 'index', :project_id => @project}) %>
+
 <div class="contextual">
 <%= link_to_if_authorized l(:label_message_new),
                           {:controller => 'messages', :action => 'new', :board_id => @board},
diff --git a/app/views/messages/show.rhtml b/app/views/messages/show.rhtml
index 632f603ff..ef7db71ef 100644
--- a/app/views/messages/show.rhtml
+++ b/app/views/messages/show.rhtml
@@ -1,9 +1,12 @@
+<%= breadcrumb link_to(l(:label_board_plural), {:controller => 'boards', :action => 'index', :project_id => @project}),
+               link_to(h(@board.name), {:controller => 'boards', :action => 'show', :project_id => @project, :id => @board}) %>
+
 <div class="contextual">
     <%= link_to_if_authorized l(:button_edit), {:action => 'edit', :id => @topic}, :class => 'icon icon-edit' %>
     <%= link_to_if_authorized l(:button_delete), {:action => 'destroy', :id => @topic}, :method => :post, :confirm => l(:text_are_you_sure), :class => 'icon icon-del' %>
 </div>
 
-<h2><%= link_to h(@board.name), :controller => 'boards', :action => 'show', :project_id => @project, :id => @board %> &#187; <%=h @topic.subject %></h2>
+<h2><%=h @topic.subject %></h2>
 
 <div class="message">
 <p><span class="author"><%= authoring @topic.created_on, @topic.author %></span></p>
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index c30367903..01b31fa45 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -159,6 +159,7 @@ hr { width: 100%; height: 1px; background: #ccc; border: 0;}
 textarea.wiki-edit { width: 99%; }
 li p {margin-top: 0;}
 div.issue {background:#ffffdd; padding:6px; margin-bottom:6px;border: 1px solid #d7d7d7;}
+p.breadcrumb { font-size: 0.9em; margin: 4px 0 4px 0;}
 
 fieldset#filters .buttons { text-align: right; font-size: 0.9em; margin: 0 4px 0px 0; }
 

From 6331809bd9cf27bbe4198ae923ce6fec23f35fe2 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Thu, 27 Mar 2008 19:27:40 +0000
Subject: [PATCH 341/710] Translation updates: (closes #915, #927, #929, #923,
 #914, #919) * Japanese (Satoru Kurashiki) * Simplified Chinese (chaoqun zou)
 * Danish (kim madsen) * Norwegian (Kai Olav Fredriksen) * Traditional Chinese
 (shortie lo) * German (Sven Schuchmann)

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1300 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 lang/da.yml                                   |  64 +++----
 lang/de.yml                                   |   2 +-
 lang/en.yml                                   |  10 +-
 lang/ja.yml                                   |  38 ++--
 lang/no.yml                                   | 174 +++++++++---------
 lang/zh-tw.yml                                |  24 +--
 lang/zh.yml                                   |   6 +-
 .../javascripts/calendar/lang/calendar-no.js  |   2 +-
 .../jstoolbar/lang/jstoolbar-no.js            |  26 +--
 9 files changed, 173 insertions(+), 173 deletions(-)

diff --git a/lang/da.yml b/lang/da.yml
index 939ee5f5c..b0a6764bb 100644
--- a/lang/da.yml
+++ b/lang/da.yml
@@ -135,7 +135,7 @@ field_parent: Underprojekt af
 field_is_in_chlog: Sager vist i ændringer
 field_is_in_roadmap: Sager vist i roadmap
 field_login: Login
-field_mail_notification: Email notifikatiner
+field_mail_notification: Email notifikationer
 field_admin: Administrator
 field_last_login_on: Sidste forbindelse
 field_language: Sprog
@@ -153,7 +153,7 @@ field_attr_login: Login attribut
 field_attr_firstname: Fornavn attribut
 field_attr_lastname: Efternavn attribut
 field_attr_mail: Email attribut
-field_onthefly: On-the-fly bruger oprettelse
+field_onthefly: løbende bruger oprettelse
 field_start_date: Start
 field_done_ratio: %% Færdig
 field_auth_source: Sikkerheds metode
@@ -180,7 +180,7 @@ field_default_value: Standard værdi
 setting_app_title: Applikations titel
 setting_app_subtitle: Applikations undertekst
 setting_welcome_text: Velkomst tekst
-setting_default_language: Standrad sporg
+setting_default_language: Standard sporg
 setting_login_required: Sikkerhed påkrævet
 setting_self_registration: Bruger oprettelse
 setting_attachment_max_size: Vedhæftede filers max størrelse
@@ -198,15 +198,15 @@ setting_commit_fix_keywords: Afslutnings nøgleord
 setting_autologin: Autologin
 setting_date_format: Dato format
 setting_time_format: Tids format
-setting_cross_project_issue_relations: Tillad cross-projekt sags relationer
-setting_issue_list_default_columns: Standrad kolonner på sags listen
+setting_cross_project_issue_relations: Tillad sags relationer på tværs af projekter
+setting_issue_list_default_columns: Standard kolonner på sags listen
 setting_repositories_encodings: Repository tegnsæt
 setting_emails_footer: Email fodnote
 setting_protocol: Protokol
 setting_per_page_options: Objekter pr. side indstillinger
 setting_user_format: Bruger visnings format
 
-project_module_issue_tracking: Sag søgning
+project_module_issue_tracking: Sags søgning
 project_module_time_tracking: Tids styring
 project_module_news: Nyheder
 project_module_documents: Dokumenter
@@ -314,12 +314,12 @@ label_news_view_all: Vis alle nyheder
 label_news_added: Nyhed tilføjet
 label_change_log: Ændringer
 label_settings: Indstillinger
-label_overview: Oversit
+label_overview: Oversigt
 label_version: Version
 label_version_new: Ny version
 label_version_plural: Versioner
 label_confirmation: Bekræftigelser
-label_export_to: Exporter til
+label_export_to: Eksporter til
 label_read: Læs...
 label_public_projects: Offentlige projekter
 label_open_issues: åben
@@ -383,14 +383,14 @@ label_browse: Gennemse
 label_modification: %d ændring
 label_modification_plural: %d ændringer
 label_revision: Revision
-label_revision_plural: Revisions
-label_associated_revisions: Tilnyttede revisions
+label_revision_plural: Revisioner
+label_associated_revisions: Tilnyttede revisioner
 label_added: tilføjet
 label_modified: ændret
 label_deleted: slettet
 label_latest_revision: Seneste revision
-label_latest_revision_plural: Seneste revisions
-label_view_revisions: Se revisions
+label_latest_revision_plural: Seneste revisioner
+label_view_revisions: Se revisioner
 label_max_size: Maximal størrelse
 label_on: 'til'
 label_sort_highest: Flyt til toppen
@@ -427,11 +427,11 @@ label_commits_per_author: Commits pr. bruger
 label_view_diff: Vis forskellighed
 label_diff_inline: inline
 label_diff_side_by_side: side ved side
-label_options: Options
+label_options: Optioner
 label_copy_workflow_from: Kopier arbejdsgang fra
 label_permissions_report: Godkendelses rapport
 label_watched_issues: Overvågede sager
-label_related_issues: Relaterede sage
+label_related_issues: Relaterede sager
 label_applied_status: Anvendte statuser
 label_loading: Indlæser...
 label_relation_new: Ny relation
@@ -452,7 +452,7 @@ label_show_completed_versions: Vis færdige versioner
 label_me: mig
 label_board: Forum
 label_board_new: Nyt forum
-label_board_plural: Forumer
+label_board_plural: Fora
 label_topic_plural: Emner
 label_message_plural: Beskeder
 label_message_last: Sidste besked
@@ -521,7 +521,7 @@ button_back: Tilbage
 button_cancel: Annuller
 button_activate: Aktiver
 button_sort: Sorter
-button_log_time: Log tidspunkt
+button_log_time: Log tid
 button_rollback: Tilbagefør til denne version
 button_watch: Overvåg
 button_unwatch: Stop overvågning
@@ -552,7 +552,7 @@ text_journal_deleted: slettet
 text_tip_task_begin_day: opgaven begynder denne dag
 text_tip_task_end_day: opaven slutter denne dag
 text_tip_task_begin_end_day: opgaven begynder og slutter denne dag
-text_project_identifier_info: 'Minuskler (a-z), numre og bindestreg er tilladt.<br />Når den er gemt, kan indifikatoren ikke rettes.'
+text_project_identifier_info: 'Små bogstaver (a-z), numre og bindestreg er tilladt.<br />Når den er gemt, kan indifikatoren ikke rettes.'
 text_caracters_maximum: max %d karakterer.
 text_caracters_minimum: Skal være mindst %d karakterer lang.
 text_length_between: Længde skal være mellem %d og %d karakterer.
@@ -602,20 +602,20 @@ enumeration_issue_priorities: Sags prioriteter
 enumeration_doc_categories: Dokument kategorier
 enumeration_activities: Aktiviteter (tids styring)
 
-label_add_another_file: Add another file
-label_chronological_order: In chronological order
-setting_activity_days_default: Days displayed on project activity
-text_destroy_time_entries_question: %.02f hours were reported on the issues you are about to delete. What do you want to do ?
-error_issue_not_found_in_project: 'The issue was not found or does not belong to this project'
-text_assign_time_entries_to_project: Assign reported hours to the project
-setting_display_subprojects_issues: Display subprojects issues on main projects by default
-label_optional_description: Optional description
-text_destroy_time_entries: Delete reported hours
-field_comments_sorting: Display comments
-text_reassign_time_entries: 'Reassign reported hours to this issue:'
-label_reverse_chronological_order: In reverse chronological order
+label_add_another_file: Tilføj endnu en fil
+label_chronological_order: I kronologisk rækkefølge
+setting_activity_days_default: Antal dage der vises under projekt aktivitet
+text_destroy_time_entries_question: %.02f timer er reporteret på denne sag, som du er ved at slette. Hvad vil du gøre ?
+error_issue_not_found_in_project: 'Sagen blev ikke fundet eller tilhører ikke dette projekt'
+text_assign_time_entries_to_project: Tildel raporterede timer til projektet
+setting_display_subprojects_issues: Vis sager for underprojekter på hovedprojektet som default
+label_optional_description: Optionel beskrivelse
+text_destroy_time_entries: Slet raportede timer
+field_comments_sorting: Vis kommentar
+text_reassign_time_entries: 'Tildel raportede timer til denne sag igen'
+label_reverse_chronological_order: I omvendt kronologisk rækkefølge
 label_preferences: Preferences
-label_overall_activity: Overall activity
-setting_default_projects_public: New projects are public by default
+label_overall_activity: Overordnet aktivitet
+setting_default_projects_public: Nye projekter er offentlige som default
 error_scm_annotate: "The entry does not exist or can not be annotated."
-label_planning: Planning
+label_planning: Planlægning
diff --git a/lang/de.yml b/lang/de.yml
index f8c747cac..17c6ac617 100644
--- a/lang/de.yml
+++ b/lang/de.yml
@@ -127,7 +127,7 @@ field_subject: Thema
 field_due_date: Abgabedatum
 field_assigned_to: Zugewiesen an
 field_priority: Priorität
-field_fixed_version: Target version
+field_fixed_version: Zielversion
 field_user: Benutzer
 field_role: Rolle
 field_homepage: Projekt-Homepage
diff --git a/lang/en.yml b/lang/en.yml
index 41e2eaceb..8264ba908 100644
--- a/lang/en.yml
+++ b/lang/en.yml
@@ -67,11 +67,11 @@ notice_successful_update: Successful update.
 notice_successful_delete: Successful deletion.
 notice_successful_connection: Successful connection.
 notice_file_not_found: The page you were trying to access doesn't exist or has been removed.
-notice_locking_conflict: Data have been updated by another user.
+notice_locking_conflict: Data has been updated by another user.
 notice_not_authorized: You are not authorized to access this page.
 notice_email_sent: An email was sent to %s
 notice_email_error: An error occurred while sending mail (%s)
-notice_feeds_access_key_reseted: Your RSS access key was reseted.
+notice_feeds_access_key_reseted: Your RSS access key was reset.
 notice_failed_to_save_issues: "Failed to save %d issue(s) on %d selected: %s."
 notice_no_issue_selected: "No issue is selected! Please, check the issues you want to edit."
 notice_account_pending: "Your account was created and is now pending administrator approval."
@@ -264,7 +264,7 @@ label_enumerations: Enumerations
 label_enumeration_new: New value
 label_information: Information
 label_information_plural: Information
-label_please_login: Please login
+label_please_login: Please log in
 label_register: Register
 label_password_lost: Lost password
 label_home: Home
@@ -284,7 +284,7 @@ label_registered_on: Registered on
 label_activity: Activity
 label_overall_activity: Overall activity
 label_new: New
-label_logged_as: Logged as
+label_logged_as: Logged in as
 label_environment: Environment
 label_authentication: Authentication
 label_auth_source: Authentication mode
@@ -556,7 +556,7 @@ status_locked: locked
 text_select_mail_notifications: Select actions for which email notifications should be sent.
 text_regexp_info: eg. ^[A-Z0-9]+$
 text_min_max_length_info: 0 means no restriction
-text_project_destroy_confirmation: Are you sure you want to delete this project and all related data ?
+text_project_destroy_confirmation: Are you sure you want to delete this project and related data ?
 text_workflow_edit: Select a role and a tracker to edit the workflow
 text_are_you_sure: Are you sure ?
 text_journal_changed: changed from %s to %s
diff --git a/lang/ja.yml b/lang/ja.yml
index 64b858ccb..44d0c3ebd 100644
--- a/lang/ja.yml
+++ b/lang/ja.yml
@@ -50,7 +50,7 @@ general_text_yes: 'はい'
 general_lang_name: 'Japanese (日本語)'
 general_csv_separator: ','
 general_csv_encoding: SJIS
-general_pdf_encoding: SJIS
+general_pdf_encoding: UTF-8
 general_day_names: 月曜日,火曜日,水曜日,木曜日,金曜日,土曜日,日曜日
 general_first_day_of_week: '7'
 
@@ -79,7 +79,7 @@ error_scm_command_failed: "リポジトリへアクセスしようとしてエ
 
 mail_subject_lost_password: %sパスワード
 mail_body_lost_password: 'パスワードを変更するには、以下のリンクをたどってください:'
-mail_subject_register: %sアカウントが有効になりました
+mail_subject_register: %sアカウントのアクティブ化
 mail_body_register: 'アカウントをアクティブにするには、以下のリンクをたどってください:'
 
 gui_validation_error: 1件のエラー
@@ -601,20 +601,20 @@ label_date_range: 日付の範囲
 label_last_week: 先週
 label_yesterday: 昨日
 label_last_month: 先月
-label_add_another_file: Add another file
-text_destroy_time_entries_question: %.02f hours were reported on the issues you are about to delete. What do you want to do ?
-error_issue_not_found_in_project: 'The issue was not found or does not belong to this project'
-text_assign_time_entries_to_project: Assign reported hours to the project
-label_optional_description: Optional description
-text_destroy_time_entries: Delete reported hours
-text_reassign_time_entries: 'Reassign reported hours to this issue:'
-setting_activity_days_default: Days displayed on project activity
-label_chronological_order: In chronological order
-field_comments_sorting: Display comments
-label_reverse_chronological_order: In reverse chronological order
-label_preferences: Preferences
-setting_display_subprojects_issues: Display subprojects issues on main projects by default
-label_overall_activity: Overall activity
-setting_default_projects_public: New projects are public by default
-error_scm_annotate: "The entry does not exist or can not be annotated."
-label_planning: Planning
+label_add_another_file: 別のファイルを追加
+text_destroy_time_entries_question: チケットに記録された%.02f時間を削除しようとしています。何がしたいのですか？
+error_issue_not_found_in_project: 'チケットが見つかりません、もしくはこのプロジェクトに属していません'
+text_assign_time_entries_to_project: 記録された時間をプロジェクトに割り当て
+label_optional_description: 任意のコメント
+text_destroy_time_entries: 記録された時間を削除
+text_reassign_time_entries: '記録された時間をこのチケットに再割り当て：'
+setting_activity_days_default: プロジェクトの活動ページに表示される日数
+label_chronological_order: 古い順
+field_comments_sorting: コメントを表示
+label_reverse_chronological_order: 新しい順
+label_preferences: 設定
+setting_display_subprojects_issues: デフォルトでサブプロジェクトのチケットをメインプロジェクトに表示する
+label_overall_activity: 全ての活動
+setting_default_projects_public: デフォルトで新しいプロジェクトは公開にする
+error_scm_annotate: "エントリが存在しない、もしくはアノテートできません。"
+label_planning: 計画
diff --git a/lang/no.yml b/lang/no.yml
index 497c4a147..f2d7ac144 100644
--- a/lang/no.yml
+++ b/lang/no.yml
@@ -26,7 +26,7 @@ activerecord_error_confirmation: stemmer ikke med bekreftelsen
 activerecord_error_accepted: må aksepteres
 activerecord_error_empty: kan ikke være tom
 activerecord_error_blank: kan ikke være blank
-activerecord_error_too_long: er for lang
+activerecord_error_too_long: er for langt
 activerecord_error_too_short: er for kort
 activerecord_error_wrong_length: har feil lengde
 activerecord_error_taken: er opptatt
@@ -68,7 +68,6 @@ notice_successful_delete: Slettet.
 notice_successful_connection: Koblet opp.
 notice_file_not_found: Siden du forsøkte å vise eksisterer ikke, eller er slettet.
 notice_locking_conflict: Data har blitt oppdatert av en annen bruker.
-notice_scm_error: Elementet og/eller revisjonen eksisterer ikke i depoet.
 notice_not_authorized: Du har ikke adgang til denne siden.
 notice_email_sent: En e-post er sendt til %s
 notice_email_error: En feil oppstod under sending av e-post (%s)
@@ -76,6 +75,13 @@ notice_feeds_access_key_reseted: Din RSS-tilgangsnøkkel er nullstilt.
 notice_failed_to_save_issues: "Lykkes ikke å lagre %d sak(er) på %d valgt: %s."
 notice_no_issue_selected: "Ingen sak valgt! Vennligst merk sakene du vil endre."
 notice_account_pending: "Din konto ble opprettet og avventer nå administrativ godkjenning."
+notice_default_data_loaded: Standardkonfigurasjonen lastet inn.
+
+error_can_t_load_default_data: "Standardkonfigurasjonen kunne ikke lastes inn: %s"
+error_scm_not_found: "Elementet og/eller revisjonen eksisterer ikke i depoet."
+error_scm_command_failed: "En feil oppstod under tilkobling til depoet: %s"
+error_scm_annotate: "Elementet eksisterer ikke, eller kan ikke annoteres."
+error_issue_not_found_in_project: 'Saken eksisterer ikke, eller hører ikke til dette prosjektet'
 
 mail_subject_lost_password: Ditt %s passord
 mail_body_lost_password: 'Klikk følgende lenke for å endre ditt passord:'
@@ -115,7 +121,7 @@ field_project: Prosjekt
 field_issue: Sak
 field_status: Status
 field_notes: Notater
-field_is_closed: Saken er lukket
+field_is_closed: Lukker saken
 field_is_default: Standardverdi
 field_tracker: Sakstype
 field_subject: Emne
@@ -128,8 +134,8 @@ field_role: Rolle
 field_homepage: Hjemmeside
 field_is_public: Offentlig
 field_parent: Underprosjekt til
-field_is_in_chlog: Saker vist i endringslogg
-field_is_in_roadmap: Saker vist i veikart
+field_is_in_chlog: Vises i endringslogg
+field_is_in_roadmap: Vises i veikart
 field_login: Brukernavn
 field_mail_notification: E-post varsling
 field_admin: Administrator
@@ -140,7 +146,7 @@ field_password: Passord
 field_new_password: Nytt passord
 field_password_confirmation: Bekreft passord
 field_version: Versjon
-field_type: Saksype
+field_type: Type
 field_host: Vert
 field_port: Port
 field_account: Konto
@@ -162,7 +168,7 @@ field_hours: Timer
 field_activity: Activitet
 field_spent_on: Dato
 field_identifier: Identifikasjon
-field_is_filter: Brukt som et filter
+field_is_filter: Brukes som filter
 field_issue_to_id: Relatert saker
 field_delay: Forsinkelse
 field_assignable: Saker kan tildeles denne rollen
@@ -171,13 +177,15 @@ field_estimated_hours: Estimert tid
 field_column_names: Kolonner
 field_time_zone: Tidssone
 field_searchable: Søkbar
+field_default_value: Standardverdi
+field_comments_sorting: Vis kommentarer
 
-setting_app_title: Appliksjonstittel
+setting_app_title: Applikasjonstittel
 setting_app_subtitle: Applikasjonens undertittel
-setting_welcome_text: Velkomstekst
+setting_welcome_text: Velkomsttekst
 setting_default_language: Standardspråk
 setting_login_required: Krever innlogging
-setting_self_registration: Selv-registrering
+setting_self_registration: Selvregistrering
 setting_attachment_max_size: Maks. størrelse vedlegg
 setting_issues_export_limit: Eksportgrense for saker
 setting_mail_from: Avsenders e-post
@@ -186,11 +194,12 @@ setting_host_name: Vertsnavn
 setting_text_formatting: Tekstformattering
 setting_wiki_compression: Komprimering av Wiki-historikk
 setting_feeds_limit: Innholdsgrense for Feed
+setting_default_projects_public: Nye prosjekter er offentlige som standard
 setting_autofetch_changesets: Autohenting av innsendinger
 setting_sys_api_enabled: Aktiver webservice for depot-administrasjon
 setting_commit_ref_keywords: Nøkkelord for referanse
 setting_commit_fix_keywords: Nøkkelord for retting
-setting_autologin: Autoinnloging
+setting_autologin: Autoinnlogging
 setting_date_format: Datoformat
 setting_time_format: Tidsformat
 setting_cross_project_issue_relations: Tillat saksrelasjoner mellom prosjekter
@@ -198,6 +207,19 @@ setting_issue_list_default_columns: Standardkolonner vist i sakslisten
 setting_repositories_encodings: Depot-tegnsett
 setting_emails_footer: E-post-signatur
 setting_protocol: Protokoll
+setting_per_page_options: Alternativer, objekter pr. side
+setting_user_format: Visningsformat, brukere
+setting_activity_days_default: Dager vist på prosjektaktivitet
+setting_display_subprojects_issues: Vis saker fra underprosjekter på hovedprosjekt som standard
+
+project_module_issue_tracking: Sakssporing
+project_module_time_tracking: Tidssporing
+project_module_news: Nyheter
+project_module_documents: Dokumenter
+project_module_files: Filer
+project_module_wiki: Wiki
+project_module_repository: Depot
+project_module_boards: Forumer
 
 label_user: Bruker
 label_user_plural: Brukere
@@ -212,9 +234,12 @@ label_issue_new: Ny sak
 label_issue_plural: Saker
 label_issue_view_all: Vis alle saker
 label_issues_by: Saker etter %s
+label_issue_added: Sak lagt til
+label_issue_updated: Sak oppdatert
 label_document: Dokument
 label_document_new: Nytt dokument
 label_document_plural: Dokumenter
+label_document_added: Dokument lagt til
 label_role: Rolle
 label_role_plural: Roller
 label_role_new: Ny rolle
@@ -257,6 +282,7 @@ label_last_updates: Sist oppdatert
 label_last_updates_plural: %d siste oppdaterte
 label_registered_on: Registrert
 label_activity: Aktivitet
+label_overall_activity: Total aktivitet
 label_new: Ny
 label_logged_as: Innlogget som
 label_environment: Miljø
@@ -284,6 +310,7 @@ label_attachment: Fil
 label_attachment_new: Ny fil
 label_attachment_delete: Slett fil
 label_attachment_plural: Filer
+label_file_added: Fil lagt til
 label_report: Rapport
 label_report_plural: Rapporter
 label_news: Nyheter
@@ -291,6 +318,7 @@ label_news_new: Legg til nyhet
 label_news_plural: Nyheter
 label_news_latest: Siste nyheter
 label_news_view_all: Vis alle nyheter
+label_news_added: Nyhet lagt til
 label_change_log: Endringslogg
 label_settings: Innstillinger
 label_overview: Oversikt
@@ -308,7 +336,7 @@ label_closed_issues_plural: lukkede
 label_total: Total
 label_permissions: Godkjenninger
 label_current_status: Nåværende status
-label_new_statuses_allowed: Nye statuser tillat
+label_new_statuses_allowed: Tillatte nye statuser
 label_all: alle
 label_none: ingen
 label_nobody: ingen
@@ -324,7 +352,7 @@ label_gantt: Gantt
 label_internal: Intern
 label_last_changes: siste %d endringer
 label_change_view_all: Vis alle endringer
-label_personalize_page: Personaliser denne siden
+label_personalize_page: Tilrettelegg denne siden
 label_comment: Kommentar
 label_comment_plural: Kommentarer
 label_comment_add: Legg til kommentar
@@ -341,7 +369,15 @@ label_in_less_than: er mindre enn
 label_in_more_than: in mer enn
 label_in: i
 label_today: idag
+label_all_time: all tid
+label_yesterday: i går
 label_this_week: denne uken
+label_last_week: sist uke
+label_last_n_days: siste %d dager
+label_this_month: denne måneden
+label_last_month: siste måned
+label_this_year: dette året
+label_date_range: Dato-spenn
 label_less_than_ago: mindre enn dager siden
 label_more_than_ago: mer enn dager siden
 label_ago: dager siden
@@ -349,11 +385,13 @@ label_contains: inneholder
 label_not_contains: ikke inneholder
 label_day_plural: dager
 label_repository: Depot
+label_repository_plural: Depoter
 label_browse: Utforsk
 label_modification: %d endring
 label_modification_plural: %d endringer
 label_revision: Revisjon
 label_revision_plural: Revisjoner
+label_associated_revisions: Assosierte revisjoner
 label_added: lagt til
 label_modified: endret
 label_deleted: slettet
@@ -368,7 +406,7 @@ label_sort_lower: Flytt ned
 label_sort_lowest: Flytt til bunnen
 label_roadmap: Veikart
 label_roadmap_due_in: Frist om
-label_roadmap_overdue: %s forsinket
+label_roadmap_overdue: %s over fristen
 label_roadmap_no_issues: Ingen saker for denne versjonen
 label_search: Søk
 label_result_plural: Resultater
@@ -396,7 +434,7 @@ label_commits_per_author: Innsendinger pr. forfatter
 label_view_diff: Vis forskjeller
 label_diff_inline: i teksten
 label_diff_side_by_side: side ved side
-label_options: Valg
+label_options: Alternativer
 label_copy_workflow_from: Kopier arbeidsflyt fra
 label_permissions_report: Godkjenningsrapport
 label_watched_issues: Overvåkede saker
@@ -415,7 +453,7 @@ label_end_to_start: slutt til start
 label_end_to_end: slutt til slutt
 label_start_to_start: start til start
 label_start_to_end: start til slutt
-label_stay_logged_in: Logg meg inn automatisk
+label_stay_logged_in: Hold meg innlogget
 label_disabled: avslått
 label_show_completed_versions: Vis ferdige versjoner
 label_me: meg
@@ -426,6 +464,7 @@ label_topic_plural: Emner
 label_message_plural: Meldinger
 label_message_last: Siste melding
 label_message_new: Ny melding
+label_message_posted: Melding lagt til
 label_reply_plural: Svar
 label_send_information: Send kontoinformasjon til brukeren
 label_year: År
@@ -456,6 +495,21 @@ label_user_mail_no_self_notified: "Jeg vil ikke bli varslet om endringer jeg sel
 label_registration_activation_by_email: kontoaktivering pr. e-post
 label_registration_manual_activation: manuell kontoaktivering
 label_registration_automatic_activation: automatisk kontoaktivering
+label_display_per_page: 'Pr. side: %s'
+label_age: Alder
+label_change_properties: Endre egenskaper
+label_general: Generell
+label_more: Mer
+label_scm: SCM
+label_plugins: Tillegg
+label_ldap_authentication: LDAP-autentifikasjon
+label_downloads_abbr: Nedl.
+label_optional_description: Valgfri beskrivelse
+label_add_another_file: Legg til en fil til
+label_preferences: Brukerinnstillinger
+label_chronological_order: I kronologisk rekkefølge
+label_reverse_chronological_order: I omvendt kronologisk rekkefølge
+label_planning: Planlegging
 
 button_login: Logg inn
 button_submit: Send
@@ -492,6 +546,8 @@ button_rename: Endre navn
 button_change_password: Endre passord
 button_copy: Kopier
 button_annotate: Annotér
+button_update: Oppdater
+button_configure: Konfigurer
 
 status_active: aktiv
 status_registered: registrert
@@ -511,19 +567,31 @@ text_tip_task_end_day: oppgaven avsluttes denne dagen
 text_tip_task_begin_end_day: oppgaven starter og avsluttes denne dagen
 text_project_identifier_info: 'Små bokstaver (a-z), nummer og binde-/understrek tillat.<br />Identifikatoren kan ikke endres etter den er lagret.'
 text_caracters_maximum: %d tegn maksimum.
-text_caracters_minimum: Må være minst %d tegn lang.
+text_caracters_minimum: Må være minst %d tegn langt.
 text_length_between: Lengde mellom %d og %d tegn.
 text_tracker_no_workflow: Ingen arbeidsflyt definert for denne sakstypen
 text_unallowed_characters: Ugyldige tegn
 text_comma_separated: Flere verdier tillat (kommaseparert).
-text_issues_ref_in_commit_messages: Refererer og retter saker i innsendingsmeldinger
+text_issues_ref_in_commit_messages: Referering og retting av saker i innsendingsmelding
 text_issue_added: Sak %s er rapportert.
 text_issue_updated: Sak %s er oppdatert.
 text_wiki_destroy_confirmation: Er du sikker på at du vil slette denne wikien og alt innholdet ?
 text_issue_category_destroy_question: Noen saker (%d) er lagt til i denne kategorien. Hva vil du gjøre ?
 text_issue_category_destroy_assignments: Fjern bruk av kategorier
-text_issue_category_reassign_to: Bruk kategorien på sakene på nytt
+text_issue_category_reassign_to: Overfør sakene til denne kategorien
 text_user_mail_option: "For ikke-valgte prosjekter vil du bare motta varsling om ting du overvåker eller er involveret i (eks. saker du er forfatter av eller er tildelt)."
+text_no_configuration_data: "Roller, arbeidsflyt, sakstyper og -statuser er ikke konfigurert enda.\nDet anbefales sterkt å laste inn standardkonfigurasjonen. Du vil kunne endre denne etter den er innlastet."
+text_load_default_configuration: Last inn standardkonfigurasjonen
+text_status_changed_by_changeset: Brukt i endringssett %s.
+text_issues_destroy_confirmation: 'Er du sikker på at du vil slette valgte sak(er) ?'
+text_select_project_modules: 'Velg moduler du vil aktivere for dette prosjektet:'
+text_default_administrator_account_changed: Standard administrator-konto er endret
+text_file_repository_writable: Fil-depotet er skrivbart
+text_rmagick_available: RMagick tilgjengelig (valgfritt)
+text_destroy_time_entries_question: %.02f timer er ført på sakene du er i ferd med å slette. Hva vil du gjøre ?
+text_destroy_time_entries: Slett førte timer
+text_assign_time_entries_to_project: Overfør førte timer til prosjektet
+text_reassign_time_entries: 'Overfør førte timer til denne saken:'
 
 default_role_manager: Leder
 default_role_developper: Utvikler
@@ -550,71 +618,3 @@ default_activity_development: Utvikling
 enumeration_issue_priorities: Sakssprioriteringer
 enumeration_doc_categories: Dokument-kategorier
 enumeration_activities: Aktiviteter (tidssporing)
-
-text_status_changed_by_changeset: Applied in changeset %s.
-label_add_another_file: Add another file
-label_downloads_abbr: D/L
-label_this_month: this month
-label_chronological_order: In chronological order
-label_display_per_page: 'Per page: %s'
-label_issue_added: Issue added
-button_configure: Configure
-project_module_boards: Boards
-setting_activity_days_default: Days displayed on project activity
-project_module_issue_tracking: Issue tracking
-label_issue_updated: Issue updated
-text_destroy_time_entries_question: %.02f hours were reported on the issues you are about to delete. What do you want to do ?
-project_module_wiki: Wiki
-setting_per_page_options: Objects per page options
-label_last_n_days: last %d days
-label_all_time: all time
-notice_default_data_loaded: Default configuration successfully loaded.
-project_module_files: Files
-project_module_documents: Documents
-error_issue_not_found_in_project: 'The issue was not found or does not belong to this project'
-text_file_repository_writable: File repository writable
-label_this_year: this year
-error_scm_not_found: "The entry or revision was not found in the repository."
-text_assign_time_entries_to_project: Assign reported hours to the project
-project_module_repository: Repository
-label_associated_revisions: Associated revisions
-label_date_range: Date range
-label_document_added: Document added
-label_last_week: last week
-label_message_posted: Message added
-text_issues_destroy_confirmation: 'Are you sure you want to delete the selected issue(s) ?'
-error_scm_command_failed: "An error occurred when trying to access the repository: %s"
-label_ldap_authentication: LDAP authentication
-setting_default_projects_public: New projects are public by default
-project_module_news: News
-setting_user_format: Users display format
-setting_display_subprojects_issues: Display subprojects issues on main projects by default
-label_age: Age
-label_file_added: File added
-label_yesterday: yesterday
-label_optional_description: Optional description
-label_last_month: last month
-text_destroy_time_entries: Delete reported hours
-label_more: More
-field_default_value: Default value
-project_module_time_tracking: Time tracking
-label_scm: SCM
-label_general: General
-field_comments_sorting: Display comments
-button_update: Update
-error_scm_annotate: "The entry does not exist or can not be annotated."
-text_reassign_time_entries: 'Reassign reported hours to this issue:'
-text_default_administrator_account_changed: Default administrator account changed
-text_select_project_modules: 'Select modules to enable for this project:'
-label_reverse_chronological_order: In reverse chronological order
-label_preferences: Preferences
-label_plugins: Plugins
-label_change_properties: Change properties
-label_overall_activity: Overall activity
-text_load_default_configuration: Load the default configuration
-text_rmagick_available: RMagick available (optional)
-text_no_configuration_data: "Roles, trackers, issue statuses and workflow have not been configured yet.\nIt is highly recommended to load the default configuration. You will be able to modify it once loaded."
-label_news_added: News added
-label_repository_plural: Repositories
-error_can_t_load_default_data: "Default configuration could not be loaded: %s"
-label_planning: Planning
diff --git a/lang/zh-tw.yml b/lang/zh-tw.yml
index e018f24bb..e16fbe591 100644
--- a/lang/zh-tw.yml
+++ b/lang/zh-tw.yml
@@ -78,17 +78,18 @@ notice_account_pending: "您的帳號已經建立，正在等待管理員的審
 notice_default_data_loaded: 預設組態已載入成功。
 
 error_can_t_load_default_data: "無法載入預設組態： %s"
-error_scm_not_found: SCM 儲存庫中找不到這個專案與(或)版本。
-error_scm_command_failed: "嘗試存取儲存庫時發生錯誤：: %s"
+error_scm_not_found: SCM 儲存庫中找不到這個專案或版本。
+error_scm_command_failed: "嘗試存取儲存庫時發生錯誤： %s"
+error_scm_annotate: "SCM 儲存庫中無此項目或此項目無法被加註。"
 error_issue_not_found_in_project: '該項目不存在或不屬於此專案'
 
-mail_subject_lost_password: 您的 %s 網站密碼
-mail_body_lost_password: '欲變更您的 網站密碼, 請點選以下鏈結:'
-mail_subject_register: 啟用您的 %s 帳號
-mail_body_register: '欲啟用您的 帳號, 請點選以下鏈結:'
-mail_body_account_information_external: 您可以使用 "%s" 帳號登入 網站。
-mail_body_account_information: 您的 帳號資訊
-mail_subject_account_activation_request: %s 帳號啟用需求通知
+mail_subject_lost_password: 您的 Redmine 網站密碼
+mail_body_lost_password: '欲變更您的 Redmine 網站密碼, 請點選以下鏈結:'
+mail_subject_register: 啟用您的 Redmine 帳號
+mail_body_register: '欲啟用您的 Redmine 帳號, 請點選以下鏈結:'
+mail_body_account_information_external: 您可以使用 "%s" 帳號登入 Redmine 網站。
+mail_body_account_information: 您的 Redmine 帳號資訊
+mail_subject_account_activation_request: Redmine 帳號啟用需求通知
 mail_body_account_activation_request: '有位新用戶 (%s) 已經完成註冊，正等候您的審核：'
 
 gui_validation_error: 1 個錯誤
@@ -177,7 +178,7 @@ field_column_names: Columns
 field_time_zone: 時區
 field_searchable: 可用做搜尋條件
 field_default_value: 預設值
-field_comments_sorting: 顯示註解
+field_comments_sorting: 註解排序
 
 setting_app_title: 標題
 setting_app_subtitle: 副標題
@@ -508,6 +509,7 @@ label_add_another_file: 增加其他檔案
 label_preferences: 偏好選項
 label_chronological_order: 以時間由遠至近排序
 label_reverse_chronological_order: 以時間由近至遠排序
+label_planning: 計劃表
 
 button_login: 登入
 button_submit: 送出
@@ -616,5 +618,3 @@ default_activity_development: 開發
 enumeration_issue_priorities: 項目優先權
 enumeration_doc_categories: 文件分類
 enumeration_activities: 活動 (時間追蹤)
-error_scm_annotate: "The entry does not exist or can not be annotated."
-label_planning: Planning
diff --git a/lang/zh.yml b/lang/zh.yml
index 6ebcb9588..bff45a2ec 100644
--- a/lang/zh.yml
+++ b/lang/zh.yml
@@ -80,6 +80,7 @@ notice_default_data_loaded: 成功载入默认设置。
 error_can_t_load_default_data: "无法载入默认设置：%s"
 error_scm_not_found: "版本库中不存在该条目和（或）其修订版本。"
 error_scm_command_failed: "访问版本库时发生错误：%s"
+error_scm_annotate: "该条目不存在或无法追溯。"
 error_issue_not_found_in_project: '问题不存在或不属于此项目'
 
 mail_subject_lost_password: 您的 %s 密码
@@ -193,6 +194,7 @@ setting_host_name: 主机名称
 setting_text_formatting: 文本格式
 setting_wiki_compression: 压缩Wiki历史文档
 setting_feeds_limit: RSS Feed内容条数限制
+setting_default_projects_public: 新建项目默认为公开项目
 setting_autofetch_changesets: 自动获取程序变更
 setting_sys_api_enabled: 启用用于版本库管理的Web Service
 setting_commit_ref_keywords: 用于引用问题的关键字
@@ -507,6 +509,7 @@ label_add_another_file: 添加其它文件
 label_preferences: 首选项
 label_chronological_order: 按时间顺序
 label_reverse_chronological_order: 按时间顺序（倒序）
+label_planning: 计划
 
 button_login: 登录
 button_submit: 提交
@@ -615,6 +618,3 @@ default_activity_development: 开发
 enumeration_issue_priorities: 问题优先级
 enumeration_doc_categories: 文档类别
 enumeration_activities: 活动（时间跟踪）
-setting_default_projects_public: New projects are public by default
-error_scm_annotate: "The entry does not exist or can not be annotated."
-label_planning: Planning
diff --git a/public/javascripts/calendar/lang/calendar-no.js b/public/javascripts/calendar/lang/calendar-no.js
index f6b7f3eca..0506b83e2 100644
--- a/public/javascripts/calendar/lang/calendar-no.js
+++ b/public/javascripts/calendar/lang/calendar-no.js
@@ -72,7 +72,7 @@ Calendar._TT["DAY_FIRST"] = "Vis %s først";
 // This may be locale-dependent.  It specifies the week-end days, as an array
 // of comma-separated numbers.  The numbers are from 0 to 6: 0 means Sunday, 1
 // means Monday, etc.
-Calendar._TT["WEEKEND"] = "6,0";
+Calendar._TT["WEEKEND"] = "0,6";
 
 Calendar._TT["CLOSE"] = "Lukk";
 Calendar._TT["TODAY"] = "Idag";
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-no.js b/public/javascripts/jstoolbar/lang/jstoolbar-no.js
index cd36a4b55..cf6e19ff9 100644
--- a/public/javascripts/jstoolbar/lang/jstoolbar-no.js
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-no.js
@@ -1,14 +1,14 @@
 jsToolBar.strings = {};
-jsToolBar.strings['Strong'] = 'Strong';
-jsToolBar.strings['Italic'] = 'Italic';
-jsToolBar.strings['Underline'] = 'Underline';
-jsToolBar.strings['Deleted'] = 'Deleted';
-jsToolBar.strings['Code'] = 'Inline Code';
-jsToolBar.strings['Heading 1'] = 'Heading 1';
-jsToolBar.strings['Heading 2'] = 'Heading 2';
-jsToolBar.strings['Heading 3'] = 'Heading 3';
-jsToolBar.strings['Unordered list'] = 'Unordered list';
-jsToolBar.strings['Ordered list'] = 'Ordered list';
-jsToolBar.strings['Preformatted text'] = 'Preformatted text';
-jsToolBar.strings['Wiki link'] = 'Link to a Wiki page';
-jsToolBar.strings['Image'] = 'Image';
+jsToolBar.strings['Strong'] = 'Fet';
+jsToolBar.strings['Italic'] = 'Kursiv';
+jsToolBar.strings['Underline'] = 'Understreking';
+jsToolBar.strings['Deleted'] = 'Slettet';
+jsToolBar.strings['Code'] = 'Kode';
+jsToolBar.strings['Heading 1'] = 'Overskrift 1';
+jsToolBar.strings['Heading 2'] = 'Overskrift 2';
+jsToolBar.strings['Heading 3'] = 'Overskrift 3';
+jsToolBar.strings['Unordered list'] = 'Punktliste';
+jsToolBar.strings['Ordered list'] = 'Nummerert liste';
+jsToolBar.strings['Preformatted text'] = 'Preformatert tekst';
+jsToolBar.strings['Wiki link'] = 'Lenke til Wiki-side';
+jsToolBar.strings['Image'] = 'Bilde';

From 85858cebe64ab4ec404e1db2220b0cdfb7c5d32f Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sat, 29 Mar 2008 09:24:09 +0000
Subject: [PATCH 342/710] Fixed: https urls in the wiki are not displayed as
 external (closes #943).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1301 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 lib/redcloth.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/redcloth.rb b/lib/redcloth.rb
index 9452c2670..5ed23b8f7 100644
--- a/lib/redcloth.rb
+++ b/lib/redcloth.rb
@@ -786,7 +786,7 @@ class RedCloth < String
             atts << " title=\"#{ title }\"" if title
             atts = shelve( atts ) if atts
             
-            external = (url =~ /^http:\/\//) ? ' class="external"' : ''
+            external = (url =~ /^https?:\/\//) ? ' class="external"' : ''
             
             "#{ pre }<a#{ atts }#{ external }>#{ text }</a>#{ post }"
         end

From 1bb51f743a3568dd8714233e83500bd7ff4feda8 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sat, 29 Mar 2008 10:54:24 +0000
Subject: [PATCH 343/710] Fixed: migrate_from_trac doesn't import timestamps of
 wiki and tickets (patch #882 by Andreas Neuhaus slightly edited).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1302 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 lib/tasks/migrate_from_trac.rake | 28 +++++++++++++++++++++++-----
 1 file changed, 23 insertions(+), 5 deletions(-)

diff --git a/lib/tasks/migrate_from_trac.rake b/lib/tasks/migrate_from_trac.rake
index 996a5f937..7fe1f09ac 100644
--- a/lib/tasks/migrate_from_trac.rake
+++ b/lib/tasks/migrate_from_trac.rake
@@ -68,7 +68,22 @@ namespace :redmine do
         ROLE_MAPPING = {'admin' => manager_role,
                         'developer' => developer_role
                         }
-      
+                        
+      class ::Time
+        class << self
+          alias :real_now :now
+          def now
+            real_now - @fake_diff.to_i
+          end
+          def fake(time)
+            @fake_diff = real_now - time
+            res = yield
+            @fake_diff = 0
+           res
+          end
+        end
+      end
+
       class TracComponent < ActiveRecord::Base
         set_table_name :component
       end
@@ -141,6 +156,7 @@ namespace :redmine do
         end
         
         def time; Time.at(read_attribute(:time)) end
+        def changetime; Time.at(read_attribute(:changetime)) end
       end
       
       class TracTicketChange < ActiveRecord::Base
@@ -167,6 +183,8 @@ namespace :redmine do
           # Hides readonly Trac field to prevent clash with AR readonly? method (Rails 2.0)
           super.select {|column| column.name.to_s != 'readonly'}
         end
+        
+        def time; Time.at(read_attribute(:time)) end
       end
       
       class TracPermission < ActiveRecord::Base
@@ -345,14 +363,14 @@ namespace :redmine do
         	i.tracker = TRACKER_MAPPING[ticket.ticket_type] || DEFAULT_TRACKER
         	i.custom_values << CustomValue.new(:custom_field => custom_field_map['resolution'], :value => ticket.resolution) unless ticket.resolution.blank?
         	i.id = ticket.id unless Issue.exists?(ticket.id)
-        	next unless i.save
+        	next unless Time.fake(ticket.changetime) { i.save }
         	TICKET_MAP[ticket.id] = i.id
         	migrated_tickets += 1
         	
         	# Owner
             unless ticket.owner.blank?
               i.assigned_to = find_or_create_user(ticket.owner, true)
-              i.save
+              Time.fake(ticket.changetime) { i.save }
             end
       	
         	# Comments and status/resolution changes
@@ -426,7 +444,7 @@ namespace :redmine do
             p.content.text = page.text
             p.content.author = find_or_create_user(page.author) unless page.author.blank? || page.author == 'trac'
             p.content.comments = page.comment
-            p.new_record? ? p.save : p.content.save
+            Time.fake(page.time) { p.new_record? ? p.save : p.content.save }
             
             next if p.content.new_record?
             migrated_wiki_edits += 1 
@@ -446,7 +464,7 @@ namespace :redmine do
           wiki.reload
           wiki.pages.each do |page|
             page.content.text = convert_wiki_text(page.content.text)
-            page.content.save
+            Time.fake(page.content.updated_on) { page.content.save }
           end
         end
         puts

From 0dfa2ad3cf593ae85a935c6b20b435d853df0b79 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sat, 29 Mar 2008 11:12:57 +0000
Subject: [PATCH 344/710] Show date range on the activity (closes #837).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1303 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/projects/activity.rhtml  | 1 +
 public/stylesheets/application.css | 1 +
 2 files changed, 2 insertions(+)

diff --git a/app/views/projects/activity.rhtml b/app/views/projects/activity.rhtml
index bb3f16da3..0cf7a5000 100644
--- a/app/views/projects/activity.rhtml
+++ b/app/views/projects/activity.rhtml
@@ -1,4 +1,5 @@
 <h2><%= l(:label_activity) %></h2>
+<p class="subtitle"><%= "#{l(:label_date_from)} #{format_date(@date_to - @days)} #{l(:label_date_to).downcase} #{format_date(@date_to-1)}" %></p>
 
 <div id="activity">
 <% @events_by_day.keys.sort.reverse.each do |day| %>
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 01b31fa45..a1981c64a 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -160,6 +160,7 @@ textarea.wiki-edit { width: 99%; }
 li p {margin-top: 0;}
 div.issue {background:#ffffdd; padding:6px; margin-bottom:6px;border: 1px solid #d7d7d7;}
 p.breadcrumb { font-size: 0.9em; margin: 4px 0 4px 0;}
+p.subtitle { font-size: 0.9em; margin: -6px 0 12px 0; font-style: italic; } 
 
 fieldset#filters .buttons { text-align: right; font-size: 0.9em; margin: 0 4px 0px 0; }
 

From a381b0978f96bab8ca0372d81b74f3c77a50b6ac Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sat, 29 Mar 2008 11:43:07 +0000
Subject: [PATCH 345/710] Changelog updated.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1304 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 doc/CHANGELOG | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/doc/CHANGELOG b/doc/CHANGELOG
index 39586b8d1..9ced8b4c0 100644
--- a/doc/CHANGELOG
+++ b/doc/CHANGELOG
@@ -5,7 +5,7 @@ Copyright (C) 2006-2008  Jean-Philippe Lang
 http://www.redmine.org/
 
 
-== 2008-03-xx v0.7-rc1
+== 2008-03-29 v0.7.0-rc1
 
 * Overall activity view and feed added, link is available on the project list
 * Git VCS support
@@ -42,14 +42,15 @@ http://www.redmine.org/
 * Display total estimated and spent hours on the version detail view
 * Weekly time tracking block for 'My page'
 * Permissions to edit time entries
-* Include subprojects on the issue list, calendar and gantt by default (can be turned off is administration settings)
+* Include subprojects on the issue list, calendar, gantt and timelog by default (can be turned off is administration settings)
 * Roadmap enhancements (separate related issues from wiki contents, leading h1 in version wiki pages is hidden, smaller wiki headings)
+* Make versions with same date sorted by name
 * Allow issue list to be sorted by target version
 * Related changesets messages displayed on the issue details view
 * Create a journal and send an email when an issue is closed by commit
 * Add 'Author' to the available columns for the issue list
 * More appropriate default sort order on sortable columns
-* Add issue subject to the time entries view and issue subject + tracker to the csv export
+* Add issue subject to the time entries view and issue subject, description and tracker to the csv export
 * Permissions to edit issue notes
 * Display date/time instead of date on files list
 * Do not show Roadmap menu item if the project doesn't define any versions
@@ -66,6 +67,7 @@ http://www.redmine.org/
 * Wiki toolbar improvements (mainly for Firefox)
 * Display wiki syntax quick ref link on all wiki textareas
 * Display links to Atom feeds
+* Breadcrumb nav for the forums
 * Show replies when choosing to display messages in the activity
 * Added 'include' macro to include another wiki page
 * RedmineWikiFormatting page available as a static HTML file locally
@@ -125,6 +127,8 @@ http://www.redmine.org/
 * Fixed: fetch_changesets fails on commit comments that close 2 duplicates issues.
 * Fixed: Mercurial browsing under unix-like os and for directory depth > 2
 * Fixed: Wiki links with pipe can not be used in wiki tables
+* Fixed: migrate_from_trac doesn't import timestamps of wiki and tickets
+* Fixed: when bulk editing, setting "Assigned to" to "nobody" causes an sql error with Postgresql
 
 
 == 2008-03-12 v0.6.4

From 5ccbeba5c2fe775818bb063fbf4741296f0d39b3 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sat, 29 Mar 2008 20:03:20 +0000
Subject: [PATCH 346/710] Use #blank? instead of #empty? in news/show view.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1307 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/news/show.rhtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/news/show.rhtml b/app/views/news/show.rhtml
index 6de8aa86e..a55b56f0b 100644
--- a/app/views/news/show.rhtml
+++ b/app/views/news/show.rhtml
@@ -25,7 +25,7 @@
 <div id="preview" class="wiki"></div>
 </div>
 
-<p><em><% unless @news.summary.empty? %><%=h @news.summary %><br /><% end %>
+<p><em><% unless @news.summary.blank? %><%=h @news.summary %><br /><% end %>
 <span class="author"><%= authoring @news.created_on, @news.author %></span></em></p>
 <div class="wiki">
 <%= textilizable(@news.description) %>

From 1b8c5d40589d345a582fd2d0ff73c1ebfd88b7fb Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sat, 29 Mar 2008 22:35:04 +0000
Subject: [PATCH 347/710] Fixed: can not display attached images inline in
 message replies.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1308 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/messages/show.rhtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/messages/show.rhtml b/app/views/messages/show.rhtml
index ef7db71ef..251b7c7a5 100644
--- a/app/views/messages/show.rhtml
+++ b/app/views/messages/show.rhtml
@@ -26,7 +26,7 @@
   </div>
   <div class="message reply">
   <h4><%=h message.subject %> - <%= authoring message.created_on, message.author %></h4>
-  <div class="wiki"><%= textilizable message.content %></div>
+  <div class="wiki"><%= textilizable message, :content, :attachments => message.attachments %></div>
   <%= link_to_attachments message.attachments, :no_author => true %>
   </div>
 <% end %>

From cd64338a7f0cf9a648365085851bb8cb60b68c56 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 30 Mar 2008 08:19:56 +0000
Subject: [PATCH 348/710] Fixed: Priorities not ordered when displayed as a
 filter in issue list (#956).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1309 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/models/query.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/query.rb b/app/models/query.rb
index 99d13aa6a..dfdfa909b 100644
--- a/app/models/query.rb
+++ b/app/models/query.rb
@@ -139,7 +139,7 @@ class Query < ActiveRecord::Base
     
     @available_filters = { "status_id" => { :type => :list_status, :order => 1, :values => IssueStatus.find(:all, :order => 'position').collect{|s| [s.name, s.id.to_s] } },       
                            "tracker_id" => { :type => :list, :order => 2, :values => trackers.collect{|s| [s.name, s.id.to_s] } },                                                                                                                
-                           "priority_id" => { :type => :list, :order => 3, :values => Enumeration.find(:all, :conditions => ['opt=?','IPRI']).collect{|s| [s.name, s.id.to_s] } },
+                           "priority_id" => { :type => :list, :order => 3, :values => Enumeration.find(:all, :conditions => ['opt=?','IPRI'], :order => 'position').collect{|s| [s.name, s.id.to_s] } },
                            "subject" => { :type => :text, :order => 8 },  
                            "created_on" => { :type => :date_past, :order => 9 },                        
                            "updated_on" => { :type => :date_past, :order => 10 },

From faf1f1e812b385dcf88591eac6fc898f86947c75 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 30 Mar 2008 08:33:04 +0000
Subject: [PATCH 349/710] Fixed: Feed content limit setting has no effect
 (closes #954).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1310 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/application.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/controllers/application.rb b/app/controllers/application.rb
index 98cb4a827..abf621641 100644
--- a/app/controllers/application.rb
+++ b/app/controllers/application.rb
@@ -150,6 +150,7 @@ class ApplicationController < ActionController::Base
   def render_feed(items, options={})    
     @items = items || []
     @items.sort! {|x,y| y.event_datetime <=> x.event_datetime }
+    @items = @items.slice(0, Setting.feeds_limit.to_i)
     @title = options[:title] || Setting.app_title
     render :template => "common/feed.atom.rxml", :layout => false, :content_type => 'application/atom+xml'
   end

From 287d86e3632546b06aeb955db8b0e5eea139082b Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 30 Mar 2008 12:29:07 +0000
Subject: [PATCH 350/710] Queries can be marked as 'For all projects'. Such
 queries will be available on all projects and on the global issue list (#897,
 closes #671). Only admin users can create/edit queries that are public and
 for all projects. Note: this change does not allow to save a query from the
 global issue list. You have to be inside a project but then you can mark the
 query as 'For all projects'.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1311 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/issues_controller.rb       |   9 +-
 app/controllers/queries_controller.rb      |  34 ++--
 app/helpers/issues_helper.rb               |  13 ++
 app/models/query.rb                        |  11 +-
 app/views/issues/_sidebar.rhtml            |  11 +-
 app/views/issues/index.rhtml               |   2 +-
 app/views/queries/_form.rhtml              |  11 +-
 test/fixtures/queries.yml                  |  53 +++++-
 test/fixtures/roles.yml                    |   2 -
 test/functional/queries_controller_test.rb | 185 +++++++++++++++++++++
 test/unit/query_test.rb                    |  34 +++-
 11 files changed, 328 insertions(+), 37 deletions(-)
 create mode 100644 test/functional/queries_controller_test.rb

diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index dbc3161d7..7d4212095 100644
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -73,6 +73,8 @@ class IssuesController < ApplicationController
       # Send html if the query is not valid
       render(:template => 'issues/index.rhtml', :layout => !request.xhr?)
     end
+  rescue ActiveRecord::RecordNotFound
+    render_404
   end
   
   def changes
@@ -87,6 +89,8 @@ class IssuesController < ApplicationController
     end
     @title = (@project ? @project.name : Setting.app_title) + ": " + (@query.new_record? ? l(:label_changes_details) : @query.name)
     render :layout => false, :content_type => 'application/atom+xml'
+  rescue ActiveRecord::RecordNotFound
+    render_404
   end
   
   def show
@@ -384,7 +388,10 @@ private
   # Retrieve query from session or build a new query
   def retrieve_query
     if !params[:query_id].blank?
-      @query = Query.find(params[:query_id], :conditions => {:project_id => (@project ? @project.id : nil)})
+      cond = "project_id IS NULL"
+      cond << " OR project_id = #{@project.id}" if @project
+      @query = Query.find(params[:query_id], :conditions => cond)
+      @query.project = @project
       session[:query] = {:id => @query.id, :project_id => @query.project_id}
     else
       if params[:set_filter] || session[:query].nil? || session[:query][:project_id] != (@project ? @project.id : nil)
diff --git a/app/controllers/queries_controller.rb b/app/controllers/queries_controller.rb
index 0a762eee0..194b1df57 100644
--- a/app/controllers/queries_controller.rb
+++ b/app/controllers/queries_controller.rb
@@ -18,19 +18,14 @@
 class QueriesController < ApplicationController
   layout 'base'
   menu_item :issues
-  before_filter :find_project, :authorize
-
-  def index
-    @queries = @project.queries.find(:all, 
-                                     :order => "name ASC",
-                                     :conditions => ["is_public = ? or user_id = ?", true, (User.current.logged? ? User.current.id : 0)])
-  end
+  before_filter :find_query, :except => :new
+  before_filter :find_project, :authorize, :only => :new
   
   def new
     @query = Query.new(params[:query])
-    @query.project = @project
+    @query.project = params[:query_is_for_all] ? nil : @project
     @query.user = User.current
-    @query.is_public = false unless current_role.allowed_to?(:manage_public_queries)
+    @query.is_public = false unless (@query.project && current_role.allowed_to?(:manage_public_queries)) || User.current.admin?
     @query.column_names = nil if params[:default_columns]
     
     params[:fields].each do |field|
@@ -52,7 +47,8 @@ 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 current_role.allowed_to?(:manage_public_queries)
+      @query.project = nil if params[:query_is_for_all]
+      @query.is_public = false unless (@query.project && current_role.allowed_to?(:manage_public_queries)) || User.current.admin?
       @query.column_names = nil if params[:default_columns]
       
       if @query.save
@@ -64,18 +60,20 @@ class QueriesController < ApplicationController
 
   def destroy
     @query.destroy if request.post?
-    redirect_to :controller => 'queries', :project_id => @project
+    redirect_to :controller => 'issues', :action => 'index', :project_id => @project, :set_filter => 1
   end
   
 private
+  def find_query
+    @query = Query.find(params[:id])
+    @project = @query.project
+    render_403 unless @query.editable_by?(User.current)
+  rescue ActiveRecord::RecordNotFound
+    render_404
+  end
+  
   def find_project
-    if params[:id]
-      @query = Query.find(params[:id])
-      @project = @query.project
-      render_403 unless @query.editable_by?(User.current)
-    else
-      @project = Project.find(params[:project_id])
-    end
+    @project = Project.find(params[:project_id])
   rescue ActiveRecord::RecordNotFound
     render_404
   end
diff --git a/app/helpers/issues_helper.rb b/app/helpers/issues_helper.rb
index 17889fadd..6013f1ec8 100644
--- a/app/helpers/issues_helper.rb
+++ b/app/helpers/issues_helper.rb
@@ -32,6 +32,19 @@ module IssuesHelper
       "<strong>#{@cached_label_assigned_to}</strong>: #{issue.assigned_to}<br />" +
       "<strong>#{@cached_label_priority}</strong>: #{issue.priority.name}"
   end
+  
+  def sidebar_queries
+    unless @sidebar_queries
+      # User can see public queries and his own queries
+      visible = ARCondition.new(["is_public = ? OR user_id = ?", true, (User.current.logged? ? User.current.id : 0)])
+      # Project specific queries and global queries
+      visible << (@project.nil? ? ["project_id IS NULL"] : ["project_id IS NULL OR project_id = ?", @project.id])
+      @sidebar_queries = Query.find(:all, 
+                                    :order => "name ASC",
+                                    :conditions => visible.conditions)
+    end
+    @sidebar_queries
+  end
 
   def show_detail(detail, no_html=false)
     case detail.property
diff --git a/app/models/query.rb b/app/models/query.rb
index dfdfa909b..c54c143e2 100644
--- a/app/models/query.rb
+++ b/app/models/query.rb
@@ -116,6 +116,11 @@ class Query < ActiveRecord::Base
     set_language_if_valid(User.current.language)
   end
   
+  def after_initialize
+    # Store the fact that project is nil (used in #editable_by?)
+    @is_for_all = project.nil?
+  end
+  
   def validate
     filters.each_key do |field|
       errors.add label_for(field), :activerecord_error_blank unless 
@@ -128,8 +133,10 @@ class Query < ActiveRecord::Base
   
   def editable_by?(user)
     return false unless user
-    return true if !is_public && self.user_id == user.id
-    is_public && user.allowed_to?(:manage_public_queries, project)
+    # Admin can edit them all and regular users can edit their private queries
+    return true if user.admin? || (!is_public && self.user_id == user.id)
+    # Members can not edit public queries that are for all project (only admin is allowed to)
+    is_public && !@is_for_all && user.allowed_to?(:manage_public_queries, project)
   end
   
   def available_filters
diff --git a/app/views/issues/_sidebar.rhtml b/app/views/issues/_sidebar.rhtml
index 4a1b7e9bc..c269eee06 100644
--- a/app/views/issues/_sidebar.rhtml
+++ b/app/views/issues/_sidebar.rhtml
@@ -1,13 +1,14 @@
+<% if @project %>
 <h3><%= l(:label_issue_plural) %></h3>
 <%= link_to l(:label_issue_view_all), { :controller => 'issues', :action => 'index', :project_id => @project, :set_filter => 1 } %><br />
 <%= link_to l(:field_summary), :controller => 'reports', :action => 'issue_report', :id => @project %><br />
 <%= link_to l(:label_change_log), :controller => 'projects', :action => 'changelog', :id => @project %>
+<% end %>
 
+<% unless sidebar_queries.empty? -%>
 <h3><%= l(:label_query_plural) %></h3>
 
-<% queries = @project.queries.find(:all, 
-                                   :order => "name ASC",
-                                   :conditions => ["is_public = ? or user_id = ?", true, (User.current.logged? ? User.current.id : 0)])
-   queries.each do |query| %>
+<% sidebar_queries.each do |query| -%>
 <%= link_to query.name, :controller => 'issues', :action => 'index', :project_id => @project, :query_id => query %><br />
-<% end %>
+<% end -%>
+<% end -%>
diff --git a/app/views/issues/index.rhtml b/app/views/issues/index.rhtml
index 094c49ff2..0123099f2 100644
--- a/app/views/issues/index.rhtml
+++ b/app/views/issues/index.rhtml
@@ -54,7 +54,7 @@
 
 <% content_for :sidebar do %>
     <%= render :partial => 'issues/sidebar' %>
-<% end if @project%>
+<% end %>
 
 <% content_for :header_tags do %>
     <%= auto_discovery_link_tag(:atom, {:query_id => @query, :format => 'atom', :page => nil, :key => User.current.rss_key}, :title => l(:label_issue_plural)) %>
diff --git a/app/views/queries/_form.rhtml b/app/views/queries/_form.rhtml
index 2d4b96fd1..8da264032 100644
--- a/app/views/queries/_form.rhtml
+++ b/app/views/queries/_form.rhtml
@@ -6,11 +6,16 @@
 <p><label for="query_name"><%=l(:field_name)%></label>
 <%= text_field 'query', 'name', :size => 80 %></p>
 
-<% if current_role.allowed_to?(:manage_public_queries) %>
-  <p><label for="query_is_public"><%=l(:field_is_public)%></label>
-  <%= check_box 'query', 'is_public' %></p>
+<% if User.current.admin? || (@project && current_role.allowed_to?(:manage_public_queries)) %>
+<p><label for="query_is_public"><%=l(:field_is_public)%></label>
+<%= check_box 'query', 'is_public',
+      :onchange => (User.current.admin? ? nil : 'if (this.checked) {$("query_is_for_all").checked = false; $("query_is_for_all").disabled = true;} else {$("query_is_for_all").disabled = false;}') %></p>
 <% end %>
 
+<p><label for="query_is_for_all"><%=l(:field_is_for_all)%></label>
+<%= check_box_tag 'query_is_for_all', 1, @query.project.nil?,
+      :disabled => (!@query.new_record? && (@query.project.nil? || (@query.is_public? && !User.current.admin?))) %></p>
+
 <p><label for="query_default_columns"><%=l(:label_default_columns)%></label>
 <%= check_box_tag 'default_columns', 1, @query.has_default_columns?, :id => 'query_default_columns',
       :onclick => 'if (this.checked) {Element.hide("columns")} else {Element.show("columns")}' %></p>
diff --git a/test/fixtures/queries.yml b/test/fixtures/queries.yml
index a4c045b15..f12022729 100644
--- a/test/fixtures/queries.yml
+++ b/test/fixtures/queries.yml
@@ -1,7 +1,9 @@
 --- 
 queries_001: 
-  name: Multiple custom fields query
+  id: 1
   project_id: 1
+  is_public: true
+  name: Multiple custom fields query
   filters: |
     --- 
     cf_1: 
@@ -17,6 +19,51 @@ queries_001:
       - "125"
       :operator: "="
 
-  id: 1
-  is_public: true
   user_id: 1
+  column_names: 
+queries_002: 
+  id: 2
+  project_id: 1
+  is_public: false
+  name: Private query for cookbook
+  filters: |
+    --- 
+    tracker_id: 
+      :values: 
+      - "3"
+      :operator: "="
+    status_id: 
+      :values: 
+      - "1"
+      :operator: o
+
+  user_id: 3
+  column_names: 
+queries_003: 
+  id: 3
+  project_id: 
+  is_public: false
+  name: Private query for all projects
+  filters: |
+    --- 
+    tracker_id: 
+      :values: 
+      - "3"
+      :operator: "="
+
+  user_id: 3
+  column_names: 
+queries_004: 
+  id: 4
+  project_id: 
+  is_public: true
+  name: Public query for all projects
+  filters: |
+    --- 
+    tracker_id: 
+      :values: 
+      - "3"
+      :operator: "="
+
+  user_id: 2
+  column_names: 
diff --git a/test/fixtures/roles.yml b/test/fixtures/roles.yml
index 0aabbb619..1ede6fca9 100644
--- a/test/fixtures/roles.yml
+++ b/test/fixtures/roles.yml
@@ -57,7 +57,6 @@ roles_002:
     - :add_issue_notes
     - :move_issues
     - :delete_issues
-    - :manage_public_queries
     - :save_queries
     - :view_gantt
     - :view_calendar
@@ -94,7 +93,6 @@ roles_003:
     - :manage_issue_relations
     - :add_issue_notes
     - :move_issues
-    - :manage_public_queries
     - :save_queries
     - :view_gantt
     - :view_calendar
diff --git a/test/functional/queries_controller_test.rb b/test/functional/queries_controller_test.rb
new file mode 100644
index 000000000..86af8edd7
--- /dev/null
+++ b/test/functional/queries_controller_test.rb
@@ -0,0 +1,185 @@
+# redMine - project management software
+# Copyright (C) 2006-2008  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 File.dirname(__FILE__) + '/../test_helper'
+require 'queries_controller'
+
+# Re-raise errors caught by the controller.
+class QueriesController; def rescue_action(e) raise e end; end
+
+class QueriesControllerTest < Test::Unit::TestCase
+  fixtures :projects, :users, :members, :roles, :trackers, :issue_statuses, :issue_categories, :enumerations, :issues, :custom_fields, :custom_values, :queries
+  
+  def setup
+    @controller = QueriesController.new
+    @request    = ActionController::TestRequest.new
+    @response   = ActionController::TestResponse.new
+    User.current = nil
+  end
+  
+  def test_get_new
+    @request.session[:user_id] = 2
+    get :new, :project_id => 1
+    assert_response :success
+    assert_template 'new'
+    assert_tag :tag => 'input', :attributes => { :type => 'checkbox',
+                                                 :name => 'query[is_public]',
+                                                 :checked => nil } 
+    assert_tag :tag => 'input', :attributes => { :type => 'checkbox',
+                                                 :name => 'query_is_for_all',
+                                                 :checked => nil,
+                                                 :disabled => nil }
+  end
+  
+  def test_new_project_public_query
+    @request.session[:user_id] = 2
+    post :new,
+         :project_id => 'ecookbook', 
+         :confirm => '1',
+         :default_columns => '1',
+         :fields => ["status_id", "assigned_to_id"],
+         :operators => {"assigned_to_id" => "=", "status_id" => "o"},
+         :values => { "assigned_to_id" => ["1"], "status_id" => ["1"]},
+         :query => {"name" => "test_new_project_public_query", "is_public" => "1"},
+         :column_names => ["", "tracker", "status", "priority", "subject", "updated_on", "category"]
+         
+    q = Query.find_by_name('test_new_project_public_query')
+    assert_redirected_to :controller => 'issues', :action => 'index', :query_id => q
+    assert q.is_public?
+    assert q.has_default_columns?
+    assert q.valid?
+  end
+  
+  def test_new_project_private_query
+    @request.session[:user_id] = 3
+    post :new,
+         :project_id => 'ecookbook', 
+         :confirm => '1',
+         :default_columns => '1',
+         :fields => ["status_id", "assigned_to_id"],
+         :operators => {"assigned_to_id" => "=", "status_id" => "o"},
+         :values => { "assigned_to_id" => ["1"], "status_id" => ["1"]},
+         :query => {"name" => "test_new_project_private_query", "is_public" => "1"},
+         :column_names => ["", "tracker", "status", "priority", "subject", "updated_on", "category"]
+         
+    q = Query.find_by_name('test_new_project_private_query')
+    assert_redirected_to :controller => 'issues', :action => 'index', :query_id => q
+    assert !q.is_public?
+    assert q.has_default_columns?
+    assert q.valid?
+  end
+  
+  def test_get_edit_global_public_query
+    @request.session[:user_id] = 1
+    get :edit, :id => 4
+    assert_response :success
+    assert_template 'edit'
+    assert_tag :tag => 'input', :attributes => { :type => 'checkbox',
+                                                 :name => 'query[is_public]',
+                                                 :checked => 'checked' } 
+    assert_tag :tag => 'input', :attributes => { :type => 'checkbox',
+                                                 :name => 'query_is_for_all',
+                                                 :checked => 'checked',
+                                                 :disabled => 'disabled' }
+  end
+
+  def test_edit_global_public_query
+    @request.session[:user_id] = 1
+    post :edit,
+         :id => 4, 
+         :confirm => '1',
+         :default_columns => '1',
+         :fields => ["status_id", "assigned_to_id"],
+         :operators => {"assigned_to_id" => "=", "status_id" => "o"},
+         :values => { "assigned_to_id" => ["1"], "status_id" => ["1"]},
+         :query => {"name" => "test_edit_global_public_query", "is_public" => "1"},
+         :column_names => ["", "tracker", "status", "priority", "subject", "updated_on", "category"]
+         
+    assert_redirected_to :controller => 'issues', :action => 'index', :query_id => 4
+    q = Query.find_by_name('test_edit_global_public_query')
+    assert q.is_public?
+    assert q.has_default_columns?
+    assert q.valid?
+  end
+  
+  def test_get_edit_global_private_query
+    @request.session[:user_id] = 3
+    get :edit, :id => 3
+    assert_response :success
+    assert_template 'edit'
+    assert_no_tag :tag => 'input', :attributes => { :type => 'checkbox',
+                                                    :name => 'query[is_public]' } 
+    assert_tag :tag => 'input', :attributes => { :type => 'checkbox',
+                                                 :name => 'query_is_for_all',
+                                                 :checked => 'checked',
+                                                 :disabled => 'disabled' }
+  end
+  
+  def test_edit_global_private_query
+    @request.session[:user_id] = 3
+    post :edit,
+         :id => 3, 
+         :confirm => '1',
+         :default_columns => '1',
+         :fields => ["status_id", "assigned_to_id"],
+         :operators => {"assigned_to_id" => "=", "status_id" => "o"},
+         :values => { "assigned_to_id" => ["me"], "status_id" => ["1"]},
+         :query => {"name" => "test_edit_global_private_query", "is_public" => "1"},
+         :column_names => ["", "tracker", "status", "priority", "subject", "updated_on", "category"]
+         
+    assert_redirected_to :controller => 'issues', :action => 'index', :query_id => 3
+    q = Query.find_by_name('test_edit_global_private_query')
+    assert !q.is_public?
+    assert q.has_default_columns?
+    assert q.valid?
+  end
+  
+  def test_get_edit_project_private_query
+    @request.session[:user_id] = 3
+    get :edit, :id => 2
+    assert_response :success
+    assert_template 'edit'
+    assert_no_tag :tag => 'input', :attributes => { :type => 'checkbox',
+                                                    :name => 'query[is_public]' } 
+    assert_tag :tag => 'input', :attributes => { :type => 'checkbox',
+                                                 :name => 'query_is_for_all',
+                                                 :checked => nil,
+                                                 :disabled => nil }
+  end
+  
+  def test_get_edit_project_public_query
+    @request.session[:user_id] = 2
+    get :edit, :id => 1
+    assert_response :success
+    assert_template 'edit'
+    assert_tag :tag => 'input', :attributes => { :type => 'checkbox',
+                                                 :name => 'query[is_public]',
+                                                 :checked => 'checked'
+                                                  } 
+    assert_tag :tag => 'input', :attributes => { :type => 'checkbox',
+                                                 :name => 'query_is_for_all',
+                                                 :checked => nil,
+                                                 :disabled => 'disabled' }
+  end
+  
+  def test_destroy
+    @request.session[:user_id] = 2
+    post :destroy, :id => 1
+    assert_redirected_to :controller => 'issues', :action => 'index', :project_id => 'ecookbook', :set_filter => 1, :query_id => nil
+    assert_nil Query.find_by_id(1)
+  end
+end
diff --git a/test/unit/query_test.rb b/test/unit/query_test.rb
index c00f47e5d..3a9d19112 100644
--- a/test/unit/query_test.rb
+++ b/test/unit/query_test.rb
@@ -1,5 +1,5 @@
 # redMine - project management software
-# Copyright (C) 2006-2007  Jean-Philippe Lang
+# Copyright (C) 2006-2008  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
@@ -18,7 +18,7 @@
 require File.dirname(__FILE__) + '/../test_helper'
 
 class QueryTest < Test::Unit::TestCase
-  fixtures :projects, :users, :trackers, :issue_statuses, :issue_categories, :enumerations, :issues, :custom_fields, :custom_values, :queries
+  fixtures :projects, :users, :members, :roles, :trackers, :issue_statuses, :issue_categories, :enumerations, :issues, :custom_fields, :custom_values, :queries
 
   def test_query_with_multiple_custom_fields
     query = Query.find(1)
@@ -41,4 +41,34 @@ class QueryTest < Test::Unit::TestCase
     c = q.columns.first
     assert q.has_column?(c)
   end
+  
+  def test_editable_by
+    admin = User.find(1)
+    manager = User.find(2)
+    developer = User.find(3)
+    
+    # Public query on project 1
+    q = Query.find(1)
+    assert q.editable_by?(admin)
+    assert q.editable_by?(manager)
+    assert !q.editable_by?(developer)
+
+    # Private query on project 1
+    q = Query.find(2)
+    assert q.editable_by?(admin)
+    assert !q.editable_by?(manager)
+    assert q.editable_by?(developer)
+
+    # Private query for all projects
+    q = Query.find(3)
+    assert q.editable_by?(admin)
+    assert !q.editable_by?(manager)
+    assert q.editable_by?(developer)
+
+    # Public query for all projects
+    q = Query.find(4)
+    assert q.editable_by?(admin)
+    assert !q.editable_by?(manager)
+    assert !q.editable_by?(developer)
+  end
 end

From da641f4122f7034b87a67e87386104fb5d121166 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 30 Mar 2008 14:20:07 +0000
Subject: [PATCH 351/710] Global queries can be saved from the global issue
 list (follows r1311 and closes #897).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1312 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/queries_controller.rb      |  7 ++--
 app/models/user.rb                         | 31 +++++++++------
 app/views/issues/_sidebar.rhtml            |  2 +-
 app/views/issues/index.rhtml               |  2 +-
 test/functional/queries_controller_test.rb | 44 +++++++++++++++++-----
 5 files changed, 61 insertions(+), 25 deletions(-)

diff --git a/app/controllers/queries_controller.rb b/app/controllers/queries_controller.rb
index 194b1df57..da2c4a2c8 100644
--- a/app/controllers/queries_controller.rb
+++ b/app/controllers/queries_controller.rb
@@ -19,7 +19,7 @@ class QueriesController < ApplicationController
   layout 'base'
   menu_item :issues
   before_filter :find_query, :except => :new
-  before_filter :find_project, :authorize, :only => :new
+  before_filter :find_optional_project, :only => :new
   
   def new
     @query = Query.new(params[:query])
@@ -72,8 +72,9 @@ private
     render_404
   end
   
-  def find_project
-    @project = Project.find(params[:project_id])
+  def find_optional_project
+    @project = Project.find(params[:project_id]) if params[:project_id]
+    User.current.allowed_to?(:save_queries, @project, :global => true)
   rescue ActiveRecord::RecordNotFound
     render_404
   end
diff --git a/app/models/user.rb b/app/models/user.rb
index ae81d46d2..e0b1e238c 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -222,17 +222,26 @@ class User < ActiveRecord::Base
   # action can be:
   # * a parameter-like Hash (eg. :controller => 'projects', :action => 'edit')
   # * a permission Symbol (eg. :edit_project)
-  def allowed_to?(action, project)
-    # No action allowed on archived projects
-    return false unless project.active?
-    # No action allowed on disabled modules
-    return false unless project.allows_to?(action)
-    # Admin users are authorized for anything else
-    return true if admin?
-    
-    role = role_for_project(project)
-    return false unless role
-    role.allowed_to?(action) && (project.is_public? || role.member?)
+  def allowed_to?(action, project, options={})
+    if project
+      # No action allowed on archived projects
+      return false unless project.active?
+      # No action allowed on disabled modules
+      return false unless project.allows_to?(action)
+      # Admin users are authorized for anything else
+      return true if admin?
+      
+      role = role_for_project(project)
+      return false unless role
+      role.allowed_to?(action) && (project.is_public? || role.member?)
+      
+    elsif options[:global]
+      # authorize if user has at least one role that has this permission
+      roles = memberships.collect {|m| m.role}.uniq
+      roles.detect {|r| r.allowed_to?(action)}
+    else
+      false
+    end
   end
   
   def self.current=(user)
diff --git a/app/views/issues/_sidebar.rhtml b/app/views/issues/_sidebar.rhtml
index c269eee06..e94d4180b 100644
--- a/app/views/issues/_sidebar.rhtml
+++ b/app/views/issues/_sidebar.rhtml
@@ -1,6 +1,6 @@
-<% if @project %>
 <h3><%= l(:label_issue_plural) %></h3>
 <%= link_to l(:label_issue_view_all), { :controller => 'issues', :action => 'index', :project_id => @project, :set_filter => 1 } %><br />
+<% if @project %>
 <%= link_to l(:field_summary), :controller => 'reports', :action => 'issue_report', :id => @project %><br />
 <%= link_to l(:label_change_log), :controller => 'projects', :action => 'changelog', :id => @project %>
 <% end %>
diff --git a/app/views/issues/index.rhtml b/app/views/issues/index.rhtml
index 0123099f2..027f3f006 100644
--- a/app/views/issues/index.rhtml
+++ b/app/views/issues/index.rhtml
@@ -18,7 +18,7 @@
                          :update => "content",
                        }, :class => 'icon icon-reload'  %>
                        
-    <% if current_role && current_role.allowed_to?(:save_queries) %>
+    <% if User.current.allowed_to?(:save_queries, @project, :global => true) %>
     <%= link_to l(:button_save), {}, :onclick => "$('query_form').submit(); return false;", :class => 'icon icon-save' %>
     <% end %>
     </p>
diff --git a/test/functional/queries_controller_test.rb b/test/functional/queries_controller_test.rb
index 86af8edd7..de08b4245 100644
--- a/test/functional/queries_controller_test.rb
+++ b/test/functional/queries_controller_test.rb
@@ -31,7 +31,7 @@ class QueriesControllerTest < Test::Unit::TestCase
     User.current = nil
   end
   
-  def test_get_new
+  def test_get_new_project_query
     @request.session[:user_id] = 2
     get :new, :project_id => 1
     assert_response :success
@@ -45,6 +45,19 @@ class QueriesControllerTest < Test::Unit::TestCase
                                                  :disabled => nil }
   end
   
+  def test_get_new_global_query
+    @request.session[:user_id] = 2
+    get :new
+    assert_response :success
+    assert_template 'new'
+    assert_no_tag :tag => 'input', :attributes => { :type => 'checkbox',
+                                                    :name => 'query[is_public]' } 
+    assert_tag :tag => 'input', :attributes => { :type => 'checkbox',
+                                                 :name => 'query_is_for_all',
+                                                 :checked => 'checked',
+                                                 :disabled => nil }
+  end
+  
   def test_new_project_public_query
     @request.session[:user_id] = 2
     post :new,
@@ -54,8 +67,7 @@ class QueriesControllerTest < Test::Unit::TestCase
          :fields => ["status_id", "assigned_to_id"],
          :operators => {"assigned_to_id" => "=", "status_id" => "o"},
          :values => { "assigned_to_id" => ["1"], "status_id" => ["1"]},
-         :query => {"name" => "test_new_project_public_query", "is_public" => "1"},
-         :column_names => ["", "tracker", "status", "priority", "subject", "updated_on", "category"]
+         :query => {"name" => "test_new_project_public_query", "is_public" => "1"}
          
     q = Query.find_by_name('test_new_project_public_query')
     assert_redirected_to :controller => 'issues', :action => 'index', :query_id => q
@@ -73,8 +85,7 @@ class QueriesControllerTest < Test::Unit::TestCase
          :fields => ["status_id", "assigned_to_id"],
          :operators => {"assigned_to_id" => "=", "status_id" => "o"},
          :values => { "assigned_to_id" => ["1"], "status_id" => ["1"]},
-         :query => {"name" => "test_new_project_private_query", "is_public" => "1"},
-         :column_names => ["", "tracker", "status", "priority", "subject", "updated_on", "category"]
+         :query => {"name" => "test_new_project_private_query", "is_public" => "1"}
          
     q = Query.find_by_name('test_new_project_private_query')
     assert_redirected_to :controller => 'issues', :action => 'index', :query_id => q
@@ -83,6 +94,23 @@ class QueriesControllerTest < Test::Unit::TestCase
     assert q.valid?
   end
   
+  def test_new_global_private_query_with_custom_columns
+    @request.session[:user_id] = 3
+    post :new,
+         :confirm => '1',
+         :fields => ["status_id", "assigned_to_id"],
+         :operators => {"assigned_to_id" => "=", "status_id" => "o"},
+         :values => { "assigned_to_id" => ["me"], "status_id" => ["1"]},
+         :query => {"name" => "test_new_global_private_query", "is_public" => "1", "column_names" => ["", "tracker", "subject", "priority", "category"]}
+         
+    q = Query.find_by_name('test_new_global_private_query')
+    assert_redirected_to :controller => 'issues', :action => 'index', :query_id => q
+    assert !q.is_public?
+    assert !q.has_default_columns?
+    assert_equal [:tracker, :subject, :priority, :category], q.columns.collect {|c| c.name}
+    assert q.valid?
+  end
+  
   def test_get_edit_global_public_query
     @request.session[:user_id] = 1
     get :edit, :id => 4
@@ -106,8 +134,7 @@ class QueriesControllerTest < Test::Unit::TestCase
          :fields => ["status_id", "assigned_to_id"],
          :operators => {"assigned_to_id" => "=", "status_id" => "o"},
          :values => { "assigned_to_id" => ["1"], "status_id" => ["1"]},
-         :query => {"name" => "test_edit_global_public_query", "is_public" => "1"},
-         :column_names => ["", "tracker", "status", "priority", "subject", "updated_on", "category"]
+         :query => {"name" => "test_edit_global_public_query", "is_public" => "1"}
          
     assert_redirected_to :controller => 'issues', :action => 'index', :query_id => 4
     q = Query.find_by_name('test_edit_global_public_query')
@@ -138,8 +165,7 @@ class QueriesControllerTest < Test::Unit::TestCase
          :fields => ["status_id", "assigned_to_id"],
          :operators => {"assigned_to_id" => "=", "status_id" => "o"},
          :values => { "assigned_to_id" => ["me"], "status_id" => ["1"]},
-         :query => {"name" => "test_edit_global_private_query", "is_public" => "1"},
-         :column_names => ["", "tracker", "status", "priority", "subject", "updated_on", "category"]
+         :query => {"name" => "test_edit_global_private_query", "is_public" => "1"}
          
     assert_redirected_to :controller => 'issues', :action => 'index', :query_id => 3
     q = Query.find_by_name('test_edit_global_private_query')

From 0d9e4196463b5cacc103186f888097b6189f58d5 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Mon, 31 Mar 2008 20:51:56 +0000
Subject: [PATCH 352/710] Add overflow:auto to the content div (closes #676,
 #748, #961).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1314 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 public/stylesheets/application.css | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index a1981c64a..3d614fe19 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -57,10 +57,7 @@ h4, .wiki h3 {font-size: 13px;padding: 2px 10px 1px 0px;margin-bottom: 5px; bord
 
 #content { width: 80%; background-color: #fff; margin: 0px; border-right: 1px solid #ddd; padding: 6px 10px 10px 10px; z-index: 10; height:600px; min-height: 600px;}
 * html #content{ width: 80%; padding-left: 0; margin-top: 0px; padding: 6px 10px 10px 10px;}
-html>body #content {
-height: auto;
-min-height: 600px;
-} 
+html>body #content { height: auto; min-height: 600px; overflow: auto; } 
 
 #main.nosidebar #sidebar{ display: none; }
 #main.nosidebar #content{ width: auto; border-right: 0; }
@@ -195,7 +192,7 @@ table#time-report .hours-dec { font-size: 0.9em; }
 .total-hours { font-size: 110%; font-weight: bold; }
 .total-hours span.hours-int { font-size: 120%; }
 
-.autoscroll {overflow-x: auto; padding:1px; width:100%; margin-bottom: 1.2em;}
+.autoscroll {overflow-x: auto; padding:1px; margin-bottom: 1.2em;}
 #user_firstname, #user_lastname, #user_mail, #my_account_form select { width: 90%; }
 
 .pagination {font-size: 90%}

From 68fe7856c9218d0bfa5c4cf468e7120cf2c964d4 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Mon, 31 Mar 2008 21:48:01 +0000
Subject: [PATCH 353/710] Move repetitive calendar include code from views into
 helper (patch #966 by Peter Suschlik).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1315 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/helpers/application_helper.rb | 13 +++++++++++++
 app/views/account/register.rhtml  |  7 -------
 app/views/issues/_form.rhtml      |  7 -------
 app/views/issues/bulk_edit.rhtml  |  7 -------
 app/views/projects/_form.rhtml    |  8 --------
 app/views/timelog/details.rhtml   |  7 -------
 app/views/timelog/edit.rhtml      |  7 -------
 app/views/timelog/report.rhtml    |  7 -------
 app/views/users/_form.rhtml       |  7 -------
 app/views/versions/_form.rhtml    |  7 -------
 10 files changed, 13 insertions(+), 64 deletions(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 77019eba3..e30343ff5 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -463,9 +463,22 @@ module ApplicationHelper
   end
   
   def calendar_for(field_id)
+    include_calendar_headers_tags
     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 include_calendar_headers_tags
+    unless @calendar_headers_tags_included
+      @calendar_headers_tags_included = true
+      content_for :header_tags do
+        javascript_include_tag('calendar/calendar') +
+        javascript_include_tag("calendar/lang/calendar-#{current_language}.js") +
+        javascript_include_tag('calendar/calendar-setup') +
+        stylesheet_link_tag('calendar')
+      end
+    end
+  end
   
   def wikitoolbar_for(field_id)
     return '' unless Setting.text_formatting == 'textile'
diff --git a/app/views/account/register.rhtml b/app/views/account/register.rhtml
index c1425a380..7cf4b6da3 100644
--- a/app/views/account/register.rhtml
+++ b/app/views/account/register.rhtml
@@ -35,10 +35,3 @@
 
 <%= submit_tag l(:button_submit) %>
 <% end %>
-
-<% content_for :header_tags do %>
-<%= javascript_include_tag 'calendar/calendar' %>
-<%= javascript_include_tag "calendar/lang/calendar-#{current_language}.js" %>
-<%= javascript_include_tag 'calendar/calendar-setup' %>
-<%= stylesheet_link_tag 'calendar' %>
-<% end %>
diff --git a/app/views/issues/_form.rhtml b/app/views/issues/_form.rhtml
index 5034e0a29..9bb74fd34 100644
--- a/app/views/issues/_form.rhtml
+++ b/app/views/issues/_form.rhtml
@@ -49,10 +49,3 @@
 <% end %>
 
 <%= wikitoolbar_for 'issue_description' %>
-
-<% content_for :header_tags do %>
-    <%= javascript_include_tag 'calendar/calendar' %>
-    <%= javascript_include_tag "calendar/lang/calendar-#{current_language}.js" %>
-    <%= javascript_include_tag 'calendar/calendar-setup' %>
-    <%= stylesheet_link_tag 'calendar' %>
-<% end %>
diff --git a/app/views/issues/bulk_edit.rhtml b/app/views/issues/bulk_edit.rhtml
index 31ed7ee56..86bc76765 100644
--- a/app/views/issues/bulk_edit.rhtml
+++ b/app/views/issues/bulk_edit.rhtml
@@ -47,10 +47,3 @@
 
 <p><%= submit_tag l(:button_submit) %>
 <% end %>
-
-<% content_for :header_tags do %>
-    <%= javascript_include_tag 'calendar/calendar' %>
-    <%= javascript_include_tag "calendar/lang/calendar-#{current_language}.js" %>
-    <%= javascript_include_tag 'calendar/calendar-setup' %>
-    <%= stylesheet_link_tag 'calendar' %>
-<% end %>
diff --git a/app/views/projects/_form.rhtml b/app/views/projects/_form.rhtml
index a810369d4..32e4dcd44 100644
--- a/app/views/projects/_form.rhtml
+++ b/app/views/projects/_form.rhtml
@@ -46,11 +46,3 @@
 </fieldset>
 <% end %>
 <!--[eoform:project]-->
-
-
-<% content_for :header_tags do %>
-<%= javascript_include_tag 'calendar/calendar' %>
-<%= javascript_include_tag "calendar/lang/calendar-#{current_language}.js" %>
-<%= javascript_include_tag 'calendar/calendar-setup' %>
-<%= stylesheet_link_tag 'calendar' %>
-<% end %>
diff --git a/app/views/timelog/details.rhtml b/app/views/timelog/details.rhtml
index cba1597d1..89793745e 100644
--- a/app/views/timelog/details.rhtml
+++ b/app/views/timelog/details.rhtml
@@ -44,10 +44,3 @@
 <span><%= link_to 'CSV', params.merge(:format => 'csv'), :class => 'csv' %></span>
 </p>
 <% end %>
-
-<% content_for :header_tags do %>
-    <%= javascript_include_tag 'calendar/calendar' %>
-    <%= javascript_include_tag "calendar/lang/calendar-#{current_language}.js" %>
-    <%= javascript_include_tag 'calendar/calendar-setup' %>
-    <%= stylesheet_link_tag 'calendar' %>
-<% end %>
diff --git a/app/views/timelog/edit.rhtml b/app/views/timelog/edit.rhtml
index 13d76f1ef..e221038a0 100644
--- a/app/views/timelog/edit.rhtml
+++ b/app/views/timelog/edit.rhtml
@@ -14,10 +14,3 @@
 <%= submit_tag l(:button_save) %>
 
 <% end %>
-
-<% content_for :header_tags do %>
-<%= javascript_include_tag 'calendar/calendar' %>
-<%= javascript_include_tag "calendar/lang/calendar-#{current_language}.js" %>
-<%= javascript_include_tag 'calendar/calendar-setup' %>
-<%= stylesheet_link_tag 'calendar' %>
-<% end %>
\ No newline at end of file
diff --git a/app/views/timelog/report.rhtml b/app/views/timelog/report.rhtml
index 8fc15a3b4..2682a5cb0 100644
--- a/app/views/timelog/report.rhtml
+++ b/app/views/timelog/report.rhtml
@@ -63,10 +63,3 @@
 <% end %>
 <% end %>
 <% end %>
-
-<% content_for :header_tags do %>
-<%= javascript_include_tag 'calendar/calendar' %>
-<%= javascript_include_tag "calendar/lang/calendar-#{current_language}.js" %>
-<%= javascript_include_tag 'calendar/calendar-setup' %>
-<%= stylesheet_link_tag 'calendar' %>
-<% end %>
diff --git a/app/views/users/_form.rhtml b/app/views/users/_form.rhtml
index d32399c60..ff4278c1f 100644
--- a/app/views/users/_form.rhtml
+++ b/app/views/users/_form.rhtml
@@ -30,10 +30,3 @@
 </div>
 </div>
 <!--[eoform:user]-->
-
-<% content_for :header_tags do %>
-<%= javascript_include_tag 'calendar/calendar' %>
-<%= javascript_include_tag "calendar/lang/calendar-#{current_language}.js" %>
-<%= javascript_include_tag 'calendar/calendar-setup' %>
-<%= stylesheet_link_tag 'calendar' %>
-<% end %>
\ No newline at end of file
diff --git a/app/views/versions/_form.rhtml b/app/views/versions/_form.rhtml
index e18f912bf..adc83b573 100644
--- a/app/views/versions/_form.rhtml
+++ b/app/views/versions/_form.rhtml
@@ -6,10 +6,3 @@
 <p><%= f.text_field :wiki_page_title, :label => :label_wiki_page, :size => 60, :disabled => @project.wiki.nil? %></p>
 <p><%= f.text_field :effective_date, :size => 10 %><%= calendar_for('version_effective_date') %></p>
 </div>
-
-<% content_for :header_tags do %>
-<%= javascript_include_tag 'calendar/calendar' %>
-<%= javascript_include_tag "calendar/lang/calendar-#{current_language}.js" %>
-<%= javascript_include_tag 'calendar/calendar-setup' %>
-<%= stylesheet_link_tag 'calendar' %>
-<% end %>

From 80a5ad7ff344b9c5047a1990f6af19f97c4bd680 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Tue, 1 Apr 2008 17:43:20 +0000
Subject: [PATCH 354/710] Fixed: Boards are not deleted when project is deleted
 (closes #963).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1316 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/models/project.rb     | 2 +-
 test/unit/project_test.rb | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/app/models/project.rb b/app/models/project.rb
index a223b35f0..eaa33c969 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -33,7 +33,7 @@ class Project < ActiveRecord::Base
   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_many :boards, :dependent => :destroy, :order => "position ASC"
   has_one :repository, :dependent => :destroy
   has_many :changesets, :through => :repository
   has_one :wiki, :dependent => :destroy
diff --git a/test/unit/project_test.rb b/test/unit/project_test.rb
index f7da6ecb5..9af68c231 100644
--- a/test/unit/project_test.rb
+++ b/test/unit/project_test.rb
@@ -18,7 +18,7 @@
 require File.dirname(__FILE__) + '/../test_helper'
 
 class ProjectTest < Test::Unit::TestCase
-  fixtures :projects, :issues, :issue_statuses, :journals, :journal_details, :users, :members, :roles, :projects_trackers, :trackers
+  fixtures :projects, :issues, :issue_statuses, :journals, :journal_details, :users, :members, :roles, :projects_trackers, :trackers, :boards
 
   def setup
     @ecookbook = Project.find(1)
@@ -84,12 +84,15 @@ class ProjectTest < Test::Unit::TestCase
     assert_equal 2, @ecookbook.members.size
     # and 1 is locked
     assert_equal 3, Member.find(:all, :conditions => ['project_id = ?', @ecookbook.id]).size
+    # some boards
+    assert @ecookbook.boards.any?
     
     @ecookbook.destroy
     # make sure that the project non longer exists
     assert_raise(ActiveRecord::RecordNotFound) { Project.find(@ecookbook.id) }
-    # make sure all members have been removed
-    assert_equal 0, Member.find(:all, :conditions => ['project_id = ?', @ecookbook.id]).size
+    # make sure related data was removed
+    assert Member.find(:all, :conditions => ['project_id = ?', @ecookbook.id]).empty?
+    assert Board.find(:all, :conditions => ['project_id = ?', @ecookbook.id]).empty?
   end
   
   def test_subproject_ok

From e4da9d6f10edda72211b63659ab938a5ad7f0cda Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Tue, 1 Apr 2008 17:48:11 +0000
Subject: [PATCH 355/710] Prevent NoMethodError on nil class if custom_fields
 params is not present in IssuesController#new (#969).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1317 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/issues_controller.rb      |  4 +++-
 test/functional/issues_controller_test.rb | 10 ++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index 7d4212095..269e988d9 100644
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -140,7 +140,9 @@ class IssuesController < ApplicationController
       requested_status = IssueStatus.find_by_id(params[:issue][:status_id])
       # Check that the user is allowed to apply the requested status
       @issue.status = (@allowed_statuses.include? requested_status) ? requested_status : default_status
-      @custom_values = @project.custom_fields_for_issues(@issue.tracker).collect { |x| CustomValue.new(:custom_field => x, :customized => @issue, :value => params["custom_fields"][x.id.to_s]) }
+      @custom_values = @project.custom_fields_for_issues(@issue.tracker).collect { |x| CustomValue.new(:custom_field => x, 
+                                                                                                       :customized => @issue,
+                                                                                                       :value => (params[:custom_fields] ? params[:custom_fields][x.id.to_s] : nil)) }
       @issue.custom_values = @custom_values
       if @issue.save
         attach_files(@issue, params[:attachments])
diff --git a/test/functional/issues_controller_test.rb b/test/functional/issues_controller_test.rb
index 7d49f088d..89769ffe2 100644
--- a/test/functional/issues_controller_test.rb
+++ b/test/functional/issues_controller_test.rb
@@ -181,6 +181,16 @@ class IssuesControllerTest < Test::Unit::TestCase
     assert_equal 'Value for field 2', v.value
   end
   
+  def test_post_new_without_custom_fields_param
+    @request.session[:user_id] = 2
+    post :new, :project_id => 1, 
+               :issue => {:tracker_id => 1,
+                          :subject => 'This is the test_new issue',
+                          :description => 'This is the description',
+                          :priority_id => 5}
+    assert_redirected_to 'issues/show'
+  end
+  
   def test_copy_issue
     @request.session[:user_id] = 2
     get :new, :project_id => 1, :copy_from => 1

From 043cb37b161d712e1c6fe7b9aa41d7af356cf795 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Tue, 1 Apr 2008 19:40:40 +0000
Subject: [PATCH 356/710] Add predefined date ranges to the time report in the
 same way as the details view (closes #972). It nows defaults to 'All time'.
 This patch also fixes time report periods (columns) computation.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1318 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/timelog_controller.rb      | 135 +++++++++++----------
 app/views/timelog/_date_range.rhtml        |  16 +++
 app/views/timelog/details.rhtml            |  18 +--
 app/views/timelog/report.rhtml             |  26 ++--
 test/functional/timelog_controller_test.rb |  18 ++-
 5 files changed, 108 insertions(+), 105 deletions(-)
 create mode 100644 app/views/timelog/_date_range.rhtml

diff --git a/app/controllers/timelog_controller.rb b/app/controllers/timelog_controller.rb
index 8cfe225d1..7e2b55872 100644
--- a/app/controllers/timelog_controller.rb
+++ b/app/controllers/timelog_controller.rb
@@ -53,16 +53,11 @@ class TimelogController < ApplicationController
     @criterias.uniq!
     @criterias = @criterias[0,3]
     
-    @columns = (params[:period] && %w(year month week).include?(params[:period])) ? params[:period] : 'month'
+    @columns = (params[:columns] && %w(year month week).include?(params[:columns])) ? params[:columns] : '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
+    retrieve_date_range
+    @from ||= TimeEntry.minimum(:spent_on, :include => :project, :conditions => @project.project_condition(Setting.display_subprojects_issues?)) || Date.today
+    @to   ||= TimeEntry.maximum(:spent_on, :include => :project, :conditions => @project.project_condition(Setting.display_subprojects_issues?)) || Date.today
     
     unless @criterias.empty?
       sql_select = @criterias.collect{|criteria| @available_criterias[criteria][:sql] + " AS " + criteria}.join(', ')
@@ -74,7 +69,7 @@ class TimelogController < ApplicationController
       sql << " LEFT JOIN #{Project.table_name} ON #{TimeEntry.table_name}.project_id = #{Project.table_name}.id"
       sql << " WHERE (%s)" % @project.project_condition(Setting.display_subprojects_issues?)
       sql << " AND (%s)" % Project.allowed_to_condition(User.current, :view_time_entries)
-      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 << " AND spent_on BETWEEN '%s' AND '%s'" % [ActiveRecord::Base.connection.quoted_date(@from.to_time), ActiveRecord::Base.connection.quoted_date(@to.to_time)]
       sql << " GROUP BY #{sql_group_by}, tyear, tmonth, tweek"
       
       @hours = ActiveRecord::Base.connection.select_all(sql)
@@ -91,22 +86,23 @@ class TimelogController < ApplicationController
       end
       
       @total_hours = @hours.inject(0) {|s,k| s = s + k['hours'].to_f}
-    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
+      
+      @periods = []
+      # Date#at_beginning_of_ not supported in Rails 1.2.x
+      date_from = @from.to_time
+      # 100 columns max
+      while date_from <= @to.to_time && @periods.length < 100
+        case @columns
+        when 'year'
+          @periods << "#{date_from.year}"
+          date_from = (date_from + 1.year).at_beginning_of_year
+        when 'month'
+          @periods << "#{date_from.year}-#{date_from.month}"
+          date_from = (date_from + 1.month).at_beginning_of_month
+        when 'week'
+          @periods << "#{date_from.year}-#{date_from.to_date.cweek}"
+          date_from = (date_from + 7.day).at_beginning_of_week
+        end
       end
     end
     
@@ -116,52 +112,13 @@ class TimelogController < ApplicationController
   def details
     sort_init 'spent_on', 'desc'
     sort_update
-
-    @free_period = false
-    @from, @to = nil, nil
-
-    if params[:period_type] == '1' || (params[:period_type].nil? && !params[:period].nil?)
-      case params[:period].to_s
-      when 'today'
-        @from = @to = Date.today
-      when 'yesterday'
-        @from = @to = Date.today - 1
-      when 'current_week'
-        @from = Date.today - (Date.today.cwday - 1)%7
-        @to = @from + 6
-      when 'last_week'
-        @from = Date.today - 7 - (Date.today.cwday - 1)%7
-        @to = @from + 6
-      when '7_days'
-        @from = Date.today - 7
-        @to = Date.today
-      when 'current_month'
-        @from = Date.civil(Date.today.year, Date.today.month, 1)
-        @to = (@from >> 1) - 1
-      when 'last_month'
-        @from = Date.civil(Date.today.year, Date.today.month, 1) << 1
-        @to = (@from >> 1) - 1
-      when '30_days'
-        @from = Date.today - 30
-        @to = Date.today
-      when 'current_year'
-        @from = Date.civil(Date.today.year, 1, 1)
-        @to = Date.civil(Date.today.year, 12, 31)
-      end
-    elsif params[:period_type] == '2' || (params[:period_type].nil? && (!params[:from].nil? || !params[:to].nil?))
-      begin; @from = params[:from].to_s.to_date unless params[:from].blank?; rescue; end
-      begin; @to = params[:to].to_s.to_date unless params[:to].blank?; rescue; end
-      @free_period = true
-    else
-      # default
-    end
-    
-    @from, @to = @to, @from if @from && @to && @from > @to
     
     cond = ARCondition.new
     cond << (@issue.nil? ? @project.project_condition(Setting.display_subprojects_issues?) :
                            ["#{TimeEntry.table_name}.issue_id = ?", @issue.id])
     
+    retrieve_date_range
+    
     if @from
       if @to
         cond << ['spent_on BETWEEN ? AND ?', @from, @to]
@@ -238,4 +195,48 @@ private
   rescue ActiveRecord::RecordNotFound
     render_404
   end
+  
+  # Retreive the date range based on predefined ranges or specific from/to param dates
+  def retrieve_date_range
+    @free_period = false
+    @from, @to = nil, nil
+
+    if params[:period_type] == '1' || (params[:period_type].nil? && !params[:period].nil?)
+      case params[:period].to_s
+      when 'today'
+        @from = @to = Date.today
+      when 'yesterday'
+        @from = @to = Date.today - 1
+      when 'current_week'
+        @from = Date.today - (Date.today.cwday - 1)%7
+        @to = @from + 6
+      when 'last_week'
+        @from = Date.today - 7 - (Date.today.cwday - 1)%7
+        @to = @from + 6
+      when '7_days'
+        @from = Date.today - 7
+        @to = Date.today
+      when 'current_month'
+        @from = Date.civil(Date.today.year, Date.today.month, 1)
+        @to = (@from >> 1) - 1
+      when 'last_month'
+        @from = Date.civil(Date.today.year, Date.today.month, 1) << 1
+        @to = (@from >> 1) - 1
+      when '30_days'
+        @from = Date.today - 30
+        @to = Date.today
+      when 'current_year'
+        @from = Date.civil(Date.today.year, 1, 1)
+        @to = Date.civil(Date.today.year, 12, 31)
+      end
+    elsif params[:period_type] == '2' || (params[:period_type].nil? && (!params[:from].nil? || !params[:to].nil?))
+      begin; @from = params[:from].to_s.to_date unless params[:from].blank?; rescue; end
+      begin; @to = params[:to].to_s.to_date unless params[:to].blank?; rescue; end
+      @free_period = true
+    else
+      # default
+    end
+    
+    @from, @to = @to, @from if @from && @to && @from > @to
+  end
 end
diff --git a/app/views/timelog/_date_range.rhtml b/app/views/timelog/_date_range.rhtml
new file mode 100644
index 000000000..ac46fea18
--- /dev/null
+++ b/app/views/timelog/_date_range.rhtml
@@ -0,0 +1,16 @@
+<fieldset><legend><%= l(:label_date_range) %></legend>
+<p>
+<%= radio_button_tag 'period_type', '1', !@free_period %>
+<%= select_tag 'period', options_for_period_select(params[:period]),
+                         :onchange => 'this.form.onsubmit();',
+                         :onfocus => '$("period_type_1").checked = true;' %>
+</p>
+<p>
+<%= radio_button_tag 'period_type', '2', @free_period %>
+<%= l(:label_date_from) %>
+<%= text_field_tag 'from', @from, :size => 10, :onfocus => '$("period_type_2").checked = true;' %> <%= calendar_for('from') %>
+<%= l(:label_date_to) %>
+<%= text_field_tag 'to', @to, :size => 10, :onfocus => '$("period_type_2").checked = true;' %> <%= calendar_for('to') %>
+<%= submit_tag l(:button_apply), :name => nil, :onclick => '$("period_type_2").checked = true;' %>
+</p>
+</fieldset>
diff --git a/app/views/timelog/details.rhtml b/app/views/timelog/details.rhtml
index 89793745e..f1e80da1f 100644
--- a/app/views/timelog/details.rhtml
+++ b/app/views/timelog/details.rhtml
@@ -12,23 +12,7 @@
 <% form_remote_tag( :url => {}, :method => :get, :update => 'content' ) do %>
 <%= hidden_field_tag 'project_id', params[:project_id] %>
 <%= hidden_field_tag 'issue_id', params[:issue_id] if @issue %>
-
-<fieldset><legend><%= l(:label_date_range) %></legend>
-<p>
-<%= radio_button_tag 'period_type', '1', !@free_period %>
-<%= select_tag 'period', options_for_period_select(params[:period]),
-                         :onchange => 'this.form.onsubmit();',
-                         :onfocus => '$("period_type_1").checked = true;' %>
-</p>
-<p>
-<%= radio_button_tag 'period_type', '2', @free_period %>
-<%= l(:label_date_from) %>
-<%= text_field_tag 'from', @from, :size => 10, :onfocus => '$("period_type_2").checked = true;' %> <%= calendar_for('from') %>
-<%= l(:label_date_to) %>
-<%= text_field_tag 'to', @to, :size => 10, :onfocus => '$("period_type_2").checked = true;' %> <%= calendar_for('to') %>
-<%= submit_tag l(:button_apply), :name => nil, :onclick => '$("period_type_2").checked = true;' %>
-</p>
-</fieldset>
+<%= render :partial => 'date_range' %>
 <% end %>
 
 <div class="total-hours">
diff --git a/app/views/timelog/report.rhtml b/app/views/timelog/report.rhtml
index 2682a5cb0..2e08e5883 100644
--- a/app/views/timelog/report.rhtml
+++ b/app/views/timelog/report.rhtml
@@ -5,32 +5,27 @@
 
 <h2><%= l(:label_spent_time) %></h2>
 
-<% form_remote_tag(:url => {:project_id => @project}, :update => 'content') do %>
+<% form_remote_tag(:url => {}, :update => 'content') do %>
   <% @criterias.each do |criteria| %>
     <%= hidden_field_tag 'criterias[]', criteria %>
   <% end %>
-  <fieldset><legend><%= l(:label_date_range) %></legend>
-  <p>
-  <%= l(:label_date_from) %>
-  <%= text_field_tag 'date_from', @date_from, :size => 10 %><%= calendar_for('date_from') %>
-  <%= l(:label_date_to) %>
-  <%= text_field_tag 'date_to', @date_to, :size => 10 %><%= calendar_for('date_to') %>
-  <%= l(:label_details) %>
-  <%= select_tag 'period', options_for_select([[l(:label_year), 'year'],
-                                               [l(:label_month), 'month'],
-                                               [l(:label_week), 'week']], @columns) %>
-  &nbsp;
-  <%= submit_tag l(:button_apply) %>
+  <%= hidden_field_tag 'project_id', params[:project_id] %>
+  <%= render :partial => 'date_range' %>
   </p>
   </fieldset>
+  <p><%= l(:label_details) %>: <%= select_tag 'columns', options_for_select([[l(:label_year), 'year'],
+                                                                            [l(:label_month), 'month'],
+                                                                            [l(:label_week), 'week']], @columns),
+                                                        :onchange => "this.form.onsubmit();" %>
 
-  <p><%= l(:button_add) %>: <%= select_tag('criterias[]', options_for_select([[]] + (@available_criterias.keys - @criterias).collect{|k| [l(@available_criterias[k][:label]), k]}),
+  <%= l(:button_add) %>: <%= select_tag('criterias[]', options_for_select([[]] + (@available_criterias.keys - @criterias).collect{|k| [l(@available_criterias[k][:label]), k]}),
                                                           :onchange => "this.form.onsubmit();",
                                                           :style => 'width: 200px',
                                                           :disabled => (@criterias.length >= 3)) %>
      <%= link_to_remote l(:button_clear), {:url => {:project_id => @project, :date_from => @date_from, :date_to => @date_to, :period => @columns}, :update => 'content'},
                                           :class => 'icon icon-reload' %></p>
-  
+<% end %>
+
 <% unless @criterias.empty? %>
 <div class="total-hours">
 <p><%= l(:label_total) %>: <%= html_hours(lwr(:label_f_hour, @total_hours)) %></p>
@@ -62,4 +57,3 @@
 </table>
 <% end %>
 <% end %>
-<% end %>
diff --git a/test/functional/timelog_controller_test.rb b/test/functional/timelog_controller_test.rb
index fa4432295..9ca1a6cbf 100644
--- a/test/functional/timelog_controller_test.rb
+++ b/test/functional/timelog_controller_test.rb
@@ -78,17 +78,25 @@ class TimelogControllerTest < Test::Unit::TestCase
     assert_response :success
     assert_template 'report'
   end
-  
+
+  def test_report_all_time
+    get :report, :project_id => 1, :criterias => ['project']
+    assert_response :success
+    assert_template 'report'
+    assert_not_nil assigns(:total_hours)
+    assert_equal "162.90", "%.2f" % assigns(:total_hours)
+  end
+    
   def test_report_one_criteria
-    get :report, :project_id => 1, :period => 'week', :date_from => "2007-04-01", :date_to => "2007-04-30", :criterias => ['project']
+    get :report, :project_id => 1, :columns => 'week', :from => "2007-04-01", :to => "2007-04-30", :criterias => ['project']
     assert_response :success
     assert_template 'report'
     assert_not_nil assigns(:total_hours)
     assert_equal "8.65", "%.2f" % assigns(:total_hours)
- end
+  end
   
   def test_report_two_criterias
-    get :report, :project_id => 1, :period => 'month', :date_from => "2007-01-01", :date_to => "2007-12-31", :criterias => ["member", "activity"]
+    get :report, :project_id => 1, :columns => 'month', :from => "2007-01-01", :to => "2007-12-31", :criterias => ["member", "activity"]
     assert_response :success
     assert_template 'report'
     assert_not_nil assigns(:total_hours)
@@ -96,7 +104,7 @@ class TimelogControllerTest < Test::Unit::TestCase
   end
   
   def test_report_one_criteria_no_result
-    get :report, :project_id => 1, :period => 'week', :date_from => "1998-04-01", :date_to => "1998-04-30", :criterias => ['project']
+    get :report, :project_id => 1, :columns => 'week', :from => "1998-04-01", :to => "1998-04-30", :criterias => ['project']
     assert_response :success
     assert_template 'report'
     assert_not_nil assigns(:total_hours)

From 467f74510e44d2c0821fad691a71bc0292b8944c Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Tue, 1 Apr 2008 22:42:10 +0000
Subject: [PATCH 357/710] Time report can be done at issue level (closes #970)
 + timelog views xhtml validation.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1319 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/timelog_controller.rb      |  7 +++++--
 app/models/issue.rb                        |  4 ++++
 app/views/timelog/_list.rhtml              |  4 +++-
 app/views/timelog/details.rhtml            |  2 ++
 app/views/timelog/report.rhtml             | 13 ++++++++-----
 public/stylesheets/application.css         |  2 +-
 test/functional/timelog_controller_test.rb |  2 +-
 7 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/app/controllers/timelog_controller.rb b/app/controllers/timelog_controller.rb
index 7e2b55872..e617d3805 100644
--- a/app/controllers/timelog_controller.rb
+++ b/app/controllers/timelog_controller.rb
@@ -45,7 +45,10 @@ class TimelogController < ApplicationController
                                           :label => :label_tracker},
                              'activity' => {:sql => "#{TimeEntry.table_name}.activity_id",
                                            :klass => Enumeration,
-                                           :label => :label_activity}
+                                           :label => :label_activity},
+                             'issue' => {:sql => "#{TimeEntry.table_name}.issue_id",
+                                         :klass => Issue,
+                                         :label => :label_issue}
                            }
     
     @criterias = params[:criterias] || []
@@ -196,7 +199,7 @@ private
     render_404
   end
   
-  # Retreive the date range based on predefined ranges or specific from/to param dates
+  # Retrieves the date range based on predefined ranges or specific from/to param dates
   def retrieve_date_range
     @free_period = false
     @from, @to = nil, nil
diff --git a/app/models/issue.rb b/app/models/issue.rb
index 1d25a4604..d6fcf53f2 100644
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -237,4 +237,8 @@ class Issue < ActiveRecord::Base
       yield
     end
   end
+  
+  def to_s
+    "#{tracker} ##{id}: #{subject}"
+  end
 end
diff --git a/app/views/timelog/_list.rhtml b/app/views/timelog/_list.rhtml
index 67e3c67d5..189f4f5e8 100644
--- a/app/views/timelog/_list.rhtml
+++ b/app/views/timelog/_list.rhtml
@@ -1,5 +1,6 @@
 <table class="list time-entries">
 <thead>
+<tr>
 <%= sort_header_tag('spent_on', :caption => l(:label_date), :default_order => 'desc') %>
 <%= sort_header_tag('user_id', :caption => l(:label_member)) %>
 <%= sort_header_tag('activity_id', :caption => l(:label_activity)) %>
@@ -8,6 +9,7 @@
 <th><%= l(:field_comments) %></th>
 <%= sort_header_tag('hours', :caption => l(:field_hours)) %>
 <th></th>
+</tr>
 </thead>
 <tbody>
 <% entries.each do |entry| -%>
@@ -35,5 +37,5 @@
 </td>
 </tr>
 <% end -%>
-</tbdoy>
+</tbody>
 </table>
diff --git a/app/views/timelog/details.rhtml b/app/views/timelog/details.rhtml
index f1e80da1f..a0810fbde 100644
--- a/app/views/timelog/details.rhtml
+++ b/app/views/timelog/details.rhtml
@@ -28,3 +28,5 @@
 <span><%= link_to 'CSV', params.merge(:format => 'csv'), :class => 'csv' %></span>
 </p>
 <% end %>
+
+<% html_title l(:label_spent_time), l(:label_details) %>
diff --git a/app/views/timelog/report.rhtml b/app/views/timelog/report.rhtml
index 2e08e5883..92d0e8782 100644
--- a/app/views/timelog/report.rhtml
+++ b/app/views/timelog/report.rhtml
@@ -7,12 +7,11 @@
 
 <% form_remote_tag(:url => {}, :update => 'content') do %>
   <% @criterias.each do |criteria| %>
-    <%= hidden_field_tag 'criterias[]', criteria %>
+    <%= hidden_field_tag 'criterias[]', criteria, :id => nil %>
   <% end %>
   <%= hidden_field_tag 'project_id', params[:project_id] %>
   <%= render :partial => 'date_range' %>
-  </p>
-  </fieldset>
+
   <p><%= l(:label_details) %>: <%= select_tag 'columns', options_for_select([[l(:label_year), 'year'],
                                                                             [l(:label_month), 'month'],
                                                                             [l(:label_week), 'week']], @columns),
@@ -21,6 +20,7 @@
   <%= l(:button_add) %>: <%= select_tag('criterias[]', options_for_select([[]] + (@available_criterias.keys - @criterias).collect{|k| [l(@available_criterias[k][:label]), k]}),
                                                           :onchange => "this.form.onsubmit();",
                                                           :style => 'width: 200px',
+                                                          :id => nil,
                                                           :disabled => (@criterias.length >= 3)) %>
      <%= link_to_remote l(:button_clear), {:url => {:project_id => @project, :date_from => @date_from, :date_to => @date_to, :period => @columns}, :update => 'content'},
                                           :class => 'icon icon-reload' %></p>
@@ -36,10 +36,10 @@
 <thead>
 <tr>
 <% @criterias.each do |criteria| %>
-  <th width="15%"><%= l(@available_criterias[criteria][:label]) %></th>
+  <th><%= l(@available_criterias[criteria][:label]) %></th>
 <% end %>
 <% @periods.each do |period| %>
-  <th width="<%= ((100 - @criterias.length * 15 - 15 ) / @periods.length).to_i %>%"><%= period %></th>
+  <th class="period" width="<%= (40 / @periods.length).to_i %>%"><%= period %></th>
 <% end %>
 </tr>
 </thead>
@@ -57,3 +57,6 @@
 </table>
 <% end %>
 <% end %>
+
+<% html_title l(:label_spent_time), l(:label_report) %>
+
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 3d614fe19..69e89b0ed 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -183,7 +183,7 @@ div#version-summary { float:right; width:380px; margin-left: 16px; margin-bottom
 div#version-summary fieldset { margin-bottom: 1em; }
 div#version-summary .total-hours { text-align: right; }
 
-table#time-report td.hours { text-align: right; padding-right: 0.5em; }
+table#time-report td.hours, table#time-report th.period { text-align: right; padding-right: 0.5em; }
 table#time-report tbody tr { font-style: italic; color: #777; }
 table#time-report tbody tr.last-level { font-style: normal; color: #555; }
 table#time-report tbody tr.total { font-style: normal; font-weight: bold; color: #555; background-color:#EEEEEE; }
diff --git a/test/functional/timelog_controller_test.rb b/test/functional/timelog_controller_test.rb
index 9ca1a6cbf..c55d5248c 100644
--- a/test/functional/timelog_controller_test.rb
+++ b/test/functional/timelog_controller_test.rb
@@ -80,7 +80,7 @@ class TimelogControllerTest < Test::Unit::TestCase
   end
 
   def test_report_all_time
-    get :report, :project_id => 1, :criterias => ['project']
+    get :report, :project_id => 1, :criterias => ['project', 'issue']
     assert_response :success
     assert_template 'report'
     assert_not_nil assigns(:total_hours)

From 4cbe6b626e3b338d7c8d7dcb236d40f8f99ff393 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Wed, 2 Apr 2008 19:52:12 +0000
Subject: [PATCH 358/710] Accept the following formats for the timelog "hours"
 field: 1h, 1 h, 1 hour, 2 hours, 30m, 30min, 1h30, 1h30m, 1:30. Also accept
 1,5 for 1.5 hour (closes #975). Note that 1.5 is still equal to 1h30 and not
 1h50 (#947).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1320 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/models/time_entry.rb     | 18 +++++++++++++-
 test/unit/time_entry_test.rb | 46 ++++++++++++++++++++++++++++++++++++
 2 files changed, 63 insertions(+), 1 deletion(-)
 create mode 100644 test/unit/time_entry_test.rb

diff --git a/app/models/time_entry.rb b/app/models/time_entry.rb
index bcf6d1223..0dce253c7 100644
--- a/app/models/time_entry.rb
+++ b/app/models/time_entry.rb
@@ -1,5 +1,5 @@
 # redMine - project management software
-# Copyright (C) 2006-2007  Jean-Philippe Lang
+# Copyright (C) 2006-2008  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
@@ -39,6 +39,22 @@ class TimeEntry < ActiveRecord::Base
     errors.add :issue_id, :activerecord_error_invalid if (issue_id && !issue) || (issue && project!=issue.project)
   end
   
+  def hours=(h)
+    s = h.dup
+    if s.is_a?(String)
+      s.strip!
+      unless s =~ %r{^[\d\.,]+$}
+        # 2:30 => 2.5
+        s.gsub!(%r{^(\d+):(\d+)$}) { $1.to_i + $2.to_i / 60.0 }
+        # 2h30, 2h, 30m
+        s.gsub!(%r{^((\d+)\s*(h|hours?))?\s*((\d+)\s*(m|min)?)?$}) { |m| ($1 || $4) ? ($2.to_i + $5.to_i / 60.0) : m[0] }
+      end
+      # 2,5 => 2.5
+      s.gsub!(',', '.')
+    end
+    write_attribute :hours, s
+  end
+  
   # tyear, tmonth, tweek assigned where setting spent_on attributes
   # these attributes make time aggregations easier
   def spent_on=(date)
diff --git a/test/unit/time_entry_test.rb b/test/unit/time_entry_test.rb
new file mode 100644
index 000000000..f86e42eab
--- /dev/null
+++ b/test/unit/time_entry_test.rb
@@ -0,0 +1,46 @@
+# redMine - project management software
+# Copyright (C) 2006-2008  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 File.dirname(__FILE__) + '/../test_helper'
+
+class TimeEntryTest < Test::Unit::TestCase
+  fixtures :issues, :projects, :users, :time_entries
+
+  def test_hours_format
+    assertions = { "2"      => 2.0,
+                   "21.1"   => 21.1,
+                   "2,1"    => 2.1,
+                   "7:12"   => 7.2,
+                   "10h"    => 10.0,
+                   "10 h"   => 10.0,
+                   "45m"    => 0.75,
+                   "45 m"   => 0.75,
+                   "3h15"   => 3.25,
+                   "3h 15"  => 3.25,
+                   "3 h 15"   => 3.25,
+                   "3 h 15m"  => 3.25,
+                   "3 h 15 m" => 3.25,
+                   "3 hours"  => 3.0,
+                   "12min"    => 0.2,
+                  }
+    
+    assertions.each do |k, v|
+      t = TimeEntry.new(:hours => k)
+      assert_equal v, t.hours
+    end
+  end
+end

From 6348eeaf8a5124dfd7793211d673bb928f1ea64b Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Wed, 2 Apr 2008 21:30:32 +0000
Subject: [PATCH 359/710] Attachment model clean up: fixed some inconsistent
 indentation and an inaccurate comment (closes patch #903 by Rocco Stanzione).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1321 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/models/attachment.rb | 97 ++++++++++++++++++++--------------------
 1 file changed, 48 insertions(+), 49 deletions(-)

diff --git a/app/models/attachment.rb b/app/models/attachment.rb
index cdcb8d231..08f440816 100644
--- a/app/models/attachment.rb
+++ b/app/models/attachment.rb
@@ -35,48 +35,48 @@ class Attachment < ActiveRecord::Base
     errors.add_to_base :too_long if self.filesize > Setting.attachment_max_size.to_i.kilobytes
   end
 
-	def file=(incomming_file)
-		unless incomming_file.nil?
-			@temp_file = incomming_file
-			if @temp_file.size > 0
-				self.filename = sanitize_filename(@temp_file.original_filename)
-				self.disk_filename = DateTime.now.strftime("%y%m%d%H%M%S") + "_" + self.filename
-				self.content_type = @temp_file.content_type.to_s.chomp
-				self.filesize = @temp_file.size
-			end
-		end
-	end
+  def file=(incoming_file)
+    unless incoming_file.nil?
+      @temp_file = incoming_file
+      if @temp_file.size > 0
+        self.filename = sanitize_filename(@temp_file.original_filename)
+        self.disk_filename = DateTime.now.strftime("%y%m%d%H%M%S") + "_" + self.filename
+        self.content_type = @temp_file.content_type.to_s.chomp
+        self.filesize = @temp_file.size
+      end
+    end
+  end
 	
-	def file
-	 nil
-	end
-	
-	# Copy temp file to its final location
-	def before_save
-		if @temp_file && (@temp_file.size > 0)
-			logger.debug("saving '#{self.diskfile}'")
-			File.open(diskfile, "wb") do |f| 
-				f.write(@temp_file.read)
-			end
-			self.digest = Digest::MD5.hexdigest(File.read(diskfile))
-		end
-		# Don't save the content type if it's longer than the authorized length
-		if self.content_type && self.content_type.length > 255
-		  self.content_type = nil
-		end
-	end
-	
-	# Deletes file on the disk
-	def after_destroy
-		if self.filename?
-			File.delete(diskfile) if File.exist?(diskfile)
-		end
-	end
-	
-	# Returns file's location on disk
-	def diskfile
-		"#{@@storage_path}/#{self.disk_filename}"
-	end
+  def file
+    nil
+  end
+
+  # Copy temp file to its final location
+  def before_save
+    if @temp_file && (@temp_file.size > 0)
+      logger.debug("saving '#{self.diskfile}'")
+      File.open(diskfile, "wb") do |f| 
+        f.write(@temp_file.read)
+      end
+      self.digest = Digest::MD5.hexdigest(File.read(diskfile))
+    end
+    # Don't save the content type if it's longer than the authorized length
+    if self.content_type && self.content_type.length > 255
+      self.content_type = nil
+    end
+  end
+
+  # Deletes file on the disk
+  def after_destroy
+    if self.filename?
+      File.delete(diskfile) if File.exist?(diskfile)
+    end
+  end
+
+  # Returns file's location on disk
+  def diskfile
+    "#{@@storage_path}/#{self.disk_filename}"
+  end
   
   def increment_download
     increment!(:downloads)
@@ -87,18 +87,17 @@ class Attachment < ActiveRecord::Base
   end
   
   def image?
-    self.filename =~ /\.(jpeg|jpg|gif|png)$/i
+    self.filename =~ /\.(jpe?g|gif|png)$/i
   end
   
 private
   def sanitize_filename(value)
-      # get only the filename, not the whole path
-      just_filename = value.gsub(/^.*(\\|\/)/, '')
-      # NOTE: File.basename doesn't work right with Windows paths on Unix
-      # INCORRECT: just_filename = File.basename(value.gsub('\\\\', '/')) 
+    # get only the filename, not the whole path
+    just_filename = value.gsub(/^.*(\\|\/)/, '')
+    # NOTE: File.basename doesn't work right with Windows paths on Unix
+    # INCORRECT: just_filename = File.basename(value.gsub('\\\\', '/')) 
 
-      # Finally, replace all non alphanumeric, underscore or periods with underscore
-      @filename = just_filename.gsub(/[^\w\.\-]/,'_') 
+    # Finally, replace all non alphanumeric, hyphens or periods with underscore
+    @filename = just_filename.gsub(/[^\w\.\-]/,'_') 
   end
-    
 end

From 7f0aa5611948ebed0c1eaf4c3218762fb50e199e Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Thu, 3 Apr 2008 13:16:51 +0000
Subject: [PATCH 360/710] Fixed: trying to preview a new issue raises an
 exception with postgresql (close #984).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1322 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/issues_controller.rb | 4 ++--
 app/views/issues/new.rhtml           | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index 269e988d9..b3f21fddf 100644
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -344,8 +344,8 @@ class IssuesController < ApplicationController
   end
   
   def preview
-    issue = @project.issues.find_by_id(params[:id])
-    @attachements = issue.attachments if issue
+    @issue = @project.issues.find_by_id(params[:id]) if params[:id]
+    @attachements = issue.attachments if @issue
     @text = params[:notes] || (params[:issue] ? params[:issue][:description] : nil)
     render :partial => 'common/preview'
   end
diff --git a/app/views/issues/new.rhtml b/app/views/issues/new.rhtml
index 7b9dde899..280e2009b 100644
--- a/app/views/issues/new.rhtml
+++ b/app/views/issues/new.rhtml
@@ -8,7 +8,7 @@
     </div>
     <%= submit_tag l(:button_create) %>
     <%= link_to_remote l(:label_preview), 
-                       { :url => { :controller => 'issues', :action => 'preview', :project_id => @project, :id => @issue },
+                       { :url => { :controller => 'issues', :action => 'preview', :project_id => @project },
                          :method => 'post',
                          :update => 'preview',
                          :with => "Form.serialize('issue-form')",

From f6ce427a00650e92f414dc3682e56348d549d7ea Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Thu, 3 Apr 2008 16:38:06 +0000
Subject: [PATCH 361/710] Display the context menu above and/or to the left of
 the click if needed (patch by Mike Duchene, closes #960).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1323 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 public/javascripts/context_menu.js  | 65 +++++++++++++++++++++++++++--
 public/stylesheets/context_menu.css | 10 ++---
 2 files changed, 66 insertions(+), 9 deletions(-)

diff --git a/public/javascripts/context_menu.js b/public/javascripts/context_menu.js
index e3f128d89..3e2d571fa 100644
--- a/public/javascripts/context_menu.js
+++ b/public/javascripts/context_menu.js
@@ -93,14 +93,55 @@ ContextMenu.prototype = {
   },
   
   showMenu: function(e) {
-		$('context-menu').style['left'] = (Event.pointerX(e) + 'px');
-		$('context-menu').style['top'] = (Event.pointerY(e) + 'px');		
-		Element.update('context-menu', '');
-		new Ajax.Updater({success:'context-menu'}, this.url, 
+    var mouse_x = Event.pointerX(e);
+    var mouse_y = Event.pointerY(e);
+    var render_x = mouse_x;
+    var render_y = mouse_y;
+    var dims;
+    var menu_width;
+    var menu_height;
+    var window_width;
+    var window_height;
+    var max_width;
+    var max_height;
+
+    $('context-menu').style['left'] = (render_x + 'px');
+    $('context-menu').style['top'] = (render_y + 'px');		
+    Element.update('context-menu', '');
+
+    new Ajax.Updater({success:'context-menu'}, this.url, 
       {asynchronous:true,
        evalScripts:true,
        parameters:Form.serialize(Event.findElement(e, 'form')),
        onComplete:function(request){
+				 dims = $('context-menu').getDimensions();
+				 menu_width = dims.width;
+				 menu_height = dims.height;
+				 max_width = mouse_x + 2*menu_width;
+				 max_height = mouse_y + menu_height;
+			
+				 var ws = window_size();
+				 window_width = ws.width;
+				 window_height = ws.height;
+			
+				 /* display the menu above and/or to the left of the click if needed */
+				 if (max_width > window_width) {
+				   render_x -= menu_width;
+				   $('context-menu').addClassName('reverse-x');
+				 } else {
+					 $('context-menu').removeClassName('reverse-x');
+				 }
+				 if (max_height > window_height) {
+				   render_y -= menu_height;
+				   $('context-menu').addClassName('reverse-y');
+				 } else {
+					 $('context-menu').removeClassName('reverse-y');
+				 }
+				 if (render_x <= 0) render_x = 1;
+				 if (render_y <= 0) render_y = 1;
+				 $('context-menu').style['left'] = (render_x + 'px');
+				 $('context-menu').style['top'] = (render_y + 'px');
+				 
          Effect.Appear('context-menu', {duration: 0.20});
          if (window.parseStylesheets) { window.parseStylesheets(); } // IE
       }})
@@ -159,3 +200,19 @@ function toggleIssuesSelection(el) {
 		}
 	}
 }
+
+function window_size() {
+    var w;
+    var h;
+    if (window.innerWidth) {
+	w = window.innerWidth;
+	h = window.innerHeight;
+    } else if (document.documentElement) {
+	w = document.documentElement.clientWidth;
+	h = document.documentElement.clientHeight;
+    } else {
+	w = document.body.clientWidth;
+	h = document.body.clientHeight;
+    }
+    return {width: w, height: h};
+}
diff --git a/public/stylesheets/context_menu.css b/public/stylesheets/context_menu.css
index f68b33fe1..e5a83be0d 100644
--- a/public/stylesheets/context_menu.css
+++ b/public/stylesheets/context_menu.css
@@ -22,13 +22,13 @@
 	padding:1px;
 	z-index:9;
 }
-#context-menu li.folder ul {
-	position:absolute;
-	left:168px; /* IE6 */
-	top:-2px;
-}
+#context-menu li.folder ul { position:absolute; left:168px; /* IE6 */ top:-2px; }
 #context-menu li.folder>ul { left:148px; }
 
+#context-menu.reverse-y li.folder>ul { top:auto; bottom:0; }
+#context-menu.reverse-x li.folder ul { left:auto; right:168px; /* IE6 */ }
+#context-menu.reverse-x li.folder>ul { right:148px; }
+
 #context-menu a {
 	border:1px solid white;
 	text-decoration:none;

From 14a2b7e9b5765de3145c63e22affee06f20e33fc Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Thu, 3 Apr 2008 16:50:53 +0000
Subject: [PATCH 362/710] Verify rev and rev_to params format in
 RepositoriesController. And turn revision arguments into integers in
 SubversionAdapter.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1324 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/repositories_controller.rb     | 11 ++++++++---
 lib/redmine/scm/adapters/subversion_adapter.rb | 14 ++++++--------
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb
index 10c235d65..9b59b51ec 100644
--- a/app/controllers/repositories_controller.rb
+++ b/app/controllers/repositories_controller.rb
@@ -19,8 +19,8 @@ require 'SVG/Graph/Bar'
 require 'SVG/Graph/BarHorizontal'
 require 'digest/sha1'
 
-class ChangesetNotFound < Exception
-end
+class ChangesetNotFound < Exception; end
+class InvalidRevisionParam < Exception; end
 
 class RepositoriesController < ApplicationController
   layout 'base'
@@ -135,7 +135,6 @@ class RepositoriesController < ApplicationController
   end
   
   def diff
-    @rev_to = params[:rev_to]
     @diff_type = params[:type] || User.current.pref[:diff_type] || 'inline'
     @diff_type = 'inline' unless %w(inline sbs).include?(@diff_type)
     
@@ -180,6 +179,8 @@ private
     render_404
   end
   
+  REV_PARAM_RE = %r{^[a-f0-9]*$}
+  
   def find_repository
     @project = Project.find(params[:id])
     @repository = @project.repository
@@ -187,8 +188,12 @@ private
     @path = params[:path].join('/') unless params[:path].nil?
     @path ||= ''
     @rev = params[:rev]
+    @rev_to = params[:rev_to]
+    raise InvalidRevisionParam unless @rev.to_s.match(REV_PARAM_RE) && @rev.to_s.match(REV_PARAM_RE)
   rescue ActiveRecord::RecordNotFound
     render_404
+  rescue InvalidRevisionParam
+    show_error_not_found
   end
 
   def show_error_not_found
diff --git a/lib/redmine/scm/adapters/subversion_adapter.rb b/lib/redmine/scm/adapters/subversion_adapter.rb
index 1e0320e2c..efbd3ba8e 100644
--- a/lib/redmine/scm/adapters/subversion_adapter.rb
+++ b/lib/redmine/scm/adapters/subversion_adapter.rb
@@ -62,7 +62,7 @@ module Redmine
         # 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
+          identifier = (identifier and identifier.to_i > 0) ? identifier.to_i : "HEAD"
           entries = Entries.new
           cmd = "#{SVN_BIN} list --xml #{target(path)}@#{identifier}"
           cmd << credentials_string
@@ -94,8 +94,8 @@ module Redmine
     
         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
+          identifier_from = (identifier_from and identifier_from.to_i > 0) ? identifier_from.to_i : "HEAD"
+          identifier_to = (identifier_to and identifier_to.to_i > 0) ? identifier_to.to_i : 1
           revisions = Revisions.new
           cmd = "#{SVN_BIN} log --xml -r #{identifier_from}:#{identifier_to}"
           cmd << credentials_string
@@ -131,11 +131,9 @@ module Redmine
         
         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
+          identifier_from = (identifier_from and identifier_from.to_i > 0) ? identifier_from.to_i : ''
+          identifier_to = (identifier_to and identifier_to.to_i > 0) ? identifier_to.to_i : (identifier_from.to_i - 1)
+          
           cmd = "#{SVN_BIN} diff -r "
           cmd << "#{identifier_to}:"
           cmd << "#{identifier_from}"

From 8d4aa6f9ade613f831ff2043713ad062293babfd Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Thu, 3 Apr 2008 22:29:58 +0000
Subject: [PATCH 363/710] Fixed: single file 'View difference' links do not
 work because of duplicate slashes in url.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1325 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/helpers/repositories_helper.rb    | 7 +++++--
 app/views/repositories/revision.rhtml | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/helpers/repositories_helper.rb b/app/helpers/repositories_helper.rb
index 31daf1bd8..22bdec9df 100644
--- a/app/helpers/repositories_helper.rb
+++ b/app/helpers/repositories_helper.rb
@@ -58,8 +58,11 @@ module RepositoriesHelper
   end
   
   def with_leading_slash(path)
-    path ||= ''
-    path.starts_with?('/') ? path : "/#{path}"
+    path.to_s.starts_with?('/') ? path : "/#{path}"
+  end
+  
+  def without_leading_slash(path)
+    path.gsub(%r{^/+}, '')
   end
 
   def subversion_field_tags(form, repository)
diff --git a/app/views/repositories/revision.rhtml b/app/views/repositories/revision.rhtml
index 5a7ef1fd5..f1e176669 100644
--- a/app/views/repositories/revision.rhtml
+++ b/app/views/repositories/revision.rhtml
@@ -49,7 +49,7 @@
 <td><div class="square action_<%= change.action %>"></div> <%= change.path %> <%= "(#{change.revision})" unless change.revision.blank?  %></td>
 <td align="right">
 <% if change.action == "M" %>
-<%= link_to l(:label_view_diff), :action => 'diff', :id => @project, :path => change.path, :rev => @changeset.revision %>
+<%= link_to l(:label_view_diff), :action => 'diff', :id => @project, :path => without_leading_slash(change.path), :rev => @changeset.revision %>
 <% end %>
 </td>
 </tr>

From 4e961f44eff23b53351d550fb46c2a346688a271 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sat, 5 Apr 2008 16:40:26 +0000
Subject: [PATCH 364/710] Various timelog report enhancements: * report can be
 done using days as columns (#993) * add a total column to the time report *
 replace upper-right links by tabs to switch between details and report *
 preserve date range filter when switching between details and report

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1326 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/timelog_controller.rb      | 27 ++++++++++------------
 app/views/timelog/_date_range.rhtml        | 10 ++++++++
 app/views/timelog/_report_criteria.rhtml   |  4 +++-
 app/views/timelog/details.rhtml            |  1 -
 app/views/timelog/report.rhtml             | 17 +++++++++-----
 public/stylesheets/application.css         |  2 +-
 test/fixtures/time_entries.yml             |  2 +-
 test/functional/timelog_controller_test.rb | 21 ++++++++++++-----
 8 files changed, 53 insertions(+), 31 deletions(-)

diff --git a/app/controllers/timelog_controller.rb b/app/controllers/timelog_controller.rb
index e617d3805..77337f344 100644
--- a/app/controllers/timelog_controller.rb
+++ b/app/controllers/timelog_controller.rb
@@ -56,24 +56,22 @@ class TimelogController < ApplicationController
     @criterias.uniq!
     @criterias = @criterias[0,3]
     
-    @columns = (params[:columns] && %w(year month week).include?(params[:columns])) ? params[:columns] : 'month'
+    @columns = (params[:columns] && %w(year month week day).include?(params[:columns])) ? params[:columns] : 'month'
     
     retrieve_date_range
-    @from ||= TimeEntry.minimum(:spent_on, :include => :project, :conditions => @project.project_condition(Setting.display_subprojects_issues?)) || Date.today
-    @to   ||= TimeEntry.maximum(:spent_on, :include => :project, :conditions => @project.project_condition(Setting.display_subprojects_issues?)) || Date.today
     
     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 = "SELECT #{sql_select}, tyear, tmonth, tweek, spent_on, SUM(hours) AS hours"
       sql << " FROM #{TimeEntry.table_name}"
       sql << " LEFT JOIN #{Issue.table_name} ON #{TimeEntry.table_name}.issue_id = #{Issue.table_name}.id"
       sql << " LEFT JOIN #{Project.table_name} ON #{TimeEntry.table_name}.project_id = #{Project.table_name}.id"
       sql << " WHERE (%s)" % @project.project_condition(Setting.display_subprojects_issues?)
       sql << " AND (%s)" % Project.allowed_to_condition(User.current, :view_time_entries)
       sql << " AND spent_on BETWEEN '%s' AND '%s'" % [ActiveRecord::Base.connection.quoted_date(@from.to_time), ActiveRecord::Base.connection.quoted_date(@to.to_time)]
-      sql << " GROUP BY #{sql_group_by}, tyear, tmonth, tweek"
+      sql << " GROUP BY #{sql_group_by}, tyear, tmonth, tweek, spent_on"
       
       @hours = ActiveRecord::Base.connection.select_all(sql)
       
@@ -85,6 +83,8 @@ class TimelogController < ApplicationController
           row['month'] = "#{row['tyear']}-#{row['tmonth']}"
         when 'week'
           row['week'] = "#{row['tyear']}-#{row['tweek']}"
+        when 'day'
+          row['day'] = "#{row['spent_on']}"
         end
       end
       
@@ -105,6 +105,9 @@ class TimelogController < ApplicationController
         when 'week'
           @periods << "#{date_from.year}-#{date_from.to_date.cweek}"
           date_from = (date_from + 7.day).at_beginning_of_week
+        when 'day'
+          @periods << "#{date_from.to_date}"
+          date_from = date_from + 1.day
         end
       end
     end
@@ -121,16 +124,7 @@ class TimelogController < ApplicationController
                            ["#{TimeEntry.table_name}.issue_id = ?", @issue.id])
     
     retrieve_date_range
-    
-    if @from
-      if @to
-        cond << ['spent_on BETWEEN ? AND ?', @from, @to]
-      else
-        cond << ['spent_on >= ?', @from]
-      end
-    elsif @to
-      cond << ['spent_on <= ?', @to]
-    end
+    cond << ['spent_on BETWEEN ? AND ?', @from, @to]
 
     TimeEntry.visible_by(User.current) do
       respond_to do |format|
@@ -145,6 +139,7 @@ class TimelogController < ApplicationController
                                     :limit  =>  @entry_pages.items_per_page,
                                     :offset =>  @entry_pages.current.offset)
           @total_hours = TimeEntry.sum(:hours, :include => :project, :conditions => cond.conditions).to_f
+
           render :layout => !request.xhr?
         }
         format.csv {
@@ -241,5 +236,7 @@ private
     end
     
     @from, @to = @to, @from if @from && @to && @from > @to
+    @from ||= (TimeEntry.minimum(:spent_on, :include => :project, :conditions => @project.project_condition(Setting.display_subprojects_issues?)) || Date.today) - 1
+    @to   ||= (TimeEntry.maximum(:spent_on, :include => :project, :conditions => @project.project_condition(Setting.display_subprojects_issues?)) || Date.today)
   end
 end
diff --git a/app/views/timelog/_date_range.rhtml b/app/views/timelog/_date_range.rhtml
index ac46fea18..a54f7a2f0 100644
--- a/app/views/timelog/_date_range.rhtml
+++ b/app/views/timelog/_date_range.rhtml
@@ -14,3 +14,13 @@
 <%= submit_tag l(:button_apply), :name => nil, :onclick => '$("period_type_2").checked = true;' %>
 </p>
 </fieldset>
+
+<div class="tabs">
+<% url_params = @free_period ? { :from => @from, :to => @to } : { :period => params[:period] } %>
+<ul>
+    <li><%= link_to(l(:label_details), url_params.merge({:controller => 'timelog', :action => 'details', :project_id => @project }),
+                                       :class => (@controller.action_name == 'details' ? 'selected' : nil)) %></li>
+    <li><%= link_to(l(:label_report), url_params.merge({:controller => 'timelog', :action => 'report', :project_id => @project}),
+                                       :class => (@controller.action_name == 'report' ? 'selected' : nil)) %></li>
+</ul>
+</div>
diff --git a/app/views/timelog/_report_criteria.rhtml b/app/views/timelog/_report_criteria.rhtml
index b048c874a..661e1fdb8 100644
--- a/app/views/timelog/_report_criteria.rhtml
+++ b/app/views/timelog/_report_criteria.rhtml
@@ -5,10 +5,12 @@
 <%= '<td></td>' * level %>
 <td><%= value.nil? ? l(:label_none) : @available_criterias[criterias[level]][:klass].find_by_id(value) %></td>
 <%= '<td></td>' * (criterias.length - level - 1) -%>
+  <% total = 0 -%>
   <% @periods.each do |period| -%>
-    <% sum = sum_hours(select_hours(hours_for_value, @columns, period.to_s)) %>
+    <% sum = sum_hours(select_hours(hours_for_value, @columns, period.to_s)); total += sum -%>
     <td class="hours"><%= html_hours("%.2f" % sum) if sum > 0 %></td>
   <% end -%>
+  <td class="hours"><%= html_hours("%.2f" % total) if total > 0 %></td>
 </tr>
 <% if criterias.length > level+1 -%>
   <%= render(:partial => 'report_criteria', :locals => {:criterias => criterias, :hours => hours_for_value, :level => (level + 1)}) %>
diff --git a/app/views/timelog/details.rhtml b/app/views/timelog/details.rhtml
index a0810fbde..f02da9959 100644
--- a/app/views/timelog/details.rhtml
+++ b/app/views/timelog/details.rhtml
@@ -1,5 +1,4 @@
 <div class="contextual">
-<%= link_to(l(:label_report), {:controller => 'timelog', :action => 'report', :project_id => @project}, :class => 'icon icon-report') %>
 <%= link_to_if_authorized l(:button_log_time), {:controller => 'timelog', :action => 'edit', :project_id => @project, :issue_id => @issue}, :class => 'icon icon-time' %>
 </div>
 
diff --git a/app/views/timelog/report.rhtml b/app/views/timelog/report.rhtml
index 92d0e8782..c29cadf9c 100644
--- a/app/views/timelog/report.rhtml
+++ b/app/views/timelog/report.rhtml
@@ -1,5 +1,4 @@
 <div class="contextual">
-<%= link_to(l(:label_details), {:controller => 'timelog', :action => 'details', :project_id => @project}, :class => 'icon icon-details') %>
 <%= link_to_if_authorized l(:button_log_time), {:controller => 'timelog', :action => 'edit', :project_id => @project, :issue_id => @issue}, :class => 'icon icon-time' %>
 </div>
 
@@ -14,7 +13,8 @@
 
   <p><%= l(:label_details) %>: <%= select_tag 'columns', options_for_select([[l(:label_year), 'year'],
                                                                             [l(:label_month), 'month'],
-                                                                            [l(:label_week), 'week']], @columns),
+                                                                            [l(:label_week), 'week'],
+                                                                            [l(:label_day_plural).titleize, 'day']], @columns),
                                                         :onchange => "this.form.onsubmit();" %>
 
   <%= l(:button_add) %>: <%= select_tag('criterias[]', options_for_select([[]] + (@available_criterias.keys - @criterias).collect{|k| [l(@available_criterias[k][:label]), k]}),
@@ -22,8 +22,9 @@
                                                           :style => 'width: 200px',
                                                           :id => nil,
                                                           :disabled => (@criterias.length >= 3)) %>
-     <%= link_to_remote l(:button_clear), {:url => {:project_id => @project, :date_from => @date_from, :date_to => @date_to, :period => @columns}, :update => 'content'},
-                                          :class => 'icon icon-reload' %></p>
+     <%= link_to_remote l(:button_clear), {:url => {:project_id => @project, :period_type => params[:period_type], :period => params[:period], :from => @from, :to => @to, :columns => @columns},
+                                           :update => 'content'
+                                          }, :class => 'icon icon-reload' %></p>
 <% end %>
 
 <% unless @criterias.empty? %>
@@ -38,9 +39,11 @@
 <% @criterias.each do |criteria| %>
   <th><%= l(@available_criterias[criteria][:label]) %></th>
 <% end %>
+<% columns_width = (40 / (@periods.length+1)).to_i %>
 <% @periods.each do |period| %>
-  <th class="period" width="<%= (40 / @periods.length).to_i %>%"><%= period %></th>
+  <th class="period" width="<%= columns_width %>%"><%= period %></th>
 <% end %>
+  <th class="total" width="<%= columns_width %>%"><%= l(:label_total) %></th>
 </tr>
 </thead>
 <tbody>
@@ -48,10 +51,12 @@
   <tr class="total">
   <td><%= l(:label_total) %></td>
   <%= '<td></td>' * (@criterias.size - 1) %>
+  <% total = 0 -%>
   <% @periods.each do |period| -%>
-    <% sum = sum_hours(select_hours(@hours, @columns, period.to_s)) %>
+    <% sum = sum_hours(select_hours(@hours, @columns, period.to_s)); total += sum -%>
     <td class="hours"><%= html_hours("%.2f" % sum) if sum > 0 %></td>
   <% end -%>
+  <td class="hours"><%= html_hours("%.2f" % total) if total > 0 %></td>
   </tr>
 </tbody>
 </table>
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 69e89b0ed..27c7592f8 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -183,7 +183,7 @@ div#version-summary { float:right; width:380px; margin-left: 16px; margin-bottom
 div#version-summary fieldset { margin-bottom: 1em; }
 div#version-summary .total-hours { text-align: right; }
 
-table#time-report td.hours, table#time-report th.period { text-align: right; padding-right: 0.5em; }
+table#time-report td.hours, table#time-report th.period, table#time-report th.total { text-align: right; padding-right: 0.5em; }
 table#time-report tbody tr { font-style: italic; color: #777; }
 table#time-report tbody tr.last-level { font-style: normal; color: #555; }
 table#time-report tbody tr.total { font-style: normal; font-weight: bold; color: #555; background-color:#EEEEEE; }
diff --git a/test/fixtures/time_entries.yml b/test/fixtures/time_entries.yml
index 151077d2b..f6876c7b0 100644
--- a/test/fixtures/time_entries.yml
+++ b/test/fixtures/time_entries.yml
@@ -15,7 +15,7 @@ time_entries_001:
   tyear: 2007
 time_entries_002: 
   created_on: 2007-03-23 14:11:04 +01:00
-  tweek: 12
+  tweek: 11
   tmonth: 3
   project_id: 1
   comments: ""
diff --git a/test/functional/timelog_controller_test.rb b/test/functional/timelog_controller_test.rb
index c55d5248c..6e3308c84 100644
--- a/test/functional/timelog_controller_test.rb
+++ b/test/functional/timelog_controller_test.rb
@@ -22,7 +22,7 @@ require 'timelog_controller'
 class TimelogController; def rescue_action(e) raise e end; end
 
 class TimelogControllerTest < Test::Unit::TestCase
-  fixtures :projects, :roles, :members, :issues, :time_entries, :users, :trackers, :enumerations, :issue_statuses
+  fixtures :projects, :enabled_modules, :roles, :members, :issues, :time_entries, :users, :trackers, :enumerations, :issue_statuses
 
   def setup
     @controller = TimelogController.new
@@ -86,7 +86,16 @@ class TimelogControllerTest < Test::Unit::TestCase
     assert_not_nil assigns(:total_hours)
     assert_equal "162.90", "%.2f" % assigns(:total_hours)
   end
-    
+
+  def test_report_all_time_by_day
+    get :report, :project_id => 1, :criterias => ['project', 'issue'], :columns => 'day'
+    assert_response :success
+    assert_template 'report'
+    assert_not_nil assigns(:total_hours)
+    assert_equal "162.90", "%.2f" % assigns(:total_hours)
+    assert_tag :tag => 'th', :content => '2007-03-12'
+  end
+  
   def test_report_one_criteria
     get :report, :project_id => 1, :columns => 'week', :from => "2007-04-01", :to => "2007-04-30", :criterias => ['project']
     assert_response :success
@@ -122,8 +131,8 @@ class TimelogControllerTest < Test::Unit::TestCase
     assert_not_nil assigns(:total_hours)
     assert_equal "162.90", "%.2f" % assigns(:total_hours)
     # display all time by default
-    assert_nil assigns(:from)
-    assert_nil assigns(:to)
+    assert_equal '2007-03-11'.to_date, assigns(:from)
+    assert_equal '2007-04-22'.to_date, assigns(:to)
   end
   
   def test_details_at_project_level_with_date_range
@@ -157,8 +166,8 @@ class TimelogControllerTest < Test::Unit::TestCase
     assert_not_nil assigns(:total_hours)
     assert_equal 154.25, assigns(:total_hours)
     # display all time by default
-    assert_nil assigns(:from)
-    assert_nil assigns(:to)
+    assert_equal '2007-03-11'.to_date, assigns(:from)
+    assert_equal '2007-04-22'.to_date, assigns(:to)
   end
   
   def test_details_csv_export

From c6271d836168af455fcc9510907fb4fb330f1d62 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sat, 5 Apr 2008 17:39:19 +0000
Subject: [PATCH 365/710] Fixed: inline image not displayed when including a
 wiki page (closes #1001).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1327 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 lib/redmine/wiki_formatting/macros.rb   |  2 +-
 test/fixtures/attachments.yml           | 12 ++++++++++++
 test/fixtures/wiki_contents.yml         | 16 ++++++++++++++++
 test/fixtures/wiki_pages.yml            |  5 +++++
 test/functional/wiki_controller_test.rb |  7 +++++--
 5 files changed, 39 insertions(+), 3 deletions(-)

diff --git a/lib/redmine/wiki_formatting/macros.rb b/lib/redmine/wiki_formatting/macros.rb
index c0f2b222a..f27ea98b9 100644
--- a/lib/redmine/wiki_formatting/macros.rb
+++ b/lib/redmine/wiki_formatting/macros.rb
@@ -85,7 +85,7 @@ module Redmine
             @included_wiki_pages ||= []
             raise 'Circular inclusion detected' if @included_wiki_pages.include?(page.title)
             @included_wiki_pages << page.title
-            out = textilizable(page.content, :text)
+            out = textilizable(page.content, :text, :attachments => page.attachments)
             @included_wiki_pages.pop
             out
           else
diff --git a/test/fixtures/attachments.yml b/test/fixtures/attachments.yml
index 764948755..509475c97 100644
--- a/test/fixtures/attachments.yml
+++ b/test/fixtures/attachments.yml
@@ -23,4 +23,16 @@ attachments_002:
   filesize: 28
   filename: document.txt
   author_id: 2
+attachments_003: 
+  created_on: 2006-07-19 21:07:27 +02:00
+  downloads: 0
+  content_type: image/gif
+  disk_filename: 060719210727_logo.gif
+  container_id: 4
+  digest: b91e08d0cf966d5c6ff411bd8c4cc3a2
+  id: 3
+  container_type: WikiPage
+  filesize: 280
+  filename: logo.gif
+  author_id: 2
   
\ No newline at end of file
diff --git a/test/fixtures/wiki_contents.yml b/test/fixtures/wiki_contents.yml
index 6937dbd14..5d6d3f1de 100644
--- a/test/fixtures/wiki_contents.yml
+++ b/test/fixtures/wiki_contents.yml
@@ -15,6 +15,8 @@ wiki_contents_002:
     h1. Another page
     
     This is a link to a ticket: #2
+    And this is an included page:
+    {{include(Page with an inline image)}}
   updated_on: 2007-03-08 00:18:07 +01:00
   page_id: 2
   id: 2
@@ -32,3 +34,17 @@ wiki_contents_003:
   version: 1
   author_id: 1
   comments: 
+wiki_contents_004: 
+  text: |-
+    h1. Page with an inline image
+    
+    This is an inline image:
+    
+    !logo.gif!
+  updated_on: 2007-03-08 00:18:07 +01:00
+  page_id: 4
+  id: 4
+  version: 1
+  author_id: 1
+  comments: 
+  
\ No newline at end of file
diff --git a/test/fixtures/wiki_pages.yml b/test/fixtures/wiki_pages.yml
index ee260291d..f89832e44 100644
--- a/test/fixtures/wiki_pages.yml
+++ b/test/fixtures/wiki_pages.yml
@@ -14,4 +14,9 @@ wiki_pages_003:
   title: Start_page
   id: 3
   wiki_id: 2
+wiki_pages_004: 
+  created_on: 2007-03-08 00:18:07 +01:00
+  title: Page_with_an_inline_image
+  id: 4
+  wiki_id: 1
   
\ No newline at end of file
diff --git a/test/functional/wiki_controller_test.rb b/test/functional/wiki_controller_test.rb
index 0418a02b6..68e52600f 100644
--- a/test/functional/wiki_controller_test.rb
+++ b/test/functional/wiki_controller_test.rb
@@ -22,7 +22,7 @@ require 'wiki_controller'
 class WikiController; def rescue_action(e) raise e end; end
 
 class WikiControllerTest < Test::Unit::TestCase
-  fixtures :projects, :users, :roles, :members, :enabled_modules, :wikis, :wiki_pages, :wiki_contents, :wiki_content_versions
+  fixtures :projects, :users, :roles, :members, :enabled_modules, :wikis, :wiki_pages, :wiki_contents, :wiki_content_versions, :attachments
   
   def setup
     @controller = WikiController.new
@@ -43,6 +43,9 @@ class WikiControllerTest < Test::Unit::TestCase
     assert_response :success
     assert_template 'show'
     assert_tag :tag => 'h1', :content => /Another page/
+    # Included page with an inline image
+    assert_tag :tag => 'p', :content => /This is an inline image/
+    assert_tag :tag => 'img', :attributes => { :src => '/attachments/download/3' }
   end
   
   def test_show_unexistent_page_without_edit_right
@@ -147,7 +150,7 @@ class WikiControllerTest < Test::Unit::TestCase
     assert_template 'special_page_index'
     pages = assigns(:pages)
     assert_not_nil pages
-    assert_equal 2, pages.size
+    assert_equal Project.find(1).wiki.pages.size, pages.size
     assert_tag :tag => 'a', :attributes => { :href => '/wiki/ecookbook/CookBook_documentation' },
                             :content => /CookBook documentation/
   end

From c37abb64151e18461cb739ed4658d912a7c752e8 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sat, 5 Apr 2008 18:56:08 +0000
Subject: [PATCH 366/710] Inline images alt attribute set to the attachment
 description.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1328 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/helpers/application_helper.rb       | 6 ++++--
 test/fixtures/attachments.yml           | 1 +
 test/functional/wiki_controller_test.rb | 3 ++-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index e30343ff5..eb8cc2795 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -207,8 +207,10 @@ module ApplicationHelper
         rf = Regexp.new(filename,  Regexp::IGNORECASE)
         # search for the picture in attachments
         if found = attachments.detect { |att| att.filename =~ rf }
-          image_url = url_for :only_path => only_path, :controller => 'attachments', :action => 'download', :id => found.id
-          "!#{style}#{image_url}!"
+          image_url = url_for :only_path => only_path, :controller => 'attachments', :action => 'download', :id => found
+          desc = found.description.to_s.gsub(/^([^\(\)]*).*$/, "\\1")
+          alt = desc.blank? ? nil : "(#{desc})"
+          "!#{style}#{image_url}#{alt}!"
         else
           "!#{style}#{filename}!"
         end
diff --git a/test/fixtures/attachments.yml b/test/fixtures/attachments.yml
index 509475c97..162d44720 100644
--- a/test/fixtures/attachments.yml
+++ b/test/fixtures/attachments.yml
@@ -34,5 +34,6 @@ attachments_003:
   container_type: WikiPage
   filesize: 280
   filename: logo.gif
+  description: This is a logo
   author_id: 2
   
\ No newline at end of file
diff --git a/test/functional/wiki_controller_test.rb b/test/functional/wiki_controller_test.rb
index 68e52600f..bf31e6614 100644
--- a/test/functional/wiki_controller_test.rb
+++ b/test/functional/wiki_controller_test.rb
@@ -45,7 +45,8 @@ class WikiControllerTest < Test::Unit::TestCase
     assert_tag :tag => 'h1', :content => /Another page/
     # Included page with an inline image
     assert_tag :tag => 'p', :content => /This is an inline image/
-    assert_tag :tag => 'img', :attributes => { :src => '/attachments/download/3' }
+    assert_tag :tag => 'img', :attributes => { :src => '/attachments/download/3',
+                                               :alt => 'This is a logo' }
   end
   
   def test_show_unexistent_page_without_edit_right

From 154f60edd353c2215b9e1622a2e47bdcc5f70101 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 6 Apr 2008 10:35:55 +0000
Subject: [PATCH 367/710] Fix repository browsing at given revision for various
 scm and add tests for this.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1329 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/repositories_controller.rb    |   4 +-
 app/models/repository/cvs.rb                  |   3 +-
 app/models/repository/darcs.rb                |   3 +-
 lib/redmine/scm/adapters/cvs_adapter.rb       |   4 +-
 lib/redmine/scm/adapters/darcs_adapter.rb     |   4 +-
 lib/redmine/scm/adapters/git_adapter.rb       |   2 +-
 .../repositories_bazaar_controller_test.rb    | 129 ++++++++++++++++++
 .../repositories_cvs_controller_test.rb       |  17 ++-
 .../repositories_darcs_controller_test.rb     |  11 +-
 .../repositories_git_controller_test.rb       |  12 +-
 .../repositories_mercurial_controller_test.rb |  12 +-
 ...repositories_subversion_controller_test.rb |  13 +-
 12 files changed, 197 insertions(+), 17 deletions(-)
 create mode 100644 test/functional/repositories_bazaar_controller_test.rb

diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb
index 9b59b51ec..79fb49c86 100644
--- a/app/controllers/repositories_controller.rb
+++ b/app/controllers/repositories_controller.rb
@@ -51,8 +51,8 @@ class RepositoriesController < ApplicationController
   def show
     # check if new revisions have been committed in the repository
     @repository.fetch_changesets if Setting.autofetch_changesets?
-    # get entries for the browse frame
-    @entries = @repository.entries('')    
+    # root entries
+    @entries = @repository.entries('', @rev)    
     # latest changesets
     @changesets = @repository.changesets.find(:all, :limit => 10, :order => "committed_on DESC")
     show_error_not_found unless @entries || @changesets.any?
diff --git a/app/models/repository/cvs.rb b/app/models/repository/cvs.rb
index a78b60806..7c01a27ee 100644
--- a/app/models/repository/cvs.rb
+++ b/app/models/repository/cvs.rb
@@ -35,7 +35,8 @@ class Repository::Cvs < Repository
   end
   
   def entries(path=nil, identifier=nil)
-    entries=scm.entries(path, identifier)
+    rev = identifier.nil? ? nil : changesets.find_by_revision(identifier)
+    entries = scm.entries(path, rev.nil? ? nil : rev.committed_on)
     if entries
       entries.each() do |entry|
         unless entry.lastrev.nil? || entry.lastrev.identifier
diff --git a/app/models/repository/darcs.rb b/app/models/repository/darcs.rb
index cc608d370..c7c14a397 100644
--- a/app/models/repository/darcs.rb
+++ b/app/models/repository/darcs.rb
@@ -29,7 +29,8 @@ class Repository::Darcs < Repository
   end
   
   def entries(path=nil, identifier=nil)
-    entries=scm.entries(path, identifier)
+    patch = identifier.nil? ? nil : changesets.find_by_revision(identifier)
+    entries = scm.entries(path, patch.nil? ? nil : patch.scmid)
     if entries
       entries.each do |entry|
         # Search the DB for the entry's last change
diff --git a/lib/redmine/scm/adapters/cvs_adapter.rb b/lib/redmine/scm/adapters/cvs_adapter.rb
index c0f60c02a..6085bfdbe 100644
--- a/lib/redmine/scm/adapters/cvs_adapter.rb
+++ b/lib/redmine/scm/adapters/cvs_adapter.rb
@@ -72,7 +72,9 @@ module Redmine
           logger.debug "<cvs> entries '#{path}' with identifier '#{identifier}'"
           path_with_project="#{url}#{with_leading_slash(path)}"
           entries = Entries.new
-          cmd = "#{CVS_BIN} -d #{root_url} rls -ed #{path_with_project}"
+          cmd = "#{CVS_BIN} -d #{root_url} rls -ed"
+          cmd << " -D \"#{time_to_cvstime(identifier)}\"" if identifier
+          cmd << " #{path_with_project}"
           shellout(cmd) do |io|
             io.each_line(){|line|
               fields=line.chop.split('/',-1)
diff --git a/lib/redmine/scm/adapters/darcs_adapter.rb b/lib/redmine/scm/adapters/darcs_adapter.rb
index cd8610121..660b6cf8f 100644
--- a/lib/redmine/scm/adapters/darcs_adapter.rb
+++ b/lib/redmine/scm/adapters/darcs_adapter.rb
@@ -53,7 +53,9 @@ module Redmine
           path_prefix = (path.blank? ? '' : "#{path}/")
           path = '.' if path.blank?
           entries = Entries.new          
-          cmd = "#{DARCS_BIN} annotate --repodir #{@url} --xml-output #{path}"
+          cmd = "#{DARCS_BIN} annotate --repodir #{@url} --xml-output"
+          cmd << " --match \"hash #{identifier}\"" if identifier
+          cmd << " #{path}"
           shellout(cmd) do |io|
             begin
               doc = REXML::Document.new(io)
diff --git a/lib/redmine/scm/adapters/git_adapter.rb b/lib/redmine/scm/adapters/git_adapter.rb
index f1d076360..5d315b0cc 100644
--- a/lib/redmine/scm/adapters/git_adapter.rb
+++ b/lib/redmine/scm/adapters/git_adapter.rb
@@ -79,7 +79,7 @@ module Redmine
             rev = Revision.new({:identifier => changeset[:commit],
                                 :scmid => changeset[:commit],
                                 :author => changeset[:author],
-                                :time => Time.parse(changeset[:date]),
+                                :time => (changeset[:date] ? Time.parse(changeset[:date]) : nil),
                                 :message => changeset[:description],
                                 :paths => files
                                })
diff --git a/test/functional/repositories_bazaar_controller_test.rb b/test/functional/repositories_bazaar_controller_test.rb
new file mode 100644
index 000000000..5a473bab3
--- /dev/null
+++ b/test/functional/repositories_bazaar_controller_test.rb
@@ -0,0 +1,129 @@
+# redMine - project management software
+# Copyright (C) 2006-2008  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 File.dirname(__FILE__) + '/../test_helper'
+require 'repositories_controller'
+
+# Re-raise errors caught by the controller.
+class RepositoriesController; def rescue_action(e) raise e end; end
+
+class RepositoriesBazaarControllerTest < Test::Unit::TestCase
+  fixtures :projects, :users, :roles, :members, :repositories, :enabled_modules
+
+  # No '..' in the repository path
+  REPOSITORY_PATH = RAILS_ROOT.gsub(%r{config\/\.\.}, '') + '/tmp/test/bazaar_repository'
+
+  def setup
+    @controller = RepositoriesController.new
+    @request    = ActionController::TestRequest.new
+    @response   = ActionController::TestResponse.new
+    User.current = nil
+    Repository::Bazaar.create(:project => Project.find(3), :url => REPOSITORY_PATH)
+  end
+  
+  if File.directory?(REPOSITORY_PATH)
+    def test_show
+      get :show, :id => 3
+      assert_response :success
+      assert_template 'show'
+      assert_not_nil assigns(:entries)
+      assert_not_nil assigns(:changesets)
+    end
+    
+    def test_browse_root
+      get :browse, :id => 3
+      assert_response :success
+      assert_template 'browse'
+      assert_not_nil assigns(:entries)
+      assert_equal 2, assigns(:entries).size
+      assert assigns(:entries).detect {|e| e.name == 'directory' && e.kind == 'dir'}
+      assert assigns(:entries).detect {|e| e.name == 'doc-mkdir.txt' && e.kind == 'file'}
+    end
+    
+    def test_browse_directory
+      get :browse, :id => 3, :path => ['directory']
+      assert_response :success
+      assert_template 'browse'
+      assert_not_nil assigns(:entries)
+      assert_equal ['doc-ls.txt', 'document.txt', 'edit.png'], assigns(:entries).collect(&:name)
+      entry = assigns(:entries).detect {|e| e.name == 'edit.png'}
+      assert_not_nil entry
+      assert_equal 'file', entry.kind
+      assert_equal 'directory/edit.png', entry.path
+    end
+    
+    def test_browse_at_given_revision
+      get :browse, :id => 3, :path => [], :rev => 3
+      assert_response :success
+      assert_template 'browse'
+      assert_not_nil assigns(:entries)
+      assert_equal ['directory', 'doc-deleted.txt', 'doc-ls.txt', 'doc-mkdir.txt'], assigns(:entries).collect(&:name)
+    end
+    
+    def test_changes
+      get :changes, :id => 3, :path => ['doc-mkdir.txt']
+      assert_response :success
+      assert_template 'changes'
+      assert_tag :tag => 'h2', :content => 'doc-mkdir.txt'
+    end
+    
+    def test_entry_show
+      get :entry, :id => 3, :path => ['directory', 'doc-ls.txt']
+      assert_response :success
+      assert_template 'entry'
+      # Line 19
+      assert_tag :tag => 'th',
+                 :content => /29/,
+                 :attributes => { :class => /line-num/ },
+                 :sibling => { :tag => 'td', :content => /Show help message/ }
+    end
+    
+    def test_entry_download
+      get :entry, :id => 3, :path => ['directory', 'doc-ls.txt'], :format => 'raw'
+      assert_response :success
+      # File content
+      assert @response.body.include?('Show help message')
+    end
+  
+    def test_diff
+      # Full diff of changeset 3
+      get :diff, :id => 3, :rev => 3
+      assert_response :success
+      assert_template 'diff'
+      # Line 22 removed
+      assert_tag :tag => 'th',
+                 :content => /2/,
+                 :sibling => { :tag => 'td', 
+                               :attributes => { :class => /diff_in/ },
+                               :content => /Main purpose/ }
+    end
+    
+    def test_annotate
+      get :annotate, :id => 3, :path => ['doc-mkdir.txt']
+      assert_response :success
+      assert_template 'annotate'
+      # Line 2, revision 3
+      assert_tag :tag => 'th', :content => /2/,
+                 :sibling => { :tag => 'td', :child => { :tag => 'a', :content => /3/ } },
+                 :sibling => { :tag => 'td', :content => /jsmith/ },
+                 :sibling => { :tag => 'td', :content => /Main purpose/ }
+    end
+  else
+    puts "Bazaar test repository NOT FOUND. Skipping functional tests !!!"
+    def test_fake; assert true end
+  end
+end
diff --git a/test/functional/repositories_cvs_controller_test.rb b/test/functional/repositories_cvs_controller_test.rb
index 1e101f59a..d6181ad36 100644
--- a/test/functional/repositories_cvs_controller_test.rb
+++ b/test/functional/repositories_cvs_controller_test.rb
@@ -65,13 +65,24 @@ class RepositoriesCvsControllerTest < Test::Unit::TestCase
     end
     
     def test_browse_directory
-      get :browse, :id => 1, :path => ['sources']
+      get :browse, :id => 1, :path => ['images']
       assert_response :success
       assert_template 'browse'
       assert_not_nil assigns(:entries)
-      entry = assigns(:entries).detect {|e| e.name == 'watchers_controller.rb'}
+      assert_equal ['add.png', 'delete.png', 'edit.png'], assigns(:entries).collect(&:name)
+      entry = assigns(:entries).detect {|e| e.name == 'edit.png'}
+      assert_not_nil entry
       assert_equal 'file', entry.kind
-      assert_equal 'sources/watchers_controller.rb', entry.path
+      assert_equal 'images/edit.png', entry.path
+    end
+    
+    def test_browse_at_given_revision
+      Project.find(1).repository.fetch_changesets
+      get :browse, :id => 1, :path => ['images'], :rev => 1
+      assert_response :success
+      assert_template 'browse'
+      assert_not_nil assigns(:entries)
+      assert_equal ['delete.png', 'edit.png'], assigns(:entries).collect(&:name)
     end
   
     def test_entry
diff --git a/test/functional/repositories_darcs_controller_test.rb b/test/functional/repositories_darcs_controller_test.rb
index fc77b8747..43c715924 100644
--- a/test/functional/repositories_darcs_controller_test.rb
+++ b/test/functional/repositories_darcs_controller_test.rb
@@ -60,13 +60,22 @@ class RepositoriesDarcsControllerTest < Test::Unit::TestCase
       assert_response :success
       assert_template 'browse'
       assert_not_nil assigns(:entries)
-      assert_equal 2, assigns(:entries).size
+      assert_equal ['delete.png', 'edit.png'], assigns(:entries).collect(&:name)
       entry = assigns(:entries).detect {|e| e.name == 'edit.png'}
       assert_not_nil entry
       assert_equal 'file', entry.kind
       assert_equal 'images/edit.png', entry.path
     end
     
+    def test_browse_at_given_revision
+      Project.find(3).repository.fetch_changesets
+      get :browse, :id => 3, :path => ['images'], :rev => 1
+      assert_response :success
+      assert_template 'browse'
+      assert_not_nil assigns(:entries)
+      assert_equal ['delete.png'], assigns(:entries).collect(&:name)
+    end
+    
     def test_changes
       get :changes, :id => 3, :path => ['images', 'edit.png']
       assert_response :success
diff --git a/test/functional/repositories_git_controller_test.rb b/test/functional/repositories_git_controller_test.rb
index f8b3cb2bb..10a4950f3 100644
--- a/test/functional/repositories_git_controller_test.rb
+++ b/test/functional/repositories_git_controller_test.rb
@@ -1,5 +1,5 @@
 # redMine - project management software
-# Copyright (C) 2006-2007  Jean-Philippe Lang
+# Copyright (C) 2006-2008  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
@@ -61,13 +61,21 @@ class RepositoriesGitControllerTest < Test::Unit::TestCase
       assert_response :success
       assert_template 'browse'
       assert_not_nil assigns(:entries)
-      assert_equal 2, assigns(:entries).size
+      assert_equal ['delete.png', 'edit.png'], assigns(:entries).collect(&:name)
       entry = assigns(:entries).detect {|e| e.name == 'edit.png'}
       assert_not_nil entry
       assert_equal 'file', entry.kind
       assert_equal 'images/edit.png', entry.path
     end
     
+    def test_browse_at_given_revision
+      get :browse, :id => 3, :path => ['images'], :rev => '7234cb2750b63f47bff735edc50a1c0a433c2518'
+      assert_response :success
+      assert_template 'browse'
+      assert_not_nil assigns(:entries)
+      assert_equal ['delete.png'], assigns(:entries).collect(&:name)
+    end
+
     def test_changes
       get :changes, :id => 3, :path => ['images', 'edit.png']
       assert_response :success
diff --git a/test/functional/repositories_mercurial_controller_test.rb b/test/functional/repositories_mercurial_controller_test.rb
index 736e38c83..b09265d13 100644
--- a/test/functional/repositories_mercurial_controller_test.rb
+++ b/test/functional/repositories_mercurial_controller_test.rb
@@ -1,5 +1,5 @@
 # redMine - project management software
-# Copyright (C) 2006-2007  Jean-Philippe Lang
+# Copyright (C) 2006-2008  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
@@ -60,13 +60,21 @@ class RepositoriesMercurialControllerTest < Test::Unit::TestCase
       assert_response :success
       assert_template 'browse'
       assert_not_nil assigns(:entries)
-      assert_equal 2, assigns(:entries).size
+      assert_equal ['delete.png', 'edit.png'], assigns(:entries).collect(&:name)
       entry = assigns(:entries).detect {|e| e.name == 'edit.png'}
       assert_not_nil entry
       assert_equal 'file', entry.kind
       assert_equal 'images/edit.png', entry.path
     end
     
+    def test_browse_at_given_revision
+      get :browse, :id => 3, :path => ['images'], :rev => 0
+      assert_response :success
+      assert_template 'browse'
+      assert_not_nil assigns(:entries)
+      assert_equal ['delete.png'], assigns(:entries).collect(&:name)
+    end
+    
     def test_changes
       get :changes, :id => 3, :path => ['images', 'edit.png']
       assert_response :success
diff --git a/test/functional/repositories_subversion_controller_test.rb b/test/functional/repositories_subversion_controller_test.rb
index 9b21a13e8..adb69c8e9 100644
--- a/test/functional/repositories_subversion_controller_test.rb
+++ b/test/functional/repositories_subversion_controller_test.rb
@@ -1,5 +1,5 @@
 # redMine - project management software
-# Copyright (C) 2006-2007  Jean-Philippe Lang
+# Copyright (C) 2006-2008  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
@@ -58,11 +58,20 @@ class RepositoriesSubversionControllerTest < Test::Unit::TestCase
       assert_response :success
       assert_template 'browse'
       assert_not_nil assigns(:entries)
+      assert_equal ['folder', '.project', 'helloworld.c', 'textfile.txt'], assigns(:entries).collect(&:name)
       entry = assigns(:entries).detect {|e| e.name == 'helloworld.c'}
       assert_equal 'file', entry.kind
       assert_equal 'subversion_test/helloworld.c', entry.path
     end
-  
+
+    def test_browse_at_given_revision
+      get :browse, :id => 1, :path => ['subversion_test'], :rev => 4
+      assert_response :success
+      assert_template 'browse'
+      assert_not_nil assigns(:entries)
+      assert_equal ['folder', '.project', 'helloworld.c', 'helloworld.rb', 'textfile.txt'], assigns(:entries).collect(&:name)
+    end
+      
     def test_entry
       get :entry, :id => 1, :path => ['subversion_test', 'helloworld.c']
       assert_response :success

From fe74ab8c0644369975be2d2a5c70c4aefd877b9c Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 6 Apr 2008 10:53:18 +0000
Subject: [PATCH 368/710] Make the project files list sortable (#997).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1330 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/projects_controller.rb | 5 ++++-
 app/views/projects/list_files.rhtml    | 8 ++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 199b2f0c5..afd7f6569 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -204,7 +204,10 @@ class ProjectsController < ApplicationController
   end
   
   def list_files
-    @versions = @project.versions.sort.reverse
+    sort_init "#{Attachment.table_name}.filename", "asc"
+    sort_update
+    @versions = @project.versions.find(:all, :include => :attachments, :order => sort_clause).sort.reverse
+    render :layout => !request.xhr?
   end
   
   # Show changelog for @project
diff --git a/app/views/projects/list_files.rhtml b/app/views/projects/list_files.rhtml
index ec4a3619b..f385229ae 100644
--- a/app/views/projects/list_files.rhtml
+++ b/app/views/projects/list_files.rhtml
@@ -9,10 +9,10 @@
 <table class="list">
   <thead><tr>
     <th><%=l(:field_version)%></th>
-    <th><%=l(:field_filename)%></th>
-    <th><%=l(:label_date)%></th>
-    <th><%=l(:field_filesize)%></th>
-    <th><%=l(:label_downloads_abbr)%></th>
+    <%= sort_header_tag("#{Attachment.table_name}.filename", :caption => l(:field_filename)) %>
+    <%= sort_header_tag("#{Attachment.table_name}.created_on", :caption => l(:label_date), :default_order => 'desc') %>
+    <%= sort_header_tag("#{Attachment.table_name}.filesize", :caption => l(:field_filesize), :default_order => 'desc') %>
+    <%= sort_header_tag("#{Attachment.table_name}.downloads", :caption => l(:label_downloads_abbr), :default_order => 'desc') %>
     <th>MD5</th>
     <% if delete_allowed %><th></th><% end %>
   </tr></thead>

From a7ca01a8de609cb1b0453d615ee0a90c3da1192d Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 6 Apr 2008 11:07:16 +0000
Subject: [PATCH 369/710] =?UTF-8?q?Translation=20updates:=20*=20Norwegian?=
 =?UTF-8?q?=20(Kai=20Olav=20Fredriksen)=20*=20German=20(Thomas=20L=C3=B6be?=
 =?UTF-8?q?r)=20*=20Bulgarian=20(Nikolay=20Solakov)=20*=20Hebrew=20(Ficoos?=
 =?UTF-8?q?=20Bangaly)=20*=20Russian=20(Michael=20Pirogov)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1331 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 lang/bg.yml | 164 +++++++++++++++++++++---------------------
 lang/de.yml |  44 ++++++------
 lang/he.yml | 200 ++++++++++++++++++++++++++--------------------------
 lang/no.yml |  14 ++--
 lang/ru.yml |   4 +-
 5 files changed, 213 insertions(+), 213 deletions(-)

diff --git a/lang/bg.yml b/lang/bg.yml
index a49365d20..d1a60fe43 100644
--- a/lang/bg.yml
+++ b/lang/bg.yml
@@ -48,8 +48,8 @@ general_text_no: 'не'
 general_text_yes: 'да'
 general_lang_name: 'Bulgarian'
 general_csv_separator: ','
-general_csv_encoding: cp1251
-general_pdf_encoding: cp1251
+general_csv_encoding: UTF-8
+general_pdf_encoding: UTF-8
 general_day_names: Понеделник,Вторник,Сряда,Четвъртък,Петък,Събота,Неделя
 general_first_day_of_week: '1'
 
@@ -57,11 +57,11 @@ notice_account_updated: Профилът е обновен успешно.
 notice_account_invalid_creditentials: Невалиден потребител или парола.
 notice_account_password_updated: Паролата е успешно променена.
 notice_account_wrong_password: Грешна парола
-notice_account_register_done: Акаунтът е създаден успешно.
-notice_account_unknown_email: Непознат потребител.
-notice_can_t_change_password: Този акаунт е с външен метод за оторизация. Невъзможна смяна на паролата.
+notice_account_register_done: Профилът е създаден успешно.
+notice_account_unknown_email: Непознат e-mail.
+notice_can_t_change_password: Този профил е с външен метод за оторизация. Невъзможна смяна на паролата.
 notice_account_lost_email_sent: Изпратен ви е e-mail с инструкции за избор на нова парола.
-notice_account_activated: Акаунтът ви е активиран. Вече може да влезете.
+notice_account_activated: Профилът ви е активиран. Вече може да влезете в системата.
 notice_successful_create: Успешно създаване.
 notice_successful_update: Успешно обновяване.
 notice_successful_delete: Успешно изтриване.
@@ -78,8 +78,8 @@ error_scm_command_failed: "Грешка при опит за комуникац
 
 mail_subject_lost_password: Вашата парола (%s)
 mail_body_lost_password: 'За да смените паролата си, използвайте следния линк:'
-mail_subject_register: Активация на акаунт (%s)
-mail_body_register: 'За да активирате акаунта си използвайте следния линк:'
+mail_subject_register: Активация на профил (%s)
+mail_body_register: 'За да активирате профила си използвайте следния линк:'
 
 gui_validation_error: 1 грешка
 gui_validation_error_plural: %d грешки
@@ -113,11 +113,11 @@ field_notes: Бележка
 field_is_closed: Затворена задача
 field_is_default: Статус по подразбиране
 field_tracker: Тракер
-field_subject: Тема
+field_subject: Относно
 field_due_date: Крайна дата
 field_assigned_to: Възложена на
 field_priority: Приоритет
-field_fixed_version: Target version
+field_fixed_version: Планувана версия
 field_user: Потребител
 field_role: Роля
 field_homepage: Начална страница
@@ -138,7 +138,7 @@ field_version: Версия
 field_type: Тип
 field_host: Хост
 field_port: Порт
-field_account: Акаунт
+field_account: Профил
 field_base_dn: Base DN
 field_attr_login: Login attribute
 field_attr_firstname: Firstname attribute
@@ -163,7 +163,7 @@ field_delay: Отместване
 field_assignable: Възможно е възлагане на задачи за тази роля
 field_redirect_existing_links: Пренасочване на съществуващи линкове
 field_estimated_hours: Изчислено време
-field_default_value: Статус по подразбиране
+field_default_value: Стойност по подразбиране
 
 setting_app_title: Заглавие
 setting_app_subtitle: Описание
@@ -171,15 +171,15 @@ setting_welcome_text: Допълнителен текст
 setting_default_language: Език по подразбиране
 setting_login_required: Изискване за вход в системата
 setting_self_registration: Регистрация от потребители
-setting_attachment_max_size: Максимално голям приложен файл
+setting_attachment_max_size: Максимална големина на прикачен файл
 setting_issues_export_limit: Лимит за експорт на задачи
 setting_mail_from: E-mail адрес за емисии
 setting_host_name: Хост
 setting_text_formatting: Форматиране на текста
 setting_wiki_compression: Wiki компресиране на историята
 setting_feeds_limit: Лимит на Feeds
-setting_autofetch_changesets: Автоматично обработване на commits в хранилището
-setting_sys_api_enabled: Разрешаване на WS за управление на хранилището
+setting_autofetch_changesets: Автоматично обработване на ревизиите
+setting_sys_api_enabled: Разрешаване на WS за управление
 setting_commit_ref_keywords: Отбелязващи ключови думи
 setting_commit_fix_keywords: Приключващи ключови думи
 setting_autologin: Автоматичен вход
@@ -231,7 +231,7 @@ label_password_lost: Забравена парола
 label_home: Начало
 label_my_page: Лична страница
 label_my_account: Профил
-label_my_projects: Моите проекти
+label_my_projects: Проекти, в които участвам
 label_administration: Администрация
 label_login: Вход
 label_logout: Изход
@@ -375,8 +375,8 @@ label_f_hour_plural: %.2f часа
 label_time_tracking: Отделяне на време
 label_change_plural: Промени
 label_statistics: Статистики
-label_commits_per_month: Commits за месец
-label_commits_per_author: Commits за автор
+label_commits_per_month: Ревизии по месеци
+label_commits_per_author: Ревизии по автор
 label_view_diff: Виж разликите
 label_diff_inline: хоризонтално
 label_diff_side_by_side: вертикално
@@ -389,7 +389,7 @@ label_applied_status: Промени статуса на
 label_loading: Зареждане...
 label_relation_new: Нова релация
 label_relation_delete: Изтриване на релация
-label_relates_to: Свързана със
+label_relates_to: свързана със
 label_duplicates: дублира
 label_blocks: блокира
 label_blocked_by: блокирана от
@@ -427,10 +427,10 @@ label_updated_time: Обновена преди %s
 label_jump_to_a_project: Проект...
 
 button_login: Вход
-button_submit: Приложи
+button_submit: Прикачване
 button_save: Запис
-button_check_all: Маркирай всички
-button_uncheck_all: Изчисти всички
+button_check_all: Избор на всички
+button_uncheck_all: Изчистване на всички
 button_delete: Изтриване
 button_create: Създаване
 button_test: Тест
@@ -481,9 +481,9 @@ text_length_between: От %d до %d символа.
 text_tracker_no_workflow: Няма дефиниран работен процес за този тракер
 text_unallowed_characters: Непозволени символи
 text_comma_separated: Позволено е изброяване (с разделител запетая).
-text_issues_ref_in_commit_messages: Отбелязване и приключване на задачи от commit съобщения
-text_issue_added: Публикувана е нова задача с номер %s (by %s).
-text_issue_updated: Задача %s е обновена (by %s).
+text_issues_ref_in_commit_messages: Отбелязване и приключване на задачи от ревизии
+text_issue_added: Публикувана е нова задача с номер %s (от %s).
+text_issue_updated: Задача %s е обновена (от %s).
 text_wiki_destroy_confirmation: Сигурни ли сте, че искате да изтриете това Wiki и цялото му съдържание?
 text_issue_category_destroy_question: Има задачи (%d) обвързани с тази категория. Какво ще изберете?
 text_issue_category_destroy_assignments: Премахване на връзките с категорията
@@ -515,11 +515,11 @@ enumeration_issue_priorities: Приоритети на задачи
 enumeration_doc_categories: Категории документи
 enumeration_activities: Дейности (time tracking)
 label_file_plural: Файлове
-label_changeset_plural: Changesets
+label_changeset_plural: Ревизии
 field_column_names: Колони
 label_default_columns: По подразбиране
 setting_issue_list_default_columns: Показвани колони по подразбиране
-setting_repositories_encodings: Кодови таблици на хранилищата
+setting_repositories_encodings: Кодови таблици
 notice_no_issue_selected: "Няма избрани задачи."
 label_bulk_edit_selected_issues: Редактиране на задачи
 label_no_change_option: (Без промяна)
@@ -536,20 +536,20 @@ label_user_mail_option_none: "Само за наблюдавани или в к
 setting_emails_footer: Подтекст за e-mail
 label_float: Дробно
 button_copy: Копиране
-mail_body_account_information_external: Можете да използвате вашия "%s" акаунт за вход.
-mail_body_account_information: Информацията за акаунта
+mail_body_account_information_external: Можете да използвате вашия "%s" профил за вход.
+mail_body_account_information: Информацията за профила ви
 setting_protocol: Протокол
 label_user_mail_no_self_notified: "Не искам известия за извършени от мен промени"
 setting_time_format: Формат на часа
-label_registration_activation_by_email: активиране на акаунта по email
-mail_subject_account_activation_request: Заявка за активиране на акаунт в %s
+label_registration_activation_by_email: активиране на профила по email
+mail_subject_account_activation_request: Заявка за активиране на профил в %s
 mail_body_account_activation_request: 'Има новорегистриран потребител (%s), очакващ вашето одобрение:'
 label_registration_automatic_activation: автоматично активиране
 label_registration_manual_activation: ръчно активиране
-notice_account_pending: "Акаунтът Ви е създаден и очаква одобрение от администратор."
+notice_account_pending: "Профилът Ви е създаден и очаква одобрение от администратор."
 field_time_zone: Часова зона
 text_caracters_minimum: Минимум %d символа.
-setting_bcc_recipients: Blind carbon copy (bcc) получатели
+setting_bcc_recipients: Получатели на скрито копие (bcc)
 button_annotate: Анотация
 label_issues_by: Задачи по %s
 field_searchable: С възможност за търсене
@@ -566,54 +566,54 @@ label_general: Основни
 label_repository_plural: Хранилища
 label_associated_revisions: Асоциирани ревизии
 setting_user_format: Потребителски формат
-text_status_changed_by_changeset: Applied in changeset %s.
-label_more: More
-text_issues_destroy_confirmation: 'Are you sure you want to delete the selected issue(s) ?'
-label_scm: SCM
-text_select_project_modules: 'Select modules to enable for this project:'
-label_issue_added: Issue added
-label_issue_updated: Issue updated
-label_document_added: Document added
-label_message_posted: Message added
-label_file_added: File added
-label_news_added: News added
-project_module_boards: Boards
-project_module_issue_tracking: Issue tracking
+text_status_changed_by_changeset: Приложено с ревизия %s.
+label_more: Още
+text_issues_destroy_confirmation: 'Сигурни ли сте, че искате да изтриете избраните задачи?'
+label_scm: SCM (Система за контрол на кода)
+text_select_project_modules: 'Изберете активните модули за този проект:'
+label_issue_added: Добавена задача
+label_issue_updated: Обновена задача
+label_document_added: Добавен документ
+label_message_posted: Добавено съобщение
+label_file_added: Добавен файл
+label_news_added: Добавена новина
+project_module_boards: Форуми
+project_module_issue_tracking: Тракинг
 project_module_wiki: Wiki
-project_module_files: Files
-project_module_documents: Documents
-project_module_repository: Repository
-project_module_news: News
-project_module_time_tracking: Time tracking
-text_file_repository_writable: File repository writable
-text_default_administrator_account_changed: Default administrator account changed
-text_rmagick_available: RMagick available (optional)
-button_configure: Configure
-label_plugins: Plugins
-label_ldap_authentication: LDAP authentication
+project_module_files: Файлове
+project_module_documents: Документи
+project_module_repository: Хранилище
+project_module_news: Новини
+project_module_time_tracking: Отделяне на време
+text_file_repository_writable: Възможност за писане в хранилището с файлове
+text_default_administrator_account_changed: Сменен фабричния администраторски профил
+text_rmagick_available: Наличен RMagick (по избор)
+button_configure: Конфигуриране
+label_plugins: Плъгини
+label_ldap_authentication: LDAP оторизация
 label_downloads_abbr: D/L
-label_this_month: this month
-label_last_n_days: last %d days
-label_all_time: all time
-label_this_year: this year
-label_date_range: Date range
-label_last_week: last week
-label_yesterday: yesterday
-label_last_month: last month
-label_add_another_file: Add another file
-label_optional_description: Optional description
-text_destroy_time_entries_question: %.02f hours were reported on the issues you are about to delete. What do you want to do ?
-error_issue_not_found_in_project: 'The issue was not found or does not belong to this project'
-text_assign_time_entries_to_project: Assign reported hours to the project
-text_destroy_time_entries: Delete reported hours
-text_reassign_time_entries: 'Reassign reported hours to this issue:'
-setting_activity_days_default: Days displayed on project activity
-label_chronological_order: In chronological order
-field_comments_sorting: Display comments
-label_reverse_chronological_order: In reverse chronological order
-label_preferences: Preferences
-setting_display_subprojects_issues: Display subprojects issues on main projects by default
-label_overall_activity: Overall activity
-setting_default_projects_public: New projects are public by default
-error_scm_annotate: "The entry does not exist or can not be annotated."
-label_planning: Planning
+label_this_month: текущия месец
+label_last_n_days: последните %d дни
+label_all_time: всички
+label_this_year: текущата година
+label_date_range: Период
+label_last_week: последната седмица
+label_yesterday: вчера
+label_last_month: последния месец
+label_add_another_file: Добавяне на друг файл
+label_optional_description: Незадължително описание
+text_destroy_time_entries_question: %.02f часа са отделени на задачите, които искате да изтриете. Какво избирате?
+error_issue_not_found_in_project: 'Задачата не е намерена или не принадлежи на този проект'
+text_assign_time_entries_to_project: Прехвърляне на отделеното време към проект
+text_destroy_time_entries: Изтриване на отделеното време
+text_reassign_time_entries: 'Прехвърляне на отделеното време към задача:'
+setting_activity_days_default: Брой дни показвани на таб Дейност
+label_chronological_order: Хронологичен ред
+field_comments_sorting: Сортиране на коментарите
+label_reverse_chronological_order: Обратен хронологичен ред
+label_preferences: Предпочитания
+setting_display_subprojects_issues: Показване на подпроектите в проектите по подразбиране
+label_overall_activity: Цялостна дейност
+setting_default_projects_public: Новите проекти са публични по подразбиране
+error_scm_annotate: "Обектът не съществува или не може да бъде анотиран."
+label_planning: Планиране
diff --git a/lang/de.yml b/lang/de.yml
index 17c6ac617..323859ae4 100644
--- a/lang/de.yml
+++ b/lang/de.yml
@@ -71,7 +71,7 @@ notice_locking_conflict: Datum wurde von einem anderen Benutzer geändert.
 notice_not_authorized: Sie sind nicht berechtigt, auf diese Seite zuzugreifen.
 notice_email_sent: Eine E-Mail wurde an %s gesendet.
 notice_email_error: Beim Senden einer E-Mail ist ein Fehler aufgetreten (%s).
-notice_feeds_access_key_reseted: Ihr RSS-Zugriffsschlüssel wurde zurückgesetzt.
+notice_feeds_access_key_reseted: Ihr Atom-Zugriffsschlüssel wurde zurückgesetzt.
 notice_failed_to_save_issues: "%d von %d ausgewählten Tickets konnte(n) nicht gespeichert werden: %s."
 notice_no_issue_selected: "Kein Ticket ausgewählt! Bitte wählen Sie die Tickets, die Sie bearbeiten möchten."
 notice_account_pending: "Ihr Konto wurde erstellt und wartet jetzt auf die Genehmigung des Administrators."
@@ -80,6 +80,7 @@ notice_default_data_loaded: Die Standard-Konfiguration wurde erfolgreich geladen
 error_can_t_load_default_data: "Die Standard-Konfiguration konnte nicht geladen werden: %s"
 error_scm_not_found: Eintrag und/oder Revision besteht nicht im Projektarchiv.
 error_scm_command_failed: "Beim Zugriff auf das Projektarchiv ist ein Fehler aufgetreten: %s"
+error_scm_annotate: "Der Eintrag existiert nicht oder kann nicht annotiert werden."
 error_issue_not_found_in_project: 'Das Ticket wurde nicht gefunden oder gehört nicht zu diesem Projekt.'
 
 mail_subject_lost_password: Ihr %s Kennwort
@@ -120,8 +121,8 @@ field_project: Projekt
 field_issue: Ticket
 field_status: Status
 field_notes: Kommentare
-field_is_closed: Problem erledigt
-field_is_default: Default
+field_is_closed: Ticket geschlossen
+field_is_default: Standardeinstellung
 field_tracker: Tracker
 field_subject: Thema
 field_due_date: Abgabedatum
@@ -133,8 +134,8 @@ field_role: Rolle
 field_homepage: Projekt-Homepage
 field_is_public: Öffentlich
 field_parent: Unterprojekt von
-field_is_in_chlog: Ansicht im Change-Log
-field_is_in_roadmap: Ansicht in der Roadmap
+field_is_in_chlog: Im Change-Log anzeigen
+field_is_in_roadmap: In der Roadmap anzeigen
 field_login: Mitgliedsname
 field_mail_notification: Mailbenachrichtigung
 field_admin: Administrator
@@ -177,6 +178,7 @@ field_column_names: Spalten
 field_time_zone: Zeitzone
 field_searchable: Durchsuchbar
 field_default_value: Standardwert
+field_comments_sorting: Kommentare anzeigen
 
 setting_app_title: Applikations-Titel
 setting_app_subtitle: Applikations-Untertitel
@@ -191,7 +193,8 @@ setting_bcc_recipients: E-Mails als Blindkopie (BCC) senden
 setting_host_name: Hostname
 setting_text_formatting: Textformatierung
 setting_wiki_compression: Wiki-Historie komprimieren
-setting_feeds_limit: Feed-Inhalt begrenzen
+setting_feeds_limit: Max. Anzahl Einträge pro Atom-Feed
+setting_default_projects_public: Neue Projekte sind standardmäßig öffentlich
 setting_autofetch_changesets: Changesets automatisch abrufen
 setting_sys_api_enabled: Webservice zur Verwaltung der Projektarchive benutzen
 setting_commit_ref_keywords: Schlüsselwörter (Beziehungen)
@@ -206,6 +209,8 @@ setting_emails_footer: E-Mail-Fußzeile
 setting_protocol: Protokoll
 setting_per_page_options: Objekte pro Seite
 setting_user_format: Benutzer-Anzeigeformat
+setting_activity_days_default: Anzahl Tage pro Seite der Projekt-Aktivität
+setting_display_subprojects_issues: Tickets von Unterprojekten im Hauptprojekt anzeigen
 
 project_module_issue_tracking: Ticket-Verfolgung
 project_module_time_tracking: Zeiterfassung
@@ -227,7 +232,7 @@ label_project_latest: Neueste Projekte
 label_issue: Ticket
 label_issue_new: Neues Ticket
 label_issue_plural: Tickets
-label_issue_view_all: Alle Tickets ansehen
+label_issue_view_all: Alle Tickets anzeigen
 label_issues_by: Tickets von %s
 label_issue_added: Ticket hinzugefügt
 label_issue_updated: Ticket aktualisiert
@@ -277,6 +282,7 @@ label_last_updates: zuletzt aktualisiert
 label_last_updates_plural: %d zuletzt aktualisierten
 label_registered_on: Angemeldet am
 label_activity: Aktivität
+label_overall_activity: Aktivität aller Projekte anzeigen
 label_new: Neu
 label_logged_as: Angemeldet als
 label_environment: Environment
@@ -320,7 +326,7 @@ label_version: Version
 label_version_new: Neue Version
 label_version_plural: Versionen
 label_confirmation: Bestätigung
-label_export_to: Export zu
+label_export_to: "Auch abrufbar als:"
 label_read: Lesen...
 label_public_projects: Öffentliche Projekte
 label_open_issues: offen
@@ -345,7 +351,7 @@ label_months_from: Monate ab
 label_gantt: Gantt
 label_internal: Intern
 label_last_changes: %d letzte Änderungen
-label_change_view_all: Alle Änderungen ansehen
+label_change_view_all: Alle Änderungen anzeigen
 label_personalize_page: Diese Seite anpassen
 label_comment: Kommentar
 label_comment_plural: Kommentare
@@ -469,7 +475,7 @@ label_date_to: Bis
 label_language_based: Sprachabhängig
 label_sort_by: Sortiert nach %s
 label_send_test_email: Test-E-Mail senden
-label_feeds_access_key_created_on: RSS-Zugriffsschlüssel vor %s erstellt
+label_feeds_access_key_created_on: Atom-Zugriffsschlüssel vor %s erstellt
 label_module_plural: Module
 label_added_time_by: Von %s vor %s hinzugefügt
 label_updated_time: Vor %s aktualisiert
@@ -500,6 +506,10 @@ label_ldap_authentication: LDAP-Authentifizierung
 label_downloads_abbr: D/L
 label_optional_description: Beschreibung (optional)
 label_add_another_file: Eine weitere Datei hinzufügen
+label_preferences: Präferenzen
+label_chronological_order: in zeitlicher Reihenfolge
+label_reverse_chronological_order: in umgekehrter zeitlicher Reihenfolge
+label_planning: Terminplanung
 
 button_login: Anmelden
 button_submit: OK
@@ -518,7 +528,7 @@ button_lock: Sperren
 button_unlock: Entsperren
 button_download: Download
 button_list: Liste
-button_view: Ansehen
+button_view: Anzeigen
 button_move: Verschieben
 button_back: Zurück
 button_cancel: Abbrechen
@@ -535,7 +545,7 @@ button_reset: Zurücksetzen
 button_rename: Umbenennen
 button_change_password: Kennwort ändern
 button_copy: Kopieren
-button_annotate: Mit Anmerkungen versehen
+button_annotate: Annotieren
 button_update: Aktualisieren
 button_configure: Konfigurieren
 
@@ -608,13 +618,3 @@ default_activity_development: Entwicklung
 enumeration_issue_priorities: Ticket-Prioritäten
 enumeration_doc_categories: Dokumentenkategorien
 enumeration_activities: Aktivitäten (Zeiterfassung)
-setting_activity_days_default: Days displayed on project activity
-label_chronological_order: In chronological order
-field_comments_sorting: Display comments
-label_reverse_chronological_order: In reverse chronological order
-label_preferences: Preferences
-setting_display_subprojects_issues: Display subprojects issues on main projects by default
-label_overall_activity: Overall activity
-setting_default_projects_public: New projects are public by default
-error_scm_annotate: "The entry does not exist or can not be annotated."
-label_planning: Planning
diff --git a/lang/he.yml b/lang/he.yml
index 018281581..0cde264f7 100644
--- a/lang/he.yml
+++ b/lang/he.yml
@@ -76,7 +76,7 @@ notice_failed_to_save_issues: "נכשרת בשמירת %d נושא\ים ב %d נ
 notice_no_issue_selected: "לא נבחר אף נושא! בחר בבקשה את הנושאים שברצונך לערוך."
 
 error_scm_not_found: כניסה ו\או גירסא אינם קיימים במאגר.
-error_scm_command_failed: "An error occurred when trying to access the repository: %s"
+error_scm_command_failed: "ארעה שגיאה בעת ניסון גישה למאגר: %s"
 
 mail_subject_lost_password: סיסמת ה-%s שלך
 mail_body_lost_password: 'לשינו סיסמת ה-Redmine שלך,לחץ על הקישור הבא:'
@@ -98,7 +98,7 @@ field_filesize: גודל
 field_downloads: הורדות
 field_author: כותב
 field_created_on: נוצר
-field_updated_on: עודגן
+field_updated_on: עודכן
 field_field_format: פורמט
 field_is_for_all: לכל הפרויקטים
 field_possible_values: ערכים אפשריים
@@ -119,7 +119,7 @@ field_subject: שם נושא
 field_due_date: תאריך סיום
 field_assigned_to: מוצב ל
 field_priority: עדיפות
-field_fixed_version: Target version
+field_fixed_version: גירסאת יעד
 field_user: מתשמש
 field_role: תפקיד
 field_homepage: דף הבית
@@ -140,7 +140,7 @@ field_version: גירסא
 field_type: סוג
 field_host: שרת
 field_port: פורט
-field_account: חשבום
+field_account: חשבון
 field_base_dn: בסיס DN
 field_attr_login: תכונת התחברות
 field_attr_firstname: תכונת שם פרטים
@@ -182,7 +182,7 @@ setting_text_formatting: עיצוב טקסט
 setting_wiki_compression: כיווץ היסטורית WIKI
 setting_feeds_limit: גבול תוכן הזנות
 setting_autofetch_changesets: משיכה אוטומתי של עידכונים
-setting_sys_api_enabled: Enable WS for repository management
+setting_sys_api_enabled: אפשר WS לניהול המאגר
 setting_commit_ref_keywords: מילות מפתח מקשרות
 setting_commit_fix_keywords: מילות מפתח מתקנות
 setting_autologin: חיבור אוטומטי
@@ -233,7 +233,7 @@ label_information_plural: מידע
 label_please_login: התחבר בבקשה
 label_register: הרשמה
 label_password_lost: אבדה הסיסמה?
-label_home: דך הבית
+label_home: דף הבית
 label_my_page: הדף שלי
 label_my_account: השבון שלי
 label_my_projects: הפרויקטים שלי
@@ -259,7 +259,7 @@ label_subproject_plural: תת-פרויקטים
 label_min_max_length: אורך מינימאלי - מקסימאלי
 label_list: רשימה
 label_date: תאריך
-label_integer: מספר שלים
+label_integer: מספר שלם
 label_boolean: ערך בוליאני
 label_string: טקסט
 label_text: טקסט ארוך
@@ -269,7 +269,7 @@ label_download: הורדה %d
 label_download_plural: %d הורדות
 label_no_data: אין מידע להציג
 label_change_status: שנה מצב
-label_history: הידטוריה
+label_history: היסטוריה
 label_attachment: קובץ
 label_attachment_new: קובץ חדש
 label_attachment_delete: מחק קובץ
@@ -279,7 +279,7 @@ label_report_plural: דו"חות
 label_news: חדשות
 label_news_new: הוסף חדשות
 label_news_plural: חדשות
-label_news_latest: חדשות חדשות
+label_news_latest: חדשות אחרונות
 label_news_view_all: צפה בכל החדשות
 label_change_log: דו"ח שינויים
 label_settings: הגדרות
@@ -419,7 +419,7 @@ label_reply_plural: השבות
 label_send_information: שלח מידע על חשבון למשתמש
 label_year: שנה
 label_month: חודש
-label_week: שבו
+label_week: שבוע
 label_date_from: מאת
 label_date_to: אל
 label_language_based: מבוסס שפה
@@ -444,7 +444,7 @@ button_save: שמור
 button_check_all: בחר הכל
 button_uncheck_all: בחר כלום
 button_delete: מחק
-button_create: צוק
+button_create: צור
 button_test: בדוק
 button_edit: ערוך
 button_add: הוסף
@@ -454,13 +454,13 @@ button_clear: נקה
 button_lock: נעל
 button_unlock: בטל נעילה
 button_download: הורד
-button_list: קשימה
+button_list: רשימה
 button_view: צפה
 button_move: הזז
 button_back: הקודם
 button_cancel: בטח
 button_activate: הפעל
-button_sort: מין
+button_sort: מיין
 button_log_time: זמן לוג
 button_rollback: חזור לגירסא זו
 button_watch: צפה
@@ -526,94 +526,94 @@ default_activity_development: פיתוח
 enumeration_issue_priorities: עדיפות נושאים
 enumeration_doc_categories: קטגוריות מסמכים
 enumeration_activities: פעילויות (מעקב אחר זמנים)
-label_search_titles_only: Search titles only
-label_nobody: nobody
-button_change_password: Change password
-text_user_mail_option: "For unselected projects, you will only receive notifications about things you watch or you're involved in (eg. issues you're the author or assignee)."
-label_user_mail_option_selected: "For any event on the selected projects only..."
-label_user_mail_option_all: "For any event on all my projects"
-label_user_mail_option_none: "Only for things I watch or I'm involved in"
-setting_emails_footer: Emails footer
-label_float: Float
-button_copy: Copy
-mail_body_account_information_external: You can use your "%s" account to log in.
-mail_body_account_information: Your account information
-setting_protocol: Protocol
-label_user_mail_no_self_notified: "I don't want to be notified of changes that I make myself"
-setting_time_format: Time format
-label_registration_activation_by_email: account activation by email
-mail_subject_account_activation_request: %s account activation request
-mail_body_account_activation_request: 'A new user (%s) has registered. His account his pending your approval:'
-label_registration_automatic_activation: automatic account activation
-label_registration_manual_activation: manual account activation
-notice_account_pending: "Your account was created and is now pending administrator approval."
-field_time_zone: Time zone
-text_caracters_minimum: Must be at least %d characters long.
-setting_bcc_recipients: Blind carbon copy recipients (bcc)
-button_annotate: Annotate
-label_issues_by: Issues by %s
-field_searchable: Searchable
-label_display_per_page: 'Per page: %s'
-setting_per_page_options: Objects per page options
-label_age: Age
-notice_default_data_loaded: Default configuration successfully loaded.
-text_load_default_configuration: Load the default configuration
-text_no_configuration_data: "Roles, trackers, issue statuses and workflow have not been configured yet.\nIt is highly recommended to load the default configuration. You will be able to modify it once loaded."
-error_can_t_load_default_data: "Default configuration could not be loaded: %s"
-button_update: Update
-label_change_properties: Change properties
-label_general: General
-label_repository_plural: Repositories
-label_associated_revisions: Associated revisions
-setting_user_format: Users display format
-text_status_changed_by_changeset: Applied in changeset %s.
-label_more: More
-text_issues_destroy_confirmation: 'Are you sure you want to delete the selected issue(s) ?'
+label_search_titles_only: חפש בכותרות בלבד
+label_nobody: אף אחד
+button_change_password: שנה סיסמא
+text_user_mail_option: "בפרויקטים שלא בחרת, אתה רק תקבל התרעות על שאתה צופה או קשור אליהם (לדוגמא:נושאים שאתה היוצר שלהם או מוצבים אליך)."
+label_user_mail_option_selected: "לכל אירוע בפרויקטים שבחרתי בלבד..."
+label_user_mail_option_all: "לכל אירוע בכל הפרויקטים שלי"
+label_user_mail_option_none: "רק לנושאים שאני צופה או קשור אליהם"
+setting_emails_footer: תחתית דוא"ל
+label_float: צף
+button_copy: העתק
+mail_body_account_information_external: אתה יכול להשתמש בחשבון "%s" כדי להתחבר
+mail_body_account_information: פרטי החשבון שלך
+setting_protocol: פרוטוקול
+label_user_mail_no_self_notified: "אני לא רוצה שיודיעו לי על שינויים שאני מבצע"
+setting_time_format: פורמט זמן
+label_registration_activation_by_email: הפעל חשבון באמצעות דוא"ל
+mail_subject_account_activation_request: בקשת הפעלה לחשבון %s
+mail_body_account_activation_request: 'משתמש חדש (%s) נרשם. החשבון שלו מחכה לאישור שלך:'
+label_registration_automatic_activation: הפעלת חשבון אוטומטית
+label_registration_manual_activation: הפעלת חשבון ידנית
+notice_account_pending: "החשבון שלך נוצר ועתה מחכה לאישור מנהל המערכת."
+field_time_zone: איזור זמן
+text_caracters_minimum: חייב להיות לפחות באורך של %d תווים.
+setting_bcc_recipients: מוסתר (bcc)
+button_annotate: הוסף תיאור מסגרת
+label_issues_by: נושאים של %s
+field_searchable: ניתן לחיפוש
+label_display_per_page: 'לכל דף: %s'
+setting_per_page_options: אפשרויות אוביקטים לפי דף
+label_age: גיל
+notice_default_data_loaded: אפשרויות ברירת מחדל מופעלות.
+text_load_default_configuration: טען את אפשרויות ברירת המחדל
+text_no_configuration_data: "Roles, trackers, issue statuses and workflow have not been configured yet.\nIt is highly recommended to load the default configuration. יהיה באפשרותך לשנותו לאחר שיטען."
+error_can_t_load_default_data: "אפשרויות ברירת המחדל לא הצליחו להיטען: %s"
+button_update: עדכן
+label_change_properties: שנה מאפיינים
+label_general: כללי
+label_repository_plural: מאגרים
+label_associated_revisions: שינויים קשורים
+setting_user_format: פורמט הצגת משתמשים
+text_status_changed_by_changeset: הוחל בסדרת השינויים %s.
+label_more: עוד
+text_issues_destroy_confirmation: 'האם את\ה בטוח שברצונך למחוק את הנושא\ים ?'
 label_scm: SCM
-text_select_project_modules: 'Select modules to enable for this project:'
-label_issue_added: Issue added
-label_issue_updated: Issue updated
-label_document_added: Document added
-label_message_posted: Message added
-label_file_added: File added
-label_news_added: News added
-project_module_boards: Boards
-project_module_issue_tracking: Issue tracking
+text_select_project_modules: 'בחר מודולים להחיל על פקרויקט זה:'
+label_issue_added: נושא הוסף
+label_issue_updated: נושא עודכן
+label_document_added: מוסמך הוסף
+label_message_posted: הודעה הוספה
+label_file_added: קובץ הוסף
+label_news_added: חדשות הוספו
+project_module_boards: לוחות
+project_module_issue_tracking: מעקב נושאים
 project_module_wiki: Wiki
-project_module_files: Files
-project_module_documents: Documents
-project_module_repository: Repository
-project_module_news: News
-project_module_time_tracking: Time tracking
-text_file_repository_writable: File repository writable
-text_default_administrator_account_changed: Default administrator account changed
+project_module_files: קבצים
+project_module_documents: מסמכים
+project_module_repository: מאגר
+project_module_news: חדשות
+project_module_time_tracking: מעקב אחר זמנים
+text_file_repository_writable: מאגר הקבצים ניתן לכתיבה
+text_default_administrator_account_changed: מנהל המערכת ברירת המחדל שונה
 text_rmagick_available: RMagick available (optional)
-button_configure: Configure
-label_plugins: Plugins
-label_ldap_authentication: LDAP authentication
+button_configure: אפשרויות
+label_plugins: פלאגינים
+label_ldap_authentication: אימות LDAP
 label_downloads_abbr: D/L
-label_this_month: this month
-label_last_n_days: last %d days
-label_all_time: all time
-label_this_year: this year
-label_date_range: Date range
-label_last_week: last week
-label_yesterday: yesterday
-label_last_month: last month
-label_add_another_file: Add another file
-label_optional_description: Optional description
-text_destroy_time_entries_question: %.02f hours were reported on the issues you are about to delete. What do you want to do ?
-error_issue_not_found_in_project: 'The issue was not found or does not belong to this project'
-text_assign_time_entries_to_project: Assign reported hours to the project
-text_destroy_time_entries: Delete reported hours
-text_reassign_time_entries: 'Reassign reported hours to this issue:'
-setting_activity_days_default: Days displayed on project activity
-label_chronological_order: In chronological order
-field_comments_sorting: Display comments
-label_reverse_chronological_order: In reverse chronological order
-label_preferences: Preferences
-setting_display_subprojects_issues: Display subprojects issues on main projects by default
-label_overall_activity: Overall activity
-setting_default_projects_public: New projects are public by default
-error_scm_annotate: "The entry does not exist or can not be annotated."
-label_planning: Planning
+label_this_month: החודש
+label_last_n_days: ב-%d ימים אחרונים
+label_all_time: תמיד
+label_this_year: השנה
+label_date_range: טווח תאריכים
+label_last_week: שבוע שעבר
+label_yesterday: אתמול
+label_last_month: חודש שעבר
+label_add_another_file: הוסף עוד קובץ
+label_optional_description: תיאור רשות
+text_destroy_time_entries_question: %.02f שעות דווחו על הנושים שאת\ה עומד\ת למחוק. מה ברצונך לעשות ?
+error_issue_not_found_in_project: 'הנושאים לא נמצאו או אינם שיכים לפרויקט'
+text_assign_time_entries_to_project: הצב שעות שדווחו לפרויקט הזה
+text_destroy_time_entries: מחק שעות שדווחו
+text_reassign_time_entries: 'הצב מחדש שעות שדווחו לפרויקט הזה:'
+setting_activity_days_default: ימים המוצגים על פעילות הפרויקט
+label_chronological_order: בסדר כרונולוגי
+field_comments_sorting: הצג הערות
+label_reverse_chronological_order: בסדר כרונולוגי הפוך
+label_preferences: העדפות
+setting_display_subprojects_issues: הצג נושאים של תת פרויקטים כברירת מחדל
+label_overall_activity: פעילות כוללת
+setting_default_projects_public: פרויקטים חדשים הינם פומביים כברירת מחדל
+error_scm_annotate: "הכניסה לא קיימת או שלא ניתן לתאר אותה."
+label_planning: תכנון
diff --git a/lang/no.yml b/lang/no.yml
index f2d7ac144..25f4047ab 100644
--- a/lang/no.yml
+++ b/lang/no.yml
@@ -80,7 +80,7 @@ notice_default_data_loaded: Standardkonfigurasjonen lastet inn.
 error_can_t_load_default_data: "Standardkonfigurasjonen kunne ikke lastes inn: %s"
 error_scm_not_found: "Elementet og/eller revisjonen eksisterer ikke i depoet."
 error_scm_command_failed: "En feil oppstod under tilkobling til depoet: %s"
-error_scm_annotate: "Elementet eksisterer ikke, eller kan ikke annoteres."
+error_scm_annotate: "Elementet eksisterer ikke, eller kan ikke noteres."
 error_issue_not_found_in_project: 'Saken eksisterer ikke, eller hører ikke til dette prosjektet'
 
 mail_subject_lost_password: Ditt %s passord
@@ -137,7 +137,7 @@ field_parent: Underprosjekt til
 field_is_in_chlog: Vises i endringslogg
 field_is_in_roadmap: Vises i veikart
 field_login: Brukernavn
-field_mail_notification: E-post varsling
+field_mail_notification: E-post-varsling
 field_admin: Administrator
 field_last_login_on: Sist innlogget
 field_language: Språk
@@ -352,7 +352,7 @@ label_gantt: Gantt
 label_internal: Intern
 label_last_changes: siste %d endringer
 label_change_view_all: Vis alle endringer
-label_personalize_page: Tilrettelegg denne siden
+label_personalize_page: Tilpass denne siden
 label_comment: Kommentar
 label_comment_plural: Kommentarer
 label_comment_add: Legg til kommentar
@@ -545,7 +545,7 @@ button_reset: Nullstill
 button_rename: Endre navn
 button_change_password: Endre passord
 button_copy: Kopier
-button_annotate: Annotér
+button_annotate: Notér
 button_update: Oppdater
 button_configure: Konfigurer
 
@@ -565,7 +565,7 @@ text_journal_deleted: slettet
 text_tip_task_begin_day: oppgaven starter denne dagen
 text_tip_task_end_day: oppgaven avsluttes denne dagen
 text_tip_task_begin_end_day: oppgaven starter og avsluttes denne dagen
-text_project_identifier_info: 'Små bokstaver (a-z), nummer og binde-/understrek tillat.<br />Identifikatoren kan ikke endres etter den er lagret.'
+text_project_identifier_info: 'Små bokstaver (a-z), nummer og bindestrek tillatt.<br />Identifikatoren kan ikke endres etter den er lagret.'
 text_caracters_maximum: %d tegn maksimum.
 text_caracters_minimum: Må være minst %d tegn langt.
 text_length_between: Lengde mellom %d og %d tegn.
@@ -586,8 +586,8 @@ text_status_changed_by_changeset: Brukt i endringssett %s.
 text_issues_destroy_confirmation: 'Er du sikker på at du vil slette valgte sak(er) ?'
 text_select_project_modules: 'Velg moduler du vil aktivere for dette prosjektet:'
 text_default_administrator_account_changed: Standard administrator-konto er endret
-text_file_repository_writable: Fil-depotet er skrivbart
-text_rmagick_available: RMagick tilgjengelig (valgfritt)
+text_file_repository_writable: Fil-arkivet er skrivbart
+text_rmagick_available: RMagick er tilgjengelig (valgfritt)
 text_destroy_time_entries_question: %.02f timer er ført på sakene du er i ferd med å slette. Hva vil du gjøre ?
 text_destroy_time_entries: Slett førte timer
 text_assign_time_entries_to_project: Overfør førte timer til prosjektet
diff --git a/lang/ru.yml b/lang/ru.yml
index e488c35e1..310ded30d 100644
--- a/lang/ru.yml
+++ b/lang/ru.yml
@@ -619,5 +619,5 @@ label_preferences: Предпочтения
 setting_display_subprojects_issues: Отображение подпроектов по умолчанию
 label_overall_activity: Сводная активность
 setting_default_projects_public: Новые проекты являются публичными
-error_scm_annotate: "The entry does not exist or can not be annotated."
-label_planning: Planning
+error_scm_annotate: "Данные отсутствуют или не могут быть подписаны."
+label_planning: Планирование

From db7f890030b8138fc12d5debcdc66bf1b1e3861b Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 6 Apr 2008 12:00:11 +0000
Subject: [PATCH 370/710] Mercurial: Get proper file action on revision (#983).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1332 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 lib/redmine/scm/adapters/mercurial_adapter.rb | 57 ++++++++++++++-----
 1 file changed, 43 insertions(+), 14 deletions(-)

diff --git a/lib/redmine/scm/adapters/mercurial_adapter.rb b/lib/redmine/scm/adapters/mercurial_adapter.rb
index ff52ab893..b92c88646 100644
--- a/lib/redmine/scm/adapters/mercurial_adapter.rb
+++ b/lib/redmine/scm/adapters/mercurial_adapter.rb
@@ -88,13 +88,7 @@ module Redmine
                 value = $2
                 if parsing_descr && line_feeds > 1
                   parsing_descr = false
-                  revisions << Revision.new({:identifier => changeset[:changeset].split(':').first.to_i,
-                                             :scmid => changeset[:changeset].split(':').last,
-                                             :author => changeset[:user],
-                                             :time => Time.parse(changeset[:date]),
-                                             :message => changeset[:description],
-                                             :paths => changeset[:files].to_s.split.collect{|path| {:action => 'X', :path => "/#{path}"}}
-                  })
+                  revisions << build_revision_from_changeset(changeset)
                   changeset = {}
                 end
                 if !parsing_descr
@@ -111,13 +105,7 @@ module Redmine
                 line_feeds += 1 if line.chomp.empty?
               end
             end
-            revisions << Revision.new({:identifier => changeset[:changeset].split(':').first.to_i,
-                                       :scmid => changeset[:changeset].split(':').last,
-                                       :author => changeset[:user],
-                                       :time => Time.parse(changeset[:date]),
-                                       :message => changeset[:description],
-                                       :paths => changeset[:files].to_s.split.collect{|path| {:action => 'X', :path => "/#{path}"}}
-            })
+            revisions << build_revision_from_changeset(changeset)
           end
           return nil if $? && $?.exitstatus != 0
           revisions
@@ -171,6 +159,47 @@ module Redmine
           return nil if $? && $?.exitstatus != 0
           blame
         end
+        
+        private
+        
+        # Builds a revision objet from the changeset returned by hg command
+        def build_revision_from_changeset(changeset)
+          rev_id = changeset[:changeset].to_s.split(':').first.to_i
+          
+          # Changes
+          paths = (rev_id == 0) ?
+            # Can't get changes for revision 0 with hg status
+            changeset[:files].to_s.split.collect{|path| {:action => 'A', :path => "/#{path}"}} :
+            status(rev_id)
+          
+          Revision.new({:identifier => rev_id,
+                        :scmid => changeset[:changeset].to_s.split(':').last,
+                        :author => changeset[:user],
+                        :time => Time.parse(changeset[:date]),
+                        :message => changeset[:description],
+                        :paths => paths
+                       })
+        end
+        
+        # Returns the file changes for a given revision
+        def status(rev_id)
+          cmd = "#{HG_BIN} -R #{target('')} status --rev #{rev_id.to_i - 1}:#{rev_id.to_i}"
+          result = []
+          shellout(cmd) do |io|
+            io.each_line do |line|
+              action, file = line.chomp.split
+              next unless action && file
+              file.gsub!("\\", "/")
+              case action
+              when 'R'
+                result << { :action => 'D' , :path => "/#{file}" }
+              else
+                result << { :action => action, :path => "/#{file}" }
+              end
+            end
+          end
+          result
+        end
       end
     end
   end

From beff2c54bc325e8a8f838d90aa122be823423114 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 6 Apr 2008 12:22:59 +0000
Subject: [PATCH 371/710] Mercurial: display working directory files sizes
 unless browsing a specific revision (#999).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1333 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/models/repository/mercurial.rb | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/app/models/repository/mercurial.rb b/app/models/repository/mercurial.rb
index 27a8eaea9..b183c15a7 100644
--- a/app/models/repository/mercurial.rb
+++ b/app/models/repository/mercurial.rb
@@ -34,6 +34,11 @@ class Repository::Mercurial < Repository
     if entries
       entries.each do |entry|
         next unless entry.is_file?
+        # Set the filesize unless browsing a specific revision
+        if identifier.nil?
+          full_path = File.join(root_url, entry.path)
+          entry.size = File.stat(full_path).size if File.file?(full_path)
+        end
         # 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

From 0249ae5f500063f4d08ff09a7071cb949a534316 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 6 Apr 2008 13:15:09 +0000
Subject: [PATCH 372/710] Preserve status filter and page number when using
 lock/unlock/activate links on the users list (closes #998).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1334 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/users_controller.rb |  3 ++-
 app/helpers/users_helper.rb         | 12 ++++++++++++
 app/views/users/list.rhtml          | 12 +-----------
 3 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index ceb70ab92..48fc6fade 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -83,7 +83,8 @@ class UsersController < ApplicationController
       end
       if @user.update_attributes(params[:user])
         flash[:notice] = l(:notice_successful_update)
-        redirect_to :action => 'list'
+        # Give a string to redirect_to otherwise it would use status param as the response code
+        redirect_to(url_for(:action => 'list', :status => params[:status], :page => params[:page]))
       end
     end
     @auth_sources = AuthSource.find(:all)
diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb
index 7bd137161..250ed8ce8 100644
--- a/app/helpers/users_helper.rb
+++ b/app/helpers/users_helper.rb
@@ -22,4 +22,16 @@ module UsersHelper
                         [l(:status_registered), 2],
                         [l(:status_locked), 3]], selected)
   end
+  
+  def change_status_link(user)
+    url = {:action => 'edit', :id => user, :page => params[:page], :status => params[:status]}
+    
+    if user.locked?
+      link_to l(:button_unlock), url.merge(:user => {:status => User::STATUS_ACTIVE}), :method => :post, :class => 'icon icon-unlock'
+    elsif user.registered?
+      link_to l(:button_activate), url.merge(:user => {:status => User::STATUS_ACTIVE}), :method => :post, :class => 'icon icon-unlock'
+    else
+      link_to l(:button_lock), url.merge(:user => {:status => User::STATUS_LOCKED}), :method => :post, :class => 'icon icon-lock'
+    end
+  end
 end
diff --git a/app/views/users/list.rhtml b/app/views/users/list.rhtml
index e12aa3425..d89672d19 100644
--- a/app/views/users/list.rhtml
+++ b/app/views/users/list.rhtml
@@ -33,17 +33,7 @@
 	<td align="center"><%= image_tag('true.png') if user.admin? %></td>
 	<td class="created_on" align="center"><%= format_time(user.created_on) %></td>
 	<td class="last_login_on" align="center"><%= format_time(user.last_login_on) unless user.last_login_on.nil? %></td>
-    <td>
-    <small>
-    <% if user.locked? -%>
-        <%= link_to l(:button_unlock), {:action => 'edit', :id => user, :user => {:status => User::STATUS_ACTIVE}}, :method => :post, :class => 'icon icon-unlock' %>
-    <% elsif user.registered? -%>
-        <%= link_to l(:button_activate), {:action => 'edit', :id => user, :user => {:status => User::STATUS_ACTIVE}}, :method => :post, :class => 'icon icon-unlock' %>
-    <% else -%>
-        <%= link_to l(:button_lock), {:action => 'edit', :id => user, :user => {:status => User::STATUS_LOCKED}}, :method => :post, :class => 'icon icon-lock' %>
-    <% end -%>
-    </small>
-    </td>
+    <td><small><%= change_status_link(user) %></small></td>
   </tr>
 <% end -%>
   </tbody>

From 246e8f67c598664741954aa2cbb4cfeafea7ef85 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 6 Apr 2008 17:29:09 +0000
Subject: [PATCH 373/710] Redmine.pm support for LDAP authentication (patch by
 Liwiusz Ociepa). Closes #879, #918.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1335 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 extra/svn/Redmine.pm | 31 ++++++++++++++++++++++++++-----
 1 file changed, 26 insertions(+), 5 deletions(-)

diff --git a/extra/svn/Redmine.pm b/extra/svn/Redmine.pm
index b76622e3d..f4c5abc6b 100644
--- a/extra/svn/Redmine.pm
+++ b/extra/svn/Redmine.pm
@@ -90,6 +90,7 @@ use strict;
 
 use DBI;
 use Digest::SHA1;
+use Authen::Simple::LDAP;
 
 use Apache2::Module;
 use Apache2::Access;
@@ -140,7 +141,7 @@ sub is_public_project {
 
     my $dbh = connect_database($r);
     my $sth = $dbh->prepare(
-	"SELECT * FROM projects WHERE projects.identifier=? and projects.is_public=true;"
+        "SELECT * FROM projects WHERE projects.identifier=? and projects.is_public=true;"
     );
 
     $sth->execute($project_id);
@@ -176,17 +177,37 @@ sub is_member {
   my $pass_digest = Digest::SHA1::sha1_hex($redmine_pass);
 
   my $sth = $dbh->prepare(
-      "SELECT hashed_password FROM members, projects, users WHERE projects.id=members.project_id AND users.id=members.user_id AND users.status=1 AND login=? AND identifier=?;"
+      "SELECT hashed_password, auth_source_id FROM members, projects, users WHERE projects.id=members.project_id AND users.id=members.user_id AND users.status=1 AND login=? AND identifier=?;"
   );
   $sth->execute($redmine_user, $project_id);
 
   my $ret;
   while (my @row = $sth->fetchrow_array) {
-      if ($row[0] eq $pass_digest) {
-	  $ret = 1;
-	  last;
+      unless ($row[1]) {
+          if ($row[0] eq $pass_digest) {
+              $ret = 1;
+              last;
+          }
+      } else {
+          my $sthldap = $dbh->prepare(
+              "SELECT host,port,account,account_password,base_dn,attr_login from auth_sources WHERE id = ?;"
+          );
+          $sthldap->execute($row[1]);
+          while (my @rowldap = $sthldap->fetchrow_array) {
+            my $ldap = Authen::Simple::LDAP->new(
+	        host 	=>	$rowldap[0],
+		port	=>	$rowldap[1],
+		basedn	=>	$rowldap[4],
+		binddn	=>	$rowldap[2] ? $rowldap[2] : "",
+		bindpw	=>	$rowldap[3] ? $rowldap[3] : "",
+		filter	=>	"(".$rowldap[5]."=%s)"
+	    );
+	    $ret = 1 if ($ldap->authenticate($redmine_user, $redmine_pass));
+          }
+          $sthldap->finish();
       }
   }
+  $sth->finish();
   $dbh->disconnect();
 
   $ret;

From 2bcb7820875b9ace4dad36a759cee453c45e4dec Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 6 Apr 2008 17:36:26 +0000
Subject: [PATCH 374/710] Redmine.pm for webdav authentication: * make
 Authen::Simple::LDAP module optional * handle TLS flag set in Redmine

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1336 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 extra/svn/Redmine.pm | 30 +++++++++++++++++-------------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/extra/svn/Redmine.pm b/extra/svn/Redmine.pm
index f4c5abc6b..782d0777a 100644
--- a/extra/svn/Redmine.pm
+++ b/extra/svn/Redmine.pm
@@ -8,8 +8,8 @@ against redmine database
 =head1 SYNOPSIS
 
 This module allow anonymous users to browse public project and
-registred users to browse and commit their project. authentication is
-done on the redmine database.
+registred users to browse and commit their project. Authentication is
+done against the redmine database or the LDAP configured in redmine.
 
 This method is far simpler than the one with pam_* and works with all
 database without an hassle but you need to have apache/mod_perl on the
@@ -29,6 +29,9 @@ On debian/ubuntu you must do :
 
   aptitude install libapache-dbi-perl libapache2-mod-perl2 libdbd-mysql-perl
 
+If your Redmine users use LDAP authentication, you will also need
+Authen::Simple::LDAP (and IO::Socket::SSL if LDAPS is used).
+
 =head1 CONFIGURATION
 
    ## if the module isn't in your perl path
@@ -90,7 +93,8 @@ use strict;
 
 use DBI;
 use Digest::SHA1;
-use Authen::Simple::LDAP;
+# optional module for LDAP authentication
+my $CanUseLDAPAuth = eval("use Authen::Simple::LDAP; 1");
 
 use Apache2::Module;
 use Apache2::Access;
@@ -188,21 +192,21 @@ sub is_member {
               $ret = 1;
               last;
           }
-      } else {
+      } elsif ($CanUseLDAPAuth) {
           my $sthldap = $dbh->prepare(
-              "SELECT host,port,account,account_password,base_dn,attr_login from auth_sources WHERE id = ?;"
+              "SELECT host,port,tls,account,account_password,base_dn,attr_login from auth_sources WHERE id = ?;"
           );
           $sthldap->execute($row[1]);
           while (my @rowldap = $sthldap->fetchrow_array) {
             my $ldap = Authen::Simple::LDAP->new(
-	        host 	=>	$rowldap[0],
-		port	=>	$rowldap[1],
-		basedn	=>	$rowldap[4],
-		binddn	=>	$rowldap[2] ? $rowldap[2] : "",
-		bindpw	=>	$rowldap[3] ? $rowldap[3] : "",
-		filter	=>	"(".$rowldap[5]."=%s)"
-	    );
-	    $ret = 1 if ($ldap->authenticate($redmine_user, $redmine_pass));
+                host    =>      ($rowldap[2] == 1 || $rowldap[2] eq "t") ? "ldaps://$rowldap[0]" : $rowldap[0],
+                port    =>      $rowldap[1],
+                basedn  =>      $rowldap[5],
+                binddn  =>      $rowldap[3] ? $rowldap[3] : "",
+                bindpw  =>      $rowldap[4] ? $rowldap[4] : "",
+                filter  =>      "(".$rowldap[6]."=%s)"
+            );
+            $ret = 1 if ($ldap->authenticate($redmine_user, $redmine_pass));
           }
           $sthldap->finish();
       }

From fc1a295d8a51f49e75155835a766e8fc5f9d5977 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Mon, 7 Apr 2008 17:03:02 +0000
Subject: [PATCH 375/710] Redmine.pm doc update

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1337 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 extra/svn/Redmine.pm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/extra/svn/Redmine.pm b/extra/svn/Redmine.pm
index 782d0777a..6f3ba4385 100644
--- a/extra/svn/Redmine.pm
+++ b/extra/svn/Redmine.pm
@@ -30,7 +30,9 @@ On debian/ubuntu you must do :
   aptitude install libapache-dbi-perl libapache2-mod-perl2 libdbd-mysql-perl
 
 If your Redmine users use LDAP authentication, you will also need
-Authen::Simple::LDAP (and IO::Socket::SSL if LDAPS is used).
+Authen::Simple::LDAP (and IO::Socket::SSL if LDAPS is used):
+
+  aptitude install libauthen-simple-ldap-perl libio-socket-ssl-perl
 
 =head1 CONFIGURATION
 

From 5d3454853956adee21518a1fc891b26f36c3c294 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Mon, 7 Apr 2008 17:18:09 +0000
Subject: [PATCH 376/710] CSV export added to timelog report (#1009).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1338 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/timelog_controller.rb      |  5 ++-
 app/helpers/timelog_helper.rb              | 52 ++++++++++++++++++++++
 app/views/timelog/report.rhtml             |  5 +++
 test/functional/timelog_controller_test.rb | 13 +++++-
 4 files changed, 73 insertions(+), 2 deletions(-)

diff --git a/app/controllers/timelog_controller.rb b/app/controllers/timelog_controller.rb
index 77337f344..3081c50dd 100644
--- a/app/controllers/timelog_controller.rb
+++ b/app/controllers/timelog_controller.rb
@@ -112,7 +112,10 @@ class TimelogController < ApplicationController
       end
     end
     
-    render :layout => false if request.xhr?
+    respond_to do |format|
+      format.html { render :layout => !request.xhr? }
+      format.csv  { send_data(report_to_csv(@criterias, @periods, @hours).read, :type => 'text/csv; header=present', :filename => 'timelog.csv') }
+    end
   end
   
   def details
diff --git a/app/helpers/timelog_helper.rb b/app/helpers/timelog_helper.rb
index 05b55907c..e0459581d 100644
--- a/app/helpers/timelog_helper.rb
+++ b/app/helpers/timelog_helper.rb
@@ -76,4 +76,56 @@ module TimelogHelper
     export.rewind
     export
   end
+  
+  def report_to_csv(criterias, periods, hours)
+    export = StringIO.new
+    CSV::Writer.generate(export, l(:general_csv_separator)) do |csv|
+      # Column headers
+      headers = criterias.collect {|criteria| l(@available_criterias[criteria][:label]) }
+      headers += periods
+      headers << l(:label_total)
+      csv << headers.collect {|c| to_utf8(c) }
+      # Content
+      report_criteria_to_csv(csv, criterias, periods, hours)
+      # Total row
+      row = [ l(:label_total) ] + [''] * (criterias.size - 1)
+      total = 0
+      periods.each do |period|
+        sum = sum_hours(select_hours(hours, @columns, period.to_s))
+        total += sum
+        row << (sum > 0 ? "%.2f" % sum : '')
+      end
+      row << "%.2f" %total
+      csv << row
+    end
+    export.rewind
+    export
+  end
+  
+  def report_criteria_to_csv(csv, criterias, periods, hours, level=0)
+    hours.collect {|h| h[criterias[level]]}.uniq.each do |value|
+      hours_for_value = select_hours(hours, criterias[level], value)
+      next if hours_for_value.empty?
+      row = [''] * level
+      row << to_utf8(value.nil? ? l(:label_none) : @available_criterias[criterias[level]][:klass].find_by_id(value))
+      row += [''] * (criterias.length - level - 1)
+      total = 0
+      periods.each do |period|
+        sum = sum_hours(select_hours(hours_for_value, @columns, period.to_s))
+        total += sum
+        row << (sum > 0 ? "%.2f" % sum : '')
+      end
+      row << "%.2f" %total
+      csv << row
+      
+      if criterias.length > level + 1
+        report_criteria_to_csv(csv, criterias, periods, hours_for_value, level + 1)
+      end
+    end
+  end
+  
+  def to_utf8(s)
+    @ic ||= Iconv.new(l(:general_csv_encoding), 'UTF-8')
+    begin; @ic.iconv(s.to_s); rescue; s.to_s; end
+  end
 end
diff --git a/app/views/timelog/report.rhtml b/app/views/timelog/report.rhtml
index c29cadf9c..97251bc11 100644
--- a/app/views/timelog/report.rhtml
+++ b/app/views/timelog/report.rhtml
@@ -60,6 +60,11 @@
   </tr>
 </tbody>
 </table>
+
+<p class="other-formats">
+<%= l(:label_export_to) %>
+<span><%= link_to 'CSV', params.merge({:format => 'csv'}), :class => 'csv' %></span>
+</p>
 <% end %>
 <% end %>
 
diff --git a/test/functional/timelog_controller_test.rb b/test/functional/timelog_controller_test.rb
index 6e3308c84..4d6cb0b36 100644
--- a/test/functional/timelog_controller_test.rb
+++ b/test/functional/timelog_controller_test.rb
@@ -118,7 +118,18 @@ class TimelogControllerTest < Test::Unit::TestCase
     assert_template 'report'
     assert_not_nil assigns(:total_hours)
     assert_equal "0.00", "%.2f" % assigns(:total_hours)
- end
+  end
+ 
+  def test_report_csv_export
+    get :report, :project_id => 1, :columns => 'month', :from => "2007-01-01", :to => "2007-06-30", :criterias => ["project", "member", "activity"], :format => "csv"
+    assert_response :success
+    assert_equal 'text/csv', @response.content_type
+    lines = @response.body.chomp.split("\n")
+    # Headers
+    assert_equal 'Project,Member,Activity,2007-1,2007-2,2007-3,2007-4,2007-5,2007-6,Total', lines.first
+    # Total row
+    assert_equal 'Total,"","","","",154.25,8.65,"","",162.90', lines.last
+  end
 
   def test_details_at_project_level
     get :details, :project_id => 1

From f025b16be747bf7ab7b1cae470eca28b77f7ada9 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Mon, 7 Apr 2008 17:56:32 +0000
Subject: [PATCH 377/710] Fix date range filter js behaviour and css fix for
 IE.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1339 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/timelog/_date_range.rhtml | 10 ++++++----
 public/stylesheets/application.css  |  4 +++-
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/app/views/timelog/_date_range.rhtml b/app/views/timelog/_date_range.rhtml
index a54f7a2f0..ed84b16cf 100644
--- a/app/views/timelog/_date_range.rhtml
+++ b/app/views/timelog/_date_range.rhtml
@@ -1,4 +1,4 @@
-<fieldset><legend><%= l(:label_date_range) %></legend>
+<fieldset id="filters"><legend><%= l(:label_date_range) %></legend>
 <p>
 <%= radio_button_tag 'period_type', '1', !@free_period %>
 <%= select_tag 'period', options_for_period_select(params[:period]),
@@ -7,11 +7,13 @@
 </p>
 <p>
 <%= radio_button_tag 'period_type', '2', @free_period %>
+<span onclick="$('period_type_2').checked = true;">
 <%= l(:label_date_from) %>
-<%= text_field_tag 'from', @from, :size => 10, :onfocus => '$("period_type_2").checked = true;' %> <%= calendar_for('from') %>
+<%= text_field_tag 'from', @from, :size => 10 %> <%= calendar_for('from') %>
 <%= l(:label_date_to) %>
-<%= text_field_tag 'to', @to, :size => 10, :onfocus => '$("period_type_2").checked = true;' %> <%= calendar_for('to') %>
-<%= submit_tag l(:button_apply), :name => nil, :onclick => '$("period_type_2").checked = true;' %>
+<%= text_field_tag 'to', @to, :size => 10 %> <%= calendar_for('to') %>
+</span>
+<%= submit_tag l(:button_apply), :name => nil %>
 </p>
 </fieldset>
 
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 27c7592f8..7c3e0fde7 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -159,7 +159,9 @@ div.issue {background:#ffffdd; padding:6px; margin-bottom:6px;border: 1px solid
 p.breadcrumb { font-size: 0.9em; margin: 4px 0 4px 0;}
 p.subtitle { font-size: 0.9em; margin: -6px 0 12px 0; font-style: italic; } 
 
-fieldset#filters .buttons { text-align: right; font-size: 0.9em; margin: 0 4px 0px 0; }
+fieldset#filters { padding: 0.7em; }
+fieldset#filters p { margin: 0.8em 0 0.8em 0; }
+fieldset#filters .buttons { text-align: right; font-size: 0.9em; }
 
 div#issue-changesets {float:right; width:45%; margin-left: 1em; margin-bottom: 1em; background: #fff; padding-left: 1em; font-size: 90%;}
 div#issue-changesets .changeset { padding: 4px;}

From a3c89d4f697e958956e129b6bc5f564c9197a89c Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Wed, 9 Apr 2008 17:45:39 +0000
Subject: [PATCH 378/710] Custom fields (list and boolean) can be used as
 criteria in time report (#1012).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1340 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/timelog_controller.rb      |  9 +++++++++
 app/helpers/timelog_helper.rb              |  8 ++++++--
 app/views/timelog/_report_criteria.rhtml   |  4 ++--
 test/fixtures/custom_fields.yml            |  2 +-
 test/fixtures/time_entries.yml             |  2 +-
 test/functional/issues_controller_test.rb  |  5 +++--
 test/functional/timelog_controller_test.rb | 21 +++++++++++++++++++--
 7 files changed, 41 insertions(+), 10 deletions(-)

diff --git a/app/controllers/timelog_controller.rb b/app/controllers/timelog_controller.rb
index 3081c50dd..2c90093bd 100644
--- a/app/controllers/timelog_controller.rb
+++ b/app/controllers/timelog_controller.rb
@@ -26,6 +26,8 @@ class TimelogController < ApplicationController
   include SortHelper
   helper :issues
   include TimelogHelper
+  helper :custom_fields
+  include CustomFieldsHelper
   
   def report
     @available_criterias = { 'project' => {:sql => "#{TimeEntry.table_name}.project_id",
@@ -51,6 +53,13 @@ class TimelogController < ApplicationController
                                          :label => :label_issue}
                            }
     
+    # Add list and boolean custom fields as available criterias
+    @project.all_custom_fields.select {|cf| %w(list bool).include? cf.field_format }.each do |cf|
+      @available_criterias["cf_#{cf.id}"] = {:sql => "(SELECT c.value FROM custom_values c WHERE c.custom_field_id = #{cf.id} AND c.customized_type = 'Issue' AND c.customized_id = issues.id)",
+                                             :format => cf.field_format,
+                                             :label => cf.name}
+    end
+    
     @criterias = params[:criterias] || []
     @criterias = @criterias.select{|criteria| @available_criterias.has_key? criteria}
     @criterias.uniq!
diff --git a/app/helpers/timelog_helper.rb b/app/helpers/timelog_helper.rb
index e0459581d..db13556a1 100644
--- a/app/helpers/timelog_helper.rb
+++ b/app/helpers/timelog_helper.rb
@@ -77,6 +77,10 @@ module TimelogHelper
     export
   end
   
+  def format_criteria_value(criteria, value)
+    value.blank? ? l(:label_none) : ((k = @available_criterias[criteria][:klass]) ? k.find_by_id(value.to_i) : format_value(value, @available_criterias[criteria][:format]))
+  end
+  
   def report_to_csv(criterias, periods, hours)
     export = StringIO.new
     CSV::Writer.generate(export, l(:general_csv_separator)) do |csv|
@@ -103,11 +107,11 @@ module TimelogHelper
   end
   
   def report_criteria_to_csv(csv, criterias, periods, hours, level=0)
-    hours.collect {|h| h[criterias[level]]}.uniq.each do |value|
+    hours.collect {|h| h[criterias[level]].to_s}.uniq.each do |value|
       hours_for_value = select_hours(hours, criterias[level], value)
       next if hours_for_value.empty?
       row = [''] * level
-      row << to_utf8(value.nil? ? l(:label_none) : @available_criterias[criterias[level]][:klass].find_by_id(value))
+      row << to_utf8(format_criteria_value(criterias[level], value))
       row += [''] * (criterias.length - level - 1)
       total = 0
       periods.each do |period|
diff --git a/app/views/timelog/_report_criteria.rhtml b/app/views/timelog/_report_criteria.rhtml
index 661e1fdb8..94f3d20f9 100644
--- a/app/views/timelog/_report_criteria.rhtml
+++ b/app/views/timelog/_report_criteria.rhtml
@@ -1,9 +1,9 @@
-<% @hours.collect {|h| h[criterias[level]]}.uniq.each do |value| %>
+<% @hours.collect {|h| h[criterias[level]].to_s}.uniq.each do |value| %>
 <% hours_for_value = select_hours(hours, criterias[level], value) -%>
 <% next if hours_for_value.empty? -%>
 <tr class="<%= cycle('odd', 'even') %> <%= 'last-level' unless criterias.length > level+1 %>">
 <%= '<td></td>' * level %>
-<td><%= value.nil? ? l(:label_none) : @available_criterias[criterias[level]][:klass].find_by_id(value) %></td>
+<td><%= format_criteria_value(criterias[level], value) %></td>
 <%= '<td></td>' * (criterias.length - level - 1) -%>
   <% total = 0 -%>
   <% @periods.each do |period| -%>
diff --git a/test/fixtures/custom_fields.yml b/test/fixtures/custom_fields.yml
index e58d8e3dc..6be840fcc 100644
--- a/test/fixtures/custom_fields.yml
+++ b/test/fixtures/custom_fields.yml
@@ -3,7 +3,7 @@ custom_fields_001:
   name: Database
   min_length: 0
   regexp: ""
-  is_for_all: false
+  is_for_all: true
   type: IssueCustomField
   max_length: 0
   possible_values: MySQL|PostgreSQL|Oracle
diff --git a/test/fixtures/time_entries.yml b/test/fixtures/time_entries.yml
index f6876c7b0..4a8a4a2a4 100644
--- a/test/fixtures/time_entries.yml
+++ b/test/fixtures/time_entries.yml
@@ -36,7 +36,7 @@ time_entries_003:
   updated_on: 2007-04-21 12:20:48 +02:00
   activity_id: 9
   spent_on: 2007-04-21
-  issue_id: 2
+  issue_id: 3
   id: 3
   hours: 1.0
   user_id: 1
diff --git a/test/functional/issues_controller_test.rb b/test/functional/issues_controller_test.rb
index 89769ffe2..042a8f3f2 100644
--- a/test/functional/issues_controller_test.rb
+++ b/test/functional/issues_controller_test.rb
@@ -450,10 +450,11 @@ class IssuesControllerTest < Test::Unit::TestCase
   end
   
   def test_destroy_issue_with_no_time_entries
+    assert_nil TimeEntry.find_by_issue_id(2)
     @request.session[:user_id] = 2
-    post :destroy, :id => 3
+    post :destroy, :id => 2
     assert_redirected_to 'projects/ecookbook/issues'
-    assert_nil Issue.find_by_id(3)
+    assert_nil Issue.find_by_id(2)
   end
 
   def test_destroy_issues_with_time_entries
diff --git a/test/functional/timelog_controller_test.rb b/test/functional/timelog_controller_test.rb
index 4d6cb0b36..e80a67728 100644
--- a/test/functional/timelog_controller_test.rb
+++ b/test/functional/timelog_controller_test.rb
@@ -22,7 +22,7 @@ require 'timelog_controller'
 class TimelogController; def rescue_action(e) raise e end; end
 
 class TimelogControllerTest < Test::Unit::TestCase
-  fixtures :projects, :enabled_modules, :roles, :members, :issues, :time_entries, :users, :trackers, :enumerations, :issue_statuses
+  fixtures :projects, :enabled_modules, :roles, :members, :issues, :time_entries, :users, :trackers, :enumerations, :issue_statuses, :custom_fields, :custom_values
 
   def setup
     @controller = TimelogController.new
@@ -112,6 +112,23 @@ class TimelogControllerTest < Test::Unit::TestCase
     assert_equal "162.90", "%.2f" % assigns(:total_hours)
   end
   
+  def test_report_custom_field_criteria
+    get :report, :project_id => 1, :criterias => ['project', 'cf_1']
+    assert_response :success
+    assert_template 'report'
+    assert_not_nil assigns(:total_hours)
+    assert_not_nil assigns(:criterias)
+    assert_equal 2, assigns(:criterias).size
+    assert_equal "162.90", "%.2f" % assigns(:total_hours)
+    # Custom field column
+    assert_tag :tag => 'th', :content => 'Database'
+    # Custom field row
+    assert_tag :tag => 'td', :content => 'MySQL',
+                             :sibling => { :tag => 'td', :attributes => { :class => 'hours' },
+                                                         :child => { :tag => 'span', :attributes => { :class => 'hours hours-int' },
+                                                                                     :content => '1' }}
+  end
+  
   def test_report_one_criteria_no_result
     get :report, :project_id => 1, :columns => 'week', :from => "1998-04-01", :to => "1998-04-30", :criterias => ['project']
     assert_response :success
@@ -186,6 +203,6 @@ class TimelogControllerTest < Test::Unit::TestCase
     assert_response :success
     assert_equal 'text/csv', @response.content_type
     assert @response.body.include?("Date,User,Activity,Project,Issue,Tracker,Subject,Hours,Comment\n")
-    assert @response.body.include?("\n04/21/2007,redMine Admin,Design,eCookbook,2,Feature request,Add ingredients categories,1.0,\"\"\n")
+    assert @response.body.include?("\n04/21/2007,redMine Admin,Design,eCookbook,3,Bug,Error 281 when updating a recipe,1.0,\"\"\n")
   end
 end

From 85f040c5362dd89829f694a58f4e91ced7fcd33e Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Wed, 9 Apr 2008 17:52:41 +0000
Subject: [PATCH 379/710] Fixed: preview fails when updating an issue (broken
 by r1322). Patch #1027.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1341 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/issues_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index b3f21fddf..369d888ef 100644
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -345,7 +345,7 @@ class IssuesController < ApplicationController
   
   def preview
     @issue = @project.issues.find_by_id(params[:id]) if params[:id]
-    @attachements = issue.attachments if @issue
+    @attachements = @issue.attachments if @issue
     @text = params[:notes] || (params[:issue] ? params[:issue][:description] : nil)
     render :partial => 'common/preview'
   end

From 6d2a89142af235b5d0a9e30350859fb99ac665f3 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sat, 12 Apr 2008 16:54:14 +0000
Subject: [PATCH 380/710] Add an icon to each event on the activity view.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1342 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/models/journal.rb                         |   1 +
 app/models/message.rb                         |   1 +
 app/models/wiki_content.rb                    |   1 +
 app/views/projects/activity.rhtml             |   2 +-
 public/images/attachment.png                  | Bin 259 -> 995 bytes
 public/images/changeset.png                   | Bin 0 -> 512 bytes
 public/images/comments.png                    | Bin 0 -> 557 bytes
 public/images/document.png                    | Bin 0 -> 458 bytes
 public/images/message.png                     | Bin 0 -> 521 bytes
 public/images/news.png                        | Bin 0 -> 658 bytes
 public/images/ticket.png                      | Bin 0 -> 500 bytes
 public/images/ticket_checked.png              | Bin 0 -> 598 bytes
 public/images/ticket_edit.png                 | Bin 0 -> 731 bytes
 public/images/wiki_edit.png                   | Bin 0 -> 626 bytes
 public/stylesheets/application.css            |  14 +++++++++++--
 test/functional/projects_controller_test.rb   |   2 +-
 .../acts_as_event/lib/acts_as_event.rb        |  19 ++++++++++++------
 17 files changed, 30 insertions(+), 10 deletions(-)
 create mode 100644 public/images/changeset.png
 create mode 100644 public/images/comments.png
 create mode 100644 public/images/document.png
 create mode 100644 public/images/message.png
 create mode 100644 public/images/news.png
 create mode 100644 public/images/ticket.png
 create mode 100644 public/images/ticket_checked.png
 create mode 100644 public/images/ticket_edit.png
 create mode 100644 public/images/wiki_edit.png

diff --git a/app/models/journal.rb b/app/models/journal.rb
index 7c5e3d3bf..1376d349e 100644
--- a/app/models/journal.rb
+++ b/app/models/journal.rb
@@ -33,6 +33,7 @@ class Journal < ActiveRecord::Base
   acts_as_event :title => Proc.new {|o| "#{o.issue.tracker.name} ##{o.issue.id}: #{o.issue.subject}" + ((s = o.new_status) ? " (#{s})" : '') },
                 :description => :notes,
                 :author => :user,
+                :type => Proc.new {|o| (s = o.new_status) && s.is_closed? ? 'issue-closed' : 'issue-edit' },
                 :url => Proc.new {|o| {:controller => 'issues', :action => 'show', :id => o.issue.id, :anchor => "change-#{o.id}"}}
 
   def save
diff --git a/app/models/message.rb b/app/models/message.rb
index 12b1cd990..a18d126c9 100644
--- a/app/models/message.rb
+++ b/app/models/message.rb
@@ -28,6 +28,7 @@ class Message < ActiveRecord::Base
                      :date_column => 'created_on'
   acts_as_event :title => Proc.new {|o| "#{o.board.name}: #{o.subject}"},
                 :description => :content,
+                :type => Proc.new {|o| o.parent_id.nil? ? 'message' : 'reply'},
                 :url => Proc.new {|o| {:controller => 'messages', :action => 'show', :board_id => o.board_id, :id => o.id}}
   
   attr_protected :locked, :sticky
diff --git a/app/models/wiki_content.rb b/app/models/wiki_content.rb
index 13915c274..724354ad6 100644
--- a/app/models/wiki_content.rb
+++ b/app/models/wiki_content.rb
@@ -32,6 +32,7 @@ class WikiContent < ActiveRecord::Base
     acts_as_event :title => Proc.new {|o| "#{l(:label_wiki_edit)}: #{o.page.title} (##{o.version})"},
                   :description => :comments,
                   :datetime => :updated_on,
+                  :type => 'wiki-page',
                   :url => Proc.new {|o| {:controller => 'wiki', :id => o.page.wiki.project_id, :page => o.page.title, :version => o.version}}
 
     def text=(plain)
diff --git a/app/views/projects/activity.rhtml b/app/views/projects/activity.rhtml
index 0cf7a5000..c2f2f9ebd 100644
--- a/app/views/projects/activity.rhtml
+++ b/app/views/projects/activity.rhtml
@@ -6,7 +6,7 @@
 <h3><%= format_activity_day(day) %></h3>
 <dl>
 <% @events_by_day[day].sort {|x,y| y.event_datetime <=> x.event_datetime }.each do |e| -%>
-  <dt class="<%= e.class.name.downcase %>"><span class="time"><%= format_time(e.event_datetime, false) %></span>
+  <dt class="<%= e.event_type %>"><span class="time"><%= format_time(e.event_datetime, false) %></span>
   <%= content_tag('span', h(e.project), :class => 'project') if @project.nil? || @project != e.project %> <%= link_to h(truncate(e.event_title, 100)), e.event_url %></dt>
   <dd><% unless e.event_description.blank? -%>
   <span class="description"><%= format_activity_description(e.event_description) %></span><br />
diff --git a/public/images/attachment.png b/public/images/attachment.png
index eea26921b695b377e2a51cbbb78f638514565a32..b7ce3c445ec04fa8d16a939340d070752937354a 100644
GIT binary patch
literal 995
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJdx@v7EBg%=9syGYj%hhlfI^%F
z9+AZi3|t>Tn9*sC$qb+%OS+@4BLl<6e(pbstPBjy3;{kNu0cUT$;rvp)zw?KZasGF
z*tv7(u3fu!@7}%t3=IEA!Dt8!_Yg2}%9RCWn35pBV3=PSg8eImfP#UZE{-7;w|dVz
zavd<>aJg9M!}h-Z(YA|AG8YDv|5t44xc)%e!;WE6F>}W~^9F%yc@l3oabC?}owatW
wV9zVYH`jy8ny#$1%Ac_MbKAL}A7jokHqT>Qc4xX;3ea!{Pgg&ebxsLQ09njHQvd(}

delta 230
zcmaFN-ppju8Q|y6%O%Cdz`(%k>ERLtq<KJ?g&9aLiFUjKq}WS5eO=kFakB|qiBwDL
z6iqZyuV*j_@CkAK|NsBZn>Xw0>k|_bj~qF2{rdF_7cK+`2XET6>CmA==g*(Nd-pET
z060kP<?04<7)yfuf*Bm1-ADs+JUv|;Ln>}1CjdcE5<}x94pxPedRJH%adGQ3itM&1
zUd`B%Ecoug0gfkAI1CI#G+L~gOf^+onk;-4o^;@2UOcIj;RKJPqXHwtkrJ*2CQBj`
PLH2pN`njxgN@xNAJ*rGm

diff --git a/public/images/changeset.png b/public/images/changeset.png
new file mode 100644
index 0000000000000000000000000000000000000000..67de2c6ccbeac17742f56cf7391e72b2bf5033ba
GIT binary patch
literal 512
zcmV+b0{{JqP)<h;3K|Lk000e1NJLTq000mG000mO1ONa4wfZ;e00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzl1W5CR4C6?
zQB6w%VGv&Y0p9%y{*S$M5weR^mokV7i!Mcpk=YVa(4jh%5k+ND8>CQDsH?WF>AIFt
zQuJ}i;w2$ZUU#3SZ6RY0Gw;kZ&ol1~2ky^QZ(fom$=jN<T*X<otG0ao1Md*)XSSIA
z*x3T8gv)x7DUK|A#S3CA>JZt!z7w_pH~wdQ;R)Gh%BbQFCx+Nm!4SuS-vkr`vhhrX
zM*>w%e+v~?m@q~ImPAgtLkR_3U<2F8LP3W5=LJ*ZN|S5p#sf4YFr$p~Q~Z*0Ngxf2
zjk#J#<7EAlhzlrV53~GF&pIzcCN_lz9@05Ue<MwWI-*!M0jvB0F~pIke2>oUXiK%N
z#x+4o*i_c|6_Uu1+&TIho?3@y4k-#b8Y_o94zW*B3a1ne2-Y5s0uke$$|@=}OP-i=
zNYZQA=>PrZu0MfSL=b8UhD_={W4IY1{b{)U)*gc45xtL%IYLY&hF;d`@GzI&7H&D#
zh;z_BX$#hqh@q?AY3sJTod2%*Yd)_>YM0#q&ixGuh+PQsneK)F0000<MNUMnLSTXw
CAKTXe

literal 0
HcmV?d00001

diff --git a/public/images/comments.png b/public/images/comments.png
new file mode 100644
index 0000000000000000000000000000000000000000..39433cf78a3e9869f24b0a95f04b1819391596e8
GIT binary patch
literal 557
zcmV+|0@D47P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzzez+vR5;6x
zlD$vDP!z>kO-!8JjERGZgNx4o8zwI5pnrkJT^AW7B+k01lLkoCLBu@bfRhnJSkT}{
z5cwz-C?AEk;`Q7|NyO0V@Jst%?>X<@)8|?6hNplZoH}p}R=_wBd4A);huvr*D{8ta
zv>weaRZy(zA{a{x)NMK$oUyoq;&Q_jA9Yid>V_!Q3{lkDazCTg+2GL8fKO$yVv7pZ
zw#ZdlB3o|B^<M_(wU#MVoXo{}h_92m+x5LzdC7NWEdzd{&HxpgEZFA!*dU-nXjmO7
z=94$}Z>q?JFdAt+nq80!As0d}1Z|KFR(*lEh^G}{es&~_I}wY;n4d5jAs0d}gj@(+
z%6*K*29I(Myv%_UPW<vN!}D5vDvK3cgj@*S5pt31J_Fn2AQG42FsLIJLN2m6|3jQn
zb;{%YU2U+zOHVw+VS)=V2@1%C+E%Ae%v~thM_%+=tg%6=XD|x3z=XZ_`a}1WcrFn#
zk+9iYsX<S9jgF!z7VBWmGw9#iCi6hkbc2u!3%)=aB>DD&5qS@s3~ZAJ<ig@Mm>GDH
vT*SlN0ce3)r#d%-F%SaNZe6;L@E^Vb!Ji3~dec0&00000NkvXXu0mjflI-*P

literal 0
HcmV?d00001

diff --git a/public/images/document.png b/public/images/document.png
new file mode 100644
index 0000000000000000000000000000000000000000..d00b9b2f4d99145ef74ddbb5624a1afbae422a4e
GIT binary patch
literal 458
zcmV;*0X6=KP)<h;3K|Lk000e1NJLTq000mG000mO0ssI2kdbIM0000kbVXQnLvm$d
zbZKvHAXI5>WdL(wZ7v`&G9Y1gaxNe;FfceEF*rIiH###lAS*C2Ffi(UX{-PM00(qQ
zO+^RT1Pl--3*6r22LJ#732;bRa{vGf5&!@T5&_cPe*6Fc00d`2O+f$vv5yP<VFdsH
z0Ut?3K~#9!jZ!<0Mo<uS5v@W(M<<b}Xe6THPx!eSg@Qt(&<TZ3%X;jIS(a}}_7vC5
zopa{l4%@bk<G8kM`@Ub6h5G|lRdrqGd7fO6K49CnEeHZ*?8=_!Im<E_r{+h1++dI6
zNCNQIb)BY3Q54fO>$*NQ{I&x=sL=2S*bdywvg|lc*L6+P{8k`<mm~=ie;tV9Sdt`!
zJkQJX+%Sw!K@>$Oxa>e<!!V#X7#RIFGyy%NX^Jq4;3OFYVHlpAn*i{ApA4!4HclGy
zSx^)OT3-%;3QZ6MuLAs#(<U|<uY#(o=n<$HdLq|#Uj>$BQNC-|+n@aKAKBM^5y{63
z&~{MlW24U9!M#W^P1DM<q!AwhHoYA?cj=$_2HdpITQ@tS{{R3007*qoM6N<$f(hcY
AoB#j-

literal 0
HcmV?d00001

diff --git a/public/images/message.png b/public/images/message.png
new file mode 100644
index 0000000000000000000000000000000000000000..252ea14d5e4bbcdb4cb23684375578159425fae7
GIT binary patch
literal 521
zcmV+k0`~ohP)<h;3K|Lk000e1NJLTq000mG000mO0ssI2kdbIM0000jbVXQnLvm$d
zbZKvHAXI5>WdLnuaxNe_AYpcLE+8^6FgPGFGCDLjIx#sQD=;xIFl)^P$N&HU2XskI
zMF-df2?{V1>|QTZ00009a7bBm000XT000XT0n*)m`~Uy|1ZP1_K>z@;j|==^1poj6
zUr9tkRCwBB{Qv(y11W%sB-KE`0>odw|C+z+`iUDafb75juvn<8Ae`*3B_YHO;sBl0
zwfgLe1Gj$v`3pq<v4PDe@8?ZF2$5y^@$1jIJFkj^4L|<?>HqoX|KI-%|Nb!m$-n<V
z7BVt0_?RgizxLw6%TFp&0xVy?{}$%uU}9wa@f+kApo^eNLE8TR`3KSr1bkd<pT7Mf
z*V7R27wlW0+5cdUfw>A*0}m(b+s{A#0eu6u?AITl&i@c~5DknBAd|lQ_|3z?3ev#A
z#$u!*w))VWP&*Zn6B&V?1R{pV@BhF1`d^ZtQH+;q%c%#SzWr1X=L3o}0z(QC567-Q
z2Zu7q9#=!TWDhMM<HMJqYmeN${`g%<upuHIFhSn51JB=mowNOFOy|xuhi@ZGF=D2r
z#d~jj`}z0SwP#^=s@`S_=)r_$_KSC4bEY2Hd;ZaX8~}?AR8Fk`{QxDX!7z0d00000
LNkvXXu0mjf7pCHg

literal 0
HcmV?d00001

diff --git a/public/images/news.png b/public/images/news.png
new file mode 100644
index 0000000000000000000000000000000000000000..6a2ecce1b85eaa9084b427ee2c5226e2296eaeb8
GIT binary patch
literal 658
zcmV;D0&V??P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!BuPX;R5;6x
zlgn!wQ5eOuuyhloyY8|Gh3>oVs((xWgD$)EF}_d~6|E9cYZTvaqk~9`i&BW97*P>v
z@lDk@Xl;b%^t%HQ(pa0tz@5kM+;h(T<_N&ip(~wEOB0DiJ{F5{;c!^;_xs1dg=jRo
z3WY*KAQ0euKA+@K0;yC=8jr^rydICoSglqd_{QV$a4whY=|O=zI1-7hhr=Og4T=Ck
z5O8*O_S@lbByBd^lf44TWKv2W^LH=<&(F_6aj;k{L?;9b7K?>5nM{(sFqO3)3<e<k
z%r?joE;|G0(+$MFeuLR;zBL++CB0t%YzI?WQUZ7?ON7Y*yk0Lz6tme3=8GoYe)xiS
zo=bf14?(b?)oNewg~<V^EHV3ZIz_2e!jIV;?*kPCJ~ffxKSQI@Y&nj5BMQ)Nd@vZ?
zP9_tO2;6SBn4Q5Sj$*NhUayBntBa3up20T+zuJ{ZaNh6t-}d``bUGd6^LY_w4l<bx
zy4@}sjRvy03#irVjZ&#Ry?2b%vQVqlaD9D^cDs#Mt0g*M&0k$zp<1mXo6SO{QvD?O
z<iQ|OS)+2fEPgbf&(Ul)MG>}ZrBV@HFj%2boa`NCnylwer*m5<6vU%rtuL2L)a!Nd
zJP*qIOD>n6?i;$@!fv-8Tdme9+l?I|%bm;R7`!3)<-bP$-VIIGvB6*%vHYw+%Da)t
sWG@c=a1S2nbh=||dPK1BKbT#A0Qk`HN6lbD;Q#;t07*qoM6N<$f^gU==>Px#

literal 0
HcmV?d00001

diff --git a/public/images/ticket.png b/public/images/ticket.png
new file mode 100644
index 0000000000000000000000000000000000000000..244e6ca045c50a130086ac388b560a12761544b4
GIT binary patch
literal 500
zcmV<Q0So?#P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzhDk(0R5;7U
zlfP<IK@`S+bE77rVxa`P_yB@pVd*0XS}7?k@(OtdTi-!!#Lhw+D+R$yu&{}R76CPe
zELn4B=FXY(S<D*my4$7j6f=i`@6Va}CP?BW)p5c)^{3I7SF-6(qybq$wICaiWmGei
zM74x0LP=b__aw{{RO9ru`wI#Z1eh&=;Nba#MF)AZ%UKC|YzF}(2Lj?RL+DmfiAzQ>
z!-sF!^gVb+8rtpyctW0#N6uWni<f>0LCt_6PoOdbjll_d4>B|?abUmpo8>v>h<lom
zMDW-|>}Zj|Ya;Eu#qwvU1IVc9khP8VrtAsT2=e83P~$#!xXbw)n}FlPSEe7Hq1uCb
zR8w;xqmBrUgA^pnkB=O@-lq0DPz$ay0yh_~I_IDpzxRb(4=Iy9CT||k!08w)Pe>W4
zElmH8fF;68$GMwZ#7{4ozI(ySrR%I+xs4-G1q^UxnUV7rlf9>R<Rv3Zs6;G&2RgbC
qkR=#0?x{uFDpwyV%n|&z-}oE3w>n&_6Wike0000<MNUMnLSTY6h1ZV&

literal 0
HcmV?d00001

diff --git a/public/images/ticket_checked.png b/public/images/ticket_checked.png
new file mode 100644
index 0000000000000000000000000000000000000000..4b1dfbc3e023f8c0a6a8d2880f20bde27932e7d6
GIT binary patch
literal 598
zcmV-c0;&CpP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00009a7bBm000XU
z000XU0RWnu7ytkOAY({UO#lFTB>(_`g8%^e{{R4h=>PzAFaQARU;qF*m;eA5Z<1fd
zMgRZ-+(|@1RCwB?lRaxyK@f(Yy?$##EF`736yY>VVv#f|;;j_4idY2ELa;D`h#*Ok
z%FaI^2*J)q5D`H{Gyx?6!NS5=2oj9OkeKM*J!d~&i*s@{<OB;Bb_aI%d1q#4$4KIT
z##R7*dZMuU9jQRUqv%m6P{>it!8>AbC|K~0p0g8Xy+90X%Z4_nOJJZ{0Kw9Oa~mVb
zm*?0ep=8Tl15yGE;*Wx9>_Fbuq!0qBm?x~hfs`W^rA-AShmu3dvVGqfl5f`t#2g4H
zIgqcQzhQ?`8x&Ac6G8a7ScbgLvn3^0iC9RsbP|4T6iCtGW?vEVj}Qw`Ai5QHHhW9Y
z$)RXL33<z<dxr#=yBFTl0El*xurf#2!Si%w!|XnA0+L6u4XNF+C~&K%n`YLkYC<Vs
zB>cB`EIqqUY|ldUBzdk*PNL{aI5{pqyg@T-A;kXdB!gr9YOK|}`^YeUd4c7ZcS!Qw
z{QQAt)?(!Kdz2g_GhaF|z|%+10gg2Q2oAHQ!JfkxQP|6s$G1C|n^}u%GxN3Z)cEuZ
zBZ-Ckr<Ht;f<xXC>{o_<^wK(Yy!u9_7Ov9YyqN~a`n4uf2X`KEvoSS3Z7Qf1t{O)F
koCBkM8W`<6T6gw)03XG3+w)>+-v9sr07*qoM6N<$f|$Mh@Bjb+

literal 0
HcmV?d00001

diff --git a/public/images/ticket_edit.png b/public/images/ticket_edit.png
new file mode 100644
index 0000000000000000000000000000000000000000..291bfc764709a7e595050c1ed43b675f7af29c56
GIT binary patch
literal 731
zcmV<10wn#3P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!ZAnByR5;6}
zlg&$%Q5431?>IABYLga|n=&i1C^Ll$f?5eeicnA#1rn`Vw5g!~Ai_;Six%mol@YXv
zpr{DSk_4&HqEGXqMs21Urx~61zW2TFJuNiKk5=8qxp3h5o#%3&<A@0VbHV^Ja!*YD
z2O=6VJ`(td(TMSozyn_q7=;)Yd`0Zg4QD<eFhsT=T|^fF2j&VOFm>zLVh3I}!7>rV
zy0cveL@eMS{2@4@V#Ifsc!DulJ&DQpf%Op4v$xe?6=D@)U81WGV*SDrfWQL`Vikx#
zC;D5g5L>`a_LDBIB75he%=~zQqY~|505hGQwLEXKi?wPF;-YiIct4j@Rd<3|O#|8C
zTHZhC><9zcK%qYMV7$)|Xb?l7a+FlZ5nDj##-OBu%J?oaL+^+>n(`G@l&xA93j+jh
z8k0*<w(~e(v3ivJtD8trz@PaB#XE@AG~-Ql6J72w`uaV-(rM*R?+pPsBKXMxrXHOq
zD13sz$BK`a|B8gS65H5<8o!PcnIckFPDx?tyPunA+I8mk$I$QpF5lgbpG}c{dKoJ|
zne;f?ZXvd*4VAb?DB`1Y>q$O-j?Nca8_zy`4G;prD4e1YrH!W$vy!p<UD%a-h;M5_
zPj*ri6}((Esb~E}QhjVb*Vn%w2a2itR}iBZOJ*o*Y{N*LiNUK>#G|OpS~5?22&Z3S
zwVIa$XW=s4>S&U~r@Q#jeV*}=UW(V%W0I-yifB=D-Gvu#7REiau<_yZq|tBhQd7T=
z($ZQI{e#oW)d!XmFX`aO{z|uT!<z8!tu;u*>vfZ<ldYEqzWi&Qe*wVTa_}14^jH7@
N002ovPDHLkV1m}kQ7-@h

literal 0
HcmV?d00001

diff --git a/public/images/wiki_edit.png b/public/images/wiki_edit.png
new file mode 100644
index 0000000000000000000000000000000000000000..bdc333a651c8901f9ab28c5bb62505b560088eb4
GIT binary patch
literal 626
zcmV-&0*(ENP)<h;3K|Lk000e1NJLTq000mG000mO0ssI2kdbIM0000jbVXQnLvm$d
zbZKvHAXI5>WdLnuaxNe_AYpcLE+8^6FgPGFGCDLhIx{&SD=;xIFfAR@hyVZp2XskI
zMF-df2?{SO2?m){00009a7bBm000XT000XT0n*)m`~Uy|1ZP1_K>z@;j|==^1poj6
z$Vo&&RCwBB{Qv(y11W$7h@U)p^77@&zkmN?N{fk!$;rtvF)^WN0IJr}(P3d>K~w$b
z&!1DLP5~LndO(VRW-~K0|NQwAuI}Hzf4_eH5*8L#5`OjN*tC0>bickiC}))=sNv57
z@dG0xBhUt*Iv^Wp7*G%>^8LkT=9i}>bYu7x4L{shzq@~hF;D}t8-PlIdVsb8HT-+O
z@Au!ELaNs9?p|kO{Kd;B!NDU0brJ*s)j{+CUHI?g3AW!?`IX#%K3~Dc#rW{TjbDG5
zRQ&2e3eY?Xbjh!`NB@1;&#&zD<JoLR*7vMDyxjla0abGfN@3CP^2X+`&vx;v`2Bb~
zor(4LuTKiEk6e5%9S2d3uHog)ZJ(YU7t{9s^<oY)+y9@R<X;~-C+a_$fkz4@9w6ZM
z@s<BRU;V=<_5AW=K{2);?_@umy&)MqjhR=Hf#EeGVBoCF$L49-q_ICfa%<z!3p?N4
z+IK<BvmLA&1t2uszW4gq)h&wpw%pw6FE8I!59whSQDOoE^t1#4SMR)<Fl)N0rXsJh
zo^#54E+J{0i4Ou6?R<hiodQD~qyb1tN=lwTe;$%9umYe0h-x4J0RG&-DOo34^#A|>
M07*qoM6N<$g0&13`~Uy|

literal 0
HcmV?d00001

diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 7c3e0fde7..682e95dde 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -169,11 +169,21 @@ div#issue-changesets .changeset { border-bottom: 1px solid #ddd; }
 div#issue-changesets p { margin-top: 0; margin-bottom: 1em;}
 
 div#activity dl { margin-left: 2em; }
-div#activity dd { margin-bottom: 1em; }
-div#activity dt { margin-bottom: 1px; }
+div#activity dd { margin-bottom: 1em; padding-left: 18px; }
+div#activity dt { margin-bottom: 1px; padding-left: 20px; line-height: 18px; background-position: 0 50%; background-repeat: no-repeat; }
 div#activity dt .time { color: #777; font-size: 80%; }
 div#activity dd .description { font-style: italic; }
 div#activity span.project:after { content: " -"; }
+div#activity dt.issue { background-image: url(../images/ticket.png); }
+div#activity dt.issue-edit { background-image: url(../images/ticket_edit.png); }
+div#activity dt.issue-closed { background-image: url(../images/ticket_checked.png); }
+div#activity dt.changeset { background-image: url(../images/changeset.png); }
+div#activity dt.news { background-image: url(../images/news.png); }
+div#activity dt.message { background-image: url(../images/message.png); }
+div#activity dt.reply { background-image: url(../images/comments.png); }
+div#activity dt.wiki-page { background-image: url(../images/wiki_edit.png); }
+div#activity dt.attachment { background-image: url(../images/attachment.png); }
+div#activity dt.document { background-image: url(../images/document.png); }
 
 div#roadmap fieldset.related-issues { margin-bottom: 1em; }
 div#roadmap fieldset.related-issues ul { margin-top: 0.3em; margin-bottom: 0.3em; }
diff --git a/test/functional/projects_controller_test.rb b/test/functional/projects_controller_test.rb
index 75b4673a1..eb5795152 100644
--- a/test/functional/projects_controller_test.rb
+++ b/test/functional/projects_controller_test.rb
@@ -144,7 +144,7 @@ class ProjectsControllerTest < Test::Unit::TestCase
                :content => /#{2.days.ago.to_date.day}/,
                :sibling => { :tag => "dl",
                  :child => { :tag => "dt",
-                   :attributes => { :class => 'journal' },
+                   :attributes => { :class => 'issue-edit' },
                    :child => { :tag => "a",
                      :content => /(#{IssueStatus.find(2).name})/,
                    }
diff --git a/vendor/plugins/acts_as_event/lib/acts_as_event.rb b/vendor/plugins/acts_as_event/lib/acts_as_event.rb
index a0d1822ad..d7f437a5e 100644
--- a/vendor/plugins/acts_as_event/lib/acts_as_event.rb
+++ b/vendor/plugins/acts_as_event/lib/acts_as_event.rb
@@ -25,11 +25,12 @@ module Redmine
       module ClassMethods
         def acts_as_event(options = {})
           return if self.included_modules.include?(Redmine::Acts::Event::InstanceMethods)
-          options[:datetime] ||= 'created_on'
-          options[:title] ||= 'title'
-          options[:description] ||= 'description'
-          options[:author] ||= 'author'
+          options[:datetime] ||= :created_on
+          options[:title] ||= :title
+          options[:description] ||= :description
+          options[:author] ||= :author
           options[:url] ||= {:controller => 'welcome'}
+          options[:type] ||= self.name.underscore.dasherize
           cattr_accessor :event_options
           self.event_options = options 
           send :include, Redmine::Acts::Event::InstanceMethods
@@ -41,11 +42,17 @@ module Redmine
           base.extend ClassMethods
         end
         
-        %w(datetime title description author).each do |attr|
+        %w(datetime title description author type).each do |attr|
           src = <<-END_SRC
             def event_#{attr}
               option = event_options[:#{attr}]
-              option.is_a?(Proc) ? option.call(self) : send(option)
+              if option.is_a?(Proc)
+                option.call(self)
+              elsif option.is_a?(Symbol)
+                send(option)
+              else
+                option
+              end
             end
           END_SRC
           class_eval src, __FILE__, __LINE__

From 7aaa538fd9cb34b88c037a7d03a5351c1e2c852e Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sat, 12 Apr 2008 17:13:17 +0000
Subject: [PATCH 381/710] Fixed: error when browsing an empty Mercurial
 repository (#1046).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1343 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/models/repository/mercurial.rb            | 4 +++-
 lib/redmine/scm/adapters/mercurial_adapter.rb | 3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/models/repository/mercurial.rb b/app/models/repository/mercurial.rb
index b183c15a7..18cbc9495 100644
--- a/app/models/repository/mercurial.rb
+++ b/app/models/repository/mercurial.rb
@@ -58,7 +58,9 @@ class Repository::Mercurial < Repository
       # latest revision found in database
       db_revision = latest_changeset ? latest_changeset.revision.to_i : -1
       # latest revision in the repository
-      scm_revision = scm_info.lastrev.identifier.to_i
+      latest_revision = scm_info.lastrev
+      return if latest_revision.nil?
+      scm_revision = latest_revision.identifier.to_i
       if db_revision < scm_revision
         logger.debug "Fetching changesets for repository #{url}" if logger && logger.debug?
         identifier_from = db_revision + 1
diff --git a/lib/redmine/scm/adapters/mercurial_adapter.rb b/lib/redmine/scm/adapters/mercurial_adapter.rb
index b92c88646..72db723ba 100644
--- a/lib/redmine/scm/adapters/mercurial_adapter.rb
+++ b/lib/redmine/scm/adapters/mercurial_adapter.rb
@@ -105,7 +105,8 @@ module Redmine
                 line_feeds += 1 if line.chomp.empty?
               end
             end
-            revisions << build_revision_from_changeset(changeset)
+            # Add the last changeset if there is one left
+            revisions << build_revision_from_changeset(changeset) if changeset[:date]
           end
           return nil if $? && $?.exitstatus != 0
           revisions

From 8eb86396e195e040658b4f3b685072e9bd5cc572 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sat, 12 Apr 2008 17:25:06 +0000
Subject: [PATCH 382/710] Fixed: Double dot displayed on ticket view when
 ticket not updated (closes #813).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1344 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/issues/show.rhtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/issues/show.rhtml b/app/views/issues/show.rhtml
index 77d9ce640..f788d0ec8 100644
--- a/app/views/issues/show.rhtml
+++ b/app/views/issues/show.rhtml
@@ -13,7 +13,7 @@
         <h3><%=h @issue.subject %></h3>
         <p class="author">
         <%= authoring @issue.created_on, @issue.author %>.
-        <%= l(:label_updated_time, distance_of_time_in_words(Time.now, @issue.updated_on)) if @issue.created_on != @issue.updated_on %>.
+        <%= l(:label_updated_time, distance_of_time_in_words(Time.now, @issue.updated_on)) + '.' if @issue.created_on != @issue.updated_on %>
         </p>
 
 <table width="100%">

From a340d8c957bb05b60a9b58ccfdfbcfd6015ea9fa Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 13 Apr 2008 09:12:43 +0000
Subject: [PATCH 383/710] Better error message and AR errors in log for failed
 LDAP on-the-fly user creation (closes #932, #1042).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1345 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/account_controller.rb |  2 ++
 app/models/user.rb                    | 13 +++++++++----
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/app/controllers/account_controller.rb b/app/controllers/account_controller.rb
index e719e8c9b..b9224c158 100644
--- a/app/controllers/account_controller.rb
+++ b/app/controllers/account_controller.rb
@@ -56,6 +56,8 @@ class AccountController < ApplicationController
         flash.now[:error] = l(:notice_account_invalid_creditentials)
       end
     end
+  rescue User::OnTheFlyCreationFailure
+    flash.now[:error] = 'Redmine could not retrieve the required information from the LDAP to create your account. Please, contact your Redmine administrator.'
   end
 
   # Log out current user and redirect to welcome page
diff --git a/app/models/user.rb b/app/models/user.rb
index e0b1e238c..a67a08567 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -18,6 +18,9 @@
 require "digest/sha1"
 
 class User < ActiveRecord::Base
+
+  class OnTheFlyCreationFailure < Exception; end
+
   # Account statuses
   STATUS_ANONYMOUS  = 0
   STATUS_ACTIVE     = 1
@@ -105,15 +108,17 @@ class User < ActiveRecord::Base
         onthefly.language = Setting.default_language
         if onthefly.save
           user = find(:first, :conditions => ["login=?", login])
-          logger.info("User '#{user.login}' created on the fly.") if logger
+          logger.info("User '#{user.login}' created from the LDAP") if logger
+        else
+          logger.error("User '#{onthefly.login}' found in LDAP but could not be created (#{onthefly.errors.full_messages.join(', ')})") if logger
+          raise OnTheFlyCreationFailure.new
         end
       end
     end    
     user.update_attribute(:last_login_on, Time.now) if user
     user
-    
-    rescue => text
-      raise text
+  rescue => text
+    raise text
   end
 	
   # Return user's full name for display

From 56683967dac2a3cd215f7495b33b2ed7dbf236f1 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 13 Apr 2008 11:18:09 +0000
Subject: [PATCH 384/710] Left align filter buttons (closes #872) and reduce
 filters spacing.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1346 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/queries/_filters.rhtml   | 12 ++++++------
 public/stylesheets/application.css |  8 ++++++--
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/app/views/queries/_filters.rhtml b/app/views/queries/_filters.rhtml
index 458d7139e..ec9d4fef6 100644
--- a/app/views/queries/_filters.rhtml
+++ b/app/views/queries/_filters.rhtml
@@ -59,19 +59,19 @@ function toggle_multi_select(field) {
 <table width="100%">
 <tr>
 <td>
-<table style="padding:0;">
+<table>
 <% query.available_filters.sort{|a,b| a[1][:order]<=>b[1][:order]}.each do |filter| %>
     <% field = filter[0]
        options = filter[1] %>
-    <tr <%= 'style="display:none;"' unless query.has_filter?(field) %> id="tr_<%= field %>">
-    <td valign="top" style="width:200px;">
+    <tr <%= 'style="display:none;"' unless query.has_filter?(field) %> id="tr_<%= field %>" class="filter">
+    <td style="width:200px;">
         <%= check_box_tag 'fields[]', field, query.has_filter?(field), :onclick => "toggle_filter('#{field}');", :id => "cb_#{field}" %>
         <label for="cb_<%= field %>"><%= filter[1][:name] || l(("field_"+field.to_s.gsub(/\_id$/, "")).to_sym) %></label>
     </td>
-    <td valign="top" style="width:150px;">
+    <td style="width:150px;">
         <%= select_tag "operators[#{field}]", options_for_select(operators_for_select(options[:type]), query.operator_for(field)), :id => "operators_#{field}", :onchange => "toggle_operator('#{field}');", :class => "select-small", :style => "vertical-align: top;" %>
     </td>
-    <td valign="top">    
+    <td>    
     <div id="div_values_<%= field %>" style="display:none;">
     <% case options[:type]
     when :list, :list_optional, :list_status, :list_subprojects %>
@@ -93,7 +93,7 @@ function toggle_multi_select(field) {
 <% end %>
 </table>
 </td>
-<td align="right" valign="top">
+<td class="add-filter">
 <%= l(:label_filter_add) %>:
 <%= select_tag 'add_filter_select', options_for_select([["",""]] + query.available_filters.sort{|a,b| a[1][:order]<=>b[1][:order]}.collect{|field| [ field[1][:name] || l(("field_"+field[0].to_s.gsub(/\_id$/, "")).to_sym), field[0]] unless query.has_filter?(field[0])}.compact), :onchange => "add_filter();", :class => "select-small" %>
 </td>
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 682e95dde..7b73d0939 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -160,8 +160,12 @@ p.breadcrumb { font-size: 0.9em; margin: 4px 0 4px 0;}
 p.subtitle { font-size: 0.9em; margin: -6px 0 12px 0; font-style: italic; } 
 
 fieldset#filters { padding: 0.7em; }
-fieldset#filters p { margin: 0.8em 0 0.8em 0; }
-fieldset#filters .buttons { text-align: right; font-size: 0.9em; }
+fieldset#filters p { margin: 1.2em 0 0.8em 2px; }
+fieldset#filters .buttons { font-size: 0.9em; }
+fieldset#filters table { border-collapse: collapse; }
+fieldset#filters table td { padding: 0; vertical-align: middle; }
+fieldset#filters tr.filter { height: 2em; }
+fieldset#filters td.add-filter { text-align: right; vertical-align: top; }
 
 div#issue-changesets {float:right; width:45%; margin-left: 1em; margin-bottom: 1em; background: #fff; padding-left: 1em; font-size: 90%;}
 div#issue-changesets .changeset { padding: 4px;}

From 8b9fb29d95d8d467da2cc1bdb657503b433305f4 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 13 Apr 2008 12:25:22 +0000
Subject: [PATCH 385/710] =?UTF-8?q?Translation=20updates=20(closes=20#1010?=
 =?UTF-8?q?,=20#1017,=20#1047):=20*=20Finnish=20(Antti=20Perki=C3=B6m?=
 =?UTF-8?q?=C3=A4ki)=20*=20Spanish=20(Gumer=20Coronel)=20*=20Czech=20(Maxi?=
 =?UTF-8?q?m=20Kru=C5=A1ina)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1347 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 lang/cs.yml |  34 +++++++--------
 lang/es.yml | 120 ++++++++++++++++++++++++++--------------------------
 lang/fi.yml |   6 +--
 3 files changed, 80 insertions(+), 80 deletions(-)

diff --git a/lang/cs.yml b/lang/cs.yml
index 03702eaa2..60fcb8d11 100644
--- a/lang/cs.yml
+++ b/lang/cs.yml
@@ -10,16 +10,16 @@ actionview_datehelper_select_month_prefix:
 actionview_datehelper_select_year_prefix: 
 actionview_datehelper_time_in_words_day: 1 den
 actionview_datehelper_time_in_words_day_plural: %d dny
-actionview_datehelper_time_in_words_hour_about: asi hodinu
-actionview_datehelper_time_in_words_hour_about_plural: asi %d hodin
-actionview_datehelper_time_in_words_hour_about_single: asi hodinu
-actionview_datehelper_time_in_words_minute: 1 minuta
-actionview_datehelper_time_in_words_minute_half: půl minuty
-actionview_datehelper_time_in_words_minute_less_than: méně než minutu
-actionview_datehelper_time_in_words_minute_plural: %d minut
-actionview_datehelper_time_in_words_minute_single: 1 minuta
-actionview_datehelper_time_in_words_second_less_than: méně než sekunda
-actionview_datehelper_time_in_words_second_less_than_plural: méně než %d sekund
+actionview_datehelper_time_in_words_hour_about: asi hodinou
+actionview_datehelper_time_in_words_hour_about_plural: asi %d hodinami
+actionview_datehelper_time_in_words_hour_about_single: asi hodinou
+actionview_datehelper_time_in_words_minute: 1 minutou
+actionview_datehelper_time_in_words_minute_half: půl minutou
+actionview_datehelper_time_in_words_minute_less_than: méně než minutou
+actionview_datehelper_time_in_words_minute_plural: %d minutami
+actionview_datehelper_time_in_words_minute_single: 1 minutou
+actionview_datehelper_time_in_words_second_less_than: méně než sekundou
+actionview_datehelper_time_in_words_second_less_than_plural: méně než %d sekundami
 actionview_instancetag_blank_option: Prosím vyberte
 
 activerecord_error_inclusion: není zahrnuto v seznamu
@@ -98,7 +98,7 @@ mail_body_account_activation_request: Byl zaregistrován nový uživatel "%s". A
 gui_validation_error: 1 chyba
 gui_validation_error_plural: %d chyb(y)
 
-field_name: Jméno
+field_name: Název
 field_description: Popis
 field_summary: Přehled
 field_is_required: Povinné pole
@@ -306,7 +306,7 @@ label_attribute: Atribut
 label_attribute_plural: Atributy
 label_download: %d Download
 label_download_plural: %d Downloads
-label_no_data: Žádná data k zobrazení
+label_no_data: Žádné položky
 label_change_status: Změnit stav
 label_history: Historie
 label_attachment: Soubor
@@ -480,8 +480,8 @@ label_sort_by: Seřadit podle %s
 label_send_test_email: Poslat testovací email
 label_feeds_access_key_created_on: Přístupový klíč pro RSS byl vytvořen před %s
 label_module_plural: Moduly
-label_added_time_by: 'Přidáno před: %s %s'
-label_updated_time: 'Aktualizováno před: %s'
+label_added_time_by: 'Přidáno uživatelem %s před %s'
+label_updated_time: 'Aktualizováno před %s'
 label_jump_to_a_project: Zvolit projekt...
 label_file_plural: Soubory
 label_changeset_plural: Changesety
@@ -586,7 +586,7 @@ text_no_configuration_data: "Role, fronty, stavy úkolů ani workflow nebyly zat
 text_load_default_configuration: Nahrát výchozí konfiguraci
 text_status_changed_by_changeset: Použito v changesetu %s.
 text_issues_destroy_confirmation: 'Opravdu si přejete odstranit všechny zvolené úkoly?'
-text_select_project_modules: 'Zvolte moduly aktivní v tomto projektu:'
+text_select_project_modules: 'Aktivní moduly v tomto projektu:'
 text_default_administrator_account_changed: Výchozí nastavení administrátorského účtu změněno
 text_file_repository_writable: Povolen zápis do repository
 text_rmagick_available: RMagick k dispozici (volitelné)
@@ -620,5 +620,5 @@ default_activity_development: Vývoj
 enumeration_issue_priorities: Priority úkolů
 enumeration_doc_categories: Kategorie dokumentů
 enumeration_activities: Aktivity (sledování času)
-error_scm_annotate: "The entry does not exist or can not be annotated."
-label_planning: Planning
+error_scm_annotate: "Položka neexistuje nebo nemůže být komentována."
+label_planning: Plánování
diff --git a/lang/es.yml b/lang/es.yml
index 5d5492833..3f13716df 100644
--- a/lang/es.yml
+++ b/lang/es.yml
@@ -333,8 +333,8 @@ label_revision_plural: Revisiones
 label_added: añadido
 label_modified: modificado
 label_deleted: suprimido
-label_latest_revision: La revisión más actual
-label_latest_revision_plural: Las revisiones más actuales
+label_latest_revision: Última revisión
+label_latest_revision_plural: Últimas revisiones
 label_view_revisions: Ver las revisiones
 label_max_size: Tamaño máximo
 label_on: de
@@ -372,7 +372,7 @@ label_view_diff: Ver diferencias
 label_diff_inline: en línea
 label_diff_side_by_side: cara a cara
 label_options: Opciones
-label_copy_workflow_from: Copiar workflow desde
+label_copy_workflow_from: Copiar flujo de trabajo desde
 label_permissions_report: Informe de permisos
 label_watched_issues: Peticiones monitorizadas 
 label_related_issues: Peticiones relacionadas
@@ -460,7 +460,7 @@ text_tip_task_begin_end_day: tarea que comienza y termina este día
 text_project_identifier_info: 'Letras minúsculas (a-z), números y signos de puntuación permitidos.<br />Una vez guardado, el identificador no puede modificarse.'
 text_caracters_maximum: %d carácteres como máximo.
 text_length_between: Longitud entre %d y %d carácteres.
-text_tracker_no_workflow: No hay ningún workflow definido para este tracker
+text_tracker_no_workflow: No hay ningún flujo de trabajo definido para este tracker
 text_unallowed_characters: Carácteres no permitidos
 text_comma_separated: Múltiples valores permitidos (separados por coma).
 text_issues_ref_in_commit_messages: Referencia y petición de corrección en los mensajes
@@ -559,64 +559,64 @@ field_searchable: Incluir en las búsquedas
 label_display_per_page: 'Por página: %s'
 setting_per_page_options: Objetos por página
 label_age: Edad
-notice_default_data_loaded: Default configuration successfully loaded.
-text_load_default_configuration: Load the default configuration
-text_no_configuration_data: "Roles, trackers, issue statuses and workflow have not been configured yet.\nIt is highly recommended to load the default configuration. You will be able to modify it once loaded."
-error_can_t_load_default_data: "Default configuration could not be loaded: %s"
-button_update: Update
-label_change_properties: Change properties
+notice_default_data_loaded: Configuración por defecto cargada correctamente.
+text_load_default_configuration: Cargar la configuración por defecto
+text_no_configuration_data: "Todavía no se han configurado roles, ni trackers, ni estados y flujo de trabajo asociado a peticiones. Se recomiendo encarecidamente cargar la configuración por defecto. Una vez cargada, podrá modificarla." 
+error_can_t_load_default_data: "No se ha podido cargar la configuración por defecto: %s" 
+button_update: Actualizar
+label_change_properties: Cambiar propiedades
 label_general: General
-label_repository_plural: Repositories
-label_associated_revisions: Associated revisions
-setting_user_format: Users display format
-text_status_changed_by_changeset: Applied in changeset %s.
-label_more: More
-text_issues_destroy_confirmation: 'Are you sure you want to delete the selected issue(s) ?'
+label_repository_plural: Repositorios
+label_associated_revisions: Revisiones asociadas
+setting_user_format: Formato de nombre de usuario
+text_status_changed_by_changeset: Aplicado en los cambios %s
+label_more: Más
+text_issues_destroy_confirmation: '¿Seguro que quiere borrar las peticiones seleccionadas?'
 label_scm: SCM
-text_select_project_modules: 'Select modules to enable for this project:'
-label_issue_added: Issue added
-label_issue_updated: Issue updated
-label_document_added: Document added
-label_message_posted: Message added
-label_file_added: File added
-label_news_added: News added
-project_module_boards: Boards
-project_module_issue_tracking: Issue tracking
+text_select_project_modules: 'Seleccione los módulos a activar para este proyecto:'
+label_issue_added: Petición añadida
+label_issue_updated: Petición actualizada
+label_document_added: Documento añadido
+label_message_posted: Mensaje añadido
+label_file_added: Fichero añadido
+label_news_added: Noticia añadida
+project_module_boards: Foros
+project_module_issue_tracking: Peticiones
 project_module_wiki: Wiki
-project_module_files: Files
-project_module_documents: Documents
-project_module_repository: Repository
-project_module_news: News
-project_module_time_tracking: Time tracking
-text_file_repository_writable: File repository writable
-text_default_administrator_account_changed: Default administrator account changed
-text_rmagick_available: RMagick available (optional)
-button_configure: Configure
+project_module_files: Ficheros
+project_module_documents: Documentos
+project_module_repository: Repositorio
+project_module_news: Noticias
+project_module_time_tracking: Control de tiempo
+text_file_repository_writable: Se puede escribir en el repositorio
+text_default_administrator_account_changed: Cuenta de administrador por defecto modificada
+text_rmagick_available: RMagick disponible (opcional)
+button_configure: Configurar
 label_plugins: Plugins
-label_ldap_authentication: LDAP authentication
+label_ldap_authentication: Autenticación LDAP
 label_downloads_abbr: D/L
-label_this_month: this month
-label_last_n_days: last %d days
-label_all_time: all time
-label_this_year: this year
-label_date_range: Date range
-label_last_week: last week
-label_yesterday: yesterday
-label_last_month: last month
-label_add_another_file: Add another file
-label_optional_description: Optional description
-text_destroy_time_entries_question: %.02f hours were reported on the issues you are about to delete. What do you want to do ?
-error_issue_not_found_in_project: 'The issue was not found or does not belong to this project'
-text_assign_time_entries_to_project: Assign reported hours to the project
-text_destroy_time_entries: Delete reported hours
-text_reassign_time_entries: 'Reassign reported hours to this issue:'
-setting_activity_days_default: Days displayed on project activity
-label_chronological_order: In chronological order
-field_comments_sorting: Display comments
-label_reverse_chronological_order: In reverse chronological order
-label_preferences: Preferences
-setting_display_subprojects_issues: Display subprojects issues on main projects by default
-label_overall_activity: Overall activity
-setting_default_projects_public: New projects are public by default
-error_scm_annotate: "The entry does not exist or can not be annotated."
-label_planning: Planning
+label_this_month: este mes
+label_last_n_days: últimos %d días
+label_all_time: todo el tiempo
+label_this_year: este año
+label_date_range: Rango de fechas
+label_last_week: última semana
+label_yesterday: ayer
+label_last_month: último mes
+label_add_another_file: Añadir otro fichero
+label_optional_description: Descripción opcional
+text_destroy_time_entries_question: Existen %.02f horas asignadas a la petición que quiere borrar. ¿Qué quiere hacer ?
+error_issue_not_found_in_project: 'La petición no se encuentra o no está asociada a este proyecto'
+text_assign_time_entries_to_project: Asignar las horas al proyecto
+text_destroy_time_entries: Borrar las horas
+text_reassign_time_entries: 'Reasignar las horas a esta petición:'
+setting_activity_days_default: Días a mostrar en la actividad de proyecto
+label_chronological_order: En orden cronológico
+field_comments_sorting: Mostrar comentarios
+label_reverse_chronological_order: En orden cronológico inverso
+label_preferences: Preferencias
+setting_display_subprojects_issues: Mostrar peticiones de un subproyecto en el proyecto padre por defecto 
+label_overall_activity: Actividad global
+setting_default_projects_public: Los proyectos nuevos son públicos por defecto 
+error_scm_annotate: "No existe la entrada o no ha podido ser anotada"
+label_planning: Planificación
diff --git a/lang/fi.yml b/lang/fi.yml
index f345be139..0b47aee7f 100644
--- a/lang/fi.yml
+++ b/lang/fi.yml
@@ -614,6 +614,6 @@ field_comments_sorting: Näytä kommentit
 label_reverse_chronological_order: Käänteisessä aikajärjestyksessä
 label_preferences: Asetukset
 setting_default_projects_public: Uudet projektit ovat oletuksena julkisia
-label_overall_activity: Kokonaisaktiviteetti
-error_scm_annotate: "The entry does not exist or can not be annotated."
-label_planning: Planning
+label_overall_activity: Kokonaishistoria
+error_scm_annotate: "Merkintää ei ole tai siihen ei voi lisätä selityksiä."
+label_planning: Suunnittelu

From 97fe797ad36389ea4719e90677408d9eed0cb369 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 13 Apr 2008 12:45:17 +0000
Subject: [PATCH 386/710] Replace closing html tags with html entity (#910).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1348 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 lib/redcloth.rb                              | 2 +-
 test/unit/helpers/application_helper_test.rb | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/lib/redcloth.rb b/lib/redcloth.rb
index 5ed23b8f7..7e0c71839 100644
--- a/lib/redcloth.rb
+++ b/lib/redcloth.rb
@@ -1134,7 +1134,7 @@ class RedCloth < String
     ALLOWED_TAGS = %w(redpre pre code)
     
     def escape_html_tags(text)
-      text.gsub!(%r{<((\/?)(\w+))}) {|m| ALLOWED_TAGS.include?($3) ? "<#{$1}" : "&lt;#{$1}" }
+      text.gsub!(%r{<(\/?(\w+)[^>\n]*)(>?)}) {|m| ALLOWED_TAGS.include?($2) ? "<#{$1}#{$3}" : "&lt;#{$1}#{'&gt;' if $3}" }
     end
 end
 
diff --git a/test/unit/helpers/application_helper_test.rb b/test/unit/helpers/application_helper_test.rb
index 66499c003..f0de341c6 100644
--- a/test/unit/helpers/application_helper_test.rb
+++ b/test/unit/helpers/application_helper_test.rb
@@ -134,8 +134,9 @@ class ApplicationHelperTest < HelperTestCase
   
   def test_html_tags
     to_test = {
-      "<div>content</div>" => "<p>&lt;div>content&lt;/div></p>",
-      "<script>some script;</script>" => "<p>&lt;script>some script;&lt;/script></p>",
+      "<div>content</div>" => "<p>&lt;div&gt;content&lt;/div&gt;</p>",
+      "<div class=\"bold\">content</div>" => "<p>&lt;div class=\"bold\"&gt;content&lt;/div&gt;</p>",
+      "<script>some script;</script>" => "<p>&lt;script&gt;some script;&lt;/script&gt;</p>",
       # do not escape pre/code tags
       "<pre>\nline 1\nline2</pre>" => "<pre>\nline 1\nline2</pre>",
       "<pre><code>\nline 1\nline2</code></pre>" => "<pre><code>\nline 1\nline2</code></pre>",

From e64443571552e46fa1ecc34833e6f765b816a837 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 13 Apr 2008 13:24:03 +0000
Subject: [PATCH 387/710] Add css class for ticket changes (#1032).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1349 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/issues/_history.rhtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/issues/_history.rhtml b/app/views/issues/_history.rhtml
index 373758874..f29a44daf 100644
--- a/app/views/issues/_history.rhtml
+++ b/app/views/issues/_history.rhtml
@@ -1,5 +1,5 @@
 <% for journal in journals %>
-    <div id="change-<%= journal.id %>">
+    <div id="change-<%= journal.id %>" class="journal">
 	<h4><div style="float:right;"><%= link_to "##{journal.indice}", :anchor => "note-#{journal.indice}" %></div>
 	<%= content_tag('a', '', :name => "note-#{journal.indice}")%>
 	<%= format_time(journal.created_on) %> - <%= journal.user.name %></h4>

From 0329094f015bcc2036fc1a2545253b8e187ee794 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 13 Apr 2008 16:22:55 +0000
Subject: [PATCH 388/710] Include macro can include a page of another project
 wiki using !{{include(projectname:Foo)}} (#1052).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1350 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 lib/redmine/wiki_formatting/macros.rb        | 29 +++++++++++---------
 test/unit/helpers/application_helper_test.rb | 18 ++++++++++++
 2 files changed, 34 insertions(+), 13 deletions(-)

diff --git a/lib/redmine/wiki_formatting/macros.rb b/lib/redmine/wiki_formatting/macros.rb
index f27ea98b9..0848aee4e 100644
--- a/lib/redmine/wiki_formatting/macros.rb
+++ b/lib/redmine/wiki_formatting/macros.rb
@@ -77,21 +77,24 @@ module Redmine
         content_tag('dl', out)
       end
       
-      desc "Include a wiki page. Example:\n\n  !{{include(Foo)}}"
+      desc "Include a wiki page. Example:\n\n  !{{include(Foo)}}\n\nor to include a page of a specific project wiki:\n\n  !{{include(projectname:Foo)}}"
       macro :include do |obj, args|
-        if @project && !@project.wiki.nil?
-          page = @project.wiki.find_page(args.first)
-          if page && page.content
-            @included_wiki_pages ||= []
-            raise 'Circular inclusion detected' if @included_wiki_pages.include?(page.title)
-            @included_wiki_pages << page.title
-            out = textilizable(page.content, :text, :attachments => page.attachments)
-            @included_wiki_pages.pop
-            out
-          else
-            raise "Page #{args.first} doesn't exist"
-          end
+        project = @project
+        title = args.first.to_s
+        if title =~ %r{^([^\:]+)\:(.*)$}
+          project_identifier, title = $1, $2
+          project = Project.find_by_identifier(project_identifier) || Project.find_by_name(project_identifier)
         end
+        raise 'Unknow project' unless project && User.current.allowed_to?(:view_wiki_pages, project)
+        raise 'No wiki for this project' unless !project.wiki.nil?
+        page = project.wiki.find_page(title)
+        raise "Page #{args.first} doesn't exist" unless page && page.content
+        @included_wiki_pages ||= []
+        raise 'Circular inclusion detected' if @included_wiki_pages.include?(page.title)
+        @included_wiki_pages << page.title
+        out = textilizable(page.content, :text, :attachments => page.attachments)
+        @included_wiki_pages.pop
+        out
       end
     end
   end
diff --git a/test/unit/helpers/application_helper_test.rb b/test/unit/helpers/application_helper_test.rb
index f0de341c6..7ae6be4f3 100644
--- a/test/unit/helpers/application_helper_test.rb
+++ b/test/unit/helpers/application_helper_test.rb
@@ -168,6 +168,24 @@ class ApplicationHelperTest < HelperTestCase
     assert_equal '<p>{{hello_world}}</p>', textilizable(text)
   end
   
+  def test_macro_include
+    @project = Project.find(1)
+    # include a page of the current project wiki
+    text = "{{include(Another page)}}"
+    assert textilizable(text).match(/This is a link to a ticket/)
+    
+    @project = nil
+    # include a page of a specific project wiki
+    text = "{{include(ecookbook:Another page)}}"
+    assert textilizable(text).match(/This is a link to a ticket/)
+
+    text = "{{include(ecookbook:)}}"
+    assert textilizable(text).match(/CookBook documentation/)
+
+    text = "{{include(unknowidentifier:somepage)}}"
+    assert textilizable(text).match(/Unknow project/)
+  end
+  
   def test_date_format_default
     today = Date.today
     Setting.date_format = ''    

From 741ddfb50b99b5193e1b5a0037cf406e4051df87 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Mon, 14 Apr 2008 19:13:22 +0000
Subject: [PATCH 389/710] Hide export links in print media css.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1351 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 public/stylesheets/application.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 7b73d0939..1df5b213c 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -588,7 +588,7 @@ vertical-align: middle;
 
 /***** Media print specific styles *****/
 @media print {
-  #top-menu, #header, #main-menu, #sidebar, #footer, .contextual { display:none; }
+  #top-menu, #header, #main-menu, #sidebar, #footer, .contextual, .other-formats { display:none; }
   #main { background: #fff; }
   #content { width: 99%; margin: 0; padding: 0; border: 0; background: #fff; }
 }

From 277bee62eb15a4a32d720deb26d881922bae7ef6 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Mon, 14 Apr 2008 19:21:58 +0000
Subject: [PATCH 390/710] Issue list shows all tickets when going back to a
 global query inside a project (closes #1055).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1352 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/issues_controller.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index 369d888ef..0f1d84265 100644
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -413,6 +413,7 @@ private
       else
         @query = Query.find_by_id(session[:query][:id]) if session[:query][:id]
         @query ||= Query.new(:name => "_", :project => @project, :filters => session[:query][:filters])
+        @query.project = @project
       end
     end
   end

From 7061f73708336881660c763aa535c9b327610c70 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Tue, 15 Apr 2008 20:27:10 +0000
Subject: [PATCH 391/710] ApplicationHelperTest fix.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1353 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 test/unit/helpers/application_helper_test.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/unit/helpers/application_helper_test.rb b/test/unit/helpers/application_helper_test.rb
index 7ae6be4f3..fa2109131 100644
--- a/test/unit/helpers/application_helper_test.rb
+++ b/test/unit/helpers/application_helper_test.rb
@@ -20,7 +20,7 @@ require File.dirname(__FILE__) + '/../../test_helper'
 class ApplicationHelperTest < HelperTestCase
   include ApplicationHelper
   include ActionView::Helpers::TextHelper
-  fixtures :projects, :repositories, :changesets, :trackers, :issue_statuses, :issues, :documents, :versions, :wikis, :wiki_pages, :wiki_contents
+  fixtures :projects, :repositories, :changesets, :trackers, :issue_statuses, :issues, :documents, :versions, :wikis, :wiki_pages, :wiki_contents, :roles, :enabled_modules
 
   def setup
     super

From 1a4f81163d2c66e9827d674d32066865ef7e4bd0 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Wed, 16 Apr 2008 17:27:53 +0000
Subject: [PATCH 392/710] Redirected user to where he is coming from after
 logging hours (#1062).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1354 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/timelog_controller.rb | 2 +-
 app/helpers/application_helper.rb     | 4 ++++
 app/views/timelog/edit.rhtml          | 1 +
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/controllers/timelog_controller.rb b/app/controllers/timelog_controller.rb
index 2c90093bd..29c2635d6 100644
--- a/app/controllers/timelog_controller.rb
+++ b/app/controllers/timelog_controller.rb
@@ -172,7 +172,7 @@ class TimelogController < ApplicationController
     @time_entry.attributes = params[:time_entry]
     if request.post? and @time_entry.save
       flash[:notice] = l(:notice_successful_update)
-      redirect_to :action => 'details', :project_id => @time_entry.project
+      redirect_to(params[:back_url] || {:action => 'details', :project_id => @time_entry.project})
       return
     end    
     @activities = Enumeration::get_values('ACTI')
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index eb8cc2795..47a251053 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -427,6 +427,10 @@ module ApplicationHelper
     form_for(name, object, options.merge({ :builder => TabularFormBuilder, :lang => current_language}), &proc)
   end
   
+  def back_url_hidden_field_tag
+    hidden_field_tag 'back_url', (params[:back_url] || request.env['HTTP_REFERER'])
+  end
+  
   def check_all_links(form_name)
     link_to_function(l(:button_check_all), "checkAll('#{form_name}', true)") +
     " | " +
diff --git a/app/views/timelog/edit.rhtml b/app/views/timelog/edit.rhtml
index e221038a0..f9dae8a99 100644
--- a/app/views/timelog/edit.rhtml
+++ b/app/views/timelog/edit.rhtml
@@ -2,6 +2,7 @@
 
 <% labelled_tabular_form_for :time_entry, @time_entry, :url => {:action => 'edit', :project_id => @time_entry.project} do |f| %>
 <%= error_messages_for 'time_entry' %>
+<%= back_url_hidden_field_tag %>
 
 <div class="box">
 <p><%= f.text_field :issue_id, :size => 6 %> <em><%= h("#{@time_entry.issue.tracker.name} ##{@time_entry.issue.id}: #{@time_entry.issue.subject}") if @time_entry.issue %></em></p>

From 76b8d3eff26b007791ebb58dd98546e0faa3938d Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Thu, 24 Apr 2008 17:28:55 +0000
Subject: [PATCH 393/710] CVS duplicate key violation fix (#996, #1098).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1355 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/models/repository/cvs.rb | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/app/models/repository/cvs.rb b/app/models/repository/cvs.rb
index 7c01a27ee..c2d8be977 100644
--- a/app/models/repository/cvs.rb
+++ b/app/models/repository/cvs.rb
@@ -138,12 +138,18 @@ class Repository::Cvs < Repository
       end
       
       # Renumber new changesets in chronological order
-      c = changesets.find(:first, :order => 'committed_on DESC, id DESC', :conditions => "revision NOT LIKE '_%'")
-      next_rev = c.nil? ? 1 : (c.revision.to_i + 1)
       changesets.find(:all, :order => 'committed_on ASC, id ASC', :conditions => "revision LIKE '_%'").each do |changeset|
-        changeset.update_attribute :revision, next_rev
-        next_rev += 1
+        changeset.update_attribute :revision, next_revision_number
       end
     end # transaction
   end
+  
+  private
+  
+  # Returns the next revision number to assign to a CVS changeset
+  def next_revision_number
+    # Need to retrieve existing revision numbers to sort them as integers
+    @current_revision_number ||= (connection.select_values("SELECT revision FROM #{Changeset.table_name} WHERE repository_id = #{id} AND revision NOT LIKE '_%'").collect(&:to_i).max || 0)
+    @current_revision_number += 1
+  end
 end

From 2b412e9e0795391b28ed991654e6add67f32d628 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Thu, 24 Apr 2008 17:35:04 +0000
Subject: [PATCH 394/710] Fixed: trying to preview a new issue raises an
 exception (closes #984).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1356 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/issues_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index 0f1d84265..84b95741e 100644
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -344,7 +344,7 @@ class IssuesController < ApplicationController
   end
   
   def preview
-    @issue = @project.issues.find_by_id(params[:id]) if params[:id]
+    @issue = @project.issues.find_by_id(params[:id]) unless params[:id].blank?
     @attachements = @issue.attachments if @issue
     @text = params[:notes] || (params[:issue] ? params[:issue][:description] : nil)
     render :partial => 'common/preview'

From 596de073f95ff0fdcd7dcdf71bd91838be75756e Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Thu, 24 Apr 2008 18:35:56 +0000
Subject: [PATCH 395/710] Commits per author graph: remove email adress in
 usernames (#1066).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1357 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/repositories_controller.rb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb
index 79fb49c86..198a9766c 100644
--- a/app/controllers/repositories_controller.rb
+++ b/app/controllers/repositories_controller.rb
@@ -260,6 +260,9 @@ private
     commits_data = commits_data + [0]*(10 - commits_data.length) if commits_data.length<10
     changes_data = changes_data + [0]*(10 - changes_data.length) if changes_data.length<10
     
+    # Remove email adress in usernames
+    fields = fields.collect {|c| c.gsub(%r{<.+@.+>}, '') }
+    
     graph = SVG::Graph::BarHorizontal.new(
       :height => 300,
       :width => 500,

From a9f86444fc5acd7502b72ea905f88952fc3c1434 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sat, 26 Apr 2008 09:49:16 +0000
Subject: [PATCH 396/710] Fixed: Modules selection not remembered when new
 project creation fails (#1109).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1358 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/projects_controller.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index afd7f6569..8bdcea8d7 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -66,20 +66,20 @@ class ProjectsController < ApplicationController
                                   :conditions => "parent_id IS NULL AND status = #{Project::STATUS_ACTIVE}",
                                   :order => 'name')
     @project = Project.new(params[:project])
-    @project.enabled_module_names = Redmine::AccessControl.available_project_modules
     if request.get?
       @custom_values = ProjectCustomField.find(:all, :order => "#{CustomField.table_name}.position").collect { |x| CustomValue.new(:custom_field => x, :customized => @project) }
       @project.trackers = Tracker.all
       @project.is_public = Setting.default_projects_public?
+      @project.enabled_module_names = Redmine::AccessControl.available_project_modules
     else
       @project.custom_fields = CustomField.find(params[:custom_field_ids]) if params[:custom_field_ids]
       @custom_values = ProjectCustomField.find(:all, :order => "#{CustomField.table_name}.position").collect { |x| CustomValue.new(:custom_field => x, :customized => @project, :value => (params[:custom_fields] ? params["custom_fields"][x.id.to_s] : nil)) }
       @project.custom_values = @custom_values
+      @project.enabled_module_names = params[:enabled_modules]
       if @project.save
-        @project.enabled_module_names = params[:enabled_modules]
         flash[:notice] = l(:notice_successful_create)
         redirect_to :controller => 'admin', :action => 'projects'
-	    end		
+	  end		
     end	
   end
 	

From 76b92fb999750402a448af0226c871bcef0ec2d9 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sat, 26 Apr 2008 10:20:48 +0000
Subject: [PATCH 397/710] Warn user that subprojects are also deleted when
 deleting a project (#1111) and add a checkbox to confirm the deletion.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1359 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/projects/destroy.rhtml   | 16 +++++++++-------
 lang/bg.yml                        |  1 +
 lang/cs.yml                        |  1 +
 lang/da.yml                        |  1 +
 lang/de.yml                        |  1 +
 lang/en.yml                        |  1 +
 lang/es.yml                        |  1 +
 lang/fi.yml                        |  1 +
 lang/fr.yml                        |  3 ++-
 lang/he.yml                        |  1 +
 lang/it.yml                        |  1 +
 lang/ja.yml                        |  1 +
 lang/ko.yml                        |  1 +
 lang/lt.yml                        |  1 +
 lang/nl.yml                        |  1 +
 lang/no.yml                        |  1 +
 lang/pl.yml                        |  1 +
 lang/pt-br.yml                     |  1 +
 lang/pt.yml                        |  1 +
 lang/ro.yml                        |  1 +
 lang/ru.yml                        |  1 +
 lang/sr.yml                        |  1 +
 lang/sv.yml                        |  1 +
 lang/uk.yml                        |  1 +
 lang/zh-tw.yml                     |  1 +
 lang/zh.yml                        |  1 +
 public/stylesheets/application.css |  4 ++--
 27 files changed, 37 insertions(+), 10 deletions(-)

diff --git a/app/views/projects/destroy.rhtml b/app/views/projects/destroy.rhtml
index 4531cb845..a1913c115 100644
--- a/app/views/projects/destroy.rhtml
+++ b/app/views/projects/destroy.rhtml
@@ -1,14 +1,16 @@
 <h2><%=l(:label_confirmation)%></h2>
-<div class="box">
-<center>
-<p><strong><%=h @project_to_destroy.name %></strong><br />
-<%=l(:text_project_destroy_confirmation)%></p>
+<div class="warning">
+<p><strong><%=h @project_to_destroy %></strong><br />
+<%=l(:text_project_destroy_confirmation)%>
 
+<% if @project_to_destroy.children.any? %>
+<br /><%= l(:text_subprojects_destroy_warning, content_tag('strong', h(@project_to_destroy.children.sort.collect{|p| p.to_s}.join(', ')))) %>
+<% end %>
+</p>
 <p>
     <% form_tag({:controller => 'projects', :action => 'destroy', :id => @project_to_destroy}) do %>
-    <%= hidden_field_tag "confirm", 1 %>
+    <label><%= check_box_tag 'confirm', 1 %> <%= l(:general_text_Yes) %></label>
     <%= submit_tag l(:button_delete) %>
     <% end %>
 </p>
-</center>
-</div>
\ No newline at end of file
+</div>
diff --git a/lang/bg.yml b/lang/bg.yml
index d1a60fe43..b341d989f 100644
--- a/lang/bg.yml
+++ b/lang/bg.yml
@@ -617,3 +617,4 @@ label_overall_activity: Цялостна дейност
 setting_default_projects_public: Новите проекти са публични по подразбиране
 error_scm_annotate: "Обектът не съществува или не може да бъде анотиран."
 label_planning: Планиране
+text_subprojects_destroy_warning: 'Its subproject(s): %s will be also deleted.'
diff --git a/lang/cs.yml b/lang/cs.yml
index 60fcb8d11..250c602c2 100644
--- a/lang/cs.yml
+++ b/lang/cs.yml
@@ -622,3 +622,4 @@ enumeration_doc_categories: Kategorie dokumentů
 enumeration_activities: Aktivity (sledování času)
 error_scm_annotate: "Položka neexistuje nebo nemůže být komentována."
 label_planning: Plánování
+text_subprojects_destroy_warning: 'Its subproject(s): %s will be also deleted.'
diff --git a/lang/da.yml b/lang/da.yml
index b0a6764bb..ff2ed982d 100644
--- a/lang/da.yml
+++ b/lang/da.yml
@@ -619,3 +619,4 @@ label_overall_activity: Overordnet aktivitet
 setting_default_projects_public: Nye projekter er offentlige som default
 error_scm_annotate: "The entry does not exist or can not be annotated."
 label_planning: Planlægning
+text_subprojects_destroy_warning: 'Its subproject(s): %s will be also deleted.'
diff --git a/lang/de.yml b/lang/de.yml
index 323859ae4..77184cf88 100644
--- a/lang/de.yml
+++ b/lang/de.yml
@@ -618,3 +618,4 @@ default_activity_development: Entwicklung
 enumeration_issue_priorities: Ticket-Prioritäten
 enumeration_doc_categories: Dokumentenkategorien
 enumeration_activities: Aktivitäten (Zeiterfassung)
+text_subprojects_destroy_warning: 'Its subproject(s): %s will be also deleted.'
diff --git a/lang/en.yml b/lang/en.yml
index 8264ba908..e39aec301 100644
--- a/lang/en.yml
+++ b/lang/en.yml
@@ -557,6 +557,7 @@ text_select_mail_notifications: Select actions for which email notifications sho
 text_regexp_info: eg. ^[A-Z0-9]+$
 text_min_max_length_info: 0 means no restriction
 text_project_destroy_confirmation: Are you sure you want to delete this project and related data ?
+text_subprojects_destroy_warning: 'Its subproject(s): %s will be also deleted.'
 text_workflow_edit: Select a role and a tracker to edit the workflow
 text_are_you_sure: Are you sure ?
 text_journal_changed: changed from %s to %s
diff --git a/lang/es.yml b/lang/es.yml
index 3f13716df..7ce4a7a8a 100644
--- a/lang/es.yml
+++ b/lang/es.yml
@@ -620,3 +620,4 @@ label_overall_activity: Actividad global
 setting_default_projects_public: Los proyectos nuevos son públicos por defecto 
 error_scm_annotate: "No existe la entrada o no ha podido ser anotada"
 label_planning: Planificación
+text_subprojects_destroy_warning: 'Its subproject(s): %s will be also deleted.'
diff --git a/lang/fi.yml b/lang/fi.yml
index 0b47aee7f..68b6c20d7 100644
--- a/lang/fi.yml
+++ b/lang/fi.yml
@@ -617,3 +617,4 @@ setting_default_projects_public: Uudet projektit ovat oletuksena julkisia
 label_overall_activity: Kokonaishistoria
 error_scm_annotate: "Merkintää ei ole tai siihen ei voi lisätä selityksiä."
 label_planning: Suunnittelu
+text_subprojects_destroy_warning: 'Its subproject(s): %s will be also deleted.'
diff --git a/lang/fr.yml b/lang/fr.yml
index 602b3c8e1..cbdda4f3d 100644
--- a/lang/fr.yml
+++ b/lang/fr.yml
@@ -556,7 +556,8 @@ status_locked: vérouillé
 text_select_mail_notifications: Actions pour lesquelles une notification par e-mail est envoyée
 text_regexp_info: ex. ^[A-Z0-9]+$
 text_min_max_length_info: 0 pour aucune restriction
-text_project_destroy_confirmation: Etes-vous sûr de vouloir supprimer ce projet et tout ce qui lui est rattaché ?
+text_project_destroy_confirmation: Etes-vous sûr de vouloir supprimer ce projet et toutes ses données ?
+text_subprojects_destroy_warning: 'Ses sous-projets: %s seront également supprimés.'
 text_workflow_edit: Sélectionner un tracker et un rôle pour éditer le workflow
 text_are_you_sure: Etes-vous sûr ?
 text_journal_changed: changé de %s à %s
diff --git a/lang/he.yml b/lang/he.yml
index 0cde264f7..a611c8c39 100644
--- a/lang/he.yml
+++ b/lang/he.yml
@@ -617,3 +617,4 @@ label_overall_activity: פעילות כוללת
 setting_default_projects_public: פרויקטים חדשים הינם פומביים כברירת מחדל
 error_scm_annotate: "הכניסה לא קיימת או שלא ניתן לתאר אותה."
 label_planning: תכנון
+text_subprojects_destroy_warning: 'Its subproject(s): %s will be also deleted.'
diff --git a/lang/it.yml b/lang/it.yml
index 7e9345b30..3d1dea09e 100644
--- a/lang/it.yml
+++ b/lang/it.yml
@@ -617,3 +617,4 @@ label_overall_activity: Overall activity
 setting_default_projects_public: New projects are public by default
 error_scm_annotate: "The entry does not exist or can not be annotated."
 label_planning: Planning
+text_subprojects_destroy_warning: 'Its subproject(s): %s will be also deleted.'
diff --git a/lang/ja.yml b/lang/ja.yml
index 44d0c3ebd..680d29836 100644
--- a/lang/ja.yml
+++ b/lang/ja.yml
@@ -618,3 +618,4 @@ label_overall_activity: 全ての活動
 setting_default_projects_public: デフォルトで新しいプロジェクトは公開にする
 error_scm_annotate: "エントリが存在しない、もしくはアノテートできません。"
 label_planning: 計画
+text_subprojects_destroy_warning: 'Its subproject(s): %s will be also deleted.'
diff --git a/lang/ko.yml b/lang/ko.yml
index a8b105855..4281f3881 100644
--- a/lang/ko.yml
+++ b/lang/ko.yml
@@ -617,3 +617,4 @@ label_overall_activity: Overall activity
 setting_default_projects_public: New projects are public by default
 error_scm_annotate: "The entry does not exist or can not be annotated."
 label_planning: Planning
+text_subprojects_destroy_warning: 'Its subproject(s): %s will be also deleted.'
diff --git a/lang/lt.yml b/lang/lt.yml
index 5db73d300..df7cd960b 100644
--- a/lang/lt.yml
+++ b/lang/lt.yml
@@ -618,3 +618,4 @@ label_overall_activity: Overall activity
 setting_default_projects_public: New projects are public by default
 error_scm_annotate: "The entry does not exist or can not be annotated."
 label_planning: Planning
+text_subprojects_destroy_warning: 'Its subproject(s): %s will be also deleted.'
diff --git a/lang/nl.yml b/lang/nl.yml
index 6494eae07..e487a7a6d 100644
--- a/lang/nl.yml
+++ b/lang/nl.yml
@@ -618,3 +618,4 @@ label_overall_activity: Overall activity
 setting_default_projects_public: New projects are public by default
 error_scm_annotate: "The entry does not exist or can not be annotated."
 label_planning: Planning
+text_subprojects_destroy_warning: 'Its subproject(s): %s will be also deleted.'
diff --git a/lang/no.yml b/lang/no.yml
index 25f4047ab..9ee42600b 100644
--- a/lang/no.yml
+++ b/lang/no.yml
@@ -618,3 +618,4 @@ default_activity_development: Utvikling
 enumeration_issue_priorities: Sakssprioriteringer
 enumeration_doc_categories: Dokument-kategorier
 enumeration_activities: Aktiviteter (tidssporing)
+text_subprojects_destroy_warning: 'Its subproject(s): %s will be also deleted.'
diff --git a/lang/pl.yml b/lang/pl.yml
index fdb8afaa2..81f03a62f 100644
--- a/lang/pl.yml
+++ b/lang/pl.yml
@@ -617,3 +617,4 @@ label_overall_activity: Ogólna aktywność
 setting_default_projects_public: Nowe projekty są domyślnie publiczne
 error_scm_annotate: "Wpis nie istnieje lub nie można do niego dodawać adnotacji."
 label_planning: Planning
+text_subprojects_destroy_warning: 'Its subproject(s): %s will be also deleted.'
diff --git a/lang/pt-br.yml b/lang/pt-br.yml
index 218cbab51..9facd8d19 100644
--- a/lang/pt-br.yml
+++ b/lang/pt-br.yml
@@ -617,3 +617,4 @@ label_overall_activity: Overall activity
 setting_default_projects_public: New projects are public by default
 error_scm_annotate: "The entry does not exist or can not be annotated."
 label_planning: Planning
+text_subprojects_destroy_warning: 'Its subproject(s): %s will be also deleted.'
diff --git a/lang/pt.yml b/lang/pt.yml
index e82176c56..6f51c8ed2 100644
--- a/lang/pt.yml
+++ b/lang/pt.yml
@@ -617,3 +617,4 @@ label_overall_activity: Overall activity
 setting_default_projects_public: New projects are public by default
 error_scm_annotate: "The entry does not exist or can not be annotated."
 label_planning: Planning
+text_subprojects_destroy_warning: 'Its subproject(s): %s will be also deleted.'
diff --git a/lang/ro.yml b/lang/ro.yml
index 4d26ab103..59edfeb70 100644
--- a/lang/ro.yml
+++ b/lang/ro.yml
@@ -617,3 +617,4 @@ label_overall_activity: Overall activity
 setting_default_projects_public: New projects are public by default
 error_scm_annotate: "The entry does not exist or can not be annotated."
 label_planning: Planning
+text_subprojects_destroy_warning: 'Its subproject(s): %s will be also deleted.'
diff --git a/lang/ru.yml b/lang/ru.yml
index 310ded30d..f69009847 100644
--- a/lang/ru.yml
+++ b/lang/ru.yml
@@ -621,3 +621,4 @@ label_overall_activity: Сводная активность
 setting_default_projects_public: Новые проекты являются публичными
 error_scm_annotate: "Данные отсутствуют или не могут быть подписаны."
 label_planning: Планирование
+text_subprojects_destroy_warning: 'Its subproject(s): %s will be also deleted.'
diff --git a/lang/sr.yml b/lang/sr.yml
index fa4ecd8de..d9869c362 100644
--- a/lang/sr.yml
+++ b/lang/sr.yml
@@ -618,3 +618,4 @@ label_overall_activity: Overall activity
 setting_default_projects_public: New projects are public by default
 error_scm_annotate: "The entry does not exist or can not be annotated."
 label_planning: Planning
+text_subprojects_destroy_warning: 'Its subproject(s): %s will be also deleted.'
diff --git a/lang/sv.yml b/lang/sv.yml
index e1ac6b4bc..c0f691230 100644
--- a/lang/sv.yml
+++ b/lang/sv.yml
@@ -618,3 +618,4 @@ label_overall_activity: Overall activity
 setting_default_projects_public: New projects are public by default
 error_scm_annotate: "The entry does not exist or can not be annotated."
 label_planning: Planning
+text_subprojects_destroy_warning: 'Its subproject(s): %s will be also deleted.'
diff --git a/lang/uk.yml b/lang/uk.yml
index 8fc418e67..a52a05603 100644
--- a/lang/uk.yml
+++ b/lang/uk.yml
@@ -619,3 +619,4 @@ label_overall_activity: Overall activity
 setting_default_projects_public: New projects are public by default
 error_scm_annotate: "The entry does not exist or can not be annotated."
 label_planning: Planning
+text_subprojects_destroy_warning: 'Its subproject(s): %s will be also deleted.'
diff --git a/lang/zh-tw.yml b/lang/zh-tw.yml
index e16fbe591..a0c7fafb3 100644
--- a/lang/zh-tw.yml
+++ b/lang/zh-tw.yml
@@ -618,3 +618,4 @@ default_activity_development: 開發
 enumeration_issue_priorities: 項目優先權
 enumeration_doc_categories: 文件分類
 enumeration_activities: 活動 (時間追蹤)
+text_subprojects_destroy_warning: 'Its subproject(s): %s will be also deleted.'
diff --git a/lang/zh.yml b/lang/zh.yml
index bff45a2ec..12fb8cb3e 100644
--- a/lang/zh.yml
+++ b/lang/zh.yml
@@ -618,3 +618,4 @@ default_activity_development: 开发
 enumeration_issue_priorities: 问题优先级
 enumeration_doc_categories: 文档类别
 enumeration_activities: 活动（时间跟踪）
+text_subprojects_destroy_warning: 'Its subproject(s): %s will be also deleted.'
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 1df5b213c..26f66f0b8 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -259,7 +259,7 @@ p.other-formats { text-align: right; font-size:0.9em; color: #666; }
 a.feed { background: url(../images/feed.png) no-repeat 1px 50%; padding: 2px 0px 3px 16px; }
 
 /***** Flash & error messages ****/
-#errorExplanation, div.flash, .nodata {
+#errorExplanation, div.flash, .nodata, .warning {
     padding: 4px 4px 4px 30px;
     margin-bottom: 12px;
 	font-size: 1.1em;
@@ -282,7 +282,7 @@ div.flash.notice {
 	color: #005f00;
 }
 
-.nodata {
+.nodata, .warning {
     text-align: center;
 	background-color: #FFEBC1;
 	border-color: #FDBF3B;

From 1d570a40ff1eb51c2a2c7d807c742083c6cfbde6 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sat, 26 Apr 2008 10:54:46 +0000
Subject: [PATCH 398/710] Fixed: ActiveRecord::StaleObjectError exception on
 closing a set of circular duplicate issues (#1105).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1360 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/models/issue.rb     | 2 ++
 test/unit/issue_test.rb | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/app/models/issue.rb b/app/models/issue.rb
index d6fcf53f2..d6eab02fe 100644
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -153,6 +153,8 @@ class Issue < ActiveRecord::Base
     # Close duplicates if the issue was closed
     if @issue_before_change && !@issue_before_change.closed? && self.closed?
       duplicates.each do |duplicate|
+        # Reload is need in case the duplicate was updated by a previous duplicate
+        duplicate.reload
         # Don't re-close it if it's already closed
         next if duplicate.closed?
         # Same user and notes
diff --git a/test/unit/issue_test.rb b/test/unit/issue_test.rb
index 7712b764e..3ceba1851 100644
--- a/test/unit/issue_test.rb
+++ b/test/unit/issue_test.rb
@@ -48,6 +48,8 @@ class IssueTest < Test::Unit::TestCase
     IssueRelation.create(:issue_from => issue1, :issue_to => issue2, :relation_type => IssueRelation::TYPE_DUPLICATES)
     # And 3 is a dupe of 2
     IssueRelation.create(:issue_from => issue2, :issue_to => issue3, :relation_type => IssueRelation::TYPE_DUPLICATES)
+    # And 3 is a dupe of 1 (circular duplicates)
+    IssueRelation.create(:issue_from => issue1, :issue_to => issue3, :relation_type => IssueRelation::TYPE_DUPLICATES)
     
     assert issue1.reload.duplicates.include?(issue2)
     

From a6311a960370af3606ac3a18ce1d45facf318e22 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sat, 26 Apr 2008 11:59:51 +0000
Subject: [PATCH 399/710] Estimated time recognizes improved time formats
 (#1092).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1361 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/models/issue.rb                        |  6 +++-
 app/models/time_entry.rb                   | 14 +-------
 lib/redmine.rb                             |  1 +
 lib/redmine/core_ext.rb                    |  1 +
 lib/redmine/core_ext/string.rb             |  5 +++
 lib/redmine/core_ext/string/conversions.rb | 40 ++++++++++++++++++++++
 test/unit/issue_test.rb                    |  7 ++++
 7 files changed, 60 insertions(+), 14 deletions(-)
 create mode 100644 lib/redmine/core_ext.rb
 create mode 100644 lib/redmine/core_ext/string.rb
 create mode 100644 lib/redmine/core_ext/string/conversions.rb

diff --git a/app/models/issue.rb b/app/models/issue.rb
index d6eab02fe..8082e43b7 100644
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -93,7 +93,11 @@ class Issue < ActiveRecord::Base
     self.priority = nil
     write_attribute(:priority_id, pid)
   end
-
+  
+  def estimated_hours=(h)
+    write_attribute :estimated_hours, (h.is_a?(String) ? h.to_hours : h)
+  end
+  
   def validate
     if self.due_date.nil? && @attributes['due_date'] && !@attributes['due_date'].empty?
       errors.add :due_date, :activerecord_error_not_a_date
diff --git a/app/models/time_entry.rb b/app/models/time_entry.rb
index 0dce253c7..ddaff2b60 100644
--- a/app/models/time_entry.rb
+++ b/app/models/time_entry.rb
@@ -40,19 +40,7 @@ class TimeEntry < ActiveRecord::Base
   end
   
   def hours=(h)
-    s = h.dup
-    if s.is_a?(String)
-      s.strip!
-      unless s =~ %r{^[\d\.,]+$}
-        # 2:30 => 2.5
-        s.gsub!(%r{^(\d+):(\d+)$}) { $1.to_i + $2.to_i / 60.0 }
-        # 2h30, 2h, 30m
-        s.gsub!(%r{^((\d+)\s*(h|hours?))?\s*((\d+)\s*(m|min)?)?$}) { |m| ($1 || $4) ? ($2.to_i + $5.to_i / 60.0) : m[0] }
-      end
-      # 2,5 => 2.5
-      s.gsub!(',', '.')
-    end
-    write_attribute :hours, s
+    write_attribute :hours, (h.is_a?(String) ? h.to_hours : h)
   end
   
   # tyear, tmonth, tweek assigned where setting spent_on attributes
diff --git a/lib/redmine.rb b/lib/redmine.rb
index 5443eef4a..2697e8f5f 100644
--- a/lib/redmine.rb
+++ b/lib/redmine.rb
@@ -1,6 +1,7 @@
 require 'redmine/access_control'
 require 'redmine/menu_manager'
 require 'redmine/mime_type'
+require 'redmine/core_ext'
 require 'redmine/themes'
 require 'redmine/plugin'
 
diff --git a/lib/redmine/core_ext.rb b/lib/redmine/core_ext.rb
new file mode 100644
index 000000000..573313e74
--- /dev/null
+++ b/lib/redmine/core_ext.rb
@@ -0,0 +1 @@
+Dir[File.dirname(__FILE__) + "/core_ext/*.rb"].each { |file| require(file) }
diff --git a/lib/redmine/core_ext/string.rb b/lib/redmine/core_ext/string.rb
new file mode 100644
index 000000000..ce2646fb9
--- /dev/null
+++ b/lib/redmine/core_ext/string.rb
@@ -0,0 +1,5 @@
+require File.dirname(__FILE__) + '/string/conversions'
+
+class String #:nodoc:
+  include Redmine::CoreExtensions::String::Conversions
+end
diff --git a/lib/redmine/core_ext/string/conversions.rb b/lib/redmine/core_ext/string/conversions.rb
new file mode 100644
index 000000000..7444445b0
--- /dev/null
+++ b/lib/redmine/core_ext/string/conversions.rb
@@ -0,0 +1,40 @@
+# redMine - project management software
+# Copyright (C) 2008  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 Redmine #:nodoc:
+  module CoreExtensions #:nodoc:
+    module String #:nodoc:
+      # Custom string conversions
+      module Conversions
+        # Parses hours format and returns a float
+        def to_hours
+          s = self.dup
+          s.strip!
+          unless s =~ %r{^[\d\.,]+$}
+            # 2:30 => 2.5
+            s.gsub!(%r{^(\d+):(\d+)$}) { $1.to_i + $2.to_i / 60.0 }
+            # 2h30, 2h, 30m => 2.5, 2, 0.5
+            s.gsub!(%r{^((\d+)\s*(h|hours?))?\s*((\d+)\s*(m|min)?)?$}) { |m| ($1 || $4) ? ($2.to_i + $5.to_i / 60.0) : m[0] }
+          end
+          # 2,5 => 2.5
+          s.gsub!(',', '.')
+          s.to_f
+        end
+      end
+    end
+  end
+end
diff --git a/test/unit/issue_test.rb b/test/unit/issue_test.rb
index 3ceba1851..36ba1fb45 100644
--- a/test/unit/issue_test.rb
+++ b/test/unit/issue_test.rb
@@ -20,6 +20,13 @@ require File.dirname(__FILE__) + '/../test_helper'
 class IssueTest < Test::Unit::TestCase
   fixtures :projects, :users, :members, :trackers, :projects_trackers, :issue_statuses, :issue_categories, :enumerations, :issues, :custom_fields, :custom_values, :time_entries
 
+  def test_create
+    issue = Issue.new(:project_id => 1, :tracker_id => 1, :author_id => 3, :status_id => 1, :priority => Enumeration.get_values('IPRI').first, :subject => 'test_create', :description => 'IssueTest#test_create', :estimated_hours => '1:30')
+    assert issue.save
+    issue.reload
+    assert_equal 1.5, issue.estimated_hours
+  end
+  
   def test_category_based_assignment
     issue = Issue.create(:project_id => 1, :tracker_id => 1, :author_id => 3, :status_id => 1, :priority => Enumeration.get_values('IPRI').first, :subject => 'Assignment test', :description => 'Assignment test', :category_id => 1)
     assert_equal IssueCategory.find(1).assigned_to, issue.assigned_to

From 64474802f9dd6ad97aaf00e795fa1489c0af0042 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sat, 26 Apr 2008 16:55:24 +0000
Subject: [PATCH 400/710] Fixes custom field filters behaviour (#1078).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1362 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/models/query.rb     | 6 +++---
 test/unit/query_test.rb | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/models/query.rb b/app/models/query.rb
index c54c143e2..641c0d17b 100644
--- a/app/models/query.rb
+++ b/app/models/query.rb
@@ -301,7 +301,7 @@ class Query < ActiveRecord::Base
         # custom field
         db_table = CustomValue.table_name
         db_field = 'value'
-        sql << "#{Issue.table_name}.id IN (SELECT #{db_table}.customized_id FROM #{db_table} where #{db_table}.customized_type='Issue' AND #{db_table}.customized_id=#{Issue.table_name}.id AND #{db_table}.custom_field_id=#{$1} AND "
+        sql << "#{Issue.table_name}.id IN (SELECT #{Issue.table_name}.id FROM #{Issue.table_name} LEFT OUTER JOIN #{db_table} ON #{db_table}.customized_type='Issue' AND #{db_table}.customized_id=#{Issue.table_name}.id AND #{db_table}.custom_field_id=#{$1} WHERE "
       else
         # regular field
         db_table = Issue.table_name
@@ -320,9 +320,9 @@ class Query < ActiveRecord::Base
       when "!"
         sql = sql + "(#{db_table}.#{db_field} IS NULL OR #{db_table}.#{db_field} NOT IN (" + v.collect{|val| "'#{connection.quote_string(val)}'"}.join(",") + "))"
       when "!*"
-        sql = sql + "#{db_table}.#{db_field} IS NULL"
+        sql = sql + "#{db_table}.#{db_field} IS NULL OR #{db_table}.#{db_field} = ''"
       when "*"
-        sql = sql + "#{db_table}.#{db_field} IS NOT NULL"
+        sql = sql + "#{db_table}.#{db_field} IS NOT NULL AND #{db_table}.#{db_field} <> ''"
       when ">="
         sql = sql + "#{db_table}.#{db_field} >= #{v.first.to_i}"
       when "<="
diff --git a/test/unit/query_test.rb b/test/unit/query_test.rb
index 3a9d19112..d291018fb 100644
--- a/test/unit/query_test.rb
+++ b/test/unit/query_test.rb
@@ -23,7 +23,7 @@ class QueryTest < Test::Unit::TestCase
   def test_query_with_multiple_custom_fields
     query = Query.find(1)
     assert query.valid?
-    assert query.statement.include?("custom_values.value IN ('MySQL')")
+    assert query.statement.include?("#{CustomValue.table_name}.value IN ('MySQL')")
     issues = Issue.find :all,:include => [ :assigned_to, :status, :tracker, :project, :priority ], :conditions => query.statement
     assert_equal 1, issues.length
     assert_equal Issue.find(3), issues.first

From ffbdc6b25bdce8abe83ee165b7a2ad6c7171f74b Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sat, 26 Apr 2008 17:56:26 +0000
Subject: [PATCH 401/710] Postgresql 8.3 compatibility fix (#834).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1363 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/models/changeset.rb                 |  4 ++++
 test/unit/changeset_test.rb             | 12 ++++++------
 test/unit/repository_bazaar_test.rb     |  4 ++--
 test/unit/repository_darcs_test.rb      |  4 ++--
 test/unit/repository_mercurial_test.rb  |  4 ++--
 test/unit/repository_subversion_test.rb |  4 ++--
 6 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/app/models/changeset.rb b/app/models/changeset.rb
index ce9ea28ca..3e95ce111 100644
--- a/app/models/changeset.rb
+++ b/app/models/changeset.rb
@@ -35,6 +35,10 @@ class Changeset < ActiveRecord::Base
   validates_uniqueness_of :revision, :scope => :repository_id
   validates_uniqueness_of :scmid, :scope => :repository_id, :allow_nil => true
   
+  def revision=(r)
+    write_attribute :revision, (r.nil? ? nil : r.to_s)
+  end
+  
   def comments=(comment)
     write_attribute(:comments, comment.strip)
   end
diff --git a/test/unit/changeset_test.rb b/test/unit/changeset_test.rb
index 2442a8b8c..bbfe6952d 100644
--- a/test/unit/changeset_test.rb
+++ b/test/unit/changeset_test.rb
@@ -41,22 +41,22 @@ class ChangesetTest < Test::Unit::TestCase
   end
 
   def test_previous
-    changeset = Changeset.find_by_revision(3)
-    assert_equal Changeset.find_by_revision(2), changeset.previous
+    changeset = Changeset.find_by_revision('3')
+    assert_equal Changeset.find_by_revision('2'), changeset.previous
   end
 
   def test_previous_nil
-    changeset = Changeset.find_by_revision(1)
+    changeset = Changeset.find_by_revision('1')
     assert_nil changeset.previous
   end
 
   def test_next
-    changeset = Changeset.find_by_revision(2)
-    assert_equal Changeset.find_by_revision(3), changeset.next
+    changeset = Changeset.find_by_revision('2')
+    assert_equal Changeset.find_by_revision('3'), changeset.next
   end
 
   def test_next_nil
-    changeset = Changeset.find_by_revision(4)
+    changeset = Changeset.find_by_revision('4')
     assert_nil changeset.next
   end
 end
diff --git a/test/unit/repository_bazaar_test.rb b/test/unit/repository_bazaar_test.rb
index 15fcc8672..b7a3cf98e 100644
--- a/test/unit/repository_bazaar_test.rb
+++ b/test/unit/repository_bazaar_test.rb
@@ -36,13 +36,13 @@ class RepositoryBazaarTest < Test::Unit::TestCase
       
       assert_equal 4, @repository.changesets.count
       assert_equal 9, @repository.changes.count
-      assert_equal 'Initial import', @repository.changesets.find_by_revision(1).comments
+      assert_equal 'Initial import', @repository.changesets.find_by_revision('1').comments
     end
     
     def test_fetch_changesets_incremental
       @repository.fetch_changesets
       # Remove changesets with revision > 5
-      @repository.changesets.find(:all, :conditions => 'revision > 2').each(&:destroy)
+      @repository.changesets.find(:all).each {|c| c.destroy if c.revision.to_i > 2}
       @repository.reload
       assert_equal 2, @repository.changesets.count
       
diff --git a/test/unit/repository_darcs_test.rb b/test/unit/repository_darcs_test.rb
index 1228976f1..1c8c1b8dd 100644
--- a/test/unit/repository_darcs_test.rb
+++ b/test/unit/repository_darcs_test.rb
@@ -35,13 +35,13 @@ class RepositoryDarcsTest < Test::Unit::TestCase
       
       assert_equal 6, @repository.changesets.count
       assert_equal 13, @repository.changes.count
-      assert_equal "Initial commit.", @repository.changesets.find_by_revision(1).comments
+      assert_equal "Initial commit.", @repository.changesets.find_by_revision('1').comments
     end
     
     def test_fetch_changesets_incremental
       @repository.fetch_changesets
       # Remove changesets with revision > 3
-      @repository.changesets.find(:all, :conditions => 'revision > 3').each(&:destroy)
+      @repository.changesets.find(:all).each {|c| c.destroy if c.revision.to_i > 3}
       @repository.reload
       assert_equal 3, @repository.changesets.count
       
diff --git a/test/unit/repository_mercurial_test.rb b/test/unit/repository_mercurial_test.rb
index e6cfdf9b2..21ddf1e3a 100644
--- a/test/unit/repository_mercurial_test.rb
+++ b/test/unit/repository_mercurial_test.rb
@@ -35,13 +35,13 @@ class RepositoryMercurialTest < Test::Unit::TestCase
       
       assert_equal 6, @repository.changesets.count
       assert_equal 11, @repository.changes.count
-      assert_equal "Initial import.\nThe repository contains 3 files.", @repository.changesets.find_by_revision(0).comments
+      assert_equal "Initial import.\nThe repository contains 3 files.", @repository.changesets.find_by_revision('0').comments
     end
     
     def test_fetch_changesets_incremental
       @repository.fetch_changesets
       # Remove changesets with revision > 2
-      @repository.changesets.find(:all, :conditions => 'revision > 2').each(&:destroy)
+      @repository.changesets.find(:all).each {|c| c.destroy if c.revision.to_i > 2}
       @repository.reload
       assert_equal 3, @repository.changesets.count
       
diff --git a/test/unit/repository_subversion_test.rb b/test/unit/repository_subversion_test.rb
index 879feece8..7a1c9df4a 100644
--- a/test/unit/repository_subversion_test.rb
+++ b/test/unit/repository_subversion_test.rb
@@ -35,13 +35,13 @@ class RepositorySubversionTest < Test::Unit::TestCase
       
       assert_equal 8, @repository.changesets.count
       assert_equal 16, @repository.changes.count
-      assert_equal 'Initial import.', @repository.changesets.find_by_revision(1).comments
+      assert_equal 'Initial import.', @repository.changesets.find_by_revision('1').comments
     end
     
     def test_fetch_changesets_incremental
       @repository.fetch_changesets
       # Remove changesets with revision > 5
-      @repository.changesets.find(:all, :conditions => 'revision > 5').each(&:destroy)
+      @repository.changesets.find(:all).each {|c| c.destroy if c.revision.to_i > 5}
       @repository.reload
       assert_equal 5, @repository.changesets.count
       

From 6a3236daea38f0cf8b62ccf9f1212eb0f0395b08 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 27 Apr 2008 08:20:53 +0000
Subject: [PATCH 402/710] Include subprojects versions on calendar and gantt
 (#1116).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1364 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/projects_controller.rb |  6 ++++--
 app/models/project.rb                  |  8 +++++---
 app/views/common/_calendar.rhtml       |  7 +++++--
 app/views/projects/gantt.rhtml         | 10 +++++++---
 4 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 8bdcea8d7..b71ec1ecd 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -341,8 +341,9 @@ class ProjectsController < ApplicationController
                            :include => [:tracker, :status, :assigned_to, :priority, :project], 
                            :conditions => ["((start_date BETWEEN ? AND ?) OR (due_date BETWEEN ? AND ?)) AND #{Issue.table_name}.tracker_id IN (#{@selected_tracker_ids.join(',')})", @calendar.startdt, @calendar.enddt, @calendar.startdt, @calendar.enddt]
                            ) unless @selected_tracker_ids.empty?
+      events += Version.find(:all, :include => :project,
+                                   :conditions => ["effective_date BETWEEN ? AND ?", @calendar.startdt, @calendar.enddt])
     end
-    events += @project.versions.find(:all, :conditions => ["effective_date BETWEEN ? AND ?", @calendar.startdt, @calendar.enddt])
     @calendar.events = events
     
     render :layout => false if request.xhr?
@@ -386,8 +387,9 @@ class ProjectsController < ApplicationController
                            :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?
+      @events += Version.find(:all, :include => :project,
+                                    :conditions => ["effective_date BETWEEN ? AND ?", @date_from, @date_to])
     end
-    @events += @project.versions.find(:all, :conditions => ["effective_date BETWEEN ? AND ?", @date_from, @date_to])
     @events.sort! {|x,y| x.start_date <=> y.start_date }
     
     if params[:format]=='pdf'
diff --git a/app/models/project.rb b/app/models/project.rb
index eaa33c969..964469649 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -75,12 +75,14 @@ class Project < ActiveRecord::Base
     conditions = nil
     if include_subprojects && !active_children.empty?
       ids = [id] + active_children.collect {|c| c.id}
-      conditions = ["#{Issue.table_name}.project_id IN (#{ids.join(',')})"]
+      conditions = ["#{Project.table_name}.id IN (#{ids.join(',')})"]
     end
-    conditions ||= ["#{Issue.table_name}.project_id = ?", id]
+    conditions ||= ["#{Project.table_name}.id = ?", id]
     # Quick and dirty fix for Rails 2 compatibility
     Issue.send(:with_scope, :find => { :conditions => conditions }) do 
-      yield
+      Version.send(:with_scope, :find => { :conditions => conditions }) do
+        yield
+      end
     end 
   end
 
diff --git a/app/views/common/_calendar.rhtml b/app/views/common/_calendar.rhtml
index 7534a1223..1095cd501 100644
--- a/app/views/common/_calendar.rhtml
+++ b/app/views/common/_calendar.rhtml
@@ -19,12 +19,15 @@ while day <= calendar.enddt %>
       elsif day == i.due_date
 		image_tag('arrow_to.png') 
       end %>
-  <%= h("#{i.project.name} -") unless @project && @project == i.project %>
+  <%= h("#{i.project} -") unless @project && @project == i.project %>
   <%= link_to_issue i %>: <%= h(truncate(i.subject, 30)) %>
   <span class="tip"><%= render_issue_tooltip i %></span>
   </div>
   <% else %>
-  <%= link_to_version i, :class => "icon icon-package" %>
+  <span class="icon icon-package">  
+    <%= h("#{i.project} -") unless @project && @project == i.project %>
+    <%= link_to_version i%>
+  </span>
   <% end %>
 <% end %>
 </td>
diff --git a/app/views/projects/gantt.rhtml b/app/views/projects/gantt.rhtml
index 05bd4b9bc..d941d2777 100644
--- a/app/views/projects/gantt.rhtml
+++ b/app/views/projects/gantt.rhtml
@@ -70,10 +70,13 @@ top = headers_height + 8
 @events.each do |i| %>
     <div style="position: absolute;line-height:1.2em;height:16px;top:<%= top %>px;left:4px;overflow:hidden;"><small>    
     <% if i.is_a? Issue %>
-      	<%= h("#{i.project.name} -") unless @project && @project == i.project %>
+      	<%= h("#{i.project} -") unless @project && @project == i.project %>
       	<%= link_to_issue i %>:	<%=h i.subject %>
   	<% else %>
-      	<%= link_to_version i, :class => "icon icon-package" %>
+		<span class="icon icon-package">
+	      	<%= h("#{i.project} -") unless @project && @project == i.project %>
+	      	<%= link_to_version i %>
+		</span>
   	<% end %>  	
   	</small></div>
     <% top = top + 20
@@ -197,7 +200,8 @@ top = headers_height + 10
     %>
     <div style="top:<%= top %>px;left:<%= i_left %>px;width:15px;" class="task milestone">&nbsp;</div>
 	<div style="top:<%= top %>px;left:<%= i_left + 12 %>px;background:#fff;" class="task">
-	<strong><%= i.name %></strong>
+		<%= h("#{i.project} -") unless @project && @project == i.project %>
+		<strong><%=h i %></strong>
 	</div>
 <% end %>
 	<% top = top + 20

From a73f68a185df00db1aaa153f576f106ee752c54d Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 27 Apr 2008 10:12:15 +0000
Subject: [PATCH 403/710] Fixed: Links to repository directories don't work
 (#1119).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1365 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/repositories_controller.rb          |  9 ++++++++-
 lib/redmine/scm/adapters/abstract_adapter.rb        | 13 +++++++++++--
 lib/redmine/scm/adapters/bazaar_adapter.rb          | 12 ------------
 lib/redmine/scm/adapters/cvs_adapter.rb             |  9 ---------
 lib/redmine/scm/adapters/darcs_adapter.rb           |  7 -------
 lib/redmine/scm/adapters/git_adapter.rb             |  8 --------
 lib/redmine/scm/adapters/mercurial_adapter.rb       |  8 --------
 lib/redmine/scm/adapters/subversion_adapter.rb      |  7 -------
 .../repositories_bazaar_controller_test.rb          |  8 ++++++++
 test/functional/repositories_cvs_controller_test.rb |  8 ++++++++
 test/functional/repositories_git_controller_test.rb |  8 ++++++++
 .../repositories_mercurial_controller_test.rb       | 10 +++++++++-
 .../repositories_subversion_controller_test.rb      |  8 ++++++++
 13 files changed, 60 insertions(+), 55 deletions(-)

diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb
index 198a9766c..64eb05793 100644
--- a/app/controllers/repositories_controller.rb
+++ b/app/controllers/repositories_controller.rb
@@ -65,7 +65,8 @@ class RepositoriesController < ApplicationController
     if request.xhr?
       @entries ? render(:partial => 'dir_list_content') : render(:nothing => true)
     else
-      show_error_not_found unless @entries
+      show_error_not_found and return unless @entries
+      render :action => 'browse'
     end
   rescue Redmine::Scm::Adapters::CommandFailed => e
     show_error_command_failed(e.message)
@@ -95,6 +96,12 @@ class RepositoriesController < ApplicationController
   end
   
   def entry
+    @entry = @repository.scm.entry(@path, @rev)
+    show_error_not_found and return unless @entry
+    
+    # If the entry is a dir, show the browser
+    browse and return if @entry.is_dir?
+    
     @content = @repository.scm.cat(@path, @rev)
     show_error_not_found and return unless @content
     if 'raw' == params[:format] || @content.is_binary_data?
diff --git a/lib/redmine/scm/adapters/abstract_adapter.rb b/lib/redmine/scm/adapters/abstract_adapter.rb
index 41edf00ad..2c254d48d 100644
--- a/lib/redmine/scm/adapters/abstract_adapter.rb
+++ b/lib/redmine/scm/adapters/abstract_adapter.rb
@@ -59,8 +59,17 @@ module Redmine
         # 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
+          parts = path.to_s.split(%r{[\/\\]}).select {|n| !n.blank?}
+          search_path = parts[0..-2].join('/')
+          search_name = parts[-1]
+          if search_path.blank? && search_name.blank?
+            # Root entry
+            Entry.new(:path => '', :kind => 'dir')
+          else
+            # Search for the entry in the parent directory
+            es = entries(search_path, identifier)
+            es ? es.detect {|e| e.name == search_name} : nil
+          end
         end
         
         # Returns an Entries collection
diff --git a/lib/redmine/scm/adapters/bazaar_adapter.rb b/lib/redmine/scm/adapters/bazaar_adapter.rb
index 11a44b7cf..2225a627c 100644
--- a/lib/redmine/scm/adapters/bazaar_adapter.rb
+++ b/lib/redmine/scm/adapters/bazaar_adapter.rb
@@ -44,18 +44,6 @@ module Redmine
           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)
-          path ||= ''
-          parts = path.split(%r{[\/\\]}).select {|p| !p.blank?}
-          if parts.size > 0
-            parent = parts[0..-2].join('/')
-            entries = entries(parent, identifier)
-            entries ? entries.detect {|e| e.name == parts.last} : nil
-          end
-        end
-        
         # Returns an Entries collection
         # or nil if the given path doesn't exist in the repository
         def entries(path=nil, identifier=nil)
diff --git a/lib/redmine/scm/adapters/cvs_adapter.rb b/lib/redmine/scm/adapters/cvs_adapter.rb
index 6085bfdbe..37920b599 100644
--- a/lib/redmine/scm/adapters/cvs_adapter.rb
+++ b/lib/redmine/scm/adapters/cvs_adapter.rb
@@ -55,15 +55,6 @@ module Redmine
         def get_previous_revision(revision)
           CvsRevisionHelper.new(revision).prevRev
         end
-        
-        # Returns the entry identified by path and revision identifier
-        # or nil if entry doesn't exist in the repository
-        # this method returns all revisions from one single SCM-Entry
-        def entry(path=nil, identifier="HEAD")
-          e = entries(path, identifier)
-          logger.debug("<cvs-result> #{e.first.inspect}") if e
-          e ? e.first : nil
-        end    
     
         # Returns an Entries collection
         # or nil if the given path doesn't exist in the repository
diff --git a/lib/redmine/scm/adapters/darcs_adapter.rb b/lib/redmine/scm/adapters/darcs_adapter.rb
index 660b6cf8f..a1d1867b1 100644
--- a/lib/redmine/scm/adapters/darcs_adapter.rb
+++ b/lib/redmine/scm/adapters/darcs_adapter.rb
@@ -40,13 +40,6 @@ module Redmine
           rev ? Info.new({:root_url => @url, :lastrev => rev.last}) : 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)
diff --git a/lib/redmine/scm/adapters/git_adapter.rb b/lib/redmine/scm/adapters/git_adapter.rb
index 5d315b0cc..77604f283 100644
--- a/lib/redmine/scm/adapters/git_adapter.rb
+++ b/lib/redmine/scm/adapters/git_adapter.rb
@@ -132,14 +132,6 @@ module Redmine
           entries.sort_by_name
         end
         
-        def entry(path=nil, identifier=nil)
-          path ||= ''
-          search_path = path.split('/')[0..-2].join('/')
-          entry_name = path.split('/').last
-          e = entries(search_path, identifier)
-          e ? e.detect{|entry| entry.name == entry_name} : nil
-        end
-        
         def revisions(path, identifier_from, identifier_to, options={})
           revisions = Revisions.new
           cmd = "#{GIT_BIN} --git-dir #{target('')} log --raw "
diff --git a/lib/redmine/scm/adapters/mercurial_adapter.rb b/lib/redmine/scm/adapters/mercurial_adapter.rb
index 72db723ba..6f42dda06 100644
--- a/lib/redmine/scm/adapters/mercurial_adapter.rb
+++ b/lib/redmine/scm/adapters/mercurial_adapter.rb
@@ -59,14 +59,6 @@ module Redmine
           return nil if $? && $?.exitstatus != 0
           entries.sort_by_name
         end
-  
-        def entry(path=nil, identifier=nil)
-          path ||= ''
-          search_path = path.split('/')[0..-2].join('/')
-          entry_name = path.split('/').last
-          e = entries(search_path, identifier)
-          e ? e.detect{|entry| entry.name == entry_name} : nil
-        end
           
         def revisions(path=nil, identifier_from=nil, identifier_to=nil, options={})
           revisions = Revisions.new
diff --git a/lib/redmine/scm/adapters/subversion_adapter.rb b/lib/redmine/scm/adapters/subversion_adapter.rb
index efbd3ba8e..40c7eb3f1 100644
--- a/lib/redmine/scm/adapters/subversion_adapter.rb
+++ b/lib/redmine/scm/adapters/subversion_adapter.rb
@@ -51,13 +51,6 @@ module Redmine
           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)
diff --git a/test/functional/repositories_bazaar_controller_test.rb b/test/functional/repositories_bazaar_controller_test.rb
index 5a473bab3..acb6c1d21 100644
--- a/test/functional/repositories_bazaar_controller_test.rb
+++ b/test/functional/repositories_bazaar_controller_test.rb
@@ -99,6 +99,14 @@ class RepositoriesBazaarControllerTest < Test::Unit::TestCase
       assert @response.body.include?('Show help message')
     end
   
+    def test_directory_entry
+      get :entry, :id => 3, :path => ['directory']
+      assert_response :success
+      assert_template 'browse'
+      assert_not_nil assigns(:entry)
+      assert_equal 'directory', assigns(:entry).name
+    end
+
     def test_diff
       # Full diff of changeset 3
       get :diff, :id => 3, :rev => 3
diff --git a/test/functional/repositories_cvs_controller_test.rb b/test/functional/repositories_cvs_controller_test.rb
index d6181ad36..e12bb53ac 100644
--- a/test/functional/repositories_cvs_controller_test.rb
+++ b/test/functional/repositories_cvs_controller_test.rb
@@ -101,6 +101,14 @@ class RepositoriesCvsControllerTest < Test::Unit::TestCase
       get :entry, :id => 1, :path => ['sources', 'watchers_controller.rb'], :format => 'raw'
       assert_response :success
     end
+
+    def test_directory_entry
+      get :entry, :id => 1, :path => ['sources']
+      assert_response :success
+      assert_template 'browse'
+      assert_not_nil assigns(:entry)
+      assert_equal 'sources', assigns(:entry).name
+    end
     
     def test_diff
       Project.find(1).repository.fetch_changesets
diff --git a/test/functional/repositories_git_controller_test.rb b/test/functional/repositories_git_controller_test.rb
index 10a4950f3..339e22897 100644
--- a/test/functional/repositories_git_controller_test.rb
+++ b/test/functional/repositories_git_controller_test.rb
@@ -101,6 +101,14 @@ class RepositoriesGitControllerTest < Test::Unit::TestCase
       assert @response.body.include?('WITHOUT ANY WARRANTY')
     end
   
+    def test_directory_entry
+      get :entry, :id => 3, :path => ['sources']
+      assert_response :success
+      assert_template 'browse'
+      assert_not_nil assigns(:entry)
+      assert_equal 'sources', assigns(:entry).name
+    end
+    
     def test_diff
       # Full diff of changeset 2f9c0091
       get :diff, :id => 3, :rev => '2f9c0091c754a91af7a9c478e36556b4bde8dcf7'
diff --git a/test/functional/repositories_mercurial_controller_test.rb b/test/functional/repositories_mercurial_controller_test.rb
index b09265d13..cb870aa32 100644
--- a/test/functional/repositories_mercurial_controller_test.rb
+++ b/test/functional/repositories_mercurial_controller_test.rb
@@ -99,7 +99,15 @@ class RepositoriesMercurialControllerTest < Test::Unit::TestCase
       # File content
       assert @response.body.include?('WITHOUT ANY WARRANTY')
     end
-  
+
+    def test_directory_entry
+      get :entry, :id => 3, :path => ['sources']
+      assert_response :success
+      assert_template 'browse'
+      assert_not_nil assigns(:entry)
+      assert_equal 'sources', assigns(:entry).name
+    end
+    
     def test_diff
       # Full diff of changeset 4
       get :diff, :id => 3, :rev => 4
diff --git a/test/functional/repositories_subversion_controller_test.rb b/test/functional/repositories_subversion_controller_test.rb
index adb69c8e9..dd56947fc 100644
--- a/test/functional/repositories_subversion_controller_test.rb
+++ b/test/functional/repositories_subversion_controller_test.rb
@@ -89,6 +89,14 @@ class RepositoriesSubversionControllerTest < Test::Unit::TestCase
       assert_response :success
     end
     
+    def test_directory_entry
+      get :entry, :id => 1, :path => ['subversion_test', 'folder']
+      assert_response :success
+      assert_template 'browse'
+      assert_not_nil assigns(:entry)
+      assert_equal 'folder', assigns(:entry).name
+    end
+    
     def test_diff
       get :diff, :id => 1, :rev => 3
       assert_response :success

From c72b53a8fa3c01ff0a80b34317fef80d97ee9c97 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 27 Apr 2008 16:34:42 +0000
Subject: [PATCH 404/710] Forces Redmine to use rails 2.0.2 gem when
 vendor/rails is not present. If you don't want to upgrade rails gem, freeze
 Redmine by running the following command in your Redmine directory:

  rake rails:freeze:edge TAG=rel_2-0-2

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1366 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 config/environment.rb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/config/environment.rb b/config/environment.rb
index 2d581168b..7878eca47 100644
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -4,6 +4,9 @@
 # you don't control web/app server and can't set it the proper way
 # ENV['RAILS_ENV'] ||= 'production'
 
+# Specifies gem version of Rails to use when vendor/rails is not present
+RAILS_GEM_VERSION = '2.0.2' unless defined? RAILS_GEM_VERSION
+
 # Bootstrap the Rails environment, frameworks, and default configuration
 require File.join(File.dirname(__FILE__), 'boot')
 

From 67e7758185c6344f95eb9d071b869cdcb0ef9ed5 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Mon, 28 Apr 2008 08:52:35 +0000
Subject: [PATCH 405/710] Translation updates (closes #1123, #1124): * Spanish
 (Gumer Coronel) * Norvegian (Kai Olav Fredriksen)

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1367 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 lang/es.yml | 6 +++---
 lang/no.yml | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lang/es.yml b/lang/es.yml
index 7ce4a7a8a..c6eef021a 100644
--- a/lang/es.yml
+++ b/lang/es.yml
@@ -432,7 +432,7 @@ button_move: Mover
 button_back: Atrás
 button_cancel: Cancelar
 button_activate: Activar
-button_sort: Clasificar
+button_sort: Ordenar
 button_log_time: Tiempo dedicado
 button_rollback: Volver a esta versión
 button_watch: Monitorizar
@@ -448,7 +448,7 @@ status_locked: bloqueado
 text_select_mail_notifications: Seleccionar los eventos a notificar
 text_regexp_info: eg. ^[A-Z0-9]+$
 text_min_max_length_info: 0 para ninguna restricción
-text_project_destroy_confirmation: ¿ Estás seguro de querer eliminar el proyecto ?
+text_project_destroy_confirmation: ¿Estás seguro de querer eliminar el proyecto?
 text_workflow_edit: Seleccionar un flujo de trabajo para actualizar
 text_are_you_sure: ¿ Estás seguro ?
 text_journal_changed: cambiado de %s a %s
@@ -620,4 +620,4 @@ label_overall_activity: Actividad global
 setting_default_projects_public: Los proyectos nuevos son públicos por defecto 
 error_scm_annotate: "No existe la entrada o no ha podido ser anotada"
 label_planning: Planificación
-text_subprojects_destroy_warning: 'Its subproject(s): %s will be also deleted.'
+text_subprojects_destroy_warning: 'Sus subprojectos: %s también se eliminarán' 
diff --git a/lang/no.yml b/lang/no.yml
index 9ee42600b..22b8c10af 100644
--- a/lang/no.yml
+++ b/lang/no.yml
@@ -165,7 +165,7 @@ field_url: URL
 field_start_page: Startside
 field_subproject: Underprosjekt
 field_hours: Timer
-field_activity: Activitet
+field_activity: Aktivitet
 field_spent_on: Dato
 field_identifier: Identifikasjon
 field_is_filter: Brukes som filter
@@ -282,7 +282,7 @@ label_last_updates: Sist oppdatert
 label_last_updates_plural: %d siste oppdaterte
 label_registered_on: Registrert
 label_activity: Aktivitet
-label_overall_activity: Total aktivitet
+label_overall_activity: All aktivitet
 label_new: Ny
 label_logged_as: Innlogget som
 label_environment: Miljø
@@ -557,6 +557,7 @@ text_select_mail_notifications: Velg hendelser som skal varsles med e-post.
 text_regexp_info: eg. ^[A-Z0-9]+$
 text_min_max_length_info: 0 betyr ingen begrensning
 text_project_destroy_confirmation: Er du sikker på at du vil slette dette prosjekter og alle relatert data ?
+text_subprojects_destroy_warning: 'Underprojekt(ene): %s vil også bli slettet.'
 text_workflow_edit: Velg en rolle og en sakstype for å endre arbeidsflyten
 text_are_you_sure: Er du sikker ?
 text_journal_changed: endret fra %s til %s
@@ -618,4 +619,3 @@ default_activity_development: Utvikling
 enumeration_issue_priorities: Sakssprioriteringer
 enumeration_doc_categories: Dokument-kategorier
 enumeration_activities: Aktiviteter (tidssporing)
-text_subprojects_destroy_warning: 'Its subproject(s): %s will be also deleted.'

From e55c1d82e633c692324c9b0289ffeeb15b11e383 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Mon, 28 Apr 2008 09:25:51 +0000
Subject: [PATCH 406/710] Notify project members when a message is posted if
 they want to receive notifications for everything on the project (#1079).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1368 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/models/message_observer.rb              |  2 ++
 test/functional/messages_controller_test.rb | 12 ++++++++++++
 2 files changed, 14 insertions(+)

diff --git a/app/models/message_observer.rb b/app/models/message_observer.rb
index c26805c1b..043988172 100644
--- a/app/models/message_observer.rb
+++ b/app/models/message_observer.rb
@@ -21,6 +21,8 @@ class MessageObserver < ActiveRecord::Observer
     recipients = ([message.root] + message.root.children).collect {|m| m.author.mail if m.author && m.author.active?}
     # send notification to the board watchers
     recipients += message.board.watcher_recipients
+    # send notification to project members who want to be notified
+    recipients += message.board.project.recipients
     recipients = recipients.compact.uniq
     Mailer.deliver_message_posted(message, recipients) if !recipients.empty? && Setting.notified_events.include?('message_posted')
   end
diff --git a/test/functional/messages_controller_test.rb b/test/functional/messages_controller_test.rb
index dcfe0caa7..1fe8d086a 100644
--- a/test/functional/messages_controller_test.rb
+++ b/test/functional/messages_controller_test.rb
@@ -54,6 +54,9 @@ class MessagesControllerTest < Test::Unit::TestCase
   
   def test_post_new
     @request.session[:user_id] = 2
+    ActionMailer::Base.deliveries.clear
+    Setting.notified_events << 'message_posted'
+    
     post :new, :board_id => 1,
                :message => { :subject => 'Test created message',
                              :content => 'Message body'}
@@ -63,6 +66,15 @@ class MessagesControllerTest < Test::Unit::TestCase
     assert_equal 'Message body', message.content
     assert_equal 2, message.author_id
     assert_equal 1, message.board_id
+
+    mail = ActionMailer::Base.deliveries.last
+    assert_kind_of TMail::Mail, mail
+    assert_equal "[#{message.board.project.name} - #{message.board.name}] Test created message", mail.subject
+    assert mail.body.include?('Message body')
+    # author
+    assert mail.bcc.include?('jsmith@somenet.foo')
+    # project member
+    assert mail.bcc.include?('dlopper@somenet.foo')
   end
   
   def test_get_edit

From 05d39eeb35c83b26bdad8ebddb55db1fdb89de2b Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Mon, 28 Apr 2008 10:26:05 +0000
Subject: [PATCH 407/710] Changelog update.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1369 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 doc/CHANGELOG | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/doc/CHANGELOG b/doc/CHANGELOG
index 9ced8b4c0..b39185151 100644
--- a/doc/CHANGELOG
+++ b/doc/CHANGELOG
@@ -5,6 +5,38 @@ Copyright (C) 2006-2008  Jean-Philippe Lang
 http://www.redmine.org/
 
 
+== 2008-04-28 v0.7.0
+
+* Forces Redmine to use rails 2.0.2 gem when vendor/rails is not present
+* Queries can be marked as 'For all projects'. Such queries will be available on all projects and on the global issue list.
+* Add predefined date ranges to the time report
+* Time report can be done at issue level
+* Various timelog report enhancements
+* Accept the following formats for "hours" field: 1h, 1 h, 1 hour, 2 hours, 30m, 30min, 1h30, 1h30m, 1:30
+* Display the context menu above and/or to the left of the click if needed
+* Make the admin project files list sortable
+* Mercurial: display working directory files sizes unless browsing a specific revision
+* Preserve status filter and page number when using lock/unlock/activate links on the users list
+* Redmine.pm support for LDAP authentication
+* Better error message and AR errors in log for failed LDAP on-the-fly user creation
+* Redirected user to where he is coming from after logging hours
+* Warn user that subprojects are also deleted when deleting a project
+* Include subprojects versions on calendar and gantt
+* Notify project members when a message is posted if they want to receive notifications
+* Fixed: Feed content limit setting has no effect
+* Fixed: Priorities not ordered when displayed as a filter in issue list
+* Fixed: can not display attached images inline in message replies
+* Fixed: Boards are not deleted when project is deleted
+* Fixed: trying to preview a new issue raises an exception with postgresql
+* Fixed: single file 'View difference' links do not work because of duplicate slashes in url
+* Fixed: inline image not displayed when including a wiki page
+* Fixed: CVS duplicate key violation
+* Fixed: ActiveRecord::StaleObjectError exception on closing a set of circular duplicate issues
+* Fixed: custom field filters behaviour
+* Fixed: Postgresql 8.3 compatibility
+* Fixed: Links to repository directories don't work
+
+
 == 2008-03-29 v0.7.0-rc1
 
 * Overall activity view and feed added, link is available on the project list

From 5f58e2ced2fd2329978e70744a4470a7dea42484 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Tue, 29 Apr 2008 09:57:47 +0000
Subject: [PATCH 408/710] Fixed: Search for target version of "none" fails with
 postgres 8.3 (#1134).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1379 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/models/query.rb             | 12 ++++--
 test/fixtures/custom_fields.yml |  1 +
 test/unit/query_test.rb         | 74 +++++++++++++++++++++++++++++++++
 3 files changed, 83 insertions(+), 4 deletions(-)

diff --git a/app/models/query.rb b/app/models/query.rb
index 641c0d17b..d9a720812 100644
--- a/app/models/query.rb
+++ b/app/models/query.rb
@@ -125,7 +125,7 @@ class Query < ActiveRecord::Base
     filters.each_key do |field|
       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 
+          (values_for(field) and !values_for(field).first.blank?) or 
           # filter doesn't require any value
           ["o", "c", "!*", "*", "t", "w"].include? operator_for(field)
     end if filters
@@ -296,11 +296,13 @@ class Query < ActiveRecord::Base
       v = values_for(field).clone
       next unless v and !v.empty?
             
-      sql = ''      
+      sql = ''
+      is_custom_filter = false
       if field =~ /^cf_(\d+)$/
         # custom field
         db_table = CustomValue.table_name
         db_field = 'value'
+        is_custom_filter = true
         sql << "#{Issue.table_name}.id IN (SELECT #{Issue.table_name}.id FROM #{Issue.table_name} LEFT OUTER JOIN #{db_table} ON #{db_table}.customized_type='Issue' AND #{db_table}.customized_id=#{Issue.table_name}.id AND #{db_table}.custom_field_id=#{$1} WHERE "
       else
         # regular field
@@ -320,9 +322,11 @@ class Query < ActiveRecord::Base
       when "!"
         sql = sql + "(#{db_table}.#{db_field} IS NULL OR #{db_table}.#{db_field} NOT IN (" + v.collect{|val| "'#{connection.quote_string(val)}'"}.join(",") + "))"
       when "!*"
-        sql = sql + "#{db_table}.#{db_field} IS NULL OR #{db_table}.#{db_field} = ''"
+        sql = sql + "#{db_table}.#{db_field} IS NULL"
+        sql << " OR #{db_table}.#{db_field} = ''" if is_custom_filter
       when "*"
-        sql = sql + "#{db_table}.#{db_field} IS NOT NULL AND #{db_table}.#{db_field} <> ''"
+        sql = sql + "#{db_table}.#{db_field} IS NOT NULL"
+        sql << " AND #{db_table}.#{db_field} <> ''" if is_custom_filter
       when ">="
         sql = sql + "#{db_table}.#{db_field} >= #{v.first.to_i}"
       when "<="
diff --git a/test/fixtures/custom_fields.yml b/test/fixtures/custom_fields.yml
index 6be840fcc..3a9e79a29 100644
--- a/test/fixtures/custom_fields.yml
+++ b/test/fixtures/custom_fields.yml
@@ -4,6 +4,7 @@ custom_fields_001:
   min_length: 0
   regexp: ""
   is_for_all: true
+  is_filter: true
   type: IssueCustomField
   max_length: 0
   possible_values: MySQL|PostgreSQL|Oracle
diff --git a/test/unit/query_test.rb b/test/unit/query_test.rb
index d291018fb..e143e6fc2 100644
--- a/test/unit/query_test.rb
+++ b/test/unit/query_test.rb
@@ -29,6 +29,80 @@ class QueryTest < Test::Unit::TestCase
     assert_equal Issue.find(3), issues.first
   end
   
+  def test_operator_none
+    query = Query.new(:project => Project.find(1), :name => '_')
+    query.add_filter('fixed_version_id', '!*', [''])
+    query.add_filter('cf_1', '!*', [''])
+    assert query.statement.include?("#{Issue.table_name}.fixed_version_id IS NULL")
+    assert query.statement.include?("#{CustomValue.table_name}.value IS NULL OR #{CustomValue.table_name}.value = ''")
+    issues = Issue.find :all,:include => [ :assigned_to, :status, :tracker, :project, :priority ], :conditions => query.statement
+  end
+  
+  def test_operator_all
+    query = Query.new(:project => Project.find(1), :name => '_')
+    query.add_filter('fixed_version_id', '*', [''])
+    query.add_filter('cf_1', '*', [''])
+    assert query.statement.include?("#{Issue.table_name}.fixed_version_id IS NOT NULL")
+    assert query.statement.include?("#{CustomValue.table_name}.value IS NOT NULL AND #{CustomValue.table_name}.value <> ''")
+    issues = Issue.find :all,:include => [ :assigned_to, :status, :tracker, :project, :priority ], :conditions => query.statement
+  end
+  
+  def test_operator_greater_than
+    query = Query.new(:project => Project.find(1), :name => '_')
+    query.add_filter('done_ratio', '>=', ['40'])
+    assert query.statement.include?("#{Issue.table_name}.done_ratio >= 40")
+    issues = Issue.find :all,:include => [ :assigned_to, :status, :tracker, :project, :priority ], :conditions => query.statement
+  end
+
+  def test_operator_in_more_than
+    query = Query.new(:project => Project.find(1), :name => '_')
+    query.add_filter('due_date', '>t+', ['15'])
+    assert query.statement.include?("#{Issue.table_name}.due_date >=")
+    issues = Issue.find :all,:include => [ :assigned_to, :status, :tracker, :project, :priority ], :conditions => query.statement
+  end
+
+  def test_operator_in_less_than
+    query = Query.new(:project => Project.find(1), :name => '_')
+    query.add_filter('due_date', '<t+', ['15'])
+    assert query.statement.include?("#{Issue.table_name}.due_date BETWEEN")
+    issues = Issue.find :all,:include => [ :assigned_to, :status, :tracker, :project, :priority ], :conditions => query.statement
+  end
+
+  def test_operator_today
+    query = Query.new(:project => Project.find(1), :name => '_')
+    query.add_filter('due_date', 't', [''])
+    assert query.statement.include?("#{Issue.table_name}.due_date BETWEEN")
+    issues = Issue.find :all,:include => [ :assigned_to, :status, :tracker, :project, :priority ], :conditions => query.statement
+  end
+
+  def test_operator_this_week_on_date
+    query = Query.new(:project => Project.find(1), :name => '_')
+    query.add_filter('due_date', 'w', [''])
+    assert query.statement.include?("#{Issue.table_name}.due_date BETWEEN")
+    issues = Issue.find :all,:include => [ :assigned_to, :status, :tracker, :project, :priority ], :conditions => query.statement
+  end
+
+  def test_operator_this_week_on_datetime
+    query = Query.new(:project => Project.find(1), :name => '_')
+    query.add_filter('created_on', 'w', [''])
+    assert query.statement.include?("#{Issue.table_name}.created_on BETWEEN")
+    issues = Issue.find :all,:include => [ :assigned_to, :status, :tracker, :project, :priority ], :conditions => query.statement
+  end
+
+  def test_operator_contains
+    query = Query.new(:project => Project.find(1), :name => '_')
+    query.add_filter('subject', '~', ['string'])
+    assert query.statement.include?("#{Issue.table_name}.subject LIKE '%string%'")
+    issues = Issue.find :all,:include => [ :assigned_to, :status, :tracker, :project, :priority ], :conditions => query.statement
+  end
+  
+  def test_operator_does_not_contains
+    query = Query.new(:project => Project.find(1), :name => '_')
+    query.add_filter('subject', '!~', ['string'])
+    assert query.statement.include?("#{Issue.table_name}.subject NOT LIKE '%string%'")
+    issues = Issue.find :all,:include => [ :assigned_to, :status, :tracker, :project, :priority ], :conditions => query.statement
+  end
+  
   def test_default_columns
     q = Query.new
     assert !q.columns.empty? 

From 4403e300ff2de9a442c83066065471aed80cb17a Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Wed, 30 Apr 2008 08:47:14 +0000
Subject: [PATCH 409/710] Thai translation added (Gampol Thitinilnithi, #1136).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1383 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 lang/th.yml                                   | 623 ++++++++++++++++++
 .../javascripts/calendar/lang/calendar-th.js  | 127 ++++
 .../jstoolbar/lang/jstoolbar-th.js            |  14 +
 3 files changed, 764 insertions(+)
 create mode 100644 lang/th.yml
 create mode 100644 public/javascripts/calendar/lang/calendar-th.js
 create mode 100644 public/javascripts/jstoolbar/lang/jstoolbar-th.js

diff --git a/lang/th.yml b/lang/th.yml
new file mode 100644
index 000000000..2c506c664
--- /dev/null
+++ b/lang/th.yml
@@ -0,0 +1,623 @@
+_gloc_rule_default: '|n| n==1 ? "" : "_plural" '
+
+actionview_datehelper_select_day_prefix:
+actionview_datehelper_select_month_names: มกราคม,กุมภาพันธ์,มีนาคม,เมษายน,พฤษภาคม,มิถุนายน,กรกฎาคม,สิงหาคม,กันยายน,ตุลาคม,พฤศจิกายน,ธันวาคม
+actionview_datehelper_select_month_names_abbr: ม.ค.,ก.พ.,มี.ค.,เม.ย.,พ.ค.,มิ.ย.,ก.ค.,ส.ค.,ก.ย.,ต.ค.,พ.ย.,ธ.ค.
+actionview_datehelper_select_month_prefix:
+actionview_datehelper_select_year_prefix:
+actionview_datehelper_time_in_words_day: 1 วัน
+actionview_datehelper_time_in_words_day_plural: %d วัน
+actionview_datehelper_time_in_words_hour_about: ประมาณ 1 ชั่วโมง
+actionview_datehelper_time_in_words_hour_about_plural: ประมาณ %d ชั่วโมง
+actionview_datehelper_time_in_words_hour_about_single: ประมาณ 1 ชั่วโมง
+actionview_datehelper_time_in_words_minute: 1 นาที
+actionview_datehelper_time_in_words_minute_half: ครึ่งนาที
+actionview_datehelper_time_in_words_minute_less_than: ไม่ถึงนาที
+actionview_datehelper_time_in_words_minute_plural: %d นาที
+actionview_datehelper_time_in_words_minute_single: 1 นาที
+actionview_datehelper_time_in_words_second_less_than: ไม่ถึงวินาที
+actionview_datehelper_time_in_words_second_less_than_plural: ไม่ถึง %d วินาที
+actionview_instancetag_blank_option: กรุณาเลือก
+
+activerecord_error_inclusion: ไม่อยู่ในรายการ
+activerecord_error_exclusion: ถูกสงวนไว้
+activerecord_error_invalid: ไม่ถูกต้อง
+activerecord_error_confirmation: พิมพ์ไม่เหมือนเดิม
+activerecord_error_accepted: ต้องยอมรับ
+activerecord_error_empty: ต้องเติม
+activerecord_error_blank: ต้องเติม
+activerecord_error_too_long: ยาวเกินไป
+activerecord_error_too_short: สั้นเกินไป
+activerecord_error_wrong_length: ความยาวไม่ถูกต้อง
+activerecord_error_taken: ถูกใช้ไปแล้ว
+activerecord_error_not_a_number: ไม่ใช่ตัวเลข
+activerecord_error_not_a_date: ไม่ใช่วันที่ ที่ถูกต้อง
+activerecord_error_greater_than_start_date: ต้องมากกว่าวันเริ่ม
+activerecord_error_not_same_project: ไม่ได้อยู่ในโครงการเดียวกัน
+activerecord_error_circular_dependency: ความสัมพันธ์อ้างอิงเป็นวงกลม
+
+general_fmt_age: %d ปี
+general_fmt_age_plural: %d ปี
+general_fmt_date: %%d/%%B/%%Y
+general_fmt_datetime: %%d/%%B/%%Y %%H:%%M
+general_fmt_datetime_short: %%d %%b, %%H:%%M
+general_fmt_time: %%H:%%M
+general_text_No: 'ไม่'
+general_text_Yes: 'ใช่'
+general_text_no: 'ไม่'
+general_text_yes: 'ใช่'
+general_lang_name: 'Thai (ไทย)'
+general_csv_separator: ','
+general_csv_encoding: Windows-874
+general_pdf_encoding: cp874
+general_day_names: จันทร์,อังคาร,พุธ,พฤหัสบดี,ศุกร์,เสาร์,อาทิตย์
+general_first_day_of_week: '1'
+
+notice_account_updated: บัญชีได้ถูกปรับปรุงแล้ว.
+notice_account_invalid_creditentials: ชื้ผู้ใช้หรือรหัสผ่านไม่ถูกต้อง
+notice_account_password_updated: รหัสได้ถูกปรับปรุงแล้ว.
+notice_account_wrong_password: รหัสผ่านไม่ถูกต้อง
+notice_account_register_done: บัญชีถูกสร้างแล้ว. กรุณาเช็คเมล์ แล้วคลิ๊กที่ลิงค์ในอีเมล์เพื่อเปิดใช้บัญชี
+notice_account_unknown_email: ไม่มีผู้ใช้ที่ใช้อีเมล์นี้.
+notice_can_t_change_password: บัญชีนี้ใช้การยืนยันตัวตนจากแหล่งภายนอก. ไม่สามารถปลี่ยนรหัสผ่านได้.
+notice_account_lost_email_sent: เราได้ส่งอีเมล์พร้อมวิธีการสร้างรหัีสผ่านใหม่ให้คุณแล้ว กรุณาเช็คเมล์.
+notice_account_activated: บัญชีของคุณได้เปิดใช้แล้ว. ตอนนี้คุณสามารถเข้าสู่ระบบได้แล้ว.
+notice_successful_create: สร้างเสร็จแล้ว.
+notice_successful_update: ปรับปรุงเสร็จแล้ว.
+notice_successful_delete: ลบเสร็จแล้ว.
+notice_successful_connection: ติดต่อสำเร็จแล้ว.
+notice_file_not_found: หน้าที่คุณต้องการดูไม่มีอยู่จริง หรือถูกลบไปแล้ว.
+notice_locking_conflict: ข้อมูลถูกปรับปรุงโดยผู้ใช้คนอื่น.
+notice_not_authorized: คุณไม่มีสิทธิเข้าถึงหน้านี้.
+notice_email_sent: อีเมล์ได้ถูกส่งถึง %s
+notice_email_error: เกิดความผิดพลาดขณะกำส่งอีเมล์ (%s)
+notice_feeds_access_key_reseted: RSS access key ของคุณถูก reset แล้ว.
+notice_failed_to_save_issues: "%d ปัญหาจาก %d ปัญหาที่ถูกเลือกไม่สามารถจัดเก็บ: %s."
+notice_no_issue_selected: "ไม่มีปัญหาที่ถูกเลือก! กรุณาเลือกปัญหาที่คุณต้องการแก้ไข."
+notice_account_pending: "บัญชีของคุณสร้างเสร็จแล้ว ขณะนี้รอการอนุมัติจากผู้บริหารจัดการ."
+notice_default_data_loaded: ค่าเริ่มต้นโหลดเสร็จแล้ว.
+
+error_can_t_load_default_data: "ค่าเริ่มต้นโหลดไม่สำเร็จ: %s"
+error_scm_not_found: "ไม่พบรุ่นที่ต้องการในแหล่งเก็บต้นฉบับ."
+error_scm_command_failed: "เกิดความผิดพลาดในการเข้าถึงแหล่งเก็บต้นฉบับ: %s"
+error_scm_annotate: "entry ไม่มีอยู่จริง หรือไม่สามารถเขียนหมายเหตุประกอบ."
+error_issue_not_found_in_project: 'ไม่พบปัญหานี้ หรือปัญหาไม่ได้อยู่ในโครงการนี้'
+
+mail_subject_lost_password: รหัสผ่าน %s ของคุณ
+mail_body_lost_password: 'คลิ๊กที่ลิงค์ต่อไปนี้เพื่อเปลี่ยนรหัสผ่าน:'
+mail_subject_register: เปิดบัญชี %s ของคุณ
+mail_body_register: 'คลิ๊กที่ลิงค์ต่อไปนี้เพื่อเปลี่ยนรหัสผ่าน:'
+mail_body_account_information_external: คุณสามารถใช้บัญชี "%s" เพื่อเข้าสู่ระบบ.
+mail_body_account_information: ข้อมูลบัญชีของคุณ
+mail_subject_account_activation_request: กรุณาเปิดบัญชี %s
+mail_body_account_activation_request: 'ผู้ใช้ใหม่ (%s) ได้ลงทะเบียน. บัญชีของเขากำลังรออนุมัติ:'
+
+gui_validation_error: 1 ข้อผิดพลาด
+gui_validation_error_plural: %d ข้อผิดพลาด
+
+field_name: ชื่อ
+field_description: รายละเอียด
+field_summary: สรุปย่อ
+field_is_required: ต้องใส่
+field_firstname: ชื่อ
+field_lastname: นามสกุล
+field_mail: อีเมล์
+field_filename: แฟ้ม
+field_filesize: ขนาด
+field_downloads: ดาวน์โหลด
+field_author: ผู้แต่ง
+field_created_on: สร้าง
+field_updated_on: ปรับปรุง
+field_field_format: รูปแบบ
+field_is_for_all: สำหรับทุกโครงการ
+field_possible_values: ค่าที่เป็นไปได้
+field_regexp: Regular expression
+field_min_length: สั้นสุด
+field_max_length: ยาวสุด
+field_value: ค่า
+field_category: ประเภท
+field_title: ชื่อเรื่อง
+field_project: โครงการ
+field_issue: ปัญหา
+field_status: สถานะ
+field_notes: บันทึก
+field_is_closed: ปัญหาจบ
+field_is_default: ค่าเริ่มต้น
+field_tracker: การติดตาม
+field_subject: เรื่อง
+field_due_date: วันครบกำหนด
+field_assigned_to: มอบหมายให้
+field_priority: ความสำคัญ
+field_fixed_version: รุ่น
+field_user: ผู้ใช้
+field_role: บทบาท
+field_homepage: หน้าแรก
+field_is_public: สาธารณะ
+field_parent: โครงการย่อยของ
+field_is_in_chlog: ปัญหาแสดงใน รายกาเปลี่ยนแปลง
+field_is_in_roadmap: ปัญหาแสดงใน แผนงาน
+field_login: ชื่อที่ใช้เข้าระบบ
+field_mail_notification: การแจ้งเตือนทางอีเมล์
+field_admin: ผู้บริหารจัดการ
+field_last_login_on: เข้าระบบครั้งสุดท้าย
+field_language: ภาษา
+field_effective_date: วันที่
+field_password: รหัสผ่าน
+field_new_password: รหัสผ่านใหม่
+field_password_confirmation: ยืนยันรหัสผ่าน
+field_version: รุ่น
+field_type: ชนิด
+field_host: โฮสต์
+field_port: พอร์ต
+field_account: บัญชี
+field_base_dn: Base DN
+field_attr_login: เข้าระบบ attribute
+field_attr_firstname: ชื่อ attribute
+field_attr_lastname: นามสกุล attribute
+field_attr_mail: อีเมล์ attribute
+field_onthefly: สร้างผู้ใช้ทันที
+field_start_date: เริ่ม
+field_done_ratio: %% สำเร็จ
+field_auth_source: วิธีการยืนยันตัวตน
+field_hide_mail: ซ่อนอีเมล์ของฉัน
+field_comments: ความเห็น
+field_url: URL
+field_start_page: หน้าเริ่มต้น
+field_subproject: โครงการย่อย
+field_hours: ชั่วโมง
+field_activity: กิจกรรม
+field_spent_on: วันที่
+field_identifier: ชื่อเฉพาะ
+field_is_filter: ใช้เป็นตัวกรอง
+field_issue_to_id: ปัญหาที่เกี่ยวข้อง
+field_delay: เลื่อน
+field_assignable: ปัญหาสามารถมอบหมายให้คนที่ทำบทบาทนี้
+field_redirect_existing_links: ย้ายจุดเชื่อมโยงนี้
+field_estimated_hours: เวลาที่ใช้โดยประมาณ
+field_column_names: สดมภ์
+field_time_zone: ย่านเวลา
+field_searchable: ค้นหาได้
+field_default_value: ค่าเริ่มต้น
+field_comments_sorting: แสดงความเห็น
+
+setting_app_title: ชื่อโปรแกรม
+setting_app_subtitle: ชื่อโปรแกรมรอง
+setting_welcome_text: ข้อความต้อนรับ
+setting_default_language: ภาษาเริ่มต้น
+setting_login_required: ต้องป้อนผู้ใช้-รหัสผ่าน
+setting_self_registration: ลงทะเบียนด้วยตนเอง
+setting_attachment_max_size: ขนาดแฟ้มแนบสูงสุด
+setting_issues_export_limit: การส่งออกปัญหาสูงสุด
+setting_mail_from: อีเมล์ที่ใช้ส่ง
+setting_bcc_recipients: ไม่ระบุชื่อผู้รับ (bcc)
+setting_host_name: ชื่อโฮสต์
+setting_text_formatting: การจัดรูปแบบข้อความ
+setting_wiki_compression: บีบอัดประวัติ Wiki
+setting_feeds_limit: จำนวน Feed
+setting_default_projects_public: โครงการใหม่มีค่าเริ่มต้นเป็น สาธารณะ
+setting_autofetch_changesets: ดึง commits อัตโนมัติ
+setting_sys_api_enabled: เปิดใช้ WS สำหรับการจัดการที่เก็บต้นฉบับ
+setting_commit_ref_keywords: คำสำคัญ Referencing
+setting_commit_fix_keywords: คำสำคัญ Fixing
+setting_autologin: เข้าระบบอัตโนมัติ
+setting_date_format: รูปแบบวันที่
+setting_time_format: รูปแบบเวลา
+setting_cross_project_issue_relations: อนุญาตให้ระบุปัญหาข้ามโครงการ
+setting_issue_list_default_columns: สดมภ์เริ่มต้นแสดงในรายการปัญหา
+setting_repositories_encodings: การเข้ารหัสที่เก็บต้นฉบับ
+setting_emails_footer: คำลงท้ายอีเมล์
+setting_protocol: Protocol
+setting_per_page_options: ตัวเลือกจำนวนต่อหน้า
+setting_user_format: รูปแบบการแสดงชื่อผู้ใช้
+setting_activity_days_default: จำนวนวันที่แสดงในกิจกรรมของโครงการ
+setting_display_subprojects_issues: แสดงปัญหาของโครงการย่อยในโครงการหลัก
+
+project_module_issue_tracking: การติดตามปัญหา
+project_module_time_tracking: การใช้เวลา
+project_module_news: ข่าว
+project_module_documents: เอกสาร
+project_module_files: แฟ้ม
+project_module_wiki: Wiki
+project_module_repository: ที่เก็บต้นฉบับ
+project_module_boards: กระดานข้อความ
+
+label_user: ผู้ใช้
+label_user_plural: ผู้ใช้
+label_user_new: ผู้ใช้ใหม่
+label_project: โครงการ
+label_project_new: โครงการใหม่
+label_project_plural: โครงการ
+label_project_all: โครงการทั้งหมด
+label_project_latest: โครงการล่าสุด
+label_issue: ปัญหา
+label_issue_new: ปัญหาใหม่
+label_issue_plural: ปัญหา
+label_issue_view_all: ดูปัญหาทั้งหมด
+label_issues_by: ปัญหาโดย %s
+label_issue_added: ปัญหาถูกเพิ่ม
+label_issue_updated: ปัญหาถูกปรับปรุง
+label_document: เอกสาร
+label_document_new: เอกสารใหม่
+label_document_plural: เอกสาร
+label_document_added: เอกสารถูกเพิ่ม
+label_role: บทบาท
+label_role_plural: บทบาท
+label_role_new: บทบาทใหม่
+label_role_and_permissions: บทบาทและสิทธิ
+label_member: สมาชิก
+label_member_new: สมาชิกใหม่
+label_member_plural: สมาชิก
+label_tracker: การติดตาม
+label_tracker_plural: การติดตาม
+label_tracker_new: การติดตามใหม่
+label_workflow: ลำดับงาน
+label_issue_status: สถานะของปัญหา
+label_issue_status_plural: สถานะของปัญหา
+label_issue_status_new: สถานะใหม
+label_issue_category: ประเภทของปัญหา
+label_issue_category_plural: ประเภทของปัญหา
+label_issue_category_new: ประเภทใหม่
+label_custom_field: เขตข้อมูลแบบระบุเอง
+label_custom_field_plural: เขตข้อมูลแบบระบุเอง
+label_custom_field_new: สร้างเขตข้อมูลแบบระบุเอง
+label_enumerations: รายการ
+label_enumeration_new: สร้างใหม่
+label_information: ข้อมูล
+label_information_plural: ข้อมูล
+label_please_login: กรุณาเข้าระบบก่อน
+label_register: ลงทะเบียน
+label_password_lost: ลืมรหัสผ่าน
+label_home: หน้าแรก
+label_my_page: หน้าของฉัน
+label_my_account: บัญชีของฉัน
+label_my_projects: โครงการของฉัน
+label_administration: บริหารจัดการ
+label_login: เข้าระบบ
+label_logout: ออกระบบ
+label_help: ช่วยเหลือ
+label_reported_issues: ปัญหาที่แจ้งไว้
+label_assigned_to_me_issues: ปัญหาที่มอบหมายให้ฉัน
+label_last_login: ติดต่อครั้งสุดท้าย
+label_last_updates: ปรับปรุงครั้งสุดท้าย
+label_last_updates_plural: %d ปรับปรุงครั้งสุดท้าย
+label_registered_on: ลงทะเบียนเมื่อ
+label_activity: กิจกรรม
+label_activity_plural: กิจกรรม
+label_activity_latest: กิจกรรมล่าสุด
+label_overall_activity: กิจกรรมโดยรวม
+label_new: ใหม่
+label_logged_as: เข้าระบบในชื่อ
+label_environment: สภาพแวดล้อม
+label_authentication: การยืนยันตัวตน
+label_auth_source: วิธีการการยืนยันตัวตน
+label_auth_source_new: สร้างวิธีการยืนยันตัวตนใหม่
+label_auth_source_plural: วิธีการ Authentication
+label_subproject_plural: โครงการย่อย
+label_min_max_length: สั้น-ยาว สุดที่
+label_list: รายการ
+label_date: วันที่
+label_integer: จำนวนเต็ม
+label_float: จำนวนจริง
+label_boolean: ถูกผิด
+label_string: ข้อความ
+label_text: ข้อความขนาดยาว
+label_attribute: คุณลักษณะ
+label_attribute_plural: คุณลักษณะ
+label_download: %d ดาวน์โหลด
+label_download_plural: %d ดาวน์โหลด
+label_no_data: จำนวนข้อมูลที่แสดง
+label_change_status: เปลี่ยนสถานะ
+label_history: ประวัติ
+label_attachment: แฟ้ม
+label_attachment_new: แฟ้มใหม่
+label_attachment_delete: ลบแฟ้ม
+label_attachment_plural: แฟ้ม
+label_file_added: แฟ้มถูกเพิ่ม
+label_report: รายงาน
+label_report_plural: รายงาน
+label_news: ข่าว
+label_news_new: เพิ่มข่าว
+label_news_plural: ข่าว
+label_news_latest: ข่าวล่าสุด
+label_news_view_all: ดูข่าวทั้งหมด
+label_news_added: ข่าวถูกเพิ่ม
+label_change_log: บันทึกการเปลี่ยนแปลง
+label_settings: ปรับแต่ง
+label_overview: ภาพรวม
+label_version: รุ่น
+label_version_new: รุ่นใหม่
+label_version_plural: รุ่น
+label_confirmation: ยืนยัน
+label_export_to: 'รูปแบบอื่นๆ :'
+label_read: อ่าน...
+label_public_projects: โครงการสาธารณะ
+label_open_issues: เปิด
+label_open_issues_plural: เปิด
+label_closed_issues: ปิด
+label_closed_issues_plural: ปิด
+label_total: จำนวนรวม
+label_permissions: สิทธิ
+label_current_status: สถานะปัจจุบัน
+label_new_statuses_allowed: อนุญาตให้มีสถานะใหม่
+label_all: ทั้งหมด
+label_none: ไม่มี
+label_nobody: ไม่มีใคร
+label_next: ต่อไป
+label_previous: ก่อนหน้า
+label_used_by: ถูกใช้โดย
+label_details: รายละเอียด
+label_add_note: เพิ่มบันทึก
+label_per_page: ต่อหน้า
+label_calendar: ปฏิทิน
+label_months_from: เดือนจาก
+label_gantt: Gantt
+label_internal: ภายใน
+label_last_changes: last %d เปลี่ยนแปลง
+label_change_view_all: ดูการเปลี่ยนแปลงทั้งหมด
+label_personalize_page: ปรับแต่งหน้านี้
+label_comment: ความเห็น
+label_comment_plural: ความเห็น
+label_comment_add: เพิ่มความเห็น
+label_comment_added: ความเห็นถูกเพิ่ม
+label_comment_delete: ลบความเห็น
+label_query: แบบสอบถามแบบกำหนดเอง
+label_query_plural: แบบสอบถามแบบกำหนดเอง
+label_query_new: แบบสอบถามใหม่
+label_filter_add: เพิ่มตัวกรอง
+label_filter_plural: ตัวกรอง
+label_equals: คือ
+label_not_equals: ไม่ใช่
+label_in_less_than: น้อยกว่า
+label_in_more_than: มากกว่า
+label_in: ในช่วง
+label_today: วันนี้
+label_all_time: ตลอดเวลา
+label_yesterday: เมื่อวาน
+label_this_week: อาทิตย์นี้
+label_last_week: อาทิตย์ที่แล้ว
+label_last_n_days: %d วันย้อนหลัง
+label_this_month: เดือนนี้
+label_last_month: เดือนที่แล้ว
+label_this_year: ปีนี้
+label_date_range: ช่วงวันที่
+label_less_than_ago: น้อยกว่าหนึ่งวัน
+label_more_than_ago: มากกว่าหนึ่งวัน
+label_ago: วันผ่านมาแล้ว
+label_contains: มี...
+label_not_contains: ไม่มี...
+label_day_plural: วัน
+label_repository: ที่เก็บต้นฉบับ
+label_repository_plural: ที่เก็บต้นฉบับ
+label_browse: เปิดหา
+label_modification: %d เปลี่ยนแปลง
+label_modification_plural: %d เปลี่ยนแปลง
+label_revision: การแก้ไข
+label_revision_plural: การแก้ไข
+label_associated_revisions: การแก้ไขที่เกี่ยวข้อง
+label_added: ถูกเพิ่ม
+label_modified: ถูกแก้ไข
+label_deleted: ถูกลบ
+label_latest_revision: รุ่นการแก้ไขล่าสุด
+label_latest_revision_plural: รุ่นการแก้ไขล่าสุด
+label_view_revisions: ดูการแก้ไข
+label_max_size: ขนาดใหญ่สุด
+label_on: 'ใน'
+label_sort_highest: ย้ายไปบนสุด
+label_sort_higher: ย้ายขึ้น
+label_sort_lower: ย้ายลง
+label_sort_lowest: ย้ายไปล่างสุด
+label_roadmap: แผนงาน
+label_roadmap_due_in: ถึงกำหนดใน
+label_roadmap_overdue: %s ช้ากว่ากำหนด
+label_roadmap_no_issues: ไม่มีปัญหาสำหรับรุ่นนี้
+label_search: ค้นหา
+label_result_plural: ผลการค้นหา
+label_all_words: ทุกคำ
+label_wiki: Wiki
+label_wiki_edit: แก้ไข Wiki
+label_wiki_edit_plural: แก้ไข Wiki
+label_wiki_page: หน้า Wiki
+label_wiki_page_plural: หน้า Wiki
+label_index_by_title: เรียงตามชื่อเรื่อง
+label_index_by_date: เรียงตามวัน
+label_current_version: รุ่นปัจจุบัน
+label_preview: ตัวอย่างก่อนจัดเก็บ
+label_feed_plural: Feeds
+label_changes_details: รายละเอียดการเปลี่ยนแปลงทั้งหมด
+label_issue_tracking: ติดตามปัญหา
+label_spent_time: เวลาที่ใช้
+label_f_hour: %.2f ชั่วโมง
+label_f_hour_plural: %.2f ชั่วโมง
+label_time_tracking: ติดตามการใช้เวลา
+label_change_plural: เปลี่ยนแปลง
+label_statistics: สถิติ
+label_commits_per_month: Commits ต่อเดือน
+label_commits_per_author: Commits ต่อผู้แต่ง
+label_view_diff: ดูความแตกต่าง
+label_diff_inline: inline
+label_diff_side_by_side: side by side
+label_options: ตัวเลือก
+label_copy_workflow_from: คัดลอกลำดับงานจาก
+label_permissions_report: รายงานสิทธิ
+label_watched_issues: เฝ้าดูปัญหา
+label_related_issues: ปัญหาที่เกี่ยวข้อง
+label_applied_status: จัดเก็บสถานะ
+label_loading: กำลังโหลด...
+label_relation_new: ความสัมพันธ์ใหม่
+label_relation_delete: ลบความสัมพันธ์
+label_relates_to: สัมพันธ์กับ
+label_duplicates: ซ้ำ
+label_blocks: กีดกัน
+label_blocked_by: กีดกันโดย
+label_precedes: นำหน้า
+label_follows: ตามหลัง
+label_end_to_start: จบ-เริ่ม
+label_end_to_end: จบ-จบ
+label_start_to_start: เริ่ม-เริ่ม
+label_start_to_end: เริ่ม-จบ
+label_stay_logged_in: อยู่ในระบบต่อ
+label_disabled: ไม่ใช้งาน
+label_show_completed_versions: แสดงรุ่นที่สมบูรณ์
+label_me: ฉัน
+label_board: สภากาแฟ
+label_board_new: สร้างสภากาแฟ
+label_board_plural: สภากาแฟ
+label_topic_plural: หัวข้อ
+label_message_plural: ข้อความ
+label_message_last: ข้อความล่าสุด
+label_message_new: เขียนข้อความใหม่
+label_message_posted: ข้อความถูกเพิ่มแล้ว
+label_reply_plural: ตอบกลับ
+label_send_information: ส่งรายละเอียดของบัญชีให้ผู้ใช้
+label_year: ปี
+label_month: เดือน
+label_week: สัปดาห์
+label_date_from: จาก
+label_date_to: ถึง
+label_language_based: ขึ้นอยู่กับภาษาของผู้ใช้
+label_sort_by: เรียงโดย %s
+label_send_test_email: ส่งจดหมายทดสอบ
+label_feeds_access_key_created_on: RSS access key สร้างเมื่อ %s ที่ผ่านมา
+label_module_plural: ส่วนประกอบ
+label_added_time_by: เพิ่มโดย %s %s ที่ผ่านมา
+label_updated_time: ปรับปรุง %s ที่ผ่านมา
+label_jump_to_a_project: ไปที่โครงการ...
+label_file_plural: แฟ้ม
+label_changeset_plural: กลุ่มการเปลี่ยนแปลง
+label_default_columns: สดมภ์เริ่มต้น
+label_no_change_option: (ไม่เปลี่ยนแปลง)
+label_bulk_edit_selected_issues: แก้ไขปัญหาที่เลือกทั้งหมด
+label_theme: ชุดรูปแบบ
+label_default: ค่าเริ่มต้น
+label_search_titles_only: ค้นหาจากชื่อเรื่องเท่านั้น
+label_user_mail_option_all: "ทุกๆ เหตุการณ์ในโครงการของฉัน"
+label_user_mail_option_selected: "ทุกๆ เหตุการณ์ในโครงการที่เลือก..."
+label_user_mail_option_none: "เฉพาะสิ่งที่ฉันเลือกหรือมีส่วนเกี่ยวข้อง"
+label_user_mail_no_self_notified: "ฉันไม่ต้องการได้รับการแจ้งเตือนในสิ่งที่ฉันทำเอง"
+label_registration_activation_by_email: เปิดบัญชีผ่านอีเมล์
+label_registration_manual_activation: อนุมัติโดยผู้บริหารจัดการ
+label_registration_automatic_activation: เปิดบัญชีอัตโนมัติ
+label_display_per_page: 'ต่อหน้า: %s'
+label_age: อายุ
+label_change_properties: เปลี่ยนคุณสมบัติ
+label_general: ทั่วๆ ไป
+label_more: อื่น ๆ
+label_scm: ตัวจัดการต้นฉบับ
+label_plugins: ส่วนเสริม
+label_ldap_authentication: การยืนยันตัวตนโดยใช้ LDAP
+label_downloads_abbr: D/L
+label_optional_description: รายละเอียดเพิ่มเติม
+label_add_another_file: เพิ่มแฟ้มอื่นๆ
+label_preferences: ค่าที่ชอบใจ
+label_chronological_order: เรียงจากเก่าไปใหม่
+label_reverse_chronological_order: เรียงจากใหม่ไปเก่า
+label_planning: การวางแผน
+
+button_login: เข้าระบบ
+button_submit: จัดส่งข้อมูล
+button_save: จัดเก็บ
+button_check_all: เลือกทั้งหมด
+button_uncheck_all: ไม่เลือกทั้งหมด
+button_delete: ลบ
+button_create: สร้าง
+button_test: ทดสอบ
+button_edit: แก้ไข
+button_add: เพิ่ม
+button_change: เปลี่ยนแปลง
+button_apply: ประยุกต์ใช้
+button_clear: ล้างข้อความ
+button_lock: ล็อค
+button_unlock: ยกเลิกการล็อค
+button_download: ดาวน์โหลด
+button_list: รายการ
+button_view: มุมมอง
+button_move: ย้าย
+button_back: กลับ
+button_cancel: ยกเลิก
+button_activate: เปิดใช้
+button_sort: จัดเรียง
+button_log_time: บันทึกเวลา
+button_rollback: ถอยกลับมาที่รุ่นนี้
+button_watch: เฝ้าดู
+button_unwatch: เลิกเฝ้าดู
+button_reply: ตอบกลับ
+button_archive: เก็บเข้าโกดัง
+button_unarchive: เอาออกจากโกดัง
+button_reset: เริ่มใหมท
+button_rename: เปลี่ยนชื่อ
+button_change_password: เปลี่ยนรหัสผ่าน
+button_copy: คัดลอก
+button_annotate: หมายเหตุประกอบ
+button_update: ปรับปรุง
+button_configure: ปรับแต่ง
+
+status_active: เปิดใช้งานแล้ว
+status_registered: รอการอนุมัติ
+status_locked: ล็อค
+
+text_select_mail_notifications: เลือกการกระทำที่ต้องการให้ส่งอีเมล์แจ้ง.
+text_regexp_info: ตัวอย่าง ^[A-Z0-9]+$
+text_min_max_length_info: 0 หมายถึงไม่จำกัด
+text_project_destroy_confirmation: คุณแน่ใจไหมว่าต้องการลบโครงการและข้อมูลที่เกี่ยวข้่อง ?
+text_subprojects_destroy_warning: 'โครงการย่อย: %s จะถูกลบด้วย.'
+text_workflow_edit: เลือกบทบาทและการติดตาม เพื่อแก้ไขลำดับงาน
+text_are_you_sure: คุณแน่ใจไหม ?
+text_journal_changed: เปลี่ยนแปลงจาก %s เป็น %s
+text_journal_set_to: ตั้งค่าเป็น %s
+text_journal_deleted: ถูกลบ
+text_tip_task_begin_day: งานที่เริ่มวันนี้
+text_tip_task_end_day: งานที่จบวันนี้
+text_tip_task_begin_end_day: งานที่เริ่มและจบวันนี้
+text_project_identifier_info: 'ภาษาอังกฤษตัวเล็ก(a-z), ตัวเลข(0-9) และขีด (-) เท่านั้น.<br />เมื่อจัดเก็บแล้ว, ชื่อเฉพาะไม่สามารถเปลี่ยนแปลงได้'
+text_caracters_maximum: สูงสุด %d ตัวอักษร.
+text_caracters_minimum: ต้องยาวอย่างน้อย %d ตัวอักษร.
+text_length_between: ความยาวระหว่าง %d ถึง %d ตัวอักษร.
+text_tracker_no_workflow: ไม่ได้บัญญัติลำดับงานสำหรับการติดตามนี้
+text_unallowed_characters: ตัวอักษรต้องห้าม
+text_comma_separated: ใส่ได้หลายค่า โดยคั่นด้วยลูกน้ำ( ,).
+text_issues_ref_in_commit_messages: Referencing and fixing issues in commit messages
+text_issue_added: ปัญหา %s ถูกแจ้งโดย %s.
+text_issue_updated: ปัญหา %s ถูกปรับปรุงโดย %s.
+text_wiki_destroy_confirmation: คุณแน่ใจหรือว่าต้องการลบ wiki นี้พร้อมทั้งเนี้อหา?
+text_issue_category_destroy_question: บางปัญหา (%d) อยู่ในประเภทนี้. คุณต้องการทำอย่างไร ?
+text_issue_category_destroy_assignments: ลบประเภทนี้
+text_issue_category_reassign_to: ระบุปัญหาในประเภทนี้
+text_user_mail_option: "ในโครงการที่ไม่ได้เลือก, คุณจะได้รับการแจ้งเกี่ยวกับสิ่งที่คุณเฝ้าดูหรือมีส่วนเกี่ยวข้อง (เช่นปัญหาที่คุณแจ้งไว้หรือได้รับมอบหมาย)."
+text_no_configuration_data: "บทบาท, การติดตาม, สถานะปัญหา และลำดับงานยังไม่ได้ถูกตั้งค่า.\nขอแนะนำให้โหลดค่าเริ่มต้น. คุณสามารถแก้ไขค่าได้หลังจากโหลดแล้ว."
+text_load_default_configuration: โหลดค่าเริ่มต้น
+text_status_changed_by_changeset: ประยุกต์ใช้ในกลุ่มการเปลี่ยนแปลง %s.
+text_issues_destroy_confirmation: 'คุณแน่ใจไหมว่าต้องการลบปัญหา(ทั้งหลาย)ที่เลือกไว้?'
+text_select_project_modules: 'เลือกส่วนประกอบที่ต้องการใช้งานสำหรับโครงการนี้:'
+text_default_administrator_account_changed: ค่าเริ่มต้นของบัญชีผู้บริหารจัดการถูกเปลี่ยนแปลง
+text_file_repository_writable: ที่เก็บต้นฉบับสามารถเขียนได้
+text_rmagick_available: RMagick มีให้ใช้ (เป็นตัวเลือก)
+text_destroy_time_entries_question: %.02f ชั่วโมงที่ถูกแจ้งในปัญหานี้จะโดนลบ. คุณต้องการทำอย่างไร?
+text_destroy_time_entries: ลบเวลาที่รายงานไว้
+text_assign_time_entries_to_project: ระบุเวลาที่ใช้ในโครงการนี้
+text_reassign_time_entries: 'ระบุเวลาที่ใช้ในโครงการนี่อีกครั้ง:'
+
+default_role_manager: ผู้จัดการ
+default_role_developper: ผู้พัฒนา
+default_role_reporter: ผู้รายงาน
+default_tracker_bug: บั๊ก
+default_tracker_feature: ลักษณะเด่น
+default_tracker_support: สนับสนุน
+default_issue_status_new: เกิดขึ้น
+default_issue_status_assigned: รับมอบหมาย
+default_issue_status_resolved: ดำเนินการ
+default_issue_status_feedback: รอคำตอบ
+default_issue_status_closed: จบ
+default_issue_status_rejected: ยกเลิก
+default_doc_category_user: เอกสารของผู้ใช้
+default_doc_category_tech: เอกสารทางเทคนิค
+default_priority_low: ต่ำ
+default_priority_normal: ปกติ
+default_priority_high: สูง
+default_priority_urgent: เร่งด่วน
+default_priority_immediate: ด่วนมาก
+default_activity_design: ออกแบบ
+default_activity_development: พัฒนา
+
+enumeration_issue_priorities: ความสำคัญของปัญหา
+enumeration_doc_categories: ประเภทเอกสาร
+enumeration_activities: กิจกรรม (ใช้ในการติดตามเวลา)
diff --git a/public/javascripts/calendar/lang/calendar-th.js b/public/javascripts/calendar/lang/calendar-th.js
new file mode 100644
index 000000000..dc4809e52
--- /dev/null
+++ b/public/javascripts/calendar/lang/calendar-th.js
@@ -0,0 +1,127 @@
+// ** I18N
+
+// Calendar EN language
+// Author: Gampol Thitinilnithi, <gampolt@gmail.com>
+// Encoding: UTF-8
+// Distributed under the same terms as the calendar itself.
+
+// For translators: please use UTF-8 if possible.  We strongly believe that
+// Unicode is the answer to a real internationalized world.  Also please
+// include your contact information in the header, as can be seen above.
+
+// full day names
+Calendar._DN = new Array
+("อาทิตย์",
+ "จันทร์",
+ "อังคาร",
+ "พุธ",
+ "พฤหัสบดี",
+ "ศุกร์",
+ "เสาร์",
+ "อาทิตย์");
+
+// Please note that the following array of short day names (and the same goes
+// for short month names, _SMN) isn't absolutely necessary.  We give it here
+// for exemplification on how one can customize the short day names, but if
+// they are simply the first N letters of the full name you can simply say:
+//
+//   Calendar._SDN_len = N; // short day name length
+//   Calendar._SMN_len = N; // short month name length
+//
+// If N = 3 then this is not needed either since we assume a value of 3 if not
+// present, to be compatible with translation files that were written before
+// this feature.
+
+// short day names
+Calendar._SDN = new Array
+("อา.",
+ "จ.",
+ "อ.",
+ "พ.",
+ "พฤ.",
+ "ศ.",
+ "ส.",
+ "อา.");
+
+// First day of the week. "0" means display Sunday first, "1" means display
+// Monday first, etc.
+Calendar._FD = 1;
+
+// full month names
+Calendar._MN = new Array
+("มกราคม",
+ "กุมภาพันธ์",
+ "มีนาคม",
+ "เมษายน",
+ "พฤษภาคม",
+ "มิถุนายน",
+ "กรกฎาคม",
+ "สิงหาคม",
+ "กันยายน",
+ "ตุลาคม",
+ "พฤศจิกายน",
+ "ธันวาคม");
+
+// short month names
+Calendar._SMN = new Array
+("ม.ค.",
+ "ก.พ.",
+ "มี.ค.",
+ "เม.ย.",
+ "พ.ค.",
+ "มิ.ย.",
+ "ก.ค.",
+ "ส.ค.",
+ "ก.ย.",
+ "ต.ค.",
+ "พ.ย.",
+ "ธ.ค.");
+
+// tooltips
+Calendar._TT = {};
+Calendar._TT["INFO"] = "เกี่ยวกับปฏิทิน";
+
+Calendar._TT["ABOUT"] =
+"DHTML Date/Time Selector\n" +
+"(c) dynarch.com 2002-2005 / Author: Mihai Bazon\n" + // don't translate this this ;-)
+"For latest version visit: http://www.dynarch.com/projects/calendar/\n" +
+"Distributed under GNU LGPL.  See http://gnu.org/licenses/lgpl.html for details." +
+"\n\n" +
+"Date selection:\n" +
+"- Use the \xab, \xbb buttons to select year\n" +
+"- Use the " + String.fromCharCode(0x2039) + ", " + String.fromCharCode(0x203a) + " buttons to select month\n" +
+"- Hold mouse button on any of the above buttons for faster selection.";
+Calendar._TT["ABOUT_TIME"] = "\n\n" +
+"Time selection:\n" +
+"- Click on any of the time parts to increase it\n" +
+"- or Shift-click to decrease it\n" +
+"- or click and drag for faster selection.";
+
+Calendar._TT["PREV_YEAR"] = "ปีที่แล้ว (ถ้ากดค้างจะมีเมนู)";
+Calendar._TT["PREV_MONTH"] = "เดือนที่แล้ว (ถ้ากดค้างจะมีเมนู)";
+Calendar._TT["GO_TODAY"] = "ไปที่วันนี้";
+Calendar._TT["NEXT_MONTH"] = "เดือนหน้า (ถ้ากดค้างจะมีเมนู)";
+Calendar._TT["NEXT_YEAR"] = "ปีหน้า (ถ้ากดค้างจะมีเมนู)";
+Calendar._TT["SEL_DATE"] = "เลือกวัน";
+Calendar._TT["DRAG_TO_MOVE"] = "กดแล้วลากเพื่อย้าย";
+Calendar._TT["PART_TODAY"] = " (วันนี้)";
+
+// the following is to inform that "%s" is to be the first day of week
+// %s will be replaced with the day name.
+Calendar._TT["DAY_FIRST"] = "แสดง %s เป็นวันแรก";
+
+// This may be locale-dependent.  It specifies the week-end days, as an array
+// of comma-separated numbers.  The numbers are from 0 to 6: 0 means Sunday, 1
+// means Monday, etc.
+Calendar._TT["WEEKEND"] = "0,6";
+
+Calendar._TT["CLOSE"] = "ปิด";
+Calendar._TT["TODAY"] = "วันนี้";
+Calendar._TT["TIME_PART"] = "(Shift-)กดหรือกดแล้วลากเพื่อเปลี่ยนค่า";
+
+// date formats
+Calendar._TT["DEF_DATE_FORMAT"] = "%Y-%m-%d";
+Calendar._TT["TT_DATE_FORMAT"] = "%a %e %b";
+
+Calendar._TT["WK"] = "wk";
+Calendar._TT["TIME"] = "เวลา:";
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-th.js b/public/javascripts/jstoolbar/lang/jstoolbar-th.js
new file mode 100644
index 000000000..2e2f2b88e
--- /dev/null
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-th.js
@@ -0,0 +1,14 @@
+jsToolBar.strings = {};
+jsToolBar.strings['Strong'] = 'หนา';
+jsToolBar.strings['Italic'] = 'เอียง';
+jsToolBar.strings['Underline'] = 'ขีดเส้นใต้';
+jsToolBar.strings['Deleted'] = 'ขีดฆ่า';
+jsToolBar.strings['Code'] = 'โค๊ดโปรแกรม';
+jsToolBar.strings['Heading 1'] = 'หัวข้อ 1';
+jsToolBar.strings['Heading 2'] = 'หัวข้อ 2';
+jsToolBar.strings['Heading 3'] = 'หัวข้อ 3';
+jsToolBar.strings['Unordered list'] = 'รายการ';
+jsToolBar.strings['Ordered list'] = 'ลำดับเลข';
+jsToolBar.strings['Preformatted text'] = 'รูปแบบข้อความคงที่';
+jsToolBar.strings['Wiki link'] = 'เชื่อมโยงไปหน้า Wiki อื่น';
+jsToolBar.strings['Image'] = 'รูปภาพ';

From 4525a7429aecbdf44a62fc3c8adb972727ba19ad Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Wed, 30 Apr 2008 08:51:12 +0000
Subject: [PATCH 410/710] Fixed: Home, Logout, Login links are absolute (#1122,
 #1145).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1384 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 lib/redmine.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/redmine.rb b/lib/redmine.rb
index 2697e8f5f..cef2615df 100644
--- a/lib/redmine.rb
+++ b/lib/redmine.rb
@@ -94,7 +94,7 @@ Redmine::AccessControl.map do |map|
 end
 
 Redmine::MenuManager.map :top_menu do |menu|
-  menu.push :home, :home_url, :html => { :class => 'home' }
+  menu.push :home, :home_path, :html => { :class => 'home' }
   menu.push :my_page, { :controller => 'my', :action => 'page' }, :html => { :class => 'mypage' }, :if => Proc.new { User.current.logged? }
   menu.push :projects, { :controller => 'projects', :action => 'index' }, :caption => :label_project_plural, :html => { :class => 'projects' }
   menu.push :administration, { :controller => 'admin', :action => 'index' }, :html => { :class => 'admin' }, :if => Proc.new { User.current.admin? }
@@ -102,10 +102,10 @@ Redmine::MenuManager.map :top_menu do |menu|
 end
 
 Redmine::MenuManager.map :account_menu do |menu|
-  menu.push :login, :signin_url, :html => { :class => 'login' }, :if => Proc.new { !User.current.logged? }
+  menu.push :login, :signin_path, :html => { :class => 'login' }, :if => Proc.new { !User.current.logged? }
   menu.push :register, { :controller => 'account', :action => 'register' }, :html => { :class => 'register' }, :if => Proc.new { !User.current.logged? && Setting.self_registration? }
   menu.push :my_account, { :controller => 'my', :action => 'account' }, :html => { :class => 'myaccount' }, :if => Proc.new { User.current.logged? }
-  menu.push :logout, :signout_url, :html => { :class => 'logout' }, :if => Proc.new { User.current.logged? }
+  menu.push :logout, :signout_path, :html => { :class => 'logout' }, :if => Proc.new { User.current.logged? }
 end
 
 Redmine::MenuManager.map :application_menu do |menu|

From f1ae453688aef224d5d8dd9e715811a7517e1bb2 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Wed, 30 Apr 2008 09:09:28 +0000
Subject: [PATCH 411/710] Fixed: Updating tickets add a time log with zero
 hours (#1147).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1385 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 lib/redmine/core_ext/string/conversions.rb |  2 +-
 test/functional/issues_controller_test.rb  | 25 ++++++++++++++--------
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/lib/redmine/core_ext/string/conversions.rb b/lib/redmine/core_ext/string/conversions.rb
index 7444445b0..41149f5ea 100644
--- a/lib/redmine/core_ext/string/conversions.rb
+++ b/lib/redmine/core_ext/string/conversions.rb
@@ -32,7 +32,7 @@ module Redmine #:nodoc:
           end
           # 2,5 => 2.5
           s.gsub!(',', '.')
-          s.to_f
+          begin; Kernel.Float(s); rescue; nil; end
         end
       end
     end
diff --git a/test/functional/issues_controller_test.rb b/test/functional/issues_controller_test.rb
index 042a8f3f2..a6d2ca6e3 100644
--- a/test/functional/issues_controller_test.rb
+++ b/test/functional/issues_controller_test.rb
@@ -169,13 +169,15 @@ class IssuesControllerTest < Test::Unit::TestCase
                :issue => {:tracker_id => 1,
                           :subject => 'This is the test_new issue',
                           :description => 'This is the description',
-                          :priority_id => 5},
+                          :priority_id => 5,
+                          :estimated_hours => ''},
                :custom_fields => {'2' => 'Value for field 2'}
     assert_redirected_to 'issues/show'
     
     issue = Issue.find_by_subject('This is the test_new issue')
     assert_not_nil issue
     assert_equal 2, issue.author_id
+    assert_nil issue.estimated_hours
     v = issue.custom_values.find_by_custom_field_id(2)
     assert_not_nil v
     assert_equal 'Value for field 2', v.value
@@ -254,10 +256,13 @@ class IssuesControllerTest < Test::Unit::TestCase
     issue = Issue.find(1)
     assert_equal 1, issue.status_id
     @request.session[:user_id] = 2
-    post :edit,
-         :id => 1,
-         :issue => { :status_id => 2, :assigned_to_id => 3 },
-         :notes => 'Assigned to dlopper'
+    assert_difference('TimeEntry.count', 0) do
+      post :edit,
+           :id => 1,
+           :issue => { :status_id => 2, :assigned_to_id => 3 },
+           :notes => 'Assigned to dlopper',
+           :time_entry => { :hours => '', :comments => '', :activity_id => Enumeration.get_values('ACTI').first }
+    end
     assert_redirected_to 'issues/show/1'
     issue.reload
     assert_equal 2, issue.status_id
@@ -288,10 +293,12 @@ class IssuesControllerTest < Test::Unit::TestCase
   def test_post_edit_with_note_and_spent_time
     @request.session[:user_id] = 2
     spent_hours_before = Issue.find(1).spent_hours
-    post :edit,
-         :id => 1,
-         :notes => '2.5 hours added',
-         :time_entry => { :hours => '2.5', :comments => '', :activity_id => Enumeration.get_values('ACTI').first }
+    assert_difference('TimeEntry.count') do
+      post :edit,
+           :id => 1,
+           :notes => '2.5 hours added',
+           :time_entry => { :hours => '2.5', :comments => '', :activity_id => Enumeration.get_values('ACTI').first }
+    end
     assert_redirected_to 'issues/show/1'
     
     issue = Issue.find(1)

From b2abe48592b3b2425d63bfbe2dc38e051bec272a Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Wed, 30 Apr 2008 12:14:15 +0000
Subject: [PATCH 412/710] Use GET instead of POST on roadmap (#718), gantt and
 calendar forms.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1388 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/projects/calendar.rhtml | 2 +-
 app/views/projects/gantt.rhtml    | 4 ++--
 app/views/projects/roadmap.rhtml  | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/views/projects/calendar.rhtml b/app/views/projects/calendar.rhtml
index 743721cb3..048d8a5df 100644
--- a/app/views/projects/calendar.rhtml
+++ b/app/views/projects/calendar.rhtml
@@ -23,7 +23,7 @@
 <% content_for :sidebar do %>
     <h3><%= l(:label_calendar) %></h3>
     
-    <% form_tag() do %>
+    <% form_tag({}, :method => :get) do %>
     <p><%= select_month(@month, :prefix => "month", :discard_type => true) %>
     <%= select_year(@year, :prefix => "year", :discard_type => true) %></p>
     
diff --git a/app/views/projects/gantt.rhtml b/app/views/projects/gantt.rhtml
index d941d2777..f398bace7 100644
--- a/app/views/projects/gantt.rhtml
+++ b/app/views/projects/gantt.rhtml
@@ -235,7 +235,7 @@ if Date.today >= @date_from and Date.today <= @date_to %>
 
 <% content_for :sidebar do %>
     <h3><%= l(:label_gantt) %></h3>
-    <% form_tag(params.merge(:tracker_ids => nil, :with_subprojects => nil)) do %>
+    <% form_tag(params.merge(:tracker_ids => nil, :with_subprojects => nil), :method => :get) do %>
     <% @trackers.each do |tracker| %>
       <label><%= check_box_tag "tracker_ids[]", tracker.id, (@selected_tracker_ids.include? tracker.id.to_s) %> <%= tracker.name %></label><br />
     <% end %>
@@ -243,7 +243,7 @@ if Date.today >= @date_from and Date.today <= @date_to %>
     <br /><label><%= check_box_tag 'with_subprojects', 1, @with_subprojects %> <%=l(:label_subproject_plural)%></label>
     <%= hidden_field_tag 'with_subprojects', 0 %>
     <% end %>
-    <p><%= submit_tag l(:button_apply), :class => 'button-small' %></p>
+    <p><%= submit_tag l(:button_apply), :class => 'button-small', :name => nil %></p>
     <% end %>
 <% end %>
 
diff --git a/app/views/projects/roadmap.rhtml b/app/views/projects/roadmap.rhtml
index d9329d109..ba0bb3ebd 100644
--- a/app/views/projects/roadmap.rhtml
+++ b/app/views/projects/roadmap.rhtml
@@ -30,7 +30,7 @@
 <% end %>
 
 <% content_for :sidebar do %>
-<% form_tag do %>
+<% form_tag({}, :method => :get) do %>
 <h3><%= l(:label_roadmap) %></h3>
 <% @trackers.each do |tracker| %>
   <label><%= check_box_tag "tracker_ids[]", tracker.id, (@selected_tracker_ids.include? tracker.id.to_s), :id => nil %>
@@ -38,7 +38,7 @@
 <% end %>
 <br />
 <label for="completed"><%= check_box_tag "completed", 1, params[:completed] %> <%= l(:label_show_completed_versions) %></label>
-<p><%= submit_tag l(:button_apply), :class => 'button-small' %></p>
+<p><%= submit_tag l(:button_apply), :class => 'button-small', :name => nil %></p>
 <% end %>
 
 <h3><%= l(:label_version_plural) %></h3>

From 6d637ad98255ab85cfc7728a0972e0b5181770a5 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Thu, 1 May 2008 08:44:40 +0000
Subject: [PATCH 413/710] Add Redcloth's :block_markdown_rule to allow
 horizontal rules in wiki (#967).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1389 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 lib/redmine/wiki_formatting.rb               | 2 +-
 test/unit/helpers/application_helper_test.rb | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/lib/redmine/wiki_formatting.rb b/lib/redmine/wiki_formatting.rb
index 79da2a38a..553f77132 100644
--- a/lib/redmine/wiki_formatting.rb
+++ b/lib/redmine/wiki_formatting.rb
@@ -26,7 +26,7 @@ module Redmine
     class TextileFormatter < RedCloth
       
       # auto_link rule after textile rules so that it doesn't break !image_url! tags
-      RULES = [:textile, :inline_auto_link, :inline_auto_mailto, :inline_toc, :inline_macros]
+      RULES = [:textile, :block_markdown_rule, :inline_auto_link, :inline_auto_mailto, :inline_toc, :inline_macros]
       
       def initialize(*args)
         super
diff --git a/test/unit/helpers/application_helper_test.rb b/test/unit/helpers/application_helper_test.rb
index fa2109131..182cd3aec 100644
--- a/test/unit/helpers/application_helper_test.rb
+++ b/test/unit/helpers/application_helper_test.rb
@@ -160,6 +160,11 @@ class ApplicationHelperTest < HelperTestCase
     to_test.each { |text, result| assert_equal "<table>#{result}</table>", textilizable(text).gsub(/[\t\n]/, '') }
   end
   
+  def test_wiki_horizontal_rule
+    assert_equal '<hr />', textilizable('---')
+    assert_equal '<p>Dashes: ---</p>', textilizable('Dashes: ---')
+  end
+  
   def test_macro_hello_world
     text = "{{hello_world}}"
     assert textilizable(text).match(/Hello world!/)

From 2d11265ec5e1696769bbd0f115cc14d2461c588f Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Thu, 1 May 2008 12:56:59 +0000
Subject: [PATCH 414/710] Fixed: private subprojects names are revealed on the
 project overview (#1152).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1399 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/projects_controller.rb      |  2 +-
 test/fixtures/members.yml                   |  6 ++++++
 test/fixtures/projects.yml                  | 14 +++++++++++++-
 test/functional/projects_controller_test.rb | 15 +++++++++++++++
 test/unit/project_test.rb                   |  2 +-
 5 files changed, 36 insertions(+), 3 deletions(-)

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index b71ec1ecd..34ce734a5 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -87,7 +87,7 @@ class ProjectsController < ApplicationController
   def show
     @custom_values = @project.custom_values.find(:all, :include => :custom_field, :order => "#{CustomField.table_name}.position")
     @members_by_role = @project.members.find(:all, :include => [:user, :role], :order => 'position').group_by {|m| m.role}
-    @subprojects = @project.active_children
+    @subprojects = @project.children.find(:all, :conditions => Project.visible_by(User.current))
     @news = @project.news.find(:all, :limit => 5, :include => [ :author, :project ], :order => "#{News.table_name}.created_on DESC")
     @trackers = @project.rolled_up_trackers
     
diff --git a/test/fixtures/members.yml b/test/fixtures/members.yml
index 2c9209131..32c65c673 100644
--- a/test/fixtures/members.yml
+++ b/test/fixtures/members.yml
@@ -24,4 +24,10 @@ members_004:
   role_id: 2
   # Locked user
   user_id: 5
+members_005: 
+  id: 5
+  created_on: 2006-07-19 19:35:33 +02:00
+  project_id: 5
+  role_id: 1
+  user_id: 2
   
\ No newline at end of file
diff --git a/test/fixtures/projects.yml b/test/fixtures/projects.yml
index ad5cf4aa2..8e1b3fe1d 100644
--- a/test/fixtures/projects.yml
+++ b/test/fixtures/projects.yml
@@ -3,7 +3,7 @@ projects_001:
   created_on: 2006-07-19 19:13:59 +02:00
   name: eCookbook
   updated_on: 2006-07-19 22:53:01 +02:00
-  projects_count: 2
+  projects_count: 3
   id: 1
   description: Recipes management application
   homepage: http://ecookbook.somenet.foo/
@@ -43,3 +43,15 @@ projects_004:
   is_public: true
   identifier: subproject2
   parent_id: 1
+projects_005: 
+  created_on: 2006-07-19 19:15:51 +02:00
+  name: Private child of eCookbook
+  updated_on: 2006-07-19 19:17:07 +02:00
+  projects_count: 0
+  id: 5
+  description: This is a private subproject of a public project
+  homepage: ""
+  is_public: false
+  identifier: private_child
+  parent_id: 1
+  
\ No newline at end of file
diff --git a/test/functional/projects_controller_test.rb b/test/functional/projects_controller_test.rb
index eb5795152..5af7b5572 100644
--- a/test/functional/projects_controller_test.rb
+++ b/test/functional/projects_controller_test.rb
@@ -63,6 +63,21 @@ class ProjectsControllerTest < Test::Unit::TestCase
     assert_equal Project.find_by_identifier('ecookbook'), assigns(:project)
   end
   
+  def test_private_subprojects_hidden
+    get :show, :id => 'ecookbook'
+    assert_response :success
+    assert_template 'show'
+    assert_no_tag :tag => 'a', :content => /Private child/
+  end
+
+  def test_private_subprojects_visible
+    @request.session[:user_id] = 2 # manager who is a member of the private subproject
+    get :show, :id => 'ecookbook'
+    assert_response :success
+    assert_template 'show'
+    assert_tag :tag => 'a', :content => /Private child/
+  end
+  
   def test_settings
     @request.session[:user_id] = 2 # manager
     get :settings, :id => 1
diff --git a/test/unit/project_test.rb b/test/unit/project_test.rb
index 9af68c231..f24e7d44f 100644
--- a/test/unit/project_test.rb
+++ b/test/unit/project_test.rb
@@ -101,7 +101,7 @@ class ProjectTest < Test::Unit::TestCase
     assert sub.save
     assert_equal @ecookbook.id, sub.parent.id
     @ecookbook.reload
-    assert_equal 3, @ecookbook.children.size
+    assert_equal 4, @ecookbook.children.size
   end
   
   def test_subproject_invalid

From f705b889d9d20086094939b1e7060bf49bd01f2b Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Thu, 1 May 2008 13:01:23 +0000
Subject: [PATCH 415/710] Hide the 'Latest projects' box on the welcome screen
 if there are no projects (#1156).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1400 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/welcome/index.rhtml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/views/welcome/index.rhtml b/app/views/welcome/index.rhtml
index 5da5a1ed3..8c25897bd 100644
--- a/app/views/welcome/index.rhtml
+++ b/app/views/welcome/index.rhtml
@@ -12,6 +12,7 @@
 </div>
 
 <div class="splitcontentright">
+    <% if @projects.any? %>
 	<div class="box">
 	<h3 class="icon22 icon22-projects"><%=l(:label_project_latest)%></h3>
 		<ul>
@@ -22,7 +23,8 @@
 			</li>
 		<% end %>
 		</ul>
-	</div>  
+	</div>
+	<% end %>
 </div>	
 
 <% content_for :header_tags do %>

From 7f8d959171c571eaf1a49951a2da02ccffa6f808 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Thu, 1 May 2008 13:50:39 +0000
Subject: [PATCH 416/710] Show the project hierarchy in the drop down list for
 new membership on user administration screen.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1401 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/helpers/users_helper.rb        | 14 ++++++++++++++
 app/views/users/_memberships.rhtml | 12 ++++++------
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb
index 250ed8ce8..0fe1755eb 100644
--- a/app/helpers/users_helper.rb
+++ b/app/helpers/users_helper.rb
@@ -23,6 +23,20 @@ module UsersHelper
                         [l(:status_locked), 3]], selected)
   end
   
+  # Options for the new membership projects combo-box
+  def projects_options_for_select(projects)
+    options = content_tag('option', "--- #{l(:actionview_instancetag_blank_option)} ---")
+    projects_by_root = projects.group_by(&:root)
+    projects_by_root.keys.sort.each do |root|
+      options << content_tag('option', h(root.name), :value => root.id, :disabled => (!projects.include?(root)))
+      projects_by_root[root].sort.each do |project|
+        next if project == root
+        options << content_tag('option', '&#187; ' + h(project.name), :value => project.id)
+      end
+    end
+    options
+  end
+  
   def change_status_link(user)
     url = {:action => 'edit', :id => user, :page => params[:page], :status => params[:status]}
     
diff --git a/app/views/users/_memberships.rhtml b/app/views/users/_memberships.rhtml
index 2499ba387..44d74ef7b 100644
--- a/app/views/users/_memberships.rhtml
+++ b/app/views/users/_memberships.rhtml
@@ -13,17 +13,17 @@
 </p>
 <% end %>
 <% end %>
+
+<% if @projects.any? %>
 <hr />
 <p>
 <label><%=l(:label_project_new)%></label><br/>
 <% form_tag({ :action => 'edit_membership', :id => @user }) do %>
-<select name="membership[project_id]">
-<%= options_from_collection_for_select @projects, "id", "name", @membership.project_id %>
-</select>
-<select name="membership[role_id]">
-<%= options_from_collection_for_select @roles, "id", "name", @membership.role_id %>
-</select>
+<%= select_tag 'membership[project_id]', projects_options_for_select(@projects) %>
+<%= l(:label_role) %>:
+<%= select_tag 'membership[role_id]', options_from_collection_for_select(@roles, "id", "name") %>
 <%= submit_tag l(:button_add) %>
 <% end %>
 </p>
+<% end %>
 </div>
\ No newline at end of file

From 7a969dafacf06f9079a925f69b62dbad81c3aba4 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Fri, 2 May 2008 15:16:17 +0000
Subject: [PATCH 417/710] Escape HTML comment tags (#1160).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1403 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 lib/redcloth.rb                              | 2 +-
 test/unit/helpers/application_helper_test.rb | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/redcloth.rb b/lib/redcloth.rb
index 7e0c71839..7729ced46 100644
--- a/lib/redcloth.rb
+++ b/lib/redcloth.rb
@@ -1134,7 +1134,7 @@ class RedCloth < String
     ALLOWED_TAGS = %w(redpre pre code)
     
     def escape_html_tags(text)
-      text.gsub!(%r{<(\/?(\w+)[^>\n]*)(>?)}) {|m| ALLOWED_TAGS.include?($2) ? "<#{$1}#{$3}" : "&lt;#{$1}#{'&gt;' if $3}" }
+      text.gsub!(%r{<(\/?([!\w]+)[^<>\n]*)(>?)}) {|m| ALLOWED_TAGS.include?($2) ? "<#{$1}#{$3}" : "&lt;#{$1}#{'&gt;' unless $3.blank?}" }
     end
 end
 
diff --git a/test/unit/helpers/application_helper_test.rb b/test/unit/helpers/application_helper_test.rb
index 182cd3aec..e8b5883ce 100644
--- a/test/unit/helpers/application_helper_test.rb
+++ b/test/unit/helpers/application_helper_test.rb
@@ -141,6 +141,8 @@ class ApplicationHelperTest < HelperTestCase
       "<pre>\nline 1\nline2</pre>" => "<pre>\nline 1\nline2</pre>",
       "<pre><code>\nline 1\nline2</code></pre>" => "<pre><code>\nline 1\nline2</code></pre>",
       "<pre><div>content</div></pre>" => "<pre>&lt;div&gt;content&lt;/div&gt;</pre>",
+      "HTML comment: <!-- no comments -->" => "<p>HTML comment: &lt;!-- no comments --&gt;</p>",
+      "<!-- opening comment" => "<p>&lt;!-- opening comment</p>"
     }
     to_test.each { |text, result| assert_equal result, textilizable(text) }
   end

From 63951812a1ed56e61cd6e5ee8439c772f800521c Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Fri, 2 May 2008 15:21:21 +0000
Subject: [PATCH 418/710] Split user edit screen into tabs.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1404 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/users_controller.rb | 13 ++++-----
 app/helpers/users_helper.rb         |  6 ++++
 app/views/users/_form.rhtml         |  1 -
 app/views/users/_general.rhtml      |  4 +++
 app/views/users/_memberships.rhtml  | 43 ++++++++++++++++++-----------
 app/views/users/edit.rhtml          | 27 ++++++++++++++----
 6 files changed, 63 insertions(+), 31 deletions(-)
 create mode 100644 app/views/users/_general.rhtml

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 48fc6fade..c37709661 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -91,23 +91,20 @@ class UsersController < ApplicationController
     @roles = Role.find_all_givable
     @projects = Project.find(:all, :order => 'name', :conditions => "status=#{Project::STATUS_ACTIVE}") - @user.projects
     @membership ||= Member.new
+    @memberships = @user.memberships
   end
   
   def edit_membership
     @user = User.find(params[:id])
     @membership = params[:membership_id] ? Member.find(params[:membership_id]) : Member.new(:user => @user)
     @membership.attributes = params[:membership]
-    if request.post? and @membership.save
-      flash[:notice] = l(:notice_successful_update)
-    end
-    redirect_to :action => 'edit', :id => @user and return
+    @membership.save if request.post?
+    redirect_to :action => 'edit', :id => @user, :tab => 'memberships'
   end
   
   def destroy_membership
     @user = User.find(params[:id])
-    if request.post? and Member.find(params[:membership_id]).destroy
-      flash[:notice] = l(:notice_successful_update)
-    end
-    redirect_to :action => 'edit', :id => @user and return
+    Member.find(params[:membership_id]).destroy if request.post?
+    redirect_to :action => 'edit', :id => @user, :tab => 'memberships'
   end
 end
diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb
index 0fe1755eb..6976d021b 100644
--- a/app/helpers/users_helper.rb
+++ b/app/helpers/users_helper.rb
@@ -48,4 +48,10 @@ module UsersHelper
       link_to l(:button_lock), url.merge(:user => {:status => User::STATUS_LOCKED}), :method => :post, :class => 'icon icon-lock'
     end
   end
+  
+  def user_settings_tabs
+    tabs = [{:name => 'general', :partial => 'users/general', :label => :label_general},
+            {:name => 'memberships', :partial => 'users/memberships', :label => :label_project_plural}
+            ]
+  end
 end
diff --git a/app/views/users/_form.rhtml b/app/views/users/_form.rhtml
index ff4278c1f..6ca167a59 100644
--- a/app/views/users/_form.rhtml
+++ b/app/views/users/_form.rhtml
@@ -2,7 +2,6 @@
 
 <!--[form:user]-->
 <div class="box">
-<h3><%=l(:label_information_plural)%></h3>
 <p><%= f.text_field :login, :required => true, :size => 25  %></p>
 <p><%= f.text_field :firstname, :required => true %></p>
 <p><%= f.text_field :lastname, :required => true %></p>
diff --git a/app/views/users/_general.rhtml b/app/views/users/_general.rhtml
new file mode 100644
index 000000000..80615ff6c
--- /dev/null
+++ b/app/views/users/_general.rhtml
@@ -0,0 +1,4 @@
+<% labelled_tabular_form_for :user, @user, :url => { :action => "edit" } do |f| %>
+<%= render :partial => 'form', :locals => { :f => f } %>
+<%= submit_tag l(:button_save) %>
+<% end %>
diff --git a/app/views/users/_memberships.rhtml b/app/views/users/_memberships.rhtml
index 44d74ef7b..94b49159e 100644
--- a/app/views/users/_memberships.rhtml
+++ b/app/views/users/_memberships.rhtml
@@ -1,21 +1,33 @@
-<div class="box" style="margin-top: 16px;">
-<h3><%= l(:label_project_plural) %></h3>
-
-<% @user.memberships.each do |membership| %>
-<% form_tag({ :action => 'edit_membership', :id => @user, :membership_id => membership }, :class => "tabular") do %>
-<p style="margin:0;padding-top:0;">
-    <label><%= membership.project.name %></label>
-    <select name="membership[role_id]">
-    <%= options_from_collection_for_select @roles, "id", "name", membership.role_id %>
-    </select>
-    <%= submit_tag l(:button_change), :class => "button-small" %>
-    <%= link_to l(:button_delete), {:action => 'destroy_membership', :id => @user, :membership_id => membership }, :confirm => l(:text_are_you_sure), :method => :post, :class => 'icon icon-del' %>
-</p>
-<% end %>
+<% if @memberships.any? %>
+<table class="list memberships">
+	<thead>
+	  <th><%= l(:label_project) %></th>
+	  <th><%= l(:label_role) %></th>
+	  <th style="width:15%"></th>
+	</thead>
+	<tbody>
+	<% @memberships.each do |membership| %>
+	<% next if membership.new_record? %>
+	<tr class="<%= cycle 'odd', 'even' %>">
+	<td><%=h membership.project %></td>
+    <td align="center">
+    <% form_tag({ :action => 'edit_membership', :id => @user, :membership_id => membership }) do %>
+        <%= select_tag 'membership[role_id]', options_from_collection_for_select(@roles, "id", "name", membership.role_id) %>
+        <%= submit_tag l(:button_change), :class => "small" %>
+    <% end %>
+    </td>
+    <td align="center">
+      <%= link_to l(:button_delete), {:action => 'destroy_membership', :id => @user, :membership_id => membership }, :method => :post, :class => 'icon icon-del' %>
+    </td>
+	</tr>
+	</tbody>
+<% end; reset_cycle %>
+</table>
+<% else %>
+<p class="nodata"><%= l(:label_no_data) %></p>
 <% end %>
 
 <% if @projects.any? %>
-<hr />
 <p>
 <label><%=l(:label_project_new)%></label><br/>
 <% form_tag({ :action => 'edit_membership', :id => @user }) do %>
@@ -26,4 +38,3 @@
 <% end %>
 </p>
 <% end %>
-</div>
\ No newline at end of file
diff --git a/app/views/users/edit.rhtml b/app/views/users/edit.rhtml
index 0da99d0d2..a4d0b2e5b 100644
--- a/app/views/users/edit.rhtml
+++ b/app/views/users/edit.rhtml
@@ -1,8 +1,23 @@
-<h2><%=l(:label_user)%></h2>
+<h2><%=l(:label_user)%>: <%=h @user.login %></h2>
 
-<% labelled_tabular_form_for :user, @user, :url => { :action => "edit" } do |f| %>
-<%= render :partial => 'form', :locals => { :f => f } %>
-<%= submit_tag l(:button_save) %>
-<% end %>
+<% selected_tab = params[:tab] ? params[:tab].to_s : user_settings_tabs.first[:name] %>
 
-<%= render :partial => 'memberships' %>
\ No newline at end of file
+<div class="tabs">
+<ul>
+<% user_settings_tabs.each do |tab| -%>
+    <li><%= link_to l(tab[:label]), { :tab => tab[:name] },
+                                    :id => "tab-#{tab[:name]}",
+                                    :class => (tab[:name] != selected_tab ? nil : 'selected'),
+                                    :onclick => "showTab('#{tab[:name]}'); this.blur(); return false;" %></li>
+<% end -%>
+</ul>
+</div>
+
+<% user_settings_tabs.each do |tab| -%>
+<%= content_tag('div', render(:partial => tab[:partial]), 
+                       :id => "tab-content-#{tab[:name]}",
+                       :style => (tab[:name] != selected_tab ? 'display:none' : nil),
+                       :class => 'tab-content') %>
+<% end -%>
+
+<% html_title(l(:label_user), @user.login, l(:label_administration)) -%>

From c65d696f41a1657afaf543a8410500e7dc9ec531 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Fri, 2 May 2008 15:35:41 +0000
Subject: [PATCH 419/710] Fixed: error when using upcase language name in
 coderay (#1162) (Windows specific).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1405 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 lib/redmine/wiki_formatting.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/redmine/wiki_formatting.rb b/lib/redmine/wiki_formatting.rb
index 553f77132..8866e8cde 100644
--- a/lib/redmine/wiki_formatting.rb
+++ b/lib/redmine/wiki_formatting.rb
@@ -56,7 +56,7 @@ module Redmine
             content = @pre_list[$1.to_i]
             if content.match(/<code\s+class="(\w+)">\s?(.+)/m)
               content = "<code class=\"#{$1} CodeRay\">" + 
-                CodeRay.scan($2, $1).html(:escape => false, :line_numbers => :inline)
+                CodeRay.scan($2, $1.downcase).html(:escape => false, :line_numbers => :inline)
             end
             content
           end

From 251b1f75e9407d28ef8e952266a9299293a9f040 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Fri, 2 May 2008 16:48:09 +0000
Subject: [PATCH 420/710] Fixed: error on Trac import when :due attribute is
 nil (#1164).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1406 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 lib/tasks/migrate_from_trac.rake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/tasks/migrate_from_trac.rake b/lib/tasks/migrate_from_trac.rake
index 7fe1f09ac..48a774eef 100644
--- a/lib/tasks/migrate_from_trac.rake
+++ b/lib/tasks/migrate_from_trac.rake
@@ -92,7 +92,7 @@ namespace :redmine do
         set_table_name :milestone
         
         def due
-          if read_attribute(:due) > 0
+          if read_attribute(:due) && read_attribute(:due) > 0
             Time.at(read_attribute(:due)).to_date
           else
             nil

From 35321d938bfbad15f0cfd3fb32f10b68e7e6cac9 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sat, 3 May 2008 10:41:28 +0000
Subject: [PATCH 421/710] Translations updates (closes #1128, #1129, #1135,
 #1148, #1163).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1409 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 lang/fi.yml    | 6 +++---
 lang/no.yml    | 2 +-
 lang/pl.yml    | 8 ++++----
 lang/zh-tw.yml | 4 ++--
 lang/zh.yml    | 4 ++--
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/lang/fi.yml b/lang/fi.yml
index 68b6c20d7..1a614a16c 100644
--- a/lang/fi.yml
+++ b/lang/fi.yml
@@ -307,8 +307,8 @@ label_confirmation: Vahvistus
 label_export_to: Vie
 label_read: Lukee...
 label_public_projects: Julkiset projektit
-label_open_issues: avoin
-label_open_issues_plural: avointa
+label_open_issues: avoin, yhteensä
+label_open_issues_plural: avointa, yhteensä
 label_closed_issues: suljettu
 label_closed_issues_plural: suljettua
 label_total: Yhteensä
@@ -617,4 +617,4 @@ setting_default_projects_public: Uudet projektit ovat oletuksena julkisia
 label_overall_activity: Kokonaishistoria
 error_scm_annotate: "Merkintää ei ole tai siihen ei voi lisätä selityksiä."
 label_planning: Suunnittelu
-text_subprojects_destroy_warning: 'Its subproject(s): %s will be also deleted.'
+text_subprojects_destroy_warning: 'Tämän alaprojekti(t): %s tullaan myös poistamaan.'
diff --git a/lang/no.yml b/lang/no.yml
index 22b8c10af..ccfa5c99f 100644
--- a/lang/no.yml
+++ b/lang/no.yml
@@ -557,7 +557,7 @@ text_select_mail_notifications: Velg hendelser som skal varsles med e-post.
 text_regexp_info: eg. ^[A-Z0-9]+$
 text_min_max_length_info: 0 betyr ingen begrensning
 text_project_destroy_confirmation: Er du sikker på at du vil slette dette prosjekter og alle relatert data ?
-text_subprojects_destroy_warning: 'Underprojekt(ene): %s vil også bli slettet.'
+text_subprojects_destroy_warning: 'Underprojekt(ene): %s vil også bli slettet.'
 text_workflow_edit: Velg en rolle og en sakstype for å endre arbeidsflyten
 text_are_you_sure: Er du sikker ?
 text_journal_changed: endret fra %s til %s
diff --git a/lang/pl.yml b/lang/pl.yml
index 81f03a62f..cf101811a 100644
--- a/lang/pl.yml
+++ b/lang/pl.yml
@@ -114,7 +114,7 @@ field_subject: Temat
 field_due_date: Data oddania
 field_assigned_to: Przydzielony do
 field_priority: Priorytet
-field_fixed_version: Target version
+field_fixed_version: Wersja docelowa
 field_user: Użytkownik
 field_role: Rola
 field_homepage: Strona www
@@ -331,7 +331,7 @@ label_modification_plural: %d modyfikacja
 label_revision: Zmiana
 label_revision_plural: Zmiany
 label_added: dodane
-label_modified: zmodufikowane
+label_modified: zmodyfikowane
 label_deleted: usunięte
 label_latest_revision: Ostatnia zmiana
 label_latest_revision_plural: Ostatnie zmiany
@@ -469,7 +469,7 @@ default_role_manager: Kierownik
 default_role_developper: Programista
 default_role_reporter: Wprowadzajacy
 default_tracker_bug: Błąd
-default_tracker_feature: Cecha
+default_tracker_feature: Zadanie
 default_tracker_support: Wsparcie
 default_issue_status_new: Nowy
 default_issue_status_assigned: Przypisany
@@ -483,7 +483,7 @@ default_priority_low: Niski
 default_priority_normal: Normalny
 default_priority_high: Wysoki
 default_priority_urgent: Pilny
-default_priority_immediate: Natyczmiastowy
+default_priority_immediate: Natychmiastowy
 default_activity_design: Projektowanie
 default_activity_development: Rozwój
 
diff --git a/lang/zh-tw.yml b/lang/zh-tw.yml
index a0c7fafb3..d91c9708d 100644
--- a/lang/zh-tw.yml
+++ b/lang/zh-tw.yml
@@ -210,7 +210,7 @@ setting_protocol: 協定
 setting_per_page_options: 每頁顯示個數選項
 setting_user_format: 使用者顯示格式
 setting_activity_days_default: 專案活動顯示天數
-setting_display_subprojects_issues: 預設於主控專案中顯示從屬專案的項目
+setting_display_subprojects_issues: 預設於父專案中顯示子專案的項目
 
 project_module_issue_tracking: 項目追蹤
 project_module_time_tracking: 工時追蹤
@@ -557,6 +557,7 @@ text_select_mail_notifications: 選擇欲寄送提醒通知郵件之動作
 text_regexp_info: eg. ^[A-Z0-9]+$
 text_min_max_length_info: 0 代表「不限制」
 text_project_destroy_confirmation: 您確定要刪除這個專案和其他相關資料？
+text_subprojects_destroy_warning: '下列子專案： %s 將一併被刪除。'
 text_workflow_edit: 選擇角色與追蹤標籤以設定其工作流程
 text_are_you_sure: 確定執行？
 text_journal_changed: 從 %s 變更為 %s
@@ -618,4 +619,3 @@ default_activity_development: 開發
 enumeration_issue_priorities: 項目優先權
 enumeration_doc_categories: 文件分類
 enumeration_activities: 活動 (時間追蹤)
-text_subprojects_destroy_warning: 'Its subproject(s): %s will be also deleted.'
diff --git a/lang/zh.yml b/lang/zh.yml
index 12fb8cb3e..c8b809764 100644
--- a/lang/zh.yml
+++ b/lang/zh.yml
@@ -554,9 +554,10 @@ status_registered: 已注册
 status_locked: 已锁定
 
 text_select_mail_notifications: 选择需要发送邮件通知的动作
-text_regexp_info: eg. ^[A-Z0-9]+$
+text_regexp_info: 例如：^[A-Z0-9]+$
 text_min_max_length_info: 0 表示没有限制
 text_project_destroy_confirmation: 您确信要删除这个项目以及所有相关的数据吗？
+text_subprojects_destroy_warning: '以下子项目也将被同时删除：%s'
 text_workflow_edit: 选择角色和跟踪标签来编辑工作流程
 text_are_you_sure: 您确定？
 text_journal_changed: 从 %s 变更为 %s
@@ -618,4 +619,3 @@ default_activity_development: 开发
 enumeration_issue_priorities: 问题优先级
 enumeration_doc_categories: 文档类别
 enumeration_activities: 活动（时间跟踪）
-text_subprojects_destroy_warning: 'Its subproject(s): %s will be also deleted.'

From 9e5624c362ad2a38c52d1b36a4f01bd051114486 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sat, 3 May 2008 15:09:06 +0000
Subject: [PATCH 422/710] Prevent "can't convert nil into String" error when
 :sort_order param is not present.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1410 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/helpers/sort_helper.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/helpers/sort_helper.rb b/app/helpers/sort_helper.rb
index f16ff3c7d..9ca5c11bd 100644
--- a/app/helpers/sort_helper.rb
+++ b/app/helpers/sort_helper.rb
@@ -83,7 +83,7 @@ module SortHelper
   # Use this to sort the controller's table items collection.
   #
   def sort_clause()
-    session[@sort_name][:key] + ' ' + session[@sort_name][:order]
+    session[@sort_name][:key] + ' ' + (session[@sort_name][:order] || 'ASC')
   end
 
   # Returns a link which sorts by the named column.

From 556df99456bf579057213157eb593c6a0dea0676 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 4 May 2008 10:20:16 +0000
Subject: [PATCH 423/710] Doc update for 0.7.1 release.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1412 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 doc/CHANGELOG | 15 +++++++++++++++
 doc/INSTALL   |  2 +-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/doc/CHANGELOG b/doc/CHANGELOG
index b39185151..3a39061c6 100644
--- a/doc/CHANGELOG
+++ b/doc/CHANGELOG
@@ -5,6 +5,21 @@ Copyright (C) 2006-2008  Jean-Philippe Lang
 http://www.redmine.org/
 
 
+== 2008-05-04 v0.7.1
+
+* Thai translation added (Gampol Thitinilnithi)
+* Translations updates
+* Escape HTML comment tags
+* Prevent "can't convert nil into String" error when :sort_order param is not present
+* Fixed: Updating tickets add a time log with zero hours
+* Fixed: private subprojects names are revealed on the project overview
+* Fixed: Search for target version of "none" fails with postgres 8.3
+* Fixed: Home, Logout, Login links shouldn't be absolute links
+* Fixed: 'Latest projects' box on the welcome screen should be hidden if there are no projects
+* Fixed: error when using upcase language name in coderay
+* Fixed: error on Trac import when :due attribute is nil
+
+
 == 2008-04-28 v0.7.0
 
 * Forces Redmine to use rails 2.0.2 gem when vendor/rails is not present
diff --git a/doc/INSTALL b/doc/INSTALL
index 7a00b9367..872543d95 100644
--- a/doc/INSTALL
+++ b/doc/INSTALL
@@ -1,7 +1,7 @@
 == Redmine installation
 
 Redmine - project management software
-Copyright (C) 2006-2007  Jean-Philippe Lang
+Copyright (C) 2006-2008  Jean-Philippe Lang
 http://www.redmine.org/
 
 

From 04766697357b29521515e7c71ae5139e04dd5ba2 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 4 May 2008 15:05:38 +0000
Subject: [PATCH 424/710] Wiki page protection (#851, patch #1146 by Mateo
 Murphy with slight changes). New permission added: protect wiki pages. Once a
 page is protected, it can be edited/renamed/deleted only by users who have
 this permission.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1415 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/wiki_controller.rb         |  22 +++++++-
 app/models/wiki_page.rb                    |   5 ++
 app/views/wiki/show.rhtml                  |   8 ++-
 db/migrate/093_add_wiki_pages_protected.rb |   9 ++++
 lib/redmine.rb                             |   1 +
 public/images/locked.png                   | Bin 566 -> 1127 bytes
 public/images/unlock.png                   | Bin 643 -> 618 bytes
 test/fixtures/roles.yml                    |   2 +
 test/fixtures/wiki_pages.yml               |   4 ++
 test/functional/wiki_controller_test.rb    |  56 +++++++++++++++++++++
 10 files changed, 103 insertions(+), 4 deletions(-)
 create mode 100644 db/migrate/093_add_wiki_pages_protected.rb

diff --git a/app/controllers/wiki_controller.rb b/app/controllers/wiki_controller.rb
index 53c5ec53b..44113ebf3 100644
--- a/app/controllers/wiki_controller.rb
+++ b/app/controllers/wiki_controller.rb
@@ -21,7 +21,7 @@ class WikiController < ApplicationController
   layout 'base'
   before_filter :find_wiki, :authorize
   
-  verify :method => :post, :only => [:destroy, :destroy_attachment], :redirect_to => { :action => :index }
+  verify :method => :post, :only => [:destroy, :destroy_attachment, :protect], :redirect_to => { :action => :index }
 
   helper :attachments
   include AttachmentsHelper   
@@ -48,12 +48,14 @@ class WikiController < ApplicationController
       send_data(@content.text, :type => 'text/plain', :filename => "#{@page.title}.txt")
       return
     end
+	@editable = editable?
     render :action => 'show'
   end
   
   # edit an existing page or a new one
   def edit
     @page = @wiki.find_or_new_page(params[:page])    
+    return render_403 unless editable?
     @page.content = WikiContent.new(:page => @page) if @page.new_record?
     
     @content = @page.content_for_version(params[:version])
@@ -82,7 +84,8 @@ class WikiController < ApplicationController
   
   # rename a page
   def rename
-    @page = @wiki.find_page(params[:page])    
+    @page = @wiki.find_page(params[:page])
+	return render_403 unless editable?
     @page.redirect_existing_links = true
     # used to display the *original* title if some AR validation errors occur
     @original_title = @page.pretty_title
@@ -92,6 +95,12 @@ class WikiController < ApplicationController
     end
   end
   
+  def protect
+    page = @wiki.find_page(params[:page])
+    page.update_attribute :protected, params[:protected]
+    redirect_to :action => 'index', :id => @project, :page => page.title
+  end
+
   # show page history
   def history
     @page = @wiki.find_page(params[:page])
@@ -122,6 +131,7 @@ class WikiController < ApplicationController
   # remove a wiki page and its history
   def destroy
     @page = @wiki.find_page(params[:page])
+	return render_403 unless editable?
     @page.destroy if @page
     redirect_to :action => 'special', :id => @project, :page => 'Page_index'
   end
@@ -152,6 +162,7 @@ class WikiController < ApplicationController
   
   def preview
     page = @wiki.find_page(params[:page])
+    return render_403 unless editable?(page)
     @attachements = page.attachments if page
     @text = params[:content][:text]
     render :partial => 'common/preview'
@@ -159,12 +170,14 @@ class WikiController < ApplicationController
 
   def add_attachment
     @page = @wiki.find_page(params[:page])
+    return render_403 unless editable?
     attach_files(@page, params[:attachments])
     redirect_to :action => 'index', :page => @page.title
   end
 
   def destroy_attachment
     @page = @wiki.find_page(params[:page])
+    return render_403 unless editable?
     @page.attachments.find(params[:attachment_id]).destroy
     redirect_to :action => 'index', :page => @page.title
   end
@@ -178,4 +191,9 @@ private
   rescue ActiveRecord::RecordNotFound
     render_404
   end
+  
+  # Returns true if the current user is allowed to edit the page, otherwise false
+  def editable?(page = @page)
+    page.editable_by?(User.current)
+  end
 end
diff --git a/app/models/wiki_page.rb b/app/models/wiki_page.rb
index 8ce71cb80..95750f37b 100644
--- a/app/models/wiki_page.rb
+++ b/app/models/wiki_page.rb
@@ -105,6 +105,11 @@ class WikiPage < ActiveRecord::Base
   def text
     content.text if content
   end
+  
+  # Returns true if usr is allowed to edit the page, otherwise false
+  def editable_by?(usr)
+    !protected? || usr.allowed_to?(:protect_wiki_pages, wiki.project)
+  end
 end
 
 class WikiDiff
diff --git a/app/views/wiki/show.rhtml b/app/views/wiki/show.rhtml
index e4413d090..8092525bd 100644
--- a/app/views/wiki/show.rhtml
+++ b/app/views/wiki/show.rhtml
@@ -1,8 +1,12 @@
 <div class="contextual">
+<% if @editable %>
 <%= link_to_if_authorized(l(:button_edit), {:action => 'edit', :page => @page.title}, :class => 'icon icon-edit', :accesskey => accesskey(:edit)) if @content.version == @page.content.version %>
+<%= link_to_if_authorized(l(:button_lock), {:action => 'protect', :page => @page.title, :protected => 1}, :method => :post, :class => 'icon icon-lock') if !@page.protected? %>
+<%= link_to_if_authorized(l(:button_unlock), {:action => 'protect', :page => @page.title, :protected => 0}, :method => :post, :class => 'icon icon-unlock') if @page.protected? %>
 <%= link_to_if_authorized(l(:button_rename), {:action => 'rename', :page => @page.title}, :class => 'icon icon-move') if @content.version == @page.content.version %>
 <%= link_to_if_authorized(l(:button_delete), {:action => 'destroy', :page => @page.title}, :method => :post, :confirm => l(:text_are_you_sure), :class => 'icon icon-del') %>
 <%= link_to_if_authorized(l(:button_rollback), {:action => 'edit', :page => @page.title, :version => @content.version }, :class => 'icon icon-cancel') if @content.version < @page.content.version %>
+<% end %>
 <%= link_to(l(:label_history), {:action => 'history', :page => @page.title}, :class => 'icon icon-history') %>
 </div>
 
@@ -22,9 +26,9 @@
 
 <%= render(:partial => "wiki/content", :locals => {:content => @content}) %>
 
-<%= link_to_attachments @page.attachments, :delete_url => (authorize_for('wiki', 'destroy_attachment') ? {:controller => 'wiki', :action => 'destroy_attachment', :page => @page.title} : nil) %>
+<%= link_to_attachments @page.attachments, :delete_url => ((@editable && authorize_for('wiki', 'destroy_attachment')) ? {:controller => 'wiki', :action => 'destroy_attachment', :page => @page.title} : nil) %>
 
-<% if authorize_for('wiki', 'add_attachment') %>
+<% if @editable && authorize_for('wiki', 'add_attachment') %>
 <p><%= link_to l(:label_attachment_new), {}, :onclick => "Element.show('add_attachment_form'); Element.hide(this); Element.scrollTo('add_attachment_form'); return false;",
                                              :id => 'attach_files_link' %></p>
 <% form_tag({ :controller => 'wiki', :action => 'add_attachment', :page => @page.title }, :multipart => true, :id => "add_attachment_form", :style => "display:none;") do %>
diff --git a/db/migrate/093_add_wiki_pages_protected.rb b/db/migrate/093_add_wiki_pages_protected.rb
new file mode 100644
index 000000000..49720fbb7
--- /dev/null
+++ b/db/migrate/093_add_wiki_pages_protected.rb
@@ -0,0 +1,9 @@
+class AddWikiPagesProtected < ActiveRecord::Migration
+  def self.up
+    add_column :wiki_pages, :protected, :boolean, :default => false, :null => false
+  end
+
+  def self.down
+    remove_column :wiki_pages, :protected
+  end
+end
diff --git a/lib/redmine.rb b/lib/redmine.rb
index cef2615df..b21f5716d 100644
--- a/lib/redmine.rb
+++ b/lib/redmine.rb
@@ -76,6 +76,7 @@ Redmine::AccessControl.map do |map|
     map.permission :delete_wiki_pages, {:wiki => :destroy}, :require => :member
     map.permission :view_wiki_pages, :wiki => [:index, :history, :diff, :annotate, :special]
     map.permission :edit_wiki_pages, :wiki => [:edit, :preview, :add_attachment, :destroy_attachment]
+    map.permission :protect_wiki_pages, {:wiki => :protect}, :require => :member
   end
     
   map.project_module :repository do |map|
diff --git a/public/images/locked.png b/public/images/locked.png
index c2789e35cbe70bd4d7bbf999158c5b6f4db451c2..82d629961912b414224d483158997d0318a74acb 100644
GIT binary patch
literal 1127
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbL!UWsc&iE~kEVo7Fxo<c}wZYo1g
zX`Y^fp}9hCVo|Yzk%57Qf}xR>fw`4|k%G2?p@G5Sw|;Fvo$Mu^zOL*ySXua_lyl#A
zr2&OF3p^r=85p=efH0%e8j~47L6&q!Uq=Rpjs4tz5?L7-m>B|mLR=@+rp<26zP~;D
z-j2Md2QyzB$$NRK^yTTwEnBv{xzzOWdgtfclfT|y{QchI4|jKbytnhyy<J})&;0su
z?$-zNzdzgf>A{{)5BFWWcJ0fPLtmaA`u6nDmuE-5K0o^H<*{$CPJDlT`un@H-`}18
z_3q4%cNczty8h?Or9WS;{P}d}&!>BTzdii_|3A=SqhK@y1}X&3KV>=sv|GC*$S)X}
z8i@o9$|sj!0BWoBba4!+xK(=Yq)?NA0LujnmQ5Z?iH2HQo815ZXJ$McvM}_^!sWl_
zw$=P|`m=FP@$Sad^^X!Ijq?~^b4wZAV!o1VzHhF!cf>>0KCN)C7y&J{r;2?yB_B$9
zdT!Fu5|CSHxY97OsbDz+BZKYRLtn3bcfOp#Yu*1hg-JbCYEi$GeGe$yJYD@<);T3K
F0RZk%`04-v

delta 522
zcmV+l0`>jp2(|=}H-B?sZ7v`-AZlT5b}k??FfcbDGBG+bG&(XdAS*C2Ffh8<PXhn|
z00(qQO+^RS0R|Ku63iavqW}N^32;bRa{vGf5&!@T5&_cPe*6Fc00d`2O+f$vv5yP<
zVFdsH0Lf5HR7L*)0QdLz@9*#D=jYzu-rm;E*3P}wy`|Q@jDP3e*7x4E=e=|1ty<@$
zIp>@)=cO^mj48E@Lf+QK_vhC4tttPtIkki-ds-OptvSY&G5@VGt$Qiw*0sHiDTHGo
z=dD7udny0DN^?>eLNO5UtwQIuTIa1w|GiT8#%tE4Qt!QE_q}8P#&h?^bML)t|IT~&
z&U^R9d+)}3=YO?p|Nr;z#)RIjWAD9lt$QK8y}j?}*6-fE=gyqgwS>l{Yqgwf#>U3Z
z&d%1>)(TKcx&QzG0d!JMQvg8b*k%9#0I5ktK~#9!P0rgEfj|@n;7;Vwq%fI;oFY+F
zLOC_P|3hhN*5tp~YyIEe7n|cqB#cGwFBlg^E;U`mIDgNJTwqWZGH?U9JTHjSq-pki
zy+7ZquGi!i-=idnwa2W2k$b*`VHCxtMd5hzeLn~s27C9Qd!DB-SgqC@v~_k2Ae=7{
zvTbuoVG6AYLI9Wsg)uZJ$O2EK*H?h54uGZ)>(6*Wlv-`M)2-G&N}d$~0Hf^`00000
MNkvXXt^-0~f~wp8kpKVy

diff --git a/public/images/unlock.png b/public/images/unlock.png
index e0d414978ad0a8d17ba340276191bce671fc43f4..f15fead727a16a9c79e86a60b37ae2dbd2b27724 100644
GIT binary patch
delta 593
zcmV-X0<Qgo1?mKlB!4b+MObu0a%Ew3X>V>IRB3Hx0Bm(`E+8>CAZ=lCb09J>FgPGF
zGCD9fIxsRID=;xIFvIOmh5!Hn2XskIMF-dg1P(I~8*zDV00009a7bBm000W`000W`
z0Ya=am;e9(1ZP1_K>z@;j|==^1poj64p2-~MgRZ*`PtR|;(z4%-{ADr&hXv1-?wY|
z-PiGPcl2Ut_1@e2+1d0<RqIw>_|eVu<-+#m!u#Cd`fhUgXkhYUW%#<g>{nU$R!;6v
zRr%A`_2<Rq!D;)}*Y|F5`DkhQUt;!QVDejA_|DG!yS?~saQanW`C(x9wX^o=#^}Uu
z_2ZfN<>UByet-RQb^LE|`)hIcV`}@}-S+Cp>B@Ed>FW50kNkpq`+9%;x4QXrclvK`
z_G)wZ<K*}2%jwH``swEVkCyv~kNMx;_1~lU*V*=XeD!sC`^Ccd?#=Adg7e#x{p#oZ
z;^g<<qx{_8_{PBe^YZuZ&-m`p`|{WP^4$IQ;r#O6^nd2Ww6wI=*4A}0xEcTe00DGT
zPE!Ct=GbNc005XtL_t(|+GAkA4k9BWA|lcFC?X&ZP!L%FMt}h;8w{{Q1lR(Df<r>X
z!otJZpaLGAUfw>wzMg*m0T2OOJ9`I5CubK|H+P7Dk+F%XnYo3fm9-5-KtoeYTSr$<
z-@p)RhDww)8=JC<s+u|*LO@1VPF_J#2`a!ZASfg(A}S^>AqjIBI|nBh8#fOxAKdYb
fOhAH}g@FM8N3$56Q!blL00000NkvXXu0mjfJ!Uk9

delta 618
zcmWlVZ%7ki0LI_TiI*Ck_J^Z{HYo6ja_=x@GisZz@<^Gs54j>-r;|CR)kc3faHt~;
zF8af)53WLDU!qsZxcXpM1hydR=nuYG)Z2%kxB7As#gQr3dU&1>&+pswe7B93Ufi7C
zmI@q9HJ|8>q+){u_E0R*3wmOS?RHnAJrRl7T~24C9lAZP2G5Rq`&K7(I-@&1699m+
zRBKzH>}~1Bs+!6n7xT4<Rvz2el?0%o`hS?$ABUET(AMW`^8s+@Ld8;~6ac0oxIYxI
z05A-LQko`M$GV2KJk}ISuvrvQsg|TDO!ID%gES8d3e*%o!3E2}CK4>w-Rb6#EEvdL
z$U-$ESO_|JmSUCUp<7^8S+FcCN3$a2Ow07^FdKJp98e@jmMUTFmqcFG6%q4tn#OSs
z5(Gt+Q}cqN@S^Sz3CPo&WtnCnV`y;$i3mBM#_<JKLVOr;P-p!F$T-PsyraMideJPz
ztQ)f#Du=NY$4P}K3eCtwP7+BX{xA`;B#R7`qdA#MaT3NRPLgz7H}zMm(`$=QF{#e>
z1Hk)bAzCbIYl|;*`hA=JWc^4G*n%x^)2=m@!K&HWk|t2HZrQ546pA*Q&yR9*W50a2
zBY{0LC%dwX#?wci&V1{rzFzn4!wvm`{m9h)pMx{u!F#jI!%eq(oi*nl_jo4it{i@W
zytP%akkoy5{_M4Z>FMT&K?k$yTt6D{cMS8s@n@cwU6*ZMrlHR(j@FMyQe#^t%a4nH
zx$?a~YA2cKo4L=wnHsZ%XE*Fl)b^k1Zoj%%{%6JfO+M<%FB~c^0Ih-cmMMSt$Uo=z
B6W;&;

diff --git a/test/fixtures/roles.yml b/test/fixtures/roles.yml
index 1ede6fca9..e7b142268 100644
--- a/test/fixtures/roles.yml
+++ b/test/fixtures/roles.yml
@@ -29,6 +29,7 @@ roles_001:
     - :manage_documents
     - :view_wiki_pages
     - :edit_wiki_pages
+    - :protect_wiki_pages
     - :delete_wiki_pages
     - :rename_wiki_pages
     - :add_messages
@@ -69,6 +70,7 @@ roles_002:
     - :manage_documents
     - :view_wiki_pages
     - :edit_wiki_pages
+    - :protect_wiki_pages
     - :delete_wiki_pages
     - :add_messages
     - :manage_boards
diff --git a/test/fixtures/wiki_pages.yml b/test/fixtures/wiki_pages.yml
index f89832e44..ef7242430 100644
--- a/test/fixtures/wiki_pages.yml
+++ b/test/fixtures/wiki_pages.yml
@@ -4,19 +4,23 @@ wiki_pages_001:
   title: CookBook_documentation
   id: 1
   wiki_id: 1
+  protected: true  
 wiki_pages_002: 
   created_on: 2007-03-08 00:18:07 +01:00
   title: Another_page
   id: 2
   wiki_id: 1
+  protected: false
 wiki_pages_003: 
   created_on: 2007-03-08 00:18:07 +01:00
   title: Start_page
   id: 3
   wiki_id: 2
+  protected: false
 wiki_pages_004: 
   created_on: 2007-03-08 00:18:07 +01:00
   title: Page_with_an_inline_image
   id: 4
   wiki_id: 1
+  protected: false
   
\ No newline at end of file
diff --git a/test/functional/wiki_controller_test.rb b/test/functional/wiki_controller_test.rb
index bf31e6614..8688c2e03 100644
--- a/test/functional/wiki_controller_test.rb
+++ b/test/functional/wiki_controller_test.rb
@@ -160,4 +160,60 @@ class WikiControllerTest < Test::Unit::TestCase
     get :index, :id => 999
     assert_response 404
   end
+  
+  def test_protect_page
+    page = WikiPage.find_by_wiki_id_and_title(1, 'Another_page')
+    assert !page.protected?
+    @request.session[:user_id] = 2
+    post :protect, :id => 1, :page => page.title, :protected => '1'
+    assert_redirected_to 'wiki/ecookbook/Another_page'
+    assert page.reload.protected?
+  end
+  
+  def test_unprotect_page
+    page = WikiPage.find_by_wiki_id_and_title(1, 'CookBook_documentation')
+    assert page.protected?
+    @request.session[:user_id] = 2
+    post :protect, :id => 1, :page => page.title, :protected => '0'
+    assert_redirected_to 'wiki/ecookbook'
+    assert !page.reload.protected?
+  end
+  
+  def test_show_page_with_edit_link
+    @request.session[:user_id] = 2
+    get :index, :id => 1
+    assert_response :success
+    assert_template 'show'
+    assert_tag :tag => 'a', :attributes => { :href => '/wiki/1/CookBook_documentation/edit' }
+  end
+  
+  def test_show_page_without_edit_link
+    @request.session[:user_id] = 4
+    get :index, :id => 1
+    assert_response :success
+    assert_template 'show'
+    assert_no_tag :tag => 'a', :attributes => { :href => '/wiki/1/CookBook_documentation/edit' }
+  end  
+  
+  def test_edit_unprotected_page
+    # Non members can edit unprotected wiki pages
+    @request.session[:user_id] = 4
+    get :edit, :id => 1, :page => 'Another_page'
+    assert_response :success
+    assert_template 'edit'
+  end
+  
+  def test_edit_protected_page_by_nonmember
+    # Non members can't edit protected wiki pages
+    @request.session[:user_id] = 4
+    get :edit, :id => 1, :page => 'CookBook_documentation'
+    assert_response 403
+  end
+  
+  def test_edit_protected_page_by_member
+    @request.session[:user_id] = 2
+    get :edit, :id => 1, :page => 'CookBook_documentation'
+    assert_response :success
+    assert_template 'edit'    
+  end
 end

From c4560c4f3be39dd4cb9505c3e08ebcca0dad1799 Mon Sep 17 00:00:00 2001
From: Liwiusz Ociepa <liwiusz.ociepa@softwarelab.eu>
Date: Tue, 13 May 2008 09:41:19 +0000
Subject: [PATCH 425/710] Merge changes from branch swistak.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1425 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 extra/svn/Redmine.pm | 136 +++++++++++++++++++++++++++++++++++++------
 1 file changed, 119 insertions(+), 17 deletions(-)

diff --git a/extra/svn/Redmine.pm b/extra/svn/Redmine.pm
index 6f3ba4385..8003cabc0 100644
--- a/extra/svn/Redmine.pm
+++ b/extra/svn/Redmine.pm
@@ -36,10 +36,9 @@ Authen::Simple::LDAP (and IO::Socket::SSL if LDAPS is used):
 
 =head1 CONFIGURATION
 
-   ## if the module isn't in your perl path
-   PerlRequire /usr/local/apache/Redmine.pm
-   ## else
-   # PerlModule Apache::Authn::Redmine
+   ## This module has to be in your perl path
+   ## eg:  /usr/lib/perl5/Apache/Authn/Redmine.pm
+   PerlLoadModule Apache::Authn::Redmine
    <Location /svn>
      DAV svn
      SVNParentPath "/var/svn"
@@ -52,12 +51,17 @@ Authen::Simple::LDAP (and IO::Socket::SSL if LDAPS is used):
      PerlAuthenHandler Apache::Authn::Redmine::authen_handler
   
      ## for mysql
-     PerlSetVar dsn DBI:mysql:database=databasename;host=my.db.server
-     ## for postgres
-     # PerlSetVar dsn DBI:Pg:dbname=databasename;host=my.db.server
+     RedmineDSN "DBI:mysql:database=databasename;host=my.db.server"
+     ## for postgres (there is memory leak in libpq+ssl)
+     # RedmineDSN "DBI:Pg:dbname=databasename;host=my.db.server;sslmode=disable"
 
-     PerlSetVar db_user redmine
-     PerlSetVar db_pass password
+     RedmineDbUser "redmine"
+     RedmineDbPass "password"
+     ## Optional where clause (fulltext search would be slow and
+     ## database dependant).
+     # RedmineDbWhereClause "and members.role_id IN (1,2)"
+     ## Optional credentials cache size
+     # RedmineCacheCredsMax 50
   </Location>
 
 To be able to browse repository inside redmine, you must add something
@@ -92,6 +96,7 @@ And you need to upgrade at least reposman.rb (after r860).
 =cut
 
 use strict;
+use warnings FATAL => 'all', NONFATAL => 'redefine';
 
 use DBI;
 use Digest::SHA1;
@@ -103,9 +108,87 @@ use Apache2::Access;
 use Apache2::ServerRec qw();
 use Apache2::RequestRec qw();
 use Apache2::RequestUtil qw();
-use Apache2::Const qw(:common);
+use Apache2::Const qw(:common :override :cmd_how);
+use APR::Pool ();
+use APR::Table ();
+
 # use Apache2::Directive qw();
 
+my @directives = (
+  {
+    name => 'RedmineDSN',
+    req_override => OR_AUTHCFG,
+    args_how => TAKE1,
+    errmsg => 'Dsn in format used by Perl DBI. eg: "DBI:Pg:dbname=databasename;host=my.db.server"',
+  },
+  {
+    name => 'RedmineDbUser',
+    req_override => OR_AUTHCFG,
+    args_how => TAKE1,
+  },
+  {
+    name => 'RedmineDbPass',
+    req_override => OR_AUTHCFG,
+    args_how => TAKE1,
+  },
+  {
+    name => 'RedmineDbWhereClause',
+    req_override => OR_AUTHCFG,
+    args_how => TAKE1,
+  },
+  {
+    name => 'RedmineCacheCredsMax',
+    req_override => OR_AUTHCFG,
+    args_how => TAKE1,
+    errmsg => 'RedmineCacheCredsMax must be decimal number',
+  },
+);
+
+sub RedmineDSN { 
+  my ($self, $parms, $arg) = @_;
+  $self->{RedmineDSN} = $arg;
+  my $query = "SELECT 
+                 hashed_password, auth_source_id 
+              FROM members, projects, users 
+              WHERE 
+                projects.id=members.project_id 
+                AND users.id=members.user_id 
+                AND users.status=1 
+                AND login=? 
+                AND identifier=? ";
+  $self->{RedmineQuery} = trim($query);
+}
+sub RedmineDbUser { set_val('RedmineDbUser', @_); }
+sub RedmineDbPass { set_val('RedmineDbPass', @_); }
+sub RedmineDbWhereClause { 
+  my ($self, $parms, $arg) = @_;
+  $self->{RedmineQuery} = trim($self->{RedmineQuery}.($arg ? $arg : "")." ");
+}
+
+sub RedmineCacheCredsMax { 
+  my ($self, $parms, $arg) = @_;
+  if ($arg) {
+    $self->{RedmineCachePool} = APR::Pool->new;
+    $self->{RedmineCacheCreds} = APR::Table::make($self->{RedmineCachePool}, $arg);
+    $self->{RedmineCacheCredsCount} = 0;
+    $self->{RedmineCacheCredsMax} = $arg;
+  }
+}
+
+sub trim {
+  my $string = shift;
+  $string =~ s/\s{2,}/ /g;
+  return $string;
+}
+
+sub set_val {
+  my ($key, $self, $parms, $arg) = @_;
+  $self->{$key} = $arg;
+}
+
+Apache2::Module::add(__PACKAGE__, \@directives);
+
+
 my %read_only_methods = map { $_ => 1 } qw/GET PROPFIND REPORT OPTIONS/;
 
 sub access_handler {
@@ -117,7 +200,7 @@ sub access_handler {
   }
 
   my $method = $r->method;
-  return OK unless 1 == $read_only_methods{$method};
+  return OK if defined $read_only_methods{$method};
 
   my $project_id = get_project_identifier($r);
 
@@ -182,9 +265,14 @@ sub is_member {
 
   my $pass_digest = Digest::SHA1::sha1_hex($redmine_pass);
 
-  my $sth = $dbh->prepare(
-      "SELECT hashed_password, auth_source_id FROM members, projects, users WHERE projects.id=members.project_id AND users.id=members.user_id AND users.status=1 AND login=? AND identifier=?;"
-  );
+  my $cfg = Apache2::Module::get_config(__PACKAGE__, $r->server, $r->per_dir_config);
+  my $usrprojpass;
+  if ($cfg->{RedmineCacheCredsMax}) {
+    $usrprojpass = $cfg->{RedmineCacheCreds}->get($redmine_user.":".$project_id);
+    return 1 if (defined $usrprojpass and ($usrprojpass eq $pass_digest));
+  }
+  my $query = $cfg->{RedmineQuery};
+  my $sth = $dbh->prepare($query);
   $sth->execute($redmine_user, $project_id);
 
   my $ret;
@@ -216,6 +304,20 @@ sub is_member {
   $sth->finish();
   $dbh->disconnect();
 
+  if ($cfg->{RedmineCacheCredsMax} and $ret) {
+    if (defined $usrprojpass) {
+      $cfg->{RedmineCacheCreds}->set($redmine_user.":".$project_id, $pass_digest);
+    } else {
+      if ($cfg->{RedmineCacheCredsCount} < $cfg->{RedmineCacheCredsMax}) {
+        $cfg->{RedmineCacheCreds}->set($redmine_user.":".$project_id, $pass_digest);
+        $cfg->{RedmineCacheCredsCount}++;
+      } else {
+        $cfg->{RedmineCacheCreds}->clear();
+        $cfg->{RedmineCacheCredsCount} = 0;
+      }
+    }
+  }
+
   $ret;
 }
 
@@ -229,9 +331,9 @@ sub get_project_identifier {
 
 sub connect_database {
     my $r = shift;
-
-    my ($dsn, $db_user, $db_pass) = map { $r->dir_config($_) } qw/dsn db_user db_pass/;
-    return DBI->connect($dsn, $db_user, $db_pass);
+    
+    my $cfg = Apache2::Module::get_config(__PACKAGE__, $r->server, $r->per_dir_config);
+    return DBI->connect($cfg->{RedmineDSN}, $cfg->{RedmineDbUser}, $cfg->{RedmineDbPass});
 }
 
 1;

From 77e87eb0bad7afb83ba569ef42d9b0dda9aa44e9 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Tue, 13 May 2008 16:56:34 +0000
Subject: [PATCH 426/710] Fixed: some labels overflow the form box (#1228).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1426 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 public/stylesheets/application.css | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 26f66f0b8..18e1de621 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -223,6 +223,8 @@ height: 1%;
 clear:left;
 }
 
+html>body .tabular p {overflow:auto;}
+
 .tabular label{
 font-weight: bold;
 float: left;

From 75d25b7e61c16b732e340073af6d928ced3f8ae3 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Tue, 13 May 2008 17:51:55 +0000
Subject: [PATCH 427/710] Fixed: Update issue form: comment field from log time
 end out of screen (#1227).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1427 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/issues/_edit.rhtml       | 2 +-
 public/stylesheets/application.css | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/views/issues/_edit.rhtml b/app/views/issues/_edit.rhtml
index 2e00ab520..49f198a63 100644
--- a/app/views/issues/_edit.rhtml
+++ b/app/views/issues/_edit.rhtml
@@ -21,9 +21,9 @@
         <p><%= time_entry.text_field :hours, :size => 6, :label => :label_spent_time %> <%= l(:field_hours) %></p>
         </div>
         <div class="splitcontentright">
-        <p><%= time_entry.text_field :comments, :size => 40 %></p>
         <p><%= time_entry.select :activity_id, (@activities.collect {|p| [p.name, p.id]}) %></p>
         </div>
+        <p><%= time_entry.text_field :comments, :size => 60 %></p>
         <% end %>
     </fieldset>
     <% end %>
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 18e1de621..8e4bf995c 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -241,6 +241,8 @@ text-align: left;
 width: 200px;
 }
 
+input#time_entry_comments { width: 90%;}
+
 #preview fieldset {margin-top: 1em; background: url(../images/draft.png)}
 
 .tabular.settings p{ padding-left: 300px; }

From 835cc7ed7c6b9257d7e5e2877f95f26edc013b5b Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Tue, 13 May 2008 17:54:51 +0000
Subject: [PATCH 428/710] Fixed: Redmine::Scm::Adapters::GitAdapter#get_rev
 ignored GIT_BIN constant (#1207).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1428 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 lib/redmine/scm/adapters/git_adapter.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/redmine/scm/adapters/git_adapter.rb b/lib/redmine/scm/adapters/git_adapter.rb
index 77604f283..a9ab505a8 100644
--- a/lib/redmine/scm/adapters/git_adapter.rb
+++ b/lib/redmine/scm/adapters/git_adapter.rb
@@ -27,8 +27,8 @@ module Redmine
 
         # Get the revision of a particuliar file
         def get_rev (rev,path)
-          cmd="git --git-dir #{target('')} show #{shell_quote rev} -- #{shell_quote path}" if rev!='latest' and (! rev.nil?)
-          cmd="git --git-dir #{target('')} log -1 master -- #{shell_quote path}" if 
+          cmd="#{GIT_BIN} --git-dir #{target('')} show #{shell_quote rev} -- #{shell_quote path}" if rev!='latest' and (! rev.nil?)
+          cmd="#{GIT_BIN} --git-dir #{target('')} log -1 master -- #{shell_quote path}" if 
             rev=='latest' or rev.nil?
           rev=[]
           i=0

From 4c6b9d9ce506253cae52bfc0d716bd67ecebb29f Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Wed, 14 May 2008 17:23:40 +0000
Subject: [PATCH 429/710] Fixed: Check All / Uncheck All in Email Settings
 doesn't work (#1180).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1429 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/settings/_notifications.rhtml | 4 ++--
 public/javascripts/application.js       | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/views/settings/_notifications.rhtml b/app/views/settings/_notifications.rhtml
index ac3213853..1a472d606 100644
--- a/app/views/settings/_notifications.rhtml
+++ b/app/views/settings/_notifications.rhtml
@@ -9,13 +9,13 @@
 <%= hidden_field_tag 'settings[bcc_recipients]', 0 %></p>
 </div>
 
-<fieldset class="box"><legend><%=l(:text_select_mail_notifications)%></legend>
+<fieldset class="box" id="notified_events"><legend><%=l(:text_select_mail_notifications)%></legend>
 <% @notifiables.each do |notifiable| %>
   <label><%= check_box_tag 'settings[notified_events][]', notifiable, Setting.notified_events.include?(notifiable) %>
   <%= l_or_humanize(notifiable) %></label><br />
 <% end %>
 <%= hidden_field_tag 'settings[notified_events][]', '' %>
-<p><%= check_all_links('mail-options-form') %></p>
+<p><%= check_all_links('notified_events') %></p>
 </fieldset>
 
 <fieldset class="box"><legend><%= l(:setting_emails_footer) %></legend>
diff --git a/public/javascripts/application.js b/public/javascripts/application.js
index 4e8849842..f3d771a10 100644
--- a/public/javascripts/application.js
+++ b/public/javascripts/application.js
@@ -2,10 +2,10 @@
    Copyright (C) 2006-2008  Jean-Philippe Lang */
 
 function checkAll (id, checked) {
-	var el = document.getElementById(id);
-	for (var i = 0; i < el.elements.length; i++) {
-    if (el.elements[i].disabled==false) {
-      el.elements[i].checked = checked;
+	var els = Element.descendants(id);
+	for (var i = 0; i < els.length; i++) {
+    if (els[i].disabled==false) {
+      els[i].checked = checked;
     }
 	}
 }

From 06e44b8e643797c8d5a11478ef6605f49c7220e0 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Wed, 14 May 2008 17:26:13 +0000
Subject: [PATCH 430/710] Do not toggle assignable check box when using
 un/check all permissions links on role form.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1430 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/roles/_form.rhtml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/roles/_form.rhtml b/app/views/roles/_form.rhtml
index 58dc2af41..4aad45471 100644
--- a/app/views/roles/_form.rhtml
+++ b/app/views/roles/_form.rhtml
@@ -12,7 +12,7 @@
 <% end %>
 
 <h3><%= l(:label_permissions) %></h3>
-<div class="box">
+<div class="box" id="permissions">
 <% perms_by_module = @permissions.group_by {|p| p.project_module.to_s} %>
 <% perms_by_module.keys.sort.each do |mod| %>
     <fieldset><legend><%= mod.blank? ? l(:label_project) : mod.humanize %></legend>
@@ -24,6 +24,6 @@
     <% end %>
     </fieldset>
 <% end %>
-<br /><%= check_all_links 'role_form' %>
+<br /><%= check_all_links 'permissions' %>
 <%= hidden_field_tag 'role[permissions][]', '' %>
 </div>

From 7ee38a95a0052ddc544137f32fcf9114e5ffabb9 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Wed, 14 May 2008 18:01:13 +0000
Subject: [PATCH 431/710] Fixed: Calendar and Gantt show private subprojects
 even if current user is not a member of them (#1217).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1431 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/models/project.rb                       |  7 +++---
 test/fixtures/issues.yml                    | 18 ++++++++++++++-
 test/functional/projects_controller_test.rb | 25 +++++++++++++++++++--
 3 files changed, 44 insertions(+), 6 deletions(-)

diff --git a/app/models/project.rb b/app/models/project.rb
index 964469649..8c32c8562 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -73,9 +73,9 @@ class Project < ActiveRecord::Base
   
   def issues_with_subprojects(include_subprojects=false)
     conditions = nil
-    if include_subprojects && !active_children.empty?
-      ids = [id] + active_children.collect {|c| c.id}
-      conditions = ["#{Project.table_name}.id IN (#{ids.join(',')})"]
+    if include_subprojects
+      ids = [id] + child_ids
+      conditions = ["#{Project.table_name}.id IN (#{ids.join(',')}) AND #{Project.visible_by}"]
     end
     conditions ||= ["#{Project.table_name}.id = ?", id]
     # Quick and dirty fix for Rails 2 compatibility
@@ -93,6 +93,7 @@ class Project < ActiveRecord::Base
   end	
 
   def self.visible_by(user=nil)
+    user ||= User.current
     if user && user.admin?
       return "#{Project.table_name}.status=#{Project::STATUS_ACTIVE}"
     elsif user && user.memberships.any?
diff --git a/test/fixtures/issues.yml b/test/fixtures/issues.yml
index 4f42d93c4..48195a7b7 100644
--- a/test/fixtures/issues.yml
+++ b/test/fixtures/issues.yml
@@ -71,4 +71,20 @@ issues_005:
   assigned_to_id: 
   author_id: 2
   status_id: 1
-  
+issues_006: 
+  created_on: <%= 1.minute.ago.to_date.to_s(:db) %>
+  project_id: 5
+  updated_on: <%= 1.minute.ago.to_date.to_s(:db) %>
+  priority_id: 4
+  subject: Issue of a private subproject
+  id: 6
+  fixed_version_id: 
+  category_id: 
+  description: This is an issue of a private subproject of cookbook
+  tracker_id: 1
+  assigned_to_id: 
+  author_id: 2
+  status_id: 1
+  start_date: <%= Date.today.to_s(:db) %>
+  due_date: <%= 1.days.from_now.to_date.to_s(:db) %>
+  
\ No newline at end of file
diff --git a/test/functional/projects_controller_test.rb b/test/functional/projects_controller_test.rb
index 5af7b5572..bebe96f29 100644
--- a/test/functional/projects_controller_test.rb
+++ b/test/functional/projects_controller_test.rb
@@ -29,6 +29,7 @@ class ProjectsControllerTest < Test::Unit::TestCase
     @controller = ProjectsController.new
     @request    = ActionController::TestRequest.new
     @response   = ActionController::TestResponse.new
+    @request.session[:user_id] = nil
   end
 
   def test_index
@@ -237,11 +238,21 @@ class ProjectsControllerTest < Test::Unit::TestCase
     assert_not_nil assigns(:calendar)
   end
 
-  def test_calendar_with_subprojects
+  def test_calendar_with_subprojects_should_not_show_private_subprojects
     get :calendar, :id => 1, :with_subprojects => 1, :tracker_ids => [1, 2]
     assert_response :success
     assert_template 'calendar'
     assert_not_nil assigns(:calendar)
+    assert_no_tag :tag => 'a', :content => /#6/
+  end
+  
+  def test_calendar_with_subprojects_should_show_private_subprojects
+    @request.session[:user_id] = 2
+    get :calendar, :id => 1, :with_subprojects => 1, :tracker_ids => [1, 2]
+    assert_response :success
+    assert_template 'calendar'
+    assert_not_nil assigns(:calendar)
+    assert_tag :tag => 'a', :content => /#6/
   end
 
   def test_gantt
@@ -251,13 +262,23 @@ class ProjectsControllerTest < Test::Unit::TestCase
     assert_not_nil assigns(:events)
   end
 
-  def test_gantt_with_subprojects
+  def test_gantt_with_subprojects_should_not_show_private_subprojects
     get :gantt, :id => 1, :with_subprojects => 1, :tracker_ids => [1, 2]
     assert_response :success
     assert_template 'gantt.rhtml'
     assert_not_nil assigns(:events)
+    assert_no_tag :tag => 'a', :content => /#6/
   end
   
+  def test_gantt_with_subprojects_should_show_private_subprojects
+    @request.session[:user_id] = 2
+    get :gantt, :id => 1, :with_subprojects => 1, :tracker_ids => [1, 2]
+    assert_response :success
+    assert_template 'gantt.rhtml'
+    assert_not_nil assigns(:events)
+    assert_tag :tag => 'a', :content => /#6/
+  end
+
   def test_gantt_export_to_pdf
     get :gantt, :id => 1, :format => 'pdf'
     assert_response :success

From 9e225cc63ff889d3dc6f2f904d8e0c33850073b6 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Wed, 14 May 2008 18:19:37 +0000
Subject: [PATCH 432/710] Fixed: private subprojects are listed on the issues
 view (#1217).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1432 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/models/query.rb                       | 17 +++++--------
 test/functional/issues_controller_test.rb | 31 +++++++++++++++++++++++
 2 files changed, 38 insertions(+), 10 deletions(-)

diff --git a/app/models/query.rb b/app/models/query.rb
index d9a720812..f25b5c401 100644
--- a/app/models/query.rb
+++ b/app/models/query.rb
@@ -265,7 +265,7 @@ class Query < ActiveRecord::Base
 
   def statement
     # project/subprojects clause
-    clause = ''
+    project_clauses = []
     if project && !@project.active_children.empty?
       ids = [project.id]
       if has_filter?("subproject_id")
@@ -277,17 +277,16 @@ class Query < ActiveRecord::Base
           # main project only
         else
           # all subprojects
-          ids += project.active_children.collect{|p| p.id}
+          ids += project.child_ids
         end
       elsif Setting.display_subprojects_issues?
-        ids += project.active_children.collect{|p| p.id}
+        ids += project.child_ids
       end
-      clause << "#{Issue.table_name}.project_id IN (%s)" % ids.join(',')
+      project_clauses << "#{Issue.table_name}.project_id IN (%s)" % ids.join(',')
     elsif project
-      clause << "#{Issue.table_name}.project_id = %d" % project.id
-    else
-      clause << Project.visible_by(User.current)
+      project_clauses << "#{Issue.table_name}.project_id = %d" % project.id
     end
+    project_clauses <<  Project.visible_by(User.current)
     
     # filters clauses
     filters_clauses = []
@@ -365,8 +364,6 @@ class Query < ActiveRecord::Base
       filters_clauses << sql
     end if filters and valid?
     
-    clause << ' AND ' unless clause.empty?
-    clause << filters_clauses.join(' AND ') unless filters_clauses.empty?
-    clause
+    (project_clauses + filters_clauses).join(' AND ')
   end
 end
diff --git a/test/functional/issues_controller_test.rb b/test/functional/issues_controller_test.rb
index a6d2ca6e3..c4389fedd 100644
--- a/test/functional/issues_controller_test.rb
+++ b/test/functional/issues_controller_test.rb
@@ -53,13 +53,44 @@ class IssuesControllerTest < Test::Unit::TestCase
     assert_template 'index.rhtml'
     assert_not_nil assigns(:issues)
     assert_nil assigns(:project)
+    assert_tag :tag => 'a', :content => /Can't print recipes/
+    assert_tag :tag => 'a', :content => /Subproject issue/
+    # private projects hidden
+    assert_no_tag :tag => 'a', :content => /Issue of a private subproject/
+    assert_no_tag :tag => 'a', :content => /Issue on project 2/
   end
 
   def test_index_with_project
+    Setting.display_subprojects_issues = 0
     get :index, :project_id => 1
     assert_response :success
     assert_template 'index.rhtml'
     assert_not_nil assigns(:issues)
+    assert_tag :tag => 'a', :content => /Can't print recipes/
+    assert_no_tag :tag => 'a', :content => /Subproject issue/
+  end
+  
+  def test_index_with_project_and_subprojects
+    Setting.display_subprojects_issues = 1
+    get :index, :project_id => 1
+    assert_response :success
+    assert_template 'index.rhtml'
+    assert_not_nil assigns(:issues)
+    assert_tag :tag => 'a', :content => /Can't print recipes/
+    assert_tag :tag => 'a', :content => /Subproject issue/
+    assert_no_tag :tag => 'a', :content => /Issue of a private subproject/
+  end
+  
+  def test_index_with_project_and_subprojects_should_show_private_subprojects
+    @request.session[:user_id] = 2
+    Setting.display_subprojects_issues = 1
+    get :index, :project_id => 1
+    assert_response :success
+    assert_template 'index.rhtml'
+    assert_not_nil assigns(:issues)
+    assert_tag :tag => 'a', :content => /Can't print recipes/
+    assert_tag :tag => 'a', :content => /Subproject issue/
+    assert_tag :tag => 'a', :content => /Issue of a private subproject/
   end
   
   def test_index_with_project_and_filter

From 439c697237224a5dde8fbe87a136239bfa0f99b6 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sat, 17 May 2008 11:03:43 +0000
Subject: [PATCH 433/710] Fixed: possible error when attachment's filename is
 non-ASCII (#747, #1243, #1089).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1433 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/models/attachment.rb     | 15 ++++++++++++++-
 test/unit/attachment_test.rb | 32 ++++++++++++++++++++++++++++++++
 2 files changed, 46 insertions(+), 1 deletion(-)
 create mode 100644 test/unit/attachment_test.rb

diff --git a/app/models/attachment.rb b/app/models/attachment.rb
index 08f440816..f44fe8b4d 100644
--- a/app/models/attachment.rb
+++ b/app/models/attachment.rb
@@ -40,7 +40,7 @@ class Attachment < ActiveRecord::Base
       @temp_file = incoming_file
       if @temp_file.size > 0
         self.filename = sanitize_filename(@temp_file.original_filename)
-        self.disk_filename = DateTime.now.strftime("%y%m%d%H%M%S") + "_" + self.filename
+        self.disk_filename = Attachment.disk_filename(filename)
         self.content_type = @temp_file.content_type.to_s.chomp
         self.filesize = @temp_file.size
       end
@@ -100,4 +100,17 @@ private
     # Finally, replace all non alphanumeric, hyphens or periods with underscore
     @filename = just_filename.gsub(/[^\w\.\-]/,'_') 
   end
+  
+  # Returns an ASCII or hashed filename
+  def self.disk_filename(filename)
+    df = DateTime.now.strftime("%y%m%d%H%M%S") + "_"
+    if filename =~ %r{^[a-zA-Z0-9_\.\-]*$}
+      df << filename
+    else
+      df << Digest::MD5.hexdigest(filename)
+      # keep the extension if any
+      df << $1 if filename =~ %r{(\.[a-zA-Z0-9]+)$}
+    end
+    df
+  end
 end
diff --git a/test/unit/attachment_test.rb b/test/unit/attachment_test.rb
new file mode 100644
index 000000000..99f7c29f9
--- /dev/null
+++ b/test/unit/attachment_test.rb
@@ -0,0 +1,32 @@
+# 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 File.dirname(__FILE__) + '/../test_helper'
+
+class AttachmentTest < Test::Unit::TestCase
+
+  def setup
+  end
+  
+  def test_diskfilename
+    assert Attachment.disk_filename("test_file.txt") =~ /^\d{12}_test_file.txt$/
+    assert_equal 'test_file.txt', Attachment.disk_filename("test_file.txt")[13..-1]
+    assert_equal '770c509475505f37c2b8fb6030434d6b.txt', Attachment.disk_filename("test_accentué.txt")[13..-1]
+    assert_equal 'f8139524ebb8f32e51976982cd20a85d', Attachment.disk_filename("test_accentué")[13..-1]
+    assert_equal 'cbb5b0f30978ba03731d61f9f6d10011', Attachment.disk_filename("test_accentué.ça")[13..-1]
+  end
+end

From 1907c31138d065aea93f53b8e7565e06a44e49f8 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 18 May 2008 08:24:31 +0000
Subject: [PATCH 434/710] Fixed: bold, italics, underline not working within
 parentheses (#1225).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1434 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 lib/redcloth.rb                              | 4 ++--
 test/unit/helpers/application_helper_test.rb | 7 +++++++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/lib/redcloth.rb b/lib/redcloth.rb
index 7729ced46..f94c95738 100644
--- a/lib/redcloth.rb
+++ b/lib/redcloth.rb
@@ -376,13 +376,13 @@ class RedCloth < String
         re =
             case rtype
             when :limit
-                /(^|[>\s])
+                /(^|[>\s\(])
                 (#{rcq})
                 (#{C})
                 (?::(\S+?))?
                 ([^\s\-].*?[^\s\-]|\w)
                 #{rcq}
-                (?=[[:punct:]]|\s|$)/x
+                (?=[[:punct:]]|\s|\)|$)/x
             else
                 /(#{rcq})
                 (#{C})
diff --git a/test/unit/helpers/application_helper_test.rb b/test/unit/helpers/application_helper_test.rb
index e8b5883ce..8bd745124 100644
--- a/test/unit/helpers/application_helper_test.rb
+++ b/test/unit/helpers/application_helper_test.rb
@@ -162,6 +162,13 @@ class ApplicationHelperTest < HelperTestCase
     to_test.each { |text, result| assert_equal "<table>#{result}</table>", textilizable(text).gsub(/[\t\n]/, '') }
   end
   
+  def test_text_formatting
+    to_test = {'*_+bold, italic and underline+_*' => '<strong><em><ins>bold, italic and underline</ins></em></strong>',
+               '(_text within parentheses_)' => '(<em>text within parentheses</em>)'
+              }
+    to_test.each { |text, result| assert_equal "<p>#{result}</p>", textilizable(text) }
+  end
+  
   def test_wiki_horizontal_rule
     assert_equal '<hr />', textilizable('---')
     assert_equal '<p>Dashes: ---</p>', textilizable('Dashes: ---')

From 073818f8bc46580e118a7550f1faaa55b3be13d9 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 18 May 2008 16:15:22 +0000
Subject: [PATCH 435/710] Ability to search all projects or the projects the
 user belongs to (#791).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1435 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/search_controller.rb          | 74 +++++++++----------
 app/helpers/search_helper.rb                  |  7 ++
 app/models/changeset.rb                       |  2 +-
 app/models/document.rb                        |  2 +-
 app/models/issue.rb                           |  2 +-
 app/models/journal.rb                         |  2 +-
 app/models/message.rb                         |  4 +-
 app/models/news.rb                            |  2 +-
 app/models/project.rb                         |  6 +-
 app/models/wiki_page.rb                       |  2 +-
 app/views/search/index.rhtml                  | 18 +++--
 public/stylesheets/application.css            |  2 +-
 test/functional/search_controller_test.rb     | 14 +++-
 .../lib/acts_as_searchable.rb                 | 18 ++++-
 14 files changed, 96 insertions(+), 59 deletions(-)

diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb
index f15653b63..d93c63808 100644
--- a/app/controllers/search_controller.rb
+++ b/app/controllers/search_controller.rb
@@ -29,6 +29,16 @@ class SearchController < ApplicationController
     @all_words = params[:all_words] || (params[:submit] ? false : true)
     @titles_only = !params[:titles_only].nil?
     
+    projects_to_search =
+      case params[:projects]
+      when 'all'
+        nil
+      when 'my_projects'
+        User.current.memberships.collect(&:project)
+      else
+        @project
+      end
+          
     offset = nil
     begin; offset = params[:offset].to_time if params[:offset]; rescue; end
     
@@ -38,16 +48,16 @@ class SearchController < ApplicationController
       return
     end
     
-    if @project
+    @object_types = %w(issues news documents changesets wiki_pages messages projects)
+    if projects_to_search.is_a? Project
+      # don't search projects
+      @object_types.delete('projects')
       # only show what the user is allowed to view
-      @object_types = %w(issues news documents changesets wiki_pages messages)
-      @object_types = @object_types.select {|o| User.current.allowed_to?("view_#{o}".to_sym, @project)}
-      
-      @scope = @object_types.select {|t| params[t]}
-      @scope = @object_types if @scope.empty?
-    else
-      @object_types = @scope = %w(projects)
+      @object_types = @object_types.select {|o| User.current.allowed_to?("view_#{o}".to_sym, projects_to_search)}
     end
+      
+    @scope = @object_types.select {|t| params[t]}
+    @scope = @object_types if @scope.empty?
     
     # extract tokens from the question
     # eg. hello "bye bye" => ["hello", "bye bye"]
@@ -62,37 +72,27 @@ class SearchController < ApplicationController
       like_tokens = @tokens.collect {|w| "%#{w.downcase}%"}      
       @results = []
       limit = 10
-      if @project        
-        @scope.each do |s|
-          @results += s.singularize.camelcase.constantize.search(like_tokens, @project,
-            :all_words => @all_words,
-            :titles_only => @titles_only,
-            :limit => (limit+1),
-            :offset => offset,
-            :before => params[:previous].nil?)
-        end
-        @results = @results.sort {|a,b| b.event_datetime <=> a.event_datetime}
-        if params[:previous].nil?
-          @pagination_previous_date = @results[0].event_datetime if offset && @results[0]
-          if @results.size > limit
-            @pagination_next_date = @results[limit-1].event_datetime 
-            @results = @results[0, limit]
-          end
-        else
-          @pagination_next_date = @results[-1].event_datetime if offset && @results[-1]
-          if @results.size > limit
-            @pagination_previous_date = @results[-(limit)].event_datetime 
-            @results = @results[-(limit), limit]
-          end
+      @scope.each do |s|
+        @results += s.singularize.camelcase.constantize.search(like_tokens, projects_to_search,
+          :all_words => @all_words,
+          :titles_only => @titles_only,
+          :limit => (limit+1),
+          :offset => offset,
+          :before => params[:previous].nil?)
+      end
+      @results = @results.sort {|a,b| b.event_datetime <=> a.event_datetime}
+      if params[:previous].nil?
+        @pagination_previous_date = @results[0].event_datetime if offset && @results[0]
+        if @results.size > limit
+          @pagination_next_date = @results[limit-1].event_datetime 
+          @results = @results[0, limit]
         end
       else
-        operator = @all_words ? ' AND ' : ' OR '
-        @results += Project.find(:all, 
-                                 :limit => limit,
-                                 :conditions => [ (["(#{Project.visible_by(User.current)}) AND (LOWER(name) like ? OR LOWER(description) like ?)"] * like_tokens.size).join(operator), * (like_tokens * 2).sort]
-                                 ) if @scope.include? 'projects'
-        # 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
+        @pagination_next_date = @results[-1].event_datetime if offset && @results[-1]
+        if @results.size > limit
+          @pagination_previous_date = @results[-(limit)].event_datetime 
+          @results = @results[-(limit), limit]
+        end
       end
     else
       @question = ""
diff --git a/app/helpers/search_helper.rb b/app/helpers/search_helper.rb
index ed2f40b69..6b5a2cede 100644
--- a/app/helpers/search_helper.rb
+++ b/app/helpers/search_helper.rb
@@ -35,4 +35,11 @@ module SearchHelper
     end
     result
   end
+  
+  def project_select_tag
+    options = [[l(:label_project_all), 'all']]
+    options << [l(:label_my_projects), 'my_projects'] unless User.current.memberships.empty?
+    options << [@project.name, ''] unless @project.nil?
+    select_tag('projects', options_for_select(options, params[:projects].to_s)) if options.size > 1
+  end
 end
diff --git a/app/models/changeset.rb b/app/models/changeset.rb
index 3e95ce111..9a05e6a68 100644
--- a/app/models/changeset.rb
+++ b/app/models/changeset.rb
@@ -27,7 +27,7 @@ class Changeset < ActiveRecord::Base
                 :url => Proc.new {|o| {:controller => 'repositories', :action => 'revision', :id => o.repository.project_id, :rev => o.revision}}
                 
   acts_as_searchable :columns => 'comments',
-                     :include => :repository,
+                     :include => {:repository => :project},
                      :project_key => "#{Repository.table_name}.project_id",
                      :date_column => 'committed_on'
   
diff --git a/app/models/document.rb b/app/models/document.rb
index 7a432b46b..9e2818fc7 100644
--- a/app/models/document.rb
+++ b/app/models/document.rb
@@ -20,7 +20,7 @@ class Document < ActiveRecord::Base
   belongs_to :category, :class_name => "Enumeration", :foreign_key => "category_id"
   has_many :attachments, :as => :container, :dependent => :destroy
 
-  acts_as_searchable :columns => ['title', 'description']
+  acts_as_searchable :columns => ['title', "#{table_name}.description"], :include => :project
   acts_as_event :title => Proc.new {|o| "#{l(:label_document)}: #{o.title}"},
                 :author => Proc.new {|o| (a = o.attachments.find(:first, :order => "#{Attachment.table_name}.created_on ASC")) ? a.author : nil },
                 :url => Proc.new {|o| {:controller => 'documents', :action => 'show', :id => o.id}}
diff --git a/app/models/issue.rb b/app/models/issue.rb
index 8082e43b7..0618b0f0a 100644
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -36,7 +36,7 @@ class Issue < ActiveRecord::Base
   has_many :relations_to, :class_name => 'IssueRelation', :foreign_key => 'issue_to_id', :dependent => :delete_all
   
   acts_as_watchable
-  acts_as_searchable :columns => ['subject', 'description'], :with => {:journal => :issue}
+  acts_as_searchable :columns => ['subject', "#{table_name}.description"], :include => :project, :with => {:journal => :issue}
   acts_as_event :title => Proc.new {|o| "#{o.tracker.name} ##{o.id}: #{o.subject}"},
                 :url => Proc.new {|o| {:controller => 'issues', :action => 'show', :id => o.id}}                
   
diff --git a/app/models/journal.rb b/app/models/journal.rb
index 1376d349e..edf261e6d 100644
--- a/app/models/journal.rb
+++ b/app/models/journal.rb
@@ -26,7 +26,7 @@ class Journal < ActiveRecord::Base
   attr_accessor :indice
   
   acts_as_searchable :columns => 'notes',
-                     :include => :issue,
+                     :include => {:issue => :project},
                      :project_key => "#{Issue.table_name}.project_id",
                      :date_column => "#{Issue.table_name}.created_on"
   
diff --git a/app/models/message.rb b/app/models/message.rb
index a18d126c9..f57b90985 100644
--- a/app/models/message.rb
+++ b/app/models/message.rb
@@ -23,9 +23,9 @@ class Message < ActiveRecord::Base
   belongs_to :last_reply, :class_name => 'Message', :foreign_key => 'last_reply_id'
   
   acts_as_searchable :columns => ['subject', 'content'],
-                     :include => :board,
+                     :include => {:board, :project},
                      :project_key => 'project_id',
-                     :date_column => 'created_on'
+                     :date_column => "#{table_name}.created_on"
   acts_as_event :title => Proc.new {|o| "#{o.board.name}: #{o.subject}"},
                 :description => :content,
                 :type => Proc.new {|o| o.parent_id.nil? ? 'message' : 'reply'},
diff --git a/app/models/news.rb b/app/models/news.rb
index 3d8c4d661..71e2a2d5e 100644
--- a/app/models/news.rb
+++ b/app/models/news.rb
@@ -24,7 +24,7 @@ class News < ActiveRecord::Base
   validates_length_of :title, :maximum => 60
   validates_length_of :summary, :maximum => 255
 
-  acts_as_searchable :columns => ['title', 'description']
+  acts_as_searchable :columns => ['title', "#{table_name}.description"], :include => :project
   acts_as_event :url => Proc.new {|o| {:controller => 'news', :action => 'show', :id => o.id}}
 
   # returns latest news for projects visible by user
diff --git a/app/models/project.rb b/app/models/project.rb
index 8c32c8562..2f2937fd9 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -46,7 +46,7 @@ class Project < ActiveRecord::Base
                           
   acts_as_tree :order => "name", :counter_cache => true
 
-  acts_as_searchable :columns => ['name', 'description'], :project_key => 'id'
+  acts_as_searchable :columns => ['name', 'description'], :project_key => 'id', :permission => nil
   acts_as_event :title => Proc.new {|o| "#{l(:label_project)}: #{o.name}"},
                 :url => Proc.new {|o| {:controller => 'projects', :action => 'show', :id => o.id}}
 
@@ -202,6 +202,10 @@ class Project < ActiveRecord::Base
     @all_custom_fields ||= (IssueCustomField.for_all + custom_fields).uniq
   end
   
+  def project
+    self
+  end
+  
   def <=>(project)
     name.downcase <=> project.name.downcase
   end
diff --git a/app/models/wiki_page.rb b/app/models/wiki_page.rb
index 95750f37b..65fc1f68c 100644
--- a/app/models/wiki_page.rb
+++ b/app/models/wiki_page.rb
@@ -29,7 +29,7 @@ class WikiPage < ActiveRecord::Base
                 :url => Proc.new {|o| {:controller => 'wiki', :id => o.wiki.project_id, :page => o.title}}
 
   acts_as_searchable :columns => ['title', 'text'],
-                     :include => [:wiki, :content],
+                     :include => [{:wiki => :project}, :content],
                      :project_key => "#{Wiki.table_name}.project_id"
 
   attr_accessor :redirect_existing_links
diff --git a/app/views/search/index.rhtml b/app/views/search/index.rhtml
index 29c604a21..0be97a504 100644
--- a/app/views/search/index.rhtml
+++ b/app/views/search/index.rhtml
@@ -4,23 +4,25 @@
 <% form_tag({}, :method => :get) do %>
 <p><%= text_field_tag 'q', @question, :size => 60, :id => 'search-input' %>
 <%= javascript_tag "Field.focus('search-input')" %>
-
-<% @object_types.each do |t| %>
-<label><%= check_box_tag t, 1, @scope.include?(t) %> <%= l("label_#{t.singularize}_plural")%></label>
-<% end %>
-<br />
+<%= project_select_tag %>
 <label><%= check_box_tag 'all_words', 1, @all_words %> <%= l(:label_all_words) %></label>
 <label><%= check_box_tag 'titles_only', 1, @titles_only %> <%= l(:label_search_titles_only) %></label>
 </p>
-<%= submit_tag l(:button_submit), :name => 'submit' %>
+<p>
+<% @object_types.each do |t| %>
+<label><%= check_box_tag t, 1, @scope.include?(t) %> <%= l("label_#{t.singularize}_plural")%></label>
+<% end %>
+</p>
+
+<p><%= submit_tag l(:button_submit), :name => 'submit' %></p>
 <% end %>
 </div>
 
 <% if @results %>
     <h3><%= l(:label_result_plural) %></h3>
-    <ul>
+    <ul id="search-results">
       <% @results.each do |e| %>
-        <li><p><%= link_to highlight_tokens(truncate(e.event_title, 255), @tokens), e.event_url %><br />
+        <li><p><%= content_tag('span', h(e.project), :class => 'project') unless @project == e.project %> <%= link_to highlight_tokens(truncate(e.event_title, 255), @tokens), e.event_url %><br />
         <%= highlight_tokens(e.event_description, @tokens) %><br />
         <span class="author"><%= format_time(e.event_datetime) %></span></p></li>
       <% end %>
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 8e4bf995c..bdcf5615c 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -177,7 +177,7 @@ div#activity dd { margin-bottom: 1em; padding-left: 18px; }
 div#activity dt { margin-bottom: 1px; padding-left: 20px; line-height: 18px; background-position: 0 50%; background-repeat: no-repeat; }
 div#activity dt .time { color: #777; font-size: 80%; }
 div#activity dd .description { font-style: italic; }
-div#activity span.project:after { content: " -"; }
+div#activity span.project:after, #search-results span.project:after { content: " -"; }
 div#activity dt.issue { background-image: url(../images/ticket.png); }
 div#activity dt.issue-edit { background-image: url(../images/ticket_edit.png); }
 div#activity dt.issue-closed { background-image: url(../images/ticket_checked.png); }
diff --git a/test/functional/search_controller_test.rb b/test/functional/search_controller_test.rb
index 49004c7e6..b02f07793 100644
--- a/test/functional/search_controller_test.rb
+++ b/test/functional/search_controller_test.rb
@@ -5,7 +5,10 @@ require 'search_controller'
 class SearchController; def rescue_action(e) raise e end; end
 
 class SearchControllerTest < Test::Unit::TestCase
-  fixtures :projects, :enabled_modules, :issues, :custom_fields, :custom_values
+  fixtures :projects, :enabled_modules, :roles, :users,
+           :issues, :trackers, :issue_statuses,
+           :custom_fields, :custom_values,
+           :repositories, :changesets
   
   def setup
     @controller = SearchController.new
@@ -25,6 +28,15 @@ class SearchControllerTest < Test::Unit::TestCase
     assert assigns(:results).include?(Project.find(1))
   end
   
+  def test_search_all_projects
+    get :index, :q => 'recipe subproject commit', :submit => 'Search'
+    assert_response :success
+    assert_template 'index'
+    assert assigns(:results).include?(Issue.find(2))
+    assert assigns(:results).include?(Issue.find(5))
+    assert assigns(:results).include?(Changeset.find(101))
+  end
+  
   def test_search_without_searchable_custom_fields
     CustomField.update_all "searchable = #{ActiveRecord::Base.connection.quoted_false}"
     
diff --git a/vendor/plugins/acts_as_searchable/lib/acts_as_searchable.rb b/vendor/plugins/acts_as_searchable/lib/acts_as_searchable.rb
index dff76b913..1eb64c30f 100644
--- a/vendor/plugins/acts_as_searchable/lib/acts_as_searchable.rb
+++ b/vendor/plugins/acts_as_searchable/lib/acts_as_searchable.rb
@@ -49,6 +49,9 @@ module Redmine
             raise 'No date column defined defined.'
           end
           
+          # Permission needed to search this model
+          searchable_options[:permission] = "view_#{self.name.underscore.pluralize}".to_sym unless searchable_options.has_key?(:permission)
+          
           # Should we search custom fields on this model ?
           searchable_options[:search_custom_fields] = !reflect_on_association(:custom_values).nil?
           
@@ -62,8 +65,12 @@ module Redmine
         end
 
         module ClassMethods
-          def search(tokens, project, options={})
+          # Search the model for the given tokens
+          # projects argument can be either nil (will search all projects), a project or an array of projects
+          def search(tokens, projects, options={})
             tokens = [] << tokens unless tokens.is_a?(Array)
+            projects = [] << projects unless projects.nil? || projects.is_a?(Array)
+            
             find_options = {:include => searchable_options[:include]}
             find_options[:limit] = options[:limit] if options[:limit]
             find_options[:order] = "#{searchable_options[:date_column]} " + (options[:before] ? 'DESC' : 'ASC')
@@ -92,12 +99,17 @@ module Redmine
             end
             find_options[:conditions] = [sql, * (tokens * token_clauses.size).sort]
             
-            results = with_scope(:find => {:conditions => ["#{searchable_options[:project_key]} = ?", project.id]}) do
+            project_conditions = []
+            project_conditions << (searchable_options[:permission].nil? ? Project.visible_by(User.current) :
+                                                 Project.allowed_to_condition(User.current, searchable_options[:permission]))
+            project_conditions << "#{searchable_options[:project_key]} IN (#{projects.collect(&:id).join(',')})" unless projects.nil?
+            
+            results = with_scope(:find => {:conditions => project_conditions.join(' AND ')}) do
               find(:all, find_options)
             end            
             if searchable_options[:with] && !options[:titles_only]
               searchable_options[:with].each do |model, assoc|
-                results += model.to_s.camelcase.constantize.search(tokens, project, options).collect {|r| r.send assoc}
+                results += model.to_s.camelcase.constantize.search(tokens, projects, options).collect {|r| r.send assoc}
               end
               results.uniq!
             end

From 82f204d8ac48744b7d4458fcf742882716bc0733 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 18 May 2008 16:33:50 +0000
Subject: [PATCH 436/710] Adds icons on search results.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1436 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/search/index.rhtml       | 10 +++++-----
 public/stylesheets/application.css | 28 +++++++++++++++-------------
 2 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/app/views/search/index.rhtml b/app/views/search/index.rhtml
index 0be97a504..44d024b60 100644
--- a/app/views/search/index.rhtml
+++ b/app/views/search/index.rhtml
@@ -20,13 +20,13 @@
 
 <% if @results %>
     <h3><%= l(:label_result_plural) %></h3>
-    <ul id="search-results">
+    <dl id="search-results">
       <% @results.each do |e| %>
-        <li><p><%= content_tag('span', h(e.project), :class => 'project') unless @project == e.project %> <%= link_to highlight_tokens(truncate(e.event_title, 255), @tokens), e.event_url %><br />
-        <%= highlight_tokens(e.event_description, @tokens) %><br />
-        <span class="author"><%= format_time(e.event_datetime) %></span></p></li>
+        <dt class="<%= e.event_type %>"><%= content_tag('span', h(e.project), :class => 'project') unless @project == e.project %> <%= link_to highlight_tokens(truncate(e.event_title, 255), @tokens), e.event_url %></dt>
+        <dd><span class="description"><%= highlight_tokens(e.event_description, @tokens) %></span><br />
+        <span class="author"><%= format_time(e.event_datetime) %></span><dd>
       <% end %>
-    </ul>
+    </dl>
 <% end %>
 
 <p><center>
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index bdcf5615c..9a0201378 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -172,22 +172,24 @@ div#issue-changesets .changeset { padding: 4px;}
 div#issue-changesets .changeset { border-bottom: 1px solid #ddd; }
 div#issue-changesets p { margin-top: 0; margin-bottom: 1em;}
 
-div#activity dl { margin-left: 2em; }
+div#activity dl, #search-results { margin-left: 2em; }
 div#activity dd { margin-bottom: 1em; padding-left: 18px; }
-div#activity dt { margin-bottom: 1px; padding-left: 20px; line-height: 18px; background-position: 0 50%; background-repeat: no-repeat; }
+div#activity dt, #search-results dt { margin-bottom: 1px; padding-left: 20px; line-height: 18px; background-position: 0 50%; background-repeat: no-repeat; }
 div#activity dt .time { color: #777; font-size: 80%; }
-div#activity dd .description { font-style: italic; }
+div#activity dd .description, #search-results dd .description { font-style: italic; }
 div#activity span.project:after, #search-results span.project:after { content: " -"; }
-div#activity dt.issue { background-image: url(../images/ticket.png); }
-div#activity dt.issue-edit { background-image: url(../images/ticket_edit.png); }
-div#activity dt.issue-closed { background-image: url(../images/ticket_checked.png); }
-div#activity dt.changeset { background-image: url(../images/changeset.png); }
-div#activity dt.news { background-image: url(../images/news.png); }
-div#activity dt.message { background-image: url(../images/message.png); }
-div#activity dt.reply { background-image: url(../images/comments.png); }
-div#activity dt.wiki-page { background-image: url(../images/wiki_edit.png); }
-div#activity dt.attachment { background-image: url(../images/attachment.png); }
-div#activity dt.document { background-image: url(../images/document.png); }
+#search-results dd { margin-bottom: 1em; padding-left: 20px; margin-left:0px;}
+
+dt.issue { background-image: url(../images/ticket.png); }
+dt.issue-edit { background-image: url(../images/ticket_edit.png); }
+dt.issue-closed { background-image: url(../images/ticket_checked.png); }
+dt.changeset { background-image: url(../images/changeset.png); }
+dt.news { background-image: url(../images/news.png); }
+dt.message { background-image: url(../images/message.png); }
+dt.reply { background-image: url(../images/comments.png); }
+dt.wiki-page { background-image: url(../images/wiki_edit.png); }
+dt.attachment { background-image: url(../images/attachment.png); }
+dt.document { background-image: url(../images/document.png); }
 
 div#roadmap fieldset.related-issues { margin-bottom: 1em; }
 div#roadmap fieldset.related-issues ul { margin-top: 0.3em; margin-bottom: 0.3em; }

From 94dbf641ffd7f479208b135b310585898058e20b Mon Sep 17 00:00:00 2001
From: Liwiusz Ociepa <liwiusz.ociepa@softwarelab.eu>
Date: Mon, 19 May 2008 12:41:40 +0000
Subject: [PATCH 437/710] Memory leak (postgres -> zlib + ssl) has been fixed
 by apache developers.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1438 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 extra/svn/Redmine.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/extra/svn/Redmine.pm b/extra/svn/Redmine.pm
index 8003cabc0..e046b949a 100644
--- a/extra/svn/Redmine.pm
+++ b/extra/svn/Redmine.pm
@@ -52,8 +52,8 @@ Authen::Simple::LDAP (and IO::Socket::SSL if LDAPS is used):
   
      ## for mysql
      RedmineDSN "DBI:mysql:database=databasename;host=my.db.server"
-     ## for postgres (there is memory leak in libpq+ssl)
-     # RedmineDSN "DBI:Pg:dbname=databasename;host=my.db.server;sslmode=disable"
+     ## for postgres
+     # RedmineDSN "DBI:Pg:dbname=databasename;host=my.db.server"
 
      RedmineDbUser "redmine"
      RedmineDbPass "password"

From b0be3b95aab8c01a7561431579c83cde07f3109f Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Tue, 20 May 2008 20:31:04 +0000
Subject: [PATCH 438/710] Ability to search a project and its subprojects
 (#1264).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1439 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/search_controller.rb      | 4 +++-
 app/helpers/search_helper.rb              | 3 ++-
 lang/bg.yml                               | 1 +
 lang/cs.yml                               | 1 +
 lang/da.yml                               | 1 +
 lang/de.yml                               | 1 +
 lang/en.yml                               | 1 +
 lang/es.yml                               | 1 +
 lang/fi.yml                               | 1 +
 lang/fr.yml                               | 1 +
 lang/he.yml                               | 1 +
 lang/it.yml                               | 1 +
 lang/ja.yml                               | 1 +
 lang/ko.yml                               | 1 +
 lang/lt.yml                               | 1 +
 lang/nl.yml                               | 1 +
 lang/no.yml                               | 1 +
 lang/pl.yml                               | 1 +
 lang/pt-br.yml                            | 1 +
 lang/pt.yml                               | 1 +
 lang/ro.yml                               | 1 +
 lang/ru.yml                               | 1 +
 lang/sr.yml                               | 1 +
 lang/sv.yml                               | 1 +
 lang/th.yml                               | 1 +
 lang/uk.yml                               | 1 +
 lang/zh-tw.yml                            | 1 +
 lang/zh.yml                               | 1 +
 test/functional/search_controller_test.rb | 8 ++++++++
 29 files changed, 39 insertions(+), 2 deletions(-)

diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb
index d93c63808..d4ef01bf8 100644
--- a/app/controllers/search_controller.rb
+++ b/app/controllers/search_controller.rb
@@ -30,11 +30,13 @@ class SearchController < ApplicationController
     @titles_only = !params[:titles_only].nil?
     
     projects_to_search =
-      case params[:projects]
+      case params[:scope]
       when 'all'
         nil
       when 'my_projects'
         User.current.memberships.collect(&:project)
+      when 'subprojects'
+        @project ? ([ @project ] + @project.active_children) : nil
       else
         @project
       end
diff --git a/app/helpers/search_helper.rb b/app/helpers/search_helper.rb
index 6b5a2cede..d6a2fb949 100644
--- a/app/helpers/search_helper.rb
+++ b/app/helpers/search_helper.rb
@@ -39,7 +39,8 @@ module SearchHelper
   def project_select_tag
     options = [[l(:label_project_all), 'all']]
     options << [l(:label_my_projects), 'my_projects'] unless User.current.memberships.empty?
+    options << [l(:label_and_its_subprojects, @project.name), 'subprojects'] unless @project.nil? || @project.active_children.empty?
     options << [@project.name, ''] unless @project.nil?
-    select_tag('projects', options_for_select(options, params[:projects].to_s)) if options.size > 1
+    select_tag('scope', options_for_select(options, params[:scope].to_s)) if options.size > 1
   end
 end
diff --git a/lang/bg.yml b/lang/bg.yml
index b341d989f..224177d94 100644
--- a/lang/bg.yml
+++ b/lang/bg.yml
@@ -618,3 +618,4 @@ setting_default_projects_public: Новите проекти са публичн
 error_scm_annotate: "Обектът не съществува или не може да бъде анотиран."
 label_planning: Планиране
 text_subprojects_destroy_warning: 'Its subproject(s): %s will be also deleted.'
+label_and_its_subprojects: %s and its subprojects
diff --git a/lang/cs.yml b/lang/cs.yml
index 250c602c2..2126553fc 100644
--- a/lang/cs.yml
+++ b/lang/cs.yml
@@ -623,3 +623,4 @@ enumeration_activities: Aktivity (sledování času)
 error_scm_annotate: "Položka neexistuje nebo nemůže být komentována."
 label_planning: Plánování
 text_subprojects_destroy_warning: 'Its subproject(s): %s will be also deleted.'
+label_and_its_subprojects: %s and its subprojects
diff --git a/lang/da.yml b/lang/da.yml
index ff2ed982d..3b5ca07d3 100644
--- a/lang/da.yml
+++ b/lang/da.yml
@@ -620,3 +620,4 @@ setting_default_projects_public: Nye projekter er offentlige som default
 error_scm_annotate: "The entry does not exist or can not be annotated."
 label_planning: Planlægning
 text_subprojects_destroy_warning: 'Its subproject(s): %s will be also deleted.'
+label_and_its_subprojects: %s and its subprojects
diff --git a/lang/de.yml b/lang/de.yml
index 77184cf88..273bad277 100644
--- a/lang/de.yml
+++ b/lang/de.yml
@@ -619,3 +619,4 @@ enumeration_issue_priorities: Ticket-Prioritäten
 enumeration_doc_categories: Dokumentenkategorien
 enumeration_activities: Aktivitäten (Zeiterfassung)
 text_subprojects_destroy_warning: 'Its subproject(s): %s will be also deleted.'
+label_and_its_subprojects: %s and its subprojects
diff --git a/lang/en.yml b/lang/en.yml
index e39aec301..892a63a1b 100644
--- a/lang/en.yml
+++ b/lang/en.yml
@@ -291,6 +291,7 @@ label_auth_source: Authentication mode
 label_auth_source_new: New authentication mode
 label_auth_source_plural: Authentication modes
 label_subproject_plural: Subprojects
+label_and_its_subprojects: %s and its subprojects
 label_min_max_length: Min - Max length
 label_list: List
 label_date: Date
diff --git a/lang/es.yml b/lang/es.yml
index c6eef021a..26009d716 100644
--- a/lang/es.yml
+++ b/lang/es.yml
@@ -621,3 +621,4 @@ setting_default_projects_public: Los proyectos nuevos son públicos por defecto
 error_scm_annotate: "No existe la entrada o no ha podido ser anotada"
 label_planning: Planificación
 text_subprojects_destroy_warning: 'Sus subprojectos: %s también se eliminarán' 
+label_and_its_subprojects: %s and its subprojects
diff --git a/lang/fi.yml b/lang/fi.yml
index 1a614a16c..908ef1283 100644
--- a/lang/fi.yml
+++ b/lang/fi.yml
@@ -618,3 +618,4 @@ label_overall_activity: Kokonaishistoria
 error_scm_annotate: "Merkintää ei ole tai siihen ei voi lisätä selityksiä."
 label_planning: Suunnittelu
 text_subprojects_destroy_warning: 'Tämän alaprojekti(t): %s tullaan myös poistamaan.'
+label_and_its_subprojects: %s and its subprojects
diff --git a/lang/fr.yml b/lang/fr.yml
index cbdda4f3d..8827edd5e 100644
--- a/lang/fr.yml
+++ b/lang/fr.yml
@@ -291,6 +291,7 @@ label_auth_source: Mode d'authentification
 label_auth_source_new: Nouveau mode d'authentification
 label_auth_source_plural: Modes d'authentification
 label_subproject_plural: Sous-projets
+label_and_its_subprojects: %s et ses sous-projets
 label_min_max_length: Longueurs mini - maxi
 label_list: Liste
 label_date: Date
diff --git a/lang/he.yml b/lang/he.yml
index a611c8c39..71bc5e5b3 100644
--- a/lang/he.yml
+++ b/lang/he.yml
@@ -618,3 +618,4 @@ setting_default_projects_public: פרויקטים חדשים הינם פומבי
 error_scm_annotate: "הכניסה לא קיימת או שלא ניתן לתאר אותה."
 label_planning: תכנון
 text_subprojects_destroy_warning: 'Its subproject(s): %s will be also deleted.'
+label_and_its_subprojects: %s and its subprojects
diff --git a/lang/it.yml b/lang/it.yml
index 3d1dea09e..1771e1bda 100644
--- a/lang/it.yml
+++ b/lang/it.yml
@@ -618,3 +618,4 @@ setting_default_projects_public: New projects are public by default
 error_scm_annotate: "The entry does not exist or can not be annotated."
 label_planning: Planning
 text_subprojects_destroy_warning: 'Its subproject(s): %s will be also deleted.'
+label_and_its_subprojects: %s and its subprojects
diff --git a/lang/ja.yml b/lang/ja.yml
index 680d29836..84f27a2eb 100644
--- a/lang/ja.yml
+++ b/lang/ja.yml
@@ -619,3 +619,4 @@ setting_default_projects_public: デフォルトで新しいプロジェクト
 error_scm_annotate: "エントリが存在しない、もしくはアノテートできません。"
 label_planning: 計画
 text_subprojects_destroy_warning: 'Its subproject(s): %s will be also deleted.'
+label_and_its_subprojects: %s and its subprojects
diff --git a/lang/ko.yml b/lang/ko.yml
index 4281f3881..ee94c4025 100644
--- a/lang/ko.yml
+++ b/lang/ko.yml
@@ -618,3 +618,4 @@ setting_default_projects_public: New projects are public by default
 error_scm_annotate: "The entry does not exist or can not be annotated."
 label_planning: Planning
 text_subprojects_destroy_warning: 'Its subproject(s): %s will be also deleted.'
+label_and_its_subprojects: %s and its subprojects
diff --git a/lang/lt.yml b/lang/lt.yml
index df7cd960b..a58835186 100644
--- a/lang/lt.yml
+++ b/lang/lt.yml
@@ -619,3 +619,4 @@ setting_default_projects_public: New projects are public by default
 error_scm_annotate: "The entry does not exist or can not be annotated."
 label_planning: Planning
 text_subprojects_destroy_warning: 'Its subproject(s): %s will be also deleted.'
+label_and_its_subprojects: %s and its subprojects
diff --git a/lang/nl.yml b/lang/nl.yml
index e487a7a6d..01755137a 100644
--- a/lang/nl.yml
+++ b/lang/nl.yml
@@ -619,3 +619,4 @@ setting_default_projects_public: New projects are public by default
 error_scm_annotate: "The entry does not exist or can not be annotated."
 label_planning: Planning
 text_subprojects_destroy_warning: 'Its subproject(s): %s will be also deleted.'
+label_and_its_subprojects: %s and its subprojects
diff --git a/lang/no.yml b/lang/no.yml
index ccfa5c99f..388e51dd7 100644
--- a/lang/no.yml
+++ b/lang/no.yml
@@ -619,3 +619,4 @@ default_activity_development: Utvikling
 enumeration_issue_priorities: Sakssprioriteringer
 enumeration_doc_categories: Dokument-kategorier
 enumeration_activities: Aktiviteter (tidssporing)
+label_and_its_subprojects: %s and its subprojects
diff --git a/lang/pl.yml b/lang/pl.yml
index cf101811a..bc65b6253 100644
--- a/lang/pl.yml
+++ b/lang/pl.yml
@@ -618,3 +618,4 @@ setting_default_projects_public: Nowe projekty są domyślnie publiczne
 error_scm_annotate: "Wpis nie istnieje lub nie można do niego dodawać adnotacji."
 label_planning: Planning
 text_subprojects_destroy_warning: 'Its subproject(s): %s will be also deleted.'
+label_and_its_subprojects: %s and its subprojects
diff --git a/lang/pt-br.yml b/lang/pt-br.yml
index 9facd8d19..b1f8d2055 100644
--- a/lang/pt-br.yml
+++ b/lang/pt-br.yml
@@ -618,3 +618,4 @@ setting_default_projects_public: New projects are public by default
 error_scm_annotate: "The entry does not exist or can not be annotated."
 label_planning: Planning
 text_subprojects_destroy_warning: 'Its subproject(s): %s will be also deleted.'
+label_and_its_subprojects: %s and its subprojects
diff --git a/lang/pt.yml b/lang/pt.yml
index 6f51c8ed2..9d0586775 100644
--- a/lang/pt.yml
+++ b/lang/pt.yml
@@ -618,3 +618,4 @@ setting_default_projects_public: New projects are public by default
 error_scm_annotate: "The entry does not exist or can not be annotated."
 label_planning: Planning
 text_subprojects_destroy_warning: 'Its subproject(s): %s will be also deleted.'
+label_and_its_subprojects: %s and its subprojects
diff --git a/lang/ro.yml b/lang/ro.yml
index 59edfeb70..01127f5c5 100644
--- a/lang/ro.yml
+++ b/lang/ro.yml
@@ -618,3 +618,4 @@ setting_default_projects_public: New projects are public by default
 error_scm_annotate: "The entry does not exist or can not be annotated."
 label_planning: Planning
 text_subprojects_destroy_warning: 'Its subproject(s): %s will be also deleted.'
+label_and_its_subprojects: %s and its subprojects
diff --git a/lang/ru.yml b/lang/ru.yml
index f69009847..4f0a4bb7b 100644
--- a/lang/ru.yml
+++ b/lang/ru.yml
@@ -622,3 +622,4 @@ setting_default_projects_public: Новые проекты являются пу
 error_scm_annotate: "Данные отсутствуют или не могут быть подписаны."
 label_planning: Планирование
 text_subprojects_destroy_warning: 'Its subproject(s): %s will be also deleted.'
+label_and_its_subprojects: %s and its subprojects
diff --git a/lang/sr.yml b/lang/sr.yml
index d9869c362..263bd1187 100644
--- a/lang/sr.yml
+++ b/lang/sr.yml
@@ -619,3 +619,4 @@ setting_default_projects_public: New projects are public by default
 error_scm_annotate: "The entry does not exist or can not be annotated."
 label_planning: Planning
 text_subprojects_destroy_warning: 'Its subproject(s): %s will be also deleted.'
+label_and_its_subprojects: %s and its subprojects
diff --git a/lang/sv.yml b/lang/sv.yml
index c0f691230..5b0c57acf 100644
--- a/lang/sv.yml
+++ b/lang/sv.yml
@@ -619,3 +619,4 @@ setting_default_projects_public: New projects are public by default
 error_scm_annotate: "The entry does not exist or can not be annotated."
 label_planning: Planning
 text_subprojects_destroy_warning: 'Its subproject(s): %s will be also deleted.'
+label_and_its_subprojects: %s and its subprojects
diff --git a/lang/th.yml b/lang/th.yml
index 2c506c664..643ee01c6 100644
--- a/lang/th.yml
+++ b/lang/th.yml
@@ -621,3 +621,4 @@ default_activity_development: พัฒนา
 enumeration_issue_priorities: ความสำคัญของปัญหา
 enumeration_doc_categories: ประเภทเอกสาร
 enumeration_activities: กิจกรรม (ใช้ในการติดตามเวลา)
+label_and_its_subprojects: %s and its subprojects
diff --git a/lang/uk.yml b/lang/uk.yml
index a52a05603..e61fc5b38 100644
--- a/lang/uk.yml
+++ b/lang/uk.yml
@@ -620,3 +620,4 @@ setting_default_projects_public: New projects are public by default
 error_scm_annotate: "The entry does not exist or can not be annotated."
 label_planning: Planning
 text_subprojects_destroy_warning: 'Its subproject(s): %s will be also deleted.'
+label_and_its_subprojects: %s and its subprojects
diff --git a/lang/zh-tw.yml b/lang/zh-tw.yml
index d91c9708d..b52446917 100644
--- a/lang/zh-tw.yml
+++ b/lang/zh-tw.yml
@@ -619,3 +619,4 @@ default_activity_development: 開發
 enumeration_issue_priorities: 項目優先權
 enumeration_doc_categories: 文件分類
 enumeration_activities: 活動 (時間追蹤)
+label_and_its_subprojects: %s and its subprojects
diff --git a/lang/zh.yml b/lang/zh.yml
index c8b809764..808dd1b39 100644
--- a/lang/zh.yml
+++ b/lang/zh.yml
@@ -619,3 +619,4 @@ default_activity_development: 开发
 enumeration_issue_priorities: 问题优先级
 enumeration_doc_categories: 文档类别
 enumeration_activities: 活动（时间跟踪）
+label_and_its_subprojects: %s and its subprojects
diff --git a/test/functional/search_controller_test.rb b/test/functional/search_controller_test.rb
index b02f07793..1c505620b 100644
--- a/test/functional/search_controller_test.rb
+++ b/test/functional/search_controller_test.rb
@@ -37,6 +37,14 @@ class SearchControllerTest < Test::Unit::TestCase
     assert assigns(:results).include?(Changeset.find(101))
   end
   
+  def test_search_project_and_subprojects
+    get :index, :id => 1, :q => 'recipe subproject', :scope => 'subprojects', :submit => 'Search'
+    assert_response :success
+    assert_template 'index'
+    assert assigns(:results).include?(Issue.find(1))
+    assert assigns(:results).include?(Issue.find(5))
+  end
+
   def test_search_without_searchable_custom_fields
     CustomField.update_all "searchable = #{ActiveRecord::Base.connection.quoted_false}"
     

From 03308028c9520fa6f4f6e153799031b153a11dfc Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Tue, 20 May 2008 20:45:53 +0000
Subject: [PATCH 439/710] Slight changes to the search results.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1440 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/search/index.rhtml       |   2 +-
 public/images/projects.png         | Bin 690 -> 811 bytes
 public/stylesheets/application.css |   2 ++
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/views/search/index.rhtml b/app/views/search/index.rhtml
index 44d024b60..b5cea4645 100644
--- a/app/views/search/index.rhtml
+++ b/app/views/search/index.rhtml
@@ -23,7 +23,7 @@
     <dl id="search-results">
       <% @results.each do |e| %>
         <dt class="<%= e.event_type %>"><%= content_tag('span', h(e.project), :class => 'project') unless @project == e.project %> <%= link_to highlight_tokens(truncate(e.event_title, 255), @tokens), e.event_url %></dt>
-        <dd><span class="description"><%= highlight_tokens(e.event_description, @tokens) %></span><br />
+        <dd><span class="description"><%= highlight_tokens(e.event_description, @tokens) %></span>
         <span class="author"><%= format_time(e.event_datetime) %></span><dd>
       <% end %>
     </dl>
diff --git a/public/images/projects.png b/public/images/projects.png
index 244c896f0eddc1e19a2cdae29acda561a20be169..073c7219db8a53000c1d6c2af503499b43716334 100644
GIT binary patch
delta 799
zcmV+)1K|9!1*-;-8Gi-<001BJ|6u?C0`f^jK~y-6g;GmMlwlM--}n9hKaS2LCv7xT
za7HQ2YNjkqBR54vA-ISZJt&Bzmx~BmSPN;<A_#&Ww5d%|S&N`3gjyt4T9aij4K1xK
z(|I;J&iv2YCZ`8fcYDt{+;h)iM1+4$bKmR=Yt*yVB^4CJq<{C1i^}saAM*`pGkf+g
zfh`^R8>&U)wM9h@IYMwGCS&M|T<kXIj;%Qp7@GnB{x|Z@`z7{L5xlUtx;jTGi9-}e
z;i<Gx=UZQ!{6L3haDNp@#*@qD`}_s4$Dy+*bQVPhV{mxW@OdlO&ETXg<7T}urZcN8
zdxf8CBZHKtw11K}3E~nAnnubBL&Y~RaM<jc`I~@oVQ!(}ZMtohF0Elgz%&h<kN1Sm
zed<a%t9*GJfD;@}<U=!bjC^``1B-tV&>i)sg{P#(=9mEE09k;}%WLZ24h(llL!Je`
zQnyXWh@_I}3BA7)8I(?BQ<yqgW|J#dO)7=6<g6W22Y<{Aw1k%4)N|V(b}l?3$-!-z
zL}_3DK;YoF%WEEGEtu(yqGUeGm`VZWG?1A9)F=P~QysRx@s1sV;_BuFCAl1o)m4<K
z56kxTpWd~C_8;C{MU04$K3n|Q?sY8tGl}k@!sI^lo^#baJL5m{A_88F>geu%wsG>(
z^6MM`(tlsld(}uPNhSl43^EziNGjeoy!)Ob&(2<s0sUWrS6_hMQGjs?vb(4;`$W&t
z#FOy@vje$vQhS6<ep6$EsR`*+m$rQSN*PTK+s~_<0Cbaq2o~_4DmypcU04yQdtO_a
z`&;2&f7a0(dfGU3srF{JNG&ZbytA`Y#9}d_s(-3541+7c$Pl}FD3>oe7ASW}k^tU(
z*678{;p0~}CvE`%YiMW?p-?Da)3iC3Wfc*T7k~#q4gdkbg3Irc%Gdgt;!>^g-Ul>#
zHzY|?)a7!;84;nat&O#}w@cx0SW#6~F$_Z{B0)rqF=jEwEY7(pgfJCF(cNyh9t;MJ
d))>}S>pR*#O3<-TAv*v7002ovPDHLkV1fh=b~gY3

literal 690
zcmWkqT}TvB6uw()x|$>v1SYgwyXYeA&a9@41i9mGx<iVLE7ZKCjaE9Si?dWPQK8eX
z16o`tVxXV~#JJIFqc05v=7@+Z1#TIv^-|l<!#u^j2)7Z=cfNBz_|D;+`<)%F<)xLS
z0D$sDTa0zMVh1I=om_K#UzbCnbo^|(WwgIHJuoutO%4q8gT8^Gkhjr0*gJeB<c$zS
zqn9L_A`MM-4c=OUB#4>m>r0NaIGt#Z7k_pYd#Vmj`2!Cf$&+e3CjwBme+RBl`5W7g
z=)M$fj{=aHEZgoa0>BmNJd=!L09Y9@qDl)2#mgiolB^J9r631`yh`$r6b(u)@T$#g
zHmz8sXwtGl$`+5XfH0-llw=}>Hx!1HvNXi3iW!Itki?n~BOfPel!6%*XCbXCjEFF;
z*cM{2;RKC!vY=6{q_fawRcBPTpbI!FV3WrtS3o?kC=3*71=6x^Xc9JMoKtj-kxWXn
zC}h!aixLo<MY3%|6N%8Ikj>~eqggbsi854G74lG43#@MQy3I)j$3aEia%xGpL}Uq~
z!Lf=a>YQFs3`<dSBBu$QD$9m|oLxDnW@Q2K9E1WAcvX5j{&CRxrYp^Mbb;odUoJY$
zyF@ISy!Msvxi!|e4wHNQ6^9Q!n|dODzuOu+9goMC-xuu~A8VoMmPPN$@JRT``BOI=
z_e}!g+sfwV=F-MmKA&Ga@L}QY?EL)vY(}5EnsV0?M16gIq=7t9SGNGlriIIcE33la
zUo$g*eviB1k7)Dl)>wCUtbMQlXl-@4`qlHA7ye^`fG6h<`Lf<%pxhmKlzQwb^-SC=
xnRwu<T3=gST@Hf_WQ3f1Gn>g|#MCI+;{yL)R<%{$8QO5}0Eu`<>^0pp_8;0PE2#hg

diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 9a0201378..2467fd3cf 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -179,6 +179,7 @@ div#activity dt .time { color: #777; font-size: 80%; }
 div#activity dd .description, #search-results dd .description { font-style: italic; }
 div#activity span.project:after, #search-results span.project:after { content: " -"; }
 #search-results dd { margin-bottom: 1em; padding-left: 20px; margin-left:0px;}
+#search-results dd span.description { display:block; }
 
 dt.issue { background-image: url(../images/ticket.png); }
 dt.issue-edit { background-image: url(../images/ticket_edit.png); }
@@ -190,6 +191,7 @@ dt.reply { background-image: url(../images/comments.png); }
 dt.wiki-page { background-image: url(../images/wiki_edit.png); }
 dt.attachment { background-image: url(../images/attachment.png); }
 dt.document { background-image: url(../images/document.png); }
+dt.project { background-image: url(../images/projects.png); }
 
 div#roadmap fieldset.related-issues { margin-bottom: 1em; }
 div#roadmap fieldset.related-issues ul { margin-top: 0.3em; margin-bottom: 0.3em; }

From e5bc1d370a12aba5273d32ee8bf45f39aaa916cc Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Tue, 20 May 2008 20:49:06 +0000
Subject: [PATCH 440/710] Use display: block; for activity item descriptions.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1441 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/projects/activity.rhtml  | 4 +---
 public/stylesheets/application.css | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/app/views/projects/activity.rhtml b/app/views/projects/activity.rhtml
index c2f2f9ebd..d4b47f7be 100644
--- a/app/views/projects/activity.rhtml
+++ b/app/views/projects/activity.rhtml
@@ -8,9 +8,7 @@
 <% @events_by_day[day].sort {|x,y| y.event_datetime <=> x.event_datetime }.each do |e| -%>
   <dt class="<%= e.event_type %>"><span class="time"><%= format_time(e.event_datetime, false) %></span>
   <%= content_tag('span', h(e.project), :class => 'project') if @project.nil? || @project != e.project %> <%= link_to h(truncate(e.event_title, 100)), e.event_url %></dt>
-  <dd><% unless e.event_description.blank? -%>
-  <span class="description"><%= format_activity_description(e.event_description) %></span><br />
-  <% end %>
+  <dd><span class="description"><%= format_activity_description(e.event_description) %></span>
   <span class="author"><%= e.event_author if e.respond_to?(:event_author) %></span></dd>
 <% end -%>
 </dl>
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 2467fd3cf..e5bb4a7ab 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -179,7 +179,7 @@ div#activity dt .time { color: #777; font-size: 80%; }
 div#activity dd .description, #search-results dd .description { font-style: italic; }
 div#activity span.project:after, #search-results span.project:after { content: " -"; }
 #search-results dd { margin-bottom: 1em; padding-left: 20px; margin-left:0px;}
-#search-results dd span.description { display:block; }
+div#activity dd span.description, #search-results dd span.description { display:block; }
 
 dt.issue { background-image: url(../images/ticket.png); }
 dt.issue-edit { background-image: url(../images/ticket_edit.png); }

From 62125cad33f8ffb47e774698603ca1772cfdea43 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Thu, 22 May 2008 17:02:29 +0000
Subject: [PATCH 441/710] Fixed: encoding problem when adding non-ASCII issue
 category in the new issue page (#1286).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1442 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 public/javascripts/application.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/javascripts/application.js b/public/javascripts/application.js
index f3d771a10..a8b6c0e46 100644
--- a/public/javascripts/application.js
+++ b/public/javascripts/application.js
@@ -56,7 +56,7 @@ function setPredecessorFieldsVisibility() {
 function promptToRemote(text, param, url) {
     value = prompt(text + ':');
     if (value) {
-        new Ajax.Request(url + '?' + param + '=' + value, {asynchronous:true, evalScripts:true});
+        new Ajax.Request(url + '?' + param + '=' + encodeURIComponent(value), {asynchronous:true, evalScripts:true});
         return false;
     }
 }

From 82c12d09e94c502358b38166c5b239eb4ffcfff9 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Thu, 22 May 2008 18:08:54 +0000
Subject: [PATCH 442/710] Fixed: non member or anonymous permissions change is
 effective only after an application restart (#1280).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1443 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/models/user.rb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/models/user.rb b/app/models/user.rb
index a67a08567..573261b77 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -258,13 +258,12 @@ class User < ActiveRecord::Base
   end
   
   def self.anonymous
-    return @anonymous_user if @anonymous_user
     anonymous_user = AnonymousUser.find(:first)
     if anonymous_user.nil?
       anonymous_user = AnonymousUser.create(:lastname => 'Anonymous', :firstname => '', :mail => '', :login => '', :status => 0)
       raise 'Unable to create the anonymous user.' if anonymous_user.new_record?
     end
-    @anonymous_user = anonymous_user
+    anonymous_user
   end
   
 private

From e02e047dd4a8f171225bcc4ca904474d9f89adcc Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Thu, 22 May 2008 18:26:43 +0000
Subject: [PATCH 443/710] Fixed: TypeError in WikiController#destroy_attachment
 (#1281).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1444 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/models/attachment.rb | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/app/models/attachment.rb b/app/models/attachment.rb
index f44fe8b4d..45bbd5428 100644
--- a/app/models/attachment.rb
+++ b/app/models/attachment.rb
@@ -68,9 +68,7 @@ class Attachment < ActiveRecord::Base
 
   # Deletes file on the disk
   def after_destroy
-    if self.filename?
-      File.delete(diskfile) if File.exist?(diskfile)
-    end
+    File.delete(diskfile) if !filename.blank? && File.exist?(diskfile)
   end
 
   # Returns file's location on disk

From 9d4e71adf35656c5a06d782b24502fa121ff10b2 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Fri, 23 May 2008 16:29:40 +0000
Subject: [PATCH 444/710] Fixed: error when previewing a new wiki page (#1292)
 introduced in r1415.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1445 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/wiki_controller.rb      |  3 ++-
 test/functional/wiki_controller_test.rb | 11 +++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/app/controllers/wiki_controller.rb b/app/controllers/wiki_controller.rb
index 44113ebf3..8655cfed7 100644
--- a/app/controllers/wiki_controller.rb
+++ b/app/controllers/wiki_controller.rb
@@ -162,7 +162,8 @@ class WikiController < ApplicationController
   
   def preview
     page = @wiki.find_page(params[:page])
-    return render_403 unless editable?(page)
+    # page is nil when previewing a new page
+    return render_403 unless page.nil? || editable?(page)
     @attachements = page.attachments if page
     @text = params[:content][:text]
     render :partial => 'common/preview'
diff --git a/test/functional/wiki_controller_test.rb b/test/functional/wiki_controller_test.rb
index 8688c2e03..f1ae7a9c2 100644
--- a/test/functional/wiki_controller_test.rb
+++ b/test/functional/wiki_controller_test.rb
@@ -86,6 +86,17 @@ class WikiControllerTest < Test::Unit::TestCase
     assert_tag :tag => 'strong', :content => /previewed text/
   end
   
+  def test_preview_new_page
+    @request.session[:user_id] = 2
+    xhr :post, :preview, :id => 1, :page => 'New page',
+                                   :content => { :text => 'h1. New page',
+                                                 :comments => '',
+                                                 :version => 0 }
+    assert_response :success
+    assert_template 'common/_preview'
+    assert_tag :tag => 'h1', :content => /New page/
+  end
+  
   def test_history
     get :history, :id => 1, :page => 'CookBook_documentation'
     assert_response :success

From 193b2450f47a8e6eb9f6ff6fc5a6895e469b78eb Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sat, 24 May 2008 17:58:34 +0000
Subject: [PATCH 445/710] Fixed: View differences for individual file of a
 changeset fails if the subversion repository URL doesn't point to the
 repository root (#1209, #1262, #1275).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1446 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/models/change.rb                          |  4 +++
 app/models/repository.rb                      |  5 ++++
 app/models/repository/subversion.rb           | 15 +++++++++++
 app/views/repositories/revision.rhtml         |  2 +-
 test/fixtures/changes.yml                     |  7 +++++
 ...repositories_subversion_controller_test.rb | 26 +++++++++++++++++++
 6 files changed, 58 insertions(+), 1 deletion(-)

diff --git a/app/models/change.rb b/app/models/change.rb
index d14f435a4..385fe5acb 100644
--- a/app/models/change.rb
+++ b/app/models/change.rb
@@ -19,4 +19,8 @@ class Change < ActiveRecord::Base
   belongs_to :changeset
   
   validates_presence_of :changeset_id, :action, :path
+  
+  def relative_path
+    changeset.repository.relative_path(path)
+  end
 end
diff --git a/app/models/repository.rb b/app/models/repository.rb
index 8b1f8d0af..1ea77f24f 100644
--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -64,6 +64,11 @@ class Repository < ActiveRecord::Base
       :order => "committed_on DESC, #{Changeset.table_name}.id DESC").collect(&:changeset)
   end
   
+  # Returns a path relative to the url of the repository
+  def relative_path(path)
+    path
+  end
+  
   def latest_changeset
     @latest_changeset ||= changesets.find(:first)
   end
diff --git a/app/models/repository/subversion.rb b/app/models/repository/subversion.rb
index 0c2239c43..3981d6f4c 100644
--- a/app/models/repository/subversion.rb
+++ b/app/models/repository/subversion.rb
@@ -35,6 +35,11 @@ class Repository::Subversion < Repository
     revisions ? changesets.find_all_by_revision(revisions.collect(&:identifier), :order => "committed_on DESC") : []
   end
   
+  # Returns a path relative to the url of the repository
+  def relative_path(path)
+    path.gsub(Regexp.new("^\/?#{Regexp.escape(relative_url)}"), '')
+  end
+  
   def fetch_changesets
     scm_info = scm.info
     if scm_info
@@ -71,4 +76,14 @@ class Repository::Subversion < Repository
       end
     end
   end
+  
+  private
+  
+  # Returns the relative url of the repository
+  # Eg: root_url = file:///var/svn/foo
+  #     url      = file:///var/svn/foo/bar
+  #     => returns /bar
+  def relative_url
+    @relative_url ||= url.gsub(Regexp.new("^#{Regexp.escape(root_url)}"), '')
+  end
 end
diff --git a/app/views/repositories/revision.rhtml b/app/views/repositories/revision.rhtml
index f1e176669..2fdf58faf 100644
--- a/app/views/repositories/revision.rhtml
+++ b/app/views/repositories/revision.rhtml
@@ -49,7 +49,7 @@
 <td><div class="square action_<%= change.action %>"></div> <%= change.path %> <%= "(#{change.revision})" unless change.revision.blank?  %></td>
 <td align="right">
 <% if change.action == "M" %>
-<%= link_to l(:label_view_diff), :action => 'diff', :id => @project, :path => without_leading_slash(change.path), :rev => @changeset.revision %>
+<%= link_to l(:label_view_diff), :action => 'diff', :id => @project, :path => without_leading_slash(change.relative_path), :rev => @changeset.revision %>
 <% end %>
 </td>
 </tr>
diff --git a/test/fixtures/changes.yml b/test/fixtures/changes.yml
index 30acbd02d..56d936296 100644
--- a/test/fixtures/changes.yml
+++ b/test/fixtures/changes.yml
@@ -13,4 +13,11 @@ changes_002:
   path: /test/some/path/elsewhere/in/the/repo
   from_path:
   from_revision:
+changes_003: 
+  id: 3
+  changeset_id: 101
+  action: M
+  path: /test/some/path/in/the/repo
+  from_path:
+  from_revision:
   
\ No newline at end of file
diff --git a/test/functional/repositories_subversion_controller_test.rb b/test/functional/repositories_subversion_controller_test.rb
index dd56947fc..bc3f261a0 100644
--- a/test/functional/repositories_subversion_controller_test.rb
+++ b/test/functional/repositories_subversion_controller_test.rb
@@ -97,6 +97,32 @@ class RepositoriesSubversionControllerTest < Test::Unit::TestCase
       assert_equal 'folder', assigns(:entry).name
     end
     
+    def test_revision
+      get :revision, :id => 1, :rev => 2
+      assert_response :success
+      assert_template 'revision'
+      assert_tag :tag => 'tr',
+                 :child => { :tag => 'td', :content => %r{/test/some/path/in/the/repo} },
+                 :child => { :tag => 'td', 
+                             :child => { :tag => 'a', :attributes => { :href => '/repositories/diff/ecookbook/test/some/path/in/the/repo?rev=2' } }
+                           }
+    end
+    
+    def test_revision_with_repository_pointing_to_a_subdirectory
+      r = Project.find(1).repository
+      # Changes repository url to a subdirectory
+      r.update_attribute :url, (r.url + '/test/some')
+      
+      get :revision, :id => 1, :rev => 2
+      assert_response :success
+      assert_template 'revision'
+      assert_tag :tag => 'tr',
+                 :child => { :tag => 'td', :content => %r{/test/some/path/in/the/repo} },
+                 :child => { :tag => 'td', 
+                             :child => { :tag => 'a', :attributes => { :href => '/repositories/diff/ecookbook/path/in/the/repo?rev=2' } }
+                           }
+    end
+    
     def test_diff
       get :diff, :id => 1, :rev => 3
       assert_response :success

From 0e5edccaf2ef94372f2fb56e57c363134b69bc04 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sat, 24 May 2008 18:37:06 +0000
Subject: [PATCH 446/710] Fixed: Issue number display clipped on 'my issues'
 (#1291).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1447 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 public/stylesheets/application.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index e5bb4a7ab..4ae1c70f1 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -80,7 +80,7 @@ a.issue.closed, .issue.closed a { text-decoration: line-through; }
 /***** Tables *****/
 table.list { border: 1px solid #e4e4e4;  border-collapse: collapse; width: 100%; margin-bottom: 4px; }
 table.list th {  background-color:#EEEEEE; padding: 4px; white-space:nowrap; }
-table.list td { overflow: hidden; vertical-align: top;}
+table.list td { vertical-align: top; }
 table.list td.id { width: 2%; text-align: center;}
 table.list td.checkbox { width: 15px; padding: 0px;}
 

From 7f134a8c67955f30ef79c4f0c7f36f8049ea1145 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sat, 24 May 2008 18:42:53 +0000
Subject: [PATCH 447/710] Prevent admin users from locking their own account
 (#1276).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1448 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/helpers/users_helper.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb
index 6976d021b..32b29526a 100644
--- a/app/helpers/users_helper.rb
+++ b/app/helpers/users_helper.rb
@@ -44,7 +44,7 @@ module UsersHelper
       link_to l(:button_unlock), url.merge(:user => {:status => User::STATUS_ACTIVE}), :method => :post, :class => 'icon icon-unlock'
     elsif user.registered?
       link_to l(:button_activate), url.merge(:user => {:status => User::STATUS_ACTIVE}), :method => :post, :class => 'icon icon-unlock'
-    else
+    elsif user != User.current
       link_to l(:button_lock), url.merge(:user => {:status => User::STATUS_LOCKED}), :method => :post, :class => 'icon icon-lock'
     end
   end

From 39fc8f38b8695820101149228f03de9638e19228 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 25 May 2008 11:22:53 +0000
Subject: [PATCH 448/710] Prevent admin users from making themselves
 non-administrator (#1276).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1449 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/users/_form.rhtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/users/_form.rhtml b/app/views/users/_form.rhtml
index 6ca167a59..09a798468 100644
--- a/app/views/users/_form.rhtml
+++ b/app/views/users/_form.rhtml
@@ -12,7 +12,7 @@
 	<p><%= custom_field_tag_with_label @custom_value %></p>
 <% end if @custom_values%>
 
-<p><%= f.check_box :admin %></p>
+<p><%= f.check_box :admin, :disabled => (@user == User.current) %></p>
 </div>
 
 <div class="box">

From e8d092e46ad8c77419792cc5b418251a1c0a09c6 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 25 May 2008 11:43:20 +0000
Subject: [PATCH 449/710] Fixed: using '*' as keyword for repository
 referencing keywords doesn't work when issue id is at the beginning of a line
 (#1253).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1451 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/models/changeset.rb     |  2 +-
 test/unit/changeset_test.rb | 11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/app/models/changeset.rb b/app/models/changeset.rb
index 9a05e6a68..41f5ed86a 100644
--- a/app/models/changeset.rb
+++ b/app/models/changeset.rb
@@ -75,7 +75,7 @@ class Changeset < ActiveRecord::Base
     if ref_keywords.delete('*')
       # find any issue ID in the comments
       target_issue_ids = []
-      comments.scan(%r{([\s\(,-^])#(\d+)(?=[[:punct:]]|\s|<|$)}).each { |m| target_issue_ids << m[1] }
+      comments.scan(%r{([\s\(,-]|^)#(\d+)(?=[[:punct:]]|\s|<|$)}).each { |m| target_issue_ids << m[1] }
       referenced_issues += repository.project.issues.find_all_by_id(target_issue_ids)
     end
     
diff --git a/test/unit/changeset_test.rb b/test/unit/changeset_test.rb
index bbfe6952d..6cc53d852 100644
--- a/test/unit/changeset_test.rb
+++ b/test/unit/changeset_test.rb
@@ -39,6 +39,17 @@ class ChangesetTest < Test::Unit::TestCase
     assert fixed.closed?
     assert_equal 90, fixed.done_ratio
   end
+  
+  def test_ref_keywords_any_line_start
+    Setting.commit_ref_keywords = '*'
+
+    c = Changeset.new(:repository => Project.find(1).repository,
+                      :committed_on => Time.now,
+                      :comments => '#1 is the reason of this commit')
+    c.scan_comment_for_issue_ids
+
+    assert_equal [1], c.issue_ids.sort
+  end
 
   def test_previous
     changeset = Changeset.find_by_revision('3')

From fbafff83630b767f7da735d64ed0feb3be001fe0 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 25 May 2008 12:18:49 +0000
Subject: [PATCH 450/710] =?UTF-8?q?Hungarian=20translation=20added=20(#119?=
 =?UTF-8?q?8=20by=20G=C3=A1bor=20Tak=C3=A1cs).?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1452 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 lang/hu.yml                                   | 622 ++++++++++++++++++
 .../javascripts/calendar/lang/calendar-hu.js  | 127 ++++
 .../jstoolbar/lang/jstoolbar-hu.js            |  14 +
 3 files changed, 763 insertions(+)
 create mode 100644 lang/hu.yml
 create mode 100644 public/javascripts/calendar/lang/calendar-hu.js
 create mode 100644 public/javascripts/jstoolbar/lang/jstoolbar-hu.js

diff --git a/lang/hu.yml b/lang/hu.yml
new file mode 100644
index 000000000..428c7bf5c
--- /dev/null
+++ b/lang/hu.yml
@@ -0,0 +1,622 @@
+_gloc_rule_default: '|n| n==1 ? "" : "_plural" '
+
+actionview_datehelper_select_day_prefix:
+actionview_datehelper_select_month_names: Január,Február,Március,Április,Május,Június,Július,Augusztus,Szeptember,Október,November,December
+actionview_datehelper_select_month_names_abbr: Jan,Feb,Már,Ápr,Máj,Jún,Júl,Aug,Szept,Okt,Nov,Dec
+actionview_datehelper_select_month_prefix:
+actionview_datehelper_select_year_prefix:
+actionview_datehelper_time_in_words_day: 1 nap
+actionview_datehelper_time_in_words_day_plural: %d nap
+actionview_datehelper_time_in_words_hour_about: kb. 1 óra
+actionview_datehelper_time_in_words_hour_about_plural: kb. %d óra
+actionview_datehelper_time_in_words_hour_about_single: kb. 1 óra
+actionview_datehelper_time_in_words_minute: 1 perc
+actionview_datehelper_time_in_words_minute_half: fél perc
+actionview_datehelper_time_in_words_minute_less_than: kevesebb, mint 1 perc
+actionview_datehelper_time_in_words_minute_plural: %d perc
+actionview_datehelper_time_in_words_minute_single: 1 perc
+actionview_datehelper_time_in_words_second_less_than: kevesebb, mint 1 másodperc
+actionview_datehelper_time_in_words_second_less_than_plural: kevesebb, mint %d másodperc
+actionview_instancetag_blank_option: Kérem válasszon
+
+activerecord_error_inclusion: nem található a listában
+activerecord_error_exclusion: foglalt
+activerecord_error_invalid: érvénytelen
+activerecord_error_confirmation: jóváhagyás szükséges
+activerecord_error_accepted: ell kell fogadni
+activerecord_error_empty: nem lehet üres
+activerecord_error_blank: nem lehet üres
+activerecord_error_too_long: túl hosszú
+activerecord_error_too_short: túl rövid
+activerecord_error_wrong_length: hibás a hossza
+activerecord_error_taken: már foglalt
+activerecord_error_not_a_number: nem egy szám
+activerecord_error_not_a_date: nem érvényes dátum
+activerecord_error_greater_than_start_date: nagyobbnak kell lennie, mint az indítás dátuma
+activerecord_error_not_same_project: nem azonos projekthez tartozik
+activerecord_error_circular_dependency: Ez a kapcsolat egy körkörös függőséget eredményez
+
+general_fmt_age: %d év
+general_fmt_age_plural: %d év
+general_fmt_date: %%Y.%%m.%%d
+general_fmt_datetime: %%Y.%%m.%%d %%H:%%M:%%S
+general_fmt_datetime_short: %%b %%d, %%H:%%M:%%S
+general_fmt_time: %%H:%%M:%%S
+general_text_No: 'Nem'
+general_text_Yes: 'Igen'
+general_text_no: 'nem'
+general_text_yes: 'igen'
+general_lang_name: 'Hungarian (Magyar)'
+general_csv_separator: ','
+general_csv_encoding: ISO-8859-2
+general_pdf_encoding: ISO-8859-2
+general_day_names: Hétfő,Kedd,Szerda,Csütörtök,Péntek,Szombat,Vasárnap
+general_first_day_of_week: '1'
+
+notice_account_updated: A fiók adatai sikeresen frissítve.
+notice_account_invalid_creditentials: Hibás felhasználói név, vagy jelszó
+notice_account_password_updated: A jelszó módosítása megtörtént.
+notice_account_wrong_password: Hibás jelszó
+notice_account_register_done: A fiók sikeresen létrehozva. Aktiválásához kattints az e-mailben kapott linkre
+notice_account_unknown_email: Ismeretlen felhasználó.
+notice_can_t_change_password: A fiók külső azonosítási forrást használ. A jelszó megváltoztatása nem lehetséges.
+notice_account_lost_email_sent: Egy e-mail üzenetben postáztunk Önnek egy leírást az új jelszó beállításáról.
+notice_account_activated: Fiókját aktiváltuk. Most már be tud jelentkezni a rendszerbe.
+notice_successful_create: Sikeres létrehozás.
+notice_successful_update: Sikeres módosítás.
+notice_successful_delete: Sikeres törlés.
+notice_successful_connection: Sikeres bejelentkezés.
+notice_file_not_found: Az oldal, amit meg szeretne nézni nem található, vagy átkerült egy másik helyre.
+notice_locking_conflict: Az adatot egy másik felhasználó idő közben módosította.
+notice_not_authorized: Nincs hozzáférési engedélye ehhez az oldalhoz.
+notice_email_sent: Egy e-mail üzenetet küldtünk a következő címre %s
+notice_email_error: Hiba történt a levél küldése közben (%s)
+notice_feeds_access_key_reseted: Az RSS hozzáférési kulcsát újra generáltuk.
+notice_failed_to_save_issues: "Nem sikerült a %d feladat(ok) mentése a %d -ban kiválasztva: %s."
+notice_no_issue_selected: "Nincs feladat kiválasztva! Kérem jelölje meg melyik feladatot szeretné szerkeszteni!"
+notice_account_pending: "A fiókja létrejött, és adminisztrátori jóváhagyásra vár."
+notice_default_data_loaded: Az alapértelmezett konfiguráció betöltése sikeresen megtörtént.
+
+error_can_t_load_default_data: "Az alapértelmezett konfiguráció betöltése nem lehetséges: %s"
+error_scm_not_found: "A bejegyzés, vagy revízió nem található a tárolóban."
+error_scm_command_failed: "A tároló elérése közben hiba lépett fel: %s"
+error_scm_annotate: "A bejegyzés nem létezik, vagy nics jegyzetekkel ellátva."
+error_issue_not_found_in_project: 'A feladat nem található, vagy nem ehhez a projekthez tartozik'
+
+mail_subject_lost_password: Az Ön Redmine jelszava
+mail_body_lost_password: 'A Redmine jelszó megváltoztatásához, kattintson a következő linkre:'
+mail_subject_register: Redmine azonosító aktiválása
+mail_body_register: 'A Redmine azonosítója aktiválásához, kattintson a következő linkre:'
+mail_body_account_information_external: A "%s" azonosító használatával bejelentkezhet a Redmineba.
+mail_body_account_information: Az Ön Redmine azonosítójának információi
+mail_subject_account_activation_request: Redmine azonosító aktiválási kérelem
+mail_body_account_activation_request: 'Egy új felhasználó (%s) regisztrált, azonosítója jóváhasgyásra várakozik:'
+
+gui_validation_error: 1 hiba
+gui_validation_error_plural: %d hiba
+
+field_name: Név
+field_description: Leírás
+field_summary: Összegzés
+field_is_required: Kötelező
+field_firstname: Keresztnév
+field_lastname: Vezetéknév
+field_mail: E-mail
+field_filename: Fájl
+field_filesize: Méret
+field_downloads: Letöltések
+field_author: Szerző
+field_created_on: Létrehozva
+field_updated_on: Módosítva
+field_field_format: Formátum
+field_is_for_all: Minden projekthez
+field_possible_values: Lehetséges értékek
+field_regexp: Reguláris kifejezés
+field_min_length: Minimum hossz
+field_max_length: Maximum hossz
+field_value: Érték
+field_category: Kategória
+field_title: Cím
+field_project: Projekt
+field_issue: Feladat
+field_status: Státusz
+field_notes: Feljegyzések
+field_is_closed: Feladat lezárva
+field_is_default: Alapértelmezett érték
+field_tracker: Típus
+field_subject: Tárgy
+field_due_date: Befejezés dátuma
+field_assigned_to: Felelős
+field_priority: Prioritás
+field_fixed_version: Cél verzió
+field_user: Felhasználó
+field_role: Szerepkör
+field_homepage: Weboldal
+field_is_public: Nyilvános
+field_parent: Szülő projekt
+field_is_in_chlog: Feladatok látszanak a változás naplóban
+field_is_in_roadmap: Feladatok látszanak az életútban
+field_login: Azonosító
+field_mail_notification: E-mail értesítések
+field_admin: Adminisztrátor
+field_last_login_on: Utolsó bejelentkezés
+field_language: Nyelv
+field_effective_date: Dátum
+field_password: Jelszó
+field_new_password: Új jelszó
+field_password_confirmation: Megerősítés
+field_version: Verzió
+field_type: Típus
+field_host: Kiszolgáló
+field_port: Port
+field_account: Felhasználói fiók
+field_base_dn: Base DN
+field_attr_login: Bejelentkezési tulajdonság
+field_attr_firstname: Családnév
+field_attr_lastname: Utónév
+field_attr_mail: E-mail
+field_onthefly: On-the-fly felhasználó létrehozás
+field_start_date: Kezdés dátuma
+field_done_ratio: Elkészült (%%)
+field_auth_source: Azonosítási mód
+field_hide_mail: Rejtse el az e-mail címem
+field_comments: Megjegyzés
+field_url: URL
+field_start_page: Kezdőlap
+field_subproject: Alprojekt
+field_hours: Óra
+field_activity: Aktivitás
+field_spent_on: Dátum
+field_identifier: Azonosító
+field_is_filter: Szűrőként használható
+field_issue_to_id: Kapcsolódó feladat
+field_delay: Késés
+field_assignable: Feladat rendelhető ehhez a szerepkörhöz
+field_redirect_existing_links: Létező linkek átirányítása
+field_estimated_hours: Becsült idő
+field_column_names: Oszlopok
+field_time_zone: Időzóna
+field_searchable: Kereshető
+field_default_value: Alapértelmezett érték
+field_comments_sorting: Feljegyzések megjelenítése
+
+setting_app_title: Alkalmazás címe
+setting_app_subtitle: Alkalmazás alcíme
+setting_welcome_text: Üdvözlő üzenet
+setting_default_language: Alapértelmezett nyelv
+setting_login_required: Azonosítás szükséges
+setting_self_registration: Regisztráció
+setting_attachment_max_size: Melléklet max. mérete
+setting_issues_export_limit: Feladatok exportálásának korlátja
+setting_mail_from: Kibocsátó e-mail címe
+setting_bcc_recipients: Titkos másolat címzet (bcc)
+setting_host_name: Kiszolgáló neve
+setting_text_formatting: Szöveg formázás
+setting_wiki_compression: Wiki történet tömörítés
+setting_feeds_limit: RSS tartalom korlát
+setting_default_projects_public: Az új projektek alapértelmezés szerint nyilvánosak
+setting_autofetch_changesets: Commitok automatikus lehúzása
+setting_sys_api_enabled: WS engedélyezése a tárolók kezeléséhez
+setting_commit_ref_keywords: Hivatkozó kulcsszavak
+setting_commit_fix_keywords: Javítások kulcsszavai
+setting_autologin: Automatikus bejelentkezés
+setting_date_format: Dátum formátum
+setting_time_format: Idő formátum
+setting_cross_project_issue_relations: Kereszt-projekt feladat hivatkozások engedélyezése
+setting_issue_list_default_columns: Az alapértelmezésként megjelenített oszlopok a feladat listában
+setting_repositories_encodings: Tárolók kódolása
+setting_emails_footer: E-mail lábléc
+setting_protocol: Protokol
+setting_per_page_options: Objektum / oldal opciók
+setting_user_format: Felhasználók megjelenítésének formája
+setting_activity_days_default: Napok megjelenítése a project aktivitásnál
+setting_display_subprojects_issues: Alapértelmezettként mutassa az alprojektek feladatait is a projekteken
+
+project_module_issue_tracking: Feladat követés
+project_module_time_tracking: Idő rögzítés
+project_module_news: Hírek
+project_module_documents: Dokumentumok
+project_module_files: Fájlok
+project_module_wiki: Wiki
+project_module_repository: Tároló
+project_module_boards: Fórumok
+
+label_user: Felhasználó
+label_user_plural: Felhasználók
+label_user_new: Új felhasználó
+label_project: Projekt
+label_project_new: Új projekt
+label_project_plural: Projektek
+label_project_all: Az összes projekt
+label_project_latest: Legutóbbi projektek
+label_issue: Feladat
+label_issue_new: Új feladat
+label_issue_plural: Feladatok
+label_issue_view_all: Minden feladat megtekintése
+label_issues_by: %s feladatai
+label_issue_added: Feladat hozzáadva
+label_issue_updated: Feladat frissítve
+label_document: Dokumentum
+label_document_new: Új dokumentum
+label_document_plural: Dokumentumok
+label_document_added: Dokumentum hozzáadva
+label_role: Szerepkör
+label_role_plural: Szerepkörök
+label_role_new: Új szerepkör
+label_role_and_permissions: Szerepkörök, és jogosultságok
+label_member: Résztvevő
+label_member_new: Új résztvevő
+label_member_plural: Résztvevők
+label_tracker: Feladat típus
+label_tracker_plural: Feladat típusok
+label_tracker_new: Új feladat típus
+label_workflow: Workflow
+label_issue_status: Feladat státusz
+label_issue_status_plural: Feladat státuszok
+label_issue_status_new: Új státusz
+label_issue_category: Feladat kategória
+label_issue_category_plural: Feladat kategóriák
+label_issue_category_new: Új kategória
+label_custom_field: Egyéni mező
+label_custom_field_plural: Egyéni mezők
+label_custom_field_new: Új egyéni mező
+label_enumerations: Felsorolások
+label_enumeration_new: Új érték
+label_information: Információ
+label_information_plural: Információk
+label_please_login: Jelentkezzen be
+label_register: Regisztráljon
+label_password_lost: Elfelejtett jelszó
+label_home: Kezdőlap
+label_my_page: Saját kezdőlapom
+label_my_account: Fiókom adatai
+label_my_projects: Saját projektem
+label_administration: Adminisztráció
+label_login: Bejelentkezés
+label_logout: Kijelentkezés
+label_help: Súgó
+label_reported_issues: Bejelentett feladatok
+label_assigned_to_me_issues: A nekem kiosztott feladatok
+label_last_login: Utolsó bejelentkezés
+label_last_updates: Utoljára frissítve
+label_last_updates_plural: Utoljára módosítva %d
+label_registered_on: Regisztrált
+label_activity: Tevékenységek
+label_overall_activity: Teljes aktivitás
+label_new: Új
+label_logged_as: Bejelentkezve, mint
+label_environment: Környezet
+label_authentication: Azonosítás
+label_auth_source: Azonosítás módja
+label_auth_source_new: Új azonosítási mód
+label_auth_source_plural: Azonosítási módok
+label_subproject_plural: Alprojektek
+label_and_its_subprojects: %s and its subprojects
+label_min_max_length: Min - Max hossz
+label_list: Lista
+label_date: Dátum
+label_integer: Egész
+label_float: Lebegőpontos
+label_boolean: Logikai
+label_string: Szöveg
+label_text: Hosszú szöveg
+label_attribute: Tulajdonság
+label_attribute_plural: Tulajdonságok
+label_download: %d Letöltés
+label_download_plural: %d Letöltések
+label_no_data: Nincs megjeleníthető adat
+label_change_status: Státusz módosítása
+label_history: Történet
+label_attachment: Fájl
+label_attachment_new: Új fájl
+label_attachment_delete: Fájl törlése
+label_attachment_plural: Fájlok
+label_file_added: Fájl hozzáadva
+label_report: Jelentés
+label_report_plural: Jelentések
+label_news: Hírek
+label_news_new: Hír hozzáadása
+label_news_plural: Hírek
+label_news_latest: Legutóbbi hírek
+label_news_view_all: Minden hír megtekintése
+label_news_added: Hír hozzáadva
+label_change_log: Változás napló
+label_settings: Beállítások
+label_overview: Áttekintés
+label_version: Verzió
+label_version_new: Új verzió
+label_version_plural: Verziók
+label_confirmation: Jóváhagyás
+label_export_to: Exportálás
+label_read: Olvas...
+label_public_projects: Nyilvános projektek
+label_open_issues: nyitott
+label_open_issues_plural: nyitott
+label_closed_issues: lezárt
+label_closed_issues_plural: lezárt
+label_total: Összesen
+label_permissions: Jogosultságok
+label_current_status: Jelenlegi státusz
+label_new_statuses_allowed: Új státuszok engedélyezve
+label_all: mind
+label_none: nincs
+label_nobody: senki
+label_next: Következő
+label_previous: Előző
+label_used_by: Használja
+label_details: Részletek
+label_add_note: Jegyzet hozzáadása
+label_per_page: Oldalanként
+label_calendar: Naptár
+label_months_from: hónap, kezdve
+label_gantt: Gantt
+label_internal: Belső
+label_last_changes: utolsó %d változás
+label_change_view_all: Minden változás megtekintése
+label_personalize_page: Az oldal testreszabása
+label_comment: Megjegyzés
+label_comment_plural: Megjegyzések
+label_comment_add: Megjegyzés hozzáadása
+label_comment_added: Megjegyzés hozzáadva
+label_comment_delete: Megjegyzések törlése
+label_query: Egyéni lekérdezés
+label_query_plural: Egyéni lekérdezések
+label_query_new: Új lekérdezés
+label_filter_add: Szűrő hozzáadása
+label_filter_plural: Szűrők
+label_equals: egyenlő
+label_not_equals: nem egyenlő
+label_in_less_than: kevesebb, mint
+label_in_more_than: több, mint
+label_in: in
+label_today: ma
+label_all_time: mindenkor
+label_yesterday: tegnap
+label_this_week: aktuális hét
+label_last_week: múlt hét
+label_last_n_days: az elmúlt %d nap
+label_this_month: aktuális hónap
+label_last_month: múlt hónap
+label_this_year: aktuális év
+label_date_range: Dátum intervallum
+label_less_than_ago: kevesebb, mint nappal ezelőtt
+label_more_than_ago: több, mint nappal ezelőtt
+label_ago: nappal ezelőtt
+label_contains: tartalmazza
+label_not_contains: nem tartalmazza
+label_day_plural: nap
+label_repository: Tároló
+label_repository_plural: Tárolók
+label_browse: Tallóz
+label_modification: %d változás
+label_modification_plural: %d változások
+label_revision: Revízió
+label_revision_plural: Revíziók
+label_associated_revisions: Kapcsolt revíziók
+label_added: hozzáadva
+label_modified: módosítva
+label_deleted: törölve
+label_latest_revision: Legutolsó revízió
+label_latest_revision_plural: Legutolsó revíziók
+label_view_revisions: Revíziók megtekintése
+label_max_size: Maximális méret
+label_on: 'összesen'
+label_sort_highest: Az elejére
+label_sort_higher: Eggyel feljebb
+label_sort_lower: Eggyel lejjebb
+label_sort_lowest: Az aljára
+label_roadmap: Életút
+label_roadmap_due_in: Esedékes 
+label_roadmap_overdue: %s késésben
+label_roadmap_no_issues: Nincsenek feladatok ehhez a verzióhoz
+label_search: Keresés
+label_result_plural: Találatok
+label_all_words: Minden szó
+label_wiki: Wiki
+label_wiki_edit: Wiki szerkesztés
+label_wiki_edit_plural: Wiki szerkesztések
+label_wiki_page: Wiki oldal
+label_wiki_page_plural: Wiki oldalak
+label_index_by_title: Cím szerint indexelve
+label_index_by_date: Dátum szerint indexelve
+label_current_version: Jelenlegi verzió
+label_preview: Előnézet
+label_feed_plural: Visszajelzések
+label_changes_details: Változások részletei
+label_issue_tracking: Feladat követés
+label_spent_time: Ráfordított idő
+label_f_hour: %.2f óra
+label_f_hour_plural: %.2f óra
+label_time_tracking: Idő követés
+label_change_plural: Változások
+label_statistics: Statisztikák
+label_commits_per_month: Commits havonta
+label_commits_per_author: Commits szerzőnként
+label_view_diff: Különbségek megtekintése
+label_diff_inline: inline
+label_diff_side_by_side: side by side
+label_options: Opciók
+label_copy_workflow_from: Workflow másolása innen
+label_permissions_report: Jogosultsági riport
+label_watched_issues: Megfigyelt feladatok
+label_related_issues: Kapcsolódó feladatok
+label_applied_status: Alkalmazandó státusz
+label_loading: Betöltés...
+label_relation_new: Új kapcsolat
+label_relation_delete: Kapcsolat törlése
+label_relates_to: kapcsolódik
+label_duplicates: duplikálja
+label_blocks: zárolja
+label_blocked_by: zárolta
+label_precedes: megelőzi
+label_follows: követi
+label_end_to_start: végétől indulásig
+label_end_to_end: végétől végéig
+label_start_to_start: indulástól indulásig
+label_start_to_end: indulástól végéig
+label_stay_logged_in: Emlékezzen rám
+label_disabled: kikapcsolva
+label_show_completed_versions: A kész verziók mutatása
+label_me: én
+label_board: Fórum
+label_board_new: Új fórum
+label_board_plural: Fórumok
+label_topic_plural: Témák
+label_message_plural: Üzenetek
+label_message_last: Utolsó üzenet
+label_message_new: Új üzenet
+label_message_posted: Üzenet hozzáadva
+label_reply_plural: Válaszok
+label_send_information: Fiók infomációk küldése a felhasználónak
+label_year: Év
+label_month: Hónap
+label_week: Hét
+label_date_from: 'Kezdet:'
+label_date_to: 'Vége:'
+label_language_based: A felhasználó nyelve alapján
+label_sort_by: %s szerint rendezve
+label_send_test_email: Teszt e-mail küldése
+label_feeds_access_key_created_on: RSS hozzáférési kulcs %s ezelőtt lérehozva
+label_module_plural: Modulok
+label_added_time_by: %s által %s ezelőtt hozzáadva
+label_updated_time: %s ezelőtt módosítva
+label_jump_to_a_project: Ugrás projekthez...
+label_file_plural: Fájlok
+label_changeset_plural: Changesets
+label_default_columns: Alapértelmezett oszlopok
+label_no_change_option: (Nincs változás)
+label_bulk_edit_selected_issues: A kiválasztott feladatok kötegelt szerkesztése
+label_theme: Téma
+label_default: Alapértelmezett
+label_search_titles_only: Keresés csak a címekben
+label_user_mail_option_all: "Minden eseményről minden saját projektemben"
+label_user_mail_option_selected: "Minden eseményről a kiválasztott projektekben..."
+label_user_mail_option_none: "Csak a megfigyelt dolgokról, vagy, amiben részt veszek"
+label_user_mail_no_self_notified: "Nem kérek értesítést az általam végzett módosításokról"
+label_registration_activation_by_email: Fiók aktiválása e-mailben
+label_registration_manual_activation: Manuális fiók aktiválás
+label_registration_automatic_activation: Automatikus fiók aktiválás
+label_display_per_page: 'Oldalanként: %s'
+label_age: Kor
+label_change_properties: Tulajdonságok változtatása
+label_general: Általános
+label_more: továbbiak
+label_scm: SCM
+label_plugins: Pluginek
+label_ldap_authentication: LDAP azonosítás
+label_downloads_abbr: D/L
+label_optional_description: Opcionális leírás
+label_add_another_file: Újabb fájl hozzáadása
+label_preferences: Tulajdonságok
+label_chronological_order: Időrendben
+label_reverse_chronological_order: Fordított időrendben
+label_planning: Tervezés
+
+button_login: Bejelentkezés
+button_submit: Elfogad
+button_save: Mentés
+button_check_all: Mindent kijelöl
+button_uncheck_all: Kijelölés törlése
+button_delete: Töröl
+button_create: Létrehoz
+button_test: Teszt
+button_edit: Szerkeszt
+button_add: Hozzáad
+button_change: Változtat
+button_apply: Alkalmaz
+button_clear: Töröl
+button_lock: Zárol
+button_unlock: Felold
+button_download: Letöltés
+button_list: Lista
+button_view: Megnéz
+button_move: Mozgat
+button_back: Vissza
+button_cancel: Mégse
+button_activate: Aktivál
+button_sort: Rendezés
+button_log_time: Idő rögzítés
+button_rollback: Visszaáll erre a verzióra
+button_watch: Megfigyel
+button_unwatch: Megfigyelés törlése
+button_reply: Válasz
+button_archive: Archivál
+button_unarchive: Dearchivál
+button_reset: Reset
+button_rename: Átnevez
+button_change_password: Jelszó megváltoztatása
+button_copy: Másol
+button_annotate: Jegyzetel
+button_update: Módosít
+button_configure: Konfigurál
+
+status_active: aktív
+status_registered: regisztrált
+status_locked: zárolt
+
+text_select_mail_notifications: Válasszon eseményeket, amelyekről e-mail értesítést kell küldeni.
+text_regexp_info: eg. ^[A-Z0-9]+$
+text_min_max_length_info: 0 = nincs korlátozás
+text_project_destroy_confirmation: Biztosan törölni szeretné a projektet és vele együtt minden kapcsolódó adatot ?
+text_subprojects_destroy_warning: 'Az alprojekt(ek): %s szintén törlésre kerülnek.'
+text_workflow_edit: Válasszon egy szerepkört, és egy trackert a workflow szerkesztéséhez
+text_are_you_sure: Biztos benne ?
+text_journal_changed: "változás: %s volt, %s lett"
+text_journal_set_to: "beállítva: %s"
+text_journal_deleted: törölve
+text_tip_task_begin_day: a feladat ezen a napon kezdődik
+text_tip_task_end_day: a feladat ezen a napon ér véget
+text_tip_task_begin_end_day: a feladat ezen a napon kezdődik és ér véget
+text_project_identifier_info: 'Kis betűk (a-z), számok és kötőjel megengedett.<br />Mentés után az azonosítót megváltoztatni nem lehet.'
+text_caracters_maximum: maximum %d karakter.
+text_caracters_minimum: Legkevesebb %d karakter hosszúnek kell lennie.
+text_length_between: Legalább %d és legfeljebb %d hosszú karakter.
+text_tracker_no_workflow: Nincs workflow definiálva ehhez a tracker-hez
+text_unallowed_characters: Tiltott karakterek
+text_comma_separated: Több érték megengedett (vesszővel elválasztva)
+text_issues_ref_in_commit_messages: Hivatkozás feladatokra, feladatok javítása a commit üzenetekben
+text_issue_added: %s feladat bejelentve.
+text_issue_updated: %s feladat frissítve.
+text_wiki_destroy_confirmation: Biztosan törölni szeretné ezt a wiki-t minden tartalmával együtt ?
+text_issue_category_destroy_question: Néhány feladat (%d) hozzá van rendelve ehhez a kategóriához. Mit szeretne tenni ?
+text_issue_category_destroy_assignments: Kategória hozzárendelés megszűntetése
+text_issue_category_reassign_to: Feladatok újra hozzárendelése a kategóriához
+text_user_mail_option: "A nem kiválasztott projektekről csak akkor kap értesítést, ha figyelést kér rá, vagy részt vesz benne (pl. Ön a létrehozó, vagy a hozzárendelő)"
+text_no_configuration_data: "Szerepkörök, trackerek, feladat státuszok, és workflow adatok még nincsenek konfigurálva.\nErősen ajánlott, az alapértelmezett konfiguráció betöltése, és utána módosíthatja azt."
+text_load_default_configuration: Alapértelmezett konfiguráció betöltése
+text_status_changed_by_changeset: Applied in changeset %s.
+text_issues_destroy_confirmation: 'Biztos benne, hogy törölni szeretné a kijelölt feladato(ka)t ?'
+text_select_project_modules: 'Válassza ki az engedélyezett modulokat ehhez a projekthez:'
+text_default_administrator_account_changed: Alapértelmezett adminisztrátor fiók megváltoztatva
+text_file_repository_writable: Fájl tároló írható
+text_rmagick_available: RMagick elérhető (opcionális)
+text_destroy_time_entries_question: %.02f órányi munka van rögzítve a feladatokon, amiket törölni szeretne. Mit szeretne tenni ?
+text_destroy_time_entries: A rögzített órák törlése
+text_assign_time_entries_to_project: A rögzített órák hozzárendelése a projekthez
+text_reassign_time_entries: 'A rögzített órák újra hozzárendelése ehhez a feladathoz:'
+
+default_role_manager: Vezető
+default_role_developper: Fejlesztő
+default_role_reporter: Bejelentő
+default_tracker_bug: Hiba
+default_tracker_feature: Fejlesztés
+default_tracker_support: Support
+default_issue_status_new: Új
+default_issue_status_assigned: Kiosztva
+default_issue_status_resolved: Megoldva
+default_issue_status_feedback: Visszajelzés
+default_issue_status_closed: Lezárt
+default_issue_status_rejected: Elutasított
+default_doc_category_user: Felhasználói dokumentáció
+default_doc_category_tech: Technikai dokumentáció
+default_priority_low: Alacsony
+default_priority_normal: Normál
+default_priority_high: Magas
+default_priority_urgent: Sürgős
+default_priority_immediate: Azonnal
+default_activity_design: Tervezés
+default_activity_development: Fejlesztés
+
+enumeration_issue_priorities: Feladat prioritások
+enumeration_doc_categories: Dokumentum kategóriák
+enumeration_activities: Tevékenységek (idő rögzítés)
diff --git a/public/javascripts/calendar/lang/calendar-hu.js b/public/javascripts/calendar/lang/calendar-hu.js
new file mode 100644
index 000000000..0e219c123
--- /dev/null
+++ b/public/javascripts/calendar/lang/calendar-hu.js
@@ -0,0 +1,127 @@
+// ** I18N
+
+// Calendar HU language
+// Author: Takács Gábor
+// Encoding: UTF-8
+// Distributed under the same terms as the calendar itself.
+
+// For translators: please use UTF-8 if possible.  We strongly believe that
+// Unicode is the answer to a real internationalized world.  Also please
+// include your contact information in the header, as can be seen above.
+
+// full day names
+Calendar._DN = new Array
+("Vasárnap",
+ "Hétfő",
+ "Kedd",
+ "Szerda",
+ "Csütörtök",
+ "Péntek",
+ "Szombat",
+ "Vasárnap");
+
+// Please note that the following array of short day names (and the same goes
+// for short month names, _SMN) isn't absolutely necessary.  We give it here
+// for exemplification on how one can customize the short day names, but if
+// they are simply the first N letters of the full name you can simply say:
+//
+//   Calendar._SDN_len = N; // short day name length
+//   Calendar._SMN_len = N; // short month name length
+//
+// If N = 3 then this is not needed either since we assume a value of 3 if not
+// present, to be compatible with translation files that were written before
+// this feature.
+
+// short day names
+Calendar._SDN = new Array
+("Vas",
+ "Hét",
+ "Ked",
+ "Sze",
+ "Csü",
+ "Pén",
+ "Szo",
+ "Vas");
+
+// First day of the week. "0" means display Sunday first, "1" means display
+// Monday first, etc.
+Calendar._FD = 1;
+
+// full month names
+Calendar._MN = new Array
+("Január",
+ "Február",
+ "Március",
+ "Április",
+ "Május",
+ "Június",
+ "Július",
+ "Augusztus",
+ "Szeptember",
+ "Október",
+ "November",
+ "December");
+
+// short month names
+Calendar._SMN = new Array
+("Jan",
+ "Feb",
+ "Már",
+ "Ápr",
+ "Máj",
+ "Jún",
+ "Júl",
+ "Aug",
+ "Szep",
+ "Okt",
+ "Nov",
+ "Dec");
+
+// tooltips
+Calendar._TT = {};
+Calendar._TT["INFO"] = "A naptár leírása";
+
+Calendar._TT["ABOUT"] =
+"DHTML Date/Time Selector\n" +
+"(c) dynarch.com 2002-2005 / Author: Mihai Bazon\n" + // don't translate this this ;-)
+"For latest version visit: http://www.dynarch.com/projects/calendar/\n" +
+"Distributed under GNU LGPL.  See http://gnu.org/licenses/lgpl.html for details." +
+"\n\n" +
+"Date selection:\n" +
+"- Use the \xab, \xbb buttons to select year\n" +
+"- Use the " + String.fromCharCode(0x2039) + ", " + String.fromCharCode(0x203a) + " buttons to select month\n" +
+"- Hold mouse button on any of the above buttons for faster selection.";
+Calendar._TT["ABOUT_TIME"] = "\n\n" +
+"Time selection:\n" +
+"- Click on any of the time parts to increase it\n" +
+"- or Shift-click to decrease it\n" +
+"- or click and drag for faster selection.";
+
+Calendar._TT["PREV_YEAR"] = "Előző év (nyomvatart = menü)";
+Calendar._TT["PREV_MONTH"] = "Előző hónap (nyomvatart = menü)";
+Calendar._TT["GO_TODAY"] = "Irány a Ma";
+Calendar._TT["NEXT_MONTH"] = "Következő hónap (nyomvatart = menü)";
+Calendar._TT["NEXT_YEAR"] = "Következő év (nyomvatart = menü)";
+Calendar._TT["SEL_DATE"] = "Válasszon dátumot";
+Calendar._TT["DRAG_TO_MOVE"] = "Fogd és vidd";
+Calendar._TT["PART_TODAY"] = " (ma)";
+
+// the following is to inform that "%s" is to be the first day of week
+// %s will be replaced with the day name.
+Calendar._TT["DAY_FIRST"] = "%s megjelenítése elsőként";
+
+// This may be locale-dependent.  It specifies the week-end days, as an array
+// of comma-separated numbers.  The numbers are from 0 to 6: 0 means Sunday, 1
+// means Monday, etc.
+Calendar._TT["WEEKEND"] = "0,6";
+
+Calendar._TT["CLOSE"] = "Bezár";
+Calendar._TT["TODAY"] = "Ma";
+Calendar._TT["TIME_PART"] = "(Shift-)Click vagy húzd az érték változtatásához";
+
+// date formats
+Calendar._TT["DEF_DATE_FORMAT"] = "%Y.%m.%d";
+Calendar._TT["TT_DATE_FORMAT"] = "%B %e, %A";
+
+Calendar._TT["WK"] = "hét";
+Calendar._TT["TIME"] = "Idő:";
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-hu.js b/public/javascripts/jstoolbar/lang/jstoolbar-hu.js
new file mode 100644
index 000000000..e586a123b
--- /dev/null
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-hu.js
@@ -0,0 +1,14 @@
+jsToolBar.strings = {};
+jsToolBar.strings['Strong'] = 'Félkövér';
+jsToolBar.strings['Italic'] = 'Dőlt';
+jsToolBar.strings['Underline'] = 'Aláhúzott';
+jsToolBar.strings['Deleted'] = 'Törölt';
+jsToolBar.strings['Code'] = 'Kód sorok';
+jsToolBar.strings['Heading 1'] = 'Fejléc 1';
+jsToolBar.strings['Heading 2'] = 'Fejléc 2';
+jsToolBar.strings['Heading 3'] = 'Fejléc 3';
+jsToolBar.strings['Unordered list'] = 'Felsorolás';
+jsToolBar.strings['Ordered list'] = 'Számozott lista';
+jsToolBar.strings['Preformatted text'] = 'Előreformázott szöveg';
+jsToolBar.strings['Wiki link'] = 'Link egy Wiki oldalra';
+jsToolBar.strings['Image'] = 'Kép';

From 02757f5892af308c0cdf905e3d504a5ce3ad84de Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 25 May 2008 12:42:56 +0000
Subject: [PATCH 451/710] Translations updates.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1453 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 lang/hu.yml                                   |  14 +-
 lang/lt.yml                                   |  83 +-
 lang/no.yml                                   |   2 +-
 lang/pl.yml                                   |  26 +-
 lang/pt-br.yml                                | 796 +++++++++---------
 lang/zh-tw.yml                                |   2 +-
 lang/zh.yml                                   |  14 +-
 .../calendar/lang/calendar-pt-br.js           |  34 +-
 .../jstoolbar/lang/jstoolbar-pt-br.js         |  28 +-
 9 files changed, 502 insertions(+), 497 deletions(-)

diff --git a/lang/hu.yml b/lang/hu.yml
index 428c7bf5c..c3feaf16d 100644
--- a/lang/hu.yml
+++ b/lang/hu.yml
@@ -46,7 +46,7 @@ general_text_No: 'Nem'
 general_text_Yes: 'Igen'
 general_text_no: 'nem'
 general_text_yes: 'igen'
-general_lang_name: 'Hungarian (Magyar)'
+general_lang_name: 'Magyar'
 general_csv_separator: ','
 general_csv_encoding: ISO-8859-2
 general_pdf_encoding: ISO-8859-2
@@ -291,7 +291,7 @@ label_auth_source: Azonosítás módja
 label_auth_source_new: Új azonosítási mód
 label_auth_source_plural: Azonosítási módok
 label_subproject_plural: Alprojektek
-label_and_its_subprojects: %s and its subprojects
+label_and_its_subprojects: %s és alprojektjei
 label_min_max_length: Min - Max hossz
 label_list: Lista
 label_date: Dátum
@@ -337,7 +337,7 @@ label_closed_issues_plural: lezárt
 label_total: Összesen
 label_permissions: Jogosultságok
 label_current_status: Jelenlegi státusz
-label_new_statuses_allowed: Új státuszok engedélyezve
+label_new_statuses_allowed: Státusz változtatások engedélyei
 label_all: mind
 label_none: nincs
 label_nobody: senki
@@ -406,7 +406,7 @@ label_sort_higher: Eggyel feljebb
 label_sort_lower: Eggyel lejjebb
 label_sort_lowest: Az aljára
 label_roadmap: Életút
-label_roadmap_due_in: Esedékes 
+label_roadmap_due_in: Elkészültéig várhatóan még 
 label_roadmap_overdue: %s késésben
 label_roadmap_no_issues: Nincsenek feladatok ehhez a verzióhoz
 label_search: Keresés
@@ -476,10 +476,10 @@ label_date_to: 'Vége:'
 label_language_based: A felhasználó nyelve alapján
 label_sort_by: %s szerint rendezve
 label_send_test_email: Teszt e-mail küldése
-label_feeds_access_key_created_on: RSS hozzáférési kulcs %s ezelőtt lérehozva
+label_feeds_access_key_created_on: 'RSS hozzáférési kulcs létrehozva ennyivel ezelőtt: %s'
 label_module_plural: Modulok
-label_added_time_by: %s által %s ezelőtt hozzáadva
-label_updated_time: %s ezelőtt módosítva
+label_added_time_by: '%s adta hozzá ennyivel ezelőtt: %s'
+label_updated_time: 'Utolsó módosítás ennyivel ezelőtt: %s'
 label_jump_to_a_project: Ugrás projekthez...
 label_file_plural: Fájlok
 label_changeset_plural: Changesets
diff --git a/lang/lt.yml b/lang/lt.yml
index a58835186..bc2faaa00 100644
--- a/lang/lt.yml
+++ b/lang/lt.yml
@@ -554,7 +554,7 @@ enumeration_issue_priorities: Darbo prioritetai
 enumeration_doc_categories: Dokumento kategorijos 
 enumeration_activities: Veiklos (laiko sekimas)
 label_display_per_page: '%s įrašų puslapyje'
-setting_per_page_options: Objects per page options
+setting_per_page_options: Įrašų puslapyje nustatimas
 notice_default_data_loaded: Numatytoji konfiguracija sėkmingai užkrauta.
 label_age: Amžius
 label_general: Bendri
@@ -578,45 +578,46 @@ label_document_added: Dokumentas pridėtas
 label_message_posted: Pranešimas pridėtas
 label_file_added: Byla pridėta
 label_news_added: Naujiena pridėta
-project_module_boards: Boards
-project_module_issue_tracking: Issue tracking
+project_module_boards: Forumai
+project_module_issue_tracking: Darbu pėdsekys
 project_module_wiki: Wiki
-project_module_files: Files
-project_module_documents: Documents
-project_module_repository: Repository
-project_module_news: News
-project_module_time_tracking: Time tracking
-text_file_repository_writable: File repository writable
-text_default_administrator_account_changed: Default administrator account changed
-text_rmagick_available: RMagick available (optional)
-button_configure: Configure
+project_module_files: Rinkmenos
+project_module_documents: Dokumentai
+project_module_repository: Saugykla
+project_module_news: Žinios
+project_module_time_tracking: Laiko pėdsekys
+text_file_repository_writable: Į rinkmenu saugyklą galima saugoti (RW)
+text_default_administrator_account_changed: Administratoriaus numatyta paskyra pakeista
+text_rmagick_available: RMagick pasiekiamas (pasirinktinai)
+button_configure: Konfiguruoti
 label_plugins: Plugins
-label_ldap_authentication: LDAP authentication
-label_downloads_abbr: D/L
-label_this_month: this month
-label_last_n_days: last %d days
-label_all_time: all time
-label_this_year: this year
-label_date_range: Date range
-label_last_week: last week
-label_yesterday: yesterday
-label_last_month: last month
-label_add_another_file: Add another file
-label_optional_description: Optional description
-text_destroy_time_entries_question: %.02f hours were reported on the issues you are about to delete. What do you want to do ?
-error_issue_not_found_in_project: 'The issue was not found or does not belong to this project'
-text_assign_time_entries_to_project: Assign reported hours to the project
-text_destroy_time_entries: Delete reported hours
-text_reassign_time_entries: 'Reassign reported hours to this issue:'
-setting_activity_days_default: Days displayed on project activity
-label_chronological_order: In chronological order
-field_comments_sorting: Display comments
-label_reverse_chronological_order: In reverse chronological order
-label_preferences: Preferences
-setting_display_subprojects_issues: Display subprojects issues on main projects by default
-label_overall_activity: Overall activity
-setting_default_projects_public: New projects are public by default
-error_scm_annotate: "The entry does not exist or can not be annotated."
-label_planning: Planning
-text_subprojects_destroy_warning: 'Its subproject(s): %s will be also deleted.'
-label_and_its_subprojects: %s and its subprojects
+label_ldap_authentication: LDAP autentifikacija
+label_downloads_abbr: siunt.
+label_this_month: šis menuo
+label_last_n_days: paskutinių %d dienų
+label_all_time: visas laikas
+label_this_year: šiemet
+label_date_range: Dienų diapazonas
+label_last_week: paskutinė savaitė
+label_yesterday: vakar
+label_last_month: paskutinis menuo
+label_add_another_file: Pridėti kitą bylą
+label_optional_description: Apibūdinimas (laisvai pasirenkamas)
+text_destroy_time_entries_question: Naikinamam darbui paskelbta %.02f valandų. Ką jūs noryte su jomis daryti?
+error_issue_not_found_in_project: 'Darbas nerastas arba nesurištas su šiuo projektu'
+text_assign_time_entries_to_project: Priskirti valandas prie projekto
+text_destroy_time_entries: Ištrinti paskelbtas valandas
+text_reassign_time_entries: 'Priskirti paskelbtas valandas šiam darbui:'
+setting_activity_days_default: Atvaizduojamos dienos projekto veikloje
+label_chronological_order: Chronologine tvarka
+field_comments_sorting: rodyti komentarus
+label_reverse_chronological_order: Atbuline chronologine tvarka
+label_preferences: Savybės
+setting_display_subprojects_issues: Pagal nutylėjimą rodyti subprojektų darbus pagrindiniame projekte
+label_overall_activity: Visa veikla
+setting_default_projects_public: Naujas projektas viešas pagal nutylėjimą
+error_scm_annotate: "Įrašas neegzituoja arba negalima jo atvaizduoti."
+label_planning: Planavimas
+text_subprojects_destroy_warning: 'Šis(ie) subprojektas(ai): %s taip pat bus ištrintas(i).'
+label_and_its_subprojects: %s projektas ir jo subprojektai
+
diff --git a/lang/no.yml b/lang/no.yml
index 388e51dd7..13fcd24f5 100644
--- a/lang/no.yml
+++ b/lang/no.yml
@@ -291,6 +291,7 @@ label_auth_source: Autentifikasjonsmodus
 label_auth_source_new: Ny autentifikasjonmodus
 label_auth_source_plural: Autentifikasjonsmoduser
 label_subproject_plural: Underprosjekter
+label_and_its_subprojects: %s og dets underprosjekter
 label_min_max_length: Min.-maks. lengde
 label_list: Liste
 label_date: Dato
@@ -619,4 +620,3 @@ default_activity_development: Utvikling
 enumeration_issue_priorities: Sakssprioriteringer
 enumeration_doc_categories: Dokument-kategorier
 enumeration_activities: Aktiviteter (tidssporing)
-label_and_its_subprojects: %s and its subprojects
diff --git a/lang/pl.yml b/lang/pl.yml
index bc65b6253..c83173ca2 100644
--- a/lang/pl.yml
+++ b/lang/pl.yml
@@ -70,7 +70,7 @@ notice_file_not_found: Strona do której próbujesz się dostać nie istnieje lu
 notice_locking_conflict: Dane poprawione przez innego użytkownika.
 notice_not_authorized: Nie jesteś autoryzowany by zobaczyć stronę.
 
-error_scm_not_found: "Wejście i/lub zmiana nie istnieje w repozytorium."
+error_scm_not_found: "Obiekt lub wersja nie zostały znalezione w repozytorium."
 error_scm_command_failed: "An error occurred when trying to access the repository: %s"
 
 mail_subject_lost_password: Twoje hasło do %s
@@ -119,7 +119,7 @@ field_user: Użytkownik
 field_role: Rola
 field_homepage: Strona www
 field_is_public: Publiczny
-field_parent: Podprojekt
+field_parent: Nadprojekt
 field_is_in_chlog: Zagadnienie pokazywane w zapisie zmian
 field_is_in_roadmap: Zagadnienie pokazywane na mapie
 field_login: Login
@@ -172,10 +172,10 @@ setting_host_name: Nazwa hosta
 setting_text_formatting: Formatowanie tekstu
 setting_wiki_compression: Kompresja historii Wiki
 setting_feeds_limit: Limit danych RSS
-setting_autofetch_changesets: Auto-odświeżanie CVS
+setting_autofetch_changesets: Automatyczne pobieranie zmian
 setting_sys_api_enabled: Włączenie WS do zarządzania repozytorium
-setting_commit_ref_keywords: Terminy odnoszące (CVS)
-setting_commit_fix_keywords: Terminy ustalające (CVS)
+setting_commit_ref_keywords: Słowa tworzące powiązania
+setting_commit_fix_keywords: Słowa zmieniające status
 setting_autologin: Auto logowanie
 setting_date_format: Format daty
 
@@ -328,14 +328,14 @@ label_repository: Repozytorium
 label_browse: Przegląd
 label_modification: %d modyfikacja
 label_modification_plural: %d modyfikacja
-label_revision: Zmiana
-label_revision_plural: Zmiany
+label_revision: Rewizja
+label_revision_plural: Rewizje
 label_added: dodane
 label_modified: zmodyfikowane
 label_deleted: usunięte
-label_latest_revision: Ostatnia zmiana
-label_latest_revision_plural: Ostatnie zmiany
-label_view_revisions: Pokaż zmiany
+label_latest_revision: Najnowsza rewizja
+label_latest_revision_plural: Najnowsze rewizje
+label_view_revisions: Pokaż rewizje
 label_max_size: Maksymalny rozmiar
 label_on: 'z'
 label_sort_highest: Przesuń na górę
@@ -366,8 +366,8 @@ label_f_hour_plural: %.2f godzin
 label_time_tracking: Śledzenie czasu
 label_change_plural: Zmiany
 label_statistics: Statystyki
-label_commits_per_month: Wrzutek CVS w miesiącu
-label_commits_per_author: Wrzutek CVS przez autora
+label_commits_per_month: Zatwierdzenia według miesięcy
+label_commits_per_author: Zatwierdzenia według autorów
 label_view_diff: Pokaż różnice
 label_diff_inline: w linii
 label_diff_side_by_side: obok siebie
@@ -463,7 +463,7 @@ text_length_between: Długość pomiędzy %d i %d znaków.
 text_tracker_no_workflow: Brak przepływu zefiniowanego dla tego typu zagadnienia
 text_unallowed_characters: Niedozwolone znaki
 text_comma_separated: Wielokrotne wartości dozwolone (rozdzielone przecinkami).
-text_issues_ref_in_commit_messages: Zagadnienia odnoszące i ustalające we wrzutkach CVS
+text_issues_ref_in_commit_messages: Odwołania do zagadnień w komentarzach zatwierdzeń
 
 default_role_manager: Kierownik
 default_role_developper: Programista
diff --git a/lang/pt-br.yml b/lang/pt-br.yml
index b1f8d2055..9714df2ca 100644
--- a/lang/pt-br.yml
+++ b/lang/pt-br.yml
@@ -1,140 +1,140 @@
 _gloc_rule_default: '|n| n==1 ? "" : "_plural" '
 
 actionview_datehelper_select_day_prefix:
-actionview_datehelper_select_month_names: Janeiro,Fevereiro,Marco,Abrill,Maio,Junho,Julho,Agosto,Setembro,Outubro,Novembro,Dezembro
+actionview_datehelper_select_month_names: Janeiro,Fevereiro,Março,Abrill,Maio,Junho,Julho,Agosto,Setembro,Outubro,Novembro,Dezembro
 actionview_datehelper_select_month_names_abbr: Jan,Fev,Mar,Abr,Mai,Jun,Jul,Ago,Set,Out,Nov,Dez
 actionview_datehelper_select_month_prefix:
 actionview_datehelper_select_year_prefix:
 actionview_datehelper_time_in_words_day: 1 dia
 actionview_datehelper_time_in_words_day_plural: %d dias
-actionview_datehelper_time_in_words_hour_about: sobre uma hora
-actionview_datehelper_time_in_words_hour_about_plural: sobra %d horas
-actionview_datehelper_time_in_words_hour_about_single: sobre uma hora
+actionview_datehelper_time_in_words_hour_about: aproximadamente uma hora
+actionview_datehelper_time_in_words_hour_about_plural: aproximadamente %d horas
+actionview_datehelper_time_in_words_hour_about_single: aproximadamente uma hora
 actionview_datehelper_time_in_words_minute: 1 minuto
 actionview_datehelper_time_in_words_minute_half: meio minuto
-actionview_datehelper_time_in_words_minute_less_than: menos que um minuto
+actionview_datehelper_time_in_words_minute_less_than: menos de um minuto
 actionview_datehelper_time_in_words_minute_plural: %d minutos
 actionview_datehelper_time_in_words_minute_single: 1 minuto
-actionview_datehelper_time_in_words_second_less_than: menos que um segundo
-actionview_datehelper_time_in_words_second_less_than_plural: menos que %d segundos
+actionview_datehelper_time_in_words_second_less_than: menos de um segundo
+actionview_datehelper_time_in_words_second_less_than_plural: menos de %d segundos
 actionview_instancetag_blank_option: Selecione
 
-activerecord_error_inclusion: nao esta incluido na lista
-activerecord_error_exclusion: esta reservado
-activerecord_error_invalid: e invalido
-activerecord_error_confirmation: confirmacao nao confere
+activerecord_error_inclusion: não está incluso na lista
+activerecord_error_exclusion: está reservado
+activerecord_error_invalid: é inválido
+activerecord_error_confirmation: confirmação não confere
 activerecord_error_accepted: deve ser aceito
-activerecord_error_empty: nao pode ser vazio
-activerecord_error_blank: nao pode estar em branco
-activerecord_error_too_long: e muito longo
-activerecord_error_too_short: e muito comprido
-activerecord_error_wrong_length: esta com o comprimento errado
-activerecord_error_taken: ja esta examinado
-activerecord_error_not_a_number: nao e um numero
-activerecord_error_not_a_date: nao e uma data valida
+activerecord_error_empty: não pode ser vazio
+activerecord_error_blank: não pode estar em branco
+activerecord_error_too_long: é muito longo
+activerecord_error_too_short: é muito curto
+activerecord_error_wrong_length: esta com o tamanho errado
+activerecord_error_taken: já foi obtido
+activerecord_error_not_a_number: não é um numero
+activerecord_error_not_a_date: não é uma data valida
 activerecord_error_greater_than_start_date: deve ser maior que a data inicial
-activerecord_error_not_same_project: doesn't belong to the same project
-activerecord_error_circular_dependency: This relation would create a circular dependency
+activerecord_error_not_same_project: não pode pertencer ao mesmo projeto
+activerecord_error_circular_dependency: Esta relação geraria uma dependência circular
 
-general_fmt_age: %d yr
-general_fmt_age_plural: %d yrs
-general_fmt_date: %%m/%%d/%%Y
-general_fmt_datetime: %%m/%%d/%%Y %%I:%%M %%p
+general_fmt_age: %d ano
+general_fmt_age_plural: %d anos
+general_fmt_date: %%d/%%m/%%Y
+general_fmt_datetime: %%d/%%m/%%Y %%I:%%M %%p
 general_fmt_datetime_short: %%b %%d, %%I:%%M %%p
 general_fmt_time: %%I:%%M %%p
-general_text_No: 'Nao'
+general_text_No: 'Não'
 general_text_Yes: 'Sim'
-general_text_no: 'nao'
+general_text_no: 'não'
 general_text_yes: 'sim'
-general_lang_name: 'Portugues Brasileiro'
+general_lang_name: 'Português(Brasil)'
 general_csv_separator: ','
 general_csv_encoding: ISO-8859-1
 general_pdf_encoding: ISO-8859-1
-general_day_names: Segunda,Terca,Quarta,Quinta,Sexta,Sabado,Domingo
+general_day_names: Segunda,Terça,Quarta,Quinta,Sexta,Sabado,Domingo
 general_first_day_of_week: '1'
 
 notice_account_updated: Conta foi alterada com sucesso.
-notice_account_invalid_creditentials: Usuario ou senha invalido.
-notice_account_password_updated: Senha foi alterada com sucesso.
-notice_account_wrong_password: Senha errada.
-notice_account_register_done: Conta foi criada com sucesso.
-notice_account_unknown_email: Usuario desconhecido.
-notice_can_t_change_password: Esta conta usa autenticacao externa. E impossivel trocar a senha.
-notice_account_lost_email_sent: Um email com instrucoes para escolher uma nova senha foi enviado para voce.
-notice_account_activated: Sua conta foi ativada. Voce pode logar agora
+notice_account_invalid_creditentials: Usuário ou senha inválido.
+notice_account_password_updated: Senha alterada com sucesso.
+notice_account_wrong_password: Senha inválida.
+notice_account_register_done: Conta criada com sucesso.
+notice_account_unknown_email: Usuário desconhecido.
+notice_can_t_change_password: Esta conta usa autenticação externa. E impossível alterar a senha.
+notice_account_lost_email_sent: Um email com instruções para escolher uma nova senha foi enviado para você.
+notice_account_activated: Sua conta foi ativada. Você pode acessá-la agora.
 notice_successful_create: Criado com sucesso.
 notice_successful_update: Alterado com sucesso.
-notice_successful_delete: Apagado com sucesso.
+notice_successful_delete: Excluído com sucesso.
 notice_successful_connection: Conectado com sucesso.
-notice_file_not_found: A pagina que voce esta tentando acessar nao existe ou foi excluida.
-notice_locking_conflict: Os dados foram atualizados por um outro usuario.
-notice_not_authorized: You are not authorized to access this page.
-notice_email_sent: An email was sent to %s
-notice_email_error: An error occurred while sending mail (%s)
-notice_feeds_access_key_reseted: Your RSS access key was reseted.
+notice_file_not_found: A página que você está tentando acessar não existe ou foi excluída.
+notice_locking_conflict: Os dados foram atualizados por outro usuário.
+notice_not_authorized: Você não está autorizado a acessar esta página.
+notice_email_sent: Um email foi enviado para %s
+notice_email_error: Um erro ocorreu ao enviar o email (%s)
+notice_feeds_access_key_reseted: Sua chave RSS foi reconfigurada.
 
-error_scm_not_found: "A entrada e/ou a revisao nao existem no repositorio."
-error_scm_command_failed: "An error occurred when trying to access the repository: %s"
+error_scm_not_found: "A entrada e/ou a revisão não existe no repositório."
+error_scm_command_failed: "Ocorreu um erro ao tentar acessar o repositório: %s"
 
 mail_subject_lost_password: Sua senha do %s.
 mail_body_lost_password: 'Para mudar sua senha, clique no link abaixo:'
-mail_subject_register: Ativacao de conta do %s.
+mail_subject_register: Ativação de conta do %s.
 mail_body_register: 'Para ativar sua conta, clique no link abaixo:'
 
 gui_validation_error: 1 erro
 gui_validation_error_plural: %d erros
 
 field_name: Nome
-field_description: Descricao
-field_summary: Sumario
-field_is_required: Obrigatorio
+field_description: Descrição
+field_summary: Resumo
+field_is_required: Obrigatório
 field_firstname: Primeiro nome
-field_lastname: Ultimo nome
+field_lastname: Último nome
 field_mail: Email
 field_filename: Arquivo
 field_filesize: Tamanho
 field_downloads: Downloads
 field_author: Autor
-field_created_on: Criado
-field_updated_on: Alterado
+field_created_on: Criado em
+field_updated_on: Alterado em
 field_field_format: Formato
 field_is_for_all: Para todos os projetos
-field_possible_values: Possiveis valores
-field_regexp: Expressao regular
-field_min_length: Tamanho minimo
-field_max_length: Tamanho maximo
+field_possible_values: Possíveis valores
+field_regexp: Expressão regular
+field_min_length: Tamanho mínimo
+field_max_length: Tamanho máximo
 field_value: Valor
 field_category: Categoria
-field_title: Titulo
+field_title: Título
 field_project: Projeto
-field_issue: Tarefa 
+field_issue: Ticket
 field_status: Status
 field_notes: Notas
-field_is_closed: Tarefa fechada
-field_is_default: Status padrao
+field_is_closed: Ticket fechado
+field_is_default: Status padrão
 field_tracker: Tipo
-field_subject: Titulo
-field_due_date: Data devida
-field_assigned_to: Atribuido para
+field_subject: Título
+field_due_date: Data prevista
+field_assigned_to: Atribuído para
 field_priority: Prioridade
-field_fixed_version: Target version
-field_user: Usuario
-field_role: Regra
-field_homepage: Pagina inicial
-field_is_public: Publico
+field_fixed_version: Versão
+field_user: Usuário
+field_role: Papel
+field_homepage: Página inicial
+field_is_public: Público
 field_parent: Sub-projeto de
-field_is_in_chlog: Tarefas mostradas no changelog
-field_is_in_roadmap: Tarefas mostradas no roadmap
+field_is_in_chlog: Tarefas exibidas no registro de alterações
+field_is_in_roadmap: Tarefas exibidas no planejamento
 field_login: Login
-field_mail_notification: Notificacoes por email
+field_mail_notification: Notificações por email
 field_admin: Administrador
-field_last_login_on: Ultima conexao
-field_language: Lingua
+field_last_login_on: Última conexão
+field_language: Idioma
 field_effective_date: Data
 field_password: Senha
 field_new_password: Nova senha
-field_password_confirmation: Confirmacao
-field_version: Versao
+field_password_confirmation: Confirmação
+field_version: Versão
 field_type: Tipo
 field_host: Servidor
 field_port: Porta
@@ -142,116 +142,116 @@ field_account: Conta
 field_base_dn: Base DN
 field_attr_login: Atributo login
 field_attr_firstname: Atributo primeiro nome
-field_attr_lastname: Atributo ultimo nome
+field_attr_lastname: Atributo último nome
 field_attr_mail: Atributo email
-field_onthefly: Criacao de usuario on-the-fly
-field_start_date: Inicio
+field_onthefly: Criação automática de usuário
+field_start_date: Início
 field_done_ratio: %% Terminado
-field_auth_source: Modo de autenticacao
-field_hide_mail: Esconder meu email
-field_comments: Comentario
+field_auth_source: Modo de autenticação
+field_hide_mail: Ocultar meu email
+field_comments: Comentário
 field_url: URL
-field_start_page: Pagina inicial
+field_start_page: Página inicial
 field_subproject: Sub-projeto
 field_hours: Horas
 field_activity: Atividade
 field_spent_on: Data
 field_identifier: Identificador
-field_is_filter: Used as a filter
-field_issue_to_id: Related issue
-field_delay: Delay
-field_assignable: Issues can be assigned to this role
-field_redirect_existing_links: Redirect existing links
-field_estimated_hours: Estimated time
-field_default_value: Padrao
+field_is_filter: É um filtro
+field_issue_to_id: Ticket relacionado
+field_delay: Espera
+field_assignable: Tickets podem ser atribuídos para este papel
+field_redirect_existing_links: Redirecionar links existentes
+field_estimated_hours: Tempo estimado
+field_default_value: Padrão
 
-setting_app_title: Titulo da aplicacao
-setting_app_subtitle: Sub-titulo da aplicacao
-setting_welcome_text: Texto de boa-vinda
-setting_default_language: Lingua padrao
-setting_login_required: Autenticacao obrigatoria
-setting_self_registration: Registro de si mesmo permitido
-setting_attachment_max_size: Tamanho maximo do anexo
-setting_issues_export_limit: Limite de exportacao das tarefas
+setting_app_title: Título da aplicação
+setting_app_subtitle: Sub-título da aplicação
+setting_welcome_text: Texto de boas-vindas
+setting_default_language: Idioma padrão
+setting_login_required: Autenticação obrigatória
+setting_self_registration: Permitido Auto-registro
+setting_attachment_max_size: Tamanho máximo do anexo
+setting_issues_export_limit: Limite de exportação das tarefas
 setting_mail_from: Email enviado de
 setting_host_name: Servidor
 setting_text_formatting: Formato do texto
-setting_wiki_compression: Compactacao do historio do Wiki
+setting_wiki_compression: Compactação de histórico do Wiki
 setting_feeds_limit: Limite do Feed
-setting_autofetch_changesets: Autofetch commits
-setting_sys_api_enabled: Ativa WS para gerenciamento do repositorio
-setting_commit_ref_keywords: Referencing keywords
-setting_commit_fix_keywords: Fixing keywords
-setting_autologin: Autologin
-setting_date_format: Date format
-setting_cross_project_issue_relations: Allow cross-project issue relations
+setting_autofetch_changesets: Auto-obter commits
+setting_sys_api_enabled: Ativa WS para gerenciamento do repositório
+setting_commit_ref_keywords: Palavras de referência
+setting_commit_fix_keywords: Palavras de fechamento
+setting_autologin: Auto-login
+setting_date_format: Formato da data
+setting_cross_project_issue_relations: Permitir relacionar tickets entre projetos
 
-label_user: Usuario
-label_user_plural: Usuarios
-label_user_new: Novo usuario
+label_user: Usuário
+label_user_plural: Usuários
+label_user_new: Novo usuário
 label_project: Projeto
 label_project_new: Novo projeto
 label_project_plural: Projetos
-label_project_all: All Projects
-label_project_latest: Ultimos projetos
-label_issue: Tarefa
-label_issue_new: Nova tarefa
-label_issue_plural: Tarefas
-label_issue_view_all: Ver todas as tarefas
+label_project_all: Todos os projetos
+label_project_latest: Últimos projetos
+label_issue: Ticket
+label_issue_new: Novo ticket
+label_issue_plural: Tickets
+label_issue_view_all: Ver todos os tickets
 label_document: Documento
 label_document_new: Novo documento
 label_document_plural: Documentos
-label_role: Regra
-label_role_plural: Regras
-label_role_new: Nova regra
-label_role_and_permissions: Regras e permissoes
+label_role: Papel
+label_role_plural: Papéis
+label_role_new: Novo papel
+label_role_and_permissions: Papéis e permissões
 label_member: Membro
 label_member_new: Novo membro
 label_member_plural: Membros
-label_tracker: Tipo
-label_tracker_plural: Tipos
+label_tracker: Tipo de ticket
+label_tracker_plural: Tipos de ticket
 label_tracker_new: Novo tipo
 label_workflow: Workflow
-label_issue_status: Status da tarefa
-label_issue_status_plural: Status das tarefas
+label_issue_status: Status do ticket
+label_issue_status_plural: Status dos tickets
 label_issue_status_new: Novo status
-label_issue_category: Categoria de tarefa
-label_issue_category_plural: Categorias de tarefa
+label_issue_category: Categoria de ticket
+label_issue_category_plural: Categorias de tickets
 label_issue_category_new: Nova categoria
 label_custom_field: Campo personalizado
-label_custom_field_plural: Campos personalizado
+label_custom_field_plural: Campos personalizados
 label_custom_field_new: Novo campo personalizado
-label_enumerations: Enumeracao
-label_enumeration_new: Novo valor
-label_information: Informacao
-label_information_plural: Informacoes
-label_please_login: Efetue login
+label_enumerations: 'Tipos & Categorias'
+label_enumeration_new: Novo
+label_information: Informação
+label_information_plural: Informações
+label_please_login: Efetue o login
 label_register: Registre-se
-label_password_lost: Perdi a senha
-label_home: Pagina inicial
-label_my_page: Minha pagina
+label_password_lost: Perdi minha senha
+label_home: Página inicial
+label_my_page: Minha página
 label_my_account: Minha conta
 label_my_projects: Meus projetos
-label_administration: Administracao
-label_login: Login
-label_logout: Logout
+label_administration: Administração
+label_login: Entrar
+label_logout: Sair
 label_help: Ajuda
-label_reported_issues: Tarefas reportadas
-label_assigned_to_me_issues: Tarefas atribuidas a mim
-label_last_login: Utima conexao
-label_last_updates: Ultima alteracao
-label_last_updates_plural: %d Ultimas alteracoes
+label_reported_issues: Tickets reportados
+label_assigned_to_me_issues: Meus tickets
+label_last_login: Última conexao
+label_last_updates: Última alteração
+label_last_updates_plural: %d Últimas alterações
 label_registered_on: Registrado em
 label_activity: Atividade
 label_new: Novo
-label_logged_as: Logado como
+label_logged_as: "Acessando como:"
 label_environment: Ambiente
-label_authentication: Autenticacao
-label_auth_source: Modo de autenticacao
-label_auth_source_new: Novo modo de autenticacao
-label_auth_source_plural: Modos de autenticacao
+label_authentication: Autenticação
+label_auth_source: Modo de autenticação
+label_auth_source_new: Novo modo de autenticação
+label_auth_source_plural: Modos de autenticação
 label_subproject_plural: Sub-projetos
-label_min_max_length: Tamanho min-max
+label_min_max_length: Tamanho mín-máx
 label_list: Lista
 label_date: Data
 label_integer: Inteiro
@@ -262,169 +262,169 @@ label_attribute: Atributo
 label_attribute_plural: Atributos
 label_download: %d Download
 label_download_plural: %d Downloads
-label_no_data: Sem dados para mostrar
-label_change_status: Mudar status
-label_history: Historico
+label_no_data: Nenhuma informação disponível
+label_change_status: Alterar status
+label_history: Histórico
 label_attachment: Arquivo
 label_attachment_new: Novo arquivo
 label_attachment_delete: Apagar arquivo
 label_attachment_plural: Arquivos
-label_report: Relatorio
-label_report_plural: Relatorio
-label_news: Noticias
-label_news_new: Adicionar noticias
-label_news_plural: Noticias
-label_news_latest: Ultimas noticias
-label_news_view_all: Ver todas as noticias
-label_change_log: Change log
-label_settings: Ajustes
-label_overview: Visao geral
-label_version: Versao
-label_version_new: Nova versao
-label_version_plural: Versoes
-label_confirmation: Confirmacao
+label_report: Relatório
+label_report_plural: Relatório
+label_news: Notícia
+label_news_new: Adicionar notícias
+label_news_plural: Notícias
+label_news_latest: Últimas notícias
+label_news_view_all: Ver todas as notícias
+label_change_log: Registro de alterações
+label_settings: Configurações
+label_overview: Visão geral
+label_version: Versão
+label_version_new: Nova versão
+label_version_plural: Versões
+label_confirmation: Confirmação
 label_export_to: Exportar para
 label_read: Ler...
-label_public_projects: Projetos publicos
+label_public_projects: Projetos públicos
 label_open_issues: Aberto
-label_open_issues_plural:  Abertos
+label_open_issues_plural: Abertos
 label_closed_issues: Fechado
 label_closed_issues_plural: Fechados
 label_total: Total
-label_permissions: Permissoes
+label_permissions: Permissões
 label_current_status: Status atual
 label_new_statuses_allowed: Novo status permitido
 label_all: todos
 label_none: nenhum
-label_next: Proximo
+label_next: Próximo
 label_previous: Anterior
 label_used_by: Usado por
 label_details: Detalhes
 label_add_note: Adicionar nota
-label_per_page: Por pagina
-label_calendar: Calendario
-label_months_from: Meses de
+label_per_page: Por página
+label_calendar: Calendário
+label_months_from: meses a partir de
 label_gantt: Gantt
 label_internal: Interno
-label_last_changes: utlimas %d mudancas
-label_change_view_all: Mostrar todas as mudancas
-label_personalize_page: Personalizar esta pagina
-label_comment: Comentario
-label_comment_plural: Comentarios
-label_comment_add: Adicionar comentario
-label_comment_added: Comentario adicionado
-label_comment_delete: Apagar comentario
+label_last_changes: últimas %d alteraçoes
+label_change_view_all: Mostrar todas as alteraçoes
+label_personalize_page: Personalizar esta página
+label_comment: Comentário
+label_comment_plural: Comentários
+label_comment_add: Adicionar comentário
+label_comment_added: Comentário adicionado
+label_comment_delete: Apagar comentário
 label_query: Consulta personalizada
 label_query_plural: Consultas personalizadas
 label_query_new: Nova consulta
 label_filter_add: Adicionar filtro
 label_filter_plural: Filtros
-label_equals: e
-label_not_equals: nao e
-label_in_less_than: e maior que
-label_in_more_than: e menor que
+label_equals: é
+label_not_equals: não é
+label_in_less_than: é maior que
+label_in_more_than: é menor que
 label_in: em
 label_today: hoje
-label_this_week: this week
+label_this_week: esta semana
 label_less_than_ago: faz menos de
 label_more_than_ago: faz mais de
-label_ago: dias atras
-label_contains: contem
-label_not_contains: nao contem
+label_ago: dias atrás
+label_contains: contém
+label_not_contains: não contem
 label_day_plural: dias
-label_repository: Repository
-label_browse: Browse
-label_modification: %d change
-label_modification_plural: %d changes
-label_revision: Revision
-label_revision_plural: Revisions
-label_added: added
-label_modified: modified
-label_deleted: deleted
-label_latest_revision: Latest revision
-label_latest_revision_plural: Latest revisions
-label_view_revisions: View revisions
-label_max_size: Maximum size
+label_repository: Repositório
+label_browse: Procurar
+label_modification: %d alteração
+label_modification_plural: %d alterações
+label_revision: Revisão
+label_revision_plural: Revisões
+label_added: adicionado
+label_modified: modificado
+label_deleted: excluído
+label_latest_revision: Última revisão
+label_latest_revision_plural: Últimas revisões
+label_view_revisions: Visualizar revisões
+label_max_size: Tamanho máximo
 label_on: 'em'
-label_sort_highest: Mover para o inicio
+label_sort_highest: Mover para o início
 label_sort_higher: Mover para cima
 label_sort_lower: Mover para baixo
 label_sort_lowest: Mover para o fim
-label_roadmap: Roadmap
-label_roadmap_due_in: Due in 
-label_roadmap_overdue: %s late
-label_roadmap_no_issues: Sem tarefas para essa versao
+label_roadmap: Planejamento
+label_roadmap_due_in: Previsão em
+label_roadmap_overdue: %s atrasado
+label_roadmap_no_issues: Sem tickets para esta versão
 label_search: Busca
 label_result_plural: Resultados
 label_all_words: Todas as palavras
 label_wiki: Wiki
-label_wiki_edit: Wiki edit
-label_wiki_edit_plural: Wiki edits
-label_wiki_page: Wiki page
-label_wiki_page_plural: Wiki pages
-label_index_by_title: Index by title
-label_index_by_date: Index by date
-label_current_version: Versao atual
-label_preview: Previa
+label_wiki_edit: Editar Wiki
+label_wiki_edit_plural: Edições Wiki
+label_wiki_page: Página Wiki
+label_wiki_page_plural: Páginas Wiki
+label_index_by_title: Índice por título
+label_index_by_date: Índice por data
+label_current_version: Versão atual
+label_preview: Pré-visualizar
 label_feed_plural: Feeds
-label_changes_details: Detalhes de todas as mudancas
-label_issue_tracking: Tarefas
+label_changes_details: Detalhes de todas as alterações
+label_issue_tracking: Tickets
 label_spent_time: Tempo gasto
 label_f_hour: %.2f hora
 label_f_hour_plural: %.2f horas
 label_time_tracking: Tempo trabalhado
-label_change_plural: Mudancas
-label_statistics: Estatisticas
-label_commits_per_month: Commits por mes
+label_change_plural: Mudanças
+label_statistics: Estatísticas
+label_commits_per_month: Commits por mês
 label_commits_per_author: Commits por autor
-label_view_diff: Ver diferencas
+label_view_diff: Ver diferenças
 label_diff_inline: inline
-label_diff_side_by_side: side by side
-label_options: Opcoes
+label_diff_side_by_side: lado a lado
+label_options: Opções
 label_copy_workflow_from: Copiar workflow de
-label_permissions_report: Relatorio de permissoes
-label_watched_issues: Watched issues
-label_related_issues: Related issues
-label_applied_status: Applied status
-label_loading: Loading...
-label_relation_new: New relation
-label_relation_delete: Delete relation
-label_relates_to: related to
-label_duplicates: duplicates
-label_blocks: blocks
-label_blocked_by: blocked by
-label_precedes: precedes
-label_follows: follows
-label_end_to_start: end to start
-label_end_to_end: end to end
-label_start_to_start: start to start
-label_start_to_end: start to end
-label_stay_logged_in: Stay logged in
-label_disabled: disabled
-label_show_completed_versions: Show completed versions
-label_me: me
-label_board: Forum
-label_board_new: New forum
-label_board_plural: Forums
-label_topic_plural: Topics
-label_message_plural: Messages
-label_message_last: Last message
-label_message_new: New message
-label_reply_plural: Replies
-label_send_information: Send account information to the user
-label_year: Year
-label_month: Month
-label_week: Week
-label_date_from: From
-label_date_to: To
-label_language_based: Language based
-label_sort_by: Sort by %s
-label_send_test_email: Send a test email
-label_feeds_access_key_created_on: RSS access key created %s ago
-label_module_plural: Modules
-label_added_time_by: Added by %s %s ago
-label_updated_time: Updated %s ago
-label_jump_to_a_project: Jump to a project...
+label_permissions_report: Relatório de permissões
+label_watched_issues: Tickes acompanhados
+label_related_issues: Tickets relacionados
+label_applied_status: Status aplicado
+label_loading: Carregando...
+label_relation_new: Nova relação
+label_relation_delete: Excluir relação
+label_relates_to: relacionado a
+label_duplicates: duplicado de
+label_blocks: bloqueia
+label_blocked_by: bloqueado por
+label_precedes: precede
+label_follows: segue
+label_end_to_start: fim para o início
+label_end_to_end: fim para fim
+label_start_to_start: início para início
+label_start_to_end: início para fim
+label_stay_logged_in: Permanecer logado
+label_disabled: desabilitado
+label_show_completed_versions: Exibir versões completas
+label_me: eu
+label_board: Fórum
+label_board_new: Novo fórum
+label_board_plural: Fóruns
+label_topic_plural: Tópicos
+label_message_plural: Mensagens
+label_message_last: Última mensagem
+label_message_new: Nova mensagem
+label_reply_plural: Respostas
+label_send_information: Enviar informação de conta para o usuário
+label_year: Ano
+label_month: Mês
+label_week: Semana
+label_date_from: De
+label_date_to: Para
+label_language_based: Com base no idioma
+label_sort_by: Ordenar por %s
+label_send_test_email: Enviar um email de teste
+label_feeds_access_key_created_on: chave de acesso RSS criada %s atrás
+label_module_plural: Módulos
+label_added_time_by: Adicionado por %s %s atrás
+label_updated_time: Atualizado %s atrás
+label_jump_to_a_project: Ir para o projeto...
 
 button_login: Login
 button_submit: Enviar
@@ -436,7 +436,7 @@ button_create: Criar
 button_test: Testar
 button_edit: Editar
 button_add: Adicionar
-button_change: Mudar
+button_change: Alterar
 button_apply: Aplicar
 button_clear: Limpar
 button_lock: Bloquear
@@ -450,59 +450,59 @@ button_cancel: Cancelar
 button_activate: Ativar
 button_sort: Ordenar
 button_log_time: Tempo de trabalho
-button_rollback: Voltar para esta versao
-button_watch: Watch
-button_unwatch: Unwatch
-button_reply: Reply
-button_archive: Archive
-button_unarchive: Unarchive
-button_reset: Reset
-button_rename: Rename
+button_rollback: Voltar para esta versão
+button_watch: Acompanhar
+button_unwatch: Não Acompanhar
+button_reply: Responder
+button_archive: Arquivar
+button_unarchive: Desarquivar
+button_reset: Redefinir
+button_rename: Renomear
 
 status_active: ativo
 status_registered: registrado
 status_locked: bloqueado
 
-text_select_mail_notifications: Selecionar acoes para ser enviado uma notificacao por email
-text_regexp_info: eg. ^[A-Z0-9]+$
-text_min_max_length_info: 0 siginifica sem restricao
-text_project_destroy_confirmation: Voce tem certeza que deseja deletar este projeto e todas os dados relacionados?
+text_select_mail_notifications: Selecionar ações para ser enviado uma notificação por email
+text_regexp_info: ex. ^[A-Z0-9]+$
+text_min_max_length_info: 0 siginifica sem restrição
+text_project_destroy_confirmation: Você tem certeza que deseja excluir este projeto e todos os dados relacionados?
 text_workflow_edit: Selecione uma regra e um tipo de tarefa para editar o workflow
-text_are_you_sure: Voce tem certeza ?
+text_are_you_sure: Você tem certeza?
 text_journal_changed: alterado de %s para %s
 text_journal_set_to: setar para %s
 text_journal_deleted: apagado
-text_tip_task_begin_day: tarefa comeca neste dia
+text_tip_task_begin_day: tarefa inicia neste dia
 text_tip_task_end_day: tarefa termina neste dia
-text_tip_task_begin_end_day: tarefa comeca e termina neste dia
-text_project_identifier_info: 'Letras minusculas (a-z), numeros e tracos permitido.<br />Uma vez salvo, o identificador nao pode ser mudado.'
-text_caracters_maximum: %d maximo de caracteres
+text_tip_task_begin_end_day: tarefa inicia e termina neste dia
+text_project_identifier_info: 'Letras minúsculas (a-z), números e traços permitidos.<br />Uma vez salvo, o identificador não pode ser alterado.'
+text_caracters_maximum: máximo %d caracteres
 text_length_between: Tamanho entre %d e %d caracteres.
 text_tracker_no_workflow: Sem workflow definido para este tipo.
-text_unallowed_characters: Unallowed characters
-text_comma_separated: Multiple values allowed (comma separated).
-text_issues_ref_in_commit_messages: Referencing and fixing issues in commit messages
-text_issue_added: Tarefa %s foi incluída (by %s).
-text_issue_updated: Tarefa %s foi alterada (by %s).
-text_wiki_destroy_confirmation: Are you sure you want to delete this wiki and all its content ?
-text_issue_category_destroy_question: Some issues (%d) are assigned to this category. What do you want to do ?
-text_issue_category_destroy_assignments: Remove category assignments
-text_issue_category_reassign_to: Reassing issues to this category
+text_unallowed_characters: Caracteres não permitidos
+text_comma_separated: Múltiplos valores são permitidos (separados por vírgula).
+text_issues_ref_in_commit_messages: Referenciando e fixando tickets nas mensagens de commit
+text_issue_added: Tarefa %s foi incluída (por %s).
+text_issue_updated: Tarefa %s foi alterada (por %s).
+text_wiki_destroy_confirmation: Você tem certeza que deseja excluir este wiki e todo o seu conteúdo?
+text_issue_category_destroy_question: Alguns tickets (%d) estão atribuídos a esta categoria. O que você deseja fazer?
+text_issue_category_destroy_assignments: Remover atribuições da categoria
+text_issue_category_reassign_to: Redefinir tickets para esta categoria
 
-default_role_manager: Analista de Negocio ou Gerente de Projeto
+default_role_manager: Gerente
 default_role_developper: Desenvolvedor
-default_role_reporter: Analista de Suporte
-default_tracker_bug: Bug
-default_tracker_feature: Implementacao
+default_role_reporter: Informante
+default_tracker_bug: Problema
+default_tracker_feature: Implementação
 default_tracker_support: Suporte
 default_issue_status_new: Novo
-default_issue_status_assigned: Atribuido
+default_issue_status_assigned: Atribuído
 default_issue_status_resolved: Resolvido
 default_issue_status_feedback: Feedback
 default_issue_status_closed: Fechado
 default_issue_status_rejected: Rejeitado
-default_doc_category_user: Documentacao do usuario
-default_doc_category_tech: Documentacao do tecnica
+default_doc_category_user: Documentação do usuário
+default_doc_category_tech: Documentação técnica
 default_priority_low: Baixo
 default_priority_normal: Normal
 default_priority_high: Alto
@@ -514,108 +514,108 @@ default_activity_development: Desenvolvimento
 enumeration_issue_priorities: Prioridade das tarefas
 enumeration_doc_categories: Categorias de documento
 enumeration_activities: Atividades (time tracking)
-label_file_plural: Files
+label_file_plural: Arquivos
 label_changeset_plural: Changesets
-field_column_names: Columns
-label_default_columns: Default columns
-setting_issue_list_default_columns: Default columns displayed on the issue list
-setting_repositories_encodings: Repositories encodings
-notice_no_issue_selected: "No issue is selected! Please, check the issues you want to edit."
-label_bulk_edit_selected_issues: Bulk edit selected issues
-label_no_change_option: (No change)
-notice_failed_to_save_issues: "Failed to save %d issue(s) on %d selected: %s."
-label_theme: Theme
-label_default: Default
-label_search_titles_only: Search titles only
-label_nobody: nobody
-button_change_password: Change password
-text_user_mail_option: "For unselected projects, you will only receive notifications about things you watch or you're involved in (eg. issues you're the author or assignee)."
-label_user_mail_option_selected: "For any event on the selected projects only..."
-label_user_mail_option_all: "For any event on all my projects"
-label_user_mail_option_none: "Only for things I watch or I'm involved in"
-setting_emails_footer: Emails footer
-label_float: Float
-button_copy: Copy
-mail_body_account_information_external: You can use your "%s" account to log in.
-mail_body_account_information: Your account information
-setting_protocol: Protocol
-label_user_mail_no_self_notified: "I don't want to be notified of changes that I make myself"
-setting_time_format: Time format
-label_registration_activation_by_email: account activation by email
-mail_subject_account_activation_request: %s account activation request
-mail_body_account_activation_request: 'A new user (%s) has registered. His account his pending your approval:'
-label_registration_automatic_activation: automatic account activation
-label_registration_manual_activation: manual account activation
-notice_account_pending: "Your account was created and is now pending administrator approval."
-field_time_zone: Time zone
-text_caracters_minimum: Must be at least %d characters long.
-setting_bcc_recipients: Blind carbon copy recipients (bcc)
-button_annotate: Annotate
-label_issues_by: Issues by %s
-field_searchable: Searchable
-label_display_per_page: 'Per page: %s'
-setting_per_page_options: Objects per page options
-label_age: Age
-notice_default_data_loaded: Default configuration successfully loaded.
-text_load_default_configuration: Load the default configuration
-text_no_configuration_data: "Roles, trackers, issue statuses and workflow have not been configured yet.\nIt is highly recommended to load the default configuration. You will be able to modify it once loaded."
-error_can_t_load_default_data: "Default configuration could not be loaded: %s"
-button_update: Update
-label_change_properties: Change properties
-label_general: General
-label_repository_plural: Repositories
-label_associated_revisions: Associated revisions
-setting_user_format: Users display format
-text_status_changed_by_changeset: Applied in changeset %s.
-label_more: More
-text_issues_destroy_confirmation: 'Are you sure you want to delete the selected issue(s) ?'
+field_column_names: Colunas
+label_default_columns: Colunas padrão
+setting_issue_list_default_columns: Colunas padrão visíveis na lista de tickets
+setting_repositories_encodings: Codificação dos repositórios
+notice_no_issue_selected: "Nenhum ticket está selecionado! Por favor, marque os tickets que você deseja alterar."
+label_bulk_edit_selected_issues: Edição em massa dos tickets selecionados.
+label_no_change_option: (Sem alteração)
+notice_failed_to_save_issues: "Problema ao salvar %d ticket(s) no %d selecionado: %s."
+label_theme: Tema
+label_default: Padrão
+label_search_titles_only: Pesquisar somente títulos
+label_nobody: ninguém
+button_change_password: Alterar senha
+text_user_mail_option: "Para projetos não selecionados, você somente receberá notificações sobre o que você acompanha ou está envolvido (ex. tickets que você é autor ou está atribuído)"
+label_user_mail_option_selected: "Para qualquer evento somente no(s) projeto(s) selecionado(s)..."
+label_user_mail_option_all: "Para qualquer evento em todos os meus projetos"
+label_user_mail_option_none: "Somente eventos que eu acompanho ou estou envolvido"
+setting_emails_footer: Rodapé dos emails
+label_float: Flutuante
+button_copy: Copiar
+mail_body_account_information_external: Você pode usar sua conta "%s" para entrar.
+mail_body_account_information: Informações de sua conta
+setting_protocol: Protocolo
+label_user_mail_no_self_notified: "Eu não desejo ser notificado de minhas próprias modificações"
+setting_time_format: Formato de data
+label_registration_activation_by_email: ativação de conta por email
+mail_subject_account_activation_request: %s requisição de ativação de conta
+mail_body_account_activation_request: 'Um novo usuário (%s) se registrou. A conta está aguardando sua aprovação:'
+label_registration_automatic_activation: ativação automática de conta
+label_registration_manual_activation: ativação manual de conta
+notice_account_pending: "Sua conta foi criada e está aguardando aprovação do administrador."
+field_time_zone: Fuso-horário
+text_caracters_minimum: Precisa ter ao menos %d caracteres.
+setting_bcc_recipients: Destinatários com cópia oculta (cco)
+button_annotate: Anotar
+label_issues_by: Tickets por %s
+field_searchable: Pesquisável
+label_display_per_page: 'Por página: %s'
+setting_per_page_options: Opções de itens por página
+notice_default_data_loaded: Configuração padrão carregada com sucesso.
+text_load_default_configuration: Carregar a configuração padrão
+text_no_configuration_data: "Os Papéis, tipos de tickets, status de tickets e workflows não foram configurados ainda.\nÉ altamente recomendado carregar as configurações padrão. Você poderá modificar estas configurações assim que carregadas."
+error_can_t_load_default_data: "Configuração padrão não pôde ser carregada: %s"
+button_update: Atualizar
+label_change_properties: Alterar propriedades
+label_general: Geral
+label_repository_plural: Repositórios
+label_associated_revisions: Revisões associadas
+setting_user_format: Formato de visualização dos usuários
+text_status_changed_by_changeset: Aplicado no changeset %s.
+label_more: Mais
+text_issues_destroy_confirmation: 'Você tem certeza que deseja excluir o(s) ticket(s) selecionado(s)?'
 label_scm: SCM
-text_select_project_modules: 'Select modules to enable for this project:'
-label_issue_added: Issue added
-label_issue_updated: Issue updated
-label_document_added: Document added
-label_message_posted: Message added
-label_file_added: File added
-label_news_added: News added
-project_module_boards: Boards
-project_module_issue_tracking: Issue tracking
+text_select_project_modules: 'Selecione módulos para habilitar para este projeto:'
+label_issue_added: Ticket adicionado
+label_issue_updated: Ticket atualizado
+label_document_added: Documento adicionado
+label_message_posted: Mensagem enviada
+label_file_added: Arquivo adicionado
+label_news_added: Notícia adicionada
+project_module_boards: Fóruns
+project_module_issue_tracking: Gerenciamento de Tickets
 project_module_wiki: Wiki
-project_module_files: Files
-project_module_documents: Documents
-project_module_repository: Repository
-project_module_news: News
-project_module_time_tracking: Time tracking
-text_file_repository_writable: File repository writable
-text_default_administrator_account_changed: Default administrator account changed
-text_rmagick_available: RMagick available (optional)
-button_configure: Configure
+project_module_files: Arquivos
+project_module_documents: Documentos
+project_module_repository: Repositório
+project_module_news: Notícias
+project_module_time_tracking: Gerenciamento de tempo
+text_file_repository_writable: Repositório de arquivos gravável
+text_default_administrator_account_changed: Conta de administrador padrão modificada
+text_rmagick_available: RMagick disponível (opcional)
+button_configure: Configuração
 label_plugins: Plugins
-label_ldap_authentication: LDAP authentication
+label_ldap_authentication: autenticação LDAP
 label_downloads_abbr: D/L
-label_this_month: this month
-label_last_n_days: last %d days
-label_all_time: all time
-label_this_year: this year
-label_date_range: Date range
-label_last_week: last week
-label_yesterday: yesterday
-label_last_month: last month
-label_add_another_file: Add another file
-label_optional_description: Optional description
-text_destroy_time_entries_question: %.02f hours were reported on the issues you are about to delete. What do you want to do ?
-error_issue_not_found_in_project: 'The issue was not found or does not belong to this project'
-text_assign_time_entries_to_project: Assign reported hours to the project
-text_destroy_time_entries: Delete reported hours
-text_reassign_time_entries: 'Reassign reported hours to this issue:'
-setting_activity_days_default: Days displayed on project activity
-label_chronological_order: In chronological order
-field_comments_sorting: Display comments
-label_reverse_chronological_order: In reverse chronological order
-label_preferences: Preferences
-setting_display_subprojects_issues: Display subprojects issues on main projects by default
-label_overall_activity: Overall activity
-setting_default_projects_public: New projects are public by default
-error_scm_annotate: "The entry does not exist or can not be annotated."
-label_planning: Planning
-text_subprojects_destroy_warning: 'Its subproject(s): %s will be also deleted.'
+label_this_month: este mês
+label_last_n_days: últimos %d dias
+label_all_time: todo o tempo
+label_this_year: este ano
+label_date_range: Intervalo de datas
+label_last_week: última semana
+label_yesterday: ontem
+label_last_month: último mês
+label_add_another_file: Adicionar outro arquivo
+label_optional_description: Descrição opcional
+text_destroy_time_entries_question: %.02f horas foram reportadas neste ticket que você está excluindo. O que você deseja fazer?
+error_issue_not_found_in_project: 'O ticket não foi encontrado ou não pertence a este projeto'
+text_assign_time_entries_to_project: Atribuir horas reportadas para o projeto
+text_destroy_time_entries: Excluir horas reportadas
+text_reassign_time_entries: 'Redefinir horas reportadas para este ticket:'
+setting_activity_days_default: Dias visualizados na atividade do projeto
+label_chronological_order: Em ordem cronológica
+field_comments_sorting: Visualizar comentários
+label_reverse_chronological_order: Em order cronológica reversa
+label_preferences: Preferências
+setting_display_subprojects_issues: Visualizar tickets dos subprojetos nos projetos principais por padrão
+label_overall_activity: Atividade geral
+setting_default_projects_public: Novos projetos são públicos por padrão
+error_scm_annotate: "Esta entrada não existe ou não pode ser anotada."
+label_planning: Planejamento
+text_subprojects_destroy_warning: 'Seu(s) subprojeto(s): %s também serão excluídos.'
+label_age: Age
 label_and_its_subprojects: %s and its subprojects
diff --git a/lang/zh-tw.yml b/lang/zh-tw.yml
index b52446917..1bdc7d715 100644
--- a/lang/zh-tw.yml
+++ b/lang/zh-tw.yml
@@ -291,6 +291,7 @@ label_auth_source: 認證模式
 label_auth_source_new: 建立新認證模式
 label_auth_source_plural: 認證模式清單
 label_subproject_plural: 子專案
+label_and_its_subprojects: %s 與其子專案
 label_min_max_length: 最小 - 最大 長度
 label_list: 清單
 label_date: 日期
@@ -619,4 +620,3 @@ default_activity_development: 開發
 enumeration_issue_priorities: 項目優先權
 enumeration_doc_categories: 文件分類
 enumeration_activities: 活動 (時間追蹤)
-label_and_its_subprojects: %s and its subprojects
diff --git a/lang/zh.yml b/lang/zh.yml
index 808dd1b39..ac5eb456d 100644
--- a/lang/zh.yml
+++ b/lang/zh.yml
@@ -198,7 +198,7 @@ setting_default_projects_public: 新建项目默认为公开项目
 setting_autofetch_changesets: 自动获取程序变更
 setting_sys_api_enabled: 启用用于版本库管理的Web Service
 setting_commit_ref_keywords: 用于引用问题的关键字
-setting_commit_fix_keywords: 用于修订问题的关键字
+setting_commit_fix_keywords: 用于解决问题的关键字
 setting_autologin: 自动登录
 setting_date_format: 日期格式
 setting_time_format: 时间格式
@@ -257,9 +257,9 @@ label_issue_status_new: 新建问题状态
 label_issue_category: 问题类别
 label_issue_category_plural: 问题类别
 label_issue_category_new: 新建问题类别
-label_custom_field: 自定义字段
-label_custom_field_plural: 自定义字段
-label_custom_field_new: 新建自定义字段
+label_custom_field: 自定义属性
+label_custom_field_plural: 自定义属性
+label_custom_field_new: 新建自定义属性
 label_enumerations: 枚举值
 label_enumeration_new: 新建枚举值
 label_information: 信息
@@ -291,6 +291,7 @@ label_auth_source: 认证模式
 label_auth_source_new: 新建认证模式
 label_auth_source_plural: 认证模式
 label_subproject_plural: 子项目
+label_and_its_subprojects: %s 及其子项目
 label_min_max_length: 最小 - 最大 长度
 label_list: 列表
 label_date: 日期
@@ -573,7 +574,7 @@ text_length_between: 长度必须在 %d 到 %d 个字符之间。
 text_tracker_no_workflow: 此跟踪标签未定义工作流程
 text_unallowed_characters: 非法字符
 text_comma_separated: 可以使用多个值（用逗号,分开）。
-text_issues_ref_in_commit_messages: 在提交信息中引用和修订问题
+text_issues_ref_in_commit_messages: 在提交信息中引用和解决问题
 text_issue_added: 问题 %s 已由 %s 提交。
 text_issue_updated: 问题 %s 已由 %s 更新。
 text_wiki_destroy_confirmation: 您确定要删除这个 wiki 及其所有内容吗？
@@ -618,5 +619,4 @@ default_activity_development: 开发
 
 enumeration_issue_priorities: 问题优先级
 enumeration_doc_categories: 文档类别
-enumeration_activities: 活动（时间跟踪）
-label_and_its_subprojects: %s and its subprojects
+enumeration_activities: 活动（时间跟踪）
\ No newline at end of file
diff --git a/public/javascripts/calendar/lang/calendar-pt-br.js b/public/javascripts/calendar/lang/calendar-pt-br.js
index 5d4d014ce..bf7734ab3 100644
--- a/public/javascripts/calendar/lang/calendar-pt-br.js
+++ b/public/javascripts/calendar/lang/calendar-pt-br.js
@@ -2,7 +2,8 @@
 
 // Calendar pt_BR language
 // Author: Adalberto Machado, <betosm@terra.com.br>
-// Encoding: any
+// Review: Alexandre da Silva, <simpsomboy@gmail.com>
+// Encoding: UTF-8
 // Distributed under the same terms as the calendar itself.
 
 // For translators: please use UTF-8 if possible.  We strongly believe that
@@ -13,7 +14,7 @@
 Calendar._DN = new Array
 ("Domingo",
  "Segunda",
- "Terca",
+ "Terça",
  "Quarta",
  "Quinta",
  "Sexta",
@@ -45,13 +46,13 @@ Calendar._SDN = new Array
 
 // First day of the week. "0" means display Sunday first, "1" means display
 // Monday first, etc.
-Calendar._FD = 1;
+Calendar._FD = 0;
 
 // full month names
 Calendar._MN = new Array
 ("Janeiro",
  "Fevereiro",
- "Marco",
+ "Março",
  "Abril",
  "Maio",
  "Junho",
@@ -79,29 +80,30 @@ Calendar._SMN = new Array
 
 // tooltips
 Calendar._TT = {};
-Calendar._TT["INFO"] = "Sobre o calendario";
+Calendar._TT["INFO"] = "Sobre o calendário";
 
 Calendar._TT["ABOUT"] =
 "DHTML Date/Time Selector\n" +
 "(c) dynarch.com 2002-2005 / Author: Mihai Bazon\n" + // don't translate this this ;-)
-"Ultima versao visite: http://www.dynarch.com/projects/calendar/\n" +
-"Distribuido sobre GNU LGPL.  Veja http://gnu.org/licenses/lgpl.html para detalhes." +
+"Última versão visite: http://www.dynarch.com/projects/calendar/\n" +
+"Distribuído sobre GNU LGPL.  Veja http://gnu.org/licenses/lgpl.html para detalhes." +
 "\n\n" +
-"Selecao de data:\n" +
-"- Use os botoes \xab, \xbb para selecionar o ano\n" +
-"- Use os botoes " + String.fromCharCode(0x2039) + ", " + String.fromCharCode(0x203a) + " para selecionar o mes\n" +
-"- Segure o botao do mouse em qualquer um desses botoes para selecao rapida.";
+"Seleção de data:\n" +
+"- Use os botões \xab, \xbb para selecionar o ano\n" +
+"- Use os botões " + String.fromCharCode(0x2039) + ", " + 
+String.fromCharCode(0x203a) + " para selecionar o mês\n" +
+"- Segure o botão do mouse em qualquer um desses botões para seleção rápida.";
 Calendar._TT["ABOUT_TIME"] = "\n\n" +
-"Selecao de hora:\n" +
+"Seleção de hora:\n" +
 "- Clique em qualquer parte da hora para incrementar\n" +
 "- ou Shift-click para decrementar\n" +
-"- ou clique e segure para selecao rapida.";
+"- ou clique e segure para seleção rápida.";
 
 Calendar._TT["PREV_YEAR"] = "Ant. ano (segure para menu)";
-Calendar._TT["PREV_MONTH"] = "Ant. mes (segure para menu)";
+Calendar._TT["PREV_MONTH"] = "Ant. mês (segure para menu)";
 Calendar._TT["GO_TODAY"] = "Hoje";
-Calendar._TT["NEXT_MONTH"] = "Prox. mes (segure para menu)";
-Calendar._TT["NEXT_YEAR"] = "Prox. ano (segure para menu)";
+Calendar._TT["NEXT_MONTH"] = "Próx. mes (segure para menu)";
+Calendar._TT["NEXT_YEAR"] = "Próx. ano (segure para menu)";
 Calendar._TT["SEL_DATE"] = "Selecione a data";
 Calendar._TT["DRAG_TO_MOVE"] = "Arraste para mover";
 Calendar._TT["PART_TODAY"] = " (hoje)";
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-pt-br.js b/public/javascripts/jstoolbar/lang/jstoolbar-pt-br.js
index cd36a4b55..8fc58ba67 100644
--- a/public/javascripts/jstoolbar/lang/jstoolbar-pt-br.js
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-pt-br.js
@@ -1,14 +1,16 @@
+// Translated by: Alexandre da Silva <simpsomboy@gmail.com>
+
 jsToolBar.strings = {};
-jsToolBar.strings['Strong'] = 'Strong';
-jsToolBar.strings['Italic'] = 'Italic';
-jsToolBar.strings['Underline'] = 'Underline';
-jsToolBar.strings['Deleted'] = 'Deleted';
-jsToolBar.strings['Code'] = 'Inline Code';
-jsToolBar.strings['Heading 1'] = 'Heading 1';
-jsToolBar.strings['Heading 2'] = 'Heading 2';
-jsToolBar.strings['Heading 3'] = 'Heading 3';
-jsToolBar.strings['Unordered list'] = 'Unordered list';
-jsToolBar.strings['Ordered list'] = 'Ordered list';
-jsToolBar.strings['Preformatted text'] = 'Preformatted text';
-jsToolBar.strings['Wiki link'] = 'Link to a Wiki page';
-jsToolBar.strings['Image'] = 'Image';
+jsToolBar.strings['Strong'] = 'Negrito';
+jsToolBar.strings['Italic'] = 'Itálico';
+jsToolBar.strings['Underline'] = 'Sublinhado';
+jsToolBar.strings['Deleted'] = 'Excluído';
+jsToolBar.strings['Code'] = 'Código Inline';
+jsToolBar.strings['Heading 1'] = 'Cabeçalho 1';
+jsToolBar.strings['Heading 2'] = 'Cabeçalho 2';
+jsToolBar.strings['Heading 3'] = 'Cabeçalho 3';
+jsToolBar.strings['Unordered list'] = 'Lista não ordenada';
+jsToolBar.strings['Ordered list'] = 'Lista ordenada';
+jsToolBar.strings['Preformatted text'] = 'Texto pré-formatado';
+jsToolBar.strings['Wiki link'] = 'Link para uma página Wiki';
+jsToolBar.strings['Image'] = 'Imagem';

From 03f0236a6ee995363c54f958d66a0abbf0d3a827 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 25 May 2008 12:50:33 +0000
Subject: [PATCH 452/710] Prevents NoMethodError on @available_filters.has_key?
 in query.rb (#1178).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1454 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/models/query.rb     | 2 +-
 test/unit/query_test.rb | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/models/query.rb b/app/models/query.rb
index f25b5c401..c19bb8d7e 100644
--- a/app/models/query.rb
+++ b/app/models/query.rb
@@ -227,7 +227,7 @@ class Query < ActiveRecord::Base
   end
   
   def label_for(field)
-    label = @available_filters[field][:name] if @available_filters.has_key?(field)
+    label = available_filters[field][:name] if available_filters.has_key?(field)
     label ||= field.gsub(/\_id$/, "")
   end
 
diff --git a/test/unit/query_test.rb b/test/unit/query_test.rb
index e143e6fc2..147bfbea3 100644
--- a/test/unit/query_test.rb
+++ b/test/unit/query_test.rb
@@ -116,6 +116,11 @@ class QueryTest < Test::Unit::TestCase
     assert q.has_column?(c)
   end
   
+  def test_label_for
+    q = Query.new
+    assert_equal 'assigned_to', q.label_for('assigned_to_id')
+  end
+  
   def test_editable_by
     admin = User.find(1)
     manager = User.find(2)

From a92749ef93bbcc4e9a1116bd58d750de3054f78a Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 25 May 2008 13:26:21 +0000
Subject: [PATCH 453/710] Gantt chart: display issues that don't have a due
 date if they are assigned to a version with a date (#184).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1455 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/projects_controller.rb      |  7 +++++++
 app/models/issue.rb                         |  6 ++++++
 app/views/projects/gantt.rfpdf              |  4 ++--
 app/views/projects/gantt.rhtml              |  4 ++--
 test/fixtures/issues.yml                    |  6 +++++-
 test/fixtures/versions.yml                  |  2 +-
 test/functional/projects_controller_test.rb | 11 ++++++++++-
 test/functional/versions_controller_test.rb |  6 +++---
 8 files changed, 36 insertions(+), 10 deletions(-)

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 34ce734a5..07b29fa25 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -382,11 +382,18 @@ class ProjectsController < ApplicationController
     
     @events = []
     @project.issues_with_subprojects(@with_subprojects) do
+      # Issues that have start and due dates
       @events += Issue.find(:all, 
                            :order => "start_date, due_date",
                            :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?
+      # Issues that don't have a due date but that are assigned to a version with a date
+      @events += Issue.find(:all, 
+                           :order => "start_date, effective_date",
+                           :include => [:tracker, :status, :assigned_to, :priority, :project, :fixed_version], 
+                           :conditions => ["(((start_date>=? and start_date<=?) or (effective_date>=? and effective_date<=?) or (start_date<? and effective_date>?)) and start_date is not null and due_date is null and effective_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?
       @events += Version.find(:all, :include => :project,
                                     :conditions => ["effective_date BETWEEN ? AND ?", @date_from, @date_to])
     end
diff --git a/app/models/issue.rb b/app/models/issue.rb
index 0618b0f0a..633253db7 100644
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -230,6 +230,12 @@ class Issue < ActiveRecord::Base
     relations.select {|r| r.relation_type == IssueRelation::TYPE_DUPLICATES}.collect {|r| r.other_issue(self)}
   end
   
+  # Returns the due date or the target due date if any
+  # Used on gantt chart
+  def due_before
+    due_date || (fixed_version ? fixed_version.effective_date : nil)
+  end
+  
   def duration
     (start_date && due_date) ? due_date - start_date : 0
   end
diff --git a/app/views/projects/gantt.rfpdf b/app/views/projects/gantt.rfpdf
index a293906ba..e94fc5814 100644
--- a/app/views/projects/gantt.rfpdf
+++ b/app/views/projects/gantt.rfpdf
@@ -124,9 +124,9 @@ pdf.SetFontStyle('B',7)
 	
 	if i.is_a? Issue
 		i_start_date = (i.start_date >= @date_from ? i.start_date : @date_from )
-		i_end_date = (i.due_date <= @date_to ? i.due_date : @date_to )
+		i_end_date = (i.due_before <= @date_to ? i.due_before : @date_to )
 		
-		i_done_date = i.start_date + ((i.due_date - i.start_date+1)*i.done_ratio/100).floor
+		i_done_date = i.start_date + ((i.due_before - i.start_date+1)*i.done_ratio/100).floor
 		i_done_date = (i_done_date <= @date_from ? @date_from : i_done_date )
 		i_done_date = (i_done_date >= @date_to ? @date_to : i_done_date )
 		
diff --git a/app/views/projects/gantt.rhtml b/app/views/projects/gantt.rhtml
index f398bace7..071e0f324 100644
--- a/app/views/projects/gantt.rhtml
+++ b/app/views/projects/gantt.rhtml
@@ -166,9 +166,9 @@ top = headers_height + 10
 @events.each do |i| 
   if i.is_a? Issue 
 	i_start_date = (i.start_date >= @date_from ? i.start_date : @date_from )
-	i_end_date = (i.due_date <= @date_to ? i.due_date : @date_to )
+	i_end_date = (i.due_before <= @date_to ? i.due_before : @date_to )
 	
-	i_done_date = i.start_date + ((i.due_date - i.start_date+1)*i.done_ratio/100).floor
+	i_done_date = i.start_date + ((i.due_before - i.start_date+1)*i.done_ratio/100).floor
 	i_done_date = (i_done_date <= @date_from ? @date_from : i_done_date )
 	i_done_date = (i_done_date >= @date_to ? @date_to : i_done_date )
 	
diff --git a/test/fixtures/issues.yml b/test/fixtures/issues.yml
index 48195a7b7..c037624ae 100644
--- a/test/fixtures/issues.yml
+++ b/test/fixtures/issues.yml
@@ -13,6 +13,8 @@ issues_001:
   assigned_to_id: 
   author_id: 2
   status_id: 1
+  start_date: <%= 1.day.ago.to_date.to_s(:db) %>
+  due_date: <%= 10.day.from_now.to_date.to_s(:db) %>
 issues_002: 
   created_on: 2006-07-19 21:04:21 +02:00
   project_id: 1
@@ -20,13 +22,15 @@ issues_002:
   priority_id: 5
   subject: Add ingredients categories
   id: 2
-  fixed_version_id: 
+  fixed_version_id: 2
   category_id: 
   description: Ingredients of the recipe should be classified by categories
   tracker_id: 2
   assigned_to_id: 3
   author_id: 2
   status_id: 2
+  start_date: <%= 2.day.ago.to_date.to_s(:db) %>
+  due_date: 
 issues_003: 
   created_on: 2006-07-19 21:07:27 +02:00
   project_id: 1
diff --git a/test/fixtures/versions.yml b/test/fixtures/versions.yml
index bf08660d5..62c5e6f99 100644
--- a/test/fixtures/versions.yml
+++ b/test/fixtures/versions.yml
@@ -14,7 +14,7 @@ versions_002:
   updated_on: 2006-07-19 21:00:33 +02:00
   id: 2
   description: Stable release
-  effective_date: 2006-07-19
+  effective_date: <%= 20.day.from_now.to_date.to_s(:db) %>
 versions_003: 
   created_on: 2006-07-19 21:00:33 +02:00
   name: "2.0"
diff --git a/test/functional/projects_controller_test.rb b/test/functional/projects_controller_test.rb
index bebe96f29..82b5bdeb6 100644
--- a/test/functional/projects_controller_test.rb
+++ b/test/functional/projects_controller_test.rb
@@ -259,7 +259,16 @@ class ProjectsControllerTest < Test::Unit::TestCase
     get :gantt, :id => 1
     assert_response :success
     assert_template 'gantt.rhtml'
-    assert_not_nil assigns(:events)
+    events = assigns(:events)
+    assert_not_nil events
+    # Issue with start and due dates
+    i = Issue.find(1)
+    assert_not_nil i.due_date
+    assert events.include?(Issue.find(1))
+    # Issue with without due date but targeted to a version with date
+    i = Issue.find(2)
+    assert_nil i.due_date
+    assert events.include?(i)
   end
 
   def test_gantt_with_subprojects_should_not_show_private_subprojects
diff --git a/test/functional/versions_controller_test.rb b/test/functional/versions_controller_test.rb
index 3477c5edd..3a118701a 100644
--- a/test/functional/versions_controller_test.rb
+++ b/test/functional/versions_controller_test.rb
@@ -22,7 +22,7 @@ require 'versions_controller'
 class VersionsController; def rescue_action(e) raise e end; end
 
 class VersionsControllerTest < Test::Unit::TestCase
-  fixtures :projects, :versions, :users, :roles, :members, :enabled_modules
+  fixtures :projects, :versions, :issues, :users, :roles, :members, :enabled_modules
   
   def setup
     @controller = VersionsController.new
@@ -60,9 +60,9 @@ class VersionsControllerTest < Test::Unit::TestCase
 
   def test_destroy
     @request.session[:user_id] = 2
-    post :destroy, :id => 2
+    post :destroy, :id => 3
     assert_redirected_to 'projects/settings/ecookbook'
-    assert_nil Version.find_by_id(2)
+    assert_nil Version.find_by_id(3)
   end
   
   def test_issue_status_by

From c7d83be6131a386928c48f093a7426505c028dfc Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 25 May 2008 13:30:54 +0000
Subject: [PATCH 454/710] Test for striked through wiki link (#199).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1456 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 test/unit/helpers/application_helper_test.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/test/unit/helpers/application_helper_test.rb b/test/unit/helpers/application_helper_test.rb
index 8bd745124..25559ebc1 100644
--- a/test/unit/helpers/application_helper_test.rb
+++ b/test/unit/helpers/application_helper_test.rb
@@ -125,6 +125,8 @@ class ApplicationHelperTest < HelperTestCase
       '[[onlinestore:Start page]]' => '<a href="/wiki/onlinestore/Start_page" class="wiki-page">Start page</a>',
       '[[onlinestore:Start page|Text]]' => '<a href="/wiki/onlinestore/Start_page" class="wiki-page">Text</a>',
       '[[onlinestore:Unknown page]]' => '<a href="/wiki/onlinestore/Unknown_page" class="wiki-page new">Unknown page</a>',
+      # striked through link
+      '-[[Another page|Page]]-' => '<del><a href="/wiki/ecookbook/Another_page" class="wiki-page">Page</a></del>',
       # escaping
       '![[Another page|Page]]' => '[[Another page|Page]]',
     }

From dfcc8e1492dc4a30b1cddf600aed105f3284528d Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 25 May 2008 13:37:29 +0000
Subject: [PATCH 455/710] Change projects homepage limit to 255 chars (#663,
 #1095).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1457 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/models/project.rb                            | 2 +-
 app/views/projects/_form.rhtml                   | 2 +-
 db/migrate/094_change_projects_homepage_limit.rb | 9 +++++++++
 3 files changed, 11 insertions(+), 2 deletions(-)
 create mode 100644 db/migrate/094_change_projects_homepage_limit.rb

diff --git a/app/models/project.rb b/app/models/project.rb
index 2f2937fd9..e560f1dac 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -57,7 +57,7 @@ class Project < ActiveRecord::Base
   validates_associated :custom_values, :on => :update
   validates_associated :repository, :wiki
   validates_length_of :name, :maximum => 30
-  validates_length_of :homepage, :maximum => 60
+  validates_length_of :homepage, :maximum => 255
   validates_length_of :identifier, :in => 3..20
   validates_format_of :identifier, :with => /^[a-z0-9\-]*$/
   
diff --git a/app/views/projects/_form.rhtml b/app/views/projects/_form.rhtml
index 32e4dcd44..774e73977 100644
--- a/app/views/projects/_form.rhtml
+++ b/app/views/projects/_form.rhtml
@@ -13,7 +13,7 @@
 <% unless @project.identifier_frozen? %>
 <br /><em><%= l(:text_length_between, 3, 20) %> <%= l(:text_project_identifier_info) %></em>
 <% end %></p>
-<p><%= f.text_field :homepage, :size => 40 %></p>
+<p><%= f.text_field :homepage, :size => 60 %></p>
 <p><%= f.check_box :is_public %></p>
 <%= wikitoolbar_for 'project_description' %>
 
diff --git a/db/migrate/094_change_projects_homepage_limit.rb b/db/migrate/094_change_projects_homepage_limit.rb
new file mode 100644
index 000000000..98374aa4e
--- /dev/null
+++ b/db/migrate/094_change_projects_homepage_limit.rb
@@ -0,0 +1,9 @@
+class ChangeProjectsHomepageLimit < ActiveRecord::Migration
+  def self.up
+    change_column :projects, :homepage, :string, :limit => nil, :default => ''
+  end
+
+  def self.down
+    change_column :projects, :homepage, :string, :limit => 60, :default => ''
+  end
+end

From d99dc4070a925fabc050ae61c21c64548730a636 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 25 May 2008 15:09:42 +0000
Subject: [PATCH 456/710] Remove edit step from Status context menu (#1197).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1458 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/issues/context_menu.rhtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/issues/context_menu.rhtml b/app/views/issues/context_menu.rhtml
index f42f254e8..04c21ceae 100644
--- a/app/views/issues/context_menu.rhtml
+++ b/app/views/issues/context_menu.rhtml
@@ -6,7 +6,7 @@
 		<a href="#" class="submenu" onclick="return false;"><%= l(:field_status) %></a>
 		<ul>
 		<% @statuses.each do |s| -%>
-		    <li><%= context_menu_link s.name, {:controller => 'issues', :action => 'edit', :id => @issue, :issue => {:status_id => s}},
+		    <li><%= context_menu_link s.name, {:controller => 'issues', :action => 'edit', :id => @issue, :issue => {:status_id => s}, :back_to => @back}, :method => :post,
 		                              :selected => (s == @issue.status), :disabled => !(@can[:update] && @allowed_statuses.include?(s)) %></li>
 		<% end -%>
 		</ul>

From 0c8105277070c20590d22a0d4b8fc1f09ce981d9 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 25 May 2008 17:31:50 +0000
Subject: [PATCH 457/710] Adds a rake task to send reminders. An email is sent
 to each user with a list of the issues due in the next days, if any. See
 @rake -D redmine:send_reminders@ for options.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1459 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/models/mailer.rb                       | 31 +++++++++++++++++
 app/views/mailer/reminder.text.html.rhtml  |  9 +++++
 app/views/mailer/reminder.text.plain.rhtml |  7 ++++
 lang/bg.yml                                |  2 ++
 lang/cs.yml                                |  2 ++
 lang/da.yml                                |  2 ++
 lang/de.yml                                |  2 ++
 lang/en.yml                                |  2 ++
 lang/es.yml                                |  2 ++
 lang/fi.yml                                |  2 ++
 lang/fr.yml                                |  2 ++
 lang/he.yml                                |  2 ++
 lang/hu.yml                                |  2 ++
 lang/it.yml                                |  2 ++
 lang/ja.yml                                |  2 ++
 lang/ko.yml                                |  2 ++
 lang/lt.yml                                |  2 ++
 lang/nl.yml                                |  2 ++
 lang/no.yml                                |  2 ++
 lang/pl.yml                                |  2 ++
 lang/pt-br.yml                             |  2 ++
 lang/pt.yml                                |  2 ++
 lang/ro.yml                                |  2 ++
 lang/ru.yml                                |  2 ++
 lang/sr.yml                                |  2 ++
 lang/sv.yml                                |  2 ++
 lang/th.yml                                |  2 ++
 lang/uk.yml                                |  2 ++
 lang/zh-tw.yml                             |  2 ++
 lang/zh.yml                                |  4 ++-
 lib/tasks/reminder.rake                    | 39 ++++++++++++++++++++++
 test/fixtures/issues.yml                   |  2 +-
 test/unit/mailer_test.rb                   |  9 +++++
 33 files changed, 151 insertions(+), 2 deletions(-)
 create mode 100644 app/views/mailer/reminder.text.html.rhtml
 create mode 100644 app/views/mailer/reminder.text.plain.rhtml
 create mode 100644 lib/tasks/reminder.rake

diff --git a/app/models/mailer.rb b/app/models/mailer.rb
index 6fc879a15..aae374268 100644
--- a/app/models/mailer.rb
+++ b/app/models/mailer.rb
@@ -51,6 +51,15 @@ class Mailer < ActionMailer::Base
          :issue_url => url_for(:controller => 'issues', :action => 'show', :id => issue)
   end
   
+  def reminder(user, issues, days)
+    set_language_if_valid user.language
+    recipients user.mail
+    subject l(:mail_subject_reminder, issues.size)
+    body :issues => issues,
+         :days => days,
+         :issues_url => url_for(:controller => 'issues', :action => 'index', :set_filter => 1, :assigned_to_id => user.id, :sort_key => 'issues.due_date', :sort_order => 'asc')
+  end
+  
   def document_added(document)
     redmine_headers 'Project' => document.project.identifier
     recipients document.project.recipients
@@ -144,6 +153,28 @@ class Mailer < ActionMailer::Base
                     (bcc.nil? || bcc.empty?)
     super
   end
+  
+  # Sends reminders to issue assignees
+  # Available options:
+  # * :days     => how many days in the future to remind about (defaults to 7)
+  # * :tracker  => id of tracker for filtering issues (defaults to all trackers)
+  # * :project  => id or identifier of project to process (defaults to all projects)
+  def self.reminders(options={})
+    days = options[:days] || 7
+    project = options[:project] ? Project.find(options[:project]) : nil
+    tracker = options[:tracker] ? Tracker.find(options[:tracker]) : nil
+    
+    s = ARCondition.new ["#{IssueStatus.table_name}.is_closed = ? AND #{Issue.table_name}.due_date <= ? AND #{Issue.table_name}.assigned_to_id IS NOT NULL", false, days.day.from_now.to_date]
+    s << "#{Issue.table_name}.project_id = #{project.id}" if project
+    s << "#{Issue.table_name}.tracker_id = #{tracker.id}" if tracker
+    
+    issues_by_assignee = Issue.find(:all, :include => [:status, :assigned_to, :project, :tracker],
+                                          :conditions => s.conditions
+                                    ).group_by(&:assigned_to)
+    issues_by_assignee.each do |assignee, issues|
+      deliver_reminder(assignee, issues, days) unless assignee.nil?
+    end
+  end
 
   private
   def initialize_defaults(method_name)
diff --git a/app/views/mailer/reminder.text.html.rhtml b/app/views/mailer/reminder.text.html.rhtml
new file mode 100644
index 000000000..1e33fbe43
--- /dev/null
+++ b/app/views/mailer/reminder.text.html.rhtml
@@ -0,0 +1,9 @@
+<p><%= l(:mail_body_reminder, @issues.size, @days) %></p>
+
+<ul>
+<% @issues.each do |issue| -%>
+    <li><%=h "#{issue.project} - #{issue.tracker} ##{issue.id}: #{issue.subject}" %></li>
+<% end -%>
+</ul>
+
+<p><%= link_to l(:label_issue_view_all), @issues_url %></p>
diff --git a/app/views/mailer/reminder.text.plain.rhtml b/app/views/mailer/reminder.text.plain.rhtml
new file mode 100644
index 000000000..7e6a2e585
--- /dev/null
+++ b/app/views/mailer/reminder.text.plain.rhtml
@@ -0,0 +1,7 @@
+<%= l(:mail_body_reminder, @issues.size, @days) %>:
+
+<% @issues.each do |issue| -%>
+* <%= "#{issue.project} - #{issue.tracker} ##{issue.id}: #{issue.subject}" %>
+<% end -%>
+
+<%= @issues_url %>
diff --git a/lang/bg.yml b/lang/bg.yml
index 224177d94..10198bce9 100644
--- a/lang/bg.yml
+++ b/lang/bg.yml
@@ -619,3 +619,5 @@ error_scm_annotate: "Обектът не съществува или не мож
 label_planning: Планиране
 text_subprojects_destroy_warning: 'Its subproject(s): %s will be also deleted.'
 label_and_its_subprojects: %s and its subprojects
+mail_body_reminder: "%d issue(s) that are assigned to you are due in the next %d days:"
+mail_subject_reminder: "%d issue(s) due in the next days"
diff --git a/lang/cs.yml b/lang/cs.yml
index 2126553fc..f90068b3b 100644
--- a/lang/cs.yml
+++ b/lang/cs.yml
@@ -624,3 +624,5 @@ error_scm_annotate: "Položka neexistuje nebo nemůže být komentována."
 label_planning: Plánování
 text_subprojects_destroy_warning: 'Its subproject(s): %s will be also deleted.'
 label_and_its_subprojects: %s and its subprojects
+mail_body_reminder: "%d issue(s) that are assigned to you are due in the next %d days:"
+mail_subject_reminder: "%d issue(s) due in the next days"
diff --git a/lang/da.yml b/lang/da.yml
index 3b5ca07d3..ca4ddeb46 100644
--- a/lang/da.yml
+++ b/lang/da.yml
@@ -621,3 +621,5 @@ error_scm_annotate: "The entry does not exist or can not be annotated."
 label_planning: Planlægning
 text_subprojects_destroy_warning: 'Its subproject(s): %s will be also deleted.'
 label_and_its_subprojects: %s and its subprojects
+mail_body_reminder: "%d issue(s) that are assigned to you are due in the next %d days:"
+mail_subject_reminder: "%d issue(s) due in the next days"
diff --git a/lang/de.yml b/lang/de.yml
index 273bad277..fa33e1c74 100644
--- a/lang/de.yml
+++ b/lang/de.yml
@@ -620,3 +620,5 @@ enumeration_doc_categories: Dokumentenkategorien
 enumeration_activities: Aktivitäten (Zeiterfassung)
 text_subprojects_destroy_warning: 'Its subproject(s): %s will be also deleted.'
 label_and_its_subprojects: %s and its subprojects
+mail_body_reminder: "%d issue(s) that are assigned to you are due in the next %d days:"
+mail_subject_reminder: "%d issue(s) due in the next days"
diff --git a/lang/en.yml b/lang/en.yml
index 892a63a1b..f9e07d211 100644
--- a/lang/en.yml
+++ b/lang/en.yml
@@ -91,6 +91,8 @@ mail_body_account_information_external: You can use your "%s" account to log in.
 mail_body_account_information: Your account information
 mail_subject_account_activation_request: %s account activation request
 mail_body_account_activation_request: 'A new user (%s) has registered. His account is pending your approval:'
+mail_subject_reminder: "%d issue(s) due in the next days"
+mail_body_reminder: "%d issue(s) that are assigned to you are due in the next %d days:"
 
 gui_validation_error: 1 error
 gui_validation_error_plural: %d errors
diff --git a/lang/es.yml b/lang/es.yml
index 26009d716..3d8c0a931 100644
--- a/lang/es.yml
+++ b/lang/es.yml
@@ -622,3 +622,5 @@ error_scm_annotate: "No existe la entrada o no ha podido ser anotada"
 label_planning: Planificación
 text_subprojects_destroy_warning: 'Sus subprojectos: %s también se eliminarán' 
 label_and_its_subprojects: %s and its subprojects
+mail_body_reminder: "%d issue(s) that are assigned to you are due in the next %d days:"
+mail_subject_reminder: "%d issue(s) due in the next days"
diff --git a/lang/fi.yml b/lang/fi.yml
index 908ef1283..60428bb49 100644
--- a/lang/fi.yml
+++ b/lang/fi.yml
@@ -619,3 +619,5 @@ error_scm_annotate: "Merkintää ei ole tai siihen ei voi lisätä selityksiä."
 label_planning: Suunnittelu
 text_subprojects_destroy_warning: 'Tämän alaprojekti(t): %s tullaan myös poistamaan.'
 label_and_its_subprojects: %s and its subprojects
+mail_body_reminder: "%d issue(s) that are assigned to you are due in the next %d days:"
+mail_subject_reminder: "%d issue(s) due in the next days"
diff --git a/lang/fr.yml b/lang/fr.yml
index 8827edd5e..8b002bbf6 100644
--- a/lang/fr.yml
+++ b/lang/fr.yml
@@ -91,6 +91,8 @@ mail_body_account_information_external: Vous pouvez utiliser votre compte "%s" p
 mail_body_account_information: Paramètres de connexion de votre compte
 mail_subject_account_activation_request: "Demande d'activation d'un compte %s"
 mail_body_account_activation_request: "Un nouvel utilisateur (%s) s'est inscrit. Son compte nécessite votre approbation:"
+mail_subject_reminder: "%d demande(s) arrivent à échéance"
+mail_body_reminder: "%d demande(s) qui vous sont assignées arrivent à échéance dans les %d prochains jours:"
 
 gui_validation_error: 1 erreur
 gui_validation_error_plural: %d erreurs
diff --git a/lang/he.yml b/lang/he.yml
index 71bc5e5b3..f972ef62a 100644
--- a/lang/he.yml
+++ b/lang/he.yml
@@ -619,3 +619,5 @@ error_scm_annotate: "הכניסה לא קיימת או שלא ניתן לתאר
 label_planning: תכנון
 text_subprojects_destroy_warning: 'Its subproject(s): %s will be also deleted.'
 label_and_its_subprojects: %s and its subprojects
+mail_body_reminder: "%d issue(s) that are assigned to you are due in the next %d days:"
+mail_subject_reminder: "%d issue(s) due in the next days"
diff --git a/lang/hu.yml b/lang/hu.yml
index c3feaf16d..f6d312ce0 100644
--- a/lang/hu.yml
+++ b/lang/hu.yml
@@ -620,3 +620,5 @@ default_activity_development: Fejlesztés
 enumeration_issue_priorities: Feladat prioritások
 enumeration_doc_categories: Dokumentum kategóriák
 enumeration_activities: Tevékenységek (idő rögzítés)
+mail_body_reminder: "%d issue(s) that are assigned to you are due in the next %d days:"
+mail_subject_reminder: "%d issue(s) due in the next days"
diff --git a/lang/it.yml b/lang/it.yml
index 1771e1bda..a8646644a 100644
--- a/lang/it.yml
+++ b/lang/it.yml
@@ -619,3 +619,5 @@ error_scm_annotate: "The entry does not exist or can not be annotated."
 label_planning: Planning
 text_subprojects_destroy_warning: 'Its subproject(s): %s will be also deleted.'
 label_and_its_subprojects: %s and its subprojects
+mail_body_reminder: "%d issue(s) that are assigned to you are due in the next %d days:"
+mail_subject_reminder: "%d issue(s) due in the next days"
diff --git a/lang/ja.yml b/lang/ja.yml
index 84f27a2eb..d119cf55e 100644
--- a/lang/ja.yml
+++ b/lang/ja.yml
@@ -620,3 +620,5 @@ error_scm_annotate: "エントリが存在しない、もしくはアノテー
 label_planning: 計画
 text_subprojects_destroy_warning: 'Its subproject(s): %s will be also deleted.'
 label_and_its_subprojects: %s and its subprojects
+mail_body_reminder: "%d issue(s) that are assigned to you are due in the next %d days:"
+mail_subject_reminder: "%d issue(s) due in the next days"
diff --git a/lang/ko.yml b/lang/ko.yml
index ee94c4025..98dde9e06 100644
--- a/lang/ko.yml
+++ b/lang/ko.yml
@@ -619,3 +619,5 @@ error_scm_annotate: "The entry does not exist or can not be annotated."
 label_planning: Planning
 text_subprojects_destroy_warning: 'Its subproject(s): %s will be also deleted.'
 label_and_its_subprojects: %s and its subprojects
+mail_body_reminder: "%d issue(s) that are assigned to you are due in the next %d days:"
+mail_subject_reminder: "%d issue(s) due in the next days"
diff --git a/lang/lt.yml b/lang/lt.yml
index bc2faaa00..6b791d87b 100644
--- a/lang/lt.yml
+++ b/lang/lt.yml
@@ -621,3 +621,5 @@ label_planning: Planavimas
 text_subprojects_destroy_warning: 'Šis(ie) subprojektas(ai): %s taip pat bus ištrintas(i).'
 label_and_its_subprojects: %s projektas ir jo subprojektai
 
+mail_body_reminder: "%d issue(s) that are assigned to you are due in the next %d days:"
+mail_subject_reminder: "%d issue(s) due in the next days"
diff --git a/lang/nl.yml b/lang/nl.yml
index 01755137a..c36eaecd5 100644
--- a/lang/nl.yml
+++ b/lang/nl.yml
@@ -620,3 +620,5 @@ error_scm_annotate: "The entry does not exist or can not be annotated."
 label_planning: Planning
 text_subprojects_destroy_warning: 'Its subproject(s): %s will be also deleted.'
 label_and_its_subprojects: %s and its subprojects
+mail_body_reminder: "%d issue(s) that are assigned to you are due in the next %d days:"
+mail_subject_reminder: "%d issue(s) due in the next days"
diff --git a/lang/no.yml b/lang/no.yml
index 13fcd24f5..5e788dc50 100644
--- a/lang/no.yml
+++ b/lang/no.yml
@@ -620,3 +620,5 @@ default_activity_development: Utvikling
 enumeration_issue_priorities: Sakssprioriteringer
 enumeration_doc_categories: Dokument-kategorier
 enumeration_activities: Aktiviteter (tidssporing)
+mail_body_reminder: "%d issue(s) that are assigned to you are due in the next %d days:"
+mail_subject_reminder: "%d issue(s) due in the next days"
diff --git a/lang/pl.yml b/lang/pl.yml
index c83173ca2..4476c2160 100644
--- a/lang/pl.yml
+++ b/lang/pl.yml
@@ -619,3 +619,5 @@ error_scm_annotate: "Wpis nie istnieje lub nie można do niego dodawać adnotacj
 label_planning: Planning
 text_subprojects_destroy_warning: 'Its subproject(s): %s will be also deleted.'
 label_and_its_subprojects: %s and its subprojects
+mail_body_reminder: "%d issue(s) that are assigned to you are due in the next %d days:"
+mail_subject_reminder: "%d issue(s) due in the next days"
diff --git a/lang/pt-br.yml b/lang/pt-br.yml
index 9714df2ca..9b3d23151 100644
--- a/lang/pt-br.yml
+++ b/lang/pt-br.yml
@@ -619,3 +619,5 @@ label_planning: Planejamento
 text_subprojects_destroy_warning: 'Seu(s) subprojeto(s): %s também serão excluídos.'
 label_age: Age
 label_and_its_subprojects: %s and its subprojects
+mail_body_reminder: "%d issue(s) that are assigned to you are due in the next %d days:"
+mail_subject_reminder: "%d issue(s) due in the next days"
diff --git a/lang/pt.yml b/lang/pt.yml
index 9d0586775..c56b76a0b 100644
--- a/lang/pt.yml
+++ b/lang/pt.yml
@@ -619,3 +619,5 @@ error_scm_annotate: "The entry does not exist or can not be annotated."
 label_planning: Planning
 text_subprojects_destroy_warning: 'Its subproject(s): %s will be also deleted.'
 label_and_its_subprojects: %s and its subprojects
+mail_body_reminder: "%d issue(s) that are assigned to you are due in the next %d days:"
+mail_subject_reminder: "%d issue(s) due in the next days"
diff --git a/lang/ro.yml b/lang/ro.yml
index 01127f5c5..30464569b 100644
--- a/lang/ro.yml
+++ b/lang/ro.yml
@@ -619,3 +619,5 @@ error_scm_annotate: "The entry does not exist or can not be annotated."
 label_planning: Planning
 text_subprojects_destroy_warning: 'Its subproject(s): %s will be also deleted.'
 label_and_its_subprojects: %s and its subprojects
+mail_body_reminder: "%d issue(s) that are assigned to you are due in the next %d days:"
+mail_subject_reminder: "%d issue(s) due in the next days"
diff --git a/lang/ru.yml b/lang/ru.yml
index 4f0a4bb7b..f4fd92037 100644
--- a/lang/ru.yml
+++ b/lang/ru.yml
@@ -623,3 +623,5 @@ error_scm_annotate: "Данные отсутствуют или не могут
 label_planning: Планирование
 text_subprojects_destroy_warning: 'Its subproject(s): %s will be also deleted.'
 label_and_its_subprojects: %s and its subprojects
+mail_body_reminder: "%d issue(s) that are assigned to you are due in the next %d days:"
+mail_subject_reminder: "%d issue(s) due in the next days"
diff --git a/lang/sr.yml b/lang/sr.yml
index 263bd1187..53e4f9f2c 100644
--- a/lang/sr.yml
+++ b/lang/sr.yml
@@ -620,3 +620,5 @@ error_scm_annotate: "The entry does not exist or can not be annotated."
 label_planning: Planning
 text_subprojects_destroy_warning: 'Its subproject(s): %s will be also deleted.'
 label_and_its_subprojects: %s and its subprojects
+mail_body_reminder: "%d issue(s) that are assigned to you are due in the next %d days:"
+mail_subject_reminder: "%d issue(s) due in the next days"
diff --git a/lang/sv.yml b/lang/sv.yml
index 5b0c57acf..248f3dcba 100644
--- a/lang/sv.yml
+++ b/lang/sv.yml
@@ -620,3 +620,5 @@ error_scm_annotate: "The entry does not exist or can not be annotated."
 label_planning: Planning
 text_subprojects_destroy_warning: 'Its subproject(s): %s will be also deleted.'
 label_and_its_subprojects: %s and its subprojects
+mail_body_reminder: "%d issue(s) that are assigned to you are due in the next %d days:"
+mail_subject_reminder: "%d issue(s) due in the next days"
diff --git a/lang/th.yml b/lang/th.yml
index 643ee01c6..444316aa1 100644
--- a/lang/th.yml
+++ b/lang/th.yml
@@ -622,3 +622,5 @@ enumeration_issue_priorities: ความสำคัญของปัญห
 enumeration_doc_categories: ประเภทเอกสาร
 enumeration_activities: กิจกรรม (ใช้ในการติดตามเวลา)
 label_and_its_subprojects: %s and its subprojects
+mail_body_reminder: "%d issue(s) that are assigned to you are due in the next %d days:"
+mail_subject_reminder: "%d issue(s) due in the next days"
diff --git a/lang/uk.yml b/lang/uk.yml
index e61fc5b38..3cc60ef48 100644
--- a/lang/uk.yml
+++ b/lang/uk.yml
@@ -621,3 +621,5 @@ error_scm_annotate: "The entry does not exist or can not be annotated."
 label_planning: Planning
 text_subprojects_destroy_warning: 'Its subproject(s): %s will be also deleted.'
 label_and_its_subprojects: %s and its subprojects
+mail_body_reminder: "%d issue(s) that are assigned to you are due in the next %d days:"
+mail_subject_reminder: "%d issue(s) due in the next days"
diff --git a/lang/zh-tw.yml b/lang/zh-tw.yml
index 1bdc7d715..3926113b2 100644
--- a/lang/zh-tw.yml
+++ b/lang/zh-tw.yml
@@ -620,3 +620,5 @@ default_activity_development: 開發
 enumeration_issue_priorities: 項目優先權
 enumeration_doc_categories: 文件分類
 enumeration_activities: 活動 (時間追蹤)
+mail_body_reminder: "%d issue(s) that are assigned to you are due in the next %d days:"
+mail_subject_reminder: "%d issue(s) due in the next days"
diff --git a/lang/zh.yml b/lang/zh.yml
index ac5eb456d..ffd7cd811 100644
--- a/lang/zh.yml
+++ b/lang/zh.yml
@@ -619,4 +619,6 @@ default_activity_development: 开发
 
 enumeration_issue_priorities: 问题优先级
 enumeration_doc_categories: 文档类别
-enumeration_activities: 活动（时间跟踪）
\ No newline at end of file
+enumeration_activities: 活动（时间跟踪）mail_body_reminder: "%d issue(s) that are assigned to you are due in the next %d days:"
+mail_subject_reminder: "%d issue(s) due in the next days"
+mail_body_reminder: "%d issue(s) that are assigned to you are due in the next %d days:"
diff --git a/lib/tasks/reminder.rake b/lib/tasks/reminder.rake
new file mode 100644
index 000000000..73844fb79
--- /dev/null
+++ b/lib/tasks/reminder.rake
@@ -0,0 +1,39 @@
+# redMine - project management software
+# Copyright (C) 2008  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.
+
+desc <<-END_DESC
+Send reminders about issues due in the next days.
+
+Available options:
+  * days     => number of days to remind about (defaults to 7)
+  * tracker  => id of tracker (defaults to all trackers)
+  * project  => id or identifier of project (defaults to all projects)
+
+Example:
+  rake redmine:send_reminders days=7 RAILS_ENV="production"
+END_DESC
+
+namespace :redmine do
+  task :send_reminders => :environment do
+    options = {}
+    options[:days] = ENV['days'].to_i if ENV['days']
+    options[:project] = ENV['project'] if ENV['project']
+    options[:tracker] = ENV['tracker'].to_i if ENV['tracker']
+    
+    Mailer.reminders(options)
+  end
+end
diff --git a/test/fixtures/issues.yml b/test/fixtures/issues.yml
index c037624ae..9d3287c6f 100644
--- a/test/fixtures/issues.yml
+++ b/test/fixtures/issues.yml
@@ -42,7 +42,7 @@ issues_003:
   category_id: 
   description: Error 281 is encountered when saving a recipe
   tracker_id: 1
-  assigned_to_id: 
+  assigned_to_id: 3
   author_id: 2
   status_id: 1
   start_date: <%= 1.day.from_now.to_date.to_s(:db) %>
diff --git a/test/unit/mailer_test.rb b/test/unit/mailer_test.rb
index 64648b94c..8cf6c1423 100644
--- a/test/unit/mailer_test.rb
+++ b/test/unit/mailer_test.rb
@@ -116,4 +116,13 @@ class MailerTest < Test::Unit::TestCase
       assert Mailer.deliver_register(token)
     end
   end
+  
+  def test_reminders
+    ActionMailer::Base.deliveries.clear
+    Mailer.reminders(:days => 42)
+    assert_equal 1, ActionMailer::Base.deliveries.size
+    mail = ActionMailer::Base.deliveries.last
+    assert mail.bcc.include?('dlopper@somenet.foo')
+    assert mail.body.include?('Bug #3: Error 281 when updating a recipe')
+  end
 end

From b3e5f1a1c39822923160e376e99c05d370429cfd Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 25 May 2008 20:49:07 +0000
Subject: [PATCH 458/710] Fixed zh lang file.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1460 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 lang/zh.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lang/zh.yml b/lang/zh.yml
index ffd7cd811..55516e033 100644
--- a/lang/zh.yml
+++ b/lang/zh.yml
@@ -619,6 +619,6 @@ default_activity_development: 开发
 
 enumeration_issue_priorities: 问题优先级
 enumeration_doc_categories: 文档类别
-enumeration_activities: 活动（时间跟踪）mail_body_reminder: "%d issue(s) that are assigned to you are due in the next %d days:"
+enumeration_activities: 活动（时间跟踪）
 mail_subject_reminder: "%d issue(s) due in the next days"
 mail_body_reminder: "%d issue(s) that are assigned to you are due in the next %d days:"

From d6daeca40ad2aa180ac807875861b987b11ba3eb Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Mon, 26 May 2008 17:12:11 +0000
Subject: [PATCH 459/710] Fixed: IssueController#edit doesn't set default
 Activity as default (#1302).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1461 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/issues_controller.rb       |  1 +
 app/models/time_entry.rb                   |  6 ++++++
 test/fixtures/enumerations.yml             |  5 +++++
 test/functional/timelog_controller_test.rb | 12 +++++++++++-
 4 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index 84b95741e..ca3309c46 100644
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -102,6 +102,7 @@ class IssuesController < ApplicationController
     @edit_allowed = User.current.allowed_to?(:edit_issues, @project)
     @activities = Enumeration::get_values('ACTI')
     @priorities = Enumeration::get_values('IPRI')
+    @time_entry = TimeEntry.new
     respond_to do |format|
       format.html { render :template => 'issues/show.rhtml' }
       format.atom { render :action => 'changes', :layout => false, :content_type => 'application/atom+xml' }
diff --git a/app/models/time_entry.rb b/app/models/time_entry.rb
index ddaff2b60..4bd2d33b8 100644
--- a/app/models/time_entry.rb
+++ b/app/models/time_entry.rb
@@ -29,6 +29,12 @@ class TimeEntry < ActiveRecord::Base
   validates_numericality_of :hours, :allow_nil => true
   validates_length_of :comments, :maximum => 255
 
+  def after_initialize
+    if new_record?
+      self.activity ||= Enumeration.default('ACTI')
+    end
+  end
+  
   def before_validation
     self.project = issue.project if issue && project.nil?
   end
diff --git a/test/fixtures/enumerations.yml b/test/fixtures/enumerations.yml
index c90a997ee..5e2615476 100644
--- a/test/fixtures/enumerations.yml
+++ b/test/fixtures/enumerations.yml
@@ -39,4 +39,9 @@ enumerations_010:
   name: Development
   id: 10
   opt: ACTI
+  is_default: true
+enumerations_011: 
+  name: QA
+  id: 11
+  opt: ACTI
   
\ No newline at end of file
diff --git a/test/functional/timelog_controller_test.rb b/test/functional/timelog_controller_test.rb
index e80a67728..479f4f44f 100644
--- a/test/functional/timelog_controller_test.rb
+++ b/test/functional/timelog_controller_test.rb
@@ -30,7 +30,17 @@ class TimelogControllerTest < Test::Unit::TestCase
     @response   = ActionController::TestResponse.new
   end
   
-  def test_create
+  def test_get_edit
+    @request.session[:user_id] = 3
+    get :edit, :project_id => 1
+    assert_response :success
+    assert_template 'edit'
+    # Default activity selected
+    assert_tag :tag => 'option', :attributes => { :selected => 'selected' },
+                                 :content => 'Development'
+  end
+  
+  def test_post_edit
     @request.session[:user_id] = 3
     post :edit, :project_id => 1,
                 :time_entry => {:comments => 'Some work on TimelogControllerTest',

From 54138d2b1771d31b14aa3007974451888fd3a8c4 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Mon, 26 May 2008 19:12:29 +0000
Subject: [PATCH 460/710] Fixed roadmap links to versions (#1297).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1462 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/projects/roadmap.rhtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/projects/roadmap.rhtml b/app/views/projects/roadmap.rhtml
index ba0bb3ebd..a51b22fa9 100644
--- a/app/views/projects/roadmap.rhtml
+++ b/app/views/projects/roadmap.rhtml
@@ -43,7 +43,7 @@
 
 <h3><%= l(:label_version_plural) %></h3>
 <% @versions.each do |version| %>
-<%= link_to version.name, :anchor => version.name %><br />
+<%= link_to version.name, "##{version.name}" %><br />
 <% end %>
 <% end %>
 

From aa87a73e413070799f450f496ad7a9d57a84a5a0 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Mon, 26 May 2008 19:39:51 +0000
Subject: [PATCH 461/710] No multiline text for textile links.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1463 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 lib/redcloth.rb                              | 2 +-
 lib/redmine/wiki_formatting.rb               | 2 +-
 test/unit/helpers/application_helper_test.rb | 4 +++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/lib/redcloth.rb b/lib/redcloth.rb
index f94c95738..fb6a053c6 100644
--- a/lib/redcloth.rb
+++ b/lib/redcloth.rb
@@ -764,7 +764,7 @@ class RedCloth < String
             ([\s\[{(]|[#{PUNCT}])?     # $pre
             "                          # start
             (#{C})                     # $atts
-            ([^"]+?)                   # $text
+            ([^"\n]+?)                 # $text
             \s?
             (?:\(([^)]+?)\)(?="))?     # $title
             ":
diff --git a/lib/redmine/wiki_formatting.rb b/lib/redmine/wiki_formatting.rb
index 8866e8cde..3c1eac020 100644
--- a/lib/redmine/wiki_formatting.rb
+++ b/lib/redmine/wiki_formatting.rb
@@ -45,7 +45,7 @@ module Redmine
       # 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 
+        text.gsub!( /(.)\n(?!\n|\Z| *([#*=]+(\s|$)|[{|]))/, "\\1<br />\n" ) if hard_breaks 
       end
       
       # Patch to add code highlighting support to RedCloth
diff --git a/test/unit/helpers/application_helper_test.rb b/test/unit/helpers/application_helper_test.rb
index 25559ebc1..ffee28b00 100644
--- a/test/unit/helpers/application_helper_test.rb
+++ b/test/unit/helpers/application_helper_test.rb
@@ -58,7 +58,9 @@ class ApplicationHelperTest < HelperTestCase
     to_test = {
       'This is a "link":http://foo.bar' => 'This is a <a href="http://foo.bar" class="external">link</a>',
       'This is an intern "link":/foo/bar' => 'This is an intern <a href="/foo/bar">link</a>',
-      '"link (Link title)":http://foo.bar' => '<a href="http://foo.bar" title="Link title" class="external">link</a>'
+      '"link (Link title)":http://foo.bar' => '<a href="http://foo.bar" title="Link title" class="external">link</a>',
+      # no multiline link text
+      "This is a double quote \"on the first line\nand another on a second line\":test" => "This is a double quote \"on the first line<br />\nand another on a second line\":test"
     }
     to_test.each { |text, result| assert_equal "<p>#{result}</p>", textilizable(text) }
   end

From 744d8669260b63a94f5cd41c6b79b8396dd47df3 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Mon, 26 May 2008 20:10:32 +0000
Subject: [PATCH 462/710] Moved ProjectsController#list to
 ProjectsController#index.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1464 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/projects_controller.rb         | 7 +------
 app/views/projects/{list.rhtml => index.rhtml} | 0
 test/functional/projects_controller_test.rb    | 8 +-------
 3 files changed, 2 insertions(+), 13 deletions(-)
 rename app/views/projects/{list.rhtml => index.rhtml} (100%)

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 07b29fa25..320def41b 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -44,13 +44,8 @@ class ProjectsController < ApplicationController
   include RepositoriesHelper
   include ProjectsHelper
   
-  def index
-    list
-    render :action => 'list' unless request.xhr?
-  end
-
   # Lists visible projects
-  def list
+  def index
     projects = Project.find :all,
                             :conditions => Project.visible_by(User.current),
                             :include => :parent
diff --git a/app/views/projects/list.rhtml b/app/views/projects/index.rhtml
similarity index 100%
rename from app/views/projects/list.rhtml
rename to app/views/projects/index.rhtml
diff --git a/test/functional/projects_controller_test.rb b/test/functional/projects_controller_test.rb
index 82b5bdeb6..d4ce97dc2 100644
--- a/test/functional/projects_controller_test.rb
+++ b/test/functional/projects_controller_test.rb
@@ -35,13 +35,7 @@ class ProjectsControllerTest < Test::Unit::TestCase
   def test_index
     get :index
     assert_response :success
-    assert_template 'list'
-  end
-
-  def test_list
-    get :list
-    assert_response :success
-    assert_template 'list'
+    assert_template 'index'
     assert_not_nil assigns(:project_tree)
     # Root project as hash key
     assert assigns(:project_tree).has_key?(Project.find(1))

From eb0e218603fb334f3281515f15b23b246c6b351d Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Tue, 27 May 2008 16:49:18 +0000
Subject: [PATCH 463/710] Adds new projects atom feed (#1290).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1465 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/projects_controller.rb | 12 ++++++++++--
 app/views/projects/index.rhtml         |  9 +++++++--
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 320def41b..d15c6bc2a 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -49,8 +49,16 @@ class ProjectsController < ApplicationController
     projects = Project.find :all,
                             :conditions => Project.visible_by(User.current),
                             :include => :parent
-    @project_tree = projects.group_by {|p| p.parent || p}
-    @project_tree.each_key {|p| @project_tree[p] -= [p]}
+    respond_to do |format|
+      format.html { 
+        @project_tree = projects.group_by {|p| p.parent || p}
+        @project_tree.each_key {|p| @project_tree[p] -= [p]} 
+      }
+      format.atom {
+        render_feed(projects.sort_by(&:created_on).reverse.slice(0, Setting.feeds_limit.to_i), 
+                                  :title => "#{Setting.app_title}: #{l(:label_project_latest)}")
+      }
+    end
   end
   
   # Add a new project
diff --git a/app/views/projects/index.rhtml b/app/views/projects/index.rhtml
index b8bb62ebb..e12b05979 100644
--- a/app/views/projects/index.rhtml
+++ b/app/views/projects/index.rhtml
@@ -17,9 +17,14 @@
 <% end %>
 
 <% if User.current.logged? %>
-<div class="contextual">
+<p style="text-align:right;">
 <span class="icon icon-fav"><%= l(:label_my_projects) %></span>
-</div>
+</p>
 <% end %>
 
+<p class="other-formats">
+<%= l(:label_export_to) %>
+<span><%= link_to 'Atom', {:format => 'atom', :key => User.current.rss_key}, :class => 'feed' %></span>
+</p>
+
 <% html_title(l(:label_project_plural)) -%>

From 39216f327c632fd9c2ed74294b0753e610235d68 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Thu, 29 May 2008 17:42:10 +0000
Subject: [PATCH 464/710] Fixed: can not access old projects created with a
 numeric identifier (#1322).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1473 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/models/project.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/models/project.rb b/app/models/project.rb
index e560f1dac..f05ccb2af 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -144,7 +144,8 @@ class Project < ActiveRecord::Base
   end
  
   def to_param
-    identifier
+    # id is used for projects with a numeric identifier (compatibility)
+    @to_param ||= (identifier.to_s =~ %r{^\d*$} ? id : identifier)
   end
   
   def active?

From e1a86106d0c5317d75eef170c1d676f9c3d464f4 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Thu, 29 May 2008 18:48:00 +0000
Subject: [PATCH 465/710] Fixed: GitAdapter#get_rev should use current branch
 instead of hardwiring @master@ (#1319).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1475 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 lib/redmine/scm/adapters/git_adapter.rb | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/lib/redmine/scm/adapters/git_adapter.rb b/lib/redmine/scm/adapters/git_adapter.rb
index a9ab505a8..9dfbd17a8 100644
--- a/lib/redmine/scm/adapters/git_adapter.rb
+++ b/lib/redmine/scm/adapters/git_adapter.rb
@@ -27,9 +27,13 @@ module Redmine
 
         # Get the revision of a particuliar file
         def get_rev (rev,path)
-          cmd="#{GIT_BIN} --git-dir #{target('')} show #{shell_quote rev} -- #{shell_quote path}" if rev!='latest' and (! rev.nil?)
-          cmd="#{GIT_BIN} --git-dir #{target('')} log -1 master -- #{shell_quote path}" if 
-            rev=='latest' or rev.nil?
+        
+          if rev != 'latest' && !rev.nil?
+            cmd="#{GIT_BIN} --git-dir #{target('')} show #{shell_quote rev} -- #{shell_quote path}" 
+          else
+            branch = shellout("#{GIT_BIN} --git-dir #{target('')} branch") { |io| io.grep(/\*/)[0].strip.match(/\* (.*)/)[1] }
+            cmd="#{GIT_BIN} --git-dir #{target('')} log -1 #{branch} -- #{shell_quote path}" 
+          end
           rev=[]
           i=0
           shellout(cmd) do |io|

From 6ebdf848a583add999e9f27a5d1a0bf4009d478d Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Thu, 29 May 2008 19:12:17 +0000
Subject: [PATCH 466/710] Fixed: Unable to use angular braces after include
 word in c code highlighting (#1230).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1476 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 vendor/plugins/coderay-0.7.6.227/lib/coderay/scanners/c.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vendor/plugins/coderay-0.7.6.227/lib/coderay/scanners/c.rb b/vendor/plugins/coderay-0.7.6.227/lib/coderay/scanners/c.rb
index f6d71ade2..e5d87b233 100644
--- a/vendor/plugins/coderay-0.7.6.227/lib/coderay/scanners/c.rb
+++ b/vendor/plugins/coderay-0.7.6.227/lib/coderay/scanners/c.rb
@@ -122,7 +122,7 @@ module Scanners
           end
 
         when :include_expected
-          if scan(/<[^>\n]+>?|"[^"\n\\]*(?:\\.[^"\n\\]*)*"?/)
+          if scan(/[^\n]+/)
             kind = :include
             state = :initial
 

From ffea0446992f91ae45ff3c9d47a89d24d23298a1 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Thu, 29 May 2008 19:31:21 +0000
Subject: [PATCH 467/710] Trac importer: migrate attachments descriptions
 (#1326).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1477 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 lib/tasks/migrate_from_trac.rake | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/lib/tasks/migrate_from_trac.rake b/lib/tasks/migrate_from_trac.rake
index 48a774eef..5341fa14a 100644
--- a/lib/tasks/migrate_from_trac.rake
+++ b/lib/tasks/migrate_from_trac.rake
@@ -126,6 +126,10 @@ namespace :redmine do
           File.open("#{trac_fullpath}", 'rb').read
         end
         
+        def description
+          read_attribute(:description).to_s.slice(0,255)
+        end
+        
       private
         def trac_fullpath
           attachment_type = read_attribute(:type)
@@ -408,6 +412,7 @@ namespace :redmine do
               a.file = attachment
               a.author = find_or_create_user(attachment.author)
               a.container = i
+              a.description = attachment.description
               migrated_ticket_attachments += 1 if a.save
         	end
         	
@@ -456,6 +461,7 @@ namespace :redmine do
               a = Attachment.new :created_on => attachment.time
               a.file = attachment
               a.author = find_or_create_user(attachment.author)
+              a.description = attachment.description
               a.container = p
               migrated_wiki_attachments += 1 if a.save
             end

From 4311ecbc04e3256bd8d7c9a8668dff32349b0159 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Fri, 30 May 2008 15:34:53 +0000
Subject: [PATCH 468/710] Fixed: Incorrect weekend definition in Hebrew
 calendar locale (#1328).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1478 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 public/javascripts/calendar/lang/calendar-he.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/javascripts/calendar/lang/calendar-he.js b/public/javascripts/calendar/lang/calendar-he.js
index bd92e0073..9d4c87db0 100644
--- a/public/javascripts/calendar/lang/calendar-he.js
+++ b/public/javascripts/calendar/lang/calendar-he.js
@@ -113,7 +113,7 @@ Calendar._TT["DAY_FIRST"] = "הצג %s קודם";
 // This may be locale-dependent.  It specifies the week-end days, as an array
 // of comma-separated numbers.  The numbers are from 0 to 6: 0 means Sunday, 1
 // means Monday, etc.
-Calendar._TT["WEEKEND"] = "6,7";
+Calendar._TT["WEEKEND"] = "5,6";
 
 Calendar._TT["CLOSE"] = "סגור";
 Calendar._TT["TODAY"] = "היום";

From 88dea1a06d833067e5a6d9668c4b6829e027a9f5 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Fri, 30 May 2008 16:35:36 +0000
Subject: [PATCH 469/710] Adds multi-levels blockquotes support by using > at
 the beginning of lines. Textile is preserved inside quoted text.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1479 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 lib/redcloth.rb                               |  25 +++++++++++
 lib/redmine/wiki_formatting.rb                |   2 +-
 public/images/jstoolbar/bt_bq.png             | Bin 0 -> 503 bytes
 public/images/jstoolbar/bt_bq_remove.png      | Bin 0 -> 501 bytes
 public/javascripts/jstoolbar/jstoolbar.js     |  33 ++++++++++++++-
 .../jstoolbar/lang/jstoolbar-bg.js            |   2 +
 .../jstoolbar/lang/jstoolbar-cs.js            |   2 +
 .../jstoolbar/lang/jstoolbar-da.js            |   2 +
 .../jstoolbar/lang/jstoolbar-de.js            |   2 +
 .../jstoolbar/lang/jstoolbar-en.js            |   2 +
 .../jstoolbar/lang/jstoolbar-es.js            |   2 +
 .../jstoolbar/lang/jstoolbar-fi.js            |   2 +
 .../jstoolbar/lang/jstoolbar-fr.js            |   2 +
 .../jstoolbar/lang/jstoolbar-he.js            |   2 +
 .../jstoolbar/lang/jstoolbar-hu.js            |   2 +
 .../jstoolbar/lang/jstoolbar-it.js            |   2 +
 .../jstoolbar/lang/jstoolbar-ja.js            |   2 +
 .../jstoolbar/lang/jstoolbar-ko.js            |   2 +
 .../jstoolbar/lang/jstoolbar-lt.js            |   2 +
 .../jstoolbar/lang/jstoolbar-nl.js            |   2 +
 .../jstoolbar/lang/jstoolbar-no.js            |   2 +
 .../jstoolbar/lang/jstoolbar-pl.js            |   2 +
 .../jstoolbar/lang/jstoolbar-pt-br.js         |   2 +
 .../jstoolbar/lang/jstoolbar-pt.js            |   2 +
 .../jstoolbar/lang/jstoolbar-ro.js            |   2 +
 .../jstoolbar/lang/jstoolbar-ru.js            |   2 +
 .../jstoolbar/lang/jstoolbar-sr.js            |   2 +
 .../jstoolbar/lang/jstoolbar-sv.js            |   2 +
 .../jstoolbar/lang/jstoolbar-th.js            |   2 +
 .../jstoolbar/lang/jstoolbar-uk.js            |   2 +
 .../jstoolbar/lang/jstoolbar-zh-tw.js         |   2 +
 .../jstoolbar/lang/jstoolbar-zh.js            |   2 +
 public/stylesheets/application.css            |   2 +
 public/stylesheets/jstoolbar.css              |   6 +++
 test/unit/helpers/application_helper_test.rb  |  40 ++++++++++++++++++
 35 files changed, 160 insertions(+), 2 deletions(-)
 create mode 100644 public/images/jstoolbar/bt_bq.png
 create mode 100644 public/images/jstoolbar/bt_bq_remove.png

diff --git a/lib/redcloth.rb b/lib/redcloth.rb
index fb6a053c6..344fd6c78 100644
--- a/lib/redcloth.rb
+++ b/lib/redcloth.rb
@@ -299,6 +299,8 @@ class RedCloth < String
         hard_break text 
         unless @lite_mode
             refs text
+            # need to do this before text is split by #blocks
+            block_textile_quotes text
             blocks text
         end
         inline text
@@ -576,6 +578,29 @@ class RedCloth < String
             lines.join( "\n" )
         end
     end
+    
+    QUOTES_RE = /(^>+([^\n]*?)\n?)+/m
+    QUOTES_CONTENT_RE = /^([> ]+)(.*)$/m
+    
+    def block_textile_quotes( text )
+      text.gsub!( QUOTES_RE ) do |match|
+        lines = match.split( /\n/ )
+        quotes = ''
+        indent = 0
+        lines.each do |line|
+          line =~ QUOTES_CONTENT_RE 
+          bq,content = $1, $2
+          l = bq.count('>')
+          if l != indent
+            quotes << ("\n\n" + (l>indent ? '<blockquote>' * (l-indent) : '</blockquote>' * (indent-l)) + "\n\n")
+            indent = l
+          end
+          quotes << (content + "\n")
+        end
+        quotes << ("\n" + '</blockquote>' * indent + "\n\n")
+        quotes
+      end
+    end
 
     CODE_RE = /(\W)
         @
diff --git a/lib/redmine/wiki_formatting.rb b/lib/redmine/wiki_formatting.rb
index 3c1eac020..7197af2c3 100644
--- a/lib/redmine/wiki_formatting.rb
+++ b/lib/redmine/wiki_formatting.rb
@@ -45,7 +45,7 @@ module Redmine
       # 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 />\n" ) if hard_breaks 
+        text.gsub!( /(.)\n(?!\n|\Z|>| *(>? *[#*=]+(\s|$)|[{|]))/, "\\1<br />\n" ) if hard_breaks 
       end
       
       # Patch to add code highlighting support to RedCloth
diff --git a/public/images/jstoolbar/bt_bq.png b/public/images/jstoolbar/bt_bq.png
new file mode 100644
index 0000000000000000000000000000000000000000..c3af4e07f65847c109006a911359565dd88f7a12
GIT binary patch
literal 503
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbL!Zi#C|iE~kEVo7Fxo<c}wZYo1r
zYM!2gv4KKvVy1$Tfq{jBp@o%!k(Gg|g0_L7fq_k6dOuJjdx@v7EBg&rIRO@4pOnV$
zKq1ZokH}&M25un`X1sK_?hjCqCEd~2k%3`jKlh(RRv`aafKQ0)|NsB3t*uQ=O!V~h
zG&D4nm6c^>WhEpegoTCq`T0FPJ)NDMZEbDM&CLxB4YjqkRaI5x<>jTMq(ntU1qB6p
zczCK-zqGTnv#_u*GBVQ9(NR)TYTocVf8pc1&%P%nCdS0XgoT9#1_t{0_;`4DG;Mr7
zZO_||%`eK9KEC(t`;=X88`eL6@bX7+aImkhualFLjg5_&nVErs!R&n>3JMCcv$NCE
z(!#^TgMxxeOG}H3i}UmI)6>(Fl9FO$V<RFW+}+(B9UVO`)an6!#8?vK7tG-B>_!@p
zljrH;7*cU7IYEIbA}VtBtsA#)M!&GMcodMtb3|=f+9$4OVgii1xw34rwxYGn&dLJe
zp`pI9&cd$UJ!@o|_cSe<w28~y#et{esH)1+h$S~SL?1eO_VDTB`U)B<I!ax!tjfa1
j+}hIC?COU14zV$;`N}zK<{d3Qpv?@Pu6{1-oD!M<t4W`e

literal 0
HcmV?d00001

diff --git a/public/images/jstoolbar/bt_bq_remove.png b/public/images/jstoolbar/bt_bq_remove.png
new file mode 100644
index 0000000000000000000000000000000000000000..05d5ff7c718620387b8cbb3d94d6eee881b24ddd
GIT binary patch
literal 501
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbL!Zi#C|iE~kEVo7Fxo<c}wZYo1r
zYM!2gv4KKvVy1$Tfq{jBp@o%!iItI=g0_L7fq_#Kmj+NHdx@v7EBg&rIRRFo8|8bQ
zfkK=G9+AZi4BSE>%y{W;-5;PJOS+@4BLl<6e(pbstU&(Z0G|-o|NsA6TU(o$nCR*0
zX=rFDD=W*&%1TH`2n!4I^YeRpdOABh+uGWio0}UN8ft56tE#HX%gakiNr{Sz3JMDH
z@bHwZcxh*6XJKJsWMrhHqobsx^x)->qGgY3*S<<jOpJ+%2@4Ag3=H(~@$vBRc=Y;b
z%f{z@+h0!D@uqOe<413Pwr+YE931TH>+9s?WMgAvW@ct!U@(2phk}BF?Ck8cw6yT>
z@Svce($do6;^O@L{Pgtnq@<+S*w~1O2zPgPM@Pp~?MEws-eD{W@(X5gcy=QV$jSF~
zaSW-rm7Ji!77-COGvfA*TQgtZvVIVd#B$`A+OkhvY0nhaP20vc;mXC(i<iv}ST==R
zy<%!&I??pRiBpW8m8`C+siJuu6C?z>y*<1(dTdVI-qJn0eR_YqLx4wwi^y&+H?=ge
iFtai~zeRsqIT<EJb2c&lzrPr0HG`+CpUXO@geCxcO{8W3

literal 0
HcmV?d00001

diff --git a/public/javascripts/jstoolbar/jstoolbar.js b/public/javascripts/jstoolbar/jstoolbar.js
index be982d4b9..64c460217 100644
--- a/public/javascripts/jstoolbar/jstoolbar.js
+++ b/public/javascripts/jstoolbar/jstoolbar.js
@@ -498,6 +498,37 @@ jsToolBar.prototype.elements.ol = {
 	}
 }
 
+// spacer
+jsToolBar.prototype.elements.space3 = {type: 'space'}
+
+// bq
+jsToolBar.prototype.elements.bq = {
+	type: 'button',
+	title: 'Quote',
+	fn: {
+		wiki: function() {
+			this.encloseLineSelection('','',function(str) {
+				str = str.replace(/\r/g,'');
+				return str.replace(/(\n|^) *([^\n]*)/g,"$1> $2");
+			});
+		}
+	}
+}
+
+// unbq
+jsToolBar.prototype.elements.unbq = {
+	type: 'button',
+	title: 'Unquote',
+	fn: {
+		wiki: function() {
+			this.encloseLineSelection('','',function(str) {
+				str = str.replace(/\r/g,'');
+				return str.replace(/(\n|^) *[>]? *([^\n]*)/g,"$1$2");
+			});
+		}
+	}
+}
+
 // pre
 jsToolBar.prototype.elements.pre = {
 	type: 'button',
@@ -508,7 +539,7 @@ jsToolBar.prototype.elements.pre = {
 }
 
 // spacer
-jsToolBar.prototype.elements.space3 = {type: 'space'}
+jsToolBar.prototype.elements.space4 = {type: 'space'}
 
 // wiki page
 jsToolBar.prototype.elements.link = {
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-bg.js b/public/javascripts/jstoolbar/lang/jstoolbar-bg.js
index cd36a4b55..2d68498f9 100644
--- a/public/javascripts/jstoolbar/lang/jstoolbar-bg.js
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-bg.js
@@ -9,6 +9,8 @@ jsToolBar.strings['Heading 2'] = 'Heading 2';
 jsToolBar.strings['Heading 3'] = 'Heading 3';
 jsToolBar.strings['Unordered list'] = 'Unordered list';
 jsToolBar.strings['Ordered list'] = 'Ordered list';
+jsToolBar.strings['Quote'] = 'Quote';
+jsToolBar.strings['Unquote'] = 'Remove Quote';
 jsToolBar.strings['Preformatted text'] = 'Preformatted text';
 jsToolBar.strings['Wiki link'] = 'Link to a Wiki page';
 jsToolBar.strings['Image'] = 'Image';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-cs.js b/public/javascripts/jstoolbar/lang/jstoolbar-cs.js
index 8a59a8162..f2c0dbff5 100644
--- a/public/javascripts/jstoolbar/lang/jstoolbar-cs.js
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-cs.js
@@ -9,6 +9,8 @@ jsToolBar.strings['Heading 2'] = 'Záhlaví 2';
 jsToolBar.strings['Heading 3'] = 'Záhlaví 3';
 jsToolBar.strings['Unordered list'] = 'Seznam';
 jsToolBar.strings['Ordered list'] = 'Uspořádaný seznam';
+jsToolBar.strings['Quote'] = 'Quote';
+jsToolBar.strings['Unquote'] = 'Remove Quote';
 jsToolBar.strings['Preformatted text'] = 'Předformátovaný text';
 jsToolBar.strings['Wiki link'] = 'Vložit odkaz na Wiki stránku';
 jsToolBar.strings['Image'] = 'Vložit obrázek';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-da.js b/public/javascripts/jstoolbar/lang/jstoolbar-da.js
index 9996acaf3..6ccc8ead2 100644
--- a/public/javascripts/jstoolbar/lang/jstoolbar-da.js
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-da.js
@@ -9,6 +9,8 @@ jsToolBar.strings['Heading 2'] = 'Overskrift 2';
 jsToolBar.strings['Heading 3'] = 'Overskrift 3';
 jsToolBar.strings['Unordered list'] = 'Unummereret list';
 jsToolBar.strings['Ordered list'] = 'Nummereret list';
+jsToolBar.strings['Quote'] = 'Quote';
+jsToolBar.strings['Unquote'] = 'Remove Quote';
 jsToolBar.strings['Preformatted text'] = 'Preformatteret tekst';
 jsToolBar.strings['Wiki link'] = 'Link til en Wiki side';
 jsToolBar.strings['Image'] = 'Billede';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-de.js b/public/javascripts/jstoolbar/lang/jstoolbar-de.js
index e2ba3fc1c..ce686860f 100644
--- a/public/javascripts/jstoolbar/lang/jstoolbar-de.js
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-de.js
@@ -9,6 +9,8 @@ jsToolBar.strings['Heading 2'] = 'Überschrift 2. Ordnung';
 jsToolBar.strings['Heading 3'] = 'Überschrift 3. Ordnung';
 jsToolBar.strings['Unordered list'] = 'Aufzählungsliste';
 jsToolBar.strings['Ordered list'] = 'Nummerierte Liste';
+jsToolBar.strings['Quote'] = 'Quote';
+jsToolBar.strings['Unquote'] = 'Remove Quote';
 jsToolBar.strings['Preformatted text'] = 'Präformatierter Text';
 jsToolBar.strings['Wiki link'] = 'Verweis (Link) zu einer Wiki-Seite';
 jsToolBar.strings['Image'] = 'Grafik';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-en.js b/public/javascripts/jstoolbar/lang/jstoolbar-en.js
index cd36a4b55..2d68498f9 100644
--- a/public/javascripts/jstoolbar/lang/jstoolbar-en.js
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-en.js
@@ -9,6 +9,8 @@ jsToolBar.strings['Heading 2'] = 'Heading 2';
 jsToolBar.strings['Heading 3'] = 'Heading 3';
 jsToolBar.strings['Unordered list'] = 'Unordered list';
 jsToolBar.strings['Ordered list'] = 'Ordered list';
+jsToolBar.strings['Quote'] = 'Quote';
+jsToolBar.strings['Unquote'] = 'Remove Quote';
 jsToolBar.strings['Preformatted text'] = 'Preformatted text';
 jsToolBar.strings['Wiki link'] = 'Link to a Wiki page';
 jsToolBar.strings['Image'] = 'Image';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-es.js b/public/javascripts/jstoolbar/lang/jstoolbar-es.js
index cd36a4b55..2d68498f9 100644
--- a/public/javascripts/jstoolbar/lang/jstoolbar-es.js
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-es.js
@@ -9,6 +9,8 @@ jsToolBar.strings['Heading 2'] = 'Heading 2';
 jsToolBar.strings['Heading 3'] = 'Heading 3';
 jsToolBar.strings['Unordered list'] = 'Unordered list';
 jsToolBar.strings['Ordered list'] = 'Ordered list';
+jsToolBar.strings['Quote'] = 'Quote';
+jsToolBar.strings['Unquote'] = 'Remove Quote';
 jsToolBar.strings['Preformatted text'] = 'Preformatted text';
 jsToolBar.strings['Wiki link'] = 'Link to a Wiki page';
 jsToolBar.strings['Image'] = 'Image';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-fi.js b/public/javascripts/jstoolbar/lang/jstoolbar-fi.js
index 357d25951..c2229b281 100644
--- a/public/javascripts/jstoolbar/lang/jstoolbar-fi.js
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-fi.js
@@ -9,6 +9,8 @@ jsToolBar.strings['Heading 2'] = 'Otsikko 2';
 jsToolBar.strings['Heading 3'] = 'Otsikko 3';
 jsToolBar.strings['Unordered list'] = 'Järjestämätön lista';
 jsToolBar.strings['Ordered list'] = 'Järjestetty lista';
+jsToolBar.strings['Quote'] = 'Quote';
+jsToolBar.strings['Unquote'] = 'Remove Quote';
 jsToolBar.strings['Preformatted text'] = 'Ennaltamuotoiltu teksti';
 jsToolBar.strings['Wiki link'] = 'Linkki Wiki sivulle';
 jsToolBar.strings['Image'] = 'Kuva';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-fr.js b/public/javascripts/jstoolbar/lang/jstoolbar-fr.js
index 3cbc67863..c52a783bc 100644
--- a/public/javascripts/jstoolbar/lang/jstoolbar-fr.js
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-fr.js
@@ -9,6 +9,8 @@ jsToolBar.strings['Heading 2'] = 'Titre niveau 2';
 jsToolBar.strings['Heading 3'] = 'Titre niveau 3';
 jsToolBar.strings['Unordered list'] = 'Liste à puces';
 jsToolBar.strings['Ordered list'] = 'Liste numérotée';
+jsToolBar.strings['Quote'] = 'Citer';
+jsToolBar.strings['Unquote'] = 'Supprimer citation';
 jsToolBar.strings['Preformatted text'] = 'Texte préformaté';
 jsToolBar.strings['Wiki link'] = 'Lien vers une page Wiki';
 jsToolBar.strings['Image'] = 'Image';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-he.js b/public/javascripts/jstoolbar/lang/jstoolbar-he.js
index cd36a4b55..2d68498f9 100644
--- a/public/javascripts/jstoolbar/lang/jstoolbar-he.js
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-he.js
@@ -9,6 +9,8 @@ jsToolBar.strings['Heading 2'] = 'Heading 2';
 jsToolBar.strings['Heading 3'] = 'Heading 3';
 jsToolBar.strings['Unordered list'] = 'Unordered list';
 jsToolBar.strings['Ordered list'] = 'Ordered list';
+jsToolBar.strings['Quote'] = 'Quote';
+jsToolBar.strings['Unquote'] = 'Remove Quote';
 jsToolBar.strings['Preformatted text'] = 'Preformatted text';
 jsToolBar.strings['Wiki link'] = 'Link to a Wiki page';
 jsToolBar.strings['Image'] = 'Image';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-hu.js b/public/javascripts/jstoolbar/lang/jstoolbar-hu.js
index e586a123b..c31ba00c0 100644
--- a/public/javascripts/jstoolbar/lang/jstoolbar-hu.js
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-hu.js
@@ -9,6 +9,8 @@ jsToolBar.strings['Heading 2'] = 'Fejléc 2';
 jsToolBar.strings['Heading 3'] = 'Fejléc 3';
 jsToolBar.strings['Unordered list'] = 'Felsorolás';
 jsToolBar.strings['Ordered list'] = 'Számozott lista';
+jsToolBar.strings['Quote'] = 'Quote';
+jsToolBar.strings['Unquote'] = 'Remove Quote';
 jsToolBar.strings['Preformatted text'] = 'Előreformázott szöveg';
 jsToolBar.strings['Wiki link'] = 'Link egy Wiki oldalra';
 jsToolBar.strings['Image'] = 'Kép';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-it.js b/public/javascripts/jstoolbar/lang/jstoolbar-it.js
index cd36a4b55..2d68498f9 100644
--- a/public/javascripts/jstoolbar/lang/jstoolbar-it.js
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-it.js
@@ -9,6 +9,8 @@ jsToolBar.strings['Heading 2'] = 'Heading 2';
 jsToolBar.strings['Heading 3'] = 'Heading 3';
 jsToolBar.strings['Unordered list'] = 'Unordered list';
 jsToolBar.strings['Ordered list'] = 'Ordered list';
+jsToolBar.strings['Quote'] = 'Quote';
+jsToolBar.strings['Unquote'] = 'Remove Quote';
 jsToolBar.strings['Preformatted text'] = 'Preformatted text';
 jsToolBar.strings['Wiki link'] = 'Link to a Wiki page';
 jsToolBar.strings['Image'] = 'Image';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-ja.js b/public/javascripts/jstoolbar/lang/jstoolbar-ja.js
index fc4d987de..c9413dac2 100644
--- a/public/javascripts/jstoolbar/lang/jstoolbar-ja.js
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-ja.js
@@ -9,6 +9,8 @@ jsToolBar.strings['Heading 2'] = '見出し 2';
 jsToolBar.strings['Heading 3'] = '見出し 3';
 jsToolBar.strings['Unordered list'] = '順不同リスト';
 jsToolBar.strings['Ordered list'] = '番号つきリスト';
+jsToolBar.strings['Quote'] = 'Quote';
+jsToolBar.strings['Unquote'] = 'Remove Quote';
 jsToolBar.strings['Preformatted text'] = '整形済みテキスト';
 jsToolBar.strings['Wiki link'] = 'Wiki ページへのリンク';
 jsToolBar.strings['Image'] = '画像';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-ko.js b/public/javascripts/jstoolbar/lang/jstoolbar-ko.js
index cd36a4b55..2d68498f9 100644
--- a/public/javascripts/jstoolbar/lang/jstoolbar-ko.js
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-ko.js
@@ -9,6 +9,8 @@ jsToolBar.strings['Heading 2'] = 'Heading 2';
 jsToolBar.strings['Heading 3'] = 'Heading 3';
 jsToolBar.strings['Unordered list'] = 'Unordered list';
 jsToolBar.strings['Ordered list'] = 'Ordered list';
+jsToolBar.strings['Quote'] = 'Quote';
+jsToolBar.strings['Unquote'] = 'Remove Quote';
 jsToolBar.strings['Preformatted text'] = 'Preformatted text';
 jsToolBar.strings['Wiki link'] = 'Link to a Wiki page';
 jsToolBar.strings['Image'] = 'Image';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-lt.js b/public/javascripts/jstoolbar/lang/jstoolbar-lt.js
index f0a7c5d90..8af364c8d 100644
--- a/public/javascripts/jstoolbar/lang/jstoolbar-lt.js
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-lt.js
@@ -9,6 +9,8 @@ jsToolBar.strings['Heading 2'] = 'Heading 2';
 jsToolBar.strings['Heading 3'] = 'Heading 3';
 jsToolBar.strings['Unordered list'] = 'Nenumeruotas sąrašas';
 jsToolBar.strings['Ordered list'] = 'Numeruotas sąrašas';
+jsToolBar.strings['Quote'] = 'Quote';
+jsToolBar.strings['Unquote'] = 'Remove Quote';
 jsToolBar.strings['Preformatted text'] = 'Preformatuotas tekstas';
 jsToolBar.strings['Wiki link'] = 'Nuoroda į Wiki puslapį';
 jsToolBar.strings['Image'] = 'Paveikslas';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-nl.js b/public/javascripts/jstoolbar/lang/jstoolbar-nl.js
index cd36a4b55..2d68498f9 100644
--- a/public/javascripts/jstoolbar/lang/jstoolbar-nl.js
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-nl.js
@@ -9,6 +9,8 @@ jsToolBar.strings['Heading 2'] = 'Heading 2';
 jsToolBar.strings['Heading 3'] = 'Heading 3';
 jsToolBar.strings['Unordered list'] = 'Unordered list';
 jsToolBar.strings['Ordered list'] = 'Ordered list';
+jsToolBar.strings['Quote'] = 'Quote';
+jsToolBar.strings['Unquote'] = 'Remove Quote';
 jsToolBar.strings['Preformatted text'] = 'Preformatted text';
 jsToolBar.strings['Wiki link'] = 'Link to a Wiki page';
 jsToolBar.strings['Image'] = 'Image';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-no.js b/public/javascripts/jstoolbar/lang/jstoolbar-no.js
index cf6e19ff9..2fb098a9d 100644
--- a/public/javascripts/jstoolbar/lang/jstoolbar-no.js
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-no.js
@@ -9,6 +9,8 @@ jsToolBar.strings['Heading 2'] = 'Overskrift 2';
 jsToolBar.strings['Heading 3'] = 'Overskrift 3';
 jsToolBar.strings['Unordered list'] = 'Punktliste';
 jsToolBar.strings['Ordered list'] = 'Nummerert liste';
+jsToolBar.strings['Quote'] = 'Quote';
+jsToolBar.strings['Unquote'] = 'Remove Quote';
 jsToolBar.strings['Preformatted text'] = 'Preformatert tekst';
 jsToolBar.strings['Wiki link'] = 'Lenke til Wiki-side';
 jsToolBar.strings['Image'] = 'Bilde';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-pl.js b/public/javascripts/jstoolbar/lang/jstoolbar-pl.js
index cd36a4b55..2d68498f9 100644
--- a/public/javascripts/jstoolbar/lang/jstoolbar-pl.js
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-pl.js
@@ -9,6 +9,8 @@ jsToolBar.strings['Heading 2'] = 'Heading 2';
 jsToolBar.strings['Heading 3'] = 'Heading 3';
 jsToolBar.strings['Unordered list'] = 'Unordered list';
 jsToolBar.strings['Ordered list'] = 'Ordered list';
+jsToolBar.strings['Quote'] = 'Quote';
+jsToolBar.strings['Unquote'] = 'Remove Quote';
 jsToolBar.strings['Preformatted text'] = 'Preformatted text';
 jsToolBar.strings['Wiki link'] = 'Link to a Wiki page';
 jsToolBar.strings['Image'] = 'Image';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-pt-br.js b/public/javascripts/jstoolbar/lang/jstoolbar-pt-br.js
index 8fc58ba67..5035524ab 100644
--- a/public/javascripts/jstoolbar/lang/jstoolbar-pt-br.js
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-pt-br.js
@@ -11,6 +11,8 @@ jsToolBar.strings['Heading 2'] = 'Cabeçalho 2';
 jsToolBar.strings['Heading 3'] = 'Cabeçalho 3';
 jsToolBar.strings['Unordered list'] = 'Lista não ordenada';
 jsToolBar.strings['Ordered list'] = 'Lista ordenada';
+jsToolBar.strings['Quote'] = 'Quote';
+jsToolBar.strings['Unquote'] = 'Remove Quote';
 jsToolBar.strings['Preformatted text'] = 'Texto pré-formatado';
 jsToolBar.strings['Wiki link'] = 'Link para uma página Wiki';
 jsToolBar.strings['Image'] = 'Imagem';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-pt.js b/public/javascripts/jstoolbar/lang/jstoolbar-pt.js
index cd36a4b55..2d68498f9 100644
--- a/public/javascripts/jstoolbar/lang/jstoolbar-pt.js
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-pt.js
@@ -9,6 +9,8 @@ jsToolBar.strings['Heading 2'] = 'Heading 2';
 jsToolBar.strings['Heading 3'] = 'Heading 3';
 jsToolBar.strings['Unordered list'] = 'Unordered list';
 jsToolBar.strings['Ordered list'] = 'Ordered list';
+jsToolBar.strings['Quote'] = 'Quote';
+jsToolBar.strings['Unquote'] = 'Remove Quote';
 jsToolBar.strings['Preformatted text'] = 'Preformatted text';
 jsToolBar.strings['Wiki link'] = 'Link to a Wiki page';
 jsToolBar.strings['Image'] = 'Image';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-ro.js b/public/javascripts/jstoolbar/lang/jstoolbar-ro.js
index cd36a4b55..2d68498f9 100644
--- a/public/javascripts/jstoolbar/lang/jstoolbar-ro.js
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-ro.js
@@ -9,6 +9,8 @@ jsToolBar.strings['Heading 2'] = 'Heading 2';
 jsToolBar.strings['Heading 3'] = 'Heading 3';
 jsToolBar.strings['Unordered list'] = 'Unordered list';
 jsToolBar.strings['Ordered list'] = 'Ordered list';
+jsToolBar.strings['Quote'] = 'Quote';
+jsToolBar.strings['Unquote'] = 'Remove Quote';
 jsToolBar.strings['Preformatted text'] = 'Preformatted text';
 jsToolBar.strings['Wiki link'] = 'Link to a Wiki page';
 jsToolBar.strings['Image'] = 'Image';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-ru.js b/public/javascripts/jstoolbar/lang/jstoolbar-ru.js
index 6370a3e2d..a6d8c4fad 100644
--- a/public/javascripts/jstoolbar/lang/jstoolbar-ru.js
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-ru.js
@@ -9,6 +9,8 @@ jsToolBar.strings['Heading 2'] = 'Заголовок 2';
 jsToolBar.strings['Heading 3'] = 'Заголовок 3';
 jsToolBar.strings['Unordered list'] = 'Маркированный список';
 jsToolBar.strings['Ordered list'] = 'Нумерованный список';
+jsToolBar.strings['Quote'] = 'Quote';
+jsToolBar.strings['Unquote'] = 'Remove Quote';
 jsToolBar.strings['Preformatted text'] = 'Заранее форматированный текст';
 jsToolBar.strings['Wiki link'] = 'Ссылка на страницу в Wiki';
 jsToolBar.strings['Image'] = 'Вставка изображения';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-sr.js b/public/javascripts/jstoolbar/lang/jstoolbar-sr.js
index cd36a4b55..2d68498f9 100644
--- a/public/javascripts/jstoolbar/lang/jstoolbar-sr.js
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-sr.js
@@ -9,6 +9,8 @@ jsToolBar.strings['Heading 2'] = 'Heading 2';
 jsToolBar.strings['Heading 3'] = 'Heading 3';
 jsToolBar.strings['Unordered list'] = 'Unordered list';
 jsToolBar.strings['Ordered list'] = 'Ordered list';
+jsToolBar.strings['Quote'] = 'Quote';
+jsToolBar.strings['Unquote'] = 'Remove Quote';
 jsToolBar.strings['Preformatted text'] = 'Preformatted text';
 jsToolBar.strings['Wiki link'] = 'Link to a Wiki page';
 jsToolBar.strings['Image'] = 'Image';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-sv.js b/public/javascripts/jstoolbar/lang/jstoolbar-sv.js
index cd36a4b55..2d68498f9 100644
--- a/public/javascripts/jstoolbar/lang/jstoolbar-sv.js
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-sv.js
@@ -9,6 +9,8 @@ jsToolBar.strings['Heading 2'] = 'Heading 2';
 jsToolBar.strings['Heading 3'] = 'Heading 3';
 jsToolBar.strings['Unordered list'] = 'Unordered list';
 jsToolBar.strings['Ordered list'] = 'Ordered list';
+jsToolBar.strings['Quote'] = 'Quote';
+jsToolBar.strings['Unquote'] = 'Remove Quote';
 jsToolBar.strings['Preformatted text'] = 'Preformatted text';
 jsToolBar.strings['Wiki link'] = 'Link to a Wiki page';
 jsToolBar.strings['Image'] = 'Image';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-th.js b/public/javascripts/jstoolbar/lang/jstoolbar-th.js
index 2e2f2b88e..d87164226 100644
--- a/public/javascripts/jstoolbar/lang/jstoolbar-th.js
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-th.js
@@ -9,6 +9,8 @@ jsToolBar.strings['Heading 2'] = 'หัวข้อ 2';
 jsToolBar.strings['Heading 3'] = 'หัวข้อ 3';
 jsToolBar.strings['Unordered list'] = 'รายการ';
 jsToolBar.strings['Ordered list'] = 'ลำดับเลข';
+jsToolBar.strings['Quote'] = 'Quote';
+jsToolBar.strings['Unquote'] = 'Remove Quote';
 jsToolBar.strings['Preformatted text'] = 'รูปแบบข้อความคงที่';
 jsToolBar.strings['Wiki link'] = 'เชื่อมโยงไปหน้า Wiki อื่น';
 jsToolBar.strings['Image'] = 'รูปภาพ';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-uk.js b/public/javascripts/jstoolbar/lang/jstoolbar-uk.js
index cd36a4b55..2d68498f9 100644
--- a/public/javascripts/jstoolbar/lang/jstoolbar-uk.js
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-uk.js
@@ -9,6 +9,8 @@ jsToolBar.strings['Heading 2'] = 'Heading 2';
 jsToolBar.strings['Heading 3'] = 'Heading 3';
 jsToolBar.strings['Unordered list'] = 'Unordered list';
 jsToolBar.strings['Ordered list'] = 'Ordered list';
+jsToolBar.strings['Quote'] = 'Quote';
+jsToolBar.strings['Unquote'] = 'Remove Quote';
 jsToolBar.strings['Preformatted text'] = 'Preformatted text';
 jsToolBar.strings['Wiki link'] = 'Link to a Wiki page';
 jsToolBar.strings['Image'] = 'Image';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-zh-tw.js b/public/javascripts/jstoolbar/lang/jstoolbar-zh-tw.js
index 1e46e2470..a87ad3442 100644
--- a/public/javascripts/jstoolbar/lang/jstoolbar-zh-tw.js
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-zh-tw.js
@@ -9,6 +9,8 @@ jsToolBar.strings['Heading 2'] = '標題 2';
 jsToolBar.strings['Heading 3'] = '標題 3';
 jsToolBar.strings['Unordered list'] = '項目清單';
 jsToolBar.strings['Ordered list'] = '編號清單';
+jsToolBar.strings['Quote'] = 'Quote';
+jsToolBar.strings['Unquote'] = 'Remove Quote';
 jsToolBar.strings['Preformatted text'] = '格式化文字';
 jsToolBar.strings['Wiki link'] = '連結至 Wiki 頁面';
 jsToolBar.strings['Image'] = '圖片';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-zh.js b/public/javascripts/jstoolbar/lang/jstoolbar-zh.js
index cd36a4b55..2d68498f9 100644
--- a/public/javascripts/jstoolbar/lang/jstoolbar-zh.js
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-zh.js
@@ -9,6 +9,8 @@ jsToolBar.strings['Heading 2'] = 'Heading 2';
 jsToolBar.strings['Heading 3'] = 'Heading 3';
 jsToolBar.strings['Unordered list'] = 'Unordered list';
 jsToolBar.strings['Ordered list'] = 'Ordered list';
+jsToolBar.strings['Quote'] = 'Quote';
+jsToolBar.strings['Unquote'] = 'Remove Quote';
 jsToolBar.strings['Preformatted text'] = 'Preformatted text';
 jsToolBar.strings['Wiki link'] = 'Link to a Wiki page';
 jsToolBar.strings['Image'] = 'Image';
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 4ae1c70f1..f51d1841c 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -153,6 +153,8 @@ input, select {vertical-align: middle; margin-top: 1px; margin-bottom: 1px;}
 fieldset {border: 1px solid #e4e4e4; margin:0;}
 legend {color: #484848;}
 hr { width: 100%; height: 1px; background: #ccc; border: 0;}
+blockquote { font-style: italic; border-left: 3px solid #e0e0e0; padding-left: 0.6em; margin-left: 2.4em;}
+blockquote blockquote { margin-left: 0;}
 textarea.wiki-edit { width: 99%; }
 li p {margin-top: 0;}
 div.issue {background:#ffffdd; padding:6px; margin-bottom:6px;border: 1px solid #d7d7d7;}
diff --git a/public/stylesheets/jstoolbar.css b/public/stylesheets/jstoolbar.css
index c4ab55711..4e9d44b6c 100644
--- a/public/stylesheets/jstoolbar.css
+++ b/public/stylesheets/jstoolbar.css
@@ -84,6 +84,12 @@
 .jstb_ol {
 	background-image: url(../images/jstoolbar/bt_ol.png);
 }
+.jstb_bq {
+	background-image: url(../images/jstoolbar/bt_bq.png);
+}
+.jstb_unbq {
+	background-image: url(../images/jstoolbar/bt_bq_remove.png);
+}
 .jstb_pre {
 	background-image: url(../images/jstoolbar/bt_pre.png);
 }
diff --git a/test/unit/helpers/application_helper_test.rb b/test/unit/helpers/application_helper_test.rb
index ffee28b00..f8bf4a602 100644
--- a/test/unit/helpers/application_helper_test.rb
+++ b/test/unit/helpers/application_helper_test.rb
@@ -178,6 +178,46 @@ class ApplicationHelperTest < HelperTestCase
     assert_equal '<p>Dashes: ---</p>', textilizable('Dashes: ---')
   end
   
+  def test_blockquote
+    # orig raw text
+    raw = <<-RAW
+John said:
+> Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Maecenas sed libero.
+> Nullam commodo metus accumsan nulla. Curabitur lobortis dui id dolor.
+> * Donec odio lorem,
+> * sagittis ac,
+> * malesuada in,
+> * adipiscing eu, dolor.
+>
+> >Nulla varius pulvinar diam. Proin id arcu id lorem scelerisque condimentum. Proin vehicula turpis vitae lacus.
+> Proin a tellus. Nam vel neque.
+
+He's right.
+RAW
+    
+    # expected html
+    expected = <<-EXPECTED
+<p>John said:</p>
+<blockquote>
+Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Maecenas sed libero.
+Nullam commodo metus accumsan nulla. Curabitur lobortis dui id dolor.
+<ul>
+  <li>Donec odio lorem,</li>
+  <li>sagittis ac,</li>
+  <li>malesuada in,</li>
+  <li>adipiscing eu, dolor.</li>
+</ul>
+<blockquote>
+<p>Nulla varius pulvinar diam. Proin id arcu id lorem scelerisque condimentum. Proin vehicula turpis vitae lacus.</p>
+</blockquote>
+<p>Proin a tellus. Nam vel neque.</p>
+</blockquote>
+<p>He's right.</p>
+EXPECTED
+    
+    assert_equal expected.gsub(%r{\s+}, ''), textilizable(raw).gsub(%r{\s+}, '')
+  end
+  
   def test_macro_hello_world
     text = "{{hello_world}}"
     assert textilizable(text).match(/Hello world!/)

From 5d2abb84bdcb8724e5d24a5299bb90f0770f6c23 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Fri, 30 May 2008 17:42:25 +0000
Subject: [PATCH 470/710] Adds a Reply link to each issue note (#739). Reply is
 pre-filled with the quoted note.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1480 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/issues_controller.rb      |  22 +++++++++++++++++++++-
 app/helpers/journals_helper.rb            |  11 +++++++----
 app/views/issues/_history.rhtml           |   3 ++-
 app/views/issues/show.rhtml               |   6 ++++++
 lang/bg.yml                               |   1 +
 lang/cs.yml                               |   1 +
 lang/da.yml                               |   1 +
 lang/de.yml                               |   1 +
 lang/en.yml                               |   1 +
 lang/es.yml                               |   1 +
 lang/fi.yml                               |   1 +
 lang/fr.yml                               |   1 +
 lang/he.yml                               |   1 +
 lang/hu.yml                               |   1 +
 lang/it.yml                               |   1 +
 lang/ja.yml                               |   1 +
 lang/ko.yml                               |   1 +
 lang/lt.yml                               |   1 +
 lang/nl.yml                               |   1 +
 lang/no.yml                               |   1 +
 lang/pl.yml                               |   1 +
 lang/pt-br.yml                            |   1 +
 lang/pt.yml                               |   1 +
 lang/ro.yml                               |   1 +
 lang/ru.yml                               |   1 +
 lang/sr.yml                               |   1 +
 lang/sv.yml                               |   1 +
 lang/th.yml                               |   1 +
 lang/uk.yml                               |   1 +
 lang/zh-tw.yml                            |   1 +
 lang/zh.yml                               |   1 +
 lib/redmine.rb                            |   4 ++--
 public/images/comment.png                 | Bin 0 -> 413 bytes
 test/functional/issues_controller_test.rb |  16 ++++++++++++++++
 34 files changed, 81 insertions(+), 8 deletions(-)
 create mode 100644 public/images/comment.png

diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index ca3309c46..defc0a11e 100644
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -19,7 +19,7 @@ class IssuesController < ApplicationController
   layout 'base'
   menu_item :new_issue, :only => :new
   
-  before_filter :find_issue, :only => [:show, :edit, :destroy_attachment]
+  before_filter :find_issue, :only => [:show, :edit, :reply, :destroy_attachment]
   before_filter :find_issues, :only => [:bulk_edit, :move, :destroy]
   before_filter :find_project, :only => [:new, :update_form, :preview]
   before_filter :authorize, :except => [:index, :changes, :preview, :update_form, :context_menu]
@@ -208,6 +208,26 @@ class IssuesController < ApplicationController
     flash.now[:error] = l(:notice_locking_conflict)
   end
 
+  def reply
+    journal = Journal.find(params[:journal_id]) if params[:journal_id]
+    if journal
+      user = journal.user
+      text = journal.notes
+    else
+      user = @issue.author
+      text = @issue.description
+    end
+    content = "#{ll(Setting.default_language, :text_user_wrote, user)}\n> "
+    content << text.to_s.strip.gsub(%r{<pre>((.|\s)*?)</pre>}m, '[...]').gsub("\n", "\n> ") + "\n\n"
+    render(:update) { |page|
+      page.replace_html "notes", content
+      page.show 'update'
+      page << "Form.Element.focus('notes');"
+      page << "Element.scrollTo('update');"
+      page << "$('notes').scrollTop = $('notes').scrollHeight - $('notes').clientHeight;"
+    }
+  end
+  
   # Bulk edit a set of issues
   def bulk_edit
     if request.post?
diff --git a/app/helpers/journals_helper.rb b/app/helpers/journals_helper.rb
index 234bfabc0..92d6e5593 100644
--- a/app/helpers/journals_helper.rb
+++ b/app/helpers/journals_helper.rb
@@ -19,13 +19,16 @@ module JournalsHelper
   def render_notes(journal, options={})
     content = ''
     editable = journal.editable_by?(User.current)
-    if editable && !journal.notes.blank?
-      links = []
+    links = []
+    if !journal.notes.blank?
       links << link_to_in_place_notes_editor(image_tag('edit.png'), "journal-#{journal.id}-notes", 
                                              { :controller => 'journals', :action => 'edit', :id => journal },
-                                                :title => l(:button_edit))
-      content << content_tag('div', links.join(' '), :class => 'contextual')
+                                                :title => l(:button_edit)) if editable
+      links << link_to_remote(image_tag('comment.png'),
+                              { :url => {:controller => 'issues', :action => 'reply', :id => journal.journalized, :journal_id => journal} },
+                              :title => l(:button_reply)) if options[:reply_links]
     end
+    content << content_tag('div', links.join(' '), :class => 'contextual') unless links.empty?
     content << textilizable(journal, :notes)
     content_tag('div', content, :id => "journal-#{journal.id}-notes", :class => (editable ? 'wiki editable' : 'wiki'))
   end
diff --git a/app/views/issues/_history.rhtml b/app/views/issues/_history.rhtml
index f29a44daf..b8efdb400 100644
--- a/app/views/issues/_history.rhtml
+++ b/app/views/issues/_history.rhtml
@@ -1,3 +1,4 @@
+<% reply_links = authorize_for('issues', 'edit') -%>
 <% for journal in journals %>
     <div id="change-<%= journal.id %>" class="journal">
 	<h4><div style="float:right;"><%= link_to "##{journal.indice}", :anchor => "note-#{journal.indice}" %></div>
@@ -8,6 +9,6 @@
 	   <li><%= show_detail(detail) %></li>
 	<% end %>
 	</ul>
-	<%= render_notes(journal) unless journal.notes.blank? %>
+	<%= render_notes(journal, :reply_links => reply_links) unless journal.notes.blank? %>
 	</div>
 <% end %>
diff --git a/app/views/issues/show.rhtml b/app/views/issues/show.rhtml
index f788d0ec8..f1c8a82cd 100644
--- a/app/views/issues/show.rhtml
+++ b/app/views/issues/show.rhtml
@@ -56,6 +56,12 @@ end %>
 </table>
 <hr />
 
+<div class="contextual">
+<%= link_to_remote(image_tag('comment.png'),
+                   { :url => {:controller => 'issues', :action => 'reply', :id => @issue} },
+                   :title => l(:button_reply)) if authorize_for('issues', 'edit') %>
+</div>
+                              
 <p><strong><%=l(:field_description)%></strong></p>
 <div class="wiki">
 <%= textilizable @issue, :description, :attachments => @issue.attachments %>
diff --git a/lang/bg.yml b/lang/bg.yml
index 10198bce9..05a0b0d60 100644
--- a/lang/bg.yml
+++ b/lang/bg.yml
@@ -621,3 +621,4 @@ text_subprojects_destroy_warning: 'Its subproject(s): %s will be also deleted.'
 label_and_its_subprojects: %s and its subprojects
 mail_body_reminder: "%d issue(s) that are assigned to you are due in the next %d days:"
 mail_subject_reminder: "%d issue(s) due in the next days"
+text_user_wrote: '%s wrote:'
diff --git a/lang/cs.yml b/lang/cs.yml
index f90068b3b..829f4449e 100644
--- a/lang/cs.yml
+++ b/lang/cs.yml
@@ -626,3 +626,4 @@ text_subprojects_destroy_warning: 'Its subproject(s): %s will be also deleted.'
 label_and_its_subprojects: %s and its subprojects
 mail_body_reminder: "%d issue(s) that are assigned to you are due in the next %d days:"
 mail_subject_reminder: "%d issue(s) due in the next days"
+text_user_wrote: '%s wrote:'
diff --git a/lang/da.yml b/lang/da.yml
index ca4ddeb46..92df87e3f 100644
--- a/lang/da.yml
+++ b/lang/da.yml
@@ -623,3 +623,4 @@ text_subprojects_destroy_warning: 'Its subproject(s): %s will be also deleted.'
 label_and_its_subprojects: %s and its subprojects
 mail_body_reminder: "%d issue(s) that are assigned to you are due in the next %d days:"
 mail_subject_reminder: "%d issue(s) due in the next days"
+text_user_wrote: '%s wrote:'
diff --git a/lang/de.yml b/lang/de.yml
index fa33e1c74..1351d1944 100644
--- a/lang/de.yml
+++ b/lang/de.yml
@@ -622,3 +622,4 @@ text_subprojects_destroy_warning: 'Its subproject(s): %s will be also deleted.'
 label_and_its_subprojects: %s and its subprojects
 mail_body_reminder: "%d issue(s) that are assigned to you are due in the next %d days:"
 mail_subject_reminder: "%d issue(s) due in the next days"
+text_user_wrote: '%s wrote:'
diff --git a/lang/en.yml b/lang/en.yml
index f9e07d211..4184a9175 100644
--- a/lang/en.yml
+++ b/lang/en.yml
@@ -596,6 +596,7 @@ text_destroy_time_entries_question: %.02f hours were reported on the issues you
 text_destroy_time_entries: Delete reported hours
 text_assign_time_entries_to_project: Assign reported hours to the project
 text_reassign_time_entries: 'Reassign reported hours to this issue:'
+text_user_wrote: '%s wrote:'
 
 default_role_manager: Manager
 default_role_developper: Developer
diff --git a/lang/es.yml b/lang/es.yml
index 3d8c0a931..ea479630d 100644
--- a/lang/es.yml
+++ b/lang/es.yml
@@ -624,3 +624,4 @@ text_subprojects_destroy_warning: 'Sus subprojectos: %s también se eliminarán'
 label_and_its_subprojects: %s and its subprojects
 mail_body_reminder: "%d issue(s) that are assigned to you are due in the next %d days:"
 mail_subject_reminder: "%d issue(s) due in the next days"
+text_user_wrote: '%s wrote:'
diff --git a/lang/fi.yml b/lang/fi.yml
index 60428bb49..b3b888622 100644
--- a/lang/fi.yml
+++ b/lang/fi.yml
@@ -621,3 +621,4 @@ text_subprojects_destroy_warning: 'Tämän alaprojekti(t): %s tullaan myös pois
 label_and_its_subprojects: %s and its subprojects
 mail_body_reminder: "%d issue(s) that are assigned to you are due in the next %d days:"
 mail_subject_reminder: "%d issue(s) due in the next days"
+text_user_wrote: '%s wrote:'
diff --git a/lang/fr.yml b/lang/fr.yml
index 8b002bbf6..a802a44cc 100644
--- a/lang/fr.yml
+++ b/lang/fr.yml
@@ -596,6 +596,7 @@ text_destroy_time_entries_question: %.02f heures ont été enregistrées sur les
 text_destroy_time_entries: Supprimer les heures
 text_assign_time_entries_to_project: Reporter les heures sur le projet
 text_reassign_time_entries: 'Reporter les heures sur cette demande:'
+text_user_wrote: '%s a écrit:'
 
 default_role_manager: Manager
 default_role_developper: Développeur
diff --git a/lang/he.yml b/lang/he.yml
index f972ef62a..c4d69ebb9 100644
--- a/lang/he.yml
+++ b/lang/he.yml
@@ -621,3 +621,4 @@ text_subprojects_destroy_warning: 'Its subproject(s): %s will be also deleted.'
 label_and_its_subprojects: %s and its subprojects
 mail_body_reminder: "%d issue(s) that are assigned to you are due in the next %d days:"
 mail_subject_reminder: "%d issue(s) due in the next days"
+text_user_wrote: '%s wrote:'
diff --git a/lang/hu.yml b/lang/hu.yml
index f6d312ce0..fd7bf9f52 100644
--- a/lang/hu.yml
+++ b/lang/hu.yml
@@ -622,3 +622,4 @@ enumeration_doc_categories: Dokumentum kategóriák
 enumeration_activities: Tevékenységek (idő rögzítés)
 mail_body_reminder: "%d issue(s) that are assigned to you are due in the next %d days:"
 mail_subject_reminder: "%d issue(s) due in the next days"
+text_user_wrote: '%s wrote:'
diff --git a/lang/it.yml b/lang/it.yml
index a8646644a..519dcd01f 100644
--- a/lang/it.yml
+++ b/lang/it.yml
@@ -621,3 +621,4 @@ text_subprojects_destroy_warning: 'Its subproject(s): %s will be also deleted.'
 label_and_its_subprojects: %s and its subprojects
 mail_body_reminder: "%d issue(s) that are assigned to you are due in the next %d days:"
 mail_subject_reminder: "%d issue(s) due in the next days"
+text_user_wrote: '%s wrote:'
diff --git a/lang/ja.yml b/lang/ja.yml
index d119cf55e..714539c7d 100644
--- a/lang/ja.yml
+++ b/lang/ja.yml
@@ -622,3 +622,4 @@ text_subprojects_destroy_warning: 'Its subproject(s): %s will be also deleted.'
 label_and_its_subprojects: %s and its subprojects
 mail_body_reminder: "%d issue(s) that are assigned to you are due in the next %d days:"
 mail_subject_reminder: "%d issue(s) due in the next days"
+text_user_wrote: '%s wrote:'
diff --git a/lang/ko.yml b/lang/ko.yml
index 98dde9e06..81656040c 100644
--- a/lang/ko.yml
+++ b/lang/ko.yml
@@ -621,3 +621,4 @@ text_subprojects_destroy_warning: 'Its subproject(s): %s will be also deleted.'
 label_and_its_subprojects: %s and its subprojects
 mail_body_reminder: "%d issue(s) that are assigned to you are due in the next %d days:"
 mail_subject_reminder: "%d issue(s) due in the next days"
+text_user_wrote: '%s wrote:'
diff --git a/lang/lt.yml b/lang/lt.yml
index 6b791d87b..89e607a83 100644
--- a/lang/lt.yml
+++ b/lang/lt.yml
@@ -623,3 +623,4 @@ label_and_its_subprojects: %s projektas ir jo subprojektai
 
 mail_body_reminder: "%d issue(s) that are assigned to you are due in the next %d days:"
 mail_subject_reminder: "%d issue(s) due in the next days"
+text_user_wrote: '%s wrote:'
diff --git a/lang/nl.yml b/lang/nl.yml
index c36eaecd5..eebc7d993 100644
--- a/lang/nl.yml
+++ b/lang/nl.yml
@@ -622,3 +622,4 @@ text_subprojects_destroy_warning: 'Its subproject(s): %s will be also deleted.'
 label_and_its_subprojects: %s and its subprojects
 mail_body_reminder: "%d issue(s) that are assigned to you are due in the next %d days:"
 mail_subject_reminder: "%d issue(s) due in the next days"
+text_user_wrote: '%s wrote:'
diff --git a/lang/no.yml b/lang/no.yml
index 5e788dc50..3f6ef6ded 100644
--- a/lang/no.yml
+++ b/lang/no.yml
@@ -622,3 +622,4 @@ enumeration_doc_categories: Dokument-kategorier
 enumeration_activities: Aktiviteter (tidssporing)
 mail_body_reminder: "%d issue(s) that are assigned to you are due in the next %d days:"
 mail_subject_reminder: "%d issue(s) due in the next days"
+text_user_wrote: '%s wrote:'
diff --git a/lang/pl.yml b/lang/pl.yml
index 4476c2160..81a7a0dba 100644
--- a/lang/pl.yml
+++ b/lang/pl.yml
@@ -621,3 +621,4 @@ text_subprojects_destroy_warning: 'Its subproject(s): %s will be also deleted.'
 label_and_its_subprojects: %s and its subprojects
 mail_body_reminder: "%d issue(s) that are assigned to you are due in the next %d days:"
 mail_subject_reminder: "%d issue(s) due in the next days"
+text_user_wrote: '%s wrote:'
diff --git a/lang/pt-br.yml b/lang/pt-br.yml
index 9b3d23151..47e80a144 100644
--- a/lang/pt-br.yml
+++ b/lang/pt-br.yml
@@ -621,3 +621,4 @@ label_age: Age
 label_and_its_subprojects: %s and its subprojects
 mail_body_reminder: "%d issue(s) that are assigned to you are due in the next %d days:"
 mail_subject_reminder: "%d issue(s) due in the next days"
+text_user_wrote: '%s wrote:'
diff --git a/lang/pt.yml b/lang/pt.yml
index c56b76a0b..002a1b7f8 100644
--- a/lang/pt.yml
+++ b/lang/pt.yml
@@ -621,3 +621,4 @@ text_subprojects_destroy_warning: 'Its subproject(s): %s will be also deleted.'
 label_and_its_subprojects: %s and its subprojects
 mail_body_reminder: "%d issue(s) that are assigned to you are due in the next %d days:"
 mail_subject_reminder: "%d issue(s) due in the next days"
+text_user_wrote: '%s wrote:'
diff --git a/lang/ro.yml b/lang/ro.yml
index 30464569b..6bcd55a50 100644
--- a/lang/ro.yml
+++ b/lang/ro.yml
@@ -621,3 +621,4 @@ text_subprojects_destroy_warning: 'Its subproject(s): %s will be also deleted.'
 label_and_its_subprojects: %s and its subprojects
 mail_body_reminder: "%d issue(s) that are assigned to you are due in the next %d days:"
 mail_subject_reminder: "%d issue(s) due in the next days"
+text_user_wrote: '%s wrote:'
diff --git a/lang/ru.yml b/lang/ru.yml
index f4fd92037..fa8fd69a9 100644
--- a/lang/ru.yml
+++ b/lang/ru.yml
@@ -625,3 +625,4 @@ text_subprojects_destroy_warning: 'Its subproject(s): %s will be also deleted.'
 label_and_its_subprojects: %s and its subprojects
 mail_body_reminder: "%d issue(s) that are assigned to you are due in the next %d days:"
 mail_subject_reminder: "%d issue(s) due in the next days"
+text_user_wrote: '%s wrote:'
diff --git a/lang/sr.yml b/lang/sr.yml
index 53e4f9f2c..9a4adf214 100644
--- a/lang/sr.yml
+++ b/lang/sr.yml
@@ -622,3 +622,4 @@ text_subprojects_destroy_warning: 'Its subproject(s): %s will be also deleted.'
 label_and_its_subprojects: %s and its subprojects
 mail_body_reminder: "%d issue(s) that are assigned to you are due in the next %d days:"
 mail_subject_reminder: "%d issue(s) due in the next days"
+text_user_wrote: '%s wrote:'
diff --git a/lang/sv.yml b/lang/sv.yml
index 248f3dcba..1ab11e98b 100644
--- a/lang/sv.yml
+++ b/lang/sv.yml
@@ -622,3 +622,4 @@ text_subprojects_destroy_warning: 'Its subproject(s): %s will be also deleted.'
 label_and_its_subprojects: %s and its subprojects
 mail_body_reminder: "%d issue(s) that are assigned to you are due in the next %d days:"
 mail_subject_reminder: "%d issue(s) due in the next days"
+text_user_wrote: '%s wrote:'
diff --git a/lang/th.yml b/lang/th.yml
index 444316aa1..751aac749 100644
--- a/lang/th.yml
+++ b/lang/th.yml
@@ -624,3 +624,4 @@ enumeration_activities: กิจกรรม (ใช้ในการติด
 label_and_its_subprojects: %s and its subprojects
 mail_body_reminder: "%d issue(s) that are assigned to you are due in the next %d days:"
 mail_subject_reminder: "%d issue(s) due in the next days"
+text_user_wrote: '%s wrote:'
diff --git a/lang/uk.yml b/lang/uk.yml
index 3cc60ef48..3ab4462ed 100644
--- a/lang/uk.yml
+++ b/lang/uk.yml
@@ -623,3 +623,4 @@ text_subprojects_destroy_warning: 'Its subproject(s): %s will be also deleted.'
 label_and_its_subprojects: %s and its subprojects
 mail_body_reminder: "%d issue(s) that are assigned to you are due in the next %d days:"
 mail_subject_reminder: "%d issue(s) due in the next days"
+text_user_wrote: '%s wrote:'
diff --git a/lang/zh-tw.yml b/lang/zh-tw.yml
index 3926113b2..3b7808aae 100644
--- a/lang/zh-tw.yml
+++ b/lang/zh-tw.yml
@@ -622,3 +622,4 @@ enumeration_doc_categories: 文件分類
 enumeration_activities: 活動 (時間追蹤)
 mail_body_reminder: "%d issue(s) that are assigned to you are due in the next %d days:"
 mail_subject_reminder: "%d issue(s) due in the next days"
+text_user_wrote: '%s wrote:'
diff --git a/lang/zh.yml b/lang/zh.yml
index 55516e033..b5ecace82 100644
--- a/lang/zh.yml
+++ b/lang/zh.yml
@@ -622,3 +622,4 @@ enumeration_doc_categories: 文档类别
 enumeration_activities: 活动（时间跟踪）
 mail_subject_reminder: "%d issue(s) due in the next days"
 mail_body_reminder: "%d issue(s) that are assigned to you are due in the next %d days:"
+text_user_wrote: '%s wrote:'
diff --git a/lib/redmine.rb b/lib/redmine.rb
index b21f5716d..7b9832d62 100644
--- a/lib/redmine.rb
+++ b/lib/redmine.rb
@@ -32,9 +32,9 @@ Redmine::AccessControl.map do |map|
                                   :queries => :index,
                                   :reports => :issue_report}, :public => true                    
     map.permission :add_issues, {:issues => :new}
-    map.permission :edit_issues, {:issues => [:edit, :bulk_edit, :destroy_attachment]}
+    map.permission :edit_issues, {:issues => [:edit, :reply, :bulk_edit, :destroy_attachment]}
     map.permission :manage_issue_relations, {:issue_relations => [:new, :destroy]}
-    map.permission :add_issue_notes, {:issues => :edit}
+    map.permission :add_issue_notes, {:issues => [:edit, :reply]}
     map.permission :edit_issue_notes, {:journals => :edit}, :require => :loggedin
     map.permission :edit_own_issue_notes, {:journals => :edit}, :require => :loggedin
     map.permission :move_issues, {:issues => :move}, :require => :loggedin
diff --git a/public/images/comment.png b/public/images/comment.png
new file mode 100644
index 0000000000000000000000000000000000000000..7bc9233ea63c89d52a99494dd0f0735a29a3ec3b
GIT binary patch
literal 413
zcmV;O0b>4%P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzFG)l}R5;6H
z`2YVu10|S&Y6e8K?+^mwr9k`>i2vikyMR~)n*keF9=!Gc_n*K2@qsNT?}H4v4a974
z1ArVJApZ0B-@pGKzWw|E^3%Wn&p!V9|K$C@{}12&`+x7vzyG&i{r!LE6~yrB1;;^#
zm?0Y=moxPMSn>r><FgO{{yzq4e(?6+|GQAl*I)eofAtx}fX-ECK?ZnZHQ*^w^P_iA
z&9DFczx5KL`3g|;#V5E8fO`St{QE##@4Wu||0YoLwda5TUj}Nv@C0PQAFu(ni%x(H
zu*4dOAVZJ=$Tb%p{{<V27Kog<qVW$b%I5C43ODHe=O17`Q2a91XvBtr3hz9B_Z6n`
zI}q0rof3hHduMLD0@C;ehzm(d%0LZDKzt8~Q|Ol$2Fw5e_lplAzT#>N00000NkvXX
Hu0mjf$^yWL

literal 0
HcmV?d00001

diff --git a/test/functional/issues_controller_test.rb b/test/functional/issues_controller_test.rb
index c4389fedd..7c7d44e5f 100644
--- a/test/functional/issues_controller_test.rb
+++ b/test/functional/issues_controller_test.rb
@@ -263,6 +263,22 @@ class IssuesControllerTest < Test::Unit::TestCase
                                     :content => 'Urgent',
                                     :attributes => { :selected => 'selected' } }
   end
+  
+  def test_reply_to_issue
+    @request.session[:user_id] = 2
+    get :reply, :id => 1
+    assert_response :success
+    assert_select_rjs :show, "update"
+    assert_select_rjs :replace_html, "notes"
+  end
+
+  def test_reply_to_note
+    @request.session[:user_id] = 2
+    get :reply, :id => 1, :journal_id => 2
+    assert_response :success
+    assert_select_rjs :show, "update"
+    assert_select_rjs :replace_html, "notes"
+  end
 
   def test_post_edit
     @request.session[:user_id] = 2

From 9894a3781e9cc7fc295f7fa7133fe951ca843e51 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Fri, 30 May 2008 18:40:02 +0000
Subject: [PATCH 471/710] Fixed: browser's accept-language subcodes ignored
 (#1320).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1481 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/application.rb             | 6 +++---
 test/functional/welcome_controller_test.rb | 7 +++++++
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/app/controllers/application.rb b/app/controllers/application.rb
index abf621641..2daee50de 100644
--- a/app/controllers/application.rb
+++ b/app/controllers/application.rb
@@ -61,11 +61,11 @@ class ApplicationController < ActionController::Base
   def set_localization
     User.current.language = nil unless User.current.logged?
     lang = begin
-      if !User.current.language.blank? and GLoc.valid_languages.include? User.current.language.to_sym
+      if !User.current.language.blank? && GLoc.valid_language?(User.current.language)
         User.current.language
       elsif request.env['HTTP_ACCEPT_LANGUAGE']
-        accept_lang = parse_qvalues(request.env['HTTP_ACCEPT_LANGUAGE']).first.split('-').first
-        if accept_lang and !accept_lang.empty? and GLoc.valid_languages.include? accept_lang.to_sym
+        accept_lang = parse_qvalues(request.env['HTTP_ACCEPT_LANGUAGE']).first.downcase
+        if !accept_lang.blank? && (GLoc.valid_language?(accept_lang) || GLoc.valid_language?(accept_lang = accept_lang.split('-').first))
           User.current.language = accept_lang
         end
       end
diff --git a/test/functional/welcome_controller_test.rb b/test/functional/welcome_controller_test.rb
index 18146c6aa..3e1308ef1 100644
--- a/test/functional/welcome_controller_test.rb
+++ b/test/functional/welcome_controller_test.rb
@@ -46,4 +46,11 @@ class WelcomeControllerTest < Test::Unit::TestCase
     get :index
     assert_equal :fr, @controller.current_language
   end
+  
+  def test_browser_language_alternate
+    Setting.default_language = 'en'
+    @request.env['HTTP_ACCEPT_LANGUAGE'] = 'zh-TW'
+    get :index
+    assert_equal :"zh-tw", @controller.current_language
+  end
 end

From 50c338b229eddd9772974bf64071c0b330ffb2c6 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Fri, 30 May 2008 18:42:56 +0000
Subject: [PATCH 472/710] Additional test for r1481.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1482 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 test/functional/welcome_controller_test.rb | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/test/functional/welcome_controller_test.rb b/test/functional/welcome_controller_test.rb
index 3e1308ef1..df565a751 100644
--- a/test/functional/welcome_controller_test.rb
+++ b/test/functional/welcome_controller_test.rb
@@ -53,4 +53,11 @@ class WelcomeControllerTest < Test::Unit::TestCase
     get :index
     assert_equal :"zh-tw", @controller.current_language
   end
+  
+  def test_browser_language_alternate_not_valid
+    Setting.default_language = 'en'
+    @request.env['HTTP_ACCEPT_LANGUAGE'] = 'fr-CA'
+    get :index
+    assert_equal :fr, @controller.current_language
+  end
 end

From a06d2c41d5e54db8e434bf80aa1fe11d82ffb870 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Mon, 2 Jun 2008 16:59:15 +0000
Subject: [PATCH 473/710] Fixed: Reminder emails shouldn't include archived
 projects (#1351).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1483 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/models/mailer.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/models/mailer.rb b/app/models/mailer.rb
index aae374268..61e5d596c 100644
--- a/app/models/mailer.rb
+++ b/app/models/mailer.rb
@@ -164,7 +164,9 @@ class Mailer < ActionMailer::Base
     project = options[:project] ? Project.find(options[:project]) : nil
     tracker = options[:tracker] ? Tracker.find(options[:tracker]) : nil
     
-    s = ARCondition.new ["#{IssueStatus.table_name}.is_closed = ? AND #{Issue.table_name}.due_date <= ? AND #{Issue.table_name}.assigned_to_id IS NOT NULL", false, days.day.from_now.to_date]
+    s = ARCondition.new ["#{IssueStatus.table_name}.is_closed = ? AND #{Issue.table_name}.due_date <= ?", false, days.day.from_now.to_date]
+    s << "#{Issue.table_name}.assigned_to_id IS NOT NULL"
+    s << "#{Project.table_name}.status = #{Project::STATUS_ACTIVE}"
     s << "#{Issue.table_name}.project_id = #{project.id}" if project
     s << "#{Issue.table_name}.tracker_id = #{tracker.id}" if tracker
     

From 4cc3ba88a8740fdbbaa4d8e6369464127c88c300 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Mon, 2 Jun 2008 17:01:02 +0000
Subject: [PATCH 474/710] Fixed: Link to PDF doesn't work after creating new
 issue (#1346).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1484 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/issues_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index defc0a11e..682a0cc6b 100644
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -149,7 +149,7 @@ class IssuesController < ApplicationController
         attach_files(@issue, params[:attachments])
         flash[:notice] = l(:notice_successful_create)
         Mailer.deliver_issue_add(@issue) if Setting.notified_events.include?('issue_added')
-        redirect_to :controller => 'issues', :action => 'show', :id => @issue,  :project_id => @project
+        redirect_to :controller => 'issues', :action => 'show', :id => @issue
         return
       end		
     end	

From 870e8654b4dd6d36f816343f20d2fa603331efb6 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Mon, 2 Jun 2008 18:16:56 +0000
Subject: [PATCH 475/710] Fixed: Atom feeds don't provide author section for
 repository revisions (#1348).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1485 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/common/feed.atom.rxml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/common/feed.atom.rxml b/app/views/common/feed.atom.rxml
index b5cbeeed9..ac087d36b 100644
--- a/app/views/common/feed.atom.rxml
+++ b/app/views/common/feed.atom.rxml
@@ -14,7 +14,7 @@ xml.feed "xmlns" => "http://www.w3.org/2005/Atom" do
       xml.link "rel" => "alternate", "href" => url
       xml.id url
       xml.updated item.event_datetime.xmlschema
-      author = item.event_author if item.respond_to?(:author)
+      author = item.event_author if item.respond_to?(:event_author)
       xml.author do
         xml.name(author)
         xml.email(author.mail) if author.respond_to?(:mail) && !author.mail.blank?

From 36162c6cf2615485cd5e9bf314cba2920943ce75 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Mon, 2 Jun 2008 19:18:17 +0000
Subject: [PATCH 476/710] Diff: adds some space between 2 changes in the same
 file and reduces html size.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1486 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/repositories/diff.rhtml | 142 +++++++++++++++---------------
 public/stylesheets/scm.css        |   2 +-
 2 files changed, 70 insertions(+), 74 deletions(-)

diff --git a/app/views/repositories/diff.rhtml b/app/views/repositories/diff.rhtml
index eaef1abf5..73c1e8c9e 100644
--- a/app/views/repositories/diff.rhtml
+++ b/app/views/repositories/diff.rhtml
@@ -11,82 +11,78 @@
   <%= select_tag 'type', options_for_select([[l(:label_diff_inline), "inline"], [l(:label_diff_side_by_side), "sbs"]], @diff_type), :onchange => "if (this.value != '') {this.form.submit()}" %></p>
 <% end %>
 
-<% cache(@cache_key) do %>
-<% @diff.each do |table_file| %>
+<% cache(@cache_key) do -%>
+<% @diff.each do |table_file| -%>
 <div class="autoscroll">
-<% if @diff_type == 'sbs' %>
-    <table class="filecontent CodeRay">
-      <thead>
-        <tr>
-          <th colspan="4" class="filename">
-            <%= table_file.file_name %>
-          </th>
-        </tr>
-        <tr>
-          <th colspan="2">@<%= format_revision @rev %></th>
-          <th colspan="2">@<%= format_revision @rev_to %></th>
-        </tr>
-      </thead>
-      <tbody>
-        <% table_file.keys.sort.each do |key| %>
-          <tr>
-            <th class="line-num">
-              <%= table_file[key].nb_line_left %>
-            </th>
-            <td class="line-code <%= table_file[key].type_diff_left %>">
-              <pre><%=to_utf8 table_file[key].line_left %></pre>
-            </td>
-            <th class="line-num">
-              <%= table_file[key].nb_line_right %>
-            </th>
-            <td class="line-code <%= table_file[key].type_diff_right %>">
-              <pre><%=to_utf8 table_file[key].line_right %></pre>
-            </td>
-          </tr>
-        <% end %>
-      </tbody>
-    </table>
+<% if @diff_type == 'sbs' -%>
+<table class="filecontent CodeRay">
+<thead>
+<tr><th colspan="4" class="filename"><%= table_file.file_name %></th></tr>
+<tr>
+  <th colspan="2">@<%= format_revision @rev %></th>
+  <th colspan="2">@<%= format_revision @rev_to %></th>
+</tr>
+</thead>
+<tbody>
+<% prev_line_left, prev_line_right = nil, nil -%>
+<% table_file.keys.sort.each do |key| -%>
+<% if prev_line_left && prev_line_right && (table_file[key].nb_line_left != prev_line_left+1) && (table_file[key].nb_line_right != prev_line_right+1) -%>
+<tr class="spacing"><td colspan="4"></td></tr>
+<% end -%>
+<tr>
+  <th class="line-num"><%= table_file[key].nb_line_left %></th>
+  <td class="line-code <%= table_file[key].type_diff_left %>">
+    <pre><%=to_utf8 table_file[key].line_left %></pre>
+  </td>
+  <th class="line-num"><%= table_file[key].nb_line_right %></th>
+  <td class="line-code <%= table_file[key].type_diff_right %>">
+    <pre><%=to_utf8 table_file[key].line_right %></pre>
+  </td>
+</tr>
+<% prev_line_left, prev_line_right = table_file[key].nb_line_left.to_i, table_file[key].nb_line_right.to_i -%>
+<% end -%>
+</tbody>
+</table>
+
+<% else -%>
+<table class="filecontent CodeRay">
+<thead>
+<tr><th colspan="3" class="filename"><%= table_file.file_name %></th></tr>
+<tr>
+  <th>@<%= format_revision @rev %></th>
+  <th>@<%= format_revision @rev_to %></th>
+  <th></th>
+</tr>
+</thead>
+<tbody>
+<% prev_line_left, prev_line_right = nil, nil -%>
+<% table_file.keys.sort.each do |key, line| %>
+<% if prev_line_left && prev_line_right && (table_file[key].nb_line_left != prev_line_left+1) && (table_file[key].nb_line_right != prev_line_right+1) -%>
+<tr class="spacing"><td colspan="3"></td></tr>
+<% end -%>
+<tr>
+  <th class="line-num"><%= table_file[key].nb_line_left %></th>
+  <th class="line-num"><%= table_file[key].nb_line_right %></th>
+  <% if table_file[key].line_left.empty? -%>
+  <td class="line-code <%= table_file[key].type_diff_right %>">
+    <pre><%=to_utf8 table_file[key].line_right %></pre>
+  </td>
+  <% else -%>
+  <td class="line-code <%= table_file[key].type_diff_left %>">
+    <pre><%=to_utf8 table_file[key].line_left %></pre>
+  </td>
+  <% end -%>
+</tr>
+<% prev_line_left = table_file[key].nb_line_left.to_i if table_file[key].nb_line_left.to_i > 0 -%>
+<% prev_line_right = table_file[key].nb_line_right.to_i if table_file[key].nb_line_right.to_i > 0 -%>
+<% end -%>
+</tbody>
+</table>
+<% end -%>
 
-<% else %>
-    <table class="filecontent CodeRay">
-      <thead>
-        <tr>
-          <th colspan="3" class="filename">
-            <%= table_file.file_name %>
-          </th>
-        </tr>
-        <tr>
-          <th>@<%= format_revision @rev %></th>
-          <th>@<%= format_revision @rev_to %></th>
-          <th></th>
-        </tr>
-      </thead>
-      <tbody>
-        <% table_file.keys.sort.each do |key, line| %>
-          <tr>
-            <th class="line-num">
-              <%= table_file[key].nb_line_left %>
-            </th>
-            <th class="line-num">
-              <%= table_file[key].nb_line_right %>
-            </th>
-            <% if table_file[key].line_left.empty? %>
-              <td class="line-code <%= table_file[key].type_diff_right %>">
-                <pre><%=to_utf8 table_file[key].line_right %></pre>
-              </td>
-            <% else %>
-              <td class="line-code <%= table_file[key].type_diff_left %>">
-                <pre><%=to_utf8 table_file[key].line_left %></pre>
-              </td>
-            <% end %>
-          </tr>
-        <% end %>
-      </tbody>
-    </table>
-<% end %>
 </div>
-<% end %>
-<% end %>
+<% end -%>
+<% end -%>
 
 <% html_title(with_leading_slash(@path), 'Diff') -%>
 
diff --git a/public/stylesheets/scm.css b/public/stylesheets/scm.css
index 66847af8c..d1495a5ef 100644
--- a/public/stylesheets/scm.css
+++ b/public/stylesheets/scm.css
@@ -2,7 +2,7 @@
 table.filecontent { border: 1px solid #ccc;  border-collapse: collapse; width:98%; }
 table.filecontent th { border: 1px solid #ccc; background-color: #eee; }
 table.filecontent th.filename {	background-color: #ddc;	text-align: left; }
-table.filecontent tr.spacing { border: 1px solid #d7d7d7; }
+table.filecontent tr.spacing td { border: 1px solid #d7d7d7; height: 0.4em; }
 table.filecontent th.line-num {
     border: 1px solid #d7d7d7;
 	font-size: 0.8em;

From 891a71ad474812ce0108d84d649706dc64336c90 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Mon, 2 Jun 2008 20:14:06 +0000
Subject: [PATCH 477/710] Fixed: new line at the end of a file is not displayed
 in diff.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1487 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 lib/redmine/scm/adapters/abstract_adapter.rb | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/redmine/scm/adapters/abstract_adapter.rb b/lib/redmine/scm/adapters/abstract_adapter.rb
index 2c254d48d..8fbae9ff8 100644
--- a/lib/redmine/scm/adapters/abstract_adapter.rb
+++ b/lib/redmine/scm/adapters/abstract_adapter.rb
@@ -279,7 +279,6 @@ module Redmine
             end
           else
             if line =~ /^[^\+\-\s@\\]/
-              self.delete(self.keys.sort.last)
               @parsing = false
               return false
             elsif line =~ /^@@ (\+|\-)(\d+)(,\d+)? (\+|\-)(\d+)(,\d+)? @@/

From 7042879811ab27fea45ea23a06b95eb8d70207b7 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Tue, 3 Jun 2008 18:30:29 +0000
Subject: [PATCH 478/710] Make the 'duplicates of' relation asymmetric: *
 closing a issue will close its duplicates * closing a duplicate won't close
 the main issue

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1488 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/models/issue.rb          |  4 ++--
 app/models/issue_relation.rb |  2 +-
 test/unit/issue_test.rb      | 30 +++++++++++++++++++++++++-----
 3 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/app/models/issue.rb b/app/models/issue.rb
index 633253db7..d83b2ab02 100644
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -225,9 +225,9 @@ class Issue < ActiveRecord::Base
     dependencies
   end
   
-  # Returns an array of the duplicate issues
+  # Returns an array of issues that duplicate this one
   def duplicates
-    relations.select {|r| r.relation_type == IssueRelation::TYPE_DUPLICATES}.collect {|r| r.other_issue(self)}
+    relations_to.select {|r| r.relation_type == IssueRelation::TYPE_DUPLICATES}.collect {|r| r.issue_from}
   end
   
   # Returns the due date or the target due date if any
diff --git a/app/models/issue_relation.rb b/app/models/issue_relation.rb
index 07e940b85..49329e0bb 100644
--- a/app/models/issue_relation.rb
+++ b/app/models/issue_relation.rb
@@ -25,7 +25,7 @@ class IssueRelation < ActiveRecord::Base
   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_DUPLICATES =>  { :name => :label_duplicates, :sym_name => :label_duplicated_by, :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
diff --git a/test/unit/issue_test.rb b/test/unit/issue_test.rb
index 36ba1fb45..999c4480d 100644
--- a/test/unit/issue_test.rb
+++ b/test/unit/issue_test.rb
@@ -42,7 +42,7 @@ class IssueTest < Test::Unit::TestCase
     assert_equal orig.custom_values.first.value, issue.custom_values.first.value
   end
   
-  def test_close_duplicates
+  def test_should_close_duplicates
     # Create 3 issues
     issue1 = Issue.new(:project_id => 1, :tracker_id => 1, :author_id => 1, :status_id => 1, :priority => Enumeration.get_values('IPRI').first, :subject => 'Duplicates test', :description => 'Duplicates test')
     assert issue1.save
@@ -52,12 +52,12 @@ class IssueTest < Test::Unit::TestCase
     assert issue3.save
     
     # 2 is a dupe of 1
-    IssueRelation.create(:issue_from => issue1, :issue_to => issue2, :relation_type => IssueRelation::TYPE_DUPLICATES)
+    IssueRelation.create(:issue_from => issue2, :issue_to => issue1, :relation_type => IssueRelation::TYPE_DUPLICATES)
     # And 3 is a dupe of 2
-    IssueRelation.create(:issue_from => issue2, :issue_to => issue3, :relation_type => IssueRelation::TYPE_DUPLICATES)
+    IssueRelation.create(:issue_from => issue3, :issue_to => issue2, :relation_type => IssueRelation::TYPE_DUPLICATES)
     # And 3 is a dupe of 1 (circular duplicates)
-    IssueRelation.create(:issue_from => issue1, :issue_to => issue3, :relation_type => IssueRelation::TYPE_DUPLICATES)
-    
+    IssueRelation.create(:issue_from => issue3, :issue_to => issue1, :relation_type => IssueRelation::TYPE_DUPLICATES)
+        
     assert issue1.reload.duplicates.include?(issue2)
     
     # Closing issue 1
@@ -69,6 +69,26 @@ class IssueTest < Test::Unit::TestCase
     assert issue3.reload.closed?    
   end
   
+  def test_should_not_close_duplicated_issue
+    # Create 3 issues
+    issue1 = Issue.new(:project_id => 1, :tracker_id => 1, :author_id => 1, :status_id => 1, :priority => Enumeration.get_values('IPRI').first, :subject => 'Duplicates test', :description => 'Duplicates test')
+    assert issue1.save
+    issue2 = issue1.clone
+    assert issue2.save
+    
+    # 2 is a dupe of 1
+    IssueRelation.create(:issue_from => issue2, :issue_to => issue1, :relation_type => IssueRelation::TYPE_DUPLICATES)
+    # 2 is a dup of 1 but 1 is not a duplicate of 2
+    assert !issue2.reload.duplicates.include?(issue1)
+    
+    # Closing issue 2
+    issue2.init_journal(User.find(:first), "Closing issue2")
+    issue2.status = IssueStatus.find :first, :conditions => {:is_closed => true}
+    assert issue2.save
+    # 1 should not be also closed
+    assert !issue1.reload.closed?
+  end
+  
   def test_move_to_another_project
     issue = Issue.find(1)
     assert issue.move_to(Project.find(2))

From a77fb3b59109a296605fa435db349c3b1eb442eb Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Tue, 3 Jun 2008 18:41:36 +0000
Subject: [PATCH 479/710] Missing strings (r1488).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1489 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 lang/bg.yml    | 1 +
 lang/cs.yml    | 1 +
 lang/da.yml    | 1 +
 lang/de.yml    | 1 +
 lang/en.yml    | 1 +
 lang/es.yml    | 1 +
 lang/fi.yml    | 1 +
 lang/fr.yml    | 3 ++-
 lang/he.yml    | 1 +
 lang/hu.yml    | 1 +
 lang/it.yml    | 1 +
 lang/ja.yml    | 1 +
 lang/ko.yml    | 1 +
 lang/lt.yml    | 1 +
 lang/nl.yml    | 1 +
 lang/no.yml    | 1 +
 lang/pl.yml    | 1 +
 lang/pt-br.yml | 1 +
 lang/pt.yml    | 1 +
 lang/ro.yml    | 1 +
 lang/ru.yml    | 1 +
 lang/sr.yml    | 1 +
 lang/sv.yml    | 1 +
 lang/th.yml    | 1 +
 lang/uk.yml    | 1 +
 lang/zh-tw.yml | 1 +
 lang/zh.yml    | 1 +
 27 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/lang/bg.yml b/lang/bg.yml
index 05a0b0d60..6ab6f26c6 100644
--- a/lang/bg.yml
+++ b/lang/bg.yml
@@ -622,3 +622,4 @@ label_and_its_subprojects: %s and its subprojects
 mail_body_reminder: "%d issue(s) that are assigned to you are due in the next %d days:"
 mail_subject_reminder: "%d issue(s) due in the next days"
 text_user_wrote: '%s wrote:'
+label_duplicated_by: duplicated by
diff --git a/lang/cs.yml b/lang/cs.yml
index 829f4449e..7413b79dd 100644
--- a/lang/cs.yml
+++ b/lang/cs.yml
@@ -627,3 +627,4 @@ label_and_its_subprojects: %s and its subprojects
 mail_body_reminder: "%d issue(s) that are assigned to you are due in the next %d days:"
 mail_subject_reminder: "%d issue(s) due in the next days"
 text_user_wrote: '%s wrote:'
+label_duplicated_by: duplicated by
diff --git a/lang/da.yml b/lang/da.yml
index 92df87e3f..2107498ad 100644
--- a/lang/da.yml
+++ b/lang/da.yml
@@ -624,3 +624,4 @@ label_and_its_subprojects: %s and its subprojects
 mail_body_reminder: "%d issue(s) that are assigned to you are due in the next %d days:"
 mail_subject_reminder: "%d issue(s) due in the next days"
 text_user_wrote: '%s wrote:'
+label_duplicated_by: duplicated by
diff --git a/lang/de.yml b/lang/de.yml
index 1351d1944..27d22fc54 100644
--- a/lang/de.yml
+++ b/lang/de.yml
@@ -623,3 +623,4 @@ label_and_its_subprojects: %s and its subprojects
 mail_body_reminder: "%d issue(s) that are assigned to you are due in the next %d days:"
 mail_subject_reminder: "%d issue(s) due in the next days"
 text_user_wrote: '%s wrote:'
+label_duplicated_by: duplicated by
diff --git a/lang/en.yml b/lang/en.yml
index 4184a9175..262570f1d 100644
--- a/lang/en.yml
+++ b/lang/en.yml
@@ -448,6 +448,7 @@ label_relation_new: New relation
 label_relation_delete: Delete relation
 label_relates_to: related to
 label_duplicates: duplicates
+label_duplicated_by: duplicated by
 label_blocks: blocks
 label_blocked_by: blocked by
 label_precedes: precedes
diff --git a/lang/es.yml b/lang/es.yml
index ea479630d..62528e688 100644
--- a/lang/es.yml
+++ b/lang/es.yml
@@ -625,3 +625,4 @@ label_and_its_subprojects: %s and its subprojects
 mail_body_reminder: "%d issue(s) that are assigned to you are due in the next %d days:"
 mail_subject_reminder: "%d issue(s) due in the next days"
 text_user_wrote: '%s wrote:'
+label_duplicated_by: duplicated by
diff --git a/lang/fi.yml b/lang/fi.yml
index b3b888622..b32bbb259 100644
--- a/lang/fi.yml
+++ b/lang/fi.yml
@@ -622,3 +622,4 @@ label_and_its_subprojects: %s and its subprojects
 mail_body_reminder: "%d issue(s) that are assigned to you are due in the next %d days:"
 mail_subject_reminder: "%d issue(s) due in the next days"
 text_user_wrote: '%s wrote:'
+label_duplicated_by: duplicated by
diff --git a/lang/fr.yml b/lang/fr.yml
index a802a44cc..8b040463f 100644
--- a/lang/fr.yml
+++ b/lang/fr.yml
@@ -447,7 +447,8 @@ label_loading: Chargement...
 label_relation_new: Nouvelle relation
 label_relation_delete: Supprimer la relation
 label_relates_to: lié à
-label_duplicates: doublon de
+label_duplicates: duplique
+label_duplicated_by: dupliqué par
 label_blocks: bloque
 label_blocked_by: bloqué par
 label_precedes: précède
diff --git a/lang/he.yml b/lang/he.yml
index c4d69ebb9..da31812cf 100644
--- a/lang/he.yml
+++ b/lang/he.yml
@@ -622,3 +622,4 @@ label_and_its_subprojects: %s and its subprojects
 mail_body_reminder: "%d issue(s) that are assigned to you are due in the next %d days:"
 mail_subject_reminder: "%d issue(s) due in the next days"
 text_user_wrote: '%s wrote:'
+label_duplicated_by: duplicated by
diff --git a/lang/hu.yml b/lang/hu.yml
index fd7bf9f52..803aa8833 100644
--- a/lang/hu.yml
+++ b/lang/hu.yml
@@ -623,3 +623,4 @@ enumeration_activities: Tevékenységek (idő rögzítés)
 mail_body_reminder: "%d issue(s) that are assigned to you are due in the next %d days:"
 mail_subject_reminder: "%d issue(s) due in the next days"
 text_user_wrote: '%s wrote:'
+label_duplicated_by: duplicated by
diff --git a/lang/it.yml b/lang/it.yml
index 519dcd01f..e5557f915 100644
--- a/lang/it.yml
+++ b/lang/it.yml
@@ -622,3 +622,4 @@ label_and_its_subprojects: %s and its subprojects
 mail_body_reminder: "%d issue(s) that are assigned to you are due in the next %d days:"
 mail_subject_reminder: "%d issue(s) due in the next days"
 text_user_wrote: '%s wrote:'
+label_duplicated_by: duplicated by
diff --git a/lang/ja.yml b/lang/ja.yml
index 714539c7d..1ae9ab1b6 100644
--- a/lang/ja.yml
+++ b/lang/ja.yml
@@ -623,3 +623,4 @@ label_and_its_subprojects: %s and its subprojects
 mail_body_reminder: "%d issue(s) that are assigned to you are due in the next %d days:"
 mail_subject_reminder: "%d issue(s) due in the next days"
 text_user_wrote: '%s wrote:'
+label_duplicated_by: duplicated by
diff --git a/lang/ko.yml b/lang/ko.yml
index 81656040c..c00a9e9a0 100644
--- a/lang/ko.yml
+++ b/lang/ko.yml
@@ -622,3 +622,4 @@ label_and_its_subprojects: %s and its subprojects
 mail_body_reminder: "%d issue(s) that are assigned to you are due in the next %d days:"
 mail_subject_reminder: "%d issue(s) due in the next days"
 text_user_wrote: '%s wrote:'
+label_duplicated_by: duplicated by
diff --git a/lang/lt.yml b/lang/lt.yml
index 89e607a83..140631fcf 100644
--- a/lang/lt.yml
+++ b/lang/lt.yml
@@ -624,3 +624,4 @@ label_and_its_subprojects: %s projektas ir jo subprojektai
 mail_body_reminder: "%d issue(s) that are assigned to you are due in the next %d days:"
 mail_subject_reminder: "%d issue(s) due in the next days"
 text_user_wrote: '%s wrote:'
+label_duplicated_by: duplicated by
diff --git a/lang/nl.yml b/lang/nl.yml
index eebc7d993..62bbc1468 100644
--- a/lang/nl.yml
+++ b/lang/nl.yml
@@ -623,3 +623,4 @@ label_and_its_subprojects: %s and its subprojects
 mail_body_reminder: "%d issue(s) that are assigned to you are due in the next %d days:"
 mail_subject_reminder: "%d issue(s) due in the next days"
 text_user_wrote: '%s wrote:'
+label_duplicated_by: duplicated by
diff --git a/lang/no.yml b/lang/no.yml
index 3f6ef6ded..d16509551 100644
--- a/lang/no.yml
+++ b/lang/no.yml
@@ -623,3 +623,4 @@ enumeration_activities: Aktiviteter (tidssporing)
 mail_body_reminder: "%d issue(s) that are assigned to you are due in the next %d days:"
 mail_subject_reminder: "%d issue(s) due in the next days"
 text_user_wrote: '%s wrote:'
+label_duplicated_by: duplicated by
diff --git a/lang/pl.yml b/lang/pl.yml
index 81a7a0dba..adf676210 100644
--- a/lang/pl.yml
+++ b/lang/pl.yml
@@ -622,3 +622,4 @@ label_and_its_subprojects: %s and its subprojects
 mail_body_reminder: "%d issue(s) that are assigned to you are due in the next %d days:"
 mail_subject_reminder: "%d issue(s) due in the next days"
 text_user_wrote: '%s wrote:'
+label_duplicated_by: duplicated by
diff --git a/lang/pt-br.yml b/lang/pt-br.yml
index 47e80a144..ca9b9073b 100644
--- a/lang/pt-br.yml
+++ b/lang/pt-br.yml
@@ -622,3 +622,4 @@ label_and_its_subprojects: %s and its subprojects
 mail_body_reminder: "%d issue(s) that are assigned to you are due in the next %d days:"
 mail_subject_reminder: "%d issue(s) due in the next days"
 text_user_wrote: '%s wrote:'
+label_duplicated_by: duplicated by
diff --git a/lang/pt.yml b/lang/pt.yml
index 002a1b7f8..f9472b7ea 100644
--- a/lang/pt.yml
+++ b/lang/pt.yml
@@ -622,3 +622,4 @@ label_and_its_subprojects: %s and its subprojects
 mail_body_reminder: "%d issue(s) that are assigned to you are due in the next %d days:"
 mail_subject_reminder: "%d issue(s) due in the next days"
 text_user_wrote: '%s wrote:'
+label_duplicated_by: duplicated by
diff --git a/lang/ro.yml b/lang/ro.yml
index 6bcd55a50..840fa7073 100644
--- a/lang/ro.yml
+++ b/lang/ro.yml
@@ -622,3 +622,4 @@ label_and_its_subprojects: %s and its subprojects
 mail_body_reminder: "%d issue(s) that are assigned to you are due in the next %d days:"
 mail_subject_reminder: "%d issue(s) due in the next days"
 text_user_wrote: '%s wrote:'
+label_duplicated_by: duplicated by
diff --git a/lang/ru.yml b/lang/ru.yml
index fa8fd69a9..91e509ffc 100644
--- a/lang/ru.yml
+++ b/lang/ru.yml
@@ -626,3 +626,4 @@ label_and_its_subprojects: %s and its subprojects
 mail_body_reminder: "%d issue(s) that are assigned to you are due in the next %d days:"
 mail_subject_reminder: "%d issue(s) due in the next days"
 text_user_wrote: '%s wrote:'
+label_duplicated_by: duplicated by
diff --git a/lang/sr.yml b/lang/sr.yml
index 9a4adf214..d507a1d97 100644
--- a/lang/sr.yml
+++ b/lang/sr.yml
@@ -623,3 +623,4 @@ label_and_its_subprojects: %s and its subprojects
 mail_body_reminder: "%d issue(s) that are assigned to you are due in the next %d days:"
 mail_subject_reminder: "%d issue(s) due in the next days"
 text_user_wrote: '%s wrote:'
+label_duplicated_by: duplicated by
diff --git a/lang/sv.yml b/lang/sv.yml
index 1ab11e98b..fbd7c5c40 100644
--- a/lang/sv.yml
+++ b/lang/sv.yml
@@ -623,3 +623,4 @@ label_and_its_subprojects: %s and its subprojects
 mail_body_reminder: "%d issue(s) that are assigned to you are due in the next %d days:"
 mail_subject_reminder: "%d issue(s) due in the next days"
 text_user_wrote: '%s wrote:'
+label_duplicated_by: duplicated by
diff --git a/lang/th.yml b/lang/th.yml
index 751aac749..9dfaf2865 100644
--- a/lang/th.yml
+++ b/lang/th.yml
@@ -625,3 +625,4 @@ label_and_its_subprojects: %s and its subprojects
 mail_body_reminder: "%d issue(s) that are assigned to you are due in the next %d days:"
 mail_subject_reminder: "%d issue(s) due in the next days"
 text_user_wrote: '%s wrote:'
+label_duplicated_by: duplicated by
diff --git a/lang/uk.yml b/lang/uk.yml
index 3ab4462ed..beabfd1f0 100644
--- a/lang/uk.yml
+++ b/lang/uk.yml
@@ -624,3 +624,4 @@ label_and_its_subprojects: %s and its subprojects
 mail_body_reminder: "%d issue(s) that are assigned to you are due in the next %d days:"
 mail_subject_reminder: "%d issue(s) due in the next days"
 text_user_wrote: '%s wrote:'
+label_duplicated_by: duplicated by
diff --git a/lang/zh-tw.yml b/lang/zh-tw.yml
index 3b7808aae..76db2f052 100644
--- a/lang/zh-tw.yml
+++ b/lang/zh-tw.yml
@@ -623,3 +623,4 @@ enumeration_activities: 活動 (時間追蹤)
 mail_body_reminder: "%d issue(s) that are assigned to you are due in the next %d days:"
 mail_subject_reminder: "%d issue(s) due in the next days"
 text_user_wrote: '%s wrote:'
+label_duplicated_by: duplicated by
diff --git a/lang/zh.yml b/lang/zh.yml
index b5ecace82..cdb7aed75 100644
--- a/lang/zh.yml
+++ b/lang/zh.yml
@@ -623,3 +623,4 @@ enumeration_activities: 活动（时间跟踪）
 mail_subject_reminder: "%d issue(s) due in the next days"
 mail_body_reminder: "%d issue(s) that are assigned to you are due in the next %d days:"
 text_user_wrote: '%s wrote:'
+label_duplicated_by: duplicated by

From 735db3dae5c16d13bf7ae3af992bb9b23644a4fa Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Wed, 4 Jun 2008 17:12:59 +0000
Subject: [PATCH 480/710] Allow empty cells in wiki tables.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1490 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 lib/redcloth.rb                              | 17 ++++--------
 test/unit/helpers/application_helper_test.rb | 29 ++++++++++++++++----
 2 files changed, 28 insertions(+), 18 deletions(-)

diff --git a/lib/redcloth.rb b/lib/redcloth.rb
index 344fd6c78..3880eb9d3 100644
--- a/lib/redcloth.rb
+++ b/lib/redcloth.rb
@@ -504,26 +504,19 @@ class RedCloth < String
             tatts = shelve( tatts ) if tatts
             rows = []
 
-            fullrow.
-            split( /\|$/m ).
-            delete_if { |x| x.empty? }.
-            each do |row|
-
+            fullrow.each_line do |row|
                 ratts, row = pba( $1, 'tr' ), $2 if row =~ /^(#{A}#{C}\. )(.*)/m
-                
                 cells = []
-                #row.split( /\(?!\[\[[^\]])|(?![^\[]\]\])/ ).each do |cell|
-                row.split( /\|(?![^\[\|]*\]\])/ ).each do |cell|
+                row.split( /(\|)(?![^\[\|]*\]\])/ )[1..-2].each do |cell|
+                    next if cell == '|'
                     ctyp = 'd'
                     ctyp = 'h' if cell =~ /^_/
 
                     catts = ''
                     catts, cell = pba( $1, 'td' ), $2 if cell =~ /^(_?#{S}#{A}#{C}\. ?)(.*)/
 
-                    unless cell.strip.empty?
-                        catts = shelve( catts ) if catts
-                        cells << "\t\t\t<t#{ ctyp }#{ catts }>#{ cell }</t#{ ctyp }>" 
-                    end
+                    catts = shelve( catts ) if catts
+                    cells << "\t\t\t<t#{ ctyp }#{ catts }>#{ cell }</t#{ ctyp }>" 
                 end
                 ratts = shelve( ratts ) if ratts
                 rows << "\t\t<tr#{ ratts }>\n#{ cells.join( "\n" ) }\n\t\t</tr>"
diff --git a/test/unit/helpers/application_helper_test.rb b/test/unit/helpers/application_helper_test.rb
index f8bf4a602..937d8aa20 100644
--- a/test/unit/helpers/application_helper_test.rb
+++ b/test/unit/helpers/application_helper_test.rb
@@ -152,12 +152,7 @@ class ApplicationHelperTest < HelperTestCase
   end
   
   def test_wiki_links_in_tables
-    to_test = {"|Cell 11|Cell 12|Cell 13|\n|Cell 21|Cell 22||\n|Cell 31||Cell 33|" => 
-                 '<tr><td>Cell 11</td><td>Cell 12</td><td>Cell 13</td></tr>' +
-                 '<tr><td>Cell 21</td><td>Cell 22</td></tr>' +
-                 '<tr><td>Cell 31</td><td>Cell 33</td></tr>',
-                 
-               "|[[Page|Link title]]|[[Other Page|Other title]]|\n|Cell 21|[[Last page]]|" =>
+    to_test = {"|[[Page|Link title]]|[[Other Page|Other title]]|\n|Cell 21|[[Last page]]|" =>
                  '<tr><td><a href="/wiki/ecookbook/Page" class="wiki-page new">Link title</a></td>' +
                  '<td><a href="/wiki/ecookbook/Other_Page" class="wiki-page new">Other title</a></td>' +
                  '</tr><tr><td>Cell 21</td><td><a href="/wiki/ecookbook/Last_page" class="wiki-page new">Last page</a></td></tr>'
@@ -218,6 +213,28 @@ EXPECTED
     assert_equal expected.gsub(%r{\s+}, ''), textilizable(raw).gsub(%r{\s+}, '')
   end
   
+  def test_table
+    raw = <<-RAW
+This is a table with empty cells:
+
+|cell11|cell12||
+|cell21||cell23|
+|cell31|cell32|cell33|
+RAW
+
+    expected = <<-EXPECTED
+<p>This is a table with empty cells:</p>
+
+<table>
+  <tr><td>cell11</td><td>cell12</td><td></td></tr>
+  <tr><td>cell21</td><td></td><td>cell23</td></tr>
+  <tr><td>cell31</td><td>cell32</td><td>cell33</td></tr>
+</table>
+EXPECTED
+
+    assert_equal expected.gsub(%r{\s+}, ''), textilizable(raw).gsub(%r{\s+}, '')
+  end
+  
   def test_macro_hello_world
     text = "{{hello_world}}"
     assert textilizable(text).match(/Hello world!/)

From 4db45b8ceddfa77e1935b7a4f1939b33d11244aa Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Wed, 4 Jun 2008 18:13:14 +0000
Subject: [PATCH 481/710] Fixed: changesets titles should not be multiline in
 atom feeds (#1356).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1491 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/helpers/application_helper.rb | 11 +++++++++--
 app/helpers/projects_helper.rb    |  4 ++++
 app/views/common/feed.atom.rxml   |  4 ++--
 app/views/projects/activity.rhtml |  3 ++-
 4 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 47a251053..589b054f3 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -90,6 +90,11 @@ module ApplicationHelper
     include_date ? local.strftime("#{@date_format} #{@time_format}") : local.strftime(@time_format)
   end
   
+  # Truncates and returns the string as a single line
+  def truncate_single_line(string, *args)
+    truncate(string, *args).gsub(%r{[\r\n]+}m, ' ')
+  end
+  
   def html_hours(text)
     text.gsub(%r{(\d+)\.(\d+)}, '<span class="hours hours-int">\1</span><span class="hours hours-dec">.\2</span>')
   end
@@ -301,7 +306,7 @@ module ApplicationHelper
           if project && (changeset = project.changesets.find_by_revision(oid))
             link = link_to("r#{oid}", {:only_path => only_path, :controller => 'repositories', :action => 'revision', :id => project, :rev => oid},
                                       :class => 'changeset',
-                                      :title => truncate(changeset.comments, 100))
+                                      :title => truncate_single_line(changeset.comments, 100))
           end
         elsif sep == '#'
           oid = oid.to_i
@@ -340,7 +345,9 @@ module ApplicationHelper
             end
           when 'commit'
             if project && (changeset = project.changesets.find(:first, :conditions => ["scmid LIKE ?", "#{name}%"]))
-              link = link_to h("#{name}"), {:only_path => only_path, :controller => 'repositories', :action => 'revision', :id => project, :rev => changeset.revision}, :class => 'changeset', :title => truncate(changeset.comments, 100)
+              link = link_to h("#{name}"), {:only_path => only_path, :controller => 'repositories', :action => 'revision', :id => project, :rev => changeset.revision},
+                                           :class => 'changeset',
+                                           :title => truncate_single_line(changeset.comments, 100)
             end
           when 'source', 'export'
             if project && project.repository
diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb
index ffbf25e83..49a2e5721 100644
--- a/app/helpers/projects_helper.rb
+++ b/app/helpers/projects_helper.rb
@@ -21,6 +21,10 @@ module ProjectsHelper
     link_to h(version.name), { :controller => 'versions', :action => 'show', :id => version }, options
   end
   
+  def format_activity_title(text)
+    h(truncate_single_line(text, 100))
+  end
+  
   def format_activity_day(date)
     date == Date.today ? l(:label_today).titleize : format_date(date)
   end
diff --git a/app/views/common/feed.atom.rxml b/app/views/common/feed.atom.rxml
index ac087d36b..8ceffc91c 100644
--- a/app/views/common/feed.atom.rxml
+++ b/app/views/common/feed.atom.rxml
@@ -1,6 +1,6 @@
 xml.instruct!
 xml.feed "xmlns" => "http://www.w3.org/2005/Atom" do
-  xml.title   @title
+  xml.title   truncate_single_line(@title, 100)
   xml.link    "rel" => "self", "href" => url_for(params.merge({:format => nil, :only_path => false}))
   xml.link    "rel" => "alternate", "href" => url_for(:controller => 'welcome', :only_path => false)
   xml.id      url_for(:controller => 'welcome', :only_path => false)
@@ -10,7 +10,7 @@ xml.feed "xmlns" => "http://www.w3.org/2005/Atom" do
   @items.each do |item|
     xml.entry do
       url = url_for(item.event_url(:only_path => false))
-      xml.title truncate(item.event_title, 100)
+      xml.title truncate_single_line(item.event_title, 100)
       xml.link "rel" => "alternate", "href" => url
       xml.id url
       xml.updated item.event_datetime.xmlschema
diff --git a/app/views/projects/activity.rhtml b/app/views/projects/activity.rhtml
index d4b47f7be..1a3fd9ff2 100644
--- a/app/views/projects/activity.rhtml
+++ b/app/views/projects/activity.rhtml
@@ -7,7 +7,8 @@
 <dl>
 <% @events_by_day[day].sort {|x,y| y.event_datetime <=> x.event_datetime }.each do |e| -%>
   <dt class="<%= e.event_type %>"><span class="time"><%= format_time(e.event_datetime, false) %></span>
-  <%= content_tag('span', h(e.project), :class => 'project') if @project.nil? || @project != e.project %> <%= link_to h(truncate(e.event_title, 100)), e.event_url %></dt>
+  <%= content_tag('span', h(e.project), :class => 'project') if @project.nil? || @project != e.project %>
+  <%= link_to format_activity_title(e.event_title), e.event_url %></dt>
   <dd><span class="description"><%= format_activity_description(e.event_description) %></span>
   <span class="author"><%= e.event_author if e.respond_to?(:event_author) %></span></dd>
 <% end -%>

From cd824c6ecf38c030603cec4a8c035fb2071421fc Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Wed, 4 Jun 2008 21:30:12 +0000
Subject: [PATCH 482/710] Redmine links regexp fix (#1369, url hash turned into
 a ticket link).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1492 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/helpers/application_helper.rb            | 2 +-
 test/unit/helpers/application_helper_test.rb | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 589b054f3..405c5bf44 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -298,7 +298,7 @@ module ApplicationHelper
     #     source:some/file#L120 -> Link to line 120 of the file
     #     source:some/file@52#L120 -> Link to line 120 of the file's revision 52
     #     export:some/file -> Force the download of the file
-    text = text.gsub(%r{([\s\(,-^])(!)?(attachment|document|version|commit|source|export)?((#|r)(\d+)|(:)([^"\s<>][^\s<>]*|"[^"]+"))(?=[[:punct:]]|\s|<|$)}) do |m|
+    text = text.gsub(%r{([\s\(,\-\>]|^)(!)?(attachment|document|version|commit|source|export)?((#|r)(\d+)|(:)([^"\s<>][^\s<>]*|"[^"]+"))(?=[[:punct:]]|\s|<|$)}) do |m|
       leading, esc, prefix, sep, oid = $1, $2, $3, $5 || $7, $6 || $8
       link = nil
       if esc.nil?
diff --git a/test/unit/helpers/application_helper_test.rb b/test/unit/helpers/application_helper_test.rb
index 937d8aa20..4f8ededd1 100644
--- a/test/unit/helpers/application_helper_test.rb
+++ b/test/unit/helpers/application_helper_test.rb
@@ -108,7 +108,9 @@ class ApplicationHelperTest < HelperTestCase
       '!version:"1.0"'              => 'version:"1.0"',
       '!source:/some/file'          => 'source:/some/file',
       # invalid expressions
-      'source:'                     => 'source:'
+      'source:'                     => 'source:',
+      # url hash
+      "http://foo.bar/FAQ#3"       => '<a class="external" href="http://foo.bar/FAQ#3">http://foo.bar/FAQ#3</a>',
     }
     @project = Project.find(1)
     to_test.each { |text, result| assert_equal "<p>#{result}</p>", textilizable(text) }

From a5ee8f89866c81c400d36568b6d140b2c501d439 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Fri, 6 Jun 2008 14:37:49 +0000
Subject: [PATCH 483/710] Fixed: SVN errors lead to svn username/password being
 displayed to end users (#1368).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1493 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 lib/redmine/scm/adapters/abstract_adapter.rb | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/lib/redmine/scm/adapters/abstract_adapter.rb b/lib/redmine/scm/adapters/abstract_adapter.rb
index 8fbae9ff8..9563ed800 100644
--- a/lib/redmine/scm/adapters/abstract_adapter.rb
+++ b/lib/redmine/scm/adapters/abstract_adapter.rb
@@ -118,7 +118,7 @@ module Redmine
         def logger
           RAILS_DEFAULT_LOGGER
         end
-      
+        
         def shellout(cmd, &block)
           logger.debug "Shelling out: #{cmd}" if logger && logger.debug?
           begin
@@ -127,11 +127,22 @@ module Redmine
               block.call(io) if block_given?
             end
           rescue Errno::ENOENT => e
+            msg = strip_credential(e.message)
             # The command failed, log it and re-raise
-            logger.error("SCM command failed: #{cmd}\n  with: #{e.message}")
-            raise CommandFailed.new(e.message)
+            logger.error("SCM command failed: #{strip_credential(cmd)}\n  with: #{msg}")
+            raise CommandFailed.new(msg)
           end
         end  
+        
+        # Hides username/password in a given command
+        def self.hide_credential(cmd)
+          q = (RUBY_PLATFORM =~ /mswin/ ? '"' : "'")
+          cmd.to_s.gsub(/(\-\-(password|username))\s+(#{q}[^#{q}]+#{q}|[^#{q}]\S+)/, '\\1 xxxx')
+        end
+        
+        def strip_credential(cmd)
+          self.class.hide_credential(cmd)
+        end
       end
       
       class Entries < Array

From 8aa57058cf0eafdf4fe02f4ab9e4ceb2d2d6d23b Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Fri, 6 Jun 2008 15:02:47 +0000
Subject: [PATCH 484/710] Trac importer: improves wiki link conversion (#1287).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1494 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 lib/tasks/migrate_from_trac.rake | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/tasks/migrate_from_trac.rake b/lib/tasks/migrate_from_trac.rake
index 5341fa14a..8d5a35fd0 100644
--- a/lib/tasks/migrate_from_trac.rake
+++ b/lib/tasks/migrate_from_trac.rake
@@ -237,7 +237,8 @@ namespace :redmine do
         text = text.gsub(/\[\"(.+)\".*\]/) {|s| "[[#{$1.delete(',./?;|:')}]]"}
         text = text.gsub(/\[wiki:\"(.+)\".*\]/) {|s| "[[#{$1.delete(',./?;|:')}]]"}
         text = text.gsub(/\[wiki:\"(.+)\".*\]/) {|s| "[[#{$1.delete(',./?;|:')}]]"}
-        text = text.gsub(/\[wiki:([^\s\]]+).*\]/) {|s| "[[#{$1.delete(',./?;|:')}]]"}
+        text = text.gsub(/\[wiki:([^\s\]]+)\]/) {|s| "[[#{$1.delete(',./?;|:')}]]"}
+        text = text.gsub(/\[wiki:([^\s\]]+)\s(.*)\]/) {|s| "[[#{$1.delete(',./?;|:')}|#{$2.delete(',./?;|:')}]]"}
 
 	# Links to pages UsingJustWikiCaps
 	text = text.gsub(/([^!]|^)(^| )([A-Z][a-z]+[A-Z][a-zA-Z]+)/, '\\1\\2[[\3]]')

From a0f83e42e42066a6b9b148f4bbc88b8ca26f7562 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Fri, 6 Jun 2008 15:14:09 +0000
Subject: [PATCH 485/710] Hides the "Replies" heading below a message if there
 is no reply (#1350).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1495 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/messages/show.rhtml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/views/messages/show.rhtml b/app/views/messages/show.rhtml
index 251b7c7a5..c04c40934 100644
--- a/app/views/messages/show.rhtml
+++ b/app/views/messages/show.rhtml
@@ -17,6 +17,7 @@
 </div>
 <br />
 
+<% unless @replies.empty? %>
 <h3 class="icon22 icon22-comment"><%= l(:label_reply_plural) %></h3>
 <% @replies.each do |message| %>
   <a name="<%= "message-#{message.id}" %>"></a>
@@ -30,6 +31,7 @@
   <%= link_to_attachments message.attachments, :no_author => true %>
   </div>
 <% end %>
+<% end %>
 
 <% if !@topic.locked? && authorize_for('messages', 'reply') %>
 <p><%= toggle_link l(:button_reply), "reply", :focus => 'message_content' %></p>

From 9f901a0ba2188368d64e65c9a2b35abba520cd33 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Fri, 6 Jun 2008 15:20:08 +0000
Subject: [PATCH 486/710] Fixed: Atom link on saved query does not include
 query_id (#1390).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1496 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/issues/index.rhtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/issues/index.rhtml b/app/views/issues/index.rhtml
index 027f3f006..973f3eb25 100644
--- a/app/views/issues/index.rhtml
+++ b/app/views/issues/index.rhtml
@@ -45,7 +45,7 @@
 
 <p class="other-formats">
 <%= l(:label_export_to) %>
-<span><%= link_to 'Atom', {:format => 'atom', :key => User.current.rss_key}, :class => 'feed' %></span>
+<span><%= link_to 'Atom', {:query_id => @query, :format => 'atom', :key => User.current.rss_key}, :class => 'feed' %></span>
 <span><%= link_to 'CSV', {:format => 'csv'}, :class => 'csv' %></span>
 <span><%= link_to 'PDF', {:format => 'pdf'}, :class => 'pdf' %></span>
 </p>

From f4aa04b96e4b4eaa77ff1bda7490935f5db23232 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sat, 7 Jun 2008 08:39:06 +0000
Subject: [PATCH 487/710] Fixes Chinese pdf export when the issue description
 is too long (#1170).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1497 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 vendor/plugins/rfpdf/lib/rfpdf/chinese.rb | 946 +++++++++++-----------
 1 file changed, 473 insertions(+), 473 deletions(-)

diff --git a/vendor/plugins/rfpdf/lib/rfpdf/chinese.rb b/vendor/plugins/rfpdf/lib/rfpdf/chinese.rb
index 6fe3eee8a..5684c702d 100644
--- a/vendor/plugins/rfpdf/lib/rfpdf/chinese.rb
+++ b/vendor/plugins/rfpdf/lib/rfpdf/chinese.rb
@@ -1,473 +1,473 @@
-# Copyright (c) 2006 4ssoM LLC <www.4ssoM.com>
-# 1.12 contributed by Ed Moss.
-#
-# The MIT License
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-#
-# This is direct port of chinese.php
-#
-# Chinese PDF support.
-#
-# Usage is as follows:
-#
-# require 'fpdf'
-# require 'chinese'
-# pdf = FPDF.new
-# pdf.extend(PDF_Chinese)
-#
-# This allows it to be combined with other extensions, such as the bookmark
-# module.
-
-module PDF_Chinese
-
-  Big5_widths={' '=>250,'!'=>250,'"'=>408,'#'=>668,''=>490,'%'=>875,'&'=>698,'\''=>250,
-  	'('=>240,')'=>240,'*'=>417,'+'=>667,','=>250,'-'=>313,'.'=>250,'/'=>520,'0'=>500,'1'=>500,
-  	'2'=>500,'3'=>500,'4'=>500,'5'=>500,'6'=>500,'7'=>500,'8'=>500,'9'=>500,':'=>250,''=>250,
-  	'<'=>667,'='=>667,'>'=>667,'?'=>396,'@'=>921,'A'=>677,'B'=>615,'C'=>719,'D'=>760,'E'=>625,
-  	'F'=>552,'G'=>771,'H'=>802,'I'=>354,'J'=>354,'K'=>781,'L'=>604,'M'=>927,'N'=>750,'O'=>823,
-  	'P'=>563,'Q'=>823,'R'=>729,'S'=>542,'T'=>698,'U'=>771,'V'=>729,'W'=>948,'X'=>771,'Y'=>677,
-  	'Z'=>635,'['=>344,'\\'=>520,']'=>344,'^'=>469,'_'=>500,'`'=>250,'a'=>469,'b'=>521,'c'=>427,
-  	'd'=>521,'e'=>438,'f'=>271,'g'=>469,'h'=>531,'i'=>250,'j'=>250,'k'=>458,'l'=>240,'m'=>802,
-  	'n'=>531,'o'=>500,'p'=>521,'q'=>521,'r'=>365,'s'=>333,'t'=>292,'u'=>521,'v'=>458,'w'=>677,
-  	'x'=>479,'y'=>458,'z'=>427,'{'=>480,'|'=>496,'end'=>480,'~'=>667}
-
-  GB_widths={' '=>207,'!'=>270,'"'=>342,'#'=>467,''=>462,'%'=>797,'&'=>710,'\''=>239,
-  	'('=>374,')'=>374,'*'=>423,'+'=>605,','=>238,'-'=>375,'.'=>238,'/'=>334,'0'=>462,'1'=>462,
-  	'2'=>462,'3'=>462,'4'=>462,'5'=>462,'6'=>462,'7'=>462,'8'=>462,'9'=>462,':'=>238,''=>238,
-  	'<'=>605,'='=>605,'>'=>605,'?'=>344,'@'=>748,'A'=>684,'B'=>560,'C'=>695,'D'=>739,'E'=>563,
-  	'F'=>511,'G'=>729,'H'=>793,'I'=>318,'J'=>312,'K'=>666,'L'=>526,'M'=>896,'N'=>758,'O'=>772,
-  	'P'=>544,'Q'=>772,'R'=>628,'S'=>465,'T'=>607,'U'=>753,'V'=>711,'W'=>972,'X'=>647,'Y'=>620,
-  	'Z'=>607,'['=>374,'\\'=>333,']'=>374,'^'=>606,'_'=>500,'`'=>239,'a'=>417,'b'=>503,'c'=>427,
-  	'd'=>529,'e'=>415,'f'=>264,'g'=>444,'h'=>518,'i'=>241,'j'=>230,'k'=>495,'l'=>228,'m'=>793,
-  	'n'=>527,'o'=>524,'p'=>524,'q'=>504,'r'=>338,'s'=>336,'t'=>277,'u'=>517,'v'=>450,'w'=>652,
-  	'x'=>466,'y'=>452,'z'=>407,'{'=>370,'|'=>258,'end'=>370,'~'=>605}
-
-  def AddCIDFont(family,style,name,cw,cMap,registry)
-#ActionController::Base::logger.debug registry.to_a.join(":").to_s
-  	fontkey=family.downcase+style.upcase
-  	unless @fonts[fontkey].nil?
-  		Error("Font already added: family style")
-		end
-  	i=@fonts.length+1
-  	name=name.gsub(' ','')
-    @fonts[fontkey]={'i'=>i,'type'=>'Type0','name'=>name,'up'=>-130,'ut'=>40,'cw'=>cw, 'CMap'=>cMap,'registry'=>registry}
-  end
-
-  def AddCIDFonts(family,name,cw,cMap,registry)
-  	AddCIDFont(family,'',name,cw,cMap,registry)
-  	AddCIDFont(family,'B',name+',Bold',cw,cMap,registry)
-  	AddCIDFont(family,'I',name+',Italic',cw,cMap,registry)
-  	AddCIDFont(family,'BI',name+',BoldItalic',cw,cMap,registry)
-  end
-
-  def AddBig5Font(family='Big5',name='MSungStd-Light-Acro')
-  	#Add Big5 font with proportional Latin
-  	cw=Big5_widths
-  	cMap='ETenms-B5-H'
-  	registry={'ordering'=>'CNS1','supplement'=>0}
-#ActionController::Base::logger.debug registry.to_a.join(":").to_s
-  	AddCIDFonts(family,name,cw,cMap,registry)
-  end
-
-  def AddBig5hwFont(family='Big5-hw',name='MSungStd-Light-Acro')
-  	#Add Big5 font with half-witdh Latin
-    cw = {}
-    32.upto(126) do |i|
-  		cw[i.chr]=500
-		end
-  	cMap='ETen-B5-H'
-  	registry={'ordering'=>'CNS1','supplement'=>0}
-  	AddCIDFonts(family,name,cw,cMap,registry)
-  end
-
-  def AddGBFont(family='GB',name='STSongStd-Light-Acro')
-  	#Add GB font with proportional Latin
-  	cw=GB_widths
-  	cMap='GBKp-EUC-H'
-  	registry={'ordering'=>'GB1','supplement'=>2}
-  	AddCIDFonts(family,name,cw,cMap,registry)
-  end
-
-  def AddGBhwFont(family='GB-hw',name='STSongStd-Light-Acro')
-  	#Add GB font with half-width Latin
-    32.upto(126) do |i|
-  		cw[i.chr]=500
-		end
-  	cMap='GBK-EUC-H'
-  	registry={'ordering'=>'GB1','supplement'=>2}
-  	AddCIDFonts(family,name,cw,cMap,registry)
-  end
-
-  def GetStringWidth(s)
-  	if(@CurrentFont['type']=='Type0')
-  		return GetMBStringWidth(s)
-  	else
-  		return super(s)
-		end
-  end
-
-  def GetMBStringWidth(s)
-  	#Multi-byte version of GetStringWidth()
-  	l=0
-  	cw=@CurrentFont['cw']
-  	nb=s.length
-  	i=0
-  	while(i<nb)
-  		c=s[i]
-  		if(c<128)
-  			l+=cw[c.chr] if cw[c.chr]
-  			i+=1
-  		else
-  			l+=1000
-  			i+=2
-  		end
-  	end
-  	return l*@FontSize/1000
-  end
-
-  def MultiCell(w,h,txt,border=0,align='L',fill=0)
-  	if(@CurrentFont['type']=='Type0')
-  		MBMultiCell(w,h,txt,border,align,fill)
-  	else
-  		super(w,h,txt,border,align,fill)
-		end
-  end
-
-  def MBMultiCell(w,h,txt,border=0,align='L',fill=0)
-  	#Multi-byte version of MultiCell()
-  	cw=@CurrentFont['cw']
-  	if(w==0)
-  		w=@w-@rMargin-@x
-		end
-  	wmax=(w-2*@cMargin)*1000/@FontSize
-  	s=txt.gsub("\r",'')
-  	nb=s.length
-  	if(nb>0 and s[nb-1]=="\n")
-  		nb-=1
-		end
-  	b=0
-  	if(border)
-  		if(border==1)
-  			border='LTRB'
-  			b='LRT'
-  			b2='LR'
-  		else
-  			b2=''
-  			if(border.to_s.index('L'))
-  				b2+='L'
-				end
-  			if(border.to_s.index('R'))
-  				b2+='R'
-				end
-  			b=border.to_s.index('T') ? b2+'T' : b2
-  		end
-  	end
-  	sep=-1
-  	i=0
-  	j=0
-  	l=0
-  	nl=1
-  	while(i<nb)
-  		#Get next character
-  		c=s[i]
-  		#Check if ASCII or MB
-  		ascii=(c<128)
-  		if(c=="\n")
-  			#Explicit line break
-  			Cell(w,h,s[j,i-j],b,2,align,fill)
-  			i+=1
-  			sep=-1
-  			j=i
-  			l=0
-  			nl+=1
-  			if(border and nl==2)
-  				b=b2
-				end
-  			next
-  		end
-  		if(!ascii)
-  			sep=i
-  			ls=l
-  		elsif(c==' ')
-  			sep=i
-  			ls=l
-  		end
-  		l+=ascii ? (cw[c.chr] || 0) : 1000
-  		if(l>wmax)
-  			#Automatic line break
-  			if(sep==-1 or i==j)
-  				if(i==j)
-  					i+=ascii ? 1 : 2
-					end
-  				Cell(w,h,s[j,i-j],b,2,align,fill)
-  			else
-  				Cell(w,h,s[j,sep-j],b,2,align,fill)
-  				i=(s[sep]==' ') ? sep+1 : sep
-  			end
-  			sep=-1
-  			j=i
-  			l=0
-#  			nl+=1
-  			if(border and nl==2)
-  				b=b2
-  			end
-  		else
-  			i+=ascii ? 1 : 2
-  		end
-  	end
-  	#Last chunk
-  	if(border and not border.to_s.index('B').nil?)
-  		b+='B'
-		end
-  	Cell(w,h,s[j,i-j],b,2,align,fill)
-  	@x=@lMargin
-  end
-
-  def Write(h,txt,link='')
-  	if(@CurrentFont['type']=='Type0')
-  		MBWrite(h,txt,link)
-  	else
-  		super(h,txt,link)
-		end
-  end
-
-  def MBWrite(h,txt,link)
-  	#Multi-byte version of Write()
-  	cw=@CurrentFont['cw']
-  	w=@w-@rMargin-@x
-  	wmax=(w-2*@cMargin)*1000/@FontSize
-  	s=txt.gsub("\r",'')
-  	nb=s.length
-  	sep=-1
-  	i=0
-  	j=0
-  	l=0
-  	nl=1
-  	while(i<nb)
-  		#Get next character
-  		c=s[i]
-  		#Check if ASCII or MB
-  		ascii=(c<128)
-  		if(c=="\n")
-  			#Explicit line break
-  			Cell(w,h,s[j,i-j],0,2,'',0,link)
-  			i+=1
-  			sep=-1
-  			j=i
-  			l=0
-  			if(nl==1)
-  				@x=@lMargin
-  				w=@w-@rMargin-@x
-  				wmax=(w-2*@cMargin)*1000/@FontSize
-  			end
-  			nl+=1
-  			next
-  		end
-  		if(!ascii or c==' ')
-  			sep=i
-			end
-  		l+=ascii ? cw[c.chr] : 1000
-  		if(l>wmax)
-  			#Automatic line break
-  			if(sep==-1 or i==j)
-  				if(@x>@lMargin)
-  					#Move to next line
-  					@x=@lMargin
-  					@y+=h
-  					w=@w-@rMargin-@x
-  					wmax=(w-2*@cMargin)*1000/@FontSize
-  					i+=1
-  					nl+=1
-  					next
-  				end
-  				if(i==j)
-  					i+=ascii ? 1 : 2
-					end
-  				Cell(w,h,s[j,i-j],0,2,'',0,link)
-  			else
-  				Cell(w,h,s[j,sep-j],0,2,'',0,link)
-  				i=(s[sep]==' ') ? sep+1 : sep
-  			end
-  			sep=-1
-  			j=i
-  			l=0
-  			if(nl==1)
-  				@x=@lMargin
-  				w=@w-@rMargin-@x
-  				wmax=(w-2*@cMargin)*1000/@FontSize
-  			end
-  			nl+=1
-  		else
-  			i+=ascii ? 1 : 2
-			end
-  	end
-  	#Last chunk
-  	if(i!=j)
-  		Cell(l/1000*@FontSize,h,s[j,i-j],0,0,'',0,link)
-		end
-  end
-
-private
-
-  def putfonts()
-  	nf=@n
-    @diffs.each do |diff|
-  		#Encodings
-  		newobj()
-  		out('<</Type /Encoding /BaseEncoding /WinAnsiEncoding /Differences ['+diff+']>>')
-  		out('endobj')
-  	end
-  	# mqr=get_magic_quotes_runtime()
-  	# set_magic_quotes_runtime(0)
-    @FontFiles.each_pair do |file, info|
-  		#Font file embedding
-  		newobj()
-  		@FontFiles[file]['n']=@n
-  		if(defined('FPDF_FONTPATH'))
-  			file=FPDF_FONTPATH+file
-			end
-  		size=filesize(file)
-  		if(!size)
-  			Error('Font file not found')
-			end
-  		out('<</Length '+size)
-  		if(file[-2]=='.z')
-  			out('/Filter /FlateDecode')
-			end
-  		out('/Length1 '+info['length1'])
-  		unless info['length2'].nil?
-  			out('/Length2 '+info['length2']+' /Length3 0')
-			end
-  		out('>>')
-  		f=fopen(file,'rb')
-  		putstream(fread(f,size))
-  		fclose(f)
-  		out('endobj')
-  	end
-#
-  	# set_magic_quotes_runtime(mqr)
-#
-    @fonts.each_pair do |k, font|
-  		#Font objects
-  		newobj()
-  		@fonts[k]['n']=@n
-  		out('<</Type /Font')
-  		if(font['type']=='Type0')
-  			putType0(font)
-  		else
-  			name=font['name']
-  			out('/BaseFont /'+name)
-  			if(font['type']=='core')
-  				#Standard font
-  				out('/Subtype /Type1')
-  				if(name!='Symbol' and name!='ZapfDingbats')
-  					out('/Encoding /WinAnsiEncoding')
-  			end
-  			else
-  				#Additional font
-  				out('/Subtype /'+font['type'])
-  				out('/FirstChar 32')
-  				out('/LastChar 255')
-  				out('/Widths '+(@n+1)+' 0 R')
-  				out('/FontDescriptor '+(@n+2)+' 0 R')
-  				if(font['enc'])
-  					if !font['diff'].nil?
-  						out('/Encoding '+(nf+font['diff'])+' 0 R')
-  					else
-  						out('/Encoding /WinAnsiEncoding')
-  					end
-  				end
-  			end
-  			out('>>')
-  			out('endobj')
-  			if(font['type']!='core')
-  				#Widths
-  				newobj()
-  				cw=font['cw']
-  				s='['
-          32.upto(255) do |i|
-  					s+=cw[i.chr]+' '
-  				end
-  				out(s+']')
-  				out('endobj')
-  				#Descriptor
-  				newobj()
-  				s='<</Type /FontDescriptor /FontName /'+name
-  				font['desc'].each_pair do |k, v|
-  					s+=' /'+k+' '+v
-  				end
-  				file=font['file']
-  				if(file)
-  					s+=' /FontFile'+(font['type']=='Type1' ? '' : '2')+' '+@FontFiles[file]['n']+' 0 R'
-  				end
-  				out(s+'>>')
-  				out('endobj')
-  			end
-  		end
-  	end
-  end
-
-  def putType0(font)
-  	#Type0
-  	out('/Subtype /Type0')
-  	out('/BaseFont /'+font['name']+'-'+font['CMap'])
-  	out('/Encoding /'+font['CMap'])
-  	out('/DescendantFonts ['+(@n+1).to_s+' 0 R]')
-  	out('>>')
-  	out('endobj')
-  	#CIDFont
-  	newobj()
-  	out('<</Type /Font')
-  	out('/Subtype /CIDFontType0')
-  	out('/BaseFont /'+font['name'])
-  	out('/CIDSystemInfo <</Registry '+textstring('Adobe')+' /Ordering '+textstring(font['registry']['ordering'])+' /Supplement '+font['registry']['supplement'].to_s+'>>')
-  	out('/FontDescriptor '+(@n+1).to_s+' 0 R')
-  	if(font['CMap']=='ETen-B5-H')
-  		w='13648 13742 500'
-  	elsif(font['CMap']=='GBK-EUC-H')
-  		w='814 907 500 7716 [500]'
-  	else
-      # ActionController::Base::logger.debug font['cw'].keys.sort.join(' ').to_s
-      # ActionController::Base::logger.debug font['cw'].values.join(' ').to_s
-  		w='1 ['
-  		font['cw'].keys.sort.each {|key|
-  		  w+=font['cw'][key].to_s + " "
-# ActionController::Base::logger.debug key.to_s
-# ActionController::Base::logger.debug font['cw'][key].to_s
-  		}
-  		w +=']'
-  	end
-  	out('/W ['+w+']>>')
-  	out('endobj')
-  	#Font descriptor
-  	newobj()
-  	out('<</Type /FontDescriptor')
-  	out('/FontName /'+font['name'])
-  	out('/Flags 6')
-  	out('/FontBBox [0 -200 1000 900]')
-  	out('/ItalicAngle 0')
-  	out('/Ascent 800')
-  	out('/Descent -200')
-  	out('/CapHeight 800')
-  	out('/StemV 50')
-  	out('>>')
-  	out('endobj')
-  end
-end
+# Copyright (c) 2006 4ssoM LLC <www.4ssoM.com>
+# 1.12 contributed by Ed Moss.
+#
+# The MIT License
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+#
+# This is direct port of chinese.php
+#
+# Chinese PDF support.
+#
+# Usage is as follows:
+#
+# require 'fpdf'
+# require 'chinese'
+# pdf = FPDF.new
+# pdf.extend(PDF_Chinese)
+#
+# This allows it to be combined with other extensions, such as the bookmark
+# module.
+
+module PDF_Chinese
+
+  Big5_widths={' '=>250,'!'=>250,'"'=>408,'#'=>668,''=>490,'%'=>875,'&'=>698,'\''=>250,
+  	'('=>240,')'=>240,'*'=>417,'+'=>667,','=>250,'-'=>313,'.'=>250,'/'=>520,'0'=>500,'1'=>500,
+  	'2'=>500,'3'=>500,'4'=>500,'5'=>500,'6'=>500,'7'=>500,'8'=>500,'9'=>500,':'=>250,''=>250,
+  	'<'=>667,'='=>667,'>'=>667,'?'=>396,'@'=>921,'A'=>677,'B'=>615,'C'=>719,'D'=>760,'E'=>625,
+  	'F'=>552,'G'=>771,'H'=>802,'I'=>354,'J'=>354,'K'=>781,'L'=>604,'M'=>927,'N'=>750,'O'=>823,
+  	'P'=>563,'Q'=>823,'R'=>729,'S'=>542,'T'=>698,'U'=>771,'V'=>729,'W'=>948,'X'=>771,'Y'=>677,
+  	'Z'=>635,'['=>344,'\\'=>520,']'=>344,'^'=>469,'_'=>500,'`'=>250,'a'=>469,'b'=>521,'c'=>427,
+  	'd'=>521,'e'=>438,'f'=>271,'g'=>469,'h'=>531,'i'=>250,'j'=>250,'k'=>458,'l'=>240,'m'=>802,
+  	'n'=>531,'o'=>500,'p'=>521,'q'=>521,'r'=>365,'s'=>333,'t'=>292,'u'=>521,'v'=>458,'w'=>677,
+  	'x'=>479,'y'=>458,'z'=>427,'{'=>480,'|'=>496,'end'=>480,'~'=>667}
+
+  GB_widths={' '=>207,'!'=>270,'"'=>342,'#'=>467,''=>462,'%'=>797,'&'=>710,'\''=>239,
+  	'('=>374,')'=>374,'*'=>423,'+'=>605,','=>238,'-'=>375,'.'=>238,'/'=>334,'0'=>462,'1'=>462,
+  	'2'=>462,'3'=>462,'4'=>462,'5'=>462,'6'=>462,'7'=>462,'8'=>462,'9'=>462,':'=>238,''=>238,
+  	'<'=>605,'='=>605,'>'=>605,'?'=>344,'@'=>748,'A'=>684,'B'=>560,'C'=>695,'D'=>739,'E'=>563,
+  	'F'=>511,'G'=>729,'H'=>793,'I'=>318,'J'=>312,'K'=>666,'L'=>526,'M'=>896,'N'=>758,'O'=>772,
+  	'P'=>544,'Q'=>772,'R'=>628,'S'=>465,'T'=>607,'U'=>753,'V'=>711,'W'=>972,'X'=>647,'Y'=>620,
+  	'Z'=>607,'['=>374,'\\'=>333,']'=>374,'^'=>606,'_'=>500,'`'=>239,'a'=>417,'b'=>503,'c'=>427,
+  	'd'=>529,'e'=>415,'f'=>264,'g'=>444,'h'=>518,'i'=>241,'j'=>230,'k'=>495,'l'=>228,'m'=>793,
+  	'n'=>527,'o'=>524,'p'=>524,'q'=>504,'r'=>338,'s'=>336,'t'=>277,'u'=>517,'v'=>450,'w'=>652,
+  	'x'=>466,'y'=>452,'z'=>407,'{'=>370,'|'=>258,'end'=>370,'~'=>605}
+
+  def AddCIDFont(family,style,name,cw,cMap,registry)
+#ActionController::Base::logger.debug registry.to_a.join(":").to_s
+  	fontkey=family.downcase+style.upcase
+  	unless @fonts[fontkey].nil?
+  		Error("Font already added: family style")
+		end
+  	i=@fonts.length+1
+  	name=name.gsub(' ','')
+    @fonts[fontkey]={'i'=>i,'type'=>'Type0','name'=>name,'up'=>-130,'ut'=>40,'cw'=>cw, 'CMap'=>cMap,'registry'=>registry}
+  end
+
+  def AddCIDFonts(family,name,cw,cMap,registry)
+  	AddCIDFont(family,'',name,cw,cMap,registry)
+  	AddCIDFont(family,'B',name+',Bold',cw,cMap,registry)
+  	AddCIDFont(family,'I',name+',Italic',cw,cMap,registry)
+  	AddCIDFont(family,'BI',name+',BoldItalic',cw,cMap,registry)
+  end
+
+  def AddBig5Font(family='Big5',name='MSungStd-Light-Acro')
+  	#Add Big5 font with proportional Latin
+  	cw=Big5_widths
+  	cMap='ETenms-B5-H'
+  	registry={'ordering'=>'CNS1','supplement'=>0}
+#ActionController::Base::logger.debug registry.to_a.join(":").to_s
+  	AddCIDFonts(family,name,cw,cMap,registry)
+  end
+
+  def AddBig5hwFont(family='Big5-hw',name='MSungStd-Light-Acro')
+  	#Add Big5 font with half-witdh Latin
+    cw = {}
+    32.upto(126) do |i|
+  		cw[i.chr]=500
+		end
+  	cMap='ETen-B5-H'
+  	registry={'ordering'=>'CNS1','supplement'=>0}
+  	AddCIDFonts(family,name,cw,cMap,registry)
+  end
+
+  def AddGBFont(family='GB',name='STSongStd-Light-Acro')
+  	#Add GB font with proportional Latin
+  	cw=GB_widths
+  	cMap='GBKp-EUC-H'
+  	registry={'ordering'=>'GB1','supplement'=>2}
+  	AddCIDFonts(family,name,cw,cMap,registry)
+  end
+
+  def AddGBhwFont(family='GB-hw',name='STSongStd-Light-Acro')
+  	#Add GB font with half-width Latin
+    32.upto(126) do |i|
+  		cw[i.chr]=500
+		end
+  	cMap='GBK-EUC-H'
+  	registry={'ordering'=>'GB1','supplement'=>2}
+  	AddCIDFonts(family,name,cw,cMap,registry)
+  end
+
+  def GetStringWidth(s)
+  	if(@CurrentFont['type']=='Type0')
+  		return GetMBStringWidth(s)
+  	else
+  		return super(s)
+		end
+  end
+
+  def GetMBStringWidth(s)
+  	#Multi-byte version of GetStringWidth()
+  	l=0
+  	cw=@CurrentFont['cw']
+  	nb=s.length
+  	i=0
+  	while(i<nb)
+  		c=s[i]
+  		if(c<128)
+  			l+=cw[c.chr] if cw[c.chr]
+  			i+=1
+  		else
+  			l+=1000
+  			i+=2
+  		end
+  	end
+  	return l*@FontSize/1000
+  end
+
+  def MultiCell(w,h,txt,border=0,align='L',fill=0)
+  	if(@CurrentFont['type']=='Type0')
+  		MBMultiCell(w,h,txt,border,align,fill)
+  	else
+  		super(w,h,txt,border,align,fill)
+		end
+  end
+
+  def MBMultiCell(w,h,txt,border=0,align='L',fill=0)
+  	#Multi-byte version of MultiCell()
+  	cw=@CurrentFont['cw']
+  	if(w==0)
+  		w=@w-@rMargin-@x
+		end
+  	wmax=(w-2*@cMargin)*1000/@FontSize
+  	s=txt.gsub("\r",'')
+  	nb=s.length
+  	if(nb>0 and s[nb-1]=="\n")
+  		nb-=1
+		end
+  	b=0
+  	if(border)
+  		if(border==1)
+  			border='LTRB'
+  			b='LRT'
+  			b2='LR'
+  		else
+  			b2=''
+  			if(border.to_s.index('L'))
+  				b2+='L'
+				end
+  			if(border.to_s.index('R'))
+  				b2+='R'
+				end
+  			b=border.to_s.index('T') ? b2+'T' : b2
+  		end
+  	end
+  	sep=-1
+  	i=0
+  	j=0
+  	l=0
+  	nl=1
+  	while(i<nb)
+  		#Get next character
+  		c=s[i]
+  		#Check if ASCII or MB
+  		ascii=(c<128)
+  		if(c.chr=="\n")
+  			#Explicit line break
+  			Cell(w,h,s[j,i-j],b,2,align,fill)
+  			i+=1
+  			sep=-1
+  			j=i
+  			l=0
+  			nl+=1
+  			if(border and nl==2)
+  				b=b2
+				end
+  			next
+  		end
+  		if(!ascii)
+  			sep=i
+  			ls=l
+  		elsif(c==' ')
+  			sep=i
+  			ls=l
+  		end
+  		l+=ascii ? (cw[c.chr] || 0) : 1100
+  		if(l>wmax)
+  			#Automatic line break
+  			if(sep==-1 or i==j)
+  				if(i==j)
+  					i+=ascii ? 1 : 3
+					end
+  				Cell(w,h,s[j,i-j],b,2,align,fill)
+  			else
+  				Cell(w,h,s[j,sep-j],b,2,align,fill)
+  				i=(s[sep]==' ') ? sep+1 : sep
+  			end
+  			sep=-1
+  			j=i
+  			l=0
+#  			nl+=1
+  			if(border and nl==2)
+  				b=b2
+  			end
+  		else
+  			i+=ascii ? 1 : 3
+  		end
+  	end
+  	#Last chunk
+  	if(border and not border.to_s.index('B').nil?)
+  		b+='B'
+		end
+  	Cell(w,h,s[j,i-j],b,2,align,fill)
+  	@x=@lMargin
+  end
+
+  def Write(h,txt,link='')
+  	if(@CurrentFont['type']=='Type0')
+  		MBWrite(h,txt,link)
+  	else
+  		super(h,txt,link)
+		end
+  end
+
+  def MBWrite(h,txt,link)
+  	#Multi-byte version of Write()
+  	cw=@CurrentFont['cw']
+  	w=@w-@rMargin-@x
+  	wmax=(w-2*@cMargin)*1000/@FontSize
+  	s=txt.gsub("\r",'')
+  	nb=s.length
+  	sep=-1
+  	i=0
+  	j=0
+  	l=0
+  	nl=1
+  	while(i<nb)
+  		#Get next character
+  		c=s[i]
+  		#Check if ASCII or MB
+  		ascii=(c<128)
+  		if(c.chr=="\n")
+  			#Explicit line break
+  			Cell(w,h,s[j,i-j],0,2,'',0,link)
+  			i+=1
+  			sep=-1
+  			j=i
+  			l=0
+  			if(nl==1)
+  				@x=@lMargin
+  				w=@w-@rMargin-@x
+  				wmax=(w-2*@cMargin)*1000/@FontSize
+  			end
+  			nl+=1
+  			next
+  		end
+  		if(!ascii or c==' ')
+  			sep=i
+			end
+  		l+=ascii ? cw[c.chr] : 1100
+  		if(l>wmax)
+  			#Automatic line break
+  			if(sep==-1 or i==j)
+  				if(@x>@lMargin)
+  					#Move to next line
+  					@x=@lMargin
+  					@y+=h
+  					w=@w-@rMargin-@x
+  					wmax=(w-2*@cMargin)*1000/@FontSize
+  					i+=1
+  					nl+=1
+  					next
+  				end
+  				if(i==j)
+  					i+=ascii ? 1 : 3
+					end
+  				Cell(w,h,s[j,i-j],0,2,'',0,link)
+  			else
+  				Cell(w,h,s[j,sep-j],0,2,'',0,link)
+  				i=(s[sep]==' ') ? sep+1 : sep
+  			end
+  			sep=-1
+  			j=i
+  			l=0
+  			if(nl==1)
+  				@x=@lMargin
+  				w=@w-@rMargin-@x
+  				wmax=(w-2*@cMargin)*1000/@FontSize
+  			end
+  			nl+=1
+  		else
+  			i+=ascii ? 1 : 3
+			end
+  	end
+  	#Last chunk
+  	if(i!=j)
+  		Cell(l/1000*@FontSize,h,s[j,i-j],0,0,'',0,link)
+		end
+  end
+
+private
+
+  def putfonts()
+  	nf=@n
+    @diffs.each do |diff|
+  		#Encodings
+  		newobj()
+  		out('<</Type /Encoding /BaseEncoding /WinAnsiEncoding /Differences ['+diff+']>>')
+  		out('endobj')
+  	end
+  	# mqr=get_magic_quotes_runtime()
+  	# set_magic_quotes_runtime(0)
+    @FontFiles.each_pair do |file, info|
+  		#Font file embedding
+  		newobj()
+  		@FontFiles[file]['n']=@n
+  		if(defined('FPDF_FONTPATH'))
+  			file=FPDF_FONTPATH+file
+			end
+  		size=filesize(file)
+  		if(!size)
+  			Error('Font file not found')
+			end
+  		out('<</Length '+size)
+  		if(file[-2]=='.z')
+  			out('/Filter /FlateDecode')
+			end
+  		out('/Length1 '+info['length1'])
+  		unless info['length2'].nil?
+  			out('/Length2 '+info['length2']+' /Length3 0')
+			end
+  		out('>>')
+  		f=fopen(file,'rb')
+  		putstream(fread(f,size))
+  		fclose(f)
+  		out('endobj')
+  	end
+#
+  	# set_magic_quotes_runtime(mqr)
+#
+    @fonts.each_pair do |k, font|
+  		#Font objects
+  		newobj()
+  		@fonts[k]['n']=@n
+  		out('<</Type /Font')
+  		if(font['type']=='Type0')
+  			putType0(font)
+  		else
+  			name=font['name']
+  			out('/BaseFont /'+name)
+  			if(font['type']=='core')
+  				#Standard font
+  				out('/Subtype /Type1')
+  				if(name!='Symbol' and name!='ZapfDingbats')
+  					out('/Encoding /WinAnsiEncoding')
+  			end
+  			else
+  				#Additional font
+  				out('/Subtype /'+font['type'])
+  				out('/FirstChar 32')
+  				out('/LastChar 255')
+  				out('/Widths '+(@n+1)+' 0 R')
+  				out('/FontDescriptor '+(@n+2)+' 0 R')
+  				if(font['enc'])
+  					if !font['diff'].nil?
+  						out('/Encoding '+(nf+font['diff'])+' 0 R')
+  					else
+  						out('/Encoding /WinAnsiEncoding')
+  					end
+  				end
+  			end
+  			out('>>')
+  			out('endobj')
+  			if(font['type']!='core')
+  				#Widths
+  				newobj()
+  				cw=font['cw']
+  				s='['
+          32.upto(255) do |i|
+  					s+=cw[i.chr]+' '
+  				end
+  				out(s+']')
+  				out('endobj')
+  				#Descriptor
+  				newobj()
+  				s='<</Type /FontDescriptor /FontName /'+name
+  				font['desc'].each_pair do |k, v|
+  					s+=' /'+k+' '+v
+  				end
+  				file=font['file']
+  				if(file)
+  					s+=' /FontFile'+(font['type']=='Type1' ? '' : '2')+' '+@FontFiles[file]['n']+' 0 R'
+  				end
+  				out(s+'>>')
+  				out('endobj')
+  			end
+  		end
+  	end
+  end
+
+  def putType0(font)
+  	#Type0
+  	out('/Subtype /Type0')
+  	out('/BaseFont /'+font['name']+'-'+font['CMap'])
+  	out('/Encoding /'+font['CMap'])
+  	out('/DescendantFonts ['+(@n+1).to_s+' 0 R]')
+  	out('>>')
+  	out('endobj')
+  	#CIDFont
+  	newobj()
+  	out('<</Type /Font')
+  	out('/Subtype /CIDFontType0')
+  	out('/BaseFont /'+font['name'])
+  	out('/CIDSystemInfo <</Registry '+textstring('Adobe')+' /Ordering '+textstring(font['registry']['ordering'])+' /Supplement '+font['registry']['supplement'].to_s+'>>')
+  	out('/FontDescriptor '+(@n+1).to_s+' 0 R')
+  	if(font['CMap']=='ETen-B5-H')
+  		w='13648 13742 500'
+  	elsif(font['CMap']=='GBK-EUC-H')
+  		w='814 907 500 7716 [500]'
+  	else
+      # ActionController::Base::logger.debug font['cw'].keys.sort.join(' ').to_s
+      # ActionController::Base::logger.debug font['cw'].values.join(' ').to_s
+  		w='1 ['
+  		font['cw'].keys.sort.each {|key|
+  		  w+=font['cw'][key].to_s + " "
+# ActionController::Base::logger.debug key.to_s
+# ActionController::Base::logger.debug font['cw'][key].to_s
+  		}
+  		w +=']'
+  	end
+  	out('/W ['+w+']>>')
+  	out('endobj')
+  	#Font descriptor
+  	newobj()
+  	out('<</Type /FontDescriptor')
+  	out('/FontName /'+font['name'])
+  	out('/Flags 6')
+  	out('/FontBBox [0 -200 1000 900]')
+  	out('/ItalicAngle 0')
+  	out('/Ascent 800')
+  	out('/Descent -200')
+  	out('/CapHeight 800')
+  	out('/StemV 50')
+  	out('>>')
+  	out('endobj')
+  end
+end

From a6da479a63c9c5add6b6d81adfca99fbaa73d0a7 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sat, 7 Jun 2008 09:03:20 +0000
Subject: [PATCH 488/710] Translations updates.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1498 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 lang/hu.yml                                   |  8 ++--
 lang/no.yml                                   | 10 ++---
 lang/ru.yml                                   | 12 +++---
 lang/zh-tw.yml                                |  8 ++--
 lang/zh.yml                                   |  6 +--
 .../calendar/lang/calendar-zh-tw.js           | 12 +++---
 .../javascripts/calendar/lang/calendar-zh.js  | 40 +++++++++----------
 .../jstoolbar/lang/jstoolbar-zh-tw.js         |  6 +--
 .../jstoolbar/lang/jstoolbar-zh.js            | 30 +++++++-------
 9 files changed, 66 insertions(+), 66 deletions(-)

diff --git a/lang/hu.yml b/lang/hu.yml
index 803aa8833..2a399bc13 100644
--- a/lang/hu.yml
+++ b/lang/hu.yml
@@ -620,7 +620,7 @@ default_activity_development: Fejlesztés
 enumeration_issue_priorities: Feladat prioritások
 enumeration_doc_categories: Dokumentum kategóriák
 enumeration_activities: Tevékenységek (idő rögzítés)
-mail_body_reminder: "%d issue(s) that are assigned to you are due in the next %d days:"
-mail_subject_reminder: "%d issue(s) due in the next days"
-text_user_wrote: '%s wrote:'
-label_duplicated_by: duplicated by
+mail_body_reminder: "%d neked kiosztott feladat határidős az elkövetkező %d napban:"
+mail_subject_reminder: "%d feladat határidős az elkövetkező napokban"
+text_user_wrote: '%s írta:'
+label_duplicated_by: duplikálta
diff --git a/lang/no.yml b/lang/no.yml
index d16509551..a31751da6 100644
--- a/lang/no.yml
+++ b/lang/no.yml
@@ -91,6 +91,8 @@ mail_body_account_information_external: Du kan bruke din "%s"-konto for å logge
 mail_body_account_information: Informasjon om din konto
 mail_subject_account_activation_request: %s kontoaktivering
 mail_body_account_activation_request: 'En ny bruker (%s) er registrert, og avventer din godkjenning:'
+mail_subject_reminder: "%d sak(er) har frist de kommende dagene"
+mail_body_reminder: "%d sak(er) som er tildelt deg har frist de kommende %d dager:"
 
 gui_validation_error: 1 feil
 gui_validation_error_plural: %d feil
@@ -445,7 +447,8 @@ label_loading: Laster...
 label_relation_new: Ny relasjon
 label_relation_delete: Slett relasjon
 label_relates_to: relatert til
-label_duplicates: duplikater
+label_duplicates: dupliserer
+label_duplicated_by: duplisert av
 label_blocks: blokkerer
 label_blocked_by: blokkert av
 label_precedes: kommer før
@@ -594,6 +597,7 @@ text_destroy_time_entries_question: %.02f timer er ført på sakene du er i ferd
 text_destroy_time_entries: Slett førte timer
 text_assign_time_entries_to_project: Overfør førte timer til prosjektet
 text_reassign_time_entries: 'Overfør førte timer til denne saken:'
+text_user_wrote: '%s skrev:'
 
 default_role_manager: Leder
 default_role_developper: Utvikler
@@ -620,7 +624,3 @@ default_activity_development: Utvikling
 enumeration_issue_priorities: Sakssprioriteringer
 enumeration_doc_categories: Dokument-kategorier
 enumeration_activities: Aktiviteter (tidssporing)
-mail_body_reminder: "%d issue(s) that are assigned to you are due in the next %d days:"
-mail_subject_reminder: "%d issue(s) due in the next days"
-text_user_wrote: '%s wrote:'
-label_duplicated_by: duplicated by
diff --git a/lang/ru.yml b/lang/ru.yml
index 91e509ffc..37f2aef30 100644
--- a/lang/ru.yml
+++ b/lang/ru.yml
@@ -332,7 +332,7 @@ label_internal: Внутренний
 label_last_changes: менее %d изменений
 label_change_view_all: Просмотреть все изменения
 label_personalize_page: Персонализировать данную страницу
-label_comment: Комментировать
+label_comment: комментарий
 label_comment_plural: Комментарии
 label_comment_add: Оставить комментарий
 label_comment_added: Добавленный комментарий
@@ -621,9 +621,9 @@ label_overall_activity: Сводная активность
 setting_default_projects_public: Новые проекты являются публичными
 error_scm_annotate: "Данные отсутствуют или не могут быть подписаны."
 label_planning: Планирование
-text_subprojects_destroy_warning: 'Its subproject(s): %s will be also deleted.'
-label_and_its_subprojects: %s and its subprojects
-mail_body_reminder: "%d issue(s) that are assigned to you are due in the next %d days:"
-mail_subject_reminder: "%d issue(s) due in the next days"
-text_user_wrote: '%s wrote:'
+text_subprojects_destroy_warning: 'Подпроекты: %s также будут удалены.'
+label_and_its_subprojects: %s и все подпроекты
+mail_body_reminder: "%d назначенных на вас задач на следующие %d дней:" 
+mail_subject_reminder: "%d назначенных на вас задач в ближайшие дни" 
+text_user_wrote: '%s написал:'
 label_duplicated_by: duplicated by
diff --git a/lang/zh-tw.yml b/lang/zh-tw.yml
index 76db2f052..c3cd096a3 100644
--- a/lang/zh-tw.yml
+++ b/lang/zh-tw.yml
@@ -91,6 +91,8 @@ mail_body_account_information_external: 您可以使用 "%s" 帳號登入 Redmin
 mail_body_account_information: 您的 Redmine 帳號資訊
 mail_subject_account_activation_request: Redmine 帳號啟用需求通知
 mail_body_account_activation_request: '有位新用戶 (%s) 已經完成註冊，正等候您的審核：'
+mail_subject_reminder: "您有 %d 個項目即將到期"
+mail_body_reminder: "%d 個指派給您的項目，將於 %d 天之內到期："
 
 gui_validation_error: 1 個錯誤
 gui_validation_error_plural: %d 個錯誤
@@ -446,6 +448,7 @@ label_relation_new: 建立新關聯
 label_relation_delete: 刪除關聯
 label_relates_to: 關聯至
 label_duplicates: 已重複
+label_duplicated_by: 與後面所列項目重複
 label_blocks: 阻擋
 label_blocked_by: 被阻擋
 label_precedes: 優先於
@@ -594,6 +597,7 @@ text_destroy_time_entries_question: 您即將刪除的項目已報工 %.02f 小
 text_destroy_time_entries: 刪除已報工的時數
 text_assign_time_entries_to_project: 指定已報工的時數至專案中
 text_reassign_time_entries: '重新指定已報工的時數至此項目：'
+text_user_wrote: '%s 先前提到:'
 
 default_role_manager: 管理人員
 default_role_developper: 開發人員
@@ -620,7 +624,3 @@ default_activity_development: 開發
 enumeration_issue_priorities: 項目優先權
 enumeration_doc_categories: 文件分類
 enumeration_activities: 活動 (時間追蹤)
-mail_body_reminder: "%d issue(s) that are assigned to you are due in the next %d days:"
-mail_subject_reminder: "%d issue(s) due in the next days"
-text_user_wrote: '%s wrote:'
-label_duplicated_by: duplicated by
diff --git a/lang/zh.yml b/lang/zh.yml
index cdb7aed75..9e22e6874 100644
--- a/lang/zh.yml
+++ b/lang/zh.yml
@@ -91,6 +91,8 @@ mail_body_account_information_external: 您可以使用您的 "%s" 帐号来登
 mail_body_account_information: 您的帐号信息
 mail_subject_account_activation_request: %s帐号激活请求
 mail_body_account_activation_request: '新用户（%s）已完成注册，正在等候您的审核：'
+mail_subject_reminder: "%d 个问题需要尽快解决"
+mail_body_reminder: "指派给您的 %d 个问题需要在 %d 天内完成："
 
 gui_validation_error: 1 个错误
 gui_validation_error_plural: %d 个错误
@@ -594,6 +596,7 @@ text_destroy_time_entries_question: 您要删除的问题已经上报了 %.02f 
 text_destroy_time_entries: 删除上报的工作量
 text_assign_time_entries_to_project: 将已上报的工作量提交到项目中
 text_reassign_time_entries: '将已上报的工作量指定到此问题：'
+text_user_wrote: '%s 写到：'
 
 default_role_manager: 管理人员
 default_role_developper: 开发人员
@@ -620,7 +623,4 @@ default_activity_development: 开发
 enumeration_issue_priorities: 问题优先级
 enumeration_doc_categories: 文档类别
 enumeration_activities: 活动（时间跟踪）
-mail_subject_reminder: "%d issue(s) due in the next days"
-mail_body_reminder: "%d issue(s) that are assigned to you are due in the next %d days:"
-text_user_wrote: '%s wrote:'
 label_duplicated_by: duplicated by
diff --git a/public/javascripts/calendar/lang/calendar-zh-tw.js b/public/javascripts/calendar/lang/calendar-zh-tw.js
index c48d25b0e..1e759db10 100644
--- a/public/javascripts/calendar/lang/calendar-zh-tw.js
+++ b/public/javascripts/calendar/lang/calendar-zh-tw.js
@@ -84,13 +84,13 @@ Calendar._TT["INFO"] = "關於 calendar";
 Calendar._TT["ABOUT"] =
 "DHTML 日期/時間 選擇器\n" +
 "(c) dynarch.com 2002-2005 / Author: Mihai Bazon\n" + // don't translate this this ;-)
-"最For latest version visit: http://www.dynarch.com/projects/calendar/\n" +
-"Distributed under GNU LGPL.  See http://gnu.org/licenses/lgpl.html for details." +
+"最新版本取得位址: http://www.dynarch.com/projects/calendar/\n" +
+"使用 GNU LGPL 發行.  參考 http://gnu.org/licenses/lgpl.html 以取得更多關於 LGPL 之細節。" +
 "\n\n" +
-"Date selection:\n" +
-"- Use the \xab, \xbb buttons to select year\n" +
-"- Use the " + String.fromCharCode(0x2039) + ", " + String.fromCharCode(0x203a) + " buttons to select month\n" +
-"- Hold mouse button on any of the above buttons for faster selection.";
+"日期選擇方式:\n" +
+"- 使用滑鼠點擊 \xab 、 \xbb 按鈕選擇年份\n" +
+"- 使用滑鼠點擊 " + String.fromCharCode(0x2039) + " 、 " + String.fromCharCode(0x203a) + " 按鈕選擇月份\n" +
+"- 使用滑鼠點擊上述按鈕並按住不放，可開啟快速選單。";
 Calendar._TT["ABOUT_TIME"] = "\n\n" +
 "時間選擇方式：\n" +
 "- 「單擊」時分秒為遞增\n" +
diff --git a/public/javascripts/calendar/lang/calendar-zh.js b/public/javascripts/calendar/lang/calendar-zh.js
index ddb092bfa..121653fba 100644
--- a/public/javascripts/calendar/lang/calendar-zh.js
+++ b/public/javascripts/calendar/lang/calendar-zh.js
@@ -82,33 +82,33 @@ Calendar._TT = {};
 Calendar._TT["INFO"] = "关于日历";
 
 Calendar._TT["ABOUT"] =
-"DHTML Date/Time Selector\n" +
+"DHTML 日期/时间 选择器\n" +
 "(c) dynarch.com 2002-2005 / Author: Mihai Bazon\n" + // don't translate this this ;-)
-"For latest version visit: http://www.dynarch.com/projects/calendar/\n" +
-"Distributed under GNU LGPL.  See http://gnu.org/licenses/lgpl.html for details." +
+"最新版本请访问： http://www.dynarch.com/projects/calendar/\n" +
+"遵循 GNU LGPL 发布。详情请查阅 http://gnu.org/licenses/lgpl.html " +
 "\n\n" +
-"Date selection:\n" +
-"- Use the \xab, \xbb buttons to select year\n" +
-"- Use the " + String.fromCharCode(0x2039) + ", " + String.fromCharCode(0x203a) + " buttons to select month\n" +
-"- Hold mouse button on any of the above buttons for faster selection.";
+"日期选择：\n" +
+"- 使用 \xab，\xbb 按钮选择年\n" +
+"- 使用 " + String.fromCharCode(0x2039) + "，" + String.fromCharCode(0x203a) + " 按钮选择月\n" +
+"- 在上述按钮上按住不放可以快速选择";
 Calendar._TT["ABOUT_TIME"] = "\n\n" +
-"Time selection:\n" +
-"- Click on any of the time parts to increase it\n" +
-"- or Shift-click to decrease it\n" +
-"- or click and drag for faster selection.";
+"时间选择：\n" +
+"- 点击时间的任意部分来增加\n" +
+"- Shift加点击来减少\n" +
+"- 点击后拖动进行快速选择";
 
-Calendar._TT["PREV_YEAR"] = "上年 (hold for menu)";
-Calendar._TT["PREV_MONTH"] = "上月 (hold for menu)";
+Calendar._TT["PREV_YEAR"] = "上年（按住不放显示菜单）";
+Calendar._TT["PREV_MONTH"] = "上月（按住不放显示菜单）";
 Calendar._TT["GO_TODAY"] = "回到今天";
-Calendar._TT["NEXT_MONTH"] = "下月 (hold for menu)";
-Calendar._TT["NEXT_YEAR"] = "下年 (hold for menu)";
+Calendar._TT["NEXT_MONTH"] = "下月（按住不放显示菜单）";
+Calendar._TT["NEXT_YEAR"] = "下年（按住不放显示菜单）";
 Calendar._TT["SEL_DATE"] = "选择日期";
 Calendar._TT["DRAG_TO_MOVE"] = "拖动";
 Calendar._TT["PART_TODAY"] = " (今日)";
 
 // the following is to inform that "%s" is to be the first day of week
 // %s will be replaced with the day name.
-Calendar._TT["DAY_FIRST"] = "Display %s first";
+Calendar._TT["DAY_FIRST"] = "一周开始于 %s";
 
 // This may be locale-dependent.  It specifies the week-end days, as an array
 // of comma-separated numbers.  The numbers are from 0 to 6: 0 means Sunday, 1
@@ -117,11 +117,11 @@ Calendar._TT["WEEKEND"] = "0,6";
 
 Calendar._TT["CLOSE"] = "关闭";
 Calendar._TT["TODAY"] = "今天";
-Calendar._TT["TIME_PART"] = "(Shift-)Click or drag to change value";
+Calendar._TT["TIME_PART"] = "Shift加点击或者拖动来变更";
 
 // date formats
 Calendar._TT["DEF_DATE_FORMAT"] = "%Y-%m-%d";
-Calendar._TT["TT_DATE_FORMAT"] = "%a, %b %e";
+Calendar._TT["TT_DATE_FORMAT"] = "星期%a %b%e日";
 
-Calendar._TT["WK"] = "wk";
-Calendar._TT["TIME"] = "Time:";
+Calendar._TT["WK"] = "周";
+Calendar._TT["TIME"] = "时间：";
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-zh-tw.js b/public/javascripts/jstoolbar/lang/jstoolbar-zh-tw.js
index a87ad3442..86599c5a2 100644
--- a/public/javascripts/jstoolbar/lang/jstoolbar-zh-tw.js
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-zh-tw.js
@@ -9,8 +9,8 @@ jsToolBar.strings['Heading 2'] = '標題 2';
 jsToolBar.strings['Heading 3'] = '標題 3';
 jsToolBar.strings['Unordered list'] = '項目清單';
 jsToolBar.strings['Ordered list'] = '編號清單';
-jsToolBar.strings['Quote'] = 'Quote';
-jsToolBar.strings['Unquote'] = 'Remove Quote';
-jsToolBar.strings['Preformatted text'] = '格式化文字';
+jsToolBar.strings['Quote'] = '引文';
+jsToolBar.strings['Unquote'] = '取消引文';
+jsToolBar.strings['Preformatted text'] = '已格式文字';
 jsToolBar.strings['Wiki link'] = '連結至 Wiki 頁面';
 jsToolBar.strings['Image'] = '圖片';
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-zh.js b/public/javascripts/jstoolbar/lang/jstoolbar-zh.js
index 2d68498f9..a9b6ba230 100644
--- a/public/javascripts/jstoolbar/lang/jstoolbar-zh.js
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-zh.js
@@ -1,16 +1,16 @@
 jsToolBar.strings = {};
-jsToolBar.strings['Strong'] = 'Strong';
-jsToolBar.strings['Italic'] = 'Italic';
-jsToolBar.strings['Underline'] = 'Underline';
-jsToolBar.strings['Deleted'] = 'Deleted';
-jsToolBar.strings['Code'] = 'Inline Code';
-jsToolBar.strings['Heading 1'] = 'Heading 1';
-jsToolBar.strings['Heading 2'] = 'Heading 2';
-jsToolBar.strings['Heading 3'] = 'Heading 3';
-jsToolBar.strings['Unordered list'] = 'Unordered list';
-jsToolBar.strings['Ordered list'] = 'Ordered list';
-jsToolBar.strings['Quote'] = 'Quote';
-jsToolBar.strings['Unquote'] = 'Remove Quote';
-jsToolBar.strings['Preformatted text'] = 'Preformatted text';
-jsToolBar.strings['Wiki link'] = 'Link to a Wiki page';
-jsToolBar.strings['Image'] = 'Image';
+jsToolBar.strings['Strong'] = '粗体';
+jsToolBar.strings['Italic'] = '斜体';
+jsToolBar.strings['Underline'] = '下划线';
+jsToolBar.strings['Deleted'] = '删除线';
+jsToolBar.strings['Code'] = '程序代码';
+jsToolBar.strings['Heading 1'] = '标题 1';
+jsToolBar.strings['Heading 2'] = '标题 2';
+jsToolBar.strings['Heading 3'] = '标题 3';
+jsToolBar.strings['Unordered list'] = '无序列表';
+jsToolBar.strings['Ordered list'] = '排序列表';
+jsToolBar.strings['Quote'] = '引用';
+jsToolBar.strings['Unquote'] = '删除引用';
+jsToolBar.strings['Preformatted text'] = '格式化文本';
+jsToolBar.strings['Wiki link'] = '连接到 Wiki 页面';
+jsToolBar.strings['Image'] = '图片';

From aa9d04a4a7ec1232477f0823a584da49aae11d58 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sat, 7 Jun 2008 09:19:50 +0000
Subject: [PATCH 489/710] Mercurial adapter improvements (patch #1199 by Pierre
 Paysant-Le Roux).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1499 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 lib/redmine/scm/adapters/abstract_adapter.rb  |   7 +-
 .../adapters/mercurial/hg-template-0.9.5.tmpl |  12 ++
 .../adapters/mercurial/hg-template-1.0.tmpl   |  12 ++
 lib/redmine/scm/adapters/mercurial_adapter.rb | 160 +++++++++---------
 test/unit/mercurial_adapter_test.rb           |  49 ++++++
 test/unit/repository_mercurial_test.rb        |  20 +++
 6 files changed, 181 insertions(+), 79 deletions(-)
 create mode 100644 lib/redmine/scm/adapters/mercurial/hg-template-0.9.5.tmpl
 create mode 100644 lib/redmine/scm/adapters/mercurial/hg-template-1.0.tmpl
 create mode 100644 test/unit/mercurial_adapter_test.rb

diff --git a/lib/redmine/scm/adapters/abstract_adapter.rb b/lib/redmine/scm/adapters/abstract_adapter.rb
index 9563ed800..80058a2bf 100644
--- a/lib/redmine/scm/adapters/abstract_adapter.rb
+++ b/lib/redmine/scm/adapters/abstract_adapter.rb
@@ -94,6 +94,11 @@ module Redmine
           path ||= ''
           (path[0,1]!="/") ? "/#{path}" : path
         end
+
+        def with_trailling_slash(path)
+          path ||= ''
+          (path[-1,1] == "/") ? path : "#{path}/"
+        end
         
         def shell_quote(str)
           if RUBY_PLATFORM =~ /mswin/
@@ -102,7 +107,7 @@ module Redmine
             "'" + str.gsub(/'/, "'\"'\"'") + "'"
           end
         end
-              
+
       private
         def retrieve_root_url
           info = self.info
diff --git a/lib/redmine/scm/adapters/mercurial/hg-template-0.9.5.tmpl b/lib/redmine/scm/adapters/mercurial/hg-template-0.9.5.tmpl
new file mode 100644
index 000000000..b3029e6ff
--- /dev/null
+++ b/lib/redmine/scm/adapters/mercurial/hg-template-0.9.5.tmpl
@@ -0,0 +1,12 @@
+changeset = 'This template must be used with --debug option\n'
+changeset_quiet =  'This template must be used with --debug option\n'
+changeset_verbose = 'This template must be used with --debug option\n'
+changeset_debug = '<logentry revision="{rev}" node="{node|short}">\n<author>{author|escape}</author>\n<date>{date|isodate}</date>\n<paths>\n{files}{file_adds}{file_dels}{file_copies}</paths>\n<msg>{desc|escape}</msg>\n{tags}</logentry>\n\n'
+
+file = '<path action="M">{file|escape}</path>\n'
+file_add = '<path action="A">{file_add|escape}</path>\n'
+file_del = '<path action="D">{file_del|escape}</path>\n'
+file_copy = '<path-copied copyfrom-path="{source|escape}">{name|urlescape}</path-copied>\n'
+tag = '<tag>{tag|escape}</tag>\n'
+header='<?xml version="1.0" encoding="UTF-8" ?>\n<log>\n\n'
+# footer="</log>"
\ No newline at end of file
diff --git a/lib/redmine/scm/adapters/mercurial/hg-template-1.0.tmpl b/lib/redmine/scm/adapters/mercurial/hg-template-1.0.tmpl
new file mode 100644
index 000000000..3eef85016
--- /dev/null
+++ b/lib/redmine/scm/adapters/mercurial/hg-template-1.0.tmpl
@@ -0,0 +1,12 @@
+changeset = 'This template must be used with --debug option\n'
+changeset_quiet =  'This template must be used with --debug option\n'
+changeset_verbose = 'This template must be used with --debug option\n'
+changeset_debug = '<logentry revision="{rev}" node="{node|short}">\n<author>{author|escape}</author>\n<date>{date|isodate}</date>\n<paths>\n{file_mods}{file_adds}{file_dels}{file_copies}</paths>\n<msg>{desc|escape}</msg>\n{tags}</logentry>\n\n'
+
+file_mod = '<path action="M">{file_mod|escape}</path>\n'
+file_add = '<path action="A">{file_add|escape}</path>\n'
+file_del = '<path action="D">{file_del|escape}</path>\n'
+file_copy = '<path-copied copyfrom-path="{source|escape}">{name|urlescape}</path-copied>\n'
+tag = '<tag>{tag|escape}</tag>\n'
+header='<?xml version="1.0" encoding="UTF-8" ?>\n<log>\n\n'
+# footer="</log>"
diff --git a/lib/redmine/scm/adapters/mercurial_adapter.rb b/lib/redmine/scm/adapters/mercurial_adapter.rb
index 6f42dda06..be01b7bbc 100644
--- a/lib/redmine/scm/adapters/mercurial_adapter.rb
+++ b/lib/redmine/scm/adapters/mercurial_adapter.rb
@@ -21,9 +21,12 @@ module Redmine
   module Scm
     module Adapters    
       class MercurialAdapter < AbstractAdapter
-      
+        
         # Mercurial executable name
         HG_BIN = "hg"
+        TEMPLATES_DIR = File.dirname(__FILE__) + "/mercurial"
+        TEMPLATE_NAME = "hg-template"
+        TEMPLATE_EXTENSION = "tmpl"
         
         def info
           cmd = "#{HG_BIN} -R #{target('')} root"
@@ -33,8 +36,8 @@ module Redmine
           end
           return nil if $? && $?.exitstatus != 0
           info = Info.new({:root_url => root_url.chomp,
-                           :lastrev => revisions(nil,nil,nil,{:limit => 1}).last
-                         })
+                            :lastrev => revisions(nil,nil,nil,{:limit => 1}).last
+                          })
           info
         rescue CommandFailed
           return nil
@@ -43,62 +46,72 @@ module Redmine
         def entries(path=nil, identifier=nil)
           path ||= ''
           entries = Entries.new
-          cmd = "#{HG_BIN} -R #{target('')} --cwd #{target(path)} locate"
-          cmd << " -r #{identifier.to_i}" if identifier
-          cmd << " " + shell_quote('glob:**')
+          cmd = "#{HG_BIN} -R #{target('')} --cwd #{target('')} locate"
+          cmd << " -r " + (identifier ? identifier.to_s : "tip")
+          cmd << " " + shell_quote("path:#{path}") unless path.empty?
           shellout(cmd) do |io|
             io.each_line do |line|
-              e = line.chomp.split(%r{[\/\\]})
-              entries << Entry.new({:name => e.first,
-                                    :path => (path.empty? ? e.first : "#{path}/#{e.first}"),
-                                    :kind => (e.size > 1 ? 'dir' : 'file'),
-                                    :lastrev => Revision.new
-                                    }) unless entries.detect{|entry| entry.name == e.first}
+              # HG uses antislashs as separator on Windows
+              line = line.gsub(/\\/, "/")
+              if path.empty? or e = line.gsub!(%r{^#{with_trailling_slash(path)}},'')
+                e ||= line
+                e = e.chomp.split(%r{[\/\\]})
+                entries << Entry.new({:name => e.first,
+                                       :path => (path.nil? or path.empty? ? e.first : "#{with_trailling_slash(path)}#{e.first}"),
+                                       :kind => (e.size > 1 ? 'dir' : 'file'),
+                                       :lastrev => Revision.new
+                                     }) unless entries.detect{|entry| entry.name == e.first}
+              end
             end
           end
           return nil if $? && $?.exitstatus != 0
           entries.sort_by_name
         end
-          
-        def revisions(path=nil, identifier_from=nil, identifier_to=nil, options={})
+        
+        # Fetch the revisions by using a template file that 
+        # makes Mercurial produce a xml output.
+        def revisions(path=nil, identifier_from=nil, identifier_to=nil, options={})  
           revisions = Revisions.new
-          cmd = "#{HG_BIN} -v --encoding utf8 -R #{target('')} log"
+          cmd = "#{HG_BIN} --debug --encoding utf8 -R #{target('')} log -C --style #{self.template_path}"
           if identifier_from && identifier_to
             cmd << " -r #{identifier_from.to_i}:#{identifier_to.to_i}"
           elsif identifier_from
             cmd << " -r #{identifier_from.to_i}:"
           end
           cmd << " --limit #{options[:limit].to_i}" if options[:limit]
+          cmd << " #{path}" if path
           shellout(cmd) do |io|
-            changeset = {}
-            parsing_descr = false
-            line_feeds = 0
-            
-            io.each_line do |line|
-              if line =~ /^(\w+):\s*(.*)$/
-                key = $1
-                value = $2
-                if parsing_descr && line_feeds > 1
-                  parsing_descr = false
-                  revisions << build_revision_from_changeset(changeset)
-                  changeset = {}
-                end
-                if !parsing_descr
-                  changeset.store key.to_sym, value
-                  if $1 == "description"
-                    parsing_descr = true
-                    line_feeds = 0
-                    next
+            begin
+              # HG doesn't close the XML Document...
+              doc = REXML::Document.new(io.read << "</log>")
+              doc.elements.each("log/logentry") do |logentry|
+                paths = []
+                copies = logentry.get_elements('paths/path-copied')
+                logentry.elements.each("paths/path") do |path|
+                  # Detect if the added file is a copy
+                  if path.attributes['action'] == 'A' and c = copies.find{ |e| e.text == path.text }
+                    from_path = c.attributes['copyfrom-path']
+                    from_rev = logentry.attributes['revision']
                   end
+                  paths << {:action => path.attributes['action'],
+                    :path => "/#{path.text}",
+                    :from_path => from_path ? "/#{from_path}" : nil,
+                    :from_revision => from_rev ? from_rev : nil
+                  }
                 end
+                paths.sort! { |x,y| x[:path] <=> y[:path] }
+                
+                revisions << Revision.new({:identifier => logentry.attributes['revision'],
+                                            :scmid => logentry.attributes['node'],
+                                            :author => (logentry.elements['author'] ? logentry.elements['author'].text : ""),
+                                            :time => Time.parse(logentry.elements['date'].text).localtime,
+                                            :message => logentry.elements['msg'].text,
+                                            :paths => paths
+                                          })
               end
-              if parsing_descr
-                changeset[:description] << line
-                line_feeds += 1 if line.chomp.empty?
-              end
+            rescue
+              logger.debug($!)
             end
-            # Add the last changeset if there is one left
-            revisions << build_revision_from_changeset(changeset) if changeset[:date]
           end
           return nil if $? && $?.exitstatus != 0
           revisions
@@ -125,7 +138,7 @@ module Redmine
         
         def cat(path, identifier=nil)
           cmd = "#{HG_BIN} -R #{target('')} cat"
-          cmd << " -r #{identifier.to_i}" if identifier
+          cmd << " -r " + (identifier ? identifier.to_s : "tip")
           cmd << " #{target(path)}"
           cat = nil
           shellout(cmd) do |io|
@@ -140,6 +153,7 @@ module Redmine
           path ||= ''
           cmd = "#{HG_BIN} -R #{target('')}"
           cmd << " annotate -n -u"
+          cmd << " -r " + (identifier ? identifier.to_s : "tip")
           cmd << " -r #{identifier.to_i}" if identifier
           cmd << " #{target(path)}"
           blame = Annotate.new
@@ -153,45 +167,35 @@ module Redmine
           blame
         end
         
-        private
-        
-        # Builds a revision objet from the changeset returned by hg command
-        def build_revision_from_changeset(changeset)
-          rev_id = changeset[:changeset].to_s.split(':').first.to_i
-          
-          # Changes
-          paths = (rev_id == 0) ?
-            # Can't get changes for revision 0 with hg status
-            changeset[:files].to_s.split.collect{|path| {:action => 'A', :path => "/#{path}"}} :
-            status(rev_id)
-          
-          Revision.new({:identifier => rev_id,
-                        :scmid => changeset[:changeset].to_s.split(':').last,
-                        :author => changeset[:user],
-                        :time => Time.parse(changeset[:date]),
-                        :message => changeset[:description],
-                        :paths => paths
-                       })
+        # The hg version version is expressed either as a
+        # release number (eg 0.9.5 or 1.0) or as a revision
+        # id composed of 12 hexa characters.
+        def hgversion  
+          theversion = hgversion_from_command_line
+          if theversion.match(/^\d+(\.\d+)+/)
+            theversion.split(".").collect(&:to_i)
+            #            elsif match = theversion.match(/[[:xdigit:]]{12}/)
+            #               match[0]
+          else
+            "Unknown version"
+          end
         end
         
-        # Returns the file changes for a given revision
-        def status(rev_id)
-          cmd = "#{HG_BIN} -R #{target('')} status --rev #{rev_id.to_i - 1}:#{rev_id.to_i}"
-          result = []
-          shellout(cmd) do |io|
-            io.each_line do |line|
-              action, file = line.chomp.split
-              next unless action && file
-              file.gsub!("\\", "/")
-              case action
-              when 'R'
-                result << { :action => 'D' , :path => "/#{file}" }
-              else
-                result << { :action => action, :path => "/#{file}" }
-              end
-            end
-          end
-          result
+        def template_path
+          @template ||= begin
+                          if hgversion.is_a?(String) or ((hgversion <=> [0,9,5]) > 0)
+                            ver = "1.0"
+                          else
+                            ver = "0.9.5"
+                          end
+                          "#{TEMPLATES_DIR}/#{TEMPLATE_NAME}-#{ver}.#{TEMPLATE_EXTENSION}"
+                        end
+        end
+        
+        private
+        
+        def hgversion_from_command_line
+          @hgversion ||= %x{#{HG_BIN} --version}.match(/\(version (.*)\)/)[1]
         end
       end
     end
diff --git a/test/unit/mercurial_adapter_test.rb b/test/unit/mercurial_adapter_test.rb
new file mode 100644
index 000000000..b4aaaec61
--- /dev/null
+++ b/test/unit/mercurial_adapter_test.rb
@@ -0,0 +1,49 @@
+require File.dirname(__FILE__) + '/../test_helper'
+begin
+  require 'mocha'
+  
+  class MercurialAdapterTest < Test::Unit::TestCase
+    
+    TEMPLATES_DIR = "#{RAILS_ROOT}/extra/mercurial"
+    TEMPLATE_NAME = "hg-template"
+    TEMPLATE_EXTENSION = "tmpl"
+    
+    REPOSITORY_PATH = RAILS_ROOT.gsub(%r{config\/\.\.}, '') + '/tmp/test/mercurial_repository'
+    
+    
+    def test_version_template_0_9_5
+      # 0.9.5
+      test_version_template_for("0.9.5", [0,9,5], "0.9.5")
+    end
+    
+    def test_version_template_1_0
+      # 1.0
+      test_version_template_for("1.0", [1,0], "1.0")
+    end
+    
+    def test_version_template_1_0_win
+      test_version_template_for("1e4ddc9ac9f7+20080325", "Unknown version", "1.0")
+    end
+    
+    def test_version_template_1_0_1_win
+      test_version_template_for("1.0.1+20080525", [1,0,1], "1.0")
+    end
+    
+    def test_version_template_changeset_id
+      test_version_template_for("1916e629a29d", "Unknown version", "1.0")
+    end
+    
+    private
+    
+    def test_version_template_for(hgversion, version, templateversion)
+      Redmine::Scm::Adapters::MercurialAdapter.any_instance.stubs(:hgversion_from_command_line).returns(hgversion)
+      adapter = Redmine::Scm::Adapters::MercurialAdapter.new(REPOSITORY_PATH)
+      assert_equal version, adapter.hgversion
+      assert_equal "#{TEMPLATES_DIR}/#{TEMPLATE_NAME}-#{templateversion}.#{TEMPLATE_EXTENSION}", adapter.template_path
+      assert File.exist?(adapter.template_path)
+    end
+  end
+  
+rescue LoadError
+  def test_fake; assert(false, "Requires mocha to run those tests")  end
+end
diff --git a/test/unit/repository_mercurial_test.rb b/test/unit/repository_mercurial_test.rb
index 21ddf1e3a..0f993ac16 100644
--- a/test/unit/repository_mercurial_test.rb
+++ b/test/unit/repository_mercurial_test.rb
@@ -48,6 +48,26 @@ class RepositoryMercurialTest < Test::Unit::TestCase
       @repository.fetch_changesets
       assert_equal 6, @repository.changesets.count
     end
+    
+    def test_entries
+      assert_equal 2, @repository.entries("sources", 2).size
+      assert_equal 1, @repository.entries("sources", 3).size
+    end
+
+    def test_locate_on_outdated_repository
+      # Change the working dir state
+      %x{hg -R #{REPOSITORY_PATH} up -r 0}
+      assert_equal 1, @repository.entries("images", 0).size
+      assert_equal 2, @repository.entries("images").size
+      assert_equal 2, @repository.entries("images", 2).size
+    end
+
+
+    def test_cat
+      assert @repository.scm.cat("sources/welcome_controller.rb", 2)
+      assert_nil @repository.scm.cat("sources/welcome_controller.rb")
+    end
+
   else
     puts "Mercurial test repository NOT FOUND. Skipping unit tests !!!"
     def test_fake; assert true end

From 6d5db302eeabd3a64ba6c1106e3eadde1ad05aae Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sat, 7 Jun 2008 10:08:11 +0000
Subject: [PATCH 490/710] Subversion adapter: ignore directories with no commit
 date (#1370).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1500 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 lib/redmine/scm/adapters/subversion_adapter.rb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/redmine/scm/adapters/subversion_adapter.rb b/lib/redmine/scm/adapters/subversion_adapter.rb
index 40c7eb3f1..1cbdce135 100644
--- a/lib/redmine/scm/adapters/subversion_adapter.rb
+++ b/lib/redmine/scm/adapters/subversion_adapter.rb
@@ -64,6 +64,9 @@ module Redmine
             begin
               doc = REXML::Document.new(output)
               doc.elements.each("lists/list/entry") do |entry|
+                # Skip directory if there is no commit date (usually that
+                # means that we don't have read access to it)
+                next if entry.attributes['kind'] == 'dir' && entry.elements['commit'].elements['date'].nil?
                 entries << Entry.new({:name => entry.elements['name'].text,
                             :path => ((path.empty? ? "" : "#{path}/") + entry.elements['name'].text),
                             :kind => entry.attributes['kind'],

From 956ad0a3f954d71240e454df950cddfc230076bf Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sat, 7 Jun 2008 11:42:37 +0000
Subject: [PATCH 491/710] Fixed: Reply/Quote Function Newline Issue in Internet
 Explorer (#1362).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1501 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/issues_controller.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index 682a0cc6b..c042a80ef 100644
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -217,10 +217,10 @@ class IssuesController < ApplicationController
       user = @issue.author
       text = @issue.description
     end
-    content = "#{ll(Setting.default_language, :text_user_wrote, user)}\n> "
-    content << text.to_s.strip.gsub(%r{<pre>((.|\s)*?)</pre>}m, '[...]').gsub("\n", "\n> ") + "\n\n"
+    content = "#{ll(Setting.default_language, :text_user_wrote, user)}\\n> "
+    content << text.to_s.strip.gsub(%r{<pre>((.|\s)*?)</pre>}m, '[...]').gsub('"', '\"').gsub(/(\r?\n|\r\n?)/, "\\n> ") + "\\n\\n"
     render(:update) { |page|
-      page.replace_html "notes", content
+      page.<< "$('notes').value = \"#{content}\";"
       page.show 'update'
       page << "Form.Element.focus('notes');"
       page << "Element.scrollTo('update');"

From 042da97f541824d72a60d51acd118dcf7892853e Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sat, 7 Jun 2008 14:55:32 +0000
Subject: [PATCH 492/710] Trac importer: read session_attribute table to find
 user's email and real name (#1340).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1502 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 lib/tasks/migrate_from_trac.rake | 23 ++++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/lib/tasks/migrate_from_trac.rake b/lib/tasks/migrate_from_trac.rake
index 8d5a35fd0..4226d79c0 100644
--- a/lib/tasks/migrate_from_trac.rake
+++ b/lib/tasks/migrate_from_trac.rake
@@ -195,6 +195,10 @@ namespace :redmine do
         set_table_name :permission  
       end
       
+      class TracSessionAttribute < ActiveRecord::Base
+        set_table_name :session_attribute
+      end
+       
       def self.find_or_create_user(username, project_member = false)
         return User.anonymous if username.blank?
         
@@ -202,10 +206,23 @@ namespace :redmine do
         if !u
           # Create a new user if not found
           mail = username[0,limit_for(User, 'mail')]
+          if mail_attr = TracSessionAttribute.find_by_sid_and_name(username, 'email')
+            mail = mail_attr.value
+          end
           mail = "#{mail}@foo.bar" unless mail.include?("@")
-          u = User.new :firstname => username[0,limit_for(User, 'firstname')].gsub(/[^\w\s\'\-]/i, '-'),
-                       :lastname => '-',
-                       :mail => mail.gsub(/[^-@a-z0-9\.]/i, '-')
+          
+          name = username
+          if name_attr = TracSessionAttribute.find_by_sid_and_name(username, 'name')
+            name = name_attr.value
+          end
+          name =~ (/(.*)(\s+\w+)?/)
+          fn = $1.strip
+          ln = ($2 || '-').strip
+          
+          u = User.new :mail => mail.gsub(/[^-@a-z0-9\.]/i, '-'),
+                       :firstname => fn[0, limit_for(User, 'firstname')].gsub(/[^\w\s\'\-]/i, '-'),
+                       :lastname => ln[0, limit_for(User, 'lastname')].gsub(/[^\w\s\'\-]/i, '-')
+
           u.login = username[0,limit_for(User, 'login')].gsub(/[^a-z0-9_\-@\.]/i, '-')
           u.password = 'trac'
           u.admin = true if TracPermission.find_by_username_and_action(username, 'admin')

From d446469f5d2d7c50911465c681ab7a469a2f9b24 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sat, 7 Jun 2008 15:08:59 +0000
Subject: [PATCH 493/710] Removes constraint on enumerations name (#1384).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1503 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/models/enumeration.rb                | 1 -
 app/views/enumerations/list.rhtml        | 2 +-
 app/views/timelog/_report_criteria.rhtml | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/models/enumeration.rb b/app/models/enumeration.rb
index 400681a43..e86768724 100644
--- a/app/models/enumeration.rb
+++ b/app/models/enumeration.rb
@@ -23,7 +23,6 @@ class Enumeration < ActiveRecord::Base
   validates_presence_of :opt, :name
   validates_uniqueness_of :name, :scope => [:opt]
   validates_length_of :name, :maximum => 30
-  validates_format_of :name, :with => /^[\w\s\'\-]*$/i
 
   OPTIONS = {
     "IPRI" => :enumeration_issue_priorities,
diff --git a/app/views/enumerations/list.rhtml b/app/views/enumerations/list.rhtml
index 9de9bf37c..1967e5cf9 100644
--- a/app/views/enumerations/list.rhtml
+++ b/app/views/enumerations/list.rhtml
@@ -8,7 +8,7 @@
 <table class="list">
 <% enumerations.each do |enumeration| %>
 <tr class="<%= cycle('odd', 'even') %>">
-    <td><%= link_to enumeration.name, :action => 'edit', :id => enumeration %></td>
+    <td><%= link_to h(enumeration), :action => 'edit', :id => enumeration %></td>
     <td style="width:15%;"><%= image_tag('true.png') if enumeration.is_default? %></td>
     <td style="width:15%;">
     <%= link_to image_tag('2uparrow.png', :alt => l(:label_sort_highest)), {:action => 'move', :id => enumeration, :position => 'highest'}, :method => :post, :title => l(:label_sort_highest) %>
diff --git a/app/views/timelog/_report_criteria.rhtml b/app/views/timelog/_report_criteria.rhtml
index 94f3d20f9..c9a1cfb45 100644
--- a/app/views/timelog/_report_criteria.rhtml
+++ b/app/views/timelog/_report_criteria.rhtml
@@ -3,7 +3,7 @@
 <% next if hours_for_value.empty? -%>
 <tr class="<%= cycle('odd', 'even') %> <%= 'last-level' unless criterias.length > level+1 %>">
 <%= '<td></td>' * level %>
-<td><%= format_criteria_value(criterias[level], value) %></td>
+<td><%= h(format_criteria_value(criterias[level], value)) %></td>
 <%= '<td></td>' * (criterias.length - level - 1) -%>
   <% total = 0 -%>
   <% @periods.each do |period| -%>

From 383da1e6d610c9738aa3ed76db5c68de0dfcea5c Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sat, 7 Jun 2008 15:14:42 +0000
Subject: [PATCH 494/710] Fixes functional tests broken by r1501.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1504 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 test/functional/issues_controller_test.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/functional/issues_controller_test.rb b/test/functional/issues_controller_test.rb
index 7c7d44e5f..582c27d9b 100644
--- a/test/functional/issues_controller_test.rb
+++ b/test/functional/issues_controller_test.rb
@@ -38,7 +38,9 @@ class IssuesControllerTest < Test::Unit::TestCase
            :custom_fields,
            :custom_values,
            :custom_fields_trackers,
-           :time_entries
+           :time_entries,
+           :journals,
+           :journal_details
   
   def setup
     @controller = IssuesController.new
@@ -269,7 +271,6 @@ class IssuesControllerTest < Test::Unit::TestCase
     get :reply, :id => 1
     assert_response :success
     assert_select_rjs :show, "update"
-    assert_select_rjs :replace_html, "notes"
   end
 
   def test_reply_to_note
@@ -277,7 +278,6 @@ class IssuesControllerTest < Test::Unit::TestCase
     get :reply, :id => 1, :journal_id => 2
     assert_response :success
     assert_select_rjs :show, "update"
-    assert_select_rjs :replace_html, "notes"
   end
 
   def test_post_edit

From 2e8b2d5e1312365afc60d2456ab1f67a336d77f3 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sat, 7 Jun 2008 20:06:44 +0000
Subject: [PATCH 495/710] Display status change before subject of issue on the
 activity view otherwise it may be truncated.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1505 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/models/journal.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/journal.rb b/app/models/journal.rb
index edf261e6d..ac141f68c 100644
--- a/app/models/journal.rb
+++ b/app/models/journal.rb
@@ -30,7 +30,7 @@ class Journal < ActiveRecord::Base
                      :project_key => "#{Issue.table_name}.project_id",
                      :date_column => "#{Issue.table_name}.created_on"
   
-  acts_as_event :title => Proc.new {|o| "#{o.issue.tracker.name} ##{o.issue.id}: #{o.issue.subject}" + ((s = o.new_status) ? " (#{s})" : '') },
+  acts_as_event :title => Proc.new {|o| status = ((s = o.new_status) ? " (#{s})" : nil); "#{o.issue.tracker} ##{o.issue.id}#{status}: #{o.issue.subject}" },
                 :description => :notes,
                 :author => :user,
                 :type => Proc.new {|o| (s = o.new_status) && s.is_closed? ? 'issue-closed' : 'issue-edit' },

From 05cd95987f1946f2bce138d339ef64511e15bde6 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 8 Jun 2008 10:10:54 +0000
Subject: [PATCH 496/710] Fixes tabulation with Firefox 2 on tabular forms.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1506 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 public/stylesheets/application.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index f51d1841c..dd942c819 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -229,7 +229,7 @@ height: 1%;
 clear:left;
 }
 
-html>body .tabular p {overflow:auto;}
+html>body .tabular p {overflow:hidden;}
 
 .tabular label{
 font-weight: bold;

From dfe62d7f51b4aadb1034e2e64de2524b30dfd17b Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 8 Jun 2008 14:59:26 +0000
Subject: [PATCH 497/710] Ability to disable unused SCM adapters in application
 settings.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1507 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/repositories_controller.rb    | 4 ++--
 app/helpers/repositories_helper.rb            | 9 ++++++---
 app/models/repository.rb                      | 5 ++++-
 app/views/projects/settings/_repository.rhtml | 2 +-
 app/views/settings/_repositories.rhtml        | 7 +++++++
 config/settings.yml                           | 9 +++++++++
 lang/bg.yml                                   | 1 +
 lang/cs.yml                                   | 1 +
 lang/da.yml                                   | 1 +
 lang/de.yml                                   | 1 +
 lang/en.yml                                   | 1 +
 lang/es.yml                                   | 1 +
 lang/fi.yml                                   | 1 +
 lang/fr.yml                                   | 1 +
 lang/he.yml                                   | 1 +
 lang/hu.yml                                   | 1 +
 lang/it.yml                                   | 1 +
 lang/ja.yml                                   | 1 +
 lang/ko.yml                                   | 1 +
 lang/lt.yml                                   | 1 +
 lang/nl.yml                                   | 1 +
 lang/no.yml                                   | 1 +
 lang/pl.yml                                   | 1 +
 lang/pt-br.yml                                | 1 +
 lang/pt.yml                                   | 1 +
 lang/ro.yml                                   | 1 +
 lang/ru.yml                                   | 1 +
 lang/sr.yml                                   | 1 +
 lang/sv.yml                                   | 1 +
 lang/th.yml                                   | 1 +
 lang/uk.yml                                   | 1 +
 lang/zh-tw.yml                                | 1 +
 lang/zh.yml                                   | 1 +
 test/unit/repository_test.rb                  | 8 ++++++++
 34 files changed, 64 insertions(+), 7 deletions(-)

diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb
index 64eb05793..ea3b117d9 100644
--- a/app/controllers/repositories_controller.rb
+++ b/app/controllers/repositories_controller.rb
@@ -34,9 +34,9 @@ class RepositoriesController < ApplicationController
     @repository = @project.repository
     if !@repository
       @repository = Repository.factory(params[:repository_scm])
-      @repository.project = @project
+      @repository.project = @project if @repository
     end
-    if request.post?
+    if request.post? && @repository
       @repository.attributes = params[:repository]
       @repository.save
     end
diff --git a/app/helpers/repositories_helper.rb b/app/helpers/repositories_helper.rb
index 22bdec9df..d2cc664e6 100644
--- a/app/helpers/repositories_helper.rb
+++ b/app/helpers/repositories_helper.rb
@@ -48,10 +48,13 @@ module RepositoriesHelper
   end
   
   def scm_select_tag(repository)
-    container = [[]]
-    REDMINE_SUPPORTED_SCM.each {|scm| container << ["Repository::#{scm}".constantize.scm_name, scm]}
+    scm_options = [["--- #{l(:actionview_instancetag_blank_option)} ---", '']]
+    REDMINE_SUPPORTED_SCM.each do |scm|
+      scm_options << ["Repository::#{scm}".constantize.scm_name, scm] if Setting.enabled_scm.include?(scm) || (repository && repository.class.name.demodulize == scm)
+    end
+    
     select_tag('repository_scm', 
-               options_for_select(container, repository.class.name.demodulize),
+               options_for_select(scm_options, repository.class.name.demodulize),
                :disabled => (repository && !repository.new_record?),
                :onchange => remote_function(:url => { :controller => 'repositories', :action => 'edit', :id => @project }, :method => :get, :with => "Form.serialize(this.form)")
                )
diff --git a/app/models/repository.rb b/app/models/repository.rb
index 1ea77f24f..e6ed7da52 100644
--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -19,7 +19,10 @@ class Repository < ActiveRecord::Base
   belongs_to :project
   has_many :changesets, :dependent => :destroy, :order => "#{Changeset.table_name}.committed_on DESC, #{Changeset.table_name}.id DESC"
   has_many :changes, :through => :changesets
-    
+  
+  # Checks if the SCM is enabled when creating a repository
+  validate_on_create { |r| r.errors.add(:type, :activerecord_error_invalid) unless Setting.enabled_scm.include?(r.class.name.demodulize) }
+  
   # Removes leading and trailing whitespace
   def url=(arg)
     write_attribute(:url, arg ? arg.to_s.strip : nil)
diff --git a/app/views/projects/settings/_repository.rhtml b/app/views/projects/settings/_repository.rhtml
index 95830ab98..dcfabbbf0 100644
--- a/app/views/projects/settings/_repository.rhtml
+++ b/app/views/projects/settings/_repository.rhtml
@@ -17,5 +17,5 @@
             :class => 'icon icon-del') if @repository && !@repository.new_record? %>
 </div>
 
-<%= submit_tag((@repository.nil? || @repository.new_record?) ? l(:button_create) : l(:button_save)) %>
+<%= submit_tag((@repository.nil? || @repository.new_record?) ? l(:button_create) : l(:button_save), :disabled => @repository.nil?) %>
 <% end %>
diff --git a/app/views/settings/_repositories.rhtml b/app/views/settings/_repositories.rhtml
index 59b3b51de..127801be2 100644
--- a/app/views/settings/_repositories.rhtml
+++ b/app/views/settings/_repositories.rhtml
@@ -7,6 +7,13 @@
 <p><label><%= l(:setting_sys_api_enabled) %></label>
 <%= check_box_tag 'settings[sys_api_enabled]', 1, Setting.sys_api_enabled? %><%= hidden_field_tag 'settings[sys_api_enabled]', 0 %></p>
 
+<p><label><%= l(:setting_enabled_scm) %></label>
+<% REDMINE_SUPPORTED_SCM.each do |scm| -%>
+<%= check_box_tag 'settings[enabled_scm][]', scm, Setting.enabled_scm.include?(scm) %> <%= scm %>
+<% end -%>
+<%= hidden_field_tag 'settings[enabled_scm][]', '' %>
+</p>
+
 <p><label><%= l(:setting_repositories_encodings) %></label>
 <%= text_field_tag 'settings[repositories_encodings]', Setting.repositories_encodings, :size => 60 %><br /><em><%= l(:text_comma_separated) %></em></p>
 </div>
diff --git a/config/settings.yml b/config/settings.yml
index bb501823e..616665f23 100644
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -59,6 +59,15 @@ protocol:
 feeds_limit:
   format: int
   default: 15
+enabled_scm:
+  serialized: true
+  default: 
+  - Subversion
+  - Darcs
+  - Mercurial
+  - Cvs
+  - Bazaar
+  - Git
 autofetch_changesets:
   default: 1
 sys_api_enabled:
diff --git a/lang/bg.yml b/lang/bg.yml
index 6ab6f26c6..5f3548684 100644
--- a/lang/bg.yml
+++ b/lang/bg.yml
@@ -623,3 +623,4 @@ mail_body_reminder: "%d issue(s) that are assigned to you are due in the next %d
 mail_subject_reminder: "%d issue(s) due in the next days"
 text_user_wrote: '%s wrote:'
 label_duplicated_by: duplicated by
+setting_enabled_scm: Enabled SCM
diff --git a/lang/cs.yml b/lang/cs.yml
index 7413b79dd..26e0f5131 100644
--- a/lang/cs.yml
+++ b/lang/cs.yml
@@ -628,3 +628,4 @@ mail_body_reminder: "%d issue(s) that are assigned to you are due in the next %d
 mail_subject_reminder: "%d issue(s) due in the next days"
 text_user_wrote: '%s wrote:'
 label_duplicated_by: duplicated by
+setting_enabled_scm: Enabled SCM
diff --git a/lang/da.yml b/lang/da.yml
index 2107498ad..b2f18db4c 100644
--- a/lang/da.yml
+++ b/lang/da.yml
@@ -625,3 +625,4 @@ mail_body_reminder: "%d issue(s) that are assigned to you are due in the next %d
 mail_subject_reminder: "%d issue(s) due in the next days"
 text_user_wrote: '%s wrote:'
 label_duplicated_by: duplicated by
+setting_enabled_scm: Enabled SCM
diff --git a/lang/de.yml b/lang/de.yml
index 27d22fc54..1e4040f3d 100644
--- a/lang/de.yml
+++ b/lang/de.yml
@@ -624,3 +624,4 @@ mail_body_reminder: "%d issue(s) that are assigned to you are due in the next %d
 mail_subject_reminder: "%d issue(s) due in the next days"
 text_user_wrote: '%s wrote:'
 label_duplicated_by: duplicated by
+setting_enabled_scm: Enabled SCM
diff --git a/lang/en.yml b/lang/en.yml
index 262570f1d..b7f217e6c 100644
--- a/lang/en.yml
+++ b/lang/en.yml
@@ -213,6 +213,7 @@ setting_per_page_options: Objects per page options
 setting_user_format: Users display format
 setting_activity_days_default: Days displayed on project activity
 setting_display_subprojects_issues: Display subprojects issues on main projects by default
+setting_enabled_scm: Enabled SCM
 
 project_module_issue_tracking: Issue tracking
 project_module_time_tracking: Time tracking
diff --git a/lang/es.yml b/lang/es.yml
index 62528e688..c0ecb997b 100644
--- a/lang/es.yml
+++ b/lang/es.yml
@@ -626,3 +626,4 @@ mail_body_reminder: "%d issue(s) that are assigned to you are due in the next %d
 mail_subject_reminder: "%d issue(s) due in the next days"
 text_user_wrote: '%s wrote:'
 label_duplicated_by: duplicated by
+setting_enabled_scm: Enabled SCM
diff --git a/lang/fi.yml b/lang/fi.yml
index b32bbb259..6ac4aea7e 100644
--- a/lang/fi.yml
+++ b/lang/fi.yml
@@ -623,3 +623,4 @@ mail_body_reminder: "%d issue(s) that are assigned to you are due in the next %d
 mail_subject_reminder: "%d issue(s) due in the next days"
 text_user_wrote: '%s wrote:'
 label_duplicated_by: duplicated by
+setting_enabled_scm: Enabled SCM
diff --git a/lang/fr.yml b/lang/fr.yml
index 8b040463f..4db2f8f3a 100644
--- a/lang/fr.yml
+++ b/lang/fr.yml
@@ -214,6 +214,7 @@ setting_per_page_options: Options d'objets affichés par page
 setting_user_format: Format d'affichage des utilisateurs
 setting_activity_days_default: Nombre de jours affichés sur l'activité des projets
 setting_display_subprojects_issues: Afficher par défaut les demandes des sous-projets sur les projets principaux
+setting_enabled_scm: SCM activés
 
 project_module_issue_tracking: Suivi des demandes
 project_module_time_tracking: Suivi du temps passé
diff --git a/lang/he.yml b/lang/he.yml
index da31812cf..e23698d32 100644
--- a/lang/he.yml
+++ b/lang/he.yml
@@ -623,3 +623,4 @@ mail_body_reminder: "%d issue(s) that are assigned to you are due in the next %d
 mail_subject_reminder: "%d issue(s) due in the next days"
 text_user_wrote: '%s wrote:'
 label_duplicated_by: duplicated by
+setting_enabled_scm: Enabled SCM
diff --git a/lang/hu.yml b/lang/hu.yml
index 2a399bc13..64518271c 100644
--- a/lang/hu.yml
+++ b/lang/hu.yml
@@ -624,3 +624,4 @@ mail_body_reminder: "%d neked kiosztott feladat határidős az elkövetkező %d
 mail_subject_reminder: "%d feladat határidős az elkövetkező napokban"
 text_user_wrote: '%s írta:'
 label_duplicated_by: duplikálta
+setting_enabled_scm: Enabled SCM
diff --git a/lang/it.yml b/lang/it.yml
index e5557f915..5ab9ad310 100644
--- a/lang/it.yml
+++ b/lang/it.yml
@@ -623,3 +623,4 @@ mail_body_reminder: "%d issue(s) that are assigned to you are due in the next %d
 mail_subject_reminder: "%d issue(s) due in the next days"
 text_user_wrote: '%s wrote:'
 label_duplicated_by: duplicated by
+setting_enabled_scm: Enabled SCM
diff --git a/lang/ja.yml b/lang/ja.yml
index 1ae9ab1b6..c693d68e5 100644
--- a/lang/ja.yml
+++ b/lang/ja.yml
@@ -624,3 +624,4 @@ mail_body_reminder: "%d issue(s) that are assigned to you are due in the next %d
 mail_subject_reminder: "%d issue(s) due in the next days"
 text_user_wrote: '%s wrote:'
 label_duplicated_by: duplicated by
+setting_enabled_scm: Enabled SCM
diff --git a/lang/ko.yml b/lang/ko.yml
index c00a9e9a0..af1c768af 100644
--- a/lang/ko.yml
+++ b/lang/ko.yml
@@ -623,3 +623,4 @@ mail_body_reminder: "%d issue(s) that are assigned to you are due in the next %d
 mail_subject_reminder: "%d issue(s) due in the next days"
 text_user_wrote: '%s wrote:'
 label_duplicated_by: duplicated by
+setting_enabled_scm: Enabled SCM
diff --git a/lang/lt.yml b/lang/lt.yml
index 140631fcf..ff8f6b695 100644
--- a/lang/lt.yml
+++ b/lang/lt.yml
@@ -625,3 +625,4 @@ mail_body_reminder: "%d issue(s) that are assigned to you are due in the next %d
 mail_subject_reminder: "%d issue(s) due in the next days"
 text_user_wrote: '%s wrote:'
 label_duplicated_by: duplicated by
+setting_enabled_scm: Enabled SCM
diff --git a/lang/nl.yml b/lang/nl.yml
index 62bbc1468..9ee913848 100644
--- a/lang/nl.yml
+++ b/lang/nl.yml
@@ -624,3 +624,4 @@ mail_body_reminder: "%d issue(s) that are assigned to you are due in the next %d
 mail_subject_reminder: "%d issue(s) due in the next days"
 text_user_wrote: '%s wrote:'
 label_duplicated_by: duplicated by
+setting_enabled_scm: Enabled SCM
diff --git a/lang/no.yml b/lang/no.yml
index a31751da6..e3b88b110 100644
--- a/lang/no.yml
+++ b/lang/no.yml
@@ -624,3 +624,4 @@ default_activity_development: Utvikling
 enumeration_issue_priorities: Sakssprioriteringer
 enumeration_doc_categories: Dokument-kategorier
 enumeration_activities: Aktiviteter (tidssporing)
+setting_enabled_scm: Enabled SCM
diff --git a/lang/pl.yml b/lang/pl.yml
index adf676210..75e04ecd4 100644
--- a/lang/pl.yml
+++ b/lang/pl.yml
@@ -623,3 +623,4 @@ mail_body_reminder: "%d issue(s) that are assigned to you are due in the next %d
 mail_subject_reminder: "%d issue(s) due in the next days"
 text_user_wrote: '%s wrote:'
 label_duplicated_by: duplicated by
+setting_enabled_scm: Enabled SCM
diff --git a/lang/pt-br.yml b/lang/pt-br.yml
index ca9b9073b..dabab5bfe 100644
--- a/lang/pt-br.yml
+++ b/lang/pt-br.yml
@@ -623,3 +623,4 @@ mail_body_reminder: "%d issue(s) that are assigned to you are due in the next %d
 mail_subject_reminder: "%d issue(s) due in the next days"
 text_user_wrote: '%s wrote:'
 label_duplicated_by: duplicated by
+setting_enabled_scm: Enabled SCM
diff --git a/lang/pt.yml b/lang/pt.yml
index f9472b7ea..2845f390c 100644
--- a/lang/pt.yml
+++ b/lang/pt.yml
@@ -623,3 +623,4 @@ mail_body_reminder: "%d issue(s) that are assigned to you are due in the next %d
 mail_subject_reminder: "%d issue(s) due in the next days"
 text_user_wrote: '%s wrote:'
 label_duplicated_by: duplicated by
+setting_enabled_scm: Enabled SCM
diff --git a/lang/ro.yml b/lang/ro.yml
index 840fa7073..dd51e59be 100644
--- a/lang/ro.yml
+++ b/lang/ro.yml
@@ -623,3 +623,4 @@ mail_body_reminder: "%d issue(s) that are assigned to you are due in the next %d
 mail_subject_reminder: "%d issue(s) due in the next days"
 text_user_wrote: '%s wrote:'
 label_duplicated_by: duplicated by
+setting_enabled_scm: Enabled SCM
diff --git a/lang/ru.yml b/lang/ru.yml
index 37f2aef30..c3ec91897 100644
--- a/lang/ru.yml
+++ b/lang/ru.yml
@@ -627,3 +627,4 @@ mail_body_reminder: "%d назначенных на вас задач на сл
 mail_subject_reminder: "%d назначенных на вас задач в ближайшие дни" 
 text_user_wrote: '%s написал:'
 label_duplicated_by: duplicated by
+setting_enabled_scm: Enabled SCM
diff --git a/lang/sr.yml b/lang/sr.yml
index d507a1d97..92906760b 100644
--- a/lang/sr.yml
+++ b/lang/sr.yml
@@ -624,3 +624,4 @@ mail_body_reminder: "%d issue(s) that are assigned to you are due in the next %d
 mail_subject_reminder: "%d issue(s) due in the next days"
 text_user_wrote: '%s wrote:'
 label_duplicated_by: duplicated by
+setting_enabled_scm: Enabled SCM
diff --git a/lang/sv.yml b/lang/sv.yml
index fbd7c5c40..f08e45eb0 100644
--- a/lang/sv.yml
+++ b/lang/sv.yml
@@ -624,3 +624,4 @@ mail_body_reminder: "%d issue(s) that are assigned to you are due in the next %d
 mail_subject_reminder: "%d issue(s) due in the next days"
 text_user_wrote: '%s wrote:'
 label_duplicated_by: duplicated by
+setting_enabled_scm: Enabled SCM
diff --git a/lang/th.yml b/lang/th.yml
index 9dfaf2865..85a1f8c01 100644
--- a/lang/th.yml
+++ b/lang/th.yml
@@ -626,3 +626,4 @@ mail_body_reminder: "%d issue(s) that are assigned to you are due in the next %d
 mail_subject_reminder: "%d issue(s) due in the next days"
 text_user_wrote: '%s wrote:'
 label_duplicated_by: duplicated by
+setting_enabled_scm: Enabled SCM
diff --git a/lang/uk.yml b/lang/uk.yml
index beabfd1f0..ae8c5cbc0 100644
--- a/lang/uk.yml
+++ b/lang/uk.yml
@@ -625,3 +625,4 @@ mail_body_reminder: "%d issue(s) that are assigned to you are due in the next %d
 mail_subject_reminder: "%d issue(s) due in the next days"
 text_user_wrote: '%s wrote:'
 label_duplicated_by: duplicated by
+setting_enabled_scm: Enabled SCM
diff --git a/lang/zh-tw.yml b/lang/zh-tw.yml
index c3cd096a3..2ee595dcd 100644
--- a/lang/zh-tw.yml
+++ b/lang/zh-tw.yml
@@ -624,3 +624,4 @@ default_activity_development: 開發
 enumeration_issue_priorities: 項目優先權
 enumeration_doc_categories: 文件分類
 enumeration_activities: 活動 (時間追蹤)
+setting_enabled_scm: Enabled SCM
diff --git a/lang/zh.yml b/lang/zh.yml
index 9e22e6874..d82363414 100644
--- a/lang/zh.yml
+++ b/lang/zh.yml
@@ -624,3 +624,4 @@ enumeration_issue_priorities: 问题优先级
 enumeration_doc_categories: 文档类别
 enumeration_activities: 活动（时间跟踪）
 label_duplicated_by: duplicated by
+setting_enabled_scm: Enabled SCM
diff --git a/test/unit/repository_test.rb b/test/unit/repository_test.rb
index 7764ee04a..270b0bea1 100644
--- a/test/unit/repository_test.rb
+++ b/test/unit/repository_test.rb
@@ -45,6 +45,14 @@ class RepositoryTest < Test::Unit::TestCase
     assert_equal repository, project.repository
   end
   
+  def test_should_not_create_with_disabled_scm
+    # disable Subversion
+    Setting.enabled_scm = ['Darcs', 'Git']
+    repository = Repository::Subversion.new(:project => Project.find(3), :url => "svn://localhost")
+    assert !repository.save
+    assert_equal :activerecord_error_invalid, repository.errors.on(:type)
+  end
+  
   def test_scan_changesets_for_issue_ids
     # choosing a status to apply to fix issues
     Setting.commit_fix_status_id = IssueStatus.find(:first, :conditions => ["is_closed = ?", true]).id

From e69b4647f201b33fff3a87890807dbffd549c0fc Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 8 Jun 2008 15:40:24 +0000
Subject: [PATCH 498/710] Adds Filesystem adapter (patch #1393 by Paul R).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1508 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/helpers/repositories_helper.rb            |   4 +
 app/models/repository/filesystem.rb           |  43 ++++++++
 doc/RUNNING_TESTS                             |   4 +
 lib/redmine.rb                                |   2 +-
 lib/redmine/scm/adapters/abstract_adapter.rb  |  10 ++
 .../scm/adapters/filesystem_adapter.rb        |  94 ++++++++++++++++++
 .../repositories/filesystem_repository.tar.gz | Bin 0 -> 265 bytes
 test/unit/filesystem_adapter_test.rb          |  42 ++++++++
 test/unit/repository_filesystem_test.rb       |  54 ++++++++++
 test/unit/repository_test.rb                  |   2 +
 10 files changed, 254 insertions(+), 1 deletion(-)
 create mode 100644 app/models/repository/filesystem.rb
 create mode 100644 lib/redmine/scm/adapters/filesystem_adapter.rb
 create mode 100644 test/fixtures/repositories/filesystem_repository.tar.gz
 create mode 100644 test/unit/filesystem_adapter_test.rb
 create mode 100644 test/unit/repository_filesystem_test.rb

diff --git a/app/helpers/repositories_helper.rb b/app/helpers/repositories_helper.rb
index d2cc664e6..10f6e7396 100644
--- a/app/helpers/repositories_helper.rb
+++ b/app/helpers/repositories_helper.rb
@@ -98,4 +98,8 @@ module RepositoriesHelper
   def bazaar_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 filesystem_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
 end
diff --git a/app/models/repository/filesystem.rb b/app/models/repository/filesystem.rb
new file mode 100644
index 000000000..da096cc09
--- /dev/null
+++ b/app/models/repository/filesystem.rb
@@ -0,0 +1,43 @@
+# redMine - project management software
+# Copyright (C) 2006-2007  Jean-Philippe Lang
+#
+# FileSystem adapter
+# File written by Paul Rivier, at Demotera.
+#
+# 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/filesystem_adapter'
+
+class Repository::Filesystem < Repository
+  attr_protected :root_url
+  validates_presence_of :url
+
+  def scm_adapter
+    Redmine::Scm::Adapters::FilesystemAdapter
+  end
+  
+  def self.scm_name
+    'Filesystem'
+  end
+  
+  def entries(path=nil, identifier=nil)
+    scm.entries(path, identifier)
+  end
+
+  def fetch_changesets
+    nil
+  end
+  
+end
diff --git a/doc/RUNNING_TESTS b/doc/RUNNING_TESTS
index 7a5e2b992..18dfe6983 100644
--- a/doc/RUNNING_TESTS
+++ b/doc/RUNNING_TESTS
@@ -24,6 +24,10 @@ Git
 ---
 gunzip < test/fixtures/repositories/git_repository.tar.gz | tar -xv -C tmp/test
 
+FileSystem
+----------
+gunzip < test/fixtures/repositories/filesystem_repository.tar.gz | tar -xv -C tmp/test
+
 
 Running Tests
 =============
diff --git a/lib/redmine.rb b/lib/redmine.rb
index 7b9832d62..84eda9f72 100644
--- a/lib/redmine.rb
+++ b/lib/redmine.rb
@@ -11,7 +11,7 @@ rescue LoadError
   # RMagick is not available
 end
 
-REDMINE_SUPPORTED_SCM = %w( Subversion Darcs Mercurial Cvs Bazaar Git )
+REDMINE_SUPPORTED_SCM = %w( Subversion Darcs Mercurial Cvs Bazaar Git Filesystem )
 
 # Permissions
 Redmine::AccessControl.map do |map|
diff --git a/lib/redmine/scm/adapters/abstract_adapter.rb b/lib/redmine/scm/adapters/abstract_adapter.rb
index 80058a2bf..bd77ce203 100644
--- a/lib/redmine/scm/adapters/abstract_adapter.rb
+++ b/lib/redmine/scm/adapters/abstract_adapter.rb
@@ -100,6 +100,16 @@ module Redmine
           (path[-1,1] == "/") ? path : "#{path}/"
         end
         
+        def without_leading_slash(path)
+          path ||= ''
+          path.gsub(%r{^/+}, '')
+        end
+
+        def without_trailling_slash(path)
+          path ||= ''
+          (path[-1,1] == "/") ? path[0..-2] : path
+         end
+        
         def shell_quote(str)
           if RUBY_PLATFORM =~ /mswin/
             '"' + str.gsub(/"/, '\\"') + '"'
diff --git a/lib/redmine/scm/adapters/filesystem_adapter.rb b/lib/redmine/scm/adapters/filesystem_adapter.rb
new file mode 100644
index 000000000..c06b7e6e3
--- /dev/null
+++ b/lib/redmine/scm/adapters/filesystem_adapter.rb
@@ -0,0 +1,94 @@
+# redMine - project management software
+# Copyright (C) 2006-2007  Jean-Philippe Lang
+#
+# FileSystem adapter
+# File written by Paul Rivier, at Demotera.
+#
+# 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/abstract_adapter'
+require 'find'
+
+module Redmine
+  module Scm
+    module Adapters    
+      class FilesystemAdapter < AbstractAdapter
+        
+
+        def initialize(url, root_url=nil, login=nil, password=nil)
+          @url = with_trailling_slash(url)
+        end
+
+        def format_path_ends(path, leading=true, trailling=true)
+          path = leading ? with_leading_slash(path) : 
+            without_leading_slash(path)
+          trailling ? with_trailling_slash(path) : 
+            without_trailling_slash(path) 
+        end
+
+        def info
+          info = Info.new({:root_url => target(),
+                            :lastrev => nil
+                          })
+          info
+        rescue CommandFailed
+          return nil
+        end
+        
+        def entries(path="", identifier=nil)
+          entries = Entries.new
+          Dir.new(target(path)).each do |e|
+            relative_path = format_path_ends((format_path_ends(path,
+                                                               false,
+                                                               true) + e),
+                                             false,false)
+            target = target(relative_path)
+            entries << 
+              Entry.new({ :name => File.basename(e),
+                          # below : list unreadable files, but dont link them.
+                          :path => File.readable?(target) ? relative_path : "",
+                          :kind => (File.directory?(target) ? 'dir' : 'file'),
+                          :size => if (File.directory?(target))
+                                     nil else File.size(target) end,
+                          :lastrev => 
+                          Revision.new({:time => (File.mtime(target)).localtime,
+                                       })
+                        }) if File.exist?(target) and # paranoid test
+              %w{file directory}.include?(File.ftype(target)) and # avoid special types
+              not File.basename(e).match(/^\.+$/) # avoid . and ..             
+          end
+          entries.sort_by_name
+        end
+        
+        def cat(path, identifier=nil)
+          File.new(target(path)).read
+        end
+
+        private
+        
+        # AbstractAdapter::target is implicitly made to quote paths.
+        # Here we do not shell-out, so we do not want quotes.
+        def target(path=nil)
+          #Prevent the use of ..
+          if path and !path.match(/(^|\/)\.\.(\/|$)/)
+            return "#{self.url}#{without_leading_slash(path)}"
+          end
+          return self.url
+        end
+        
+      end
+    end
+  end
+end
diff --git a/test/fixtures/repositories/filesystem_repository.tar.gz b/test/fixtures/repositories/filesystem_repository.tar.gz
new file mode 100644
index 0000000000000000000000000000000000000000..7e8a4ac56a63c90171110e9433a8762bcc7c136b
GIT binary patch
literal 265
zcmb2|=HO^%_4Ht1PRq<mEv_ssNzIKfN-fAQ&Me6<s?;k<EMj<j^*&dVfe71&*zY3M
z&1KjA#khZAsg!r)YFfCX^5JdsW(^PFM2(BznQg^|%N{(I`Ml^%%=4NuYxBt1orl7G
zx2Fbn9>}^IzA0+Yb#*tDB`V6EQEDEZn|faF$mPkN>o0vSa_+XL+utucS07?GWB>U%
z{pIfR8v?Uz>KBFo^J@EJ%6WK4$Mr)y?9ba<&J(J;p+0-7bYm#b`Ttupl>RZNy{Q+C
z`}=QuSkiy}M4SH~zO)Ozn{nsA{Lk638aMuPOPs&Ib-G7(!nHq_mFqJ(KJzmm1B2tT
MmP_Io88jFe02tJEzyJUM

literal 0
HcmV?d00001

diff --git a/test/unit/filesystem_adapter_test.rb b/test/unit/filesystem_adapter_test.rb
new file mode 100644
index 000000000..720d1e92c
--- /dev/null
+++ b/test/unit/filesystem_adapter_test.rb
@@ -0,0 +1,42 @@
+
+require File.dirname(__FILE__) + '/../test_helper'
+
+
+class FilesystemAdapterTest < Test::Unit::TestCase
+  
+  REPOSITORY_PATH = RAILS_ROOT.gsub(%r{config\/\.\.}, '') + '/tmp/test/filesystem_repository'  
+  
+  if File.directory?(REPOSITORY_PATH)    
+    def setup
+      @adapter = Redmine::Scm::Adapters::FilesystemAdapter.new(REPOSITORY_PATH)
+    end
+    
+    def test_entries
+      assert_equal 2, @adapter.entries.size
+      assert_equal ["dir", "test"], @adapter.entries.collect(&:name)
+      assert_equal ["dir", "test"], @adapter.entries(nil).collect(&:name)
+      assert_equal ["dir", "test"], @adapter.entries("/").collect(&:name)
+      ["dir", "/dir", "/dir/", "dir/"].each do |path|
+        assert_equal ["subdir", "dirfile"], @adapter.entries(path).collect(&:name)
+      end
+      # If y try to use "..", the path is ignored
+      ["/../","dir/../", "..", "../", "/..", "dir/.."].each do |path|
+        assert_equal ["dir", "test"], @adapter.entries(path).collect(&:name), ".. must be ignored in path argument"
+      end
+    end
+    
+    def test_cat
+      assert_equal "TEST CAT\n", @adapter.cat("test")
+      assert_equal "TEST CAT\n", @adapter.cat("/test")
+      # Revision number is ignored
+      assert_equal "TEST CAT\n", @adapter.cat("/test", 1)
+    end
+    
+  else
+    puts "Filesystem test repository NOT FOUND. Skipping unit tests !!! See doc/RUNNING_TESTS."
+    def test_fake; assert true end
+  end
+  
+end
+
+
diff --git a/test/unit/repository_filesystem_test.rb b/test/unit/repository_filesystem_test.rb
new file mode 100644
index 000000000..6b643f96f
--- /dev/null
+++ b/test/unit/repository_filesystem_test.rb
@@ -0,0 +1,54 @@
+# 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 File.dirname(__FILE__) + '/../test_helper'
+
+class RepositoryFilesystemTest < Test::Unit::TestCase
+  fixtures :projects
+  
+  # No '..' in the repository path
+  REPOSITORY_PATH = RAILS_ROOT.gsub(%r{config\/\.\.}, '') + '/tmp/test/filesystem_repository'
+  
+  def setup
+    @project = Project.find(1)
+    Setting.enabled_scm << 'Filesystem' unless Setting.enabled_scm.include?('Filesystem')
+    assert @repository = Repository::Filesystem.create(:project => @project, :url => REPOSITORY_PATH)
+  end
+  
+  if File.directory?(REPOSITORY_PATH)  
+    def test_fetch_changesets
+      @repository.fetch_changesets
+      @repository.reload
+      
+      assert_equal 0, @repository.changesets.count
+      assert_equal 0, @repository.changes.count
+    end
+        
+    def test_entries
+      assert_equal 2, @repository.entries("", 2).size
+      assert_equal 2, @repository.entries("dir", 3).size
+    end
+
+    def test_cat
+      assert_equal "TEST CAT\n", @repository.scm.cat("test")
+    end
+
+  else
+    puts "Filesystem test repository NOT FOUND. Skipping unit tests !!! See doc/RUNNING_TESTS."
+    def test_fake; assert true end
+  end
+end
diff --git a/test/unit/repository_test.rb b/test/unit/repository_test.rb
index 270b0bea1..03d836ef7 100644
--- a/test/unit/repository_test.rb
+++ b/test/unit/repository_test.rb
@@ -51,6 +51,8 @@ class RepositoryTest < Test::Unit::TestCase
     repository = Repository::Subversion.new(:project => Project.find(3), :url => "svn://localhost")
     assert !repository.save
     assert_equal :activerecord_error_invalid, repository.errors.on(:type)
+    # re-enable Subversion for following tests
+    Setting.delete_all
   end
   
   def test_scan_changesets_for_issue_ids

From 5dea2007746a5d7027cb5b3c70674e94c3563f37 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 8 Jun 2008 15:43:32 +0000
Subject: [PATCH 499/710] Filesystem adapter: negative size is displayed for
 large files under win32.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1509 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 lib/redmine/scm/adapters/filesystem_adapter.rb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/redmine/scm/adapters/filesystem_adapter.rb b/lib/redmine/scm/adapters/filesystem_adapter.rb
index c06b7e6e3..d300f6cbb 100644
--- a/lib/redmine/scm/adapters/filesystem_adapter.rb
+++ b/lib/redmine/scm/adapters/filesystem_adapter.rb
@@ -60,8 +60,7 @@ module Redmine
                           # below : list unreadable files, but dont link them.
                           :path => File.readable?(target) ? relative_path : "",
                           :kind => (File.directory?(target) ? 'dir' : 'file'),
-                          :size => if (File.directory?(target))
-                                     nil else File.size(target) end,
+                          :size => (File.directory?(target) ? nil : [File.size(target)].pack('l').unpack('L').first),
                           :lastrev => 
                           Revision.new({:time => (File.mtime(target)).localtime,
                                        })

From a0d141460655e0bd6e3b2b6e8ccccddc34ade68a Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 8 Jun 2008 15:44:23 +0000
Subject: [PATCH 500/710] Filesystem adapter: read files in binary mode.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1510 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 lib/redmine/scm/adapters/filesystem_adapter.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/redmine/scm/adapters/filesystem_adapter.rb b/lib/redmine/scm/adapters/filesystem_adapter.rb
index d300f6cbb..99296a090 100644
--- a/lib/redmine/scm/adapters/filesystem_adapter.rb
+++ b/lib/redmine/scm/adapters/filesystem_adapter.rb
@@ -72,7 +72,7 @@ module Redmine
         end
         
         def cat(path, identifier=nil)
-          File.new(target(path)).read
+          File.new(target(path), "rb").read
         end
 
         private

From 0aba4255f58252da835729b09ccfce9b0ded14be Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 8 Jun 2008 15:46:15 +0000
Subject: [PATCH 501/710] Don't display the table headers if there is no
 changeset to display.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1511 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/repositories/changes.rhtml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/views/repositories/changes.rhtml b/app/views/repositories/changes.rhtml
index 2d7462b29..341c6cba5 100644
--- a/app/views/repositories/changes.rhtml
+++ b/app/views/repositories/changes.rhtml
@@ -13,6 +13,7 @@
 <%= "(#{number_to_human_size(@entry.size)})" if @entry.size %>
 </p>
 
-<%= render :partial => 'revisions', :locals => {:project => @project, :path => @path, :revisions => @changesets, :entry => @entry }%>
+<%= render(:partial => 'revisions', 
+           :locals => {:project => @project, :path => @path, :revisions => @changesets, :entry => @entry }) unless @changesets.empty? %>
 
 <% html_title(l(:label_change_plural)) -%>

From 731d15fe9b29a28362fff19ed7dad9df2516d73b Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 8 Jun 2008 15:47:55 +0000
Subject: [PATCH 502/710] Don't search for the changeset if revision identifier
 is nil.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1512 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/repositories/_dir_list_content.rhtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/repositories/_dir_list_content.rhtml b/app/views/repositories/_dir_list_content.rhtml
index 3564e52ab..c3bd56e09 100644
--- a/app/views/repositories/_dir_list_content.rhtml
+++ b/app/views/repositories/_dir_list_content.rhtml
@@ -26,7 +26,7 @@ end %>
 <td class="revision"><%= link_to(format_revision(entry.lastrev.name), :action => 'revision', :id => @project, :rev => entry.lastrev.identifier) if entry.lastrev && entry.lastrev.identifier %></td>
 <td class="age"><%= distance_of_time_in_words(entry.lastrev.time, Time.now) if entry.lastrev && entry.lastrev.time %></td>
 <td class="author"><%=h(entry.lastrev.author.to_s.split('<').first) if entry.lastrev %></td>
-<% changeset = @project.repository.changesets.find_by_revision(entry.lastrev.identifier) if entry.lastrev %>
+<% changeset = @project.repository.changesets.find_by_revision(entry.lastrev.identifier) if entry.lastrev && entry.lastrev.identifier %>
 <td class="comments"><%=h truncate(changeset.comments, 50) unless changeset.nil? %></td>
 </tr>
 <% end %>

From ec0525d4975b9cae9982695cb0a19ac9c4bd1a3c Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 8 Jun 2008 16:28:42 +0000
Subject: [PATCH 503/710] Move unified diff parser out of the scm abstract
 adapter so it can be reused for viewing attached diffs (#1403).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1513 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/repositories_controller.rb    |   2 +-
 app/models/repository.rb                      |   4 +-
 app/models/repository/cvs.rb                  |   4 +-
 app/models/repository/darcs.rb                |   4 +-
 app/views/repositories/diff.rhtml             |   2 +-
 lib/redmine/scm/adapters/abstract_adapter.rb  | 161 +---------------
 lib/redmine/scm/adapters/bazaar_adapter.rb    |   4 +-
 lib/redmine/scm/adapters/cvs_adapter.rb       |   4 +-
 lib/redmine/scm/adapters/darcs_adapter.rb     |   4 +-
 lib/redmine/scm/adapters/git_adapter.rb       |   4 +-
 lib/redmine/scm/adapters/mercurial_adapter.rb |   4 +-
 .../scm/adapters/subversion_adapter.rb        |   2 +-
 lib/redmine/unified_diff.rb                   | 178 ++++++++++++++++++
 13 files changed, 198 insertions(+), 179 deletions(-)
 create mode 100644 lib/redmine/unified_diff.rb

diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb
index ea3b117d9..5fb2fdd75 100644
--- a/app/controllers/repositories_controller.rb
+++ b/app/controllers/repositories_controller.rb
@@ -153,7 +153,7 @@ class RepositoriesController < ApplicationController
     
     @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, @diff_type)
+      @diff = @repository.diff(@path, @rev, @rev_to)
       show_error_not_found unless @diff
     end
   rescue Redmine::Scm::Adapters::CommandFailed => e
diff --git a/app/models/repository.rb b/app/models/repository.rb
index e6ed7da52..1cf61393f 100644
--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -55,8 +55,8 @@ class Repository < ActiveRecord::Base
     scm.entries(path, identifier)
   end
   
-  def diff(path, rev, rev_to, type)
-    scm.diff(path, rev, rev_to, type)
+  def diff(path, rev, rev_to)
+    scm.diff(path, rev, rev_to)
   end
   
   # Default behaviour: we search in cached changesets
diff --git a/app/models/repository/cvs.rb b/app/models/repository/cvs.rb
index c2d8be977..ea75de5d3 100644
--- a/app/models/repository/cvs.rb
+++ b/app/models/repository/cvs.rb
@@ -53,7 +53,7 @@ class Repository::Cvs < Repository
     entries
   end
   
-  def diff(path, rev, rev_to, type)
+  def diff(path, rev, rev_to)
     #convert rev to revision. CVS can't handle changesets here
     diff=[]
     changeset_from=changesets.find_by_revision(rev)
@@ -76,7 +76,7 @@ class Repository::Cvs < Repository
         unless revision_to
           revision_to=scm.get_previous_revision(revision_from)
         end
-        diff=diff+scm.diff(change_from.path, revision_from, revision_to, type)
+        diff=diff+scm.diff(change_from.path, revision_from, revision_to)
       end
     end
     return diff
diff --git a/app/models/repository/darcs.rb b/app/models/repository/darcs.rb
index c7c14a397..034c0c145 100644
--- a/app/models/repository/darcs.rb
+++ b/app/models/repository/darcs.rb
@@ -46,14 +46,14 @@ class Repository::Darcs < Repository
     entries
   end
   
-  def diff(path, rev, rev_to, type)
+  def diff(path, rev, rev_to)
     patch_from = changesets.find_by_revision(rev)
     return nil if patch_from.nil?
     patch_to = changesets.find_by_revision(rev_to) if rev_to
     if path.blank?
       path = patch_from.changes.collect{|change| change.path}.join(' ')
     end
-    patch_from ? scm.diff(path, patch_from.scmid, patch_to ? patch_to.scmid : nil, type) : nil
+    patch_from ? scm.diff(path, patch_from.scmid, patch_to ? patch_to.scmid : nil) : nil
   end
   
   def fetch_changesets
diff --git a/app/views/repositories/diff.rhtml b/app/views/repositories/diff.rhtml
index 73c1e8c9e..953c7c02a 100644
--- a/app/views/repositories/diff.rhtml
+++ b/app/views/repositories/diff.rhtml
@@ -12,7 +12,7 @@
 <% end %>
 
 <% cache(@cache_key) do -%>
-<% @diff.each do |table_file| -%>
+<% Redmine::UnifiedDiff.new(@diff, @diff_type).each do |table_file| -%>
 <div class="autoscroll">
 <% if @diff_type == 'sbs' -%>
 <table class="filecontent CodeRay">
diff --git a/lib/redmine/scm/adapters/abstract_adapter.rb b/lib/redmine/scm/adapters/abstract_adapter.rb
index bd77ce203..0bacda770 100644
--- a/lib/redmine/scm/adapters/abstract_adapter.rb
+++ b/lib/redmine/scm/adapters/abstract_adapter.rb
@@ -82,7 +82,7 @@ module Redmine
           return nil
         end
         
-        def diff(path, identifier_from, identifier_to=nil, type="inline")
+        def diff(path, identifier_from, identifier_to=nil)
           return nil
         end
         
@@ -234,166 +234,7 @@ module Redmine
         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 =~ /^(---|\+\+\+) (.*)$/
-                    self << diff_table if diff_table.length > 1
-                    diff_table = DiffTable.new type
-                end
-                a = diff_table.add_line line
-            end
-            self << diff_table unless diff_table.empty?
-            self
-        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 =~ /^(---|\+\+\+) (.*)$/
-              @file_name = $2
-              return false
-            elsif line =~ /^@@ (\+|\-)(\d+)(,\d+)? (\+|\-)(\d+)(,\d+)? @@/
-              @line_num_l = $5.to_i
-              @line_num_r = $2.to_i
-              @parsing = true
-            end
-          else
-            if line =~ /^[^\+\-\s@\\]/
-              @parsing = false
-              return false
-            elsif line =~ /^@@ (\+|\-)(\d+)(,\d+)? (\+|\-)(\d+)(,\d+)? @@/
-              @line_num_l = $5.to_i
-              @line_num_r = $2.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)
-        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
-          elsif line[0, 1] = "\\"
-            true
-          else
-            false
-          end
-        end
-      end
-    
       class Annotate
         attr_reader :lines, :revisions
         
diff --git a/lib/redmine/scm/adapters/bazaar_adapter.rb b/lib/redmine/scm/adapters/bazaar_adapter.rb
index 2225a627c..ff69e3e6b 100644
--- a/lib/redmine/scm/adapters/bazaar_adapter.rb
+++ b/lib/redmine/scm/adapters/bazaar_adapter.rb
@@ -132,7 +132,7 @@ module Redmine
           revisions
         end
         
-        def diff(path, identifier_from, identifier_to=nil, type="inline")
+        def diff(path, identifier_from, identifier_to=nil)
           path ||= ''
           if identifier_to
             identifier_to = identifier_to.to_i 
@@ -147,7 +147,7 @@ module Redmine
             end
           end
           #return nil if $? && $?.exitstatus != 0
-          DiffTableList.new diff, type   
+          diff
         end
         
         def cat(path, identifier=nil)
diff --git a/lib/redmine/scm/adapters/cvs_adapter.rb b/lib/redmine/scm/adapters/cvs_adapter.rb
index 37920b599..c86b02cb7 100644
--- a/lib/redmine/scm/adapters/cvs_adapter.rb
+++ b/lib/redmine/scm/adapters/cvs_adapter.rb
@@ -227,7 +227,7 @@ module Redmine
           end
         end  
         
-        def diff(path, identifier_from, identifier_to=nil, type="inline")
+        def diff(path, identifier_from, identifier_to=nil)
           logger.debug "<cvs> diff path:'#{path}',identifier_from #{identifier_from}, identifier_to #{identifier_to}"
           path_with_project="#{url}#{with_leading_slash(path)}"
           cmd = "#{CVS_BIN} -d #{root_url} rdiff -u -r#{identifier_to} -r#{identifier_from} #{path_with_project}"
@@ -238,7 +238,7 @@ module Redmine
             end
           end
           return nil if $? && $?.exitstatus != 0
-          DiffTableList.new diff, type
+          diff
         end  
         
         def cat(path, identifier=nil)
diff --git a/lib/redmine/scm/adapters/darcs_adapter.rb b/lib/redmine/scm/adapters/darcs_adapter.rb
index a1d1867b1..b1b2a4573 100644
--- a/lib/redmine/scm/adapters/darcs_adapter.rb
+++ b/lib/redmine/scm/adapters/darcs_adapter.rb
@@ -94,7 +94,7 @@ module Redmine
           revisions
         end
         
-        def diff(path, identifier_from, identifier_to=nil, type="inline")
+        def diff(path, identifier_from, identifier_to=nil)
           path = '*' if path.blank?
           cmd = "#{DARCS_BIN} diff --repodir #{@url}"
           if identifier_to.nil?
@@ -111,7 +111,7 @@ module Redmine
             end
           end
           return nil if $? && $?.exitstatus != 0
-          DiffTableList.new diff, type    
+          diff
         end
         
         private
diff --git a/lib/redmine/scm/adapters/git_adapter.rb b/lib/redmine/scm/adapters/git_adapter.rb
index 9dfbd17a8..d05b4fb38 100644
--- a/lib/redmine/scm/adapters/git_adapter.rb
+++ b/lib/redmine/scm/adapters/git_adapter.rb
@@ -204,7 +204,7 @@ module Redmine
           revisions
         end
         
-        def diff(path, identifier_from, identifier_to=nil, type="inline")
+        def diff(path, identifier_from, identifier_to=nil)
           path ||= ''
           if !identifier_to
             identifier_to = nil
@@ -220,7 +220,7 @@ module Redmine
             end
           end
           return nil if $? && $?.exitstatus != 0
-          DiffTableList.new diff, type
+          diff
         end
         
         def annotate(path, identifier=nil)
diff --git a/lib/redmine/scm/adapters/mercurial_adapter.rb b/lib/redmine/scm/adapters/mercurial_adapter.rb
index be01b7bbc..28b842c27 100644
--- a/lib/redmine/scm/adapters/mercurial_adapter.rb
+++ b/lib/redmine/scm/adapters/mercurial_adapter.rb
@@ -117,7 +117,7 @@ module Redmine
           revisions
         end
         
-        def diff(path, identifier_from, identifier_to=nil, type="inline")
+        def diff(path, identifier_from, identifier_to=nil)
           path ||= ''
           if identifier_to
             identifier_to = identifier_to.to_i 
@@ -133,7 +133,7 @@ module Redmine
             end
           end
           return nil if $? && $?.exitstatus != 0
-          DiffTableList.new diff, type
+          diff
         end
         
         def cat(path, identifier=nil)
diff --git a/lib/redmine/scm/adapters/subversion_adapter.rb b/lib/redmine/scm/adapters/subversion_adapter.rb
index 1cbdce135..7c98eee8b 100644
--- a/lib/redmine/scm/adapters/subversion_adapter.rb
+++ b/lib/redmine/scm/adapters/subversion_adapter.rb
@@ -142,7 +142,7 @@ module Redmine
             end
           end
           return nil if $? && $?.exitstatus != 0
-          DiffTableList.new diff, type    
+          diff
         end
         
         def cat(path, identifier=nil)
diff --git a/lib/redmine/unified_diff.rb b/lib/redmine/unified_diff.rb
new file mode 100644
index 000000000..aa8994454
--- /dev/null
+++ b/lib/redmine/unified_diff.rb
@@ -0,0 +1,178 @@
+# redMine - project management software
+# Copyright (C) 2006-2008  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 Redmine
+  # Class used to parse unified diffs
+  class UnifiedDiff < Array  
+    def initialize(diff, type="inline")
+      diff_table = DiffTable.new type
+      diff.each do |line|
+        if line =~ /^(---|\+\+\+) (.*)$/
+          self << diff_table if diff_table.length > 1
+          diff_table = DiffTable.new type
+        end
+        a = diff_table.add_line line
+      end
+      self << diff_table unless diff_table.empty?
+      self
+    end
+  end
+
+  # Class that represents a file 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 =~ /^(---|\+\+\+) (.*)$/
+          @file_name = $2
+          return false
+        elsif line =~ /^@@ (\+|\-)(\d+)(,\d+)? (\+|\-)(\d+)(,\d+)? @@/
+          @line_num_l = $5.to_i
+          @line_num_r = $2.to_i
+          @parsing = true
+        end
+      else
+        if line =~ /^[^\+\-\s@\\]/
+          @parsing = false
+          return false
+        elsif line =~ /^@@ (\+|\-)(\d+)(,\d+)? (\+|\-)(\d+)(,\d+)? @@/
+          @line_num_l = $5.to_i
+          @line_num_r = $2.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)
+    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
+      elsif line[0, 1] = "\\"
+          true
+        else
+          false
+        end
+      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
+end

From b78b62df8d1fd34321cffd3785121da98f64265b Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 8 Jun 2008 16:48:21 +0000
Subject: [PATCH 504/710] SCM browser: ability to download raw unified diffs.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1514 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/repositories_controller.rb | 34 ++++++++++++++--------
 app/views/repositories/diff.rhtml          |  5 ++++
 2 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb
index 5fb2fdd75..ef49cf248 100644
--- a/app/controllers/repositories_controller.rb
+++ b/app/controllers/repositories_controller.rb
@@ -142,19 +142,29 @@ class RepositoriesController < ApplicationController
   end
   
   def diff
-    @diff_type = params[:type] || User.current.pref[:diff_type] || 'inline'
-    @diff_type = 'inline' unless %w(inline sbs).include?(@diff_type)
-    
-    # Save diff type as user preference
-    if User.current.logged? && @diff_type != User.current.pref[:diff_type]
-      User.current.pref[:diff_type] = @diff_type
-      User.current.preference.save
-    end
-    
-    @cache_key = "repositories/diff/#{@repository.id}/" + Digest::MD5.hexdigest("#{@path}-#{@rev}-#{@rev_to}-#{@diff_type}")    
-    unless read_fragment(@cache_key)
+    if params[:format] == 'diff'
       @diff = @repository.diff(@path, @rev, @rev_to)
-      show_error_not_found unless @diff
+      show_error_not_found and return unless @diff
+      filename = "changeset_r#{@rev}"
+      filename << "_r#{@rev_to}" if @rev_to
+      send_data @diff.join, :filename => "#{filename}.diff",
+                            :type => 'text/x-patch',
+                            :disposition => 'attachment'
+    else
+      @diff_type = params[:type] || User.current.pref[:diff_type] || 'inline'
+      @diff_type = 'inline' unless %w(inline sbs).include?(@diff_type)
+      
+      # Save diff type as user preference
+      if User.current.logged? && @diff_type != User.current.pref[:diff_type]
+        User.current.pref[:diff_type] = @diff_type
+        User.current.preference.save
+      end
+      
+      @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)
+        show_error_not_found unless @diff
+      end
     end
   rescue Redmine::Scm::Adapters::CommandFailed => e
     show_error_command_failed(e.message)
diff --git a/app/views/repositories/diff.rhtml b/app/views/repositories/diff.rhtml
index 953c7c02a..802082740 100644
--- a/app/views/repositories/diff.rhtml
+++ b/app/views/repositories/diff.rhtml
@@ -84,6 +84,11 @@
 <% end -%>
 <% end -%>
 
+<p class="other-formats">
+<%= l(:label_export_to) %>
+<span><%= link_to 'Unified diff', params.merge(:format => 'diff') %></span>
+</p>
+
 <% html_title(with_leading_slash(@path), 'Diff') -%>
 
 <% content_for :header_tags do %>

From e833cab30e19b5c9d17db405660f081923482f11 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 8 Jun 2008 18:10:49 +0000
Subject: [PATCH 505/710] Move diff viewer to a partial.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1515 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/common/_diff.rhtml      | 74 +++++++++++++++++++++++++++++++
 app/views/repositories/diff.rhtml | 71 +----------------------------
 2 files changed, 75 insertions(+), 70 deletions(-)
 create mode 100644 app/views/common/_diff.rhtml

diff --git a/app/views/common/_diff.rhtml b/app/views/common/_diff.rhtml
new file mode 100644
index 000000000..c849b7ff7
--- /dev/null
+++ b/app/views/common/_diff.rhtml
@@ -0,0 +1,74 @@
+<% Redmine::UnifiedDiff.new(diff, diff_type).each do |table_file| -%>
+<div class="autoscroll">
+<% if diff_type == 'sbs' -%>
+<table class="filecontent CodeRay">
+<thead>
+<tr><th colspan="4" class="filename"><%= table_file.file_name %></th></tr>
+<% unless @rev.nil? -%>
+<tr>
+  <th colspan="2">@<%= format_revision @rev %></th>
+  <th colspan="2">@<%= format_revision @rev_to %></th>
+</tr>
+<% end -%>
+</thead>
+<tbody>
+<% prev_line_left, prev_line_right = nil, nil -%>
+<% table_file.keys.sort.each do |key| -%>
+<% if prev_line_left && prev_line_right && (table_file[key].nb_line_left != prev_line_left+1) && (table_file[key].nb_line_right != prev_line_right+1) -%>
+<tr class="spacing"><td colspan="4"></td></tr>
+<% end -%>
+<tr>
+  <th class="line-num"><%= table_file[key].nb_line_left %></th>
+  <td class="line-code <%= table_file[key].type_diff_left %>">
+    <pre><%=to_utf8 table_file[key].line_left %></pre>
+  </td>
+  <th class="line-num"><%= table_file[key].nb_line_right %></th>
+  <td class="line-code <%= table_file[key].type_diff_right %>">
+    <pre><%=to_utf8 table_file[key].line_right %></pre>
+  </td>
+</tr>
+<% prev_line_left, prev_line_right = table_file[key].nb_line_left.to_i, table_file[key].nb_line_right.to_i -%>
+<% end -%>
+</tbody>
+</table>
+
+<% else -%>
+<table class="filecontent CodeRay">
+<thead>
+<tr><th colspan="3" class="filename"><%= table_file.file_name %></th></tr>
+<% unless @rev.nil? -%>
+<tr>
+  <th>@<%= format_revision @rev %></th>
+  <th>@<%= format_revision @rev_to %></th>
+  <th></th>
+</tr>
+<% end -%>
+</thead>
+<tbody>
+<% prev_line_left, prev_line_right = nil, nil -%>
+<% table_file.keys.sort.each do |key, line| %>
+<% if prev_line_left && prev_line_right && (table_file[key].nb_line_left != prev_line_left+1) && (table_file[key].nb_line_right != prev_line_right+1) -%>
+<tr class="spacing"><td colspan="3"></td></tr>
+<% end -%>
+<tr>
+  <th class="line-num"><%= table_file[key].nb_line_left %></th>
+  <th class="line-num"><%= table_file[key].nb_line_right %></th>
+  <% if table_file[key].line_left.empty? -%>
+  <td class="line-code <%= table_file[key].type_diff_right %>">
+    <pre><%=to_utf8 table_file[key].line_right %></pre>
+  </td>
+  <% else -%>
+  <td class="line-code <%= table_file[key].type_diff_left %>">
+    <pre><%=to_utf8 table_file[key].line_left %></pre>
+  </td>
+  <% end -%>
+</tr>
+<% prev_line_left = table_file[key].nb_line_left.to_i if table_file[key].nb_line_left.to_i > 0 -%>
+<% prev_line_right = table_file[key].nb_line_right.to_i if table_file[key].nb_line_right.to_i > 0 -%>
+<% end -%>
+</tbody>
+</table>
+<% end -%>
+
+</div>
+<% end -%>
diff --git a/app/views/repositories/diff.rhtml b/app/views/repositories/diff.rhtml
index 802082740..52a5d6057 100644
--- a/app/views/repositories/diff.rhtml
+++ b/app/views/repositories/diff.rhtml
@@ -12,76 +12,7 @@
 <% end %>
 
 <% cache(@cache_key) do -%>
-<% Redmine::UnifiedDiff.new(@diff, @diff_type).each do |table_file| -%>
-<div class="autoscroll">
-<% if @diff_type == 'sbs' -%>
-<table class="filecontent CodeRay">
-<thead>
-<tr><th colspan="4" class="filename"><%= table_file.file_name %></th></tr>
-<tr>
-  <th colspan="2">@<%= format_revision @rev %></th>
-  <th colspan="2">@<%= format_revision @rev_to %></th>
-</tr>
-</thead>
-<tbody>
-<% prev_line_left, prev_line_right = nil, nil -%>
-<% table_file.keys.sort.each do |key| -%>
-<% if prev_line_left && prev_line_right && (table_file[key].nb_line_left != prev_line_left+1) && (table_file[key].nb_line_right != prev_line_right+1) -%>
-<tr class="spacing"><td colspan="4"></td></tr>
-<% end -%>
-<tr>
-  <th class="line-num"><%= table_file[key].nb_line_left %></th>
-  <td class="line-code <%= table_file[key].type_diff_left %>">
-    <pre><%=to_utf8 table_file[key].line_left %></pre>
-  </td>
-  <th class="line-num"><%= table_file[key].nb_line_right %></th>
-  <td class="line-code <%= table_file[key].type_diff_right %>">
-    <pre><%=to_utf8 table_file[key].line_right %></pre>
-  </td>
-</tr>
-<% prev_line_left, prev_line_right = table_file[key].nb_line_left.to_i, table_file[key].nb_line_right.to_i -%>
-<% end -%>
-</tbody>
-</table>
-
-<% else -%>
-<table class="filecontent CodeRay">
-<thead>
-<tr><th colspan="3" class="filename"><%= table_file.file_name %></th></tr>
-<tr>
-  <th>@<%= format_revision @rev %></th>
-  <th>@<%= format_revision @rev_to %></th>
-  <th></th>
-</tr>
-</thead>
-<tbody>
-<% prev_line_left, prev_line_right = nil, nil -%>
-<% table_file.keys.sort.each do |key, line| %>
-<% if prev_line_left && prev_line_right && (table_file[key].nb_line_left != prev_line_left+1) && (table_file[key].nb_line_right != prev_line_right+1) -%>
-<tr class="spacing"><td colspan="3"></td></tr>
-<% end -%>
-<tr>
-  <th class="line-num"><%= table_file[key].nb_line_left %></th>
-  <th class="line-num"><%= table_file[key].nb_line_right %></th>
-  <% if table_file[key].line_left.empty? -%>
-  <td class="line-code <%= table_file[key].type_diff_right %>">
-    <pre><%=to_utf8 table_file[key].line_right %></pre>
-  </td>
-  <% else -%>
-  <td class="line-code <%= table_file[key].type_diff_left %>">
-    <pre><%=to_utf8 table_file[key].line_left %></pre>
-  </td>
-  <% end -%>
-</tr>
-<% prev_line_left = table_file[key].nb_line_left.to_i if table_file[key].nb_line_left.to_i > 0 -%>
-<% prev_line_right = table_file[key].nb_line_right.to_i if table_file[key].nb_line_right.to_i > 0 -%>
-<% end -%>
-</tbody>
-</table>
-<% end -%>
-
-</div>
-<% end -%>
+<%= render :partial => 'common/diff', :locals => {:diff => @diff, :diff_type => @diff_type} %>
 <% end -%>
 
 <p class="other-formats">

From d77c1d2829f985c418442940c623ec6ec5d5457b Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 8 Jun 2008 18:26:39 +0000
Subject: [PATCH 506/710] Unified diff viewer for attached files with .patch or
 .diff extension (#1403).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1516 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/attachments_controller.rb | 13 ++++++++++---
 app/helpers/attachments_helper.rb         |  4 ++++
 app/helpers/issues_helper.rb              |  2 +-
 app/models/attachment.rb                  |  4 ++++
 app/views/attachments/_links.rhtml        |  2 +-
 app/views/attachments/diff.rhtml          | 15 +++++++++++++++
 config/routes.rb                          |  2 ++
 7 files changed, 37 insertions(+), 5 deletions(-)
 create mode 100644 app/views/attachments/diff.rhtml

diff --git a/app/controllers/attachments_controller.rb b/app/controllers/attachments_controller.rb
index 4e87e5442..cfc15669f 100644
--- a/app/controllers/attachments_controller.rb
+++ b/app/controllers/attachments_controller.rb
@@ -19,19 +19,26 @@ class AttachmentsController < ApplicationController
   layout 'base'
   before_filter :find_project, :check_project_privacy
 
+  def show
+    if @attachment.is_diff?
+      @diff = File.new(@attachment.diskfile, "rb").read
+      render :action => 'diff'
+    else
+      download
+    end
+  end
+  
   def download
     # images are sent inline
     send_file @attachment.diskfile, :filename => filename_for_content_disposition(@attachment.filename),
                                     :type => @attachment.content_type, 
                                     :disposition => (@attachment.image? ? 'inline' : 'attachment')
-  rescue
-    # in case the disk file was deleted
-    render_404
   end
  
 private
   def find_project
     @attachment = Attachment.find(params[:id])
+    render_404 and return false unless File.readable?(@attachment.diskfile)
     @project = @attachment.project
   rescue
     render_404
diff --git a/app/helpers/attachments_helper.rb b/app/helpers/attachments_helper.rb
index 989cd3e66..ebf417bab 100644
--- a/app/helpers/attachments_helper.rb
+++ b/app/helpers/attachments_helper.rb
@@ -22,4 +22,8 @@ module AttachmentsHelper
       render :partial => 'attachments/links', :locals => {:attachments => attachments, :options => options}
     end
   end
+  
+  def to_utf8(str)
+    str
+  end
 end
diff --git a/app/helpers/issues_helper.rb b/app/helpers/issues_helper.rb
index 6013f1ec8..915a80b2a 100644
--- a/app/helpers/issues_helper.rb
+++ b/app/helpers/issues_helper.rb
@@ -91,7 +91,7 @@ module IssuesHelper
       old_value = content_tag("strike", old_value) if detail.old_value and (!detail.value or detail.value.empty?)
       if detail.property == 'attachment' && !value.blank? && Attachment.find_by_id(detail.prop_key)
         # Link to the attachment if it has not been removed
-        value = link_to(value, :controller => 'attachments', :action => 'download', :id => detail.prop_key)
+        value = link_to(value, :controller => 'attachments', :action => 'show', :id => detail.prop_key)
       else
         value = content_tag("i", h(value)) if value
       end
diff --git a/app/models/attachment.rb b/app/models/attachment.rb
index 45bbd5428..95de4837a 100644
--- a/app/models/attachment.rb
+++ b/app/models/attachment.rb
@@ -88,6 +88,10 @@ class Attachment < ActiveRecord::Base
     self.filename =~ /\.(jpe?g|gif|png)$/i
   end
   
+  def is_diff?
+    self.filename =~ /\.(patch|diff)$/i
+  end
+  
 private
   def sanitize_filename(value)
     # get only the filename, not the whole path
diff --git a/app/views/attachments/_links.rhtml b/app/views/attachments/_links.rhtml
index 4d485548b..9e3ac747c 100644
--- a/app/views/attachments/_links.rhtml
+++ b/app/views/attachments/_links.rhtml
@@ -1,6 +1,6 @@
 <div class="attachments">
 <% for attachment in attachments %>
-<p><%= link_to attachment.filename, {:controller => 'attachments', :action => 'download', :id => attachment }, :class => 'icon icon-attachment' -%>
+<p><%= link_to attachment.filename, {:controller => 'attachments', :action => 'show', :id => attachment }, :class => 'icon icon-attachment' -%>
 <%= h(" - #{attachment.description}") unless attachment.description.blank? %>
   <span class="size">(<%= number_to_human_size attachment.filesize %>)</span>
   <% if options[:delete_url] %>
diff --git a/app/views/attachments/diff.rhtml b/app/views/attachments/diff.rhtml
new file mode 100644
index 000000000..4a9f5c9bd
--- /dev/null
+++ b/app/views/attachments/diff.rhtml
@@ -0,0 +1,15 @@
+<h2><%=h @attachment.filename %></h2>
+
+<div class="attachments">
+<p><%= h("#{@attachment.description} - ") unless @attachment.description.blank? %>
+   <span class="author"><%= @attachment.author %>, <%= format_time(@attachment.created_on) %></span></p>
+<p><%= link_to l(:button_download), {:controller => 'attachments', :action => 'download', :id => @attachment } -%>
+   <span class="size">(<%= number_to_human_size @attachment.filesize %>)</span></p>
+
+</div>
+&nbsp;
+<%= render :partial => 'common/diff', :locals => {:diff => @diff, :diff_type => @diff_type} %>
+
+<% content_for :header_tags do -%>
+    <%= stylesheet_link_tag "scm" -%>
+<% end -%>
diff --git a/config/routes.rb b/config/routes.rb
index 0edb71a06..3cb18d1bd 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -31,6 +31,8 @@ ActionController::Routing::Routes.draw do |map|
     omap.repositories_entry 'repositories/annotate/:id/*path', :action => 'annotate'
   end
   
+  map.connect 'attachments/:id', :controller => 'attachments', :action => 'show'
+  
   # Allow downloading Web Service WSDL as a file with an extension
   # instead of a file named 'wsdl'
   map.connect ':controller/service.wsdl', :action => 'wsdl'

From 0389c60129636969d3727b752625d95a559deff6 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 8 Jun 2008 20:31:36 +0000
Subject: [PATCH 507/710] Fixed: notextile tag has no effect.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1517 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 lib/redcloth.rb                              | 2 +-
 test/unit/helpers/application_helper_test.rb | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/lib/redcloth.rb b/lib/redcloth.rb
index 3880eb9d3..42eddd8e0 100644
--- a/lib/redcloth.rb
+++ b/lib/redcloth.rb
@@ -1149,7 +1149,7 @@ class RedCloth < String
         end
     end
     
-    ALLOWED_TAGS = %w(redpre pre code)
+    ALLOWED_TAGS = %w(redpre pre code notextile)
     
     def escape_html_tags(text)
       text.gsub!(%r{<(\/?([!\w]+)[^<>\n]*)(>?)}) {|m| ALLOWED_TAGS.include?($2) ? "<#{$1}#{$3}" : "&lt;#{$1}#{'&gt;' unless $3.blank?}" }
diff --git a/test/unit/helpers/application_helper_test.rb b/test/unit/helpers/application_helper_test.rb
index 4f8ededd1..1e75dbd64 100644
--- a/test/unit/helpers/application_helper_test.rb
+++ b/test/unit/helpers/application_helper_test.rb
@@ -153,6 +153,14 @@ class ApplicationHelperTest < HelperTestCase
     to_test.each { |text, result| assert_equal result, textilizable(text) }
   end
   
+  def test_allowed_html_tags
+    to_test = {
+      "<pre>preformatted text</pre>" => "<pre>preformatted text</pre>",
+      "<notextile>no *textile* formatting</notextile>" => "no *textile* formatting",
+    }
+    to_test.each { |text, result| assert_equal result, textilizable(text) }
+  end
+  
   def test_wiki_links_in_tables
     to_test = {"|[[Page|Link title]]|[[Other Page|Other title]]|\n|Cell 21|[[Last page]]|" =>
                  '<tr><td><a href="/wiki/ecookbook/Page" class="wiki-page new">Link title</a></td>' +

From e46b56d7fcad573e9531acae9337811e586ed7b8 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 8 Jun 2008 22:45:22 +0000
Subject: [PATCH 508/710] "New Project" link on Projects page for admin users
 (#1082).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1518 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/projects/index.rhtml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/views/projects/index.rhtml b/app/views/projects/index.rhtml
index e12b05979..4c68717f5 100644
--- a/app/views/projects/index.rhtml
+++ b/app/views/projects/index.rhtml
@@ -1,4 +1,5 @@
 <div class="contextual">
+    <%= link_to(l(:label_project_new), {:controller => 'projects', :action => 'add'}, :class => 'icon icon-add') + ' |' if User.current.admin? %>
     <%= link_to l(:label_issue_view_all), { :controller => 'issues' } %> |
     <%= link_to l(:label_overall_activity), { :controller => 'projects', :action => 'activity' }%>
 </div>

From aa0beecad0fa7cd8c62816b4dc7918f03b214b91 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Mon, 9 Jun 2008 17:02:55 +0000
Subject: [PATCH 509/710] Move the file viewer to a partial.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1519 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/common/_file.rhtml       | 11 +++++++++++
 app/views/repositories/entry.rhtml | 12 +-----------
 2 files changed, 12 insertions(+), 11 deletions(-)
 create mode 100644 app/views/common/_file.rhtml

diff --git a/app/views/common/_file.rhtml b/app/views/common/_file.rhtml
new file mode 100644
index 000000000..43f5c6c4b
--- /dev/null
+++ b/app/views/common/_file.rhtml
@@ -0,0 +1,11 @@
+<div class="autoscroll">
+<table class="filecontent CodeRay">
+<tbody>
+<% line_num = 1 %>
+<% syntax_highlight(filename, to_utf8(content)).each_line do |line| %>
+<tr><th class="line-num" id="L<%= line_num %>"><%= line_num %></th><td class="line-code"><pre><%= line %></pre></td></tr>
+<% line_num += 1 %>
+<% end %>
+</tbody>
+</table>
+</div>
diff --git a/app/views/repositories/entry.rhtml b/app/views/repositories/entry.rhtml
index 309da76fc..8e1e1992c 100644
--- a/app/views/repositories/entry.rhtml
+++ b/app/views/repositories/entry.rhtml
@@ -1,16 +1,6 @@
 <h2><%= render :partial => 'navigation', :locals => { :path => @path, :kind => 'file', :revision => @rev } %></h2>
 
-<div class="autoscroll">
-<table class="filecontent CodeRay">
-<tbody>
-<% line_num = 1 %>
-<% syntax_highlight(@path, to_utf8(@content)).each_line do |line| %>
-<tr><th class="line-num" id="L<%= line_num %>"><%= line_num %></th><td class="line-code"><pre><%= line %></pre></td></tr>
-<% line_num += 1 %>
-<% end %>
-</tbody>
-</table>
-</div>
+<%= render :partial => 'common/file', :locals => {:filename => @path, :content => @content} %>
 
 <% content_for :header_tags do %>
 <%= stylesheet_link_tag "scm" %>

From 80a7486f95a39ad3fc0946fad17fe51cff01cec6 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Mon, 9 Jun 2008 18:40:59 +0000
Subject: [PATCH 510/710] File viewer for attached text files.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1520 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/attachments_controller.rb     |  11 ++--
 app/helpers/application_helper.rb             |   8 +++
 app/helpers/repositories_helper.rb            |   7 ---
 app/models/attachment.rb                      |   4 ++
 app/views/attachments/file.rhtml              |  15 +++++
 test/fixtures/attachments.yml                 |  38 ++++++++++-
 test/fixtures/files/060719210727_archive.zip  | Bin 0 -> 157 bytes
 .../files/060719210727_changeset.diff         |  13 ++++
 test/fixtures/files/060719210727_source.rb    |  10 +++
 .../functional/attachments_controller_test.rb |  59 ++++++++++++++++++
 test/functional/documents_controller_test.rb  |   2 +
 test/functional/issues_controller_test.rb     |   2 +
 test/integration/issues_test.rb               |  18 ++++++
 test/test_helper.rb                           |   6 ++
 14 files changed, 181 insertions(+), 12 deletions(-)
 create mode 100644 app/views/attachments/file.rhtml
 create mode 100644 test/fixtures/files/060719210727_archive.zip
 create mode 100644 test/fixtures/files/060719210727_changeset.diff
 create mode 100644 test/fixtures/files/060719210727_source.rb
 create mode 100644 test/functional/attachments_controller_test.rb

diff --git a/app/controllers/attachments_controller.rb b/app/controllers/attachments_controller.rb
index cfc15669f..9ea9ac48e 100644
--- a/app/controllers/attachments_controller.rb
+++ b/app/controllers/attachments_controller.rb
@@ -23,7 +23,10 @@ class AttachmentsController < ApplicationController
     if @attachment.is_diff?
       @diff = File.new(@attachment.diskfile, "rb").read
       render :action => 'diff'
-    else
+    elsif @attachment.is_text?
+      @content = File.new(@attachment.diskfile, "rb").read
+      render :action => 'file'
+    elsif
       download
     end
   end
@@ -38,9 +41,9 @@ class AttachmentsController < ApplicationController
 private
   def find_project
     @attachment = Attachment.find(params[:id])
-    render_404 and return false unless File.readable?(@attachment.diskfile)
+    #render_404 and return false unless File.readable?(@attachment.diskfile)
     @project = @attachment.project
-  rescue
-    render_404
+  #rescue
+  #  render_404
   end
 end
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 405c5bf44..16904c251 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -15,6 +15,9 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
+require 'coderay'
+require 'coderay/helpers/file_type'
+
 module ApplicationHelper
   include Redmine::WikiFormatting::Macros::Definitions
 
@@ -116,6 +119,11 @@ module ApplicationHelper
     l(:actionview_datehelper_select_month_names).split(',')[month-1]
   end
 
+  def syntax_highlight(name, content)
+    type = CodeRay::FileType[name]
+    type ? CodeRay.scan(content, type).html : h(content)
+  end
+  
   def pagination_links_full(paginator, count=nil, options={})
     page_param = options.delete(:page_param) || :page
     url_param = params.dup
diff --git a/app/helpers/repositories_helper.rb b/app/helpers/repositories_helper.rb
index 10f6e7396..e94ae2e7f 100644
--- a/app/helpers/repositories_helper.rb
+++ b/app/helpers/repositories_helper.rb
@@ -15,16 +15,9 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
-require 'coderay'
-require 'coderay/helpers/file_type'
 require 'iconv'
 
 module RepositoriesHelper
-  def syntax_highlight(name, content)
-    type = CodeRay::FileType[name]
-    type ? CodeRay.scan(content, type).html : h(content)
-  end
-  
   def format_revision(txt)
     txt.to_s[0,8]
   end
diff --git a/app/models/attachment.rb b/app/models/attachment.rb
index 95de4837a..7d6a74ebb 100644
--- a/app/models/attachment.rb
+++ b/app/models/attachment.rb
@@ -88,6 +88,10 @@ class Attachment < ActiveRecord::Base
     self.filename =~ /\.(jpe?g|gif|png)$/i
   end
   
+  def is_text?
+    Redmine::MimeType.is_type?('text', filename)
+  end
+  
   def is_diff?
     self.filename =~ /\.(patch|diff)$/i
   end
diff --git a/app/views/attachments/file.rhtml b/app/views/attachments/file.rhtml
new file mode 100644
index 000000000..7988d0aed
--- /dev/null
+++ b/app/views/attachments/file.rhtml
@@ -0,0 +1,15 @@
+<h2><%=h @attachment.filename %></h2>
+
+<div class="attachments">
+<p><%= h("#{@attachment.description} - ") unless @attachment.description.blank? %>
+   <span class="author"><%= @attachment.author %>, <%= format_time(@attachment.created_on) %></span></p>
+<p><%= link_to l(:button_download), {:controller => 'attachments', :action => 'download', :id => @attachment } -%>
+   <span class="size">(<%= number_to_human_size @attachment.filesize %>)</span></p>
+
+</div>
+&nbsp;
+<%= render :partial => 'common/file', :locals => {:content => @content, :filename => @attachment.filename} %>
+
+<% content_for :header_tags do -%>
+    <%= stylesheet_link_tag "scm" -%>
+<% end -%>
diff --git a/test/fixtures/attachments.yml b/test/fixtures/attachments.yml
index 162d44720..a73d6b385 100644
--- a/test/fixtures/attachments.yml
+++ b/test/fixtures/attachments.yml
@@ -36,4 +36,40 @@ attachments_003:
   filename: logo.gif
   description: This is a logo
   author_id: 2
-  
\ No newline at end of file
+attachments_004: 
+  created_on: 2006-07-19 21:07:27 +02:00
+  container_type: Issue
+  container_id: 3
+  downloads: 0
+  disk_filename: 060719210727_source.rb
+  digest: b91e08d0cf966d5c6ff411bd8c4cc3a2
+  id: 4
+  filesize: 153
+  filename: source.rb
+  author_id: 2
+  description: This is a Ruby source file
+  content_type: application/x-ruby
+attachments_005: 
+  created_on: 2006-07-19 21:07:27 +02:00
+  container_type: Issue
+  container_id: 3
+  downloads: 0
+  disk_filename: 060719210727_changeset.diff
+  digest: b91e08d0cf966d5c6ff411bd8c4cc3a2
+  id: 5
+  filesize: 687
+  filename: changeset.diff
+  author_id: 2
+  content_type: text/x-diff
+attachments_006: 
+  created_on: 2006-07-19 21:07:27 +02:00
+  container_type: Issue
+  container_id: 3
+  downloads: 0
+  disk_filename: 060719210727_archive.zip
+  digest: b91e08d0cf966d5c6ff411bd8c4cc3a2
+  id: 6
+  filesize: 157
+  filename: archive.zip
+  author_id: 2
+  content_type: application/octet-stream
diff --git a/test/fixtures/files/060719210727_archive.zip b/test/fixtures/files/060719210727_archive.zip
new file mode 100644
index 0000000000000000000000000000000000000000..5467885d4b28eedd531d78c32380ffd3e69eded0
GIT binary patch
literal 157
zcmWIWW@Zs#U|`^2Fv$%vtB#e4Q3mo<fS3n}OHzwV(lT>W^-3yAv`?PU31e8~(mLr%
zmr(1LGjl>(xBO9Rz0@@4&k>OY35A}93<2JZOd<@pjRTs<z{sG$u&oiqLN+|Wo0SbB
N%gA5_WcY$O3;?$FB(nej

literal 0
HcmV?d00001

diff --git a/test/fixtures/files/060719210727_changeset.diff b/test/fixtures/files/060719210727_changeset.diff
new file mode 100644
index 000000000..af2c2068d
--- /dev/null
+++ b/test/fixtures/files/060719210727_changeset.diff
@@ -0,0 +1,13 @@
+Index: trunk/app/controllers/issues_controller.rb
+===================================================================
+--- trunk/app/controllers/issues_controller.rb	(r�vision 1483)
++++ trunk/app/controllers/issues_controller.rb	(r�vision 1484)
+@@ -149,7 +149,7 @@
+         attach_files(@issue, params[:attachments])
+         flash[:notice] = l(:notice_successful_create)
+         Mailer.deliver_issue_add(@issue) if Setting.notified_events.include?('issue_added')
+-        redirect_to :controller => 'issues', :action => 'show', :id => @issue,  :project_id => @project
++        redirect_to :controller => 'issues', :action => 'show', :id => @issue
+         return
+       end		
+     end	
diff --git a/test/fixtures/files/060719210727_source.rb b/test/fixtures/files/060719210727_source.rb
new file mode 100644
index 000000000..dccb59165
--- /dev/null
+++ b/test/fixtures/files/060719210727_source.rb
@@ -0,0 +1,10 @@
+# The Greeter class
+class Greeter
+  def initialize(name)
+    @name = name.capitalize
+  end
+
+  def salute
+    puts "Hello #{@name}!" 
+  end
+end
diff --git a/test/functional/attachments_controller_test.rb b/test/functional/attachments_controller_test.rb
new file mode 100644
index 000000000..d088c0b0f
--- /dev/null
+++ b/test/functional/attachments_controller_test.rb
@@ -0,0 +1,59 @@
+# redMine - project management software
+# Copyright (C) 2006-2008  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 File.dirname(__FILE__) + '/../test_helper'
+require 'attachments_controller'
+
+# Re-raise errors caught by the controller.
+class AttachmentsController; def rescue_action(e) raise e end; end
+
+
+class AttachmentsControllerTest < Test::Unit::TestCase
+  fixtures :users, :projects, :issues, :attachments
+  
+  def setup
+    @controller = AttachmentsController.new
+    @request    = ActionController::TestRequest.new
+    @response   = ActionController::TestResponse.new
+    Attachment.storage_path = "#{RAILS_ROOT}/test/fixtures/files"
+    User.current = nil
+  end
+  
+  def test_show_diff
+    get :show, :id => 5
+    assert_response :success
+    assert_template 'diff'
+  end
+  
+  def test_show_text_file
+    get :show, :id => 4
+    assert_response :success
+    assert_template 'file'
+  end
+  
+  def test_show_other
+    get :show, :id => 6
+    assert_response :success
+    assert_equal 'application/octet-stream', @response.content_type
+  end
+  
+  def test_download_text_file
+    get :download, :id => 4
+    assert_response :success
+    assert_equal 'application/x-ruby', @response.content_type
+  end
+end
diff --git a/test/functional/documents_controller_test.rb b/test/functional/documents_controller_test.rb
index f150a5b7a..7c1f0213a 100644
--- a/test/functional/documents_controller_test.rb
+++ b/test/functional/documents_controller_test.rb
@@ -40,6 +40,8 @@ class DocumentsControllerTest < Test::Unit::TestCase
   
   def test_new_with_one_attachment
     @request.session[:user_id] = 2
+    set_tmp_attachments_directory
+    
     post :new, :project_id => 'ecookbook',
                :document => { :title => 'DocumentsControllerTest#test_post_new',
                               :description => 'This is a new document',
diff --git a/test/functional/issues_controller_test.rb b/test/functional/issues_controller_test.rb
index 582c27d9b..32d2a7f41 100644
--- a/test/functional/issues_controller_test.rb
+++ b/test/functional/issues_controller_test.rb
@@ -361,6 +361,8 @@ class IssuesControllerTest < Test::Unit::TestCase
   end
   
   def test_post_edit_with_attachment_only
+    set_tmp_attachments_directory
+    
     # anonymous user
     post :edit,
          :id => 1,
diff --git a/test/integration/issues_test.rb b/test/integration/issues_test.rb
index b9e21719c..1b57ba8f8 100644
--- a/test/integration/issues_test.rb
+++ b/test/integration/issues_test.rb
@@ -1,3 +1,20 @@
+# redMine - project management software
+# Copyright (C) 2006-2008  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 "#{File.dirname(__FILE__)}/../test_helper"
 
 class IssuesTest < ActionController::IntegrationTest
@@ -47,6 +64,7 @@ class IssuesTest < ActionController::IntegrationTest
   # add then remove 2 attachments to an issue
   def test_issue_attachements
     log_user('jsmith', 'jsmith')
+    set_tmp_attachments_directory
 
     post 'issues/edit/1',
          :notes => 'Some notes',
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 61670318a..150b063e8 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -57,6 +57,12 @@ class Test::Unit::TestCase
   def test_uploaded_file(name, mime)
     ActionController::TestUploadedFile.new(Test::Unit::TestCase.fixture_path + "/files/#{name}", mime)
   end
+  
+  # Use a temporary directory for attachment related tests
+  def set_tmp_attachments_directory
+    Dir.mkdir "#{RAILS_ROOT}/tmp/test/attachments" unless File.directory?("#{RAILS_ROOT}/tmp/test/attachments")
+    Attachment.storage_path = "#{RAILS_ROOT}/tmp/test/attachments"
+  end
 end
 
 

From 19cb6f96f4bf3f10780e292d7b5b59d880b673e8 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Mon, 9 Jun 2008 18:59:15 +0000
Subject: [PATCH 511/710] Log the user in after registration if account
 activation is not needed.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1521 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/account_controller.rb | 3 ++-
 test/integration/account_test.rb      | 8 ++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/app/controllers/account_controller.rb b/app/controllers/account_controller.rb
index b9224c158..3fbbc8912 100644
--- a/app/controllers/account_controller.rb
+++ b/app/controllers/account_controller.rb
@@ -134,8 +134,9 @@ class AccountController < ApplicationController
         # Automatic activation
         @user.status = User::STATUS_ACTIVE
         if @user.save
+          self.logged_user = @user
           flash[:notice] = l(:notice_account_activated)
-          redirect_to :action => 'login'
+          redirect_to :controller => 'my', :action => 'account'
         end
       else
         # Manual activation by the administrator
diff --git a/test/integration/account_test.rb b/test/integration/account_test.rb
index e9d665d19..a01a3ba09 100644
--- a/test/integration/account_test.rb
+++ b/test/integration/account_test.rb
@@ -67,8 +67,12 @@ class AccountTest < ActionController::IntegrationTest
     
     post 'account/register', :user => {:login => "newuser", :language => "en", :firstname => "New", :lastname => "User", :mail => "newuser@foo.bar"}, 
                              :password => "newpass", :password_confirmation => "newpass"
-    assert_redirected_to 'account/login'
-    log_user('newuser', 'newpass')
+    assert_redirected_to 'my/account'
+    follow_redirect!
+    assert_response :success
+    assert_template 'my/account'
+    
+    assert User.find_by_login('newuser').active?
   end
   
   def test_register_with_manual_activation

From efe790a8d3ca2688e5ad639e7166b5f77adb7335 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Mon, 9 Jun 2008 19:02:22 +0000
Subject: [PATCH 512/710] Removed inconsistent revision numbers on diff view.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1522 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/common/_diff.rhtml | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/app/views/common/_diff.rhtml b/app/views/common/_diff.rhtml
index c849b7ff7..b95ef116b 100644
--- a/app/views/common/_diff.rhtml
+++ b/app/views/common/_diff.rhtml
@@ -4,12 +4,6 @@
 <table class="filecontent CodeRay">
 <thead>
 <tr><th colspan="4" class="filename"><%= table_file.file_name %></th></tr>
-<% unless @rev.nil? -%>
-<tr>
-  <th colspan="2">@<%= format_revision @rev %></th>
-  <th colspan="2">@<%= format_revision @rev_to %></th>
-</tr>
-<% end -%>
 </thead>
 <tbody>
 <% prev_line_left, prev_line_right = nil, nil -%>
@@ -36,13 +30,6 @@
 <table class="filecontent CodeRay">
 <thead>
 <tr><th colspan="3" class="filename"><%= table_file.file_name %></th></tr>
-<% unless @rev.nil? -%>
-<tr>
-  <th>@<%= format_revision @rev %></th>
-  <th>@<%= format_revision @rev_to %></th>
-  <th></th>
-</tr>
-<% end -%>
 </thead>
 <tbody>
 <% prev_line_left, prev_line_right = nil, nil -%>

From 53b570398132d41202e75ce9dd3f6bb36dc2981e Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Mon, 9 Jun 2008 19:15:40 +0000
Subject: [PATCH 513/710] Slight changes to diff view and style.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1523 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/common/_diff.rhtml | 7 +++++--
 public/stylesheets/scm.css   | 6 ++++--
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/app/views/common/_diff.rhtml b/app/views/common/_diff.rhtml
index b95ef116b..0b28101b7 100644
--- a/app/views/common/_diff.rhtml
+++ b/app/views/common/_diff.rhtml
@@ -9,7 +9,8 @@
 <% prev_line_left, prev_line_right = nil, nil -%>
 <% table_file.keys.sort.each do |key| -%>
 <% if prev_line_left && prev_line_right && (table_file[key].nb_line_left != prev_line_left+1) && (table_file[key].nb_line_right != prev_line_right+1) -%>
-<tr class="spacing"><td colspan="4"></td></tr>
+<tr class="spacing">
+<th class="line-num">...</th><td></td><th class="line-num">...</th><td></td>
 <% end -%>
 <tr>
   <th class="line-num"><%= table_file[key].nb_line_left %></th>
@@ -35,7 +36,9 @@
 <% prev_line_left, prev_line_right = nil, nil -%>
 <% table_file.keys.sort.each do |key, line| %>
 <% if prev_line_left && prev_line_right && (table_file[key].nb_line_left != prev_line_left+1) && (table_file[key].nb_line_right != prev_line_right+1) -%>
-<tr class="spacing"><td colspan="3"></td></tr>
+<tr class="spacing">
+<th class="line-num">...</th><th class="line-num">...</th><td></td>
+</tr>
 <% end -%>
 <tr>
   <th class="line-num"><%= table_file[key].nb_line_left %></th>
diff --git a/public/stylesheets/scm.css b/public/stylesheets/scm.css
index d1495a5ef..d5a879bf1 100644
--- a/public/stylesheets/scm.css
+++ b/public/stylesheets/scm.css
@@ -1,14 +1,16 @@
 
 table.filecontent { border: 1px solid #ccc;  border-collapse: collapse; width:98%; }
 table.filecontent th { border: 1px solid #ccc; background-color: #eee; }
-table.filecontent th.filename {	background-color: #ddc;	text-align: left; }
-table.filecontent tr.spacing td { border: 1px solid #d7d7d7; height: 0.4em; }
+table.filecontent th.filename {	background-color: #e4e4d4; text-align: left; padding: 0.2em;}
+table.filecontent tr.spacing th { text-align:center; }
+table.filecontent tr.spacing td { height: 0.4em; background: #EAF2F5;}
 table.filecontent th.line-num {
     border: 1px solid #d7d7d7;
 	font-size: 0.8em;
 	text-align: right;
 	width: 2%;
 	padding-right: 3px;
+	color: #999;
 }
 table.filecontent td.line-code pre {
     white-space: pre-wrap; /* CSS2.1 compliant */

From cc9b8f78783bd9f9d8cdcc4c6f47e4416af83b3e Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Mon, 9 Jun 2008 20:05:32 +0000
Subject: [PATCH 514/710] Fixed: SVG::Graph raises an error when using external
 stylesheet (#1402).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1524 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 lib/SVG/Graph/Graph.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/SVG/Graph/Graph.rb b/lib/SVG/Graph/Graph.rb
index 403a0202b..a5e1ea732 100644
--- a/lib/SVG/Graph/Graph.rb
+++ b/lib/SVG/Graph/Graph.rb
@@ -829,7 +829,7 @@ module SVG
         @doc << DocType.new( %q{svg PUBLIC "-//W3C//DTD SVG 1.0//EN" } +
           %q{"http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd"} )
         if style_sheet && style_sheet != ''
-          @doc << ProcessingInstruction.new( "xml-stylesheet",
+          @doc << Instruction.new( "xml-stylesheet",
             %Q{href="#{style_sheet}" type="text/css"} )
         end
         @root = @doc.add_element( "svg", {

From b42b697ffbbf87f9973a4b9ee70e0d53c4938c38 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sat, 14 Jun 2008 10:51:15 +0000
Subject: [PATCH 515/710] Fixed: unexpected nil when viewing differences on CVS
 (#1444).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1525 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/models/repository/cvs.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/models/repository/cvs.rb b/app/models/repository/cvs.rb
index ea75de5d3..5ff7af999 100644
--- a/app/models/repository/cvs.rb
+++ b/app/models/repository/cvs.rb
@@ -76,7 +76,8 @@ class Repository::Cvs < Repository
         unless revision_to
           revision_to=scm.get_previous_revision(revision_from)
         end
-        diff=diff+scm.diff(change_from.path, revision_from, revision_to)
+        file_diff = scm.diff(change_from.path, revision_from, revision_to)
+        diff = diff + file_diff unless file_diff.nil?
       end
     end
     return diff

From d2ad4edc8679ce541bc566c69ee404e8b3b34e1f Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sat, 14 Jun 2008 11:15:57 +0000
Subject: [PATCH 516/710] Fixed: page has no title when adding a project
 (#1436).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1526 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/layouts/base.rhtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/layouts/base.rhtml b/app/views/layouts/base.rhtml
index 0b9d31512..62d542b7b 100644
--- a/app/views/layouts/base.rhtml
+++ b/app/views/layouts/base.rhtml
@@ -36,7 +36,7 @@
         <%= render :partial => 'layouts/project_selector' if User.current.memberships.any? %>
     </div>
     
-    <h1><%= h(@project ? @project.name : Setting.app_title) %></h1>
+    <h1><%= h(@project && !@project.new_record? ? @project.name : Setting.app_title) %></h1>
     
     <div id="main-menu">
         <%= render_main_menu(@project) %>

From 40a9bbe946848861cd37d2f300806490bed9194d Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sat, 14 Jun 2008 11:42:50 +0000
Subject: [PATCH 517/710] CVS: add support for modules names with spaces
 (#1434).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1527 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 lib/redmine/scm/adapters/cvs_adapter.rb | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/redmine/scm/adapters/cvs_adapter.rb b/lib/redmine/scm/adapters/cvs_adapter.rb
index c86b02cb7..18f26b9c8 100644
--- a/lib/redmine/scm/adapters/cvs_adapter.rb
+++ b/lib/redmine/scm/adapters/cvs_adapter.rb
@@ -65,7 +65,7 @@ module Redmine
           entries = Entries.new
           cmd = "#{CVS_BIN} -d #{root_url} rls -ed"
           cmd << " -D \"#{time_to_cvstime(identifier)}\"" if identifier
-          cmd << " #{path_with_project}"
+          cmd << " #{shell_quote path_with_project}"
           shellout(cmd) do |io|
             io.each_line(){|line|
               fields=line.chop.split('/',-1)
@@ -110,7 +110,7 @@ module Redmine
           path_with_project="#{url}#{with_leading_slash(path)}"
           cmd = "#{CVS_BIN} -d #{root_url} rlog"
           cmd << " -d\">#{time_to_cvstime(identifier_from)}\"" if identifier_from
-          cmd << " #{path_with_project}"
+          cmd << " #{shell_quote path_with_project}"
           shellout(cmd) do |io|
             state="entry_start"
             
@@ -230,7 +230,7 @@ module Redmine
         def diff(path, identifier_from, identifier_to=nil)
           logger.debug "<cvs> diff path:'#{path}',identifier_from #{identifier_from}, identifier_to #{identifier_to}"
           path_with_project="#{url}#{with_leading_slash(path)}"
-          cmd = "#{CVS_BIN} -d #{root_url} rdiff -u -r#{identifier_to} -r#{identifier_from} #{path_with_project}"
+          cmd = "#{CVS_BIN} -d #{root_url} rdiff -u -r#{identifier_to} -r#{identifier_from} #{shell_quote path_with_project}"
           diff = []
           shellout(cmd) do |io|
             io.each_line do |line|
@@ -245,7 +245,7 @@ module Redmine
           identifier = (identifier) ? identifier : "HEAD"
           logger.debug "<cvs> cat path:'#{path}',identifier #{identifier}"
           path_with_project="#{url}#{with_leading_slash(path)}"
-          cmd = "#{CVS_BIN} -d #{root_url} co -r#{identifier} -p #{path_with_project}"
+          cmd = "#{CVS_BIN} -d #{root_url} co -r#{identifier} -p #{shell_quote path_with_project}"
           cat = nil
           shellout(cmd) do |io|
             cat = io.read
@@ -258,7 +258,7 @@ module Redmine
           identifier = (identifier) ? identifier : "HEAD"
           logger.debug "<cvs> annotate path:'#{path}',identifier #{identifier}"
           path_with_project="#{url}#{with_leading_slash(path)}"
-          cmd = "#{CVS_BIN} -d #{root_url} rannotate -r#{identifier} #{path_with_project}"
+          cmd = "#{CVS_BIN} -d #{root_url} rannotate -r#{identifier} #{shell_quote path_with_project}"
           blame = Annotate.new
           shellout(cmd) do |io|
             io.each_line do |line|

From 846045fd05909689644f4858897ac3fda7fdac36 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sat, 14 Jun 2008 12:31:32 +0000
Subject: [PATCH 518/710] Fixed: time entries created with the default activity
 even if a different one is specified (#1302).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1533 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/models/time_entry.rb                   | 6 ++++--
 test/functional/timelog_controller_test.rb | 4 +++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/app/models/time_entry.rb b/app/models/time_entry.rb
index 4bd2d33b8..b234a8b21 100644
--- a/app/models/time_entry.rb
+++ b/app/models/time_entry.rb
@@ -30,8 +30,10 @@ class TimeEntry < ActiveRecord::Base
   validates_length_of :comments, :maximum => 255
 
   def after_initialize
-    if new_record?
-      self.activity ||= Enumeration.default('ACTI')
+    if new_record? && self.activity.nil?
+      if default_activity = Enumeration.default('ACTI')
+        self.activity_id = default_activity.id
+      end
     end
   end
   
diff --git a/test/functional/timelog_controller_test.rb b/test/functional/timelog_controller_test.rb
index 479f4f44f..c8b47cf8d 100644
--- a/test/functional/timelog_controller_test.rb
+++ b/test/functional/timelog_controller_test.rb
@@ -44,7 +44,8 @@ class TimelogControllerTest < Test::Unit::TestCase
     @request.session[:user_id] = 3
     post :edit, :project_id => 1,
                 :time_entry => {:comments => 'Some work on TimelogControllerTest',
-                                :activity_id => '10',
+                                # Not the default activity
+                                :activity_id => '11',
                                 :spent_on => '2008-03-14',
                                 :issue_id => '1',
                                 :hours => '7.3'}
@@ -53,6 +54,7 @@ class TimelogControllerTest < Test::Unit::TestCase
     i = Issue.find(1)
     t = TimeEntry.find_by_comments('Some work on TimelogControllerTest')
     assert_not_nil t
+    assert_equal 11, t.activity_id
     assert_equal 7.3, t.hours
     assert_equal 3, t.user_id
     assert_equal i, t.issue

From 34bcd5b80b0e7e60e2c307b0dcc0d9113e68d4b7 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sat, 14 Jun 2008 14:10:47 +0000
Subject: [PATCH 519/710] Fixed: Logtime info lost when there's an error
 updating an issue (#1400).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1535 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/issues_controller.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index c042a80ef..a86e9b00c 100644
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -186,13 +186,13 @@ class IssuesController < ApplicationController
         @custom_values = @project.custom_fields_for_issues(@issue.tracker).collect { |x| CustomValue.new(:custom_field => x, :customized => @issue, :value => params["custom_fields"][x.id.to_s]) }
         @issue.custom_values = @custom_values
       end
+      @time_entry = TimeEntry.new(:project => @project, :issue => @issue, :user => User.current, :spent_on => Date.today)
+      @time_entry.attributes = params[:time_entry]
       attachments = attach_files(@issue, params[:attachments])
       attachments.each {|a| journal.details << JournalDetail.new(:property => 'attachment', :prop_key => a.id, :value => a.filename)}
       if @issue.save
         # Log spend time
         if current_role.allowed_to?(:log_time)
-          @time_entry = TimeEntry.new(:project => @project, :issue => @issue, :user => User.current, :spent_on => Date.today)
-          @time_entry.attributes = params[:time_entry]
           @time_entry.save
         end
         if !journal.new_record?

From b1a8790a36ea854c2d079756307059e9f69751b5 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sat, 14 Jun 2008 15:44:36 +0000
Subject: [PATCH 520/710] File size display with Bazaar repositories (#1149).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1537 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/models/repository/bazaar.rb | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/app/models/repository/bazaar.rb b/app/models/repository/bazaar.rb
index 1b75066c2..ec953bd45 100644
--- a/app/models/repository/bazaar.rb
+++ b/app/models/repository/bazaar.rb
@@ -34,6 +34,11 @@ class Repository::Bazaar < Repository
     if entries
       entries.each do |e|
         next if e.lastrev.revision.blank?
+        # Set the filesize unless browsing a specific revision
+        if identifier.nil? && e.is_file?
+          full_path = File.join(root_url, e.path)
+          e.size = File.stat(full_path).size if File.file?(full_path)
+        end
         c = Change.find(:first,
                         :include => :changeset,
                         :conditions => ["#{Change.table_name}.revision = ? and #{Changeset.table_name}.repository_id = ?", e.lastrev.revision, id],

From 2b3009d91df47805d53c7313512900199ed81eaf Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 15 Jun 2008 09:38:02 +0000
Subject: [PATCH 521/710] Hungarian translation update (closes #1408).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1538 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 lang/hu.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lang/hu.yml b/lang/hu.yml
index 64518271c..1df061942 100644
--- a/lang/hu.yml
+++ b/lang/hu.yml
@@ -624,4 +624,4 @@ mail_body_reminder: "%d neked kiosztott feladat határidős az elkövetkező %d
 mail_subject_reminder: "%d feladat határidős az elkövetkező napokban"
 text_user_wrote: '%s írta:'
 label_duplicated_by: duplikálta
-setting_enabled_scm: Enabled SCM
+setting_enabled_scm: Forráskódkezelő (SCM) engedélyezése

From 622798a5edfb47250d782a86d87b4e5c1101a814 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 15 Jun 2008 09:43:53 +0000
Subject: [PATCH 522/710] Close statement handler in Redmine.pm (#1433).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1539 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 extra/svn/Redmine.pm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/extra/svn/Redmine.pm b/extra/svn/Redmine.pm
index e046b949a..09a85fb09 100644
--- a/extra/svn/Redmine.pm
+++ b/extra/svn/Redmine.pm
@@ -235,6 +235,7 @@ sub is_public_project {
 
     $sth->execute($project_id);
     my $ret = $sth->fetchrow_array ? 1 : 0;
+    $sth->finish();
     $dbh->disconnect();
 
     $ret;

From 8b2105e20ac76dba21cd8e313a75a5d52850cf69 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 15 Jun 2008 09:49:16 +0000
Subject: [PATCH 523/710] Translation updates.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1540 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 lang/no.yml                                       | 2 +-
 lang/zh-tw.yml                                    | 4 ++--
 lang/zh.yml                                       | 4 ++--
 public/javascripts/jstoolbar/lang/jstoolbar-no.js | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/lang/no.yml b/lang/no.yml
index e3b88b110..aa9d0396b 100644
--- a/lang/no.yml
+++ b/lang/no.yml
@@ -213,6 +213,7 @@ setting_per_page_options: Alternativer, objekter pr. side
 setting_user_format: Visningsformat, brukere
 setting_activity_days_default: Dager vist på prosjektaktivitet
 setting_display_subprojects_issues: Vis saker fra underprosjekter på hovedprosjekt som standard
+setting_enabled_scm: Aktiviserte SCM
 
 project_module_issue_tracking: Sakssporing
 project_module_time_tracking: Tidssporing
@@ -624,4 +625,3 @@ default_activity_development: Utvikling
 enumeration_issue_priorities: Sakssprioriteringer
 enumeration_doc_categories: Dokument-kategorier
 enumeration_activities: Aktiviteter (tidssporing)
-setting_enabled_scm: Enabled SCM
diff --git a/lang/zh-tw.yml b/lang/zh-tw.yml
index 2ee595dcd..064004c3a 100644
--- a/lang/zh-tw.yml
+++ b/lang/zh-tw.yml
@@ -213,6 +213,7 @@ setting_per_page_options: 每頁顯示個數選項
 setting_user_format: 使用者顯示格式
 setting_activity_days_default: 專案活動顯示天數
 setting_display_subprojects_issues: 預設於父專案中顯示子專案的項目
+setting_enabled_scm: 啟用的 SCM
 
 project_module_issue_tracking: 項目追蹤
 project_module_time_tracking: 工時追蹤
@@ -429,7 +430,7 @@ label_issue_tracking: 項目追蹤
 label_spent_time: 耗用時間
 label_f_hour: %.2f 小時
 label_f_hour_plural: %.2f 小時
-label_time_tracking: Time tracking
+label_time_tracking: 工時追蹤
 label_change_plural: 變更
 label_statistics: 統計資訊
 label_commits_per_month: 依月份統計送交次數
@@ -624,4 +625,3 @@ default_activity_development: 開發
 enumeration_issue_priorities: 項目優先權
 enumeration_doc_categories: 文件分類
 enumeration_activities: 活動 (時間追蹤)
-setting_enabled_scm: Enabled SCM
diff --git a/lang/zh.yml b/lang/zh.yml
index d82363414..ac650c853 100644
--- a/lang/zh.yml
+++ b/lang/zh.yml
@@ -213,6 +213,7 @@ setting_per_page_options: 每页显示条目个数的设置
 setting_user_format: 用户显示格式
 setting_activity_days_default: 在项目活动中显示的天数
 setting_display_subprojects_issues: 在项目页面上默认显示子项目的问题
+setting_enabled_scm: 启用 SCM
 
 project_module_issue_tracking: 问题跟踪
 project_module_time_tracking: 时间跟踪
@@ -448,6 +449,7 @@ label_relation_new: 新建关联
 label_relation_delete: 删除关联
 label_relates_to: 关联到
 label_duplicates: 重复
+label_duplicated_by: 与其重复
 label_blocks: 阻挡
 label_blocked_by: 被阻挡
 label_precedes: 优先于
@@ -623,5 +625,3 @@ default_activity_development: 开发
 enumeration_issue_priorities: 问题优先级
 enumeration_doc_categories: 文档类别
 enumeration_activities: 活动（时间跟踪）
-label_duplicated_by: duplicated by
-setting_enabled_scm: Enabled SCM
diff --git a/public/javascripts/jstoolbar/lang/jstoolbar-no.js b/public/javascripts/jstoolbar/lang/jstoolbar-no.js
index 2fb098a9d..799597343 100644
--- a/public/javascripts/jstoolbar/lang/jstoolbar-no.js
+++ b/public/javascripts/jstoolbar/lang/jstoolbar-no.js
@@ -9,8 +9,8 @@ jsToolBar.strings['Heading 2'] = 'Overskrift 2';
 jsToolBar.strings['Heading 3'] = 'Overskrift 3';
 jsToolBar.strings['Unordered list'] = 'Punktliste';
 jsToolBar.strings['Ordered list'] = 'Nummerert liste';
-jsToolBar.strings['Quote'] = 'Quote';
-jsToolBar.strings['Unquote'] = 'Remove Quote';
+jsToolBar.strings['Quote'] = 'Sitat';
+jsToolBar.strings['Unquote'] = 'Avslutt sitat';
 jsToolBar.strings['Preformatted text'] = 'Preformatert tekst';
 jsToolBar.strings['Wiki link'] = 'Lenke til Wiki-side';
 jsToolBar.strings['Image'] = 'Bilde';

From 11e9891425c4fb59ebeb7080077c1097d3800f8c Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 15 Jun 2008 11:00:40 +0000
Subject: [PATCH 524/710] Fixed: TOC does not remove colorization markups
 (#1423).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1542 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 lib/redmine/wiki_formatting.rb               |  3 +++
 test/unit/helpers/application_helper_test.rb | 28 ++++++++++++++++++++
 2 files changed, 31 insertions(+)

diff --git a/lib/redmine/wiki_formatting.rb b/lib/redmine/wiki_formatting.rb
index 7197af2c3..88a858b04 100644
--- a/lib/redmine/wiki_formatting.rb
+++ b/lib/redmine/wiki_formatting.rb
@@ -85,6 +85,9 @@ module Redmine
           @toc.each_with_index do |heading, index|
             # remove wiki links from the item
             toc_item = heading.last.gsub(/(\[\[|\]\])/, '')
+            # remove styles
+            # eg. %{color:red}Triggers% => Triggers
+            toc_item.gsub! %r[%\{[^\}]*\}([^%]+)%], '\\1'
             out << "<a href=\"##{index+1}\" class=\"heading#{heading.first}\">#{toc_item}</a>"
           end
           out << '</div>'
diff --git a/test/unit/helpers/application_helper_test.rb b/test/unit/helpers/application_helper_test.rb
index 1e75dbd64..7fa96d7e2 100644
--- a/test/unit/helpers/application_helper_test.rb
+++ b/test/unit/helpers/application_helper_test.rb
@@ -183,6 +183,34 @@ class ApplicationHelperTest < HelperTestCase
     assert_equal '<p>Dashes: ---</p>', textilizable('Dashes: ---')
   end
   
+  def test_table_of_content
+    raw = <<-RAW
+{{toc}}
+
+h1. Title
+
+Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Maecenas sed libero.
+
+h2. Subtitle
+
+Nullam commodo metus accumsan nulla. Curabitur lobortis dui id dolor.
+
+h2. Subtitle with %{color:red}red text%
+
+h1. Another title
+
+RAW
+
+    expected = '<div class="toc">' +
+               '<a href="#1" class="heading1">Title</a>' +
+               '<a href="#2" class="heading2">Subtitle</a>' + 
+               '<a href="#3" class="heading2">Subtitle with red text</a>' +
+               '<a href="#4" class="heading1">Another title</a>' +
+               '</div>'
+               
+    assert textilizable(raw).include?(expected)
+  end
+  
   def test_blockquote
     # orig raw text
     raw = <<-RAW

From 597c1e6c09f57e5e3b5f471f774137fbe21b06cd Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 15 Jun 2008 11:40:13 +0000
Subject: [PATCH 525/710] Adds links to repository directories in the browser
 (#1094).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1544 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 .../repositories/_dir_list_content.rhtml      |  24 ++++++------------
 public/images/bullet_toggle_minus.png         | Bin 0 -> 335 bytes
 public/images/bullet_toggle_plus.png          | Bin 0 -> 335 bytes
 public/stylesheets/application.css            |   4 +++
 4 files changed, 12 insertions(+), 16 deletions(-)
 create mode 100644 public/images/bullet_toggle_minus.png
 create mode 100644 public/images/bullet_toggle_plus.png

diff --git a/app/views/repositories/_dir_list_content.rhtml b/app/views/repositories/_dir_list_content.rhtml
index c3bd56e09..c30216533 100644
--- a/app/views/repositories/_dir_list_content.rhtml
+++ b/app/views/repositories/_dir_list_content.rhtml
@@ -1,26 +1,18 @@
 <% @entries.each do |entry| %>
 <% tr_id = Digest::MD5.hexdigest(entry.path)
    depth = params[:depth].to_i %>
-<tr id="<%= tr_id %>" class="<%= params[:parent_id] %> entry">
-<td class="filename">
-<%= if entry.is_dir?
-  link_to_remote h(entry.name),
-                 {:url => {:action => 'browse', :id => @project, :path => entry.path, :rev => @rev, :depth => (depth + 1), :parent_id => tr_id},
+<tr id="<%= tr_id %>" class="<%= params[:parent_id] %> entry <%= entry.kind %>">
+<td style="padding-left: <%=18 * depth%>px;" class="filename">
+<% if entry.is_dir? %>
+<span class="expander" onclick="<%=  remote_function :url => {:action => 'browse', :id => @project, :path => entry.path, :rev => @rev, :depth => (depth + 1), :parent_id => tr_id},
                   :update => { :success => tr_id },
                   :position => :after,
                   :success => "scmEntryLoaded('#{tr_id}')",
-                  :condition => "scmEntryClick('#{tr_id}')"
-                 },
-                 {:href => url_for({:action => 'browse', :id => @project, :path => entry.path, :rev => @rev}),
-                  :class => ('icon icon-folder'),
-                  :style => "margin-left: #{18 * depth}px;"
-                 }
-else
-  link_to h(entry.name),
+                  :condition => "scmEntryClick('#{tr_id}')"%>">&nbsp</span>
+<% end %>
+<%=  link_to h(entry.name),
           {:action => (entry.is_dir? ? 'browse' : 'changes'), :id => @project, :path => entry.path, :rev => @rev},
-          :class => 'icon icon-file',
-          :style => "margin-left: #{18 * depth}px;"
-end %>
+          :class => (entry.is_dir? ? 'icon icon-folder' : 'icon icon-file')%>
 </td>
 <td class="size"><%= (entry.size ? number_to_human_size(entry.size) : "?") unless entry.is_dir? %></td>
 <td class="revision"><%= link_to(format_revision(entry.lastrev.name), :action => 'revision', :id => @project, :rev => entry.lastrev.identifier) if entry.lastrev && entry.lastrev.identifier %></td>
diff --git a/public/images/bullet_toggle_minus.png b/public/images/bullet_toggle_minus.png
new file mode 100644
index 0000000000000000000000000000000000000000..5ce75938fdeca159bf2917dcafae187bfb8dc52e
GIT binary patch
literal 335
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbL!UWsc&iE~kEVo7Fxo<c}wZYo1c
zX0D!sp{YVvX=a{+k%57Qf}ydMv9XnjrGmDBp@G4pizO3*I@wD+eO=jau<>&%v+ZMj
zvk)l6S>O>_%)r1c1j3A$?$-SQ3bLd-`Z_W&Z0zU$lgJ9>dj$A|xc>kDf77N-ot>S{
z&CPXnbrlsA#l^*Q=FFKnbLPQ=2TMy!7cE+}X3d(_t5>(RwQb(Kxxc@E&z?P(E?wHU
zZ{N<HJJ+pSw_?SLUAuP8JG7kzXeMJxkY6x^!?PP{K#sGgi(^Q|t>lCSLIOf!55+}=
z-8ndlni$xf8s<-KZ*LD~P&{y&Q^n$^0MnfWQ5_COz73Kw9E@&iX<}h!Wm%R|!VC<?
X+>D=R-fLC|8pq)2>gTe~DWM4f<rr~d

literal 0
HcmV?d00001

diff --git a/public/images/bullet_toggle_plus.png b/public/images/bullet_toggle_plus.png
new file mode 100644
index 0000000000000000000000000000000000000000..b3603d30adcdb812a31a0cd528c7600131a3a64b
GIT binary patch
literal 335
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbL!UWsc&iE~kEVo7Fxo<c}wZYo1c
zX0D!sp{YVvX=a{+k%57Qf}ydMv9Xn@v4XaNp@Bgcx3(itCwqyfuPgfvHhykp?ccXH
zTmcGk7I;J!Gca%qfiUBxyLEqnf-LEdzCiUG`?>!lvI6-Y0X`wF|NsBrv}sdkXJ>PB
zb6s6sMMXt%aq*lvb7sz*dGO%D($dmJix#a}vu5?`)opEUn>TOn@9*EUXV0Zem-g-3
zw{z#tb?erxSg~T)u3hsEZD#?R$ygHP7tG-B>_!@p<Lv3;7*cU7Ibng2fRNZjaZzD+
z4vwNG26m^0`IFll+k+Vt51i&yvG^&#bSFVnhl7!CgJcW`qnlcqSeRK^mZg+11A}TY
W<L%EqJQIM%F?hQAxvX<aXaWF9#BmA$

literal 0
HcmV?d00001

diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index dd942c819..d87b3bf2b 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -97,6 +97,10 @@ tr.entry td.size { text-align: right; font-size: 90%; }
 tr.entry td.revision, tr.entry td.author { text-align: center; }
 tr.entry td.age { text-align: right; }
 
+tr.entry span.expander {background-image: url(../images/bullet_toggle_plus.png); padding-left: 8px; margin-left: 0; cursor: pointer;}
+tr.entry.open span.expander {background-image: url(../images/bullet_toggle_minus.png);}
+tr.entry.file td.filename a { margin-left: 16px; }
+
 tr.changeset td.author { text-align: center; width: 15%; }
 tr.changeset td.committed_on { text-align: center; width: 15%; }
 

From 576130f363ffb766fbf2a3d47ab1b09758b68a1e Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 15 Jun 2008 12:25:48 +0000
Subject: [PATCH 526/710] Doc update for 0.7.2 release.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1546 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 doc/CHANGELOG | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++
 doc/INSTALL   | 17 +++++++++++++----
 2 files changed, 66 insertions(+), 4 deletions(-)

diff --git a/doc/CHANGELOG b/doc/CHANGELOG
index 3a39061c6..5fe6bfc4e 100644
--- a/doc/CHANGELOG
+++ b/doc/CHANGELOG
@@ -5,6 +5,59 @@ Copyright (C) 2006-2008  Jean-Philippe Lang
 http://www.redmine.org/
 
 
+== 2008-06-15 v0.7.2
+
+* "New Project" link on Projects page
+* Links to repository directories on the repo browser
+* Move status to front in Activity View
+* Remove edit step from Status context menu
+* Fixed: No way to do textile horizontal rule
+* Fixed: Repository: View differences doesn't work
+* Fixed: attachement's name maybe invalid.
+* Fixed: Error when creating a new issue
+* Fixed: NoMethodError on @available_filters.has_key?
+* Fixed: Check All / Uncheck All in Email Settings
+* Fixed: "View differences" of one file at /repositories/revision/ fails
+* Fixed: Column width in "my page"
+* Fixed: private subprojects are listed on Issues view
+* Fixed: Textile: bold, italics, underline, etc... not working after parentheses
+* Fixed: Update issue form: comment field from log time end out of screen
+* Fixed: Editing role: "issue can be assigned to this role" out of box
+* Fixed: Unable use angular braces after include word
+* Fixed: Using '*' as keyword for repository referencing keywords doesn't work
+* Fixed: Subversion repository "View differences" on each file rise ERROR
+* Fixed: View differences for individual file of a changeset fails if the repository URL doesn't point to the repository root
+* Fixed: It is possible to lock out the last admin account
+* Fixed: Wikis are viewable for anonymous users on public projects, despite not granting access
+* Fixed: Issue number display clipped on 'my issues'
+* Fixed: Roadmap version list links not carrying state
+* Fixed: Log Time fieldset in IssueController#edit doesn't set default Activity as default
+* Fixed: git's "get_rev" API should use repo's current branch instead of hardwiring "master"
+* Fixed: browser's language subcodes ignored
+* Fixed: Error on project selection with numeric (only) identifier.
+* Fixed: Link to PDF doesn't work after creating new issue
+* Fixed: "Replies" should not be shown on forum threads that are locked
+* Fixed: SVN errors lead to svn username/password being displayed to end users (security issue)
+* Fixed: http links containing hashes don't display correct
+* Fixed: Allow ampersands in Enumeration names
+* Fixed: Atom link on saved query does not include query_id
+* Fixed: Logtime info lost when there's an error updating an issue
+* Fixed: TOC does not parse colorization markups
+* Fixed: CVS: add support for modules names with spaces
+* Fixed: Bad rendering on projects/add
+* Fixed: exception when viewing differences on cvs
+* Fixed: export issue to pdf will messup when use Chinese language
+* Fixed: Redmine::Scm::Adapters::GitAdapter#get_rev ignored GIT_BIN constant
+* Fixed: Adding non-ASCII new issue type in the New Issue page have encoding error using IE
+* Fixed: Importing from trac : some wiki links are messed
+* Fixed: Incorrect weekend definition in Hebrew calendar locale
+* Fixed: Atom feeds don't provide author section for repository revisions
+* Fixed: In Activity views, changesets titles can be multiline while they should not
+* Fixed: Ignore unreadable subversion directories (read disabled using authz)
+* Fixed: lib/SVG/Graph/Graph.rb can't externalize stylesheets
+* Fixed: Close statement handler in Redmine.pm
+
+
 == 2008-05-04 v0.7.1
 
 * Thai translation added (Gampol Thitinilnithi)
diff --git a/doc/INSTALL b/doc/INSTALL
index 872543d95..ab35bd1b8 100644
--- a/doc/INSTALL
+++ b/doc/INSTALL
@@ -7,7 +7,7 @@ http://www.redmine.org/
 
 == Requirements
 
-* Ruby on Rails 2.0.2
+* Ruby on Rails 2.0.2 (not Rails 2.1)
 * A database (see compatibility below)
 
 Optional:
@@ -33,17 +33,26 @@ Supported databases:
    rake db:migrate RAILS_ENV="production"
    It will create tables and an administrator account.
 
-5. Test the installation by running WEBrick web server:
+5. Setting up permissions
+   The user who runs Redmine must have write permission on the following
+   subdirectories: files, log, tmp (create the last one if not present).
+
+   Assuming you run Redmine with a user named redmine:
+     mkdir tmp
+     sudo chown -R redmine:redmine files log tmp
+     sudo chmod -R 755 files log tmp
+
+6. Test the installation by running WEBrick web server:
    ruby script/server -e production   
   
    Once WEBrick has started, point your browser to http://localhost:3000/
    You should now see the application welcome page
 
-6. Use default administrator account to log in:
+7. Use default administrator account to log in:
    login: admin
    password: admin
    
-7. Go to "Administration" to load the default configuration data (roles, 
+   Go to "Administration" to load the default configuration data (roles, 
    trackers, statuses, workflow) and adjust application settings
 
 

From 5051566e51a30cbc3776e84774d492b24abb03d6 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 15 Jun 2008 14:19:06 +0000
Subject: [PATCH 527/710] Prettier url for changesets (#1443).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1549 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 config/routes.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/config/routes.rb b/config/routes.rb
index 3cb18d1bd..a77a8833b 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -29,6 +29,7 @@ ActionController::Routing::Routes.draw do |map|
     omap.repositories_diff 'repositories/diff/:id/*path', :action => 'diff'
     omap.repositories_entry 'repositories/entry/:id/*path', :action => 'entry'
     omap.repositories_entry 'repositories/annotate/:id/*path', :action => 'annotate'
+    omap.repositories_revision 'repositories/revision/:id/:rev', :action => 'revision'
   end
   
   map.connect 'attachments/:id', :controller => 'attachments', :action => 'show'

From 8a54c455b808eb6a5477f57b61b6f50a23d3347e Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 15 Jun 2008 14:34:23 +0000
Subject: [PATCH 528/710] Fixes test broken by r1549.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1550 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 test/functional/repositories_controller_test.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/functional/repositories_controller_test.rb b/test/functional/repositories_controller_test.rb
index 47455dc55..2892f3bd1 100644
--- a/test/functional/repositories_controller_test.rb
+++ b/test/functional/repositories_controller_test.rb
@@ -43,10 +43,10 @@ class RepositoriesControllerTest < Test::Unit::TestCase
     assert_response :success
     assert_template 'revision'
     assert_no_tag :tag => "div", :attributes => { :class => "contextual" },
-      :child => { :tag => "a", :attributes => { :href => '/repositories/revision/ecookbook?rev=0'}
+      :child => { :tag => "a", :attributes => { :href => '/repositories/revision/ecookbook/0'}
     }
     assert_tag :tag => "div", :attributes => { :class => "contextual" },
-        :child => { :tag => "a", :attributes => { :href => '/repositories/revision/ecookbook?rev=2'}
+        :child => { :tag => "a", :attributes => { :href => '/repositories/revision/ecookbook/2'}
     }
   end
 

From 7c1c2e1ba22e7fbf64012ab927c49ee62687472e Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 15 Jun 2008 14:39:52 +0000
Subject: [PATCH 529/710] Fixes test broken by r1549.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1551 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 test/unit/mailer_test.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/unit/mailer_test.rb b/test/unit/mailer_test.rb
index 8cf6c1423..402624f5f 100644
--- a/test/unit/mailer_test.rb
+++ b/test/unit/mailer_test.rb
@@ -36,7 +36,7 @@ class MailerTest < Test::Unit::TestCase
     # link to a referenced ticket
     assert mail.body.include?('<a href="https://mydomain.foo/issues/show/2" class="issue" title="Add ingredients categories (Assigned)">#2</a>')
     # link to a changeset
-    assert mail.body.include?('<a href="https://mydomain.foo/repositories/revision/ecookbook?rev=2" class="changeset" title="This commit fixes #1, #2 and references #1 &amp; #3">r2</a>')
+    assert mail.body.include?('<a href="https://mydomain.foo/repositories/revision/ecookbook/2" class="changeset" title="This commit fixes #1, #2 and references #1 &amp; #3">r2</a>')
   end
   
   # test mailer methods for each language

From 93b3dba926ef9593c6849b2e84f57de176c595f1 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 15 Jun 2008 14:40:05 +0000
Subject: [PATCH 530/710] Makes changes link to entries on the revision view.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1552 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/repositories/revision.rhtml                      | 4 +++-
 test/functional/repositories_subversion_controller_test.rb | 7 ++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/app/views/repositories/revision.rhtml b/app/views/repositories/revision.rhtml
index 2fdf58faf..8d994ef7f 100644
--- a/app/views/repositories/revision.rhtml
+++ b/app/views/repositories/revision.rhtml
@@ -46,7 +46,9 @@
 <tbody>
 <% @changes.each do |change| %>
 <tr class="<%= cycle 'odd', 'even' %>">
-<td><div class="square action_<%= change.action %>"></div> <%= change.path %> <%= "(#{change.revision})" unless change.revision.blank?  %></td>
+<td><div class="square action_<%= change.action %>"></div>
+<%= link_to change.path, :action => 'entry', :id => @project, :path => change.relative_path, :rev => @changeset.revision %>
+<%= "(#{change.revision})" unless change.revision.blank?  %></td>
 <td align="right">
 <% if change.action == "M" %>
 <%= link_to l(:label_view_diff), :action => 'diff', :id => @project, :path => without_leading_slash(change.relative_path), :rev => @changeset.revision %>
diff --git a/test/functional/repositories_subversion_controller_test.rb b/test/functional/repositories_subversion_controller_test.rb
index bc3f261a0..efb824992 100644
--- a/test/functional/repositories_subversion_controller_test.rb
+++ b/test/functional/repositories_subversion_controller_test.rb
@@ -102,8 +102,13 @@ class RepositoriesSubversionControllerTest < Test::Unit::TestCase
       assert_response :success
       assert_template 'revision'
       assert_tag :tag => 'tr',
-                 :child => { :tag => 'td', :content => %r{/test/some/path/in/the/repo} },
                  :child => { :tag => 'td', 
+                             # link to the entry at rev 2
+                             :child => { :tag => 'a', :attributes => {:href => 'repositories/entry/ecookbook/test/some/path/in/the/repo?rev=2'},
+                                                      :content => %r{/test/some/path/in/the/repo} }
+                           },
+                 :child => { :tag => 'td', 
+                             # link to partial diff
                              :child => { :tag => 'a', :attributes => { :href => '/repositories/diff/ecookbook/test/some/path/in/the/repo?rev=2' } }
                            }
     end

From ca6e69ec247e10c521f22fba542404720cc2ebff Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 15 Jun 2008 15:47:28 +0000
Subject: [PATCH 531/710] Fixed: view file at given revision with CVS.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1553 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/repositories_controller.rb          |  6 +++---
 app/models/repository.rb                            |  8 ++++++++
 app/models/repository/cvs.rb                        | 11 ++++++++---
 lib/redmine/scm/adapters/cvs_adapter.rb             |  4 +++-
 test/functional/repositories_cvs_controller_test.rb | 13 +++++++++++++
 .../repositories_subversion_controller_test.rb      |  9 +++++++++
 6 files changed, 44 insertions(+), 7 deletions(-)

diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb
index ef49cf248..c14449290 100644
--- a/app/controllers/repositories_controller.rb
+++ b/app/controllers/repositories_controller.rb
@@ -73,7 +73,7 @@ class RepositoriesController < ApplicationController
   end
   
   def changes
-    @entry = @repository.scm.entry(@path, @rev)
+    @entry = @repository.entry(@path, @rev)
     show_error_not_found and return unless @entry
     @changesets = @repository.changesets_for_path(@path)
   rescue Redmine::Scm::Adapters::CommandFailed => e
@@ -96,13 +96,13 @@ class RepositoriesController < ApplicationController
   end
   
   def entry
-    @entry = @repository.scm.entry(@path, @rev)
+    @entry = @repository.entry(@path, @rev)
     show_error_not_found and return unless @entry
     
     # If the entry is a dir, show the browser
     browse and return if @entry.is_dir?
     
-    @content = @repository.scm.cat(@path, @rev)
+    @content = @repository.cat(@path, @rev)
     show_error_not_found and return unless @content
     if 'raw' == params[:format] || @content.is_binary_data?
       # Force the download if it's a binary file
diff --git a/app/models/repository.rb b/app/models/repository.rb
index 1cf61393f..c7bf0dbf4 100644
--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -51,10 +51,18 @@ class Repository < ActiveRecord::Base
     scm.supports_annotate?
   end
   
+  def entry(path=nil, identifier=nil)
+    scm.entry(path, identifier)
+  end
+  
   def entries(path=nil, identifier=nil)
     scm.entries(path, identifier)
   end
   
+  def cat(path, identifier=nil)
+    scm.cat(path, identifier)
+  end
+  
   def diff(path, rev, rev_to)
     scm.diff(path, rev, rev_to)
   end
diff --git a/app/models/repository/cvs.rb b/app/models/repository/cvs.rb
index 5ff7af999..dd9d35c8f 100644
--- a/app/models/repository/cvs.rb
+++ b/app/models/repository/cvs.rb
@@ -29,9 +29,9 @@ class Repository::Cvs < Repository
     'CVS'
   end
   
-  def entry(path, identifier)
-    e = entries(path, identifier)
-    e ? e.first : nil
+  def entry(path=nil, identifier=nil)
+    rev = identifier.nil? ? nil : changesets.find_by_revision(identifier)
+    scm.entry(path, rev.nil? ? nil : rev.committed_on)
   end
   
   def entries(path=nil, identifier=nil)
@@ -53,6 +53,11 @@ class Repository::Cvs < Repository
     entries
   end
   
+  def cat(path, identifier=nil)
+    rev = identifier.nil? ? nil : changesets.find_by_revision(identifier)
+    scm.cat(path, rev.nil? ? nil : rev.committed_on)
+  end
+  
   def diff(path, rev, rev_to)
     #convert rev to revision. CVS can't handle changesets here
     diff=[]
diff --git a/lib/redmine/scm/adapters/cvs_adapter.rb b/lib/redmine/scm/adapters/cvs_adapter.rb
index 18f26b9c8..089a6b153 100644
--- a/lib/redmine/scm/adapters/cvs_adapter.rb
+++ b/lib/redmine/scm/adapters/cvs_adapter.rb
@@ -245,7 +245,9 @@ module Redmine
           identifier = (identifier) ? identifier : "HEAD"
           logger.debug "<cvs> cat path:'#{path}',identifier #{identifier}"
           path_with_project="#{url}#{with_leading_slash(path)}"
-          cmd = "#{CVS_BIN} -d #{root_url} co -r#{identifier} -p #{shell_quote path_with_project}"
+          cmd = "#{CVS_BIN} -d #{root_url} co"
+          cmd << " -D \"#{time_to_cvstime(identifier)}\"" if identifier
+          cmd << " -p #{shell_quote path_with_project}"
           cat = nil
           shellout(cmd) do |io|
             cat = io.read
diff --git a/test/functional/repositories_cvs_controller_test.rb b/test/functional/repositories_cvs_controller_test.rb
index e12bb53ac..254fbc69c 100644
--- a/test/functional/repositories_cvs_controller_test.rb
+++ b/test/functional/repositories_cvs_controller_test.rb
@@ -89,6 +89,19 @@ class RepositoriesCvsControllerTest < Test::Unit::TestCase
       get :entry, :id => 1, :path => ['sources', 'watchers_controller.rb']
       assert_response :success
       assert_template 'entry'
+      assert_no_tag :tag => 'td', :attributes => { :class => /line-code/},
+                                  :content => /before_filter/
+    end
+    
+    def test_entry_at_given_revision
+      # changesets must be loaded
+      Project.find(1).repository.fetch_changesets
+      get :entry, :id => 1, :path => ['sources', 'watchers_controller.rb'], :rev => 2
+      assert_response :success
+      assert_template 'entry'
+      # this line was removed in r3
+      assert_tag :tag => 'td', :attributes => { :class => /line-code/},
+                               :content => /before_filter/
     end
     
     def test_entry_not_found
diff --git a/test/functional/repositories_subversion_controller_test.rb b/test/functional/repositories_subversion_controller_test.rb
index efb824992..6af5cd5dd 100644
--- a/test/functional/repositories_subversion_controller_test.rb
+++ b/test/functional/repositories_subversion_controller_test.rb
@@ -78,6 +78,15 @@ class RepositoriesSubversionControllerTest < Test::Unit::TestCase
       assert_template 'entry'
     end
     
+    def test_entry_at_given_revision
+      get :entry, :id => 1, :path => ['subversion_test', 'helloworld.rb'], :rev => 2
+      assert_response :success
+      assert_template 'entry'
+      # this line was removed in r3 and file was moved in r6
+      assert_tag :tag => 'td', :attributes => { :class => /line-code/},
+                               :content => /Here's the code/
+    end
+    
     def test_entry_not_found
       get :entry, :id => 1, :path => ['subversion_test', 'zzz.c']
       assert_tag :tag => 'div', :attributes => { :class => /error/ },

From 9737beecc4cdfba8bb8aba84283c95d54e5fa61b Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 15 Jun 2008 15:56:47 +0000
Subject: [PATCH 532/710] Adds a field on the repository view to browse at
 specific revision (#1443).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1554 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/repositories/show.rhtml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/views/repositories/show.rhtml b/app/views/repositories/show.rhtml
index 469ac063e..9a73183e8 100644
--- a/app/views/repositories/show.rhtml
+++ b/app/views/repositories/show.rhtml
@@ -1,11 +1,16 @@
 <div class="contextual">
 <%= link_to l(:label_statistics), {:action => 'stats', :id => @project}, :class => 'icon icon-stats' %>
+
+<% if !@entries.nil? && authorize_for('repositories', 'browse') -%>
+<% form_tag(:action => 'browse', :id => @project) do -%>
+| <%= l(:label_revision) %>: <%= text_field_tag 'rev', @rev, :size => 5 %>
+<% end -%>
+<% end -%>
 </div>
 
 <h2><%= l(:label_repository) %> (<%= @repository.scm_name %>)</h2>
 
 <% if !@entries.nil? && authorize_for('repositories', 'browse') %>
-<h3><%= l(:label_browse) %></h3>
 <%= render :partial => 'dir_list' %>
 <% end %>
 

From 0223b87612fd536b51c448916dc5fff1284c6b82 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 15 Jun 2008 16:11:07 +0000
Subject: [PATCH 533/710] RepositoriesController cleanup with rescue_from.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1555 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/repositories_controller.rb | 21 +++++----------------
 1 file changed, 5 insertions(+), 16 deletions(-)

diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb
index c14449290..99e2b7203 100644
--- a/app/controllers/repositories_controller.rb
+++ b/app/controllers/repositories_controller.rb
@@ -30,6 +30,8 @@ class RepositoriesController < ApplicationController
   before_filter :authorize
   accept_key_auth :revisions
   
+  rescue_from Redmine::Scm::Adapters::CommandFailed, :with => :show_error_command_failed
+  
   def edit
     @repository = @project.repository
     if !@repository
@@ -56,8 +58,6 @@ class RepositoriesController < ApplicationController
     # latest changesets
     @changesets = @repository.changesets.find(:all, :limit => 10, :order => "committed_on DESC")
     show_error_not_found unless @entries || @changesets.any?
-  rescue Redmine::Scm::Adapters::CommandFailed => e
-    show_error_command_failed(e.message)
   end
   
   def browse
@@ -68,16 +68,12 @@ class RepositoriesController < ApplicationController
       show_error_not_found and return unless @entries
       render :action => 'browse'
     end
-  rescue Redmine::Scm::Adapters::CommandFailed => e
-    show_error_command_failed(e.message)
   end
   
   def changes
     @entry = @repository.entry(@path, @rev)
     show_error_not_found and return unless @entry
     @changesets = @repository.changesets_for_path(@path)
-  rescue Redmine::Scm::Adapters::CommandFailed => e
-    show_error_command_failed(e.message)
   end
   
   def revisions
@@ -111,15 +107,11 @@ class RepositoriesController < ApplicationController
       # Prevent empty lines when displaying a file with Windows style eol
       @content.gsub!("\r\n", "\n")
     end
-  rescue Redmine::Scm::Adapters::CommandFailed => e
-    show_error_command_failed(e.message)
   end
   
   def annotate
     @annotate = @repository.scm.annotate(@path, @rev)
     render_error l(:error_scm_annotate) and return if @annotate.nil? || @annotate.empty?
-  rescue Redmine::Scm::Adapters::CommandFailed => e
-    show_error_command_failed(e.message)
   end
   
   def revision
@@ -137,8 +129,6 @@ class RepositoriesController < ApplicationController
     end
   rescue ChangesetNotFound
     show_error_not_found
-  rescue Redmine::Scm::Adapters::CommandFailed => e
-    show_error_command_failed(e.message)
   end
   
   def diff
@@ -166,8 +156,6 @@ class RepositoriesController < ApplicationController
         show_error_not_found unless @diff
       end
     end
-  rescue Redmine::Scm::Adapters::CommandFailed => e
-    show_error_command_failed(e.message)
   end
   
   def stats  
@@ -217,8 +205,9 @@ private
     render_error l(:error_scm_not_found)
   end
   
-  def show_error_command_failed(msg)
-    render_error l(:error_scm_command_failed, msg)
+  # Handler for Redmine::Scm::Adapters::CommandFailed exception
+  def show_error_command_failed(exception)
+    render_error l(:error_scm_command_failed, exception.message)
   end
   
   def graph_commits_per_month(repository)

From f4e0c77c8357958e713466c000e135e321600249 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Mon, 16 Jun 2008 19:37:09 +0000
Subject: [PATCH 534/710] Prevent unwanted textile link parsing at end of line.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1557 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 lib/redcloth.rb                              | 2 +-
 test/unit/helpers/application_helper_test.rb | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/redcloth.rb b/lib/redcloth.rb
index 42eddd8e0..59d02fbab 100644
--- a/lib/redcloth.rb
+++ b/lib/redcloth.rb
@@ -786,7 +786,7 @@ class RedCloth < String
             \s?
             (?:\(([^)]+?)\)(?="))?     # $title
             ":
-            (\S+?)                     # $url
+            ([\w\/]\S+?)               # $url
             (\/)?                      # $slash
             ([^\w\/;]*?)               # $post
             (?=<|\s|$)
diff --git a/test/unit/helpers/application_helper_test.rb b/test/unit/helpers/application_helper_test.rb
index 7fa96d7e2..c6afdda0e 100644
--- a/test/unit/helpers/application_helper_test.rb
+++ b/test/unit/helpers/application_helper_test.rb
@@ -59,6 +59,7 @@ class ApplicationHelperTest < HelperTestCase
       'This is a "link":http://foo.bar' => 'This is a <a href="http://foo.bar" class="external">link</a>',
       'This is an intern "link":/foo/bar' => 'This is an intern <a href="/foo/bar">link</a>',
       '"link (Link title)":http://foo.bar' => '<a href="http://foo.bar" title="Link title" class="external">link</a>',
+      "This is not a \"Link\":\n\nAnother paragraph" => "This is not a \"Link\":</p>\n\n\n\t<p>Another paragraph",
       # no multiline link text
       "This is a double quote \"on the first line\nand another on a second line\":test" => "This is a double quote \"on the first line<br />\nand another on a second line\":test"
     }

From 3c95f761e610a1d5957ca9f96708958ba80565ab Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Tue, 17 Jun 2008 19:10:54 +0000
Subject: [PATCH 535/710] Ability to remove enumerations (activities,
 priorities, document categories) that are in use. Associated objects can be
 reassigned to another value (#1467).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1558 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/enumerations_controller.rb | 21 +++++---
 app/models/enumeration.rb                  | 37 ++++++++-----
 app/views/enumerations/destroy.rhtml       | 12 +++++
 app/views/enumerations/list.rhtml          |  7 ++-
 lang/bg.yml                                |  2 +
 lang/cs.yml                                |  2 +
 lang/da.yml                                |  2 +
 lang/de.yml                                |  2 +
 lang/en.yml                                |  2 +
 lang/es.yml                                |  2 +
 lang/fi.yml                                |  2 +
 lang/fr.yml                                |  2 +
 lang/he.yml                                |  2 +
 lang/hu.yml                                |  2 +
 lang/it.yml                                |  2 +
 lang/ja.yml                                |  2 +
 lang/ko.yml                                |  2 +
 lang/lt.yml                                |  2 +
 lang/nl.yml                                |  2 +
 lang/no.yml                                |  2 +
 lang/pl.yml                                |  2 +
 lang/pt-br.yml                             |  2 +
 lang/pt.yml                                |  2 +
 lang/ro.yml                                |  2 +
 lang/ru.yml                                |  2 +
 lang/sr.yml                                |  2 +
 lang/sv.yml                                |  2 +
 lang/th.yml                                |  2 +
 lang/uk.yml                                |  2 +
 lang/zh-tw.yml                             |  2 +
 lang/zh.yml                                |  2 +
 test/functional/enumerations_controller.rb | 61 ++++++++++++++++++++++
 test/unit/enumeration_test.rb              | 45 ++++++++++++++++
 33 files changed, 217 insertions(+), 20 deletions(-)
 create mode 100644 app/views/enumerations/destroy.rhtml
 create mode 100644 test/functional/enumerations_controller.rb
 create mode 100644 test/unit/enumeration_test.rb

diff --git a/app/controllers/enumerations_controller.rb b/app/controllers/enumerations_controller.rb
index 7a7f1685a..788fa11b2 100644
--- a/app/controllers/enumerations_controller.rb
+++ b/app/controllers/enumerations_controller.rb
@@ -75,11 +75,20 @@ class EnumerationsController < ApplicationController
   end
   
   def destroy
-    Enumeration.find(params[:id]).destroy
-    flash[:notice] = l(:notice_successful_delete)
-    redirect_to :action => 'list'
-  rescue
-    flash[:error] = "Unable to delete enumeration"
-    redirect_to :action => 'list'
+    @enumeration = Enumeration.find(params[:id])
+    if !@enumeration.in_use?
+      # No associated objects
+      @enumeration.destroy
+      redirect_to :action => 'index'
+    elsif params[:reassign_to_id]
+      if reassign_to = Enumeration.find_by_opt_and_id(@enumeration.opt, params[:reassign_to_id])
+        @enumeration.destroy(reassign_to)
+        redirect_to :action => 'index'
+      end
+    end
+    @enumerations = Enumeration.get_values(@enumeration.opt) - [@enumeration]
+  #rescue
+  #  flash[:error] = 'Unable to delete enumeration'
+  #  redirect_to :action => 'index'
   end
 end
diff --git a/app/models/enumeration.rb b/app/models/enumeration.rb
index e86768724..d32a0c049 100644
--- a/app/models/enumeration.rb
+++ b/app/models/enumeration.rb
@@ -24,10 +24,11 @@ class Enumeration < ActiveRecord::Base
   validates_uniqueness_of :name, :scope => [:opt]
   validates_length_of :name, :maximum => 30
 
+  # Single table inheritance would be an option
   OPTIONS = {
-    "IPRI" => :enumeration_issue_priorities,
-    "DCAT" => :enumeration_doc_categories,
-    "ACTI" => :enumeration_activities
+    "IPRI" => {:label => :enumeration_issue_priorities, :model => Issue, :foreign_key => :priority_id},
+    "DCAT" => {:label => :enumeration_doc_categories, :model => Document, :foreign_key => :category_id},
+    "ACTI" => {:label => :enumeration_activities, :model => TimeEntry, :foreign_key => :activity_id}
   }.freeze
   
   def self.get_values(option)
@@ -39,13 +40,32 @@ class Enumeration < ActiveRecord::Base
   end
 
   def option_name
-    OPTIONS[self.opt]
+    OPTIONS[self.opt][:label]
   end
 
   def before_save
     Enumeration.update_all("is_default = #{connection.quoted_false}", {:opt => opt}) if is_default?
   end
   
+  def objects_count
+    OPTIONS[self.opt][:model].count(:conditions => "#{OPTIONS[self.opt][:foreign_key]} = #{id}")
+  end
+  
+  def in_use?
+    self.objects_count != 0
+  end
+  
+  alias :destroy_without_reassign :destroy
+  
+  # Destroy the enumeration
+  # If a enumeration is specified, objects are reassigned
+  def destroy(reassign_to = nil)
+    if reassign_to && reassign_to.is_a?(Enumeration)
+      OPTIONS[self.opt][:model].update_all("#{OPTIONS[self.opt][:foreign_key]} = #{reassign_to.id}", "#{OPTIONS[self.opt][:foreign_key]} = #{id}")
+    end
+    destroy_without_reassign
+  end
+  
   def <=>(enumeration)
     position <=> enumeration.position
   end
@@ -54,13 +74,6 @@ class Enumeration < ActiveRecord::Base
   
 private
   def check_integrity
-    case self.opt
-    when "IPRI"
-      raise "Can't delete enumeration" if Issue.find(:first, :conditions => ["priority_id=?", self.id])
-    when "DCAT"
-      raise "Can't delete enumeration" if Document.find(:first, :conditions => ["category_id=?", self.id])
-    when "ACTI"
-      raise "Can't delete enumeration" if TimeEntry.find(:first, :conditions => ["activity_id=?", self.id])
-    end
+    raise "Can't delete enumeration" if self.in_use?
   end
 end
diff --git a/app/views/enumerations/destroy.rhtml b/app/views/enumerations/destroy.rhtml
new file mode 100644
index 000000000..657df8322
--- /dev/null
+++ b/app/views/enumerations/destroy.rhtml
@@ -0,0 +1,12 @@
+<h2><%= l(@enumeration.option_name) %>: <%=h @enumeration %></h2>
+
+<% form_tag({}) do %>
+<div class="box">
+<p><strong><%= l(:text_enumeration_destroy_question, @enumeration.objects_count) %></strong></p>
+<p><%= l(:text_enumeration_category_reassign_to) %>
+<%= select_tag 'reassign_to_id', ("<option>--- #{l(:actionview_instancetag_blank_option)} ---</option>" + options_from_collection_for_select(@enumerations, 'id', 'name')) %></p>
+</div>
+
+<%= submit_tag l(:button_apply) %>
+<%= link_to l(:button_cancel), :controller => 'enumerations', :action => 'index' %>
+<% end %>
diff --git a/app/views/enumerations/list.rhtml b/app/views/enumerations/list.rhtml
index 1967e5cf9..7f3886b44 100644
--- a/app/views/enumerations/list.rhtml
+++ b/app/views/enumerations/list.rhtml
@@ -1,7 +1,7 @@
 <h2><%=l(:label_enumerations)%></h2>
 
-<% Enumeration::OPTIONS.each do |option, name| %>
-<h3><%= l(name) %></h3>
+<% Enumeration::OPTIONS.each do |option, params| %>
+<h3><%= l(params[:label]) %></h3>
 
 <% enumerations = Enumeration.get_values(option) %>
 <% if enumerations.any? %>
@@ -16,6 +16,9 @@
     <%= link_to image_tag('1downarrow.png', :alt => l(:label_sort_lower)), {:action => 'move', :id => enumeration, :position => 'lower'}, :method => :post, :title => l(:label_sort_lower) %>
     <%= link_to image_tag('2downarrow.png', :alt => l(:label_sort_lowest)), {:action => 'move', :id => enumeration, :position => 'lowest'}, :method => :post, :title => l(:label_sort_lowest) %>
     </td>
+    <td align="center" style="width:10%;">
+    <%= link_to l(:button_delete), { :action => 'destroy', :id => enumeration }, :method => :post, :confirm => l(:text_are_you_sure), :class => "icon icon-del" %>
+    </td>
 </tr>
 <% end %>
 </table>
diff --git a/lang/bg.yml b/lang/bg.yml
index 5f3548684..48226c79a 100644
--- a/lang/bg.yml
+++ b/lang/bg.yml
@@ -624,3 +624,5 @@ mail_subject_reminder: "%d issue(s) due in the next days"
 text_user_wrote: '%s wrote:'
 label_duplicated_by: duplicated by
 setting_enabled_scm: Enabled SCM
+text_enumeration_category_reassign_to: 'Reassign them to this value:'
+text_enumeration_destroy_question: '%d objects are assigned to this value.'
diff --git a/lang/cs.yml b/lang/cs.yml
index 26e0f5131..de460ba3a 100644
--- a/lang/cs.yml
+++ b/lang/cs.yml
@@ -629,3 +629,5 @@ mail_subject_reminder: "%d issue(s) due in the next days"
 text_user_wrote: '%s wrote:'
 label_duplicated_by: duplicated by
 setting_enabled_scm: Enabled SCM
+text_enumeration_category_reassign_to: 'Reassign them to this value:'
+text_enumeration_destroy_question: '%d objects are assigned to this value.'
diff --git a/lang/da.yml b/lang/da.yml
index b2f18db4c..6919cdfcb 100644
--- a/lang/da.yml
+++ b/lang/da.yml
@@ -626,3 +626,5 @@ mail_subject_reminder: "%d issue(s) due in the next days"
 text_user_wrote: '%s wrote:'
 label_duplicated_by: duplicated by
 setting_enabled_scm: Enabled SCM
+text_enumeration_category_reassign_to: 'Reassign them to this value:'
+text_enumeration_destroy_question: '%d objects are assigned to this value.'
diff --git a/lang/de.yml b/lang/de.yml
index 1e4040f3d..290acd916 100644
--- a/lang/de.yml
+++ b/lang/de.yml
@@ -625,3 +625,5 @@ mail_subject_reminder: "%d issue(s) due in the next days"
 text_user_wrote: '%s wrote:'
 label_duplicated_by: duplicated by
 setting_enabled_scm: Enabled SCM
+text_enumeration_category_reassign_to: 'Reassign them to this value:'
+text_enumeration_destroy_question: '%d objects are assigned to this value.'
diff --git a/lang/en.yml b/lang/en.yml
index b7f217e6c..ffbd10622 100644
--- a/lang/en.yml
+++ b/lang/en.yml
@@ -599,6 +599,8 @@ text_destroy_time_entries: Delete reported hours
 text_assign_time_entries_to_project: Assign reported hours to the project
 text_reassign_time_entries: 'Reassign reported hours to this issue:'
 text_user_wrote: '%s wrote:'
+text_enumeration_destroy_question: '%d objects are assigned to this value.'
+text_enumeration_category_reassign_to: 'Reassign them to this value:'
 
 default_role_manager: Manager
 default_role_developper: Developer
diff --git a/lang/es.yml b/lang/es.yml
index c0ecb997b..b027f48e3 100644
--- a/lang/es.yml
+++ b/lang/es.yml
@@ -627,3 +627,5 @@ mail_subject_reminder: "%d issue(s) due in the next days"
 text_user_wrote: '%s wrote:'
 label_duplicated_by: duplicated by
 setting_enabled_scm: Enabled SCM
+text_enumeration_category_reassign_to: 'Reassign them to this value:'
+text_enumeration_destroy_question: '%d objects are assigned to this value.'
diff --git a/lang/fi.yml b/lang/fi.yml
index 6ac4aea7e..e1d188dcc 100644
--- a/lang/fi.yml
+++ b/lang/fi.yml
@@ -624,3 +624,5 @@ mail_subject_reminder: "%d issue(s) due in the next days"
 text_user_wrote: '%s wrote:'
 label_duplicated_by: duplicated by
 setting_enabled_scm: Enabled SCM
+text_enumeration_category_reassign_to: 'Reassign them to this value:'
+text_enumeration_destroy_question: '%d objects are assigned to this value.'
diff --git a/lang/fr.yml b/lang/fr.yml
index 4db2f8f3a..eaae51765 100644
--- a/lang/fr.yml
+++ b/lang/fr.yml
@@ -599,6 +599,8 @@ text_destroy_time_entries: Supprimer les heures
 text_assign_time_entries_to_project: Reporter les heures sur le projet
 text_reassign_time_entries: 'Reporter les heures sur cette demande:'
 text_user_wrote: '%s a écrit:'
+text_enumeration_destroy_question: 'Cette valeur est affectée à %d objets.'
+text_enumeration_category_reassign_to: 'Réaffecter les objets à cette valeur:'
 
 default_role_manager: Manager
 default_role_developper: Développeur
diff --git a/lang/he.yml b/lang/he.yml
index e23698d32..5f14ee16e 100644
--- a/lang/he.yml
+++ b/lang/he.yml
@@ -624,3 +624,5 @@ mail_subject_reminder: "%d issue(s) due in the next days"
 text_user_wrote: '%s wrote:'
 label_duplicated_by: duplicated by
 setting_enabled_scm: Enabled SCM
+text_enumeration_category_reassign_to: 'Reassign them to this value:'
+text_enumeration_destroy_question: '%d objects are assigned to this value.'
diff --git a/lang/hu.yml b/lang/hu.yml
index 1df061942..c46d0e26c 100644
--- a/lang/hu.yml
+++ b/lang/hu.yml
@@ -625,3 +625,5 @@ mail_subject_reminder: "%d feladat határidős az elkövetkező napokban"
 text_user_wrote: '%s írta:'
 label_duplicated_by: duplikálta
 setting_enabled_scm: Forráskódkezelő (SCM) engedélyezése
+text_enumeration_category_reassign_to: 'Reassign them to this value:'
+text_enumeration_destroy_question: '%d objects are assigned to this value.'
diff --git a/lang/it.yml b/lang/it.yml
index 5ab9ad310..8aec9ef0e 100644
--- a/lang/it.yml
+++ b/lang/it.yml
@@ -624,3 +624,5 @@ mail_subject_reminder: "%d issue(s) due in the next days"
 text_user_wrote: '%s wrote:'
 label_duplicated_by: duplicated by
 setting_enabled_scm: Enabled SCM
+text_enumeration_category_reassign_to: 'Reassign them to this value:'
+text_enumeration_destroy_question: '%d objects are assigned to this value.'
diff --git a/lang/ja.yml b/lang/ja.yml
index c693d68e5..c48579dda 100644
--- a/lang/ja.yml
+++ b/lang/ja.yml
@@ -625,3 +625,5 @@ mail_subject_reminder: "%d issue(s) due in the next days"
 text_user_wrote: '%s wrote:'
 label_duplicated_by: duplicated by
 setting_enabled_scm: Enabled SCM
+text_enumeration_category_reassign_to: 'Reassign them to this value:'
+text_enumeration_destroy_question: '%d objects are assigned to this value.'
diff --git a/lang/ko.yml b/lang/ko.yml
index af1c768af..f2339556f 100644
--- a/lang/ko.yml
+++ b/lang/ko.yml
@@ -624,3 +624,5 @@ mail_subject_reminder: "%d issue(s) due in the next days"
 text_user_wrote: '%s wrote:'
 label_duplicated_by: duplicated by
 setting_enabled_scm: Enabled SCM
+text_enumeration_category_reassign_to: 'Reassign them to this value:'
+text_enumeration_destroy_question: '%d objects are assigned to this value.'
diff --git a/lang/lt.yml b/lang/lt.yml
index ff8f6b695..61533b3ab 100644
--- a/lang/lt.yml
+++ b/lang/lt.yml
@@ -626,3 +626,5 @@ mail_subject_reminder: "%d issue(s) due in the next days"
 text_user_wrote: '%s wrote:'
 label_duplicated_by: duplicated by
 setting_enabled_scm: Enabled SCM
+text_enumeration_category_reassign_to: 'Reassign them to this value:'
+text_enumeration_destroy_question: '%d objects are assigned to this value.'
diff --git a/lang/nl.yml b/lang/nl.yml
index 9ee913848..109d444f1 100644
--- a/lang/nl.yml
+++ b/lang/nl.yml
@@ -625,3 +625,5 @@ mail_subject_reminder: "%d issue(s) due in the next days"
 text_user_wrote: '%s wrote:'
 label_duplicated_by: duplicated by
 setting_enabled_scm: Enabled SCM
+text_enumeration_category_reassign_to: 'Reassign them to this value:'
+text_enumeration_destroy_question: '%d objects are assigned to this value.'
diff --git a/lang/no.yml b/lang/no.yml
index aa9d0396b..4e47c75a2 100644
--- a/lang/no.yml
+++ b/lang/no.yml
@@ -625,3 +625,5 @@ default_activity_development: Utvikling
 enumeration_issue_priorities: Sakssprioriteringer
 enumeration_doc_categories: Dokument-kategorier
 enumeration_activities: Aktiviteter (tidssporing)
+text_enumeration_category_reassign_to: 'Reassign them to this value:'
+text_enumeration_destroy_question: '%d objects are assigned to this value.'
diff --git a/lang/pl.yml b/lang/pl.yml
index 75e04ecd4..97378b5b1 100644
--- a/lang/pl.yml
+++ b/lang/pl.yml
@@ -624,3 +624,5 @@ mail_subject_reminder: "%d issue(s) due in the next days"
 text_user_wrote: '%s wrote:'
 label_duplicated_by: duplicated by
 setting_enabled_scm: Enabled SCM
+text_enumeration_category_reassign_to: 'Reassign them to this value:'
+text_enumeration_destroy_question: '%d objects are assigned to this value.'
diff --git a/lang/pt-br.yml b/lang/pt-br.yml
index dabab5bfe..67822499e 100644
--- a/lang/pt-br.yml
+++ b/lang/pt-br.yml
@@ -624,3 +624,5 @@ mail_subject_reminder: "%d issue(s) due in the next days"
 text_user_wrote: '%s wrote:'
 label_duplicated_by: duplicated by
 setting_enabled_scm: Enabled SCM
+text_enumeration_category_reassign_to: 'Reassign them to this value:'
+text_enumeration_destroy_question: '%d objects are assigned to this value.'
diff --git a/lang/pt.yml b/lang/pt.yml
index 2845f390c..a91eea01b 100644
--- a/lang/pt.yml
+++ b/lang/pt.yml
@@ -624,3 +624,5 @@ mail_subject_reminder: "%d issue(s) due in the next days"
 text_user_wrote: '%s wrote:'
 label_duplicated_by: duplicated by
 setting_enabled_scm: Enabled SCM
+text_enumeration_category_reassign_to: 'Reassign them to this value:'
+text_enumeration_destroy_question: '%d objects are assigned to this value.'
diff --git a/lang/ro.yml b/lang/ro.yml
index dd51e59be..aafc61916 100644
--- a/lang/ro.yml
+++ b/lang/ro.yml
@@ -624,3 +624,5 @@ mail_subject_reminder: "%d issue(s) due in the next days"
 text_user_wrote: '%s wrote:'
 label_duplicated_by: duplicated by
 setting_enabled_scm: Enabled SCM
+text_enumeration_category_reassign_to: 'Reassign them to this value:'
+text_enumeration_destroy_question: '%d objects are assigned to this value.'
diff --git a/lang/ru.yml b/lang/ru.yml
index c3ec91897..e04377781 100644
--- a/lang/ru.yml
+++ b/lang/ru.yml
@@ -628,3 +628,5 @@ mail_subject_reminder: "%d назначенных на вас задач в бл
 text_user_wrote: '%s написал:'
 label_duplicated_by: duplicated by
 setting_enabled_scm: Enabled SCM
+text_enumeration_category_reassign_to: 'Reassign them to this value:'
+text_enumeration_destroy_question: '%d objects are assigned to this value.'
diff --git a/lang/sr.yml b/lang/sr.yml
index 92906760b..ec01774bc 100644
--- a/lang/sr.yml
+++ b/lang/sr.yml
@@ -625,3 +625,5 @@ mail_subject_reminder: "%d issue(s) due in the next days"
 text_user_wrote: '%s wrote:'
 label_duplicated_by: duplicated by
 setting_enabled_scm: Enabled SCM
+text_enumeration_category_reassign_to: 'Reassign them to this value:'
+text_enumeration_destroy_question: '%d objects are assigned to this value.'
diff --git a/lang/sv.yml b/lang/sv.yml
index f08e45eb0..e28943d9b 100644
--- a/lang/sv.yml
+++ b/lang/sv.yml
@@ -625,3 +625,5 @@ mail_subject_reminder: "%d issue(s) due in the next days"
 text_user_wrote: '%s wrote:'
 label_duplicated_by: duplicated by
 setting_enabled_scm: Enabled SCM
+text_enumeration_category_reassign_to: 'Reassign them to this value:'
+text_enumeration_destroy_question: '%d objects are assigned to this value.'
diff --git a/lang/th.yml b/lang/th.yml
index 85a1f8c01..6c84dba70 100644
--- a/lang/th.yml
+++ b/lang/th.yml
@@ -627,3 +627,5 @@ mail_subject_reminder: "%d issue(s) due in the next days"
 text_user_wrote: '%s wrote:'
 label_duplicated_by: duplicated by
 setting_enabled_scm: Enabled SCM
+text_enumeration_category_reassign_to: 'Reassign them to this value:'
+text_enumeration_destroy_question: '%d objects are assigned to this value.'
diff --git a/lang/uk.yml b/lang/uk.yml
index ae8c5cbc0..365ced150 100644
--- a/lang/uk.yml
+++ b/lang/uk.yml
@@ -626,3 +626,5 @@ mail_subject_reminder: "%d issue(s) due in the next days"
 text_user_wrote: '%s wrote:'
 label_duplicated_by: duplicated by
 setting_enabled_scm: Enabled SCM
+text_enumeration_category_reassign_to: 'Reassign them to this value:'
+text_enumeration_destroy_question: '%d objects are assigned to this value.'
diff --git a/lang/zh-tw.yml b/lang/zh-tw.yml
index 064004c3a..c7b473548 100644
--- a/lang/zh-tw.yml
+++ b/lang/zh-tw.yml
@@ -625,3 +625,5 @@ default_activity_development: 開發
 enumeration_issue_priorities: 項目優先權
 enumeration_doc_categories: 文件分類
 enumeration_activities: 活動 (時間追蹤)
+text_enumeration_category_reassign_to: 'Reassign them to this value:'
+text_enumeration_destroy_question: '%d objects are assigned to this value.'
diff --git a/lang/zh.yml b/lang/zh.yml
index ac650c853..981e8102d 100644
--- a/lang/zh.yml
+++ b/lang/zh.yml
@@ -625,3 +625,5 @@ default_activity_development: 开发
 enumeration_issue_priorities: 问题优先级
 enumeration_doc_categories: 文档类别
 enumeration_activities: 活动（时间跟踪）
+text_enumeration_category_reassign_to: 'Reassign them to this value:'
+text_enumeration_destroy_question: '%d objects are assigned to this value.'
diff --git a/test/functional/enumerations_controller.rb b/test/functional/enumerations_controller.rb
new file mode 100644
index 000000000..36ff86720
--- /dev/null
+++ b/test/functional/enumerations_controller.rb
@@ -0,0 +1,61 @@
+# redMine - project management software
+# Copyright (C) 2006-2008  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 File.dirname(__FILE__) + '/../test_helper'
+require 'enumerations_controller'
+
+# Re-raise errors caught by the controller.
+class EnumerationsController; def rescue_action(e) raise e end; end
+
+class EnumerationsControllerTest < Test::Unit::TestCase
+  fixtures :enumerations, :issues, :users
+  
+  def setup
+    @controller = EnumerationsController.new
+    @request    = ActionController::TestRequest.new
+    @response   = ActionController::TestResponse.new
+    @request.session[:user_id] = 1 # admin
+  end
+
+  def test_index
+    get :index
+    assert_response :success
+    assert_template 'list'
+  end
+  
+  def test_destroy_enumeration_not_in_use
+    post :destroy, :id => 7
+    assert_redirected_to :controller => 'enumerations', :action => 'index'
+    assert_nil Enumeration.find_by_id(7)
+  end
+  
+  def test_destroy_enumeration_in_use
+    post :destroy, :id => 4
+    assert_response :success
+    assert_template 'destroy'
+    assert_not_nil Enumeration.find_by_id(4)
+  end
+  
+  def test_destroy_enumeration_in_use_with_reassignment
+    issue = Issue.find(:first, :conditions => {:priority_id => 4})
+    post :destroy, :id => 4, :reassign_to_id => 6
+    assert_redirected_to :controller => 'enumerations', :action => 'index'
+    assert_nil Enumeration.find_by_id(4)
+    # check that the issue was reassign
+    assert_equal 6, issue.reload.priority_id
+  end
+end
diff --git a/test/unit/enumeration_test.rb b/test/unit/enumeration_test.rb
new file mode 100644
index 000000000..9b7bfd174
--- /dev/null
+++ b/test/unit/enumeration_test.rb
@@ -0,0 +1,45 @@
+# redMine - project management software
+# Copyright (C) 2006-2008  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 File.dirname(__FILE__) + '/../test_helper'
+
+class EnumerationTest < Test::Unit::TestCase
+  fixtures :enumerations, :issues
+
+  def setup
+  end
+  
+  def test_objects_count
+    # low priority
+    assert_equal 5, Enumeration.find(4).objects_count
+    # urgent
+    assert_equal 0, Enumeration.find(7).objects_count
+  end
+  
+  def test_in_use
+    # low priority
+    assert Enumeration.find(4).in_use?
+    # urgent
+    assert !Enumeration.find(7).in_use?
+  end
+  
+  def test_destroy_with_reassign
+    Enumeration.find(4).destroy(Enumeration.find(6))
+    assert_nil Issue.find(:first, :conditions => {:priority_id => 4})
+    assert_equal 5, Enumeration.find(6).objects_count
+  end
+end

From d991e46f122d084c9465073256e7750b24898d49 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Tue, 17 Jun 2008 19:27:03 +0000
Subject: [PATCH 536/710] Fixed: urls containing @ are parsed as email adress
 by the wiki formatter (#1456).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1559 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 lib/redmine/wiki_formatting.rb               | 10 +++++++---
 test/unit/helpers/application_helper_test.rb |  3 ++-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/lib/redmine/wiki_formatting.rb b/lib/redmine/wiki_formatting.rb
index 88a858b04..6c8eebbbc 100644
--- a/lib/redmine/wiki_formatting.rb
+++ b/lib/redmine/wiki_formatting.rb
@@ -152,12 +152,16 @@ module Redmine
           end
         end
       end
-      
+
       # Turns all email addresses into clickable links (code from Rails).
       def inline_auto_mailto(text)
         text.gsub!(/([\w\.!#\$%\-+.]+@[A-Za-z0-9\-]+(\.[A-Za-z0-9\-]+)+)/) do
-          text = $1
-          %{<a href="mailto:#{$1}" class="email">#{text}</a>}
+          mail = $1
+          if text.match(/<a\b[^>]*>(.*)(#{Regexp.escape(mail)})(.*)<\/a>/)
+            mail
+          else
+            %{<a href="mailto:#{mail}" class="email">#{mail}</a>}
+          end
         end
       end
     end
diff --git a/test/unit/helpers/application_helper_test.rb b/test/unit/helpers/application_helper_test.rb
index c6afdda0e..9504a8c79 100644
--- a/test/unit/helpers/application_helper_test.rb
+++ b/test/unit/helpers/application_helper_test.rb
@@ -34,7 +34,8 @@ class ApplicationHelperTest < HelperTestCase
       'http://foo.bar/foo.bar#foo.bar.' => '<a class="external" href="http://foo.bar/foo.bar#foo.bar">http://foo.bar/foo.bar#foo.bar</a>.',
       'www.foo.bar' => '<a class="external" href="http://www.foo.bar">www.foo.bar</a>',
       'http://foo.bar/page?p=1&t=z&s=' => '<a class="external" href="http://foo.bar/page?p=1&#38;t=z&#38;s=">http://foo.bar/page?p=1&#38;t=z&#38;s=</a>',
-      'http://foo.bar/page#125' => '<a class="external" href="http://foo.bar/page#125">http://foo.bar/page#125</a>'
+      'http://foo.bar/page#125' => '<a class="external" href="http://foo.bar/page#125">http://foo.bar/page#125</a>',
+      'http://foo@www.bar.com' => '<a class="external" href="http://foo@www.bar.com">http://foo@www.bar.com</a>',
     }
     to_test.each { |text, result| assert_equal "<p>#{result}</p>", textilizable(text) }
   end

From 062a2d6f5d6ebdc74d5586cb151fd07a219b1b31 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Tue, 17 Jun 2008 20:01:15 +0000
Subject: [PATCH 537/710] Adds atom feed on time entries details (#1479).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1560 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/timelog_controller.rb      | 8 ++++++++
 app/models/time_entry.rb                   | 5 +++++
 app/views/timelog/details.rhtml            | 5 +++++
 test/functional/timelog_controller_test.rb | 8 ++++++++
 4 files changed, 26 insertions(+)

diff --git a/app/controllers/timelog_controller.rb b/app/controllers/timelog_controller.rb
index 29c2635d6..2b763129e 100644
--- a/app/controllers/timelog_controller.rb
+++ b/app/controllers/timelog_controller.rb
@@ -154,6 +154,14 @@ class TimelogController < ApplicationController
 
           render :layout => !request.xhr?
         }
+        format.atom {
+          entries = TimeEntry.find(:all,
+                                   :include => [:project, :activity, :user, {:issue => :tracker}],
+                                   :conditions => cond.conditions,
+                                   :order => "#{TimeEntry.table_name}.created_on DESC",
+                                   :limit => Setting.feeds_limit.to_i)
+          render_feed(entries, :title => l(:label_spent_time))
+        }
         format.csv {
           # Export all entries
           @entries = TimeEntry.find(:all, 
diff --git a/app/models/time_entry.rb b/app/models/time_entry.rb
index b234a8b21..61b53d1c0 100644
--- a/app/models/time_entry.rb
+++ b/app/models/time_entry.rb
@@ -24,6 +24,11 @@ class TimeEntry < ActiveRecord::Base
   belongs_to :activity, :class_name => 'Enumeration', :foreign_key => :activity_id
   
   attr_protected :project_id, :user_id, :tyear, :tmonth, :tweek
+
+  acts_as_event :title => Proc.new {|o| "#{o.user}: #{lwr(:label_f_hour, o.hours)} (#{(o.issue || o.project).event_title})"},
+                :url => Proc.new {|o| {:controller => 'timelog', :action => 'details', :project_id => o.project}},
+                :author => :user,
+                :description => :comments
   
   validates_presence_of :user_id, :activity_id, :project_id, :hours, :spent_on
   validates_numericality_of :hours, :allow_nil => true
diff --git a/app/views/timelog/details.rhtml b/app/views/timelog/details.rhtml
index f02da9959..f111cbfc0 100644
--- a/app/views/timelog/details.rhtml
+++ b/app/views/timelog/details.rhtml
@@ -24,8 +24,13 @@
 
 <p class="other-formats">
 <%= l(:label_export_to) %>
+<span><%= link_to 'Atom', {:issue_id => @issue, :format => 'atom', :key => User.current.rss_key}, :class => 'feed' %></span>
 <span><%= link_to 'CSV', params.merge(:format => 'csv'), :class => 'csv' %></span>
 </p>
 <% end %>
 
 <% html_title l(:label_spent_time), l(:label_details) %>
+
+<% content_for :header_tags do %>
+    <%= auto_discovery_link_tag(:atom, {:issue_id => @issue, :format => 'atom', :key => User.current.rss_key}, :title => l(:label_spent_time)) %>
+<% end %>
diff --git a/test/functional/timelog_controller_test.rb b/test/functional/timelog_controller_test.rb
index c8b47cf8d..7b4622daa 100644
--- a/test/functional/timelog_controller_test.rb
+++ b/test/functional/timelog_controller_test.rb
@@ -210,6 +210,14 @@ class TimelogControllerTest < Test::Unit::TestCase
     assert_equal '2007-04-22'.to_date, assigns(:to)
   end
   
+  def test_details_atom_feed
+    get :details, :project_id => 1, :format => 'atom'
+    assert_response :success
+    assert_equal 'application/atom+xml', @response.content_type
+    assert_not_nil assigns(:items)
+    assert assigns(:items).first.is_a?(TimeEntry)
+  end
+  
   def test_details_csv_export
     get :details, :project_id => 1, :format => 'csv'
     assert_response :success

From 7d143bc3f7394f0af2d95b1e3ce3a6db282516cb Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Tue, 17 Jun 2008 20:14:31 +0000
Subject: [PATCH 538/710] Allow dot in firstnames and lastnames (closes #1426).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1561 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/models/user.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/user.rb b/app/models/user.rb
index 573261b77..5568027d5 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -54,7 +54,7 @@ class User < ActiveRecord::Base
   # Login must contain lettres, numbers, underscores only
   validates_format_of :login, :with => /^[a-z0-9_\-@\.]*$/i
   validates_length_of :login, :maximum => 30
-  validates_format_of :firstname, :lastname, :with => /^[\w\s\'\-]*$/i
+  validates_format_of :firstname, :lastname, :with => /^[\w\s\'\-\.]*$/i
   validates_length_of :firstname, :lastname, :maximum => 30
   validates_format_of :mail, :with => /^([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})$/i, :allow_nil => true
   validates_length_of :mail, :maximum => 60, :allow_nil => true

From af734b1b38e9e8534e02f2859f9cc53d6b385de6 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Wed, 18 Jun 2008 16:49:40 +0000
Subject: [PATCH 539/710] Enable syntax highlight on issues, messages and news
 (#1473, #1466).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1562 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/issues/show.rhtml   | 1 +
 app/views/messages/show.rhtml | 4 ++++
 app/views/news/show.rhtml     | 4 ++++
 3 files changed, 9 insertions(+)

diff --git a/app/views/issues/show.rhtml b/app/views/issues/show.rhtml
index f1c8a82cd..044637094 100644
--- a/app/views/issues/show.rhtml
+++ b/app/views/issues/show.rhtml
@@ -116,4 +116,5 @@ end %>
 
 <% content_for :header_tags do %>
     <%= auto_discovery_link_tag(:atom, {:format => 'atom', :key => User.current.rss_key}, :title => "#{@issue.project} - #{@issue.tracker} ##{@issue.id}: #{@issue.subject}") %>
+    <%= stylesheet_link_tag 'scm' %>
 <% end %>
diff --git a/app/views/messages/show.rhtml b/app/views/messages/show.rhtml
index c04c40934..07508fbfd 100644
--- a/app/views/messages/show.rhtml
+++ b/app/views/messages/show.rhtml
@@ -50,3 +50,7 @@
 <div id="preview" class="wiki"></div>
 </div>
 <% end %>
+
+<% content_for :header_tags do %>
+  <%= stylesheet_link_tag 'scm' %>
+<% end %>
diff --git a/app/views/news/show.rhtml b/app/views/news/show.rhtml
index a55b56f0b..cc9fe1fbb 100644
--- a/app/views/news/show.rhtml
+++ b/app/views/news/show.rhtml
@@ -55,3 +55,7 @@
 <% end %>
 
 <% html_title @news.title -%>
+
+<% content_for :header_tags do %>
+  <%= stylesheet_link_tag 'scm' %>
+<% end %>

From fda7bcdfb6e6200b14f91baba9e3c3143635a50c Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Wed, 18 Jun 2008 17:02:39 +0000
Subject: [PATCH 540/710] Mercurial adapter tests fix (#1469).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1563 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 lib/redmine/scm/adapters/mercurial_adapter.rb | 2 --
 test/unit/mercurial_adapter_test.rb           | 6 +++---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/lib/redmine/scm/adapters/mercurial_adapter.rb b/lib/redmine/scm/adapters/mercurial_adapter.rb
index 28b842c27..a00ff4c49 100644
--- a/lib/redmine/scm/adapters/mercurial_adapter.rb
+++ b/lib/redmine/scm/adapters/mercurial_adapter.rb
@@ -192,8 +192,6 @@ module Redmine
                         end
         end
         
-        private
-        
         def hgversion_from_command_line
           @hgversion ||= %x{#{HG_BIN} --version}.match(/\(version (.*)\)/)[1]
         end
diff --git a/test/unit/mercurial_adapter_test.rb b/test/unit/mercurial_adapter_test.rb
index b4aaaec61..7c1ef85fd 100644
--- a/test/unit/mercurial_adapter_test.rb
+++ b/test/unit/mercurial_adapter_test.rb
@@ -4,9 +4,9 @@ begin
   
   class MercurialAdapterTest < Test::Unit::TestCase
     
-    TEMPLATES_DIR = "#{RAILS_ROOT}/extra/mercurial"
-    TEMPLATE_NAME = "hg-template"
-    TEMPLATE_EXTENSION = "tmpl"
+    TEMPLATES_DIR = Redmine::Scm::Adapters::MercurialAdapter::TEMPLATES_DIR
+    TEMPLATE_NAME = Redmine::Scm::Adapters::MercurialAdapter::TEMPLATE_NAME
+    TEMPLATE_EXTENSION = Redmine::Scm::Adapters::MercurialAdapter::TEMPLATE_EXTENSION
     
     REPOSITORY_PATH = RAILS_ROOT.gsub(%r{config\/\.\.}, '') + '/tmp/test/mercurial_repository'
     

From 0870f6267fc93400f1dc126fd6d329988a65c7a7 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Wed, 18 Jun 2008 20:15:51 +0000
Subject: [PATCH 541/710] Add target version to the issue list context menu.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1564 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/issues/context_menu.rhtml | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/app/views/issues/context_menu.rhtml b/app/views/issues/context_menu.rhtml
index 04c21ceae..69a5ec02a 100644
--- a/app/views/issues/context_menu.rhtml
+++ b/app/views/issues/context_menu.rhtml
@@ -20,6 +20,19 @@
 		<% end -%>
 		</ul>
 	</li>
+	<% unless @project.versions.empty? -%>
+	<li class="folder">			
+		<a href="#" class="submenu"><%= l(:field_fixed_version) %></a>
+		<ul>
+		<% @project.versions.sort.each do |v| -%>
+		    <li><%= context_menu_link v.name, {:controller => 'issues', :action => 'edit', :id => @issue, 'issue[fixed_version_id]' => v, :back_to => @back}, :method => :post,
+		                              :selected => (v == @issue.fixed_version), :disabled => !@can[:update] %></li>
+		<% end -%>
+		    <li><%= context_menu_link l(:label_none), {:controller => 'issues', :action => 'edit', :id => @issue, 'issue[fixed_version_id]' => '', :back_to => @back}, :method => :post,
+		                              :selected => @issue.fixed_version.nil?, :disabled => !@can[:update] %></li>
+		</ul>
+	</li>
+	<% end %>
 	<li class="folder">			
 		<a href="#" class="submenu"><%= l(:field_assigned_to) %></a>
 		<ul>

From 9cfa233001b0cca2c978372bfc70729fdbad4e9c Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Thu, 19 Jun 2008 18:52:20 +0000
Subject: [PATCH 542/710] Track project and tracker changes in issue history.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1565 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/issues_controller.rb | 1 +
 app/helpers/issues_helper.rb         | 6 ++++++
 2 files changed, 7 insertions(+)

diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index a86e9b00c..69c8e7932 100644
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -285,6 +285,7 @@ class IssuesController < ApplicationController
       new_tracker = params[:new_tracker_id].blank? ? nil : @target_project.trackers.find_by_id(params[:new_tracker_id])
       unsaved_issue_ids = []
       @issues.each do |issue|
+        issue.init_journal(User.current)
         unsaved_issue_ids << issue.id unless issue.move_to(@target_project, new_tracker)
       end
       if unsaved_issue_ids.empty?
diff --git a/app/helpers/issues_helper.rb b/app/helpers/issues_helper.rb
index 915a80b2a..e8f21e9a4 100644
--- a/app/helpers/issues_helper.rb
+++ b/app/helpers/issues_helper.rb
@@ -54,9 +54,15 @@ module IssuesHelper
       when 'due_date', 'start_date'
         value = format_date(detail.value.to_date) if detail.value
         old_value = format_date(detail.old_value.to_date) if detail.old_value
+      when 'project_id'
+        p = Project.find_by_id(detail.value) and value = p.name if detail.value
+        p = Project.find_by_id(detail.old_value) and old_value = p.name if detail.old_value
       when 'status_id'
         s = IssueStatus.find_by_id(detail.value) and value = s.name if detail.value
         s = IssueStatus.find_by_id(detail.old_value) and old_value = s.name if detail.old_value
+      when 'tracker_id'
+        t = Tracker.find_by_id(detail.value) and value = t.name if detail.value
+        t = Tracker.find_by_id(detail.old_value) and old_value = t.name if detail.old_value
       when 'assigned_to_id'
         u = User.find_by_id(detail.value) and value = u.name if detail.value
         u = User.find_by_id(detail.old_value) and old_value = u.name if detail.old_value

From ba8a36a39b0aeafd45aeff2a71d5cf689cabaea1 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sat, 21 Jun 2008 10:15:07 +0000
Subject: [PATCH 543/710] Removes spaces before colons on issue detail view
 (#1512).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1566 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/issues/show.rhtml | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/app/views/issues/show.rhtml b/app/views/issues/show.rhtml
index 044637094..57fbd05c7 100644
--- a/app/views/issues/show.rhtml
+++ b/app/views/issues/show.rhtml
@@ -18,34 +18,34 @@
 
 <table width="100%">
 <tr>
-    <td style="width:15%"><b><%=l(:field_status)%> :</b></td><td style="width:35%"><%= @issue.status.name %></td>
-    <td style="width:15%"><b><%=l(:field_start_date)%> :</b></td><td style="width:35%"><%= format_date(@issue.start_date) %></td>
+    <td style="width:15%"><b><%=l(:field_status)%>:</b></td><td style="width:35%"><%= @issue.status.name %></td>
+    <td style="width:15%"><b><%=l(:field_start_date)%>:</b></td><td style="width:35%"><%= format_date(@issue.start_date) %></td>
 </tr>
 <tr>
-    <td><b><%=l(:field_priority)%> :</b></td><td><%= @issue.priority.name %></td>
-    <td><b><%=l(:field_due_date)%> :</b></td><td><%= format_date(@issue.due_date) %></td>
+    <td><b><%=l(:field_priority)%>:</b></td><td><%= @issue.priority.name %></td>
+    <td><b><%=l(:field_due_date)%>:</b></td><td><%= format_date(@issue.due_date) %></td>
 </tr>
 <tr>
-    <td><b><%=l(:field_assigned_to)%> :</b></td><td><%= @issue.assigned_to ? link_to_user(@issue.assigned_to) : "-" %></td>
-    <td><b><%=l(:field_done_ratio)%> :</b></td><td><%= progress_bar @issue.done_ratio, :width => '80px', :legend => "#{@issue.done_ratio}%" %></td>
+    <td><b><%=l(:field_assigned_to)%>:</b></td><td><%= @issue.assigned_to ? link_to_user(@issue.assigned_to) : "-" %></td>
+    <td><b><%=l(:field_done_ratio)%>:</b></td><td><%= progress_bar @issue.done_ratio, :width => '80px', :legend => "#{@issue.done_ratio}%" %></td>
 </tr>
 <tr>
-    <td><b><%=l(:field_category)%> :</b></td><td><%=h @issue.category ? @issue.category.name : "-" %></td>
+    <td><b><%=l(:field_category)%>:</b></td><td><%=h @issue.category ? @issue.category.name : "-" %></td>
     <% if User.current.allowed_to?(:view_time_entries, @project) %>
-    <td><b><%=l(:label_spent_time)%> :</b></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', :project_id => @project, :issue_id => @issue}, :class => 'icon icon-time') : "-" %></td>
     <% end %>
 </tr>
 <tr>
-    <td><b><%=l(:field_fixed_version)%> :</b></td><td><%= @issue.fixed_version ? link_to_version(@issue.fixed_version) : "-" %></td>
+    <td><b><%=l(:field_fixed_version)%>:</b></td><td><%= @issue.fixed_version ? link_to_version(@issue.fixed_version) : "-" %></td>
     <% if @issue.estimated_hours %>
-    <td><b><%=l(:field_estimated_hours)%> :</b></td><td><%= lwr(:label_f_hour, @issue.estimated_hours) %></td>
+    <td><b><%=l(:field_estimated_hours)%>:</b></td><td><%= lwr(:label_f_hour, @issue.estimated_hours) %></td>
     <% end %>
 </tr>
 <tr>
 <% n = 0
 for custom_value in @custom_values %>
-    <td valign="top"><b><%= custom_value.custom_field.name %> :</b></td><td valign="top"><%= simple_format(h(show_value(custom_value))) %></td>
+    <td valign="top"><b><%= custom_value.custom_field.name %>:</b></td><td valign="top"><%= simple_format(h(show_value(custom_value))) %></td>
 <% n = n + 1
    if (n > 1) 
         n = 0 %>

From bb1edda6e803c6a91fbcb7941fd619eb55be8d32 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sat, 21 Jun 2008 12:32:47 +0000
Subject: [PATCH 544/710] Display issue notes in the activity view (#1509).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1567 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/projects_controller.rb |   3 ++-
 app/models/journal.rb                  |   2 +-
 public/images/ticket_note.png          | Bin 0 -> 784 bytes
 public/stylesheets/application.css     |   1 +
 4 files changed, 4 insertions(+), 2 deletions(-)
 create mode 100644 public/images/ticket_note.png

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index d15c6bc2a..c9a55088b 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -258,7 +258,8 @@ class ProjectsController < ApplicationController
       @events += Issue.find(:all, :include => [:project, :author, :tracker], :conditions => cond.conditions)
       
       cond = ARCondition.new(Project.allowed_to_condition(User.current, :view_issues, :project => @project, :with_subprojects => @with_subprojects))
-      cond.add(["#{Journal.table_name}.journalized_type = 'Issue' AND #{JournalDetail.table_name}.prop_key = 'status_id' AND #{Journal.table_name}.created_on BETWEEN ? AND ?", @date_from, @date_to])
+      cond.add(["#{Journal.table_name}.journalized_type = 'Issue' AND #{Journal.table_name}.created_on BETWEEN ? AND ?", @date_from, @date_to])
+      cond.add("#{JournalDetail.table_name}.prop_key = 'status_id' OR #{Journal.table_name}.notes <> ''")
       @events += Journal.find(:all, :include => [{:issue => :project}, :details, :user], :conditions => cond.conditions)
     end
     
diff --git a/app/models/journal.rb b/app/models/journal.rb
index ac141f68c..67a3eee3b 100644
--- a/app/models/journal.rb
+++ b/app/models/journal.rb
@@ -33,7 +33,7 @@ class Journal < ActiveRecord::Base
   acts_as_event :title => Proc.new {|o| status = ((s = o.new_status) ? " (#{s})" : nil); "#{o.issue.tracker} ##{o.issue.id}#{status}: #{o.issue.subject}" },
                 :description => :notes,
                 :author => :user,
-                :type => Proc.new {|o| (s = o.new_status) && s.is_closed? ? 'issue-closed' : 'issue-edit' },
+                :type => Proc.new {|o| (s = o.new_status) ? (s.is_closed? ? 'issue-closed' : 'issue-edit') : 'issue-note' },
                 :url => Proc.new {|o| {:controller => 'issues', :action => 'show', :id => o.issue.id, :anchor => "change-#{o.id}"}}
 
   def save
diff --git a/public/images/ticket_note.png b/public/images/ticket_note.png
new file mode 100644
index 0000000000000000000000000000000000000000..c69db223f73adee7b012c00c27770678fe529ca2
GIT binary patch
literal 784
zcmV+r1MmEaP)<h;3K|Lk000e1NJLTq000mG000mO0{{R3C@l|D00007bV*G`2iOJ`
z3N0Cv=n)nG000SaNLh0L01FZT01FZU(%pXi00004XF*Lt006O%3;baP0005DP)t-s
z|NsB&@%N0Z&Eo3v_xbx^jJjNjx!&jS>Z48Qo<`@IKIWA*;*1{Rj3DHVA#j+%xz6HS
ziMZf>1K)W7>!(%u=C<+CmFTBS>#thw!hOfq=kfOWxXt2MhPQK?!|SVE_~W$ZpEBvI
zJNW6SroPyXt<TZk>-zlt`1}3c=ke<C_*{y)v&i1;tX=D^RqL-u`RT0s>aAvwz3lP$
z=kWOE@Au^H_xbz%;OX*kn8NF=Uhu<%{PWZN^U?b4vR;e2^7s1e^ZM!W_~PvL=kNFB
z?DTAv!0xtj^wFO1%6Ra{a`47(^7i`g_4@Ag`t9@j>+|{I>ho`x!SK0x{Px@U=bZTE
zmG|S1e4xj@(d6;=`tkMp@b&uX@b;|3+>NZx^u>(*_ucsDqWI^X%-idGpvPZ~yI_pF
zT8Ow|jk{=)zNWv~<m~hH$dmo|;rZ&S`RJqg<(Bv3koVz;_TPZ@-FN%($m^a!_RN?6
z{rUd;@c#Vp{rm3y`|thx@c#Yx?W0Ql+_L}v`u_d;|NZ*zs8jymw))bd`O%#C&6oGe
zlJ>@o^}>bpzkc+(cJa1u@Ums_tzCoUq^JM@00DGTPE!Ct=GbNc007WQL_t(|+GAiK
z4BFZ|I=i}idi(k(Oau!wHi1BMOH)%zD_EeSvZ|`Orna`OuD$^*keioZkX%?)TvA$A
z4i-pAOiB(*Nli;n%gD^i&S78(4hanlkBIb%ii(bjjf-bsaQE=^^0xQ!_45yK@(m1P
zV6d{bv9+^zaC9;;b#`%eV_?wL(>E|QGS)CLHPbS;uw-D6S5Q<^R#8<`SJ%+g($-;M
z5D^s<myncVm6nl}lam5k%fZRT&BM#bFCZu+jN~I0RyKANFETPQLl^+3axxK@j@j1$
O0000<MNUMnLSTaawbhOQ

literal 0
HcmV?d00001

diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index d87b3bf2b..48a8193e2 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -190,6 +190,7 @@ div#activity dd span.description, #search-results dd span.description { display:
 dt.issue { background-image: url(../images/ticket.png); }
 dt.issue-edit { background-image: url(../images/ticket_edit.png); }
 dt.issue-closed { background-image: url(../images/ticket_checked.png); }
+dt.issue-note { background-image: url(../images/ticket_note.png); }
 dt.changeset { background-image: url(../images/changeset.png); }
 dt.news { background-image: url(../images/news.png); }
 dt.message { background-image: url(../images/message.png); }

From a01f976b4cfa4a72deed2d12e9b4b5e897de30ef Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 22 Jun 2008 10:45:03 +0000
Subject: [PATCH 545/710] Adds basic support for issue creation via email
 (#1110).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1568 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/models/mail_handler.rb                    | 124 +++++++--
 lib/tasks/email.rake                          |  37 +++
 test/fixtures/enabled_modules.yml             |   4 +
 test/fixtures/enumerations.yml                |   1 +
 .../mail_handler/add_note_to_issue.txt        |  14 -
 .../mail_handler/ticket_on_given_project.eml  |  41 +++
 test/fixtures/mail_handler/ticket_reply.eml   |  73 ++++++
 .../mail_handler/ticket_with_attachment.eml   | 248 ++++++++++++++++++
 test/unit/mail_handler_test.rb                |  70 +++--
 9 files changed, 555 insertions(+), 57 deletions(-)
 create mode 100644 lib/tasks/email.rake
 delete mode 100644 test/fixtures/mail_handler/add_note_to_issue.txt
 create mode 100644 test/fixtures/mail_handler/ticket_on_given_project.eml
 create mode 100644 test/fixtures/mail_handler/ticket_reply.eml
 create mode 100644 test/fixtures/mail_handler/ticket_with_attachment.eml

diff --git a/app/models/mail_handler.rb b/app/models/mail_handler.rb
index 7a1d73244..03e48e170 100644
--- a/app/models/mail_handler.rb
+++ b/app/models/mail_handler.rb
@@ -16,25 +16,119 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class MailHandler < ActionMailer::Base
+
+  class UnauthorizedAction < StandardError; end
+  class MissingInformation < StandardError; end
+  
+  attr_reader :email, :user
+
+  def self.receive(email, options={})
+    @@handler_options = options
+    super email
+  end
   
   # 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
+    @email = email
+    @user = User.find_active(:first, :conditions => {:mail => email.from.first})
+    unless @user
+      # Unknown user => the email is ignored
+      # TODO: ability to create the user's account
+      logger.info "MailHandler: email submitted by unknown user [#{email.from.first}]" if logger && logger.info
+      return false
+    end
+    User.current = @user
+    dispatch
+  end
+  
+  private
+
+  ISSUE_REPLY_SUBJECT_RE = %r{\[[^\]]+#(\d+)\]}
+  
+  def dispatch
+    if m = email.subject.match(ISSUE_REPLY_SUBJECT_RE)
+      receive_issue_update(m[1].to_i)
+    else
+      receive_issue
+    end
+  rescue ActiveRecord::RecordInvalid => e
+    # TODO: send a email to the user
+    logger.error e.message if logger
+    false
+  rescue MissingInformation => e
+    logger.error "MailHandler: missing information from #{user}: #{e.message}" if logger
+    false
+  rescue UnauthorizedAction => e
+    logger.error "MailHandler: unauthorized attempt from #{user}" if logger
+    false
+  end
+  
+  # Creates a new issue
+  def receive_issue
+    project = target_project
+    # TODO: make the tracker configurable
+    tracker = project.trackers.find(:first)
     # check permission
-    return unless user.allowed_to?(:add_issue_notes, issue.project)
-    
+    raise UnauthorizedAction unless user.allowed_to?(:add_issues, project)
+    issue = Issue.new(:author => user, :project => project, :tracker => tracker)
+    issue.subject = email.subject.chomp
+    issue.description = email.plain_text_body.chomp
+    issue.save!
+    add_attachments(issue)
+    logger.info "MailHandler: issue ##{issue.id} created by #{user}" if logger && logger.info
+    Mailer.deliver_issue_add(issue) if Setting.notified_events.include?('issue_added')
+    issue
+  end
+  
+  def target_project
+    # TODO: other ways to specify project:
+    # * parse the email To field
+    # * specific project (eg. Setting.mail_handler_target_project)
+    identifier = if @@handler_options[:project]
+                   @@handler_options[:project]
+                 elsif email.plain_text_body =~ %r{^Project:[ \t]*(.+)$}i
+                    $1
+                 end
+                 
+    target = Project.find_by_identifier(identifier.to_s)
+    raise MissingInformation.new('Unable to determine target project') if target.nil?
+    target
+  end
+  
+  # Adds a note to an existing issue
+  def receive_issue_update(issue_id)
+    issue = Issue.find_by_id(issue_id)
+    return unless issue
+    # check permission
+    raise UnauthorizedAction unless user.allowed_to?(:add_issue_notes, issue.project) || user.allowed_to?(:edit_issues, issue.project)
     # add the note
-    issue.init_journal(user, email.body.chomp)
-    issue.save
+    journal = issue.init_journal(user, email.plain_text_body.chomp)
+    add_attachments(journal)
+    issue.save!
+    logger.info "MailHandler: issue ##{issue.id} updated by #{user}" if logger && logger.info
+    Mailer.deliver_issue_edit(journal) if Setting.notified_events.include?('issue_updated')
+    journal
+  end
+  
+  def add_attachments(obj)
+    if email.has_attachments?
+      email.attachments.each do |attachment|
+        Attachment.create(:container => obj,
+                          :file => attachment,
+                          :author => user,
+                          :content_type => attachment.content_type)
+      end
+    end
   end
 end
+
+class TMail::Mail
+  # Returns body of the first plain text part found if any
+  def plain_text_body
+    return @plain_text_body unless @plain_text_body.nil?
+    p = self.parts.collect {|c| (c.respond_to?(:parts) && !c.parts.empty?) ? c.parts : c}.flatten
+    plain = p.detect {|c| c.content_type == 'text/plain'}
+    @plain_text_body = plain.nil? ? self.body : plain.body
+  end
+end
+
diff --git a/lib/tasks/email.rake b/lib/tasks/email.rake
new file mode 100644
index 000000000..dbdbe71fc
--- /dev/null
+++ b/lib/tasks/email.rake
@@ -0,0 +1,37 @@
+# redMine - project management software
+# Copyright (C) 2006-2008  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.
+
+desc <<-END_DESC
+Read an email from standard input.
+
+Available options:
+  * project => identifier of the project the issue should be added to
+  
+Example:
+  rake redmine:email:receive project=foo RAILS_ENV="production"
+END_DESC
+
+namespace :redmine do
+  namespace :email do
+    task :receive => :environment do
+      options = {}
+      options[:project] = ENV['project'] if ENV['project']
+      
+      MailHandler.receive(STDIN.read, options)
+    end
+  end
+end
diff --git a/test/fixtures/enabled_modules.yml b/test/fixtures/enabled_modules.yml
index 8d1565534..da63bad5d 100644
--- a/test/fixtures/enabled_modules.yml
+++ b/test/fixtures/enabled_modules.yml
@@ -39,4 +39,8 @@ enabled_modules_010:
   name: wiki
   project_id: 3
   id: 10
+enabled_modules_011: 
+  name: issue_tracking
+  project_id: 2
+  id: 11
   
\ No newline at end of file
diff --git a/test/fixtures/enumerations.yml b/test/fixtures/enumerations.yml
index 5e2615476..22a581ab9 100644
--- a/test/fixtures/enumerations.yml
+++ b/test/fixtures/enumerations.yml
@@ -19,6 +19,7 @@ enumerations_005:
   name: Normal
   id: 5
   opt: IPRI
+  is_default: true
 enumerations_006: 
   name: High
   id: 6
diff --git a/test/fixtures/mail_handler/add_note_to_issue.txt b/test/fixtures/mail_handler/add_note_to_issue.txt
deleted file mode 100644
index 4fc6b68fb..000000000
--- a/test/fixtures/mail_handler/add_note_to_issue.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-x-sender: <jsmith@somenet.foo>
-x-receiver: <redmine@somenet.foo>
-Received: from somenet.foo ([127.0.0.1]) by somenet.foo;
-	Sun, 25 Feb 2007 09:57:56 GMT
-Date: Sun, 25 Feb 2007 10:57:56 +0100
-From: jsmith@somenet.foo
-To: redmine@somenet.foo
-Message-Id: <45e15df440c00_b90238570a27b@osiris.tmail>
-In-Reply-To: <45e15df440c29_b90238570a27b@osiris.tmail>
-Subject: [Cookbook - Feature #2]
-Mime-Version: 1.0
-Content-Type: text/plain; charset=utf-8
-
-Note added by mail
diff --git a/test/fixtures/mail_handler/ticket_on_given_project.eml b/test/fixtures/mail_handler/ticket_on_given_project.eml
new file mode 100644
index 000000000..07c7f16b2
--- /dev/null
+++ b/test/fixtures/mail_handler/ticket_on_given_project.eml
@@ -0,0 +1,41 @@
+Return-Path: <jsmith@somenet.foo>
+Received: from osiris ([127.0.0.1])
+	by OSIRIS
+	with hMailServer ; Sun, 22 Jun 2008 12:28:07 +0200
+Message-ID: <000501c8d452$a95cd7e0$0a00a8c0@osiris>
+From: "John Smith" <jsmith@somenet.foo>
+To: <redmine@somenet.foo>
+Subject: New ticket on a given project
+Date: Sun, 22 Jun 2008 12:28:07 +0200
+MIME-Version: 1.0
+Content-Type: text/plain;
+	format=flowed;
+	charset="iso-8859-1";
+	reply-type=original
+Content-Transfer-Encoding: 7bit
+X-Priority: 3
+X-MSMail-Priority: Normal
+X-Mailer: Microsoft Outlook Express 6.00.2900.2869
+X-MimeOLE: Produced By Microsoft MimeOLE V6.00.2900.2869
+
+Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Maecenas imperdiet 
+turpis et odio. Integer eget pede vel dolor euismod varius. Phasellus 
+blandit eleifend augue. Nulla facilisi. Duis id diam. Class aptent taciti 
+sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. In 
+in urna sed tellus aliquet lobortis. Morbi scelerisque tortor in dolor. Cras 
+sagittis odio eu lacus. Aliquam sem tortor, consequat sit amet, vestibulum 
+id, iaculis at, lectus. Fusce tortor libero, congue ut, euismod nec, luctus 
+eget, eros. Pellentesque tortor enim, feugiat in, dignissim eget, tristique 
+sed, mauris. Pellentesque habitant morbi tristique senectus et netus et 
+malesuada fames ac turpis egestas. Quisque sit amet libero. In hac habitasse 
+platea dictumst.
+
+Nulla et nunc. Duis pede. Donec et ipsum. Nam ut dui tincidunt neque 
+sollicitudin iaculis. Duis vitae dolor. Vestibulum eget massa. Sed lorem. 
+Nullam volutpat cursus erat. Cras felis dolor, lacinia quis, rutrum et, 
+dictum et, ligula. Sed erat nibh, gravida in, accumsan non, placerat sed, 
+massa. Sed sodales, ante fermentum ultricies sollicitudin, massa leo 
+pulvinar dui, a gravida orci mi eget odio. Nunc a lacus.
+
+Project: onlinestore
+
diff --git a/test/fixtures/mail_handler/ticket_reply.eml b/test/fixtures/mail_handler/ticket_reply.eml
new file mode 100644
index 000000000..99fcfa0d1
--- /dev/null
+++ b/test/fixtures/mail_handler/ticket_reply.eml
@@ -0,0 +1,73 @@
+Return-Path: <jsmith@somenet.foo>
+Received: from osiris ([127.0.0.1])
+	by OSIRIS
+	with hMailServer ; Sat, 21 Jun 2008 18:41:39 +0200
+Message-ID: <006a01c8d3bd$ad9baec0$0a00a8c0@osiris>
+From: "John Smith" <jsmith@somenet.foo>
+To: <redmine@somenet.foo>
+References: <485d0ad366c88_d7014663a025f@osiris.tmail>
+Subject: Re: [Cookbook - Feature #2] (New) Add ingredients categories
+Date: Sat, 21 Jun 2008 18:41:39 +0200
+MIME-Version: 1.0
+Content-Type: multipart/alternative;
+	boundary="----=_NextPart_000_0067_01C8D3CE.711F9CC0"
+X-Priority: 3
+X-MSMail-Priority: Normal
+X-Mailer: Microsoft Outlook Express 6.00.2900.2869
+X-MimeOLE: Produced By Microsoft MimeOLE V6.00.2900.2869
+
+This is a multi-part message in MIME format.
+
+------=_NextPart_000_0067_01C8D3CE.711F9CC0
+Content-Type: text/plain;
+	charset="utf-8"
+Content-Transfer-Encoding: quoted-printable
+
+This is reply
+------=_NextPart_000_0067_01C8D3CE.711F9CC0
+Content-Type: text/html;
+	charset="utf-8"
+Content-Transfer-Encoding: quoted-printable
+
+=EF=BB=BF<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<HTML><HEAD>
+<META http-equiv=3DContent-Type content=3D"text/html; charset=3Dutf-8">
+<STYLE>BODY {
+	FONT-SIZE: 0.8em; COLOR: #484848; FONT-FAMILY: Verdana, sans-serif
+}
+BODY H1 {
+	FONT-SIZE: 1.2em; MARGIN: 0px; FONT-FAMILY: "Trebuchet MS", Verdana, =
+sans-serif
+}
+A {
+	COLOR: #2a5685
+}
+A:link {
+	COLOR: #2a5685
+}
+A:visited {
+	COLOR: #2a5685
+}
+A:hover {
+	COLOR: #c61a1a
+}
+A:active {
+	COLOR: #c61a1a
+}
+HR {
+	BORDER-RIGHT: 0px; BORDER-TOP: 0px; BACKGROUND: #ccc; BORDER-LEFT: 0px; =
+WIDTH: 100%; BORDER-BOTTOM: 0px; HEIGHT: 1px
+}
+.footer {
+	FONT-SIZE: 0.8em; FONT-STYLE: italic
+}
+</STYLE>
+
+<META content=3D"MSHTML 6.00.2900.2883" name=3DGENERATOR></HEAD>
+<BODY bgColor=3D#ffffff>
+<DIV><SPAN class=3Dfooter><FONT face=3DArial color=3D#000000 =
+size=3D2>This is=20
+reply</FONT></DIV></SPAN></BODY></HTML>
+
+------=_NextPart_000_0067_01C8D3CE.711F9CC0--
+
diff --git a/test/fixtures/mail_handler/ticket_with_attachment.eml b/test/fixtures/mail_handler/ticket_with_attachment.eml
new file mode 100644
index 000000000..c85f6b4a2
--- /dev/null
+++ b/test/fixtures/mail_handler/ticket_with_attachment.eml
@@ -0,0 +1,248 @@
+Return-Path: <jsmith@somenet.foo>
+Received: from osiris ([127.0.0.1])
+	by OSIRIS
+	with hMailServer ; Sat, 21 Jun 2008 15:53:25 +0200
+Message-ID: <002301c8d3a6$2cdf6950$0a00a8c0@osiris>
+From: "John Smith" <jsmith@somenet.foo>
+To: <redmine@somenet.foo>
+Subject: Ticket created by email with attachment
+Date: Sat, 21 Jun 2008 15:53:25 +0200
+MIME-Version: 1.0
+Content-Type: multipart/mixed;
+	boundary="----=_NextPart_000_001F_01C8D3B6.F05C5270"
+X-Priority: 3
+X-MSMail-Priority: Normal
+X-Mailer: Microsoft Outlook Express 6.00.2900.2869
+X-MimeOLE: Produced By Microsoft MimeOLE V6.00.2900.2869
+
+This is a multi-part message in MIME format.
+
+------=_NextPart_000_001F_01C8D3B6.F05C5270
+Content-Type: multipart/alternative;
+	boundary="----=_NextPart_001_0020_01C8D3B6.F05C5270"
+
+
+------=_NextPart_001_0020_01C8D3B6.F05C5270
+Content-Type: text/plain;
+	charset="iso-8859-1"
+Content-Transfer-Encoding: quoted-printable
+
+This is  a new ticket with attachments
+------=_NextPart_001_0020_01C8D3B6.F05C5270
+Content-Type: text/html;
+	charset="iso-8859-1"
+Content-Transfer-Encoding: quoted-printable
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<HTML><HEAD>
+<META http-equiv=3DContent-Type content=3D"text/html; =
+charset=3Diso-8859-1">
+<META content=3D"MSHTML 6.00.2900.2883" name=3DGENERATOR>
+<STYLE></STYLE>
+</HEAD>
+<BODY bgColor=3D#ffffff>
+<DIV><FONT face=3DArial size=3D2>This is&nbsp; a new ticket with=20
+attachments</FONT></DIV></BODY></HTML>
+
+------=_NextPart_001_0020_01C8D3B6.F05C5270--
+
+------=_NextPart_000_001F_01C8D3B6.F05C5270
+Content-Type: image/jpeg;
+	name="Paella.jpg"
+Content-Transfer-Encoding: base64
+Content-Disposition: attachment;
+	filename="Paella.jpg"
+
+/9j/4AAQSkZJRgABAQEASABIAAD/2wBDAAYEBQYFBAYGBQYHBwYIChAKCgkJChQODwwQFxQYGBcU
+FhYaHSUfGhsjHBYWICwgIyYnKSopGR8tMC0oMCUoKSj/2wBDAQcHBwoIChMKChMoGhYaKCgoKCgo
+KCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCgoKCj/wAARCACmAMgDASIA
+AhEBAxEB/8QAHQAAAgMBAQEBAQAAAAAAAAAABQYABAcDCAIBCf/EADsQAAEDAwMCBQIDBQcFAQAA
+AAECAwQABREGEiExQQcTIlFhcYEUMpEVI0Kh0QhSYrHB4fAWJCUzQ3L/xAAaAQADAQEBAQAAAAAA
+AAAAAAADBAUCAQYA/8QAKhEAAgIBBAICAgIDAAMAAAAAAQIAAxEEEiExIkEFE1FhMnFCkaEjwdH/
+2gAMAwEAAhEDEQA/ACTUdSsdhRCNE54GTRaBaXHiBtNOVo0wEpSt8BKfmpWCZRPHcVbdZ3X1J9Jx
+Tla9OBpIU8Noo7Gjx4qdrCBkfxGupUSck13GJjeT1ObEdthOG04/zpX8SNXjR1njym46ZMmQ+llp
+pStuc9T9hRq/X22afhKl3iazEYHdxWCfgDqT9K83eKfiFG1RfIEi3tuC3W9KlNh0YLqyeuO3QV0D
+MznM9O2uai4QI8psYQ8gLA9virY615P034xX+zNNslLDsMKOG1J5HuAa3nQPiBZ9WtpUy4lmcE4U
+ypXP2rmMHmcI/EealD7te7ZZ2S7dLhGiN9cvOBP+dIF18btHw3C1DkSbi7nATGZJBPwTitTIyZp9
+SsCun9oJaEFUDTy0oyQFyXSOfoB/rQOL466huE9LIagxW1A48tkuKJxwBlQrm4YzNhGPE9Mmua8Y
+JrzsrXPiQ42y7+KtsZt4kpS8ltK0p91J5IzXGFr3xFef8pMqE4vJABZT6se3FDNyEZzNCh89Tfbv
+aoV2iKj3GO2+0eyh0+h7VkWq/CqTDUqXpp0uJHPkKOFj6HofvQRzxZ1bbwFTG7c+jO0lKeh+cGi8
+bxrebZZVMtjDqljKgw4Rt9uuea5vEIEceoL09ZnHQoyGy3KaOFhxO0j6g0J8QNPr3tzorHmsJSUv
+NgdQeprTIuqbfqdtD7MRxh7HO/H6ZHWlnW0e5tQnv2WgupAyEg8p9xUl7WGowpzKCoDXyJ5nvMdK
+Uuho4bSv057CqK2stIWrgEZp2kWtE+O5+MC0OKUchHFCbnaWVNeW1KU3tTtwtAUkj6jkfpXoK7gQ
+AZLsqYEmJ0mUBlLeCfeqHKl5PqJopNhriupQWyoqPpKeQfpTXYPDW+3ZlEhTTcVpXI8w+oj6Cmty
+qMxTazHAi1ZLG/PXuKClv3Ip7t2n4yI3lKZSsEc7hmicXwfu5ThN22fCUH+tXB4QX1KdzN6WVjth
+Q/1oDuG/yjCIV/xgWLouQFfiLK/5LqejbnKT9D1FStX05DRaYrTN8K232wEl1aMJV856VKF9hPc3
+9QPM32HEjxEjykBSh/ERSd4s61uGjLbBnQrcie2t4pfClEFKAM8Y704uvtsMrdfcQ20gZUtZAAHu
+SawHxt8V7PKt/wCytPp/aLrToW7JAPlNkAjAPfOfpQ0JY4E42B3Nf09ruwXvTQvjM9lmGkfvvOWE
+llXdKvn/ADrONZeNwU28zo2Ml1tHpXc5Y2spP+EHlR/5ivOzYkPPKdjMechRDjrCUHy1Ec9Aa1Lw
+l0VF10pcy4XJC0RlbTFTgKbHwnokfSibFXkzAJbiJ0tN81jc1yHXplzkEEqkPA7UjvtR2H1/SrOl
+rGu6NvP7Q8yhaWkDruVj/n616Lvl20n4Z2cpeS02tSfRHbAU69/t8nivOGoNXzNQSVRbFAbtsFal
+FESEjBOepUR1rBs3D8CFVMHjmXNYW+wWtsMrlMvyyOW4h3FB9irpn70lx7k9AeDttW4w70DgWd3+
+1NmlvDi7XpL0iShcWG0dqllO5SlHsB35NG7l4PSRG823z0YbGFqkDaFK+MZx7d6XOu09Z2M8MKHb
+OBM1vBuAkJcuUgyHXRu3KfDp+5ycVTaeU36kKUlYOQQcEVrehvC5l1Mh/VClISHFMttIVgL45VnH
+TkEH4rQbjpHTbyGWVQIzL7bYabc2AnaMfYnAxk0K35Smo7e/2IRdC7eXUwfT5m6pfbtC/wARIlLW
+VNu7yoN9MlQ9h3NO+n9Cwo8rzZU1Sm2Mlx9YLaUkHjaOv3Nc7zd7FoyY5D07HR56SfMl7961ZGNo
+9gKXrtd77dnkssoSwt7K9rZG8jHU44Tkc9q0rvbyvipnNgT9kTRLvqKy2JDgS/8AiH3hjecKXjv2
+/SkG8akmRyhqG+hKSQ4dpyofBxxV2w+Hkuda27pMW5tcSpWxati1HJGQTkYp70xoS2MW1pp+ImXN
+koJLi+UtfP1FAt1dFPHcPXQ9nPUy+/3pu4usrYZS16MOKCAkuLJypRxX5aG5ExX4VlfC/Vt98e3z
+WvL8M9NsNMtyFyVyGx6h5uPMPyMcV9Q9HQbbdWwzHQGFHKVhStw+uTQTr6tu1IQad85M46baVarV
+uVkJ/mDVCVqWUll59t4FxlW0ocOA4k+1P8uLGU35UgAhQ2kgdRWUeIMi2WyKqASFLJJbWchQI7Ul
+pWWyw5GSYZ1IXA4Ez7U12mR7q95jCWgTuCQeoPsaGqntylbCpIdxnaSM/wBK56lujtydZS4UkNIw
+CBzQO4RURywWnUupcQF7knoT1BHYg5r0lFY2DIwZKvYq5x1DjUo26WzJKEuIQoFSFDIP+9bzaL0x
++HZcZcQpC0ggewIrzYzNJQGpGVt+/cUw2PU8+0vqWEJnW8q/9KzgpHslXb6UV6yw4gBZg8z1NZbj
+Ek43LQDjkZFMLbkMcJW3+orKvDq86T1SUssrEef3iPq2rz8f3vtTZrtizaR0pOvD8XephOG2959a
+ycJH60HBBxDBhjMB+L9/RY7WpT7jam3kkNNJwSs+/NSss0Bpi4+Jmpfxl7kPOQ2k7iCfyI/hQOwz
+/vUroqrUnceZ8LnIG2Cdaa61Dq54i7SVJi5ymGwdjSf/ANe/86s6W0TLvkNySp5pcVjBUy0oAD5x
+1P1NbDbPALTQjp/aC5bj+OS27tH+VOmjPDqw6QEv9lNPFcpIQ4p5zeSB0A/WtNYoXCwK1nOWgjwk
+sFrg2wuJjtKl5IJUBwPakLxDXbNI6/alaGW6b87uL1vjJCmAogjcvHTrnb8DpVnxj1q1oOS7b9PP
+j9qSEErA58gHuf8AF7CsStOurpBjKZioQqS6sqU+vlayepPvQytu3cgz/fEPWaXfFjYEfLlo5+bM
+/aurr+X33vW6lIJUD/dyen2p80zboMNG6NBEGOygJLy04cdAGRjjn5NYRD1NcjMMme8XpST6Q4Mp
+H0HStstF4kO2lMS5vAlTfq9O04PQZ+KifILaqg3PnPodS5o0S3I0q4x2T3Kr+obzH1HsjuFFpeUU
+B5s5Snck4ST0z0p502w5HZW86qW5lXLbpSeMfHFZH4gpFutbDlrmNtujlxvzc705HAHfB5qknVSI
+VliuWK7STcHVBL7Ticc8c8f70IaMaipWq4z+oo6jT2sr8ma3qCfBky48be4zvcAOB6gR/CMd6EXF
+m9EPKhx3Vx92EJdADmOmQKJ2y5xVpiJlW+OzPSj1LbSBtURyoGjFzWqPbHljClFBLbiBnHHUmpeT
+WdqiPISuDM/e0bark4YzkEJkJ9RebGF7u+T/AKVeg6DbVdXHJ6U/hi35KAlRGU44zj/WrtpdfSlt
+D7m54jKznr/WnOAVKa9Y7cGtDVWodhaH1WnVlD7cZxPhq3NMobbeBeZQnalKlZ47cUQDSGtvlqwn
+GEp7AVQdbddWQHkp2dOea6qWHQlPmJSscEE9aET/AJCK/X+JFxUtuKecHnKxx8VXRKiBSkuKII55
+PSvq4yUQmf3qspxwc8is71fqZMeKtTO0AHn3V8UaitrDgdmcdtoyZ215q1USShq0bZClghTYPqFL
+Vr0xH1otbt1XKZkpT6cccfOaF6SZkz7q7dZYWHjz0ykJp2Yvi4YaYVHdUXjs2eSUlR7HPt89KoW5
+p8af5D3OVLldz9GLmsNLR1WZiI+oJlRB5aHgBuKe2cdaxd5tVsuy0OJbdWwvkKGUq+or0PqiyXVy
+IJ7za1NlIJbz6m/fgdv61lN000qWJ09EWQ8++6lqM01k8geokY5p/wCK1RXK2Nn/AOz75PS1vStt
+Y594iCUnOauWi5SLXMDzIQ4g8ONOp3IcT7KHcVduWn7nbWg5OgSI6SopBcQUjPtzXK1RX1OqkMtb
+0xcPO9PSkHrzV0WKRkHM86a2BwZqFm0da9c2pdw0asM3JgBT9qdd2uNH+8y51x7A/rSjrXUmq129
+Om9TuyvKhu70NyUYd4GBlX8QofG1hcLbrBF/tZ/DvtqGEDhJQONpA6gjrXq61f8AS/jDo9mXNhNu
+nGxxPR2O5jkBXX+tY3bcFhPtoPAin4H6gsMTQgLEhtM7eoyGioBYI4Tx7Yx+pqUr668ILjZXDOtS
+XZsdvlMiGkJlND/GgYDg+Rg1KwUDHIM2r7Bgiei5NwiQo635cllllAypbiwAPvWO678c4UJuRH0y
+gSHkDBkrHpz2CR3+prHbXJ1L4o6matwkKaYP7xzkhthsdVEf8NLWrzbo94fh2RKjAjqLSHFnKniO
+Cs/X/KuLSAcN3OfYW5HUD3SXJutxfnTnVOyn1lbi1HJJNPnh9otyfbJF5lLabjpJQ0FjlZHUis9C
+lDOO9bdHkS4WkbXBlIMdaGUnyhwkjqFfU5pf5K566gqe+I98TpBqb9pnB/Q9wu7kdyOGUNNp3oWp
+Owq7+3P1r9uQmqllqS+S+ghClFWR+vtT/Z7goWGOopbjodwEltQOcdR16/WrcrTFmW4tyYZHmuDc
+dhwkDHSvNvq2BC2+up6PThdIzDvMypelJN2lI8+M9JKxsZS1/Cfcn2+tF9K6Oh6ZeW5fYS5VwKgl
+locpR3Cvk0+zJTdtioi2htDe5OVL/KAPcn3r5j3ZtdmkrKFTFJ3EDG7BAzgH9a+XX2sNi8CJXaZW
+c3GIN7u0u931+KwhaGGspKQMKcKepVV5UmU1DZZtzspMVKQXm3F5B+gHIH0zQCBImKuiJMeCuEH1
+YCfVkjv+bqSKr6t1U7a7uxEgurS0yMLBASc/arlenBULiSGtOSSY6WKJKXckJU2tplSt6FA7gfvW
+gxA/sUBggDGSayGya5ed8tkNqSlXVYOVVpEZydIablRFF6ORgjGFJPyKga3Tuj5Il2rVC6sKT1L9
+tiuPTnDI3eSfc/lqrqWOuHFK4qlF1HIX7j2NWIkyQ8XEApSUcD/Ea5TmZj2SggqUMKSrp9KUByQM
+T45U5mSS9UzJMtMZ93GFcqJ7UL8Q3UOOww24Bx6h3V8/Sqev0sx7u4IqkB5w8tJ4KFfNBXG3Fuo/
+FPqLxA3FXXHtXp9PQiBXXiTGZrmIjTo68qh+Y2ygPhYSAlXIBz1rYHp04RkNRnWDOA5KyEgDrgVh
+mmSmPcCfQpWCACnINFdRXOW3GQ4+60GgcJKDgr+R70lqdP8AZaAvuUK3woDY4mqyrjeFWppZZUXW
+lnzUlYCVp+K+LLeYEoLLG5lGdxQk4wcfyrOourlyIzbDhcKVNhHB7e9XYlxatbam0dVDOAOT96Rf
+TEDBHMMpU9dTQpVxiTWXGUqDy1n0hxCSAPvXnfWVtnWO9TI8lpLHnZOGxhKkE54+K1K1XhLj4S4j
+GOnxX5qiNZ7wlpd1Di30ZS0hKtu4kdCaN8fqG0luxhwYtrdOtqZXsTA1dTWh+B+unNG6tbTIWTap
+hDUhGeE56L+oP8qSbtBXDnyWSB+7WUnadwH3rgYT6IQmEpS0VbU5WNyj8DrXr/F1/ueXIZT1P6Hh
+aVoSpJBSoZBB4IqVjPgP4ii72eHZLsSJrCPKadP8YA4B+cfrUpMgg4jK8jMybw5vUfT/AIXatujD
+iRc5S24DX95KVAkn/P8ASstODk9asPSXvwZbUEoQpzhtIwkYHt9z1q3NZiO2uNMhFLbif3chkryc
+9lAHsabbAbP5i6DI/qctPSokW9w3p0cvsIcBLY7+2fituuVxYvDbAMZ2VIUkeX5I5x3Tgdqznwz0
+xbb/ADZQuy3w2y2FISycHJz3+MVtWnNLwNMb3G0SZDvlgb3DlWPgf86V5/5e+oOAc7l/9y18WLK/
+IdH/AHB+l23bLPLMl0RkyQS22r1eWQO/tR178NEju3GS8ZahyVIc7ewA4qpKKfxzTMOGHCsBZSob
+ueveitut+XGo8tpDacEp2DAP69ahNYHO4yo1rMxJgt22RLy0l5bYQ04jckLWfM+o7frVPUMpdg0a
+65EfXvaX5XOArnp9hTtGgRbcyhL6PPbaG1ClnJAPvWeeMl0FogwnWGYkqKHSFxnUkpSojgkD79aJ
+pQbblr9ZgNRcAhMzli9zZYfS27NkPBIKAFKVnnkn2pf1PaZbMNm4PpkDzeV+c0UEK+p6/WtX8H5M
+GXDm3OS22Jq3P/W2AlIHwOgFVPF+VBfjqKi4sEHBKSAVfFegXWsmo+pV4zJZ0wareTFbw71Y1Ab/
+AAjbcNh1Q/8Ae9yaYU33VESW5KdK1wucuMpwgj3FYq4S456E7VDjimGHqa6wYqIS5HmMq42LOQBT
+Wo0AYll5z+YCjV7MA+puVmuDkgh7evZt3bsdK46s1uiNZSY6iHwSj82CPnFC7PcbdbdOxkPTiqaB
+5iQlXCf61mV9uC79dn39oDIVztGAajafRK9pPoSrZezKAOzKclyXcLgue8VLUo7sHrUaVIfeCloG
+T0Uo9qstKdbcBLZUg9DiuzkbY4VDIBGQkdBVkuBxOrRtAwf7naKlyMoqQ4pRI9RHH2qtc1/i/KS+
+p3yWchtKwcIzX7HnoQv1nbgYUR7+9NESXCmR1xdjexxOXCTg9ODSzO1bBiJvCsCBFu3eahwltCnA
+O6ATj6082K2rlltyXGSsIGEhzPP1xQa1QJNngLmMuNPMrPKE5BwKuzrw6Yu6JJVGWkZSkHIXn274
+pe8m0+H+51G2DBlu4J/DzFKbWhICiS2EgH7H2FD3JTMuclt7B2ArBzgJPvQNF1lSUFoON5JyST1P
+tmgEu5yY0wgJ2uoUd27nPtRKdEzHk8xezVLUnHudtXsRYc4rt8pxZdKvMSpWcH60M07a03W5JZcW
+UtgFSj8Dt96orKnVKUQVK6nv966R5b0dCksLLe4gkp68dOatKjBNgPMiM4Z9xHE1fwCkQx4pqYdC
+vJcC1RwT0WkZH8s1KVPDm+Psa208ogAtysqWOqyo4JP2qUtanPM2jDEL+OWn49u8R5UK0MbGClDg
+bSOApYyQPvSzM0rKt9qiXCRs8uSSlCeQoHnII+1aJ/aAZWjxImL3FILTSwR/+RX7bhqJ561XC5Jj
+O20pSnyFYJWMZypJ6djWLdSa1BzxDUaYWnaOzH/RlmZ0nYWPJab9SQqS5t/eLV2+wzj7UfZmouM8
+MNtlsNoKlFZAV8H4FULPfmrmtyCtwJfQjKggFIVx2orHsbUZ1TzCktFwfvVKJJUB05968jqHaxyz
+y3t+sBeiJJTLSXA6hAWscFSTjke561yfkAlte4h88BIJwB3q5Hjx297RUpWfUD+YYqs5Gjx3HJJK
+ywRylIGM+/vShBMIrDMtpKiyVKcWtvaP3aRnn3HevOfi9eZM/UEiEv8A7eOHgkhfT0jg4+5r0JJu
+ENLad0plpWM9c8dqUtTaMtGoJS37gyXH3UANyEHH6iqXx99entD2CK31m1CqmZZomd+HjORbXte8
+hOVLSk4USeTRm4xrvqbTjseUGmozTmVPLH5fgfNNNhYtWmJardbw3tf59XqIwepNM2poyJVpdKEt
++SRuCR/EfemLdWou3oO/cJXVmsI08z3BiFp7UakMuonR0jk47+31oG7iTM/dkNoWvCdx/KCe9P8A
+dIzR1PAZfjtI3gx3QsAJHznFKOqbfbbXKSzbriZrwJ8390UJRjpgnrXpdNeLAM9kSDqKDWT+AYcu
+1ivcK2x1KdiyYSejrCgSnPZXehTLqou7cghKRkgd6Px9SWp2xsMT23HF7QgpaOCFDoaCxFee4UKC
+gCT14P3oKs5B+xccx+kIpG0wlaJKZLB9KglB5Uo9KsLeDj2GzjI+1AjmPLH4ZzCVEApPAIopGCFR
+1rSpW4naaFbWB5DqUabMnaYEuTGyc40le4deO1fMZam17krwAOua7yYjyZCiG8hZ65ya57WW3W2y
+lS3FDkFW0CmgdygdydZ4MT1HezzUy4iCwVKLKcFtSuD74r9uVtRJabLZ8obckpTlP60ItSLXOeDT
+KlR1spG9W7clw/ejN4mXa0MDYA9FLn7olIxtxyFCprVkWbU7/cY+0FNx6/UU70GYDBQw6FrUcAgH
+ke9Lq3FHkkk980xXedHuYWt6D5L4A2rQrCQO4xV+yaaiTrW5JL29GRgflUCOoJ5wPmqaOKUy/cl3
+Zufw6itbriuAJHloSVPNlvJ/hB61RCwVAKPHc1YubQZmvNpSlKUqIACtwH371Tzk/FOKAeR7ibEj
+g+o06QWy7riziG2pDf4lsJCjknnrUrv4TtIe1/ZQ50Q+Fk/TkfzxUpW7ggQ1a7xmbF/aGsKEX83N
+U4IU8wFJZWMbtvBwf04pOieITadOMxXmWRJR6CsD1HHTH2xWx/2irAu9aJTIjJJkQXgsYHJSrg/6
+V5os1rjsynVXOQY8uMsER1t8r+M9j0pSymu1P/J6j+ktatxtE23QtvmwYar3cX0JjyE+hhQ9ROeC
+a0CJJaLTe+Uhfm/l7/YUhWKUxfbKxCztdQkJStWdySf7o/rTHZLC7bW3g5M819Y2pLiPy/TmvLak
+AsSeCPUp7i1hB6h+Ytbnl+US2AfVx/nXyWg4kpeOQ4CPT2FVX0JacS6qWpASnC0qIINDLlKKGyGp
+QaLmADgYA74xzSY7zDpWW4Eq2e0N2yXMdmKS6twlCUO4IQj3+po86RGWzGjtNgO4AATwlPXNAmPK
+dLanH15K04SEE5x7GrsGWLnclJ9SHGuCrOCU+1E2s5zNfSE/7mJniFFciyHJ6XEktoIylWBjPPHv
+SnC1HKlFK25Kls7cBpSvy4PtWwXHSsCXIUqUt15Tg2qStfpx7kUIc0JZIqHlpGwqTgFJxgZzx809
+XfWE22DJgwQD49TGr0pN2nlL7i2JKjvC1DCc9qUtRR47sjLQWiYkYdbX0PyDWwax09bZpcZtpdbl
+FJO5aztJxkD46Vl83TclMT8SlDjh28lIJwfY/NXdDqK8Ag4iGsosYHK8QVKiRIztv/BqccWUhT6l
+jASruBVpEoKkOAYLhJO0D9KGIUoqQ2vucYPaidptb0i6lCMNt8lSlq/N8VRcDblz1J9Tbf4CEGYb
+rzbjiEBLqQQAtQAzUs7jrqnGFNJy0fUMcA/WjlutUySrLT0dLGw5C08hQ6fbNCrTBuVlubjjkJ58
+pJwU5Lef72B1pQMLFYZGY0bHQggS7KYUw35ivUlXU9xSfdCp5QWltSUp/iPfNaBLtv4KGiVOkYcf
+X5imS2dyE9uM8DvjrQc2hyYsg+WGSfSQKxRatfJMLepvXA7iilxtKmlMJcQ4nlSlKzn7U4wbou7Y
+RK9SGeUpzjJPciuLmi5ayDF8t3nsrHFfFx0lcbeSptYWhKUlS0EjBP8ADR2votx5DMSFF1eRjiGF
+OWuK4mO+y2lTyFIWpw5SCeivgZpNuCzBU4zEmBbTnUtq4UP+ZoxaNIXG6So5ebX5C3NillXQd/pV
+zWlmYtEJmEiARLz6XEerf78jrXy3VK4XO4mDsSzbwMYiQI8iQlx5tpa2kfmWBwK4BKVdDiicpq5t
+NGItl1DbbYdUgDgAjO40JZSpxwBA5zVBDnn1EnGD+5rn9n+1pXeZlzcQFIYbCEEjoo9x9galN/hp
+BFn06wwQA89+9cPfJ7fpUpG072zHql2Libtf225NukRX+WnWyhX0Iry9drM3ar2i4XN0h6BKS28r
+O5TiByleD8Yr0ldJyHWtyOD0UKzHW9taloXM8jzkhBbkN4yVt+4HunqPvQXBxkTqH1E2dck2u5wp
+9rUW0yiVPKCdwQgkYJx361pca9NSGG3C5kIR6nkD0g/Ws5uMMT4DJtFyZTCdSlAjlsJKTnHpP+hr
+hapk+yxP2fNW7+DeSrAIyN3uP0qJfQtij8/9lPTlkznmPNwdh3FgILzgcK/3bqSfUfZQpW1BMuNr
+hKeeQlCyrCWeu0DjdXL9oW2NAadjuLbdj4UFBQIWoe6Scg/NEo5cu81h+5JAQtvcgdE++Tmlvr+o
+5YZEbpvstyvRlPSGtFvNJjzox4JKHknHP0pq03c2GlTAp5j8Spw7d5CVEYHANL9xsrTbMibHUCUJ
+IKEt8JPvxSey4ZylLX/8yOSMbqIK67stXwIT0NxyZubSDKUX1lbawkAZ9u+KHXeez5ja3HwhpPxy
+D2HNZu1rG7W5zeqS0EgbUggHA+nvVaNqOXdr5HVNcQhCV71BKQNx7ZzxQxoW7PUIgGcmNs6SqW+W
+2hvdc53qRgkHgc0YsdpVGgluSGygrUdqQClJ+TXVu2sSSu4x3PxD20qDa14yccAe2KruPvNw23Lg
+z+HDytqh1Chjoo9utAJ9LC22h0CqMRc15omyXhCnLc0mLc0c7mcBKiBnCk/PuKy646YvkCU0qLuL
+iWylQUPyE9cH5/WtkRLs0VhTLzqW22sEqLm5xXPTjtV2bLt88sttrCSpQxsOSCPeqGn191ACnyH7
+k27RI/K8TFdFOOYcTcAWENqIcUpJBz23DvTqvWMRElm3uQiUpIQ08BgJV259qdFWjzorsd8RXQ7k
+KJHCh7E9yBWWatszVpmsKRuCRgJTn0g5P9KKt9WrtJYYM+q07IgQGWpsNN/lsTH5W7yF7H22+Nqc
+ZJz84r8sMda284IRztBHal19yRbslgltMjKVA01abvCmLamK6AprbtGeoo1ysKwF5Eao0TsxK9xu
+03BS6hS9gU4DzkUWj26G4osKbSpRysBQJGaE2W822NHDbyngM7s4wM/avmZqdhrelhorSoEbxknn
+5qVtctnEOdLZnkQvKjIhuNojNZyraQMYTx1PtXzeYMZtDS30IS4lQWhWMkH4+tIxvz8GT5iQt1Bz
+vSoHBPbNVjPvGo33HWnSEsgqTgcE9NtMJpWyGJwJ9dQVGOxAGt9QruazbYxQGMAOOjBUo9hn4pf0
+vYiu7AvEKQ0rcQOh9hX47bJMW5qjlrCyohKSoEgfOKboflWmIhhsb5S+Sfk16SsCmsLX1PLWoXsz
+Z2I6QZ3kBKc5dPGPapSw28qMn1q3PK/Mc9PipQ4YVMwyJt2oHV2uZuGVML/mKoKWlwbkHchQ4qkN
+ZaevsQxzcmQsj0byUkH71TgOvRVqbeG6Ks+l5PqSD9RXxBioihqTS8Vm7JlNyHGIqlZWWujDmQQr
+H9339q/bihUVLqVvh1ak7S6g8KHwO1OshQIIUAoHg96z7VdpkxIEw2chTDqTmOr/AOZ90Ht9KWv0
+7WkYMf0Oqr075sXIgLTkZl7Uy1zZCQhpsuDOOuQOa05NvYkS0J8h1UUDd5w5UOOAfisK026yJZj3
+YOR3i56XRzkn+EitUsN4uEvEeCpDCGlEOL67ldMikfk6HUg54Ef02pS9i6jEcLpcGUMLSW9iU43J
+6EjH+VZ9NuLDmQqCIsdxR7e30rQWNPKaebmOTVrdXysq5C+OhFfcm129Y/7ptghJ3JKU8j6VLqtS
+rvmNFNx4mNXGMy6jEQqeUF5V8D2oS63JalpaQdrhxjdyQK2O6Ls8SOGm0hO7ohKeVH2FIl205Pdd
+cmMskrICkNg+pIz0IqrptWGGDwP3M3VhFye4w2hmVGYaUmUUsrwcpOSn5xTpcpUJu1vOmQpwObUK
+S6njfnjjtzWOu6iu3luRnIhQGTtJHBB/pRq1u3G5hhKFlIVneVdz9+lKXaRgdzkCdRxYMg9S9qB+
+A/MS0tpYIVudaZTgOqwAPtUdjTkORXGmhHbKgltKVBJSMd+9Mtv/ABrcWRFLUdxATl0lGFlWOx7/
+AAaEOJhuLZipYdksr6BokraVnnd7VhbOl7xBfWwctnj8T9m39strVFa9aMggZKlK+lLGpXLhc47d
+smsKjlSgpJWg5A65B7dfrWk2vTdus8p+clS1vYyEurB2H+pqs9erVc32zJIbeZXtS2oZO8fH+tap
+sVH3VrnHucXftIeZf/0zdZDYbKlPlpJWVnkZ7D704WLRhTbkOzg6XVpxsB2+Wfr3p0hzIylPPtth
+KEr2uFQxuI7ChV61IhaTGay24okBST0J6GutrLLPACMJY6DxMze/Ldtdzcik7gnlJ+DVJF2KTlVO
+0O2M3WK8mQ0h5/HoIOFdepPalq5aTuapziQhptrPUkHA609VZW3i3cbHyRVfKU03RLishXIpfVqe
+Q2lyJC/dZWQpfzmqF5f/AGdcSw08hwJxnb3V7CqcNl5qWp6U2lKRnYnOefeqlOjQDcw4kX5D5g2Y
+Wn13GOKsQklxR8yU51UecUSt+5GX3vU8rue1CbeypxfnO/YUWB9jRGIHAiVNZc72lgLJVzzUrmg1
+KFiOjjqIwUpPKSR96KWnUl1tLoXCmOt+4CuD9qFlOe9fm3nrT5wexPN5I6msWHxHjzili+Nhlw4A
+faGBn5HSmicCI6X2loeiufkeb5Sf6GvPqknrTJpPVs2wPbMh+EvhxhzlKh9KA1XtYZbM9xj1Laos
+/K1ICHv74/1qnbryuwBtCIYQgDatbayQv5wehpnu8NiXaBebK6X7csgOIPK4yj/Cr49jSbJXwQel
+BesWLseGrsNTbkjx/wBWQ4FvYfdntLW8NwZC8qT9RQ9Gq3bo8ERlBDajgrJ/KPekB1ltLqZCAlK0
+HcCUgjP0NfIuy1Tg+yw2y4kEL8kYSv52nj9KSPxNQ/jyZRr+UYfyGJt+nm7Kje95pflEAFxR6H/C
+DQW+OSocpBjL/EFZOHmzyR7GkzSl9ZLr5uE2LFBOPLWlWSPccYFaxpS8WZlP4aEpDri8OKO4KBP+
+lTL9NZQ/kMxg21agBi3MXo9ulOvB1uC8p0j1LV0PH86JQ7QpiSh94mO3tUFBSeMn2zTsJjKFrde8
+g8DbsIJA78VzbuEd6MVLaSWFZSCUZI985pRnJjCviI2nbncJNzXDUhL7aSU5C8J2/OKcbTaodsU7
+K8hLL6zuUndkA/GaU7tM/ZUlQjBlu3bdzbkdHKTnkE+59qU77q+4zISmGY8lbyVH96hKjlPHHFGG
+me0+HAM7bcmMxv1V/wCQkLFvcdxzktd6RbNDC71lDgbS2dy3F9sHmh8PVF5ZQtEdteFDar0eof0o
+8q7abXHYNxdDEhgYUUnYpffkdxmqFelspGMZz+Io2qQ+51v9/wDw7KkwZflxlElIKgTnPJNcH7mz
+Asjbi1smU8QouE/PBH2pd1DreyOwnojMGPIK8+tLe3HGAfrSE9cVrjtJjFfozwv1bfpnj+VOaf40
+so3DETv+RReF5m53LUNis0Bp9ExK3QkAoQ5nPfisq1druXd3CmMVtsDITlXOPn3pcMGS/HW84VKd
+zwF9SKFKCs7T27U/pvjqaju7Mm6jW2uMdCE4tsukyI5cmY77sdtYSt4DICuoBNMFoWiapJcVhY6o
+V7138N9XK0/JWw42l+BIT5cmMv8AK6jv9COxpi1XpBtE2LctJvfi7bOBdbAI8xrH5krHYj370zaf
+R4gqCQwxzOCMJGE9K6A4rm20ttnDysuJ4OBxmq0uWllv08rNIjyOBPRsCg5GJLnODDZQg+s/yqUs
+zJKlqUVHJNSmkqGOZOt1TBvGfZIxkVwWsg1KlaEmT8DhxX7u3dqlStTka/D3Ur2nrylKkfiIEr9z
+IjK/K4g9fvR/xBsyLDqF+IwsrjqSl5rd1CFjcAfkZqVKHYIZOonyclpZz0oeygoUpWetSpWVmz1O
+c6Ol9o9lDoaBIkPMOZS4obTg4URUqUzWAeDE7SVPEYrXrSZb30ORGwhwDG4rUr/M0SXri+SpYcYu
+EiMMcJbVx9alSgtpad27aMw6ai0pjdKFz1nqJuSn/wAtIJIznj+lfQu11VueVdJm9weohwjNSpWj
+UigYAmfsck8wPPlPKz5jzyz33LJoOt1SieSB7VKlGQQDk5n2w35qwCaYLbEQEBwgY7CpUrlphaAC
+3MIkBKc0DuUUKC5CcJIPI96lSh18GH1AyINiI8x9CM4x3Fat4f6okWOY0qKkFv8AKpCgCFp75qVK
+xqfUY+MUENmMmv7bHbDV5tqPJjTFcsK6pVgE4+Kz68xy41vZUEKPvUqUovDyufKjmfrVmYbiHd6n
+cbis+/WpUqUcMZKdF44n/9k=
+
+------=_NextPart_000_001F_01C8D3B6.F05C5270--
+
diff --git a/test/unit/mail_handler_test.rb b/test/unit/mail_handler_test.rb
index d0fc68de8..6bb638f21 100644
--- a/test/unit/mail_handler_test.rb
+++ b/test/unit/mail_handler_test.rb
@@ -20,38 +20,52 @@ require File.dirname(__FILE__) + '/../test_helper'
 class MailHandlerTest < Test::Unit::TestCase
   fixtures :users, :projects, :enabled_modules, :roles, :members, :issues, :trackers, :enumerations
   
-  FIXTURES_PATH = File.dirname(__FILE__) + '/../fixtures'
-  CHARSET = "utf-8"
-
-  include ActionMailer::Quoting
-
+  FIXTURES_PATH = File.dirname(__FILE__) + '/../fixtures/mail_handler'
+  
   def setup
-    ActionMailer::Base.delivery_method = :test
-    ActionMailer::Base.perform_deliveries = true
-    ActionMailer::Base.deliveries = []
-
-    @expected = TMail::Mail.new
-    @expected.set_content_type "text", "plain", { "charset" => CHARSET }
-    @expected.mime_version = '1.0'
+    ActionMailer::Base.deliveries.clear
   end
   
-  def test_add_note_to_issue
-    raw = read_fixture("add_note_to_issue.txt").join
-    MailHandler.receive(raw)
-
-    issue = Issue.find(2)
-    journal = issue.journals.find(:first, :order => "created_on DESC")
-    assert journal
-    assert_equal User.find_by_mail("jsmith@somenet.foo"), journal.user
-    assert_equal "Note added by mail", journal.notes
+  def test_add_issue
+    # This email contains: 'Project: onlinestore'
+    issue = submit_email('ticket_on_given_project.eml')
+    assert issue.is_a?(Issue)
+    assert !issue.new_record?
+    issue.reload
+    assert_equal 'New ticket on a given project', issue.subject
+    assert_equal User.find_by_login('jsmith'), issue.author
+    assert_equal Project.find(2), issue.project
+    assert issue.description.include?('Lorem ipsum dolor sit amet, consectetuer adipiscing elit.')
+  end
+  
+  def test_add_issue_with_attachment_to_specific_project
+    issue = submit_email('ticket_with_attachment.eml', :project => 'onlinestore')
+    assert issue.is_a?(Issue)
+    assert !issue.new_record?
+    issue.reload
+    assert_equal 'Ticket created by email with attachment', issue.subject
+    assert_equal User.find_by_login('jsmith'), issue.author
+    assert_equal Project.find(2), issue.project
+    assert_equal 'This is  a new ticket with attachments', issue.description
+    # Attachment properties
+    assert_equal 1, issue.attachments.size
+    assert_equal 'Paella.jpg', issue.attachments.first.filename
+    assert_equal 'image/jpeg', issue.attachments.first.content_type
+    assert_equal 10790, issue.attachments.first.filesize
+  end
+  
+  def test_add_issue_note
+    journal = submit_email('ticket_reply.eml')
+    assert journal.is_a?(Journal)
+    assert_equal User.find_by_login('jsmith'), journal.user
+    assert_equal Issue.find(2), journal.journalized
+    assert_equal 'This is reply', journal.notes
   end
 
   private
-    def read_fixture(action)
-      IO.readlines("#{FIXTURES_PATH}/mail_handler/#{action}")
-    end
-
-    def encode(subject)
-      quoted_printable(subject, CHARSET)
-    end
+  
+  def submit_email(filename, options={})
+    raw = IO.read(File.join(FIXTURES_PATH, filename))
+    MailHandler.receive(raw, options)
+  end
 end

From 3d8d4fa0d6cc945f18b90c139069e8c806e72668 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 22 Jun 2008 12:27:00 +0000
Subject: [PATCH 546/710] Adds a rake task (redmine:email:receive_imap) to read
 emails from an IMAP server (#1110).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1569 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 lib/redmine/imap.rb  | 43 +++++++++++++++++++++++++++++++++++++++++++
 lib/tasks/email.rake | 38 +++++++++++++++++++++++++++++++++++---
 2 files changed, 78 insertions(+), 3 deletions(-)
 create mode 100644 lib/redmine/imap.rb

diff --git a/lib/redmine/imap.rb b/lib/redmine/imap.rb
new file mode 100644
index 000000000..d09832c2e
--- /dev/null
+++ b/lib/redmine/imap.rb
@@ -0,0 +1,43 @@
+# redMine - project management software
+# Copyright (C) 2006-2008  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 'net/imap'
+
+module Redmine
+  module IMAP
+    class << self
+      def check(imap_options={}, options={})
+        host = imap_options[:host] || '127.0.0.1'
+        port = imap_options[:port] || '143'
+        ssl = !imap_options[:ssl].nil?
+        folder = imap_options[:folder] || 'INBOX'
+        
+        imap = Net::IMAP.new(host, port, ssl)        
+        imap.login(imap_options[:username], imap_options[:password]) unless imap_options[:username].nil?
+        imap.select(folder)
+        imap.search(['ALL']).each do |message_id|
+          puts "Receiving message #{message_id}"
+          msg = imap.fetch(message_id,'RFC822')[0].attr['RFC822']
+          if MailHandler.receive(msg, options)
+            imap.store(message_id, "+FLAGS", [:Deleted])
+          end
+        end
+        imap.expunge
+      end
+    end
+  end
+end
diff --git a/lib/tasks/email.rake b/lib/tasks/email.rake
index dbdbe71fc..01407c36d 100644
--- a/lib/tasks/email.rake
+++ b/lib/tasks/email.rake
@@ -15,7 +15,10 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
-desc <<-END_DESC
+namespace :redmine do
+  namespace :email do
+
+    desc <<-END_DESC
 Read an email from standard input.
 
 Available options:
@@ -25,13 +28,42 @@ Example:
   rake redmine:email:receive project=foo RAILS_ENV="production"
 END_DESC
 
-namespace :redmine do
-  namespace :email do
     task :receive => :environment do
       options = {}
       options[:project] = ENV['project'] if ENV['project']
       
       MailHandler.receive(STDIN.read, options)
     end
+    
+    desc <<-END_DESC
+Read emails from an IMAP server.
+
+Available IMAP options:
+  * host      => IMAP server host (default: 127.0.0.1)
+  * port      => IMAP server port (default: 143)
+  * ssl       => Use SSL? (default: false)
+  * username  => IMAP account
+  * password  => IMAP password
+  * folder    => IMAP folder to read (default: INBOX)
+Other options:
+  * project   => identifier of the project the issue should be added to
+  
+Example:
+  rake redmine:email:receive_iamp host=imap.foo.bar username=redmine@somenet.foo password=xxx project=foo RAILS_ENV="production"
+END_DESC
+
+    task :receive_imap => :environment do
+      imap_options = {:host => ENV['host'],
+                      :port => ENV['port'],
+                      :ssl => ENV['ssl'],
+                      :username => ENV['username'],
+                      :password => ENV['password'],
+                      :folder => ENV['folder']}
+                      
+      options = {}
+      options[:project] = ENV['project'] if ENV['project']
+
+      Redmine::IMAP.check(imap_options, options)
+    end
   end
 end

From 268165a013ebf6734aa377cf62ce0a4f8b894921 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 22 Jun 2008 12:37:24 +0000
Subject: [PATCH 547/710] Fixes reply attachments handling.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1570 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/models/mail_handler.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/mail_handler.rb b/app/models/mail_handler.rb
index 03e48e170..7b85077e1 100644
--- a/app/models/mail_handler.rb
+++ b/app/models/mail_handler.rb
@@ -103,7 +103,7 @@ class MailHandler < ActionMailer::Base
     raise UnauthorizedAction unless user.allowed_to?(:add_issue_notes, issue.project) || user.allowed_to?(:edit_issues, issue.project)
     # add the note
     journal = issue.init_journal(user, email.plain_text_body.chomp)
-    add_attachments(journal)
+    add_attachments(issue)
     issue.save!
     logger.info "MailHandler: issue ##{issue.id} updated by #{user}" if logger && logger.info
     Mailer.deliver_issue_edit(journal) if Setting.notified_events.include?('issue_updated')

From 8b33565b3e7bbca7ec2ef4aeedba4eb20cb66bdc Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 22 Jun 2008 12:56:10 +0000
Subject: [PATCH 548/710] IMAP: Mark emails as Seen.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1571 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 lib/redmine/imap.rb | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/lib/redmine/imap.rb b/lib/redmine/imap.rb
index d09832c2e..aceb75cb2 100644
--- a/lib/redmine/imap.rb
+++ b/lib/redmine/imap.rb
@@ -30,14 +30,22 @@ module Redmine
         imap.login(imap_options[:username], imap_options[:password]) unless imap_options[:username].nil?
         imap.select(folder)
         imap.search(['ALL']).each do |message_id|
-          puts "Receiving message #{message_id}"
           msg = imap.fetch(message_id,'RFC822')[0].attr['RFC822']
+          logger.debug "Receiving message #{message_id}" if logger && logger.debug?
           if MailHandler.receive(msg, options)
-            imap.store(message_id, "+FLAGS", [:Deleted])
+            imap.store(message_id, "+FLAGS", [:Seen, :Deleted])
+          else
+            imap.store(message_id, "+FLAGS", [:Seen])
           end
         end
         imap.expunge
       end
+      
+      private
+      
+      def logger
+        RAILS_DEFAULT_LOGGER
+      end
     end
   end
 end

From 8b6dd3fdcd5c5d0d52cab2d22623971c1adb1944 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 22 Jun 2008 13:14:45 +0000
Subject: [PATCH 549/710] IMAP: fetch unseen messages only.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1572 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 lib/redmine/imap.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/redmine/imap.rb b/lib/redmine/imap.rb
index aceb75cb2..a6cd958cd 100644
--- a/lib/redmine/imap.rb
+++ b/lib/redmine/imap.rb
@@ -29,7 +29,7 @@ module Redmine
         imap = Net::IMAP.new(host, port, ssl)        
         imap.login(imap_options[:username], imap_options[:password]) unless imap_options[:username].nil?
         imap.select(folder)
-        imap.search(['ALL']).each do |message_id|
+        imap.search(['NOT', 'SEEN']).each do |message_id|
           msg = imap.fetch(message_id,'RFC822')[0].attr['RFC822']
           logger.debug "Receiving message #{message_id}" if logger && logger.debug?
           if MailHandler.receive(msg, options)

From c107fee54e453cf35081ee5046b878ac719333b0 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 22 Jun 2008 14:35:56 +0000
Subject: [PATCH 550/710] Use new image instead of expand.png

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1573 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/queries/_filters.rhtml |   2 +-
 public/images/expand.png         | Bin 266 -> 0 bytes
 2 files changed, 1 insertion(+), 1 deletion(-)
 delete mode 100644 public/images/expand.png

diff --git a/app/views/queries/_filters.rhtml b/app/views/queries/_filters.rhtml
index ec9d4fef6..c9d612364 100644
--- a/app/views/queries/_filters.rhtml
+++ b/app/views/queries/_filters.rhtml
@@ -78,7 +78,7 @@ function toggle_multi_select(field) {
         <select <%= "multiple=true" if query.values_for(field) and query.values_for(field).length > 1 %> name="values[<%= field %>][]" id="values_<%= field %>" class="select-small" style="vertical-align: top;">
         <%= options_for_select options[:values], query.values_for(field) %>        
         </select>
-        <%= link_to_function image_tag('expand.png'), "toggle_multi_select('#{field}');" %>
+        <%= link_to_function image_tag('bullet_toggle_plus.png'), "toggle_multi_select('#{field}');", :style => "vertical-align: bottom;" %>
     <% when :date, :date_past %>
         <%= text_field_tag "values[#{field}][]", query.values_for(field), :id => "values_#{field}", :size => 3, :class => "select-small" %> <%= l(:label_day_plural) %>
     <% when :string, :text %>
diff --git a/public/images/expand.png b/public/images/expand.png
deleted file mode 100644
index 3e3aaa441ffe1779acb1434f30f6d3560bd485d4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 266
zcmeAS@N?(olHy`uVBq!ia0vp^oFL4>1SIo6Pjm-T>?NMQuI$%%IC<pNma(<Uf#eH3
zB8wRqxP?HN@zUM8KR`j2bVpxD28NCO+<y{Tf&7`CE{-7;w{rWug$^0;IHxXsY8=!5
zkU^$Hd&Ba>U%k`|lb-N-@9}(-9=Yl1*8@9T&e%k(&3<@N>4d`(m4dx@7xJ@T5H#NO
zXRnQ>E7R0%mG5LP@D(}D^=e(%EA`^ah6Bf^#mHG5EfSc~?-rF<_+Mr6PMfGwO_pOF
z4}aVZ)v`UhLEn$5_2t~$W3A1TzpveDD#~>2n~h*scl}q^d#8N9$UEmZ0UgQU>FVdQ
I&MBb@0GV%N-v9sr


From b14aa23c8cf2cb35b863cbd41fc6c0d1286161aa Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 22 Jun 2008 14:40:45 +0000
Subject: [PATCH 551/710] Revision view: do not display links for deleted
 files.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1574 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/repositories/revision.rhtml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/views/repositories/revision.rhtml b/app/views/repositories/revision.rhtml
index 8d994ef7f..527ae6dcd 100644
--- a/app/views/repositories/revision.rhtml
+++ b/app/views/repositories/revision.rhtml
@@ -47,7 +47,11 @@
 <% @changes.each do |change| %>
 <tr class="<%= cycle 'odd', 'even' %>">
 <td><div class="square action_<%= change.action %>"></div>
-<%= link_to change.path, :action => 'entry', :id => @project, :path => change.relative_path, :rev => @changeset.revision %>
+<% if change.action == "D" -%>
+    <%= change.path -%>
+<% else -%>
+    <%= link_to change.path, :action => 'entry', :id => @project, :path => change.relative_path, :rev => @changeset.revision -%>
+<% end -%>
 <%= "(#{change.revision})" unless change.revision.blank?  %></td>
 <td align="right">
 <% if change.action == "M" %>

From b025b63111089a5048f4fef5af30c98c0de26b8a Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 22 Jun 2008 15:20:59 +0000
Subject: [PATCH 552/710] Hide 'Target version' filter if no version is
 defined.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1575 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/models/query.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/models/query.rb b/app/models/query.rb
index c19bb8d7e..77893bcf8 100644
--- a/app/models/query.rb
+++ b/app/models/query.rb
@@ -168,7 +168,9 @@ class Query < ActiveRecord::Base
     if project
       # project specific filters      
       @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.sort.collect{|s| [s.name, s.id.to_s] } }
+      unless @project.versions.empty?
+        @available_filters["fixed_version_id"] = { :type => :list_optional, :order => 7, :values => @project.versions.sort.collect{|s| [s.name, s.id.to_s] } }
+      end
       unless @project.active_children.empty?
         @available_filters["subproject_id"] = { :type => :list_subprojects, :order => 13, :values => @project.active_children.collect{|s| [s.name, s.id.to_s] } }
       end

From 0d5b03bab7338da4a5c456f21d18dd09308e0d8a Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 22 Jun 2008 15:35:11 +0000
Subject: [PATCH 553/710] Add filters on cross-project issue list for custom
 fields marked as 'For all projects'.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1576 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/models/query.rb             | 49 ++++++++++++++++++++-------------
 test/fixtures/custom_fields.yml |  1 +
 test/unit/query_test.rb         |  6 ++++
 3 files changed, 37 insertions(+), 19 deletions(-)

diff --git a/app/models/query.rb b/app/models/query.rb
index 77893bcf8..4c72e23f2 100644
--- a/app/models/query.rb
+++ b/app/models/query.rb
@@ -166,31 +166,20 @@ class Query < ActiveRecord::Base
     @available_filters["author_id"] = { :type => :list, :order => 5, :values => user_values } unless user_values.empty?
   
     if project
-      # project specific filters      
-      @available_filters["category_id"] = { :type => :list_optional, :order => 6, :values => @project.issue_categories.collect{|s| [s.name, s.id.to_s] } }
+      # project specific filters
+      unless @project.issue_categories.empty?
+        @available_filters["category_id"] = { :type => :list_optional, :order => 6, :values => @project.issue_categories.collect{|s| [s.name, s.id.to_s] } }
+      end
       unless @project.versions.empty?
         @available_filters["fixed_version_id"] = { :type => :list_optional, :order => 7, :values => @project.versions.sort.collect{|s| [s.name, s.id.to_s] } }
       end
       unless @project.active_children.empty?
         @available_filters["subproject_id"] = { :type => :list_subprojects, :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 "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 }
-        else
-          options = { :type => :string, :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?
+      add_custom_fields_filters(@project.all_custom_fields)
+    else
+      # global filters for cross project issue list
+      add_custom_fields_filters(IssueCustomField.find(:all, :conditions => {:is_filter => true, :is_for_all => true}))
     end
     @available_filters
   end
@@ -368,4 +357,26 @@ class Query < ActiveRecord::Base
     
     (project_clauses + filters_clauses).join(' AND ')
   end
+  
+  private
+  
+  def add_custom_fields_filters(custom_fields)
+    @available_filters ||= {}
+    
+    custom_fields.select(&:is_filter?).each do |field|
+      case field.field_format
+      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 }
+      else
+        options = { :type => :string, :order => 20 }
+      end
+      @available_filters["cf_#{field.id}"] = options.merge({ :name => field.name })
+    end
+  end
 end
diff --git a/test/fixtures/custom_fields.yml b/test/fixtures/custom_fields.yml
index 3a9e79a29..9d88bc6fb 100644
--- a/test/fixtures/custom_fields.yml
+++ b/test/fixtures/custom_fields.yml
@@ -30,6 +30,7 @@ custom_fields_003:
   min_length: 0
   regexp: ""
   is_for_all: false
+  is_filter: true
   type: ProjectCustomField
   max_length: 0
   possible_values: Stable|Beta|Alpha|Planning
diff --git a/test/unit/query_test.rb b/test/unit/query_test.rb
index 147bfbea3..3f77cd835 100644
--- a/test/unit/query_test.rb
+++ b/test/unit/query_test.rb
@@ -20,6 +20,12 @@ require File.dirname(__FILE__) + '/../test_helper'
 class QueryTest < Test::Unit::TestCase
   fixtures :projects, :users, :members, :roles, :trackers, :issue_statuses, :issue_categories, :enumerations, :issues, :custom_fields, :custom_values, :queries
 
+  def test_custom_fields_for_all_projects_should_be_available_in_global_queries
+    query = Query.new(:project => nil, :name => '_')
+    assert query.available_filters.has_key?('cf_1')
+    assert !query.available_filters.has_key?('cf_3')
+  end
+  
   def test_query_with_multiple_custom_fields
     query = Query.find(1)
     assert query.valid?

From 28c094f50e3c64774e04581a77cb7b1c3de231e0 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Mon, 23 Jun 2008 16:51:13 +0000
Subject: [PATCH 554/710] Turn ftp urls into links (#1514).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1577 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 lib/redmine/wiki_formatting.rb               | 1 +
 test/unit/helpers/application_helper_test.rb | 1 +
 2 files changed, 2 insertions(+)

diff --git a/lib/redmine/wiki_formatting.rb b/lib/redmine/wiki_formatting.rb
index 6c8eebbbc..952f636d3 100644
--- a/lib/redmine/wiki_formatting.rb
+++ b/lib/redmine/wiki_formatting.rb
@@ -129,6 +129,7 @@ module Redmine
                         )
                         (
                           (?:https?://)|           # protocol spec, or
+                          (?:ftp://)|
                           (?:www\.)                # www.*
                         )
                         (
diff --git a/test/unit/helpers/application_helper_test.rb b/test/unit/helpers/application_helper_test.rb
index 9504a8c79..45eb2df90 100644
--- a/test/unit/helpers/application_helper_test.rb
+++ b/test/unit/helpers/application_helper_test.rb
@@ -36,6 +36,7 @@ class ApplicationHelperTest < HelperTestCase
       'http://foo.bar/page?p=1&t=z&s=' => '<a class="external" href="http://foo.bar/page?p=1&#38;t=z&#38;s=">http://foo.bar/page?p=1&#38;t=z&#38;s=</a>',
       'http://foo.bar/page#125' => '<a class="external" href="http://foo.bar/page#125">http://foo.bar/page#125</a>',
       'http://foo@www.bar.com' => '<a class="external" href="http://foo@www.bar.com">http://foo@www.bar.com</a>',
+      'ftp://foo.bar' => '<a class="external" href="ftp://foo.bar">ftp://foo.bar</a>',
     }
     to_test.each { |text, result| assert_equal "<p>#{result}</p>", textilizable(text) }
   end

From dc57b06b6c92bbb463a899c1546d7976594aea6f Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Mon, 23 Jun 2008 17:01:21 +0000
Subject: [PATCH 555/710] Adds a class ('me') to events of the activity view
 created by current user.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1578 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/projects/activity.rhtml  | 3 ++-
 public/stylesheets/application.css | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/views/projects/activity.rhtml b/app/views/projects/activity.rhtml
index 1a3fd9ff2..c08cd06f9 100644
--- a/app/views/projects/activity.rhtml
+++ b/app/views/projects/activity.rhtml
@@ -6,7 +6,8 @@
 <h3><%= format_activity_day(day) %></h3>
 <dl>
 <% @events_by_day[day].sort {|x,y| y.event_datetime <=> x.event_datetime }.each do |e| -%>
-  <dt class="<%= e.event_type %>"><span class="time"><%= format_time(e.event_datetime, false) %></span>
+  <dt class="<%= e.event_type %> <%= User.current.logged? && e.respond_to?(:event_author) && User.current == e.event_author ? 'me' : nil %>">
+  <span class="time"><%= format_time(e.event_datetime, false) %></span>
   <%= content_tag('span', h(e.project), :class => 'project') if @project.nil? || @project != e.project %>
   <%= link_to format_activity_title(e.event_title), e.event_url %></dt>
   <dd><span class="description"><%= format_activity_description(e.event_description) %></span>
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 48a8193e2..15e382d80 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -181,6 +181,7 @@ div#issue-changesets p { margin-top: 0; margin-bottom: 1em;}
 div#activity dl, #search-results { margin-left: 2em; }
 div#activity dd { margin-bottom: 1em; padding-left: 18px; }
 div#activity dt, #search-results dt { margin-bottom: 1px; padding-left: 20px; line-height: 18px; background-position: 0 50%; background-repeat: no-repeat; }
+div#activity dt.me .time { border-bottom: 1px solid #999; }
 div#activity dt .time { color: #777; font-size: 80%; }
 div#activity dd .description, #search-results dd .description { font-style: italic; }
 div#activity span.project:after, #search-results span.project:after { content: " -"; }

From 810ec643f8cd1ccd492d3691293a1fcfe682f8d6 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Mon, 23 Jun 2008 17:06:58 +0000
Subject: [PATCH 556/710] Strip pre/code tags content from activity view
 events.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1579 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/helpers/projects_helper.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb
index 49a2e5721..5d51e7075 100644
--- a/app/helpers/projects_helper.rb
+++ b/app/helpers/projects_helper.rb
@@ -30,7 +30,7 @@ module ProjectsHelper
   end
   
   def format_activity_description(text)
-    h(truncate(text, 250))
+    h(truncate(text, 250).gsub(%r{<(pre|code)>.*$}m, '...'))
   end
   
   def project_settings_tabs

From 3121e0b5d0d7f985ca8ff329804cb0b5c83cb915 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Mon, 23 Jun 2008 17:12:12 +0000
Subject: [PATCH 557/710] Smaller font size for activity events and search
 results descriptions.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1580 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 public/stylesheets/application.css | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 15e382d80..c10dfbef1 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -179,8 +179,8 @@ div#issue-changesets .changeset { border-bottom: 1px solid #ddd; }
 div#issue-changesets p { margin-top: 0; margin-bottom: 1em;}
 
 div#activity dl, #search-results { margin-left: 2em; }
-div#activity dd { margin-bottom: 1em; padding-left: 18px; }
-div#activity dt, #search-results dt { margin-bottom: 1px; padding-left: 20px; line-height: 18px; background-position: 0 50%; background-repeat: no-repeat; }
+div#activity dd, #search-results dd { margin-bottom: 1em; padding-left: 18px; font-size: 0.9em; }
+div#activity dt, #search-results dt { margin-bottom: 0px; padding-left: 20px; line-height: 18px; background-position: 0 50%; background-repeat: no-repeat; }
 div#activity dt.me .time { border-bottom: 1px solid #999; }
 div#activity dt .time { color: #777; font-size: 80%; }
 div#activity dd .description, #search-results dd .description { font-style: italic; }

From 8474d05e9994d947d862691751c6b5fa110f6754 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Tue, 24 Jun 2008 16:49:51 +0000
Subject: [PATCH 558/710] Fixes test broken by r1578.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1581 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 test/functional/projects_controller_test.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/functional/projects_controller_test.rb b/test/functional/projects_controller_test.rb
index d4ce97dc2..5b7c29b18 100644
--- a/test/functional/projects_controller_test.rb
+++ b/test/functional/projects_controller_test.rb
@@ -154,7 +154,7 @@ class ProjectsControllerTest < Test::Unit::TestCase
                :content => /#{2.days.ago.to_date.day}/,
                :sibling => { :tag => "dl",
                  :child => { :tag => "dt",
-                   :attributes => { :class => 'issue-edit' },
+                   :attributes => { :class => /issue-edit/ },
                    :child => { :tag => "a",
                      :content => /(#{IssueStatus.find(2).name})/,
                    }
@@ -170,7 +170,7 @@ class ProjectsControllerTest < Test::Unit::TestCase
                :content => /#{3.day.ago.to_date.day}/,
                :sibling => { :tag => "dl",
                  :child => { :tag => "dt",
-                   :attributes => { :class => 'issue' },
+                   :attributes => { :class => /issue/ },
                    :child => { :tag => "a",
                      :content => /#{Issue.find(1).subject}/,
                    }

From c97a5efde91163238e0d4df3de8c08a895c925f4 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Tue, 24 Jun 2008 16:52:41 +0000
Subject: [PATCH 559/710] Fixed: private method 'gsub' called for nil:NilClass
 on activity (#1519).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1582 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/helpers/projects_helper.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb
index 5d51e7075..912482f1c 100644
--- a/app/helpers/projects_helper.rb
+++ b/app/helpers/projects_helper.rb
@@ -30,7 +30,7 @@ module ProjectsHelper
   end
   
   def format_activity_description(text)
-    h(truncate(text, 250).gsub(%r{<(pre|code)>.*$}m, '...'))
+    h(truncate(text.to_s, 250).gsub(%r{<(pre|code)>.*$}m, '...'))
   end
   
   def project_settings_tabs

From 4d6f50d3febff0e9cbbab158d39b2d8c0375c6a7 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Tue, 24 Jun 2008 18:39:49 +0000
Subject: [PATCH 560/710] Encoding set to utf8 in example database.yml (#1506).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1583 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 config/database.yml.example | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/config/database.yml.example b/config/database.yml.example
index f72844a07..1dc678131 100644
--- a/config/database.yml.example
+++ b/config/database.yml.example
@@ -12,6 +12,7 @@ production:
   host: localhost
   username: root
   password:
+  encoding: utf8
  
 development:
   adapter: mysql
@@ -19,6 +20,7 @@ development:
   host: localhost
   username: root
   password:
+  encoding: utf8
 
 test:
   adapter: mysql
@@ -26,6 +28,7 @@ test:
   host: localhost
   username: root
   password:
+  encoding: utf8
 
 test_pgsql:
   adapter: postgresql

From 25bba80c9eb112b8ded40d2baf9f202c79d4e2ad Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Wed, 25 Jun 2008 19:25:28 +0000
Subject: [PATCH 561/710] Adds a simple API and a standalone script that can be
 used to forward emails from a local or remote email server to Redmine
 (#1110).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1584 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/mail_handler_controller.rb    | 44 +++++++++++
 app/helpers/mail_handler_helper.rb            | 19 +++++
 app/helpers/settings_helper.rb                |  1 +
 app/models/mail_handler.rb                    |  2 +-
 app/views/settings/_mail_handler.rhtml        | 18 +++++
 config/settings.yml                           |  4 +
 extra/mail_handler/rdm-mailhandler.rb         | 79 +++++++++++++++++++
 lang/bg.yml                                   |  4 +
 lang/cs.yml                                   |  4 +
 lang/da.yml                                   |  4 +
 lang/de.yml                                   |  4 +
 lang/en.yml                                   |  4 +
 lang/es.yml                                   |  4 +
 lang/fi.yml                                   |  4 +
 lang/fr.yml                                   |  4 +
 lang/he.yml                                   |  4 +
 lang/hu.yml                                   |  4 +
 lang/it.yml                                   |  4 +
 lang/ja.yml                                   |  4 +
 lang/ko.yml                                   |  4 +
 lang/lt.yml                                   |  4 +
 lang/nl.yml                                   |  4 +
 lang/no.yml                                   |  4 +
 lang/pl.yml                                   |  4 +
 lang/pt-br.yml                                |  4 +
 lang/pt.yml                                   |  4 +
 lang/ro.yml                                   |  4 +
 lang/ru.yml                                   |  4 +
 lang/sr.yml                                   |  4 +
 lang/sv.yml                                   |  4 +
 lang/th.yml                                   |  4 +
 lang/uk.yml                                   |  4 +
 lang/zh-tw.yml                                |  4 +
 lang/zh.yml                                   |  4 +
 public/javascripts/application.js             |  9 +++
 .../mail_handler_controller_test.rb           | 53 +++++++++++++
 36 files changed, 336 insertions(+), 1 deletion(-)
 create mode 100644 app/controllers/mail_handler_controller.rb
 create mode 100644 app/helpers/mail_handler_helper.rb
 create mode 100644 app/views/settings/_mail_handler.rhtml
 create mode 100644 extra/mail_handler/rdm-mailhandler.rb
 create mode 100644 test/functional/mail_handler_controller_test.rb

diff --git a/app/controllers/mail_handler_controller.rb b/app/controllers/mail_handler_controller.rb
new file mode 100644
index 000000000..8bcfce630
--- /dev/null
+++ b/app/controllers/mail_handler_controller.rb
@@ -0,0 +1,44 @@
+# redMine - project management software
+# Copyright (C) 2006-2008  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 MailHandlerController < ActionController::Base
+  before_filter :check_credential
+  
+  verify :method => :post,
+         :only => :index,
+         :render => { :nothing => true, :status => 405 }
+         
+  # Submits an incoming email to MailHandler
+  def index
+    options = params.dup
+    email = options.delete(:email)
+    if MailHandler.receive(email, options)
+      render :nothing => true, :status => :created
+    else
+      render :nothing => true, :status => :unprocessable_entity
+    end
+  end
+  
+  private
+  
+  def check_credential
+    User.current = nil
+    unless Setting.mail_handler_api_enabled? && params[:key] == Setting.mail_handler_api_key
+      render :nothing => true, :status => 403
+    end
+  end
+end
diff --git a/app/helpers/mail_handler_helper.rb b/app/helpers/mail_handler_helper.rb
new file mode 100644
index 000000000..a29a6dd5a
--- /dev/null
+++ b/app/helpers/mail_handler_helper.rb
@@ -0,0 +1,19 @@
+# redMine - project management software
+# Copyright (C) 2006-2008  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 MailHandlerHelper
+end
diff --git a/app/helpers/settings_helper.rb b/app/helpers/settings_helper.rb
index f4ec5a7a7..d88269f7d 100644
--- a/app/helpers/settings_helper.rb
+++ b/app/helpers/settings_helper.rb
@@ -21,6 +21,7 @@ module SettingsHelper
             {:name => 'authentication', :partial => 'settings/authentication', :label => :label_authentication},
             {:name => 'issues', :partial => 'settings/issues', :label => :label_issue_tracking},
             {:name => 'notifications', :partial => 'settings/notifications', :label => l(:field_mail_notification)},
+            {:name => 'mail_handler', :partial => 'settings/mail_handler', :label => l(:label_incoming_emails)},
             {:name => 'repositories', :partial => 'settings/repositories', :label => :label_repository_plural}
             ]
   end
diff --git a/app/models/mail_handler.rb b/app/models/mail_handler.rb
index 7b85077e1..124f7db74 100644
--- a/app/models/mail_handler.rb
+++ b/app/models/mail_handler.rb
@@ -84,7 +84,7 @@ class MailHandler < ActionMailer::Base
     # TODO: other ways to specify project:
     # * parse the email To field
     # * specific project (eg. Setting.mail_handler_target_project)
-    identifier = if @@handler_options[:project]
+    identifier = if !@@handler_options[:project].blank?
                    @@handler_options[:project]
                  elsif email.plain_text_body =~ %r{^Project:[ \t]*(.+)$}i
                     $1
diff --git a/app/views/settings/_mail_handler.rhtml b/app/views/settings/_mail_handler.rhtml
new file mode 100644
index 000000000..830b1ba4a
--- /dev/null
+++ b/app/views/settings/_mail_handler.rhtml
@@ -0,0 +1,18 @@
+<% form_tag({:action => 'edit', :tab => 'mail_handler'}) do %>
+
+<div class="box tabular settings">
+<p><label><%= l(:setting_mail_handler_api_enabled) %></label>
+<%= check_box_tag 'settings[mail_handler_api_enabled]', 1, Setting.mail_handler_api_enabled?,
+                  :onclick => "if (this.checked) { Form.Element.enable('settings_mail_handler_api_key'); } else { Form.Element.disable('settings_mail_handler_api_key'); }" %>
+<%= hidden_field_tag 'settings[mail_handler_api_enabled]', 0 %></p>
+
+<p><label><%= l(:setting_mail_handler_api_key) %></label>
+<%= text_field_tag 'settings[mail_handler_api_key]', Setting.mail_handler_api_key, 
+                                                     :size => 30,
+                                                     :id => 'settings_mail_handler_api_key',
+                                                     :disabled => !Setting.mail_handler_api_enabled? %>
+<%= link_to_function l(:label_generate_key), "if ($('settings_mail_handler_api_key').disabled == false) { $('settings_mail_handler_api_key').value = randomKey(20) }" %></p>
+</div>
+
+<%= submit_tag l(:button_save) %>
+<% end %>
diff --git a/config/settings.yml b/config/settings.yml
index 616665f23..78a366f35 100644
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -101,6 +101,10 @@ notified_events:
   default: 
   - issue_added
   - issue_updated
+mail_handler_api_enabled:
+  default: 0
+mail_handler_api_key:
+  default: 
 issue_list_default_columns:
   serialized: true
   default: 
diff --git a/extra/mail_handler/rdm-mailhandler.rb b/extra/mail_handler/rdm-mailhandler.rb
new file mode 100644
index 000000000..585afefef
--- /dev/null
+++ b/extra/mail_handler/rdm-mailhandler.rb
@@ -0,0 +1,79 @@
+#!/usr/bin/ruby
+
+# rdm-mailhandler
+# Reads an email from standard input and forward it to a Redmine server
+# Can be used from a remote mail server
+
+require 'net/http'
+require 'net/https'
+require 'uri'
+require 'getoptlong'
+
+class RedmineMailHandler
+  VERSION = '0.1'
+  
+  attr_accessor :verbose, :project, :url, :key
+
+  def initialize
+    opts = GetoptLong.new(
+      [ '--help', '-h', GetoptLong::NO_ARGUMENT ],
+      [ '--version', '-V', GetoptLong::NO_ARGUMENT ],
+      [ '--verbose', '-v', GetoptLong::NO_ARGUMENT ],
+      [ '--url', '-u', GetoptLong::REQUIRED_ARGUMENT ],
+      [ '--key', '-k', GetoptLong::REQUIRED_ARGUMENT],
+      [ '--project', '-p', GetoptLong::REQUIRED_ARGUMENT ]
+    )
+
+    opts.each do |opt, arg|
+      case opt
+      when '--url'
+        self.url = arg.dup
+      when '--key'
+        self.key = arg.dup
+      when '--help'
+        usage
+      when '--verbose'
+        self.verbose = true
+      when '--version'
+        puts VERSION; exit
+      when '--project'
+        self.project = arg.dup
+      end
+    end
+    
+    usage if url.nil?
+  end
+  
+  def submit(email)
+    uri = url.gsub(%r{/*$}, '') + '/mail_handler'
+    debug "Posting to #{uri}..."
+    data = { 'key' => key, 'project' => project, 'email' => email }
+    response = Net::HTTP.post_form(URI.parse(uri), data)
+    debug "Response received: #{response.code}"
+    response.code == 201 ? 0 : 1
+  end
+  
+  private
+  
+  def usage
+    puts "Usage: rdm-mailhandler [options] --url=<Redmine URL> --key=<API key>"
+    puts "Reads an email from standard input and forward it to a Redmine server"
+    puts
+    puts "Options:"
+    puts "  --help             show this help"
+    puts "  --verbose          show extra information"
+    puts "  --project          identifier of the target project"
+    puts
+    puts "Examples:"
+    puts "  rdm-mailhandler --url http://redmine.domain.foo --key secret"
+    puts "  rdm-mailhandler --url https://redmine.domain.foo --key secret --project foo"
+    exit
+  end
+  
+  def debug(msg)
+    puts msg if verbose
+  end
+end
+
+handler = RedmineMailHandler.new
+handler.submit(STDIN.read)
diff --git a/lang/bg.yml b/lang/bg.yml
index 48226c79a..1339d9a83 100644
--- a/lang/bg.yml
+++ b/lang/bg.yml
@@ -626,3 +626,7 @@ label_duplicated_by: duplicated by
 setting_enabled_scm: Enabled SCM
 text_enumeration_category_reassign_to: 'Reassign them to this value:'
 text_enumeration_destroy_question: '%d objects are assigned to this value.'
+label_incoming_emails: Incoming emails
+label_generate_key: Generate a key
+setting_mail_handler_api_enabled: Enable WS for incoming emails
+setting_mail_handler_api_key: API key
diff --git a/lang/cs.yml b/lang/cs.yml
index de460ba3a..00d0642de 100644
--- a/lang/cs.yml
+++ b/lang/cs.yml
@@ -631,3 +631,7 @@ label_duplicated_by: duplicated by
 setting_enabled_scm: Enabled SCM
 text_enumeration_category_reassign_to: 'Reassign them to this value:'
 text_enumeration_destroy_question: '%d objects are assigned to this value.'
+label_incoming_emails: Incoming emails
+label_generate_key: Generate a key
+setting_mail_handler_api_enabled: Enable WS for incoming emails
+setting_mail_handler_api_key: API key
diff --git a/lang/da.yml b/lang/da.yml
index 6919cdfcb..b8546ab20 100644
--- a/lang/da.yml
+++ b/lang/da.yml
@@ -628,3 +628,7 @@ label_duplicated_by: duplicated by
 setting_enabled_scm: Enabled SCM
 text_enumeration_category_reassign_to: 'Reassign them to this value:'
 text_enumeration_destroy_question: '%d objects are assigned to this value.'
+label_incoming_emails: Incoming emails
+label_generate_key: Generate a key
+setting_mail_handler_api_enabled: Enable WS for incoming emails
+setting_mail_handler_api_key: API key
diff --git a/lang/de.yml b/lang/de.yml
index 290acd916..6bc7919f9 100644
--- a/lang/de.yml
+++ b/lang/de.yml
@@ -627,3 +627,7 @@ label_duplicated_by: duplicated by
 setting_enabled_scm: Enabled SCM
 text_enumeration_category_reassign_to: 'Reassign them to this value:'
 text_enumeration_destroy_question: '%d objects are assigned to this value.'
+label_incoming_emails: Incoming emails
+label_generate_key: Generate a key
+setting_mail_handler_api_enabled: Enable WS for incoming emails
+setting_mail_handler_api_key: API key
diff --git a/lang/en.yml b/lang/en.yml
index ffbd10622..7ab73f051 100644
--- a/lang/en.yml
+++ b/lang/en.yml
@@ -214,6 +214,8 @@ setting_user_format: Users display format
 setting_activity_days_default: Days displayed on project activity
 setting_display_subprojects_issues: Display subprojects issues on main projects by default
 setting_enabled_scm: Enabled SCM
+setting_mail_handler_api_enabled: Enable WS for incoming emails
+setting_mail_handler_api_key: API key
 
 project_module_issue_tracking: Issue tracking
 project_module_time_tracking: Time tracking
@@ -515,6 +517,8 @@ label_preferences: Preferences
 label_chronological_order: In chronological order
 label_reverse_chronological_order: In reverse chronological order
 label_planning: Planning
+label_incoming_emails: Incoming emails
+label_generate_key: Generate a key
 
 button_login: Login
 button_submit: Submit
diff --git a/lang/es.yml b/lang/es.yml
index b027f48e3..2615d8f61 100644
--- a/lang/es.yml
+++ b/lang/es.yml
@@ -629,3 +629,7 @@ label_duplicated_by: duplicated by
 setting_enabled_scm: Enabled SCM
 text_enumeration_category_reassign_to: 'Reassign them to this value:'
 text_enumeration_destroy_question: '%d objects are assigned to this value.'
+label_incoming_emails: Incoming emails
+label_generate_key: Generate a key
+setting_mail_handler_api_enabled: Enable WS for incoming emails
+setting_mail_handler_api_key: API key
diff --git a/lang/fi.yml b/lang/fi.yml
index e1d188dcc..51b0c04a0 100644
--- a/lang/fi.yml
+++ b/lang/fi.yml
@@ -626,3 +626,7 @@ label_duplicated_by: duplicated by
 setting_enabled_scm: Enabled SCM
 text_enumeration_category_reassign_to: 'Reassign them to this value:'
 text_enumeration_destroy_question: '%d objects are assigned to this value.'
+label_incoming_emails: Incoming emails
+label_generate_key: Generate a key
+setting_mail_handler_api_enabled: Enable WS for incoming emails
+setting_mail_handler_api_key: API key
diff --git a/lang/fr.yml b/lang/fr.yml
index eaae51765..1fd86dd07 100644
--- a/lang/fr.yml
+++ b/lang/fr.yml
@@ -215,6 +215,8 @@ setting_user_format: Format d'affichage des utilisateurs
 setting_activity_days_default: Nombre de jours affichés sur l'activité des projets
 setting_display_subprojects_issues: Afficher par défaut les demandes des sous-projets sur les projets principaux
 setting_enabled_scm: SCM activés
+setting_mail_handler_api_enabled: "Activer le WS pour la réception d'emails"
+setting_mail_handler_api_key: Clé de protection de l'API
 
 project_module_issue_tracking: Suivi des demandes
 project_module_time_tracking: Suivi du temps passé
@@ -515,6 +517,8 @@ label_preferences: Préférences
 label_chronological_order: Dans l'ordre chronologique
 label_reverse_chronological_order: Dans l'ordre chronologique inverse
 label_planning: Planning
+label_incoming_emails: Emails entrants
+label_generate_key: Générer une clé
 
 button_login: Connexion
 button_submit: Soumettre
diff --git a/lang/he.yml b/lang/he.yml
index 5f14ee16e..7455fc395 100644
--- a/lang/he.yml
+++ b/lang/he.yml
@@ -626,3 +626,7 @@ label_duplicated_by: duplicated by
 setting_enabled_scm: Enabled SCM
 text_enumeration_category_reassign_to: 'Reassign them to this value:'
 text_enumeration_destroy_question: '%d objects are assigned to this value.'
+label_incoming_emails: Incoming emails
+label_generate_key: Generate a key
+setting_mail_handler_api_enabled: Enable WS for incoming emails
+setting_mail_handler_api_key: API key
diff --git a/lang/hu.yml b/lang/hu.yml
index c46d0e26c..ba904ed45 100644
--- a/lang/hu.yml
+++ b/lang/hu.yml
@@ -627,3 +627,7 @@ label_duplicated_by: duplikálta
 setting_enabled_scm: Forráskódkezelő (SCM) engedélyezése
 text_enumeration_category_reassign_to: 'Reassign them to this value:'
 text_enumeration_destroy_question: '%d objects are assigned to this value.'
+label_incoming_emails: Incoming emails
+label_generate_key: Generate a key
+setting_mail_handler_api_enabled: Enable WS for incoming emails
+setting_mail_handler_api_key: API key
diff --git a/lang/it.yml b/lang/it.yml
index 8aec9ef0e..867c73f9a 100644
--- a/lang/it.yml
+++ b/lang/it.yml
@@ -626,3 +626,7 @@ label_duplicated_by: duplicated by
 setting_enabled_scm: Enabled SCM
 text_enumeration_category_reassign_to: 'Reassign them to this value:'
 text_enumeration_destroy_question: '%d objects are assigned to this value.'
+label_incoming_emails: Incoming emails
+label_generate_key: Generate a key
+setting_mail_handler_api_enabled: Enable WS for incoming emails
+setting_mail_handler_api_key: API key
diff --git a/lang/ja.yml b/lang/ja.yml
index c48579dda..aa4320c3a 100644
--- a/lang/ja.yml
+++ b/lang/ja.yml
@@ -627,3 +627,7 @@ label_duplicated_by: duplicated by
 setting_enabled_scm: Enabled SCM
 text_enumeration_category_reassign_to: 'Reassign them to this value:'
 text_enumeration_destroy_question: '%d objects are assigned to this value.'
+label_incoming_emails: Incoming emails
+label_generate_key: Generate a key
+setting_mail_handler_api_enabled: Enable WS for incoming emails
+setting_mail_handler_api_key: API key
diff --git a/lang/ko.yml b/lang/ko.yml
index f2339556f..f945537a9 100644
--- a/lang/ko.yml
+++ b/lang/ko.yml
@@ -626,3 +626,7 @@ label_duplicated_by: duplicated by
 setting_enabled_scm: Enabled SCM
 text_enumeration_category_reassign_to: 'Reassign them to this value:'
 text_enumeration_destroy_question: '%d objects are assigned to this value.'
+label_incoming_emails: Incoming emails
+label_generate_key: Generate a key
+setting_mail_handler_api_enabled: Enable WS for incoming emails
+setting_mail_handler_api_key: API key
diff --git a/lang/lt.yml b/lang/lt.yml
index 61533b3ab..355f473c8 100644
--- a/lang/lt.yml
+++ b/lang/lt.yml
@@ -628,3 +628,7 @@ label_duplicated_by: duplicated by
 setting_enabled_scm: Enabled SCM
 text_enumeration_category_reassign_to: 'Reassign them to this value:'
 text_enumeration_destroy_question: '%d objects are assigned to this value.'
+label_incoming_emails: Incoming emails
+label_generate_key: Generate a key
+setting_mail_handler_api_enabled: Enable WS for incoming emails
+setting_mail_handler_api_key: API key
diff --git a/lang/nl.yml b/lang/nl.yml
index 109d444f1..89b8a5736 100644
--- a/lang/nl.yml
+++ b/lang/nl.yml
@@ -627,3 +627,7 @@ label_duplicated_by: duplicated by
 setting_enabled_scm: Enabled SCM
 text_enumeration_category_reassign_to: 'Reassign them to this value:'
 text_enumeration_destroy_question: '%d objects are assigned to this value.'
+label_incoming_emails: Incoming emails
+label_generate_key: Generate a key
+setting_mail_handler_api_enabled: Enable WS for incoming emails
+setting_mail_handler_api_key: API key
diff --git a/lang/no.yml b/lang/no.yml
index 4e47c75a2..5e4bdcca3 100644
--- a/lang/no.yml
+++ b/lang/no.yml
@@ -627,3 +627,7 @@ enumeration_doc_categories: Dokument-kategorier
 enumeration_activities: Aktiviteter (tidssporing)
 text_enumeration_category_reassign_to: 'Reassign them to this value:'
 text_enumeration_destroy_question: '%d objects are assigned to this value.'
+label_incoming_emails: Incoming emails
+label_generate_key: Generate a key
+setting_mail_handler_api_enabled: Enable WS for incoming emails
+setting_mail_handler_api_key: API key
diff --git a/lang/pl.yml b/lang/pl.yml
index 97378b5b1..0b0f87b6f 100644
--- a/lang/pl.yml
+++ b/lang/pl.yml
@@ -626,3 +626,7 @@ label_duplicated_by: duplicated by
 setting_enabled_scm: Enabled SCM
 text_enumeration_category_reassign_to: 'Reassign them to this value:'
 text_enumeration_destroy_question: '%d objects are assigned to this value.'
+label_incoming_emails: Incoming emails
+label_generate_key: Generate a key
+setting_mail_handler_api_enabled: Enable WS for incoming emails
+setting_mail_handler_api_key: API key
diff --git a/lang/pt-br.yml b/lang/pt-br.yml
index 67822499e..e2036afde 100644
--- a/lang/pt-br.yml
+++ b/lang/pt-br.yml
@@ -626,3 +626,7 @@ label_duplicated_by: duplicated by
 setting_enabled_scm: Enabled SCM
 text_enumeration_category_reassign_to: 'Reassign them to this value:'
 text_enumeration_destroy_question: '%d objects are assigned to this value.'
+label_incoming_emails: Incoming emails
+label_generate_key: Generate a key
+setting_mail_handler_api_enabled: Enable WS for incoming emails
+setting_mail_handler_api_key: API key
diff --git a/lang/pt.yml b/lang/pt.yml
index a91eea01b..543743cab 100644
--- a/lang/pt.yml
+++ b/lang/pt.yml
@@ -626,3 +626,7 @@ label_duplicated_by: duplicated by
 setting_enabled_scm: Enabled SCM
 text_enumeration_category_reassign_to: 'Reassign them to this value:'
 text_enumeration_destroy_question: '%d objects are assigned to this value.'
+label_incoming_emails: Incoming emails
+label_generate_key: Generate a key
+setting_mail_handler_api_enabled: Enable WS for incoming emails
+setting_mail_handler_api_key: API key
diff --git a/lang/ro.yml b/lang/ro.yml
index aafc61916..16c2ea104 100644
--- a/lang/ro.yml
+++ b/lang/ro.yml
@@ -626,3 +626,7 @@ label_duplicated_by: duplicated by
 setting_enabled_scm: Enabled SCM
 text_enumeration_category_reassign_to: 'Reassign them to this value:'
 text_enumeration_destroy_question: '%d objects are assigned to this value.'
+label_incoming_emails: Incoming emails
+label_generate_key: Generate a key
+setting_mail_handler_api_enabled: Enable WS for incoming emails
+setting_mail_handler_api_key: API key
diff --git a/lang/ru.yml b/lang/ru.yml
index e04377781..f68505be5 100644
--- a/lang/ru.yml
+++ b/lang/ru.yml
@@ -630,3 +630,7 @@ label_duplicated_by: duplicated by
 setting_enabled_scm: Enabled SCM
 text_enumeration_category_reassign_to: 'Reassign them to this value:'
 text_enumeration_destroy_question: '%d objects are assigned to this value.'
+label_incoming_emails: Incoming emails
+label_generate_key: Generate a key
+setting_mail_handler_api_enabled: Enable WS for incoming emails
+setting_mail_handler_api_key: API key
diff --git a/lang/sr.yml b/lang/sr.yml
index ec01774bc..83bfdf43c 100644
--- a/lang/sr.yml
+++ b/lang/sr.yml
@@ -627,3 +627,7 @@ label_duplicated_by: duplicated by
 setting_enabled_scm: Enabled SCM
 text_enumeration_category_reassign_to: 'Reassign them to this value:'
 text_enumeration_destroy_question: '%d objects are assigned to this value.'
+label_incoming_emails: Incoming emails
+label_generate_key: Generate a key
+setting_mail_handler_api_enabled: Enable WS for incoming emails
+setting_mail_handler_api_key: API key
diff --git a/lang/sv.yml b/lang/sv.yml
index e28943d9b..375970f3e 100644
--- a/lang/sv.yml
+++ b/lang/sv.yml
@@ -627,3 +627,7 @@ label_duplicated_by: duplicated by
 setting_enabled_scm: Enabled SCM
 text_enumeration_category_reassign_to: 'Reassign them to this value:'
 text_enumeration_destroy_question: '%d objects are assigned to this value.'
+label_incoming_emails: Incoming emails
+label_generate_key: Generate a key
+setting_mail_handler_api_enabled: Enable WS for incoming emails
+setting_mail_handler_api_key: API key
diff --git a/lang/th.yml b/lang/th.yml
index 6c84dba70..acbf146cf 100644
--- a/lang/th.yml
+++ b/lang/th.yml
@@ -629,3 +629,7 @@ label_duplicated_by: duplicated by
 setting_enabled_scm: Enabled SCM
 text_enumeration_category_reassign_to: 'Reassign them to this value:'
 text_enumeration_destroy_question: '%d objects are assigned to this value.'
+label_incoming_emails: Incoming emails
+label_generate_key: Generate a key
+setting_mail_handler_api_enabled: Enable WS for incoming emails
+setting_mail_handler_api_key: API key
diff --git a/lang/uk.yml b/lang/uk.yml
index 365ced150..d70916b1e 100644
--- a/lang/uk.yml
+++ b/lang/uk.yml
@@ -628,3 +628,7 @@ label_duplicated_by: duplicated by
 setting_enabled_scm: Enabled SCM
 text_enumeration_category_reassign_to: 'Reassign them to this value:'
 text_enumeration_destroy_question: '%d objects are assigned to this value.'
+label_incoming_emails: Incoming emails
+label_generate_key: Generate a key
+setting_mail_handler_api_enabled: Enable WS for incoming emails
+setting_mail_handler_api_key: API key
diff --git a/lang/zh-tw.yml b/lang/zh-tw.yml
index c7b473548..462633575 100644
--- a/lang/zh-tw.yml
+++ b/lang/zh-tw.yml
@@ -627,3 +627,7 @@ enumeration_doc_categories: 文件分類
 enumeration_activities: 活動 (時間追蹤)
 text_enumeration_category_reassign_to: 'Reassign them to this value:'
 text_enumeration_destroy_question: '%d objects are assigned to this value.'
+label_incoming_emails: Incoming emails
+label_generate_key: Generate a key
+setting_mail_handler_api_enabled: Enable WS for incoming emails
+setting_mail_handler_api_key: API key
diff --git a/lang/zh.yml b/lang/zh.yml
index 981e8102d..9f81d42fa 100644
--- a/lang/zh.yml
+++ b/lang/zh.yml
@@ -627,3 +627,7 @@ enumeration_doc_categories: 文档类别
 enumeration_activities: 活动（时间跟踪）
 text_enumeration_category_reassign_to: 'Reassign them to this value:'
 text_enumeration_destroy_question: '%d objects are assigned to this value.'
+label_incoming_emails: Incoming emails
+label_generate_key: Generate a key
+setting_mail_handler_api_enabled: Enable WS for incoming emails
+setting_mail_handler_api_key: API key
diff --git a/public/javascripts/application.js b/public/javascripts/application.js
index a8b6c0e46..4e5b67e55 100644
--- a/public/javascripts/application.js
+++ b/public/javascripts/application.js
@@ -107,6 +107,15 @@ function scmEntryLoaded(id) {
     Element.removeClassName(id, 'loading');
 }
 
+function randomKey(size) {
+	var chars = new Array('0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z');
+	var key = '';
+	for (i = 0; i < size; i++) {
+  	key += chars[Math.floor(Math.random() * chars.length)];
+	}
+	return key;
+}
+
 /* shows and hides ajax indicator */
 Ajax.Responders.register({
     onCreate: function(){
diff --git a/test/functional/mail_handler_controller_test.rb b/test/functional/mail_handler_controller_test.rb
new file mode 100644
index 000000000..6c5af23f0
--- /dev/null
+++ b/test/functional/mail_handler_controller_test.rb
@@ -0,0 +1,53 @@
+# redMine - project management software
+# Copyright (C) 2006-2008  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 File.dirname(__FILE__) + '/../test_helper'
+require 'mail_handler_controller'
+
+# Re-raise errors caught by the controller.
+class MailHandlerController; def rescue_action(e) raise e end; end
+
+class MailHandlerControllerTest < Test::Unit::TestCase
+  fixtures :users, :projects, :enabled_modules, :roles, :members, :issues, :issue_statuses, :trackers, :enumerations
+  
+  FIXTURES_PATH = File.dirname(__FILE__) + '/../fixtures/mail_handler'
+  
+  def setup
+    @controller = MailHandlerController.new
+    @request    = ActionController::TestRequest.new
+    @response   = ActionController::TestResponse.new
+    User.current = nil
+  end
+  
+  def test_should_create_issue
+    # Enable API and set a key
+    Setting.mail_handler_api_enabled = 1
+    Setting.mail_handler_api_key = 'secret'
+    
+    post :index, :key => 'secret', :email => IO.read(File.join(FIXTURES_PATH, 'ticket_on_given_project.eml'))
+    assert_response 201
+  end
+  
+  def test_should_not_allow
+    # Disable API
+    Setting.mail_handler_api_enabled = 0
+    Setting.mail_handler_api_key = 'secret'
+    
+    post :index, :key => 'secret', :email => IO.read(File.join(FIXTURES_PATH, 'ticket_on_given_project.eml'))
+    assert_response 403
+  end
+end

From 31e3d180c01e701eb71ded5dd842fcc5e743365a Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Thu, 26 Jun 2008 14:54:45 +0000
Subject: [PATCH 562/710] Add project name to cross-project Atom feeds (#1527).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1585 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/common/feed.atom.rxml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/views/common/feed.atom.rxml b/app/views/common/feed.atom.rxml
index 8ceffc91c..c1b88a28e 100644
--- a/app/views/common/feed.atom.rxml
+++ b/app/views/common/feed.atom.rxml
@@ -10,7 +10,11 @@ xml.feed "xmlns" => "http://www.w3.org/2005/Atom" do
   @items.each do |item|
     xml.entry do
       url = url_for(item.event_url(:only_path => false))
-      xml.title truncate_single_line(item.event_title, 100)
+      if @project
+        xml.title truncate_single_line(item.event_title, 100)
+      else
+        xml.title truncate_single_line("#{item.project} - #{item.event_title}", 100)
+      end
       xml.link "rel" => "alternate", "href" => url
       xml.id url
       xml.updated item.event_datetime.xmlschema

From ad7816cea4361341a161afae00078ceb0f5fbb35 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Thu, 26 Jun 2008 14:59:03 +0000
Subject: [PATCH 563/710] Tests: create tmp/test if it doesn't exist.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1586 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 test/test_helper.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/test_helper.rb b/test/test_helper.rb
index 150b063e8..1340f9c35 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -60,6 +60,7 @@ class Test::Unit::TestCase
   
   # Use a temporary directory for attachment related tests
   def set_tmp_attachments_directory
+    Dir.mkdir "#{RAILS_ROOT}/tmp/test" unless File.directory?("#{RAILS_ROOT}/tmp/test")
     Dir.mkdir "#{RAILS_ROOT}/tmp/test/attachments" unless File.directory?("#{RAILS_ROOT}/tmp/test/attachments")
     Attachment.storage_path = "#{RAILS_ROOT}/tmp/test/attachments"
   end

From b3939fb134c38c310e0f031ad445035db70ca2a0 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Thu, 26 Jun 2008 17:02:09 +0000
Subject: [PATCH 564/710] Link to view specific file on revision view fails
 with Subversion repository subdirectory (#1525).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1587 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/repositories/revision.rhtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/repositories/revision.rhtml b/app/views/repositories/revision.rhtml
index 527ae6dcd..a43aa4536 100644
--- a/app/views/repositories/revision.rhtml
+++ b/app/views/repositories/revision.rhtml
@@ -50,7 +50,7 @@
 <% if change.action == "D" -%>
     <%= change.path -%>
 <% else -%>
-    <%= link_to change.path, :action => 'entry', :id => @project, :path => change.relative_path, :rev => @changeset.revision -%>
+    <%= link_to change.path, :action => 'entry', :id => @project, :path => without_leading_slash(change.relative_path), :rev => @changeset.revision -%>
 <% end -%>
 <%= "(#{change.revision})" unless change.revision.blank?  %></td>
 <td align="right">

From 0fd9b102be7dec664c8df1ddb802fac9ba8cea79 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Thu, 26 Jun 2008 19:04:58 +0000
Subject: [PATCH 565/710] Adds anchor to atom feed messages links.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1588 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/models/message.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/models/message.rb b/app/models/message.rb
index f57b90985..888bffcc3 100644
--- a/app/models/message.rb
+++ b/app/models/message.rb
@@ -29,7 +29,8 @@ class Message < ActiveRecord::Base
   acts_as_event :title => Proc.new {|o| "#{o.board.name}: #{o.subject}"},
                 :description => :content,
                 :type => Proc.new {|o| o.parent_id.nil? ? 'message' : 'reply'},
-                :url => Proc.new {|o| {:controller => 'messages', :action => 'show', :board_id => o.board_id, :id => o.id}}
+                :url => Proc.new {|o| {:controller => 'messages', :action => 'show', :board_id => o.board_id}.merge(o.parent_id.nil? ? {:id => o.id} : 
+                                                                                                                                       {:id => o.parent_id, :anchor => "message-#{o.id}"})}
   
   attr_protected :locked, :sticky
   validates_presence_of :subject, :content

From f79f19f84c3b30b47280592a4ab8eb06dafb168f Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Thu, 26 Jun 2008 19:11:07 +0000
Subject: [PATCH 566/710] Fixed: timelog redirects inappropriately when
 :back_url is blank (#1524).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1589 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/timelog_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/timelog_controller.rb b/app/controllers/timelog_controller.rb
index 2b763129e..2e257c5aa 100644
--- a/app/controllers/timelog_controller.rb
+++ b/app/controllers/timelog_controller.rb
@@ -180,7 +180,7 @@ class TimelogController < ApplicationController
     @time_entry.attributes = params[:time_entry]
     if request.post? and @time_entry.save
       flash[:notice] = l(:notice_successful_update)
-      redirect_to(params[:back_url] || {:action => 'details', :project_id => @time_entry.project})
+      redirect_to(params[:back_url].blank? ? {:action => 'details', :project_id => @time_entry.project} : params[:back_url])
       return
     end    
     @activities = Enumeration::get_values('ACTI')

From 864ac367e85160b523b2f05522cbf0d3f2d65c0d Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Thu, 26 Jun 2008 19:29:05 +0000
Subject: [PATCH 567/710] =?UTF-8?q?Translations=20updates:=20*=20Simplifie?=
 =?UTF-8?q?d=20Chinese=20(chaoqun=20zou)=20*=20Hungarian=20(G=C3=A1bor=20T?=
 =?UTF-8?q?ak=C3=A1cs)=20*=20Russian=20(Denis=20Tomashenko)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1590 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 lang/hu.yml | 14 +++++++-------
 lang/ru.yml | 22 +++++++++++-----------
 lang/zh.yml | 12 ++++++------
 3 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/lang/hu.yml b/lang/hu.yml
index ba904ed45..1810e93d8 100644
--- a/lang/hu.yml
+++ b/lang/hu.yml
@@ -355,7 +355,7 @@ label_last_changes: utolsó %d változás
 label_change_view_all: Minden változás megtekintése
 label_personalize_page: Az oldal testreszabása
 label_comment: Megjegyzés
-label_comment_plural: Megjegyzések
+label_comment_plural: Megjegyzés
 label_comment_add: Megjegyzés hozzáadása
 label_comment_added: Megjegyzés hozzáadva
 label_comment_delete: Megjegyzések törlése
@@ -625,9 +625,9 @@ mail_subject_reminder: "%d feladat határidős az elkövetkező napokban"
 text_user_wrote: '%s írta:'
 label_duplicated_by: duplikálta
 setting_enabled_scm: Forráskódkezelő (SCM) engedélyezése
-text_enumeration_category_reassign_to: 'Reassign them to this value:'
-text_enumeration_destroy_question: '%d objects are assigned to this value.'
-label_incoming_emails: Incoming emails
-label_generate_key: Generate a key
-setting_mail_handler_api_enabled: Enable WS for incoming emails
-setting_mail_handler_api_key: API key
+text_enumeration_category_reassign_to: 'Újra hozzárendelés ehhez:'
+text_enumeration_destroy_question: '%d objektum van hozzárendelve ehhez az értékhez.'
+label_incoming_emails: Beérkezett levelek
+label_generate_key: Kulcs generálása
+setting_mail_handler_api_enabled: Web Service engedélyezése a beérkezett levelekhez
+setting_mail_handler_api_key: API kulcs
diff --git a/lang/ru.yml b/lang/ru.yml
index f68505be5..10ea1aad6 100644
--- a/lang/ru.yml
+++ b/lang/ru.yml
@@ -108,7 +108,7 @@ field_author: Автор
 field_created_on: Создано
 field_updated_on: Обновлено
 field_field_format: Формат
-field_is_for_all: Для всех форматов
+field_is_for_all: Для всех проектов
 field_possible_values: Возможные значения 
 field_regexp: Регулярное выражение
 field_min_length: Минимальная длина
@@ -239,9 +239,9 @@ label_issue_status_new: Новый статус
 label_issue_category: Категория задачи
 label_issue_category_plural: Категории задачи
 label_issue_category_new: Новая категория
-label_custom_field: Поле клиента
-label_custom_field_plural: Поля клиента
-label_custom_field_new: Новое поле клиента
+label_custom_field: Настраиваемое поле
+label_custom_field_plural: Настраиваемые поля
+label_custom_field_new: Новое настраиваемое поле
 label_enumerations: Справочники
 label_enumeration_new: Новое значение
 label_information: Информация
@@ -276,7 +276,7 @@ label_min_max_length: Минимальная - Максимальная длин
 label_list: Список
 label_date: Дата
 label_integer: Целый
-label_float: Свободный
+label_float: С плавающей точкой
 label_boolean: Логический
 label_string: Текст
 label_text: Длинный текст
@@ -337,8 +337,8 @@ label_comment_plural: Комментарии
 label_comment_add: Оставить комментарий
 label_comment_added: Добавленный комментарий
 label_comment_delete: Удалить комментарии
-label_query: Запрос клиента
-label_query_plural: Запросы клиентов
+label_query: Сохраненный запрос
+label_query_plural: Сохраненные запросы
 label_query_new: Новый запрос
 label_filter_add: Добавить фильтр
 label_filter_plural: Фильтры
@@ -626,10 +626,10 @@ label_and_its_subprojects: %s и все подпроекты
 mail_body_reminder: "%d назначенных на вас задач на следующие %d дней:" 
 mail_subject_reminder: "%d назначенных на вас задач в ближайшие дни" 
 text_user_wrote: '%s написал:'
-label_duplicated_by: duplicated by
-setting_enabled_scm: Enabled SCM
-text_enumeration_category_reassign_to: 'Reassign them to this value:'
-text_enumeration_destroy_question: '%d objects are assigned to this value.'
+label_duplicated_by: дублируется
+setting_enabled_scm: Задействовать SCM
+text_enumeration_category_reassign_to: 'Назначить им следующее значение:'
+text_enumeration_destroy_question: '%d объект(а,ов) связаны с этим значением.'
 label_incoming_emails: Incoming emails
 label_generate_key: Generate a key
 setting_mail_handler_api_enabled: Enable WS for incoming emails
diff --git a/lang/zh.yml b/lang/zh.yml
index 9f81d42fa..f412f848c 100644
--- a/lang/zh.yml
+++ b/lang/zh.yml
@@ -214,6 +214,8 @@ setting_user_format: 用户显示格式
 setting_activity_days_default: 在项目活动中显示的天数
 setting_display_subprojects_issues: 在项目页面上默认显示子项目的问题
 setting_enabled_scm: 启用 SCM
+setting_mail_handler_api_enabled: 启用用于接收邮件的Web Service
+setting_mail_handler_api_key: API key
 
 project_module_issue_tracking: 问题跟踪
 project_module_time_tracking: 时间跟踪
@@ -515,6 +517,8 @@ label_preferences: 首选项
 label_chronological_order: 按时间顺序
 label_reverse_chronological_order: 按时间顺序（倒序）
 label_planning: 计划
+label_incoming_emails: 接收邮件
+label_generate_key: 生成一个key
 
 button_login: 登录
 button_submit: 提交
@@ -599,6 +603,8 @@ text_destroy_time_entries: 删除上报的工作量
 text_assign_time_entries_to_project: 将已上报的工作量提交到项目中
 text_reassign_time_entries: '将已上报的工作量指定到此问题：'
 text_user_wrote: '%s 写到：'
+text_enumeration_category_reassign_to: '将它们关联到新的枚举值：'
+text_enumeration_destroy_question: '%d 个对象被关联到了这个枚举值。'
 
 default_role_manager: 管理人员
 default_role_developper: 开发人员
@@ -625,9 +631,3 @@ default_activity_development: 开发
 enumeration_issue_priorities: 问题优先级
 enumeration_doc_categories: 文档类别
 enumeration_activities: 活动（时间跟踪）
-text_enumeration_category_reassign_to: 'Reassign them to this value:'
-text_enumeration_destroy_question: '%d objects are assigned to this value.'
-label_incoming_emails: Incoming emails
-label_generate_key: Generate a key
-setting_mail_handler_api_enabled: Enable WS for incoming emails
-setting_mail_handler_api_key: API key

From a4a8b6381e4a162da85319e216a770ee7bd82202 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Thu, 26 Jun 2008 19:46:57 +0000
Subject: [PATCH 568/710] Adds a key in lang files
 (general_csv_decimal_separator) to set the decimal separator (point or comma)
 in csv exports (#1372).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1591 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/helpers/issues_helper.rb  | 3 ++-
 app/helpers/timelog_helper.rb | 3 ++-
 lang/bg.yml                   | 1 +
 lang/cs.yml                   | 1 +
 lang/da.yml                   | 1 +
 lang/de.yml                   | 1 +
 lang/en.yml                   | 1 +
 lang/es.yml                   | 1 +
 lang/fi.yml                   | 1 +
 lang/fr.yml                   | 1 +
 lang/he.yml                   | 1 +
 lang/hu.yml                   | 1 +
 lang/it.yml                   | 1 +
 lang/ja.yml                   | 1 +
 lang/ko.yml                   | 1 +
 lang/lt.yml                   | 1 +
 lang/nl.yml                   | 1 +
 lang/no.yml                   | 1 +
 lang/pl.yml                   | 1 +
 lang/pt-br.yml                | 1 +
 lang/pt.yml                   | 1 +
 lang/ro.yml                   | 1 +
 lang/ru.yml                   | 1 +
 lang/sr.yml                   | 1 +
 lang/sv.yml                   | 1 +
 lang/th.yml                   | 1 +
 lang/uk.yml                   | 1 +
 lang/zh-tw.yml                | 1 +
 lang/zh.yml                   | 1 +
 29 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/app/helpers/issues_helper.rb b/app/helpers/issues_helper.rb
index e8f21e9a4..f42002ec8 100644
--- a/app/helpers/issues_helper.rb
+++ b/app/helpers/issues_helper.rb
@@ -126,6 +126,7 @@ module IssuesHelper
   
   def issues_to_csv(issues, project = nil)
     ic = Iconv.new(l(:general_csv_encoding), 'UTF-8')    
+    decimal_separator = l(:general_csv_decimal_separator)
     export = StringIO.new
     CSV::Writer.generate(export, l(:general_csv_separator)) do |csv|
       # csv header fields
@@ -168,7 +169,7 @@ module IssuesHelper
                   format_date(issue.start_date),
                   format_date(issue.due_date),
                   issue.done_ratio,
-                  issue.estimated_hours,
+                  issue.estimated_hours.to_s.gsub('.', decimal_separator),
                   format_time(issue.created_on),  
                   format_time(issue.updated_on)
                   ]
diff --git a/app/helpers/timelog_helper.rb b/app/helpers/timelog_helper.rb
index db13556a1..7fd70e744 100644
--- a/app/helpers/timelog_helper.rb
+++ b/app/helpers/timelog_helper.rb
@@ -44,6 +44,7 @@ module TimelogHelper
   
   def entries_to_csv(entries)
     ic = Iconv.new(l(:general_csv_encoding), 'UTF-8')    
+    decimal_separator = l(:general_csv_decimal_separator)
     export = StringIO.new
     CSV::Writer.generate(export, l(:general_csv_separator)) do |csv|
       # csv header fields
@@ -67,7 +68,7 @@ module TimelogHelper
                   (entry.issue ? entry.issue.id : nil),
                   (entry.issue ? entry.issue.tracker : nil),
                   (entry.issue ? entry.issue.subject : nil),
-                  entry.hours,
+                  entry.hours.to_s.gsub('.', decimal_separator),
                   entry.comments
                   ]
         csv << fields.collect {|c| begin; ic.iconv(c.to_s); rescue; c.to_s; end }
diff --git a/lang/bg.yml b/lang/bg.yml
index 1339d9a83..fd6e7e6cf 100644
--- a/lang/bg.yml
+++ b/lang/bg.yml
@@ -48,6 +48,7 @@ general_text_no: 'не'
 general_text_yes: 'да'
 general_lang_name: 'Bulgarian'
 general_csv_separator: ','
+general_csv_decimal_separator: '.'
 general_csv_encoding: UTF-8
 general_pdf_encoding: UTF-8
 general_day_names: Понеделник,Вторник,Сряда,Четвъртък,Петък,Събота,Неделя
diff --git a/lang/cs.yml b/lang/cs.yml
index 00d0642de..2c760722b 100644
--- a/lang/cs.yml
+++ b/lang/cs.yml
@@ -51,6 +51,7 @@ general_text_no: 'ne'
 general_text_yes: 'ano'
 general_lang_name: 'Čeština'
 general_csv_separator: ','
+general_csv_decimal_separator: '.'
 general_csv_encoding: UTF-8
 general_pdf_encoding: UTF-8
 general_day_names: Pondělí,Úterý,Středa,Čtvrtek,Pátek,Sobota,Neděle
diff --git a/lang/da.yml b/lang/da.yml
index b8546ab20..d51d30817 100644
--- a/lang/da.yml
+++ b/lang/da.yml
@@ -48,6 +48,7 @@ general_text_no: 'nej'
 general_text_yes: 'ja'
 general_lang_name: 'Danish (Dansk)'
 general_csv_separator: ','
+general_csv_decimal_separator: '.'
 general_csv_encoding: ISO-8859-1
 general_pdf_encoding: ISO-8859-1
 general_day_names: Mandag,Tirsdag,Onsdag,Torsdag,Fredag,Lørdag,Søndag
diff --git a/lang/de.yml b/lang/de.yml
index 6bc7919f9..2bc0a16f7 100644
--- a/lang/de.yml
+++ b/lang/de.yml
@@ -48,6 +48,7 @@ general_text_no: 'nein'
 general_text_yes: 'ja'
 general_lang_name: 'Deutsch'
 general_csv_separator: ';'
+general_csv_decimal_separator: ','
 general_csv_encoding: ISO-8859-1
 general_pdf_encoding: ISO-8859-1
 general_day_names: Montag,Dienstag,Mittwoch,Donnerstag,Freitag,Samstag,Sonntag
diff --git a/lang/en.yml b/lang/en.yml
index 7ab73f051..180a70565 100644
--- a/lang/en.yml
+++ b/lang/en.yml
@@ -48,6 +48,7 @@ general_text_no: 'no'
 general_text_yes: 'yes'
 general_lang_name: 'English'
 general_csv_separator: ','
+general_csv_decimal_separator: '.'
 general_csv_encoding: ISO-8859-1
 general_pdf_encoding: ISO-8859-1
 general_day_names: Monday,Tuesday,Wednesday,Thursday,Friday,Saturday,Sunday
diff --git a/lang/es.yml b/lang/es.yml
index 2615d8f61..44d48190b 100644
--- a/lang/es.yml
+++ b/lang/es.yml
@@ -48,6 +48,7 @@ general_text_no: 'no'
 general_text_yes: 'sí'
 general_lang_name: 'Español'
 general_csv_separator: ';'
+general_csv_decimal_separator: ','
 general_csv_encoding: ISO-8859-15
 general_pdf_encoding: ISO-8859-15
 general_day_names: Lunes,Martes,Miércoles,Jueves,Viernes,Sábado,Domingo
diff --git a/lang/fi.yml b/lang/fi.yml
index 51b0c04a0..ad719dd6c 100644
--- a/lang/fi.yml
+++ b/lang/fi.yml
@@ -48,6 +48,7 @@ general_text_no: 'ei'
 general_text_yes: 'kyllä'
 general_lang_name: 'Finnish (Suomi)'
 general_csv_separator: ','
+general_csv_decimal_separator: '.'
 general_csv_encoding: ISO-8859-1
 general_pdf_encoding: ISO-8859-1
 general_day_names: Maanantai,Tiistai,Keskiviikko,Torstai,Perjantai,Lauantai,Sunnuntai
diff --git a/lang/fr.yml b/lang/fr.yml
index 1fd86dd07..89b0b4c86 100644
--- a/lang/fr.yml
+++ b/lang/fr.yml
@@ -48,6 +48,7 @@ general_text_no: 'non'
 general_text_yes: 'oui'
 general_lang_name: 'Français'
 general_csv_separator: ';'
+general_csv_decimal_separator: ','
 general_csv_encoding: ISO-8859-1
 general_pdf_encoding: ISO-8859-1
 general_day_names: Lundi,Mardi,Mercredi,Jeudi,Vendredi,Samedi,Dimanche
diff --git a/lang/he.yml b/lang/he.yml
index 7455fc395..501cfdc9b 100644
--- a/lang/he.yml
+++ b/lang/he.yml
@@ -48,6 +48,7 @@ general_text_no: 'לא'
 general_text_yes: 'כן'
 general_lang_name: 'Hebrew (עברית)'
 general_csv_separator: ','
+general_csv_decimal_separator: '.'
 general_csv_encoding: ISO-8859-8-I
 general_pdf_encoding: ISO-8859-8-I
 general_day_names: שני,שלישי,רביעי,חמישי,שישי,שבת,ראשון
diff --git a/lang/hu.yml b/lang/hu.yml
index 1810e93d8..6f88eb962 100644
--- a/lang/hu.yml
+++ b/lang/hu.yml
@@ -48,6 +48,7 @@ general_text_no: 'nem'
 general_text_yes: 'igen'
 general_lang_name: 'Magyar'
 general_csv_separator: ','
+general_csv_decimal_separator: '.'
 general_csv_encoding: ISO-8859-2
 general_pdf_encoding: ISO-8859-2
 general_day_names: Hétfő,Kedd,Szerda,Csütörtök,Péntek,Szombat,Vasárnap
diff --git a/lang/it.yml b/lang/it.yml
index 867c73f9a..14dc86fff 100644
--- a/lang/it.yml
+++ b/lang/it.yml
@@ -48,6 +48,7 @@ general_text_no: 'no'
 general_text_yes: 'si'
 general_lang_name: 'Italiano'
 general_csv_separator: ','
+general_csv_decimal_separator: '.'
 general_csv_encoding: ISO-8859-1
 general_pdf_encoding: ISO-8859-1
 general_day_names: Lunedì,Martedì,Mercoledì,Giovedì,Venerdì,Sabato,Domenica
diff --git a/lang/ja.yml b/lang/ja.yml
index aa4320c3a..5bdc3b554 100644
--- a/lang/ja.yml
+++ b/lang/ja.yml
@@ -49,6 +49,7 @@ general_text_no: 'いいえ'
 general_text_yes: 'はい'
 general_lang_name: 'Japanese (日本語)'
 general_csv_separator: ','
+general_csv_decimal_separator: '.'
 general_csv_encoding: SJIS
 general_pdf_encoding: UTF-8
 general_day_names: 月曜日,火曜日,水曜日,木曜日,金曜日,土曜日,日曜日
diff --git a/lang/ko.yml b/lang/ko.yml
index f945537a9..8e0d35ef4 100644
--- a/lang/ko.yml
+++ b/lang/ko.yml
@@ -48,6 +48,7 @@ general_text_no: '아니오'
 general_text_yes: '예'
 general_lang_name: 'Korean (한국어)'
 general_csv_separator: ','
+general_csv_decimal_separator: '.'
 general_csv_encoding: CP949
 general_pdf_encoding: CP949
 general_day_names: 월요일,화요일,수요일,목요일,금요일,토요일,일요일
diff --git a/lang/lt.yml b/lang/lt.yml
index 355f473c8..df2e2b471 100644
--- a/lang/lt.yml
+++ b/lang/lt.yml
@@ -48,6 +48,7 @@ general_text_no: 'ne'
 general_text_yes: 'taip'
 general_lang_name: 'Lithuanian (lietuvių)'
 general_csv_separator: ','
+general_csv_decimal_separator: '.'
 general_csv_encoding: UTF-8
 general_pdf_encoding: UTF-8
 general_day_names: pirmadienis,antradienis,trečiadienis,ketvirtadienis,penktadienis,šeštadienis,sekmadienis
diff --git a/lang/nl.yml b/lang/nl.yml
index 89b8a5736..d1facc7a6 100644
--- a/lang/nl.yml
+++ b/lang/nl.yml
@@ -48,6 +48,7 @@ general_text_no: 'nee'
 general_text_yes: 'ja'
 general_lang_name: 'Nederlands'
 general_csv_separator: ','
+general_csv_decimal_separator: '.'
 general_csv_encoding: ISO-8859-1
 general_pdf_encoding: ISO-8859-1
 general_day_names: Maandag, Dinsdag, Woensdag, Donderdag, Vrijdag, Zaterdag, Zondag
diff --git a/lang/no.yml b/lang/no.yml
index 5e4bdcca3..bf25a15a5 100644
--- a/lang/no.yml
+++ b/lang/no.yml
@@ -48,6 +48,7 @@ general_text_no: 'nei'
 general_text_yes: 'ja'
 general_lang_name: 'Norwegian (Norsk bokmål)'
 general_csv_separator: ','
+general_csv_decimal_separator: '.'
 general_csv_encoding: ISO-8859-1
 general_pdf_encoding: ISO-8859-1
 general_day_names: Mandag,Tirsdag,Onsdag,Torsdag,Fredag,Lørdag,Søndag
diff --git a/lang/pl.yml b/lang/pl.yml
index 0b0f87b6f..28c5f19d4 100644
--- a/lang/pl.yml
+++ b/lang/pl.yml
@@ -48,6 +48,7 @@ general_text_no: 'nie'
 general_text_yes: 'tak'
 general_lang_name: 'Polski'
 general_csv_separator: ','
+general_csv_decimal_separator: '.'
 general_csv_encoding: ISO-8859-2
 general_pdf_encoding: ISO-8859-2
 general_day_names: Poniedziałek,Wtorek,Środa,Czwartek,Piątek,Sobota,Niedziela
diff --git a/lang/pt-br.yml b/lang/pt-br.yml
index e2036afde..04c3b347c 100644
--- a/lang/pt-br.yml
+++ b/lang/pt-br.yml
@@ -48,6 +48,7 @@ general_text_no: 'não'
 general_text_yes: 'sim'
 general_lang_name: 'Português(Brasil)'
 general_csv_separator: ','
+general_csv_decimal_separator: '.'
 general_csv_encoding: ISO-8859-1
 general_pdf_encoding: ISO-8859-1
 general_day_names: Segunda,Terça,Quarta,Quinta,Sexta,Sabado,Domingo
diff --git a/lang/pt.yml b/lang/pt.yml
index 543743cab..5a1ffc2e0 100644
--- a/lang/pt.yml
+++ b/lang/pt.yml
@@ -48,6 +48,7 @@ general_text_no: 'não'
 general_text_yes: 'sim'
 general_lang_name: 'Português'
 general_csv_separator: ','
+general_csv_decimal_separator: '.'
 general_csv_encoding: ISO-8859-1
 general_pdf_encoding: ISO-8859-1
 general_day_names: Segunda,Terça,Quarta,Quinta,Sexta,Sábado,Domingo
diff --git a/lang/ro.yml b/lang/ro.yml
index 16c2ea104..3a1696c7b 100644
--- a/lang/ro.yml
+++ b/lang/ro.yml
@@ -48,6 +48,7 @@ general_text_no: 'nu'
 general_text_yes: 'da'
 general_lang_name: 'Română'
 general_csv_separator: ','
+general_csv_decimal_separator: '.'
 general_csv_encoding: ISO-8859-1
 general_pdf_encoding: ISO-8859-1
 general_day_names: Luni,Marti,Miercuri,Joi,Vineri,Sambata,Duminica
diff --git a/lang/ru.yml b/lang/ru.yml
index 10ea1aad6..7d0707f7f 100644
--- a/lang/ru.yml
+++ b/lang/ru.yml
@@ -48,6 +48,7 @@ general_text_no: 'Нет'
 general_text_yes: 'Да'
 general_lang_name: 'Russian (Русский)'
 general_csv_separator: ','
+general_csv_decimal_separator: '.'
 general_csv_encoding: UTF-8
 general_pdf_encoding: UTF-8
 general_day_names: Понедельник,Вторник,Среда,Четверг,Пятница,Суббота,Воскресенье
diff --git a/lang/sr.yml b/lang/sr.yml
index 83bfdf43c..5b8e5d934 100644
--- a/lang/sr.yml
+++ b/lang/sr.yml
@@ -48,6 +48,7 @@ general_text_no: 'ne'
 general_text_yes: 'da'
 general_lang_name: 'Srpski'
 general_csv_separator: ','
+general_csv_decimal_separator: '.'
 general_csv_encoding: ISO-8859-1
 general_pdf_encoding: ISO-8859-1
 general_day_names: Ponedeljak, Utorak, Sreda, četvrtak, Petak, Subota, Nedelja
diff --git a/lang/sv.yml b/lang/sv.yml
index 375970f3e..4c6170f4a 100644
--- a/lang/sv.yml
+++ b/lang/sv.yml
@@ -48,6 +48,7 @@ general_text_no: 'nej'
 general_text_yes: 'ja'
 general_lang_name: 'Svenska'
 general_csv_separator: ','
+general_csv_decimal_separator: '.'
 general_csv_encoding: ISO-8859-1
 general_pdf_encoding: ISO-8859-1
 general_day_names: Måndag,Tisdag,Onsdag,Torsdag,Fredag,Lördag,Söndag
diff --git a/lang/th.yml b/lang/th.yml
index acbf146cf..e7f276a34 100644
--- a/lang/th.yml
+++ b/lang/th.yml
@@ -48,6 +48,7 @@ general_text_no: 'ไม่'
 general_text_yes: 'ใช่'
 general_lang_name: 'Thai (ไทย)'
 general_csv_separator: ','
+general_csv_decimal_separator: '.'
 general_csv_encoding: Windows-874
 general_pdf_encoding: cp874
 general_day_names: จันทร์,อังคาร,พุธ,พฤหัสบดี,ศุกร์,เสาร์,อาทิตย์
diff --git a/lang/uk.yml b/lang/uk.yml
index d70916b1e..275de0e4b 100644
--- a/lang/uk.yml
+++ b/lang/uk.yml
@@ -48,6 +48,7 @@ general_text_no: 'Ні'
 general_text_yes: 'Так'
 general_lang_name: 'Ukrainian (Українська)'
 general_csv_separator: ','
+general_csv_decimal_separator: '.'
 general_csv_encoding: UTF-8
 general_pdf_encoding: UTF-8
 general_day_names: Понеділок,Вівторок,Середа,Четвер,П'ятниця,Субота,Неділя
diff --git a/lang/zh-tw.yml b/lang/zh-tw.yml
index 462633575..26ffa9461 100644
--- a/lang/zh-tw.yml
+++ b/lang/zh-tw.yml
@@ -48,6 +48,7 @@ general_text_no: '否'
 general_text_yes: '是'
 general_lang_name: 'Traditional Chinese (繁體中文)'
 general_csv_separator: ','
+general_csv_decimal_separator: '.'
 general_csv_encoding: Big5
 general_pdf_encoding: Big5
 general_day_names: 星期一,星期二,星期三,星期四,星期五,星期六,星期日
diff --git a/lang/zh.yml b/lang/zh.yml
index f412f848c..2bd0880a5 100644
--- a/lang/zh.yml
+++ b/lang/zh.yml
@@ -48,6 +48,7 @@ general_text_no: '否'
 general_text_yes: '是'
 general_lang_name: 'Simplified Chinese (简体中文)'
 general_csv_separator: ','
+general_csv_decimal_separator: '.'
 general_csv_encoding: gb2312
 general_pdf_encoding: gb2312
 general_day_names: 星期一,星期二,星期三,星期四,星期五,星期六,星期日

From ce6cf66f6c3af26383cd25ed012d908be4b40bae Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Fri, 27 Jun 2008 20:13:56 +0000
Subject: [PATCH 569/710] Custom fields refactoring: most of code moved from
 controllers to models (using new module ActsAsCustomizable).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1592 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/account_controller.rb         |  5 --
 app/controllers/issues_controller.rb          | 24 ++---
 app/controllers/projects_controller.rb        | 14 +--
 app/controllers/timelog_controller.rb         |  2 +-
 app/controllers/users_controller.rb           | 11 +--
 app/helpers/custom_fields_helper.rb           | 27 +++---
 app/helpers/issues_helper.rb                  |  2 +-
 app/models/issue.rb                           | 14 ++-
 app/models/project.rb                         | 13 +--
 app/models/query.rb                           |  4 +-
 app/models/user.rb                            |  8 +-
 app/views/account/register.rhtml              |  4 +-
 app/views/issues/_form_custom_fields.rhtml    | 13 +--
 app/views/issues/show.rhtml                   |  6 +-
 app/views/projects/_form.rhtml                | 12 +--
 app/views/projects/show.rhtml                 |  2 +-
 app/views/users/_form.rhtml                   |  6 +-
 test/fixtures/custom_fields.yml               | 11 ++-
 test/functional/issues_controller_test.rb     | 87 +++++++++++++++++--
 test/functional/projects_controller_test.rb   |  2 +-
 test/integration/admin_test.rb                |  5 +-
 test/unit/issue_test.rb                       | 78 ++++++++++++++++-
 vendor/plugins/acts_as_customizable/init.rb   |  2 +
 .../lib/acts_as_customizable.rb               | 82 +++++++++++++++++
 24 files changed, 321 insertions(+), 113 deletions(-)
 create mode 100644 vendor/plugins/acts_as_customizable/init.rb
 create mode 100644 vendor/plugins/acts_as_customizable/lib/acts_as_customizable.rb

diff --git a/app/controllers/account_controller.rb b/app/controllers/account_controller.rb
index 3fbbc8912..a9b8a1b82 100644
--- a/app/controllers/account_controller.rb
+++ b/app/controllers/account_controller.rb
@@ -110,17 +110,12 @@ class AccountController < ApplicationController
     redirect_to(home_url) && return unless Setting.self_registration?
     if request.get?
       @user = User.new(:language => Setting.default_language)
-      @custom_values = UserCustomField.find(:all).collect { |x| CustomValue.new(:custom_field => x, :customized => @user) }
     else
       @user = User.new(params[:user])
       @user.admin = false
       @user.login = params[:user][:login]
       @user.status = User::STATUS_REGISTERED
       @user.password, @user.password_confirmation = params[:password], params[:password_confirmation]
-      @custom_values = UserCustomField.find(:all).collect { |x| CustomValue.new(:custom_field => x, 
-                                                                                :customized => @user, 
-                                                                                :value => (params["custom_fields"] ? params["custom_fields"][x.id.to_s] : nil)) }
-      @user.custom_values = @custom_values
       case Setting.self_registration
       when '1'
         # Email activation
diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index 69c8e7932..49b443238 100644
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -94,7 +94,6 @@ class IssuesController < ApplicationController
   end
   
   def show
-    @custom_values = @project.custom_fields_for_issues(@issue.tracker).collect { |x| @issue.custom_values.find_by_custom_field_id(x.id) || CustomValue.new(:custom_field => x, :customized => @issue) }
     @journals = @issue.journals.find(:all, :include => [:user, :details], :order => "#{Journal.table_name}.created_on ASC")
     @journals.each_with_index {|j,i| j.indice = i+1}
     @journals.reverse! if User.current.wants_comments_in_reverse_order?
@@ -113,15 +112,17 @@ class IssuesController < ApplicationController
   # Add a new issue
   # The new issue will be created from an existing one if copy_from parameter is given
   def new
-    @issue = params[:copy_from] ? Issue.new.copy_from(params[:copy_from]) : Issue.new(params[:issue])
+    @issue = Issue.new
+    @issue.copy_from(params[:copy_from]) if params[:copy_from]
     @issue.project = @project
-    @issue.author = User.current
     @issue.tracker ||= @project.trackers.find(params[:tracker_id] ? params[:tracker_id] : :first)
     if @issue.tracker.nil?
       flash.now[:error] = 'No tracker is associated to this project. Please check the Project settings.'
       render :nothing => true, :layout => true
       return
     end
+    @issue.attributes = params[:issue]
+    @issue.author = User.current
     
     default_status = IssueStatus.default
     unless default_status
@@ -134,17 +135,10 @@ class IssuesController < ApplicationController
     
     if request.get? || request.xhr?
       @issue.start_date ||= Date.today
-      @custom_values = @issue.custom_values.empty? ?
-        @project.custom_fields_for_issues(@issue.tracker).collect { |x| CustomValue.new(:custom_field => x, :customized => @issue) } :
-        @issue.custom_values
     else
       requested_status = IssueStatus.find_by_id(params[:issue][:status_id])
       # Check that the user is allowed to apply the requested status
       @issue.status = (@allowed_statuses.include? requested_status) ? requested_status : default_status
-      @custom_values = @project.custom_fields_for_issues(@issue.tracker).collect { |x| CustomValue.new(:custom_field => x, 
-                                                                                                       :customized => @issue,
-                                                                                                       :value => (params[:custom_fields] ? params[:custom_fields][x.id.to_s] : nil)) }
-      @issue.custom_values = @custom_values
       if @issue.save
         attach_files(@issue, params[:attachments])
         flash[:notice] = l(:notice_successful_create)
@@ -165,7 +159,6 @@ class IssuesController < ApplicationController
     @allowed_statuses = @issue.new_statuses_allowed_to(User.current)
     @activities = Enumeration::get_values('ACTI')
     @priorities = Enumeration::get_values('IPRI')
-    @custom_values = []
     @edit_allowed = User.current.allowed_to?(:edit_issues, @project)
     
     @notes = params[:notes]
@@ -178,14 +171,7 @@ class IssuesController < ApplicationController
       @issue.attributes = attrs
     end
 
-    if request.get?
-      @custom_values = @project.custom_fields_for_issues(@issue.tracker).collect { |x| @issue.custom_values.find_by_custom_field_id(x.id) || CustomValue.new(:custom_field => x, :customized => @issue) }
-    else
-      # Update custom fields if user has :edit permission
-      if @edit_allowed && params[:custom_fields]
-        @custom_values = @project.custom_fields_for_issues(@issue.tracker).collect { |x| CustomValue.new(:custom_field => x, :customized => @issue, :value => params["custom_fields"][x.id.to_s]) }
-        @issue.custom_values = @custom_values
-      end
+    if request.post?
       @time_entry = TimeEntry.new(:project => @project, :issue => @issue, :user => User.current, :spent_on => Date.today)
       @time_entry.attributes = params[:time_entry]
       attachments = attach_files(@issue, params[:attachments])
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index c9a55088b..a37ae09a8 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -63,21 +63,17 @@ class ProjectsController < ApplicationController
   
   # Add a new project
   def add
-    @custom_fields = IssueCustomField.find(:all, :order => "#{CustomField.table_name}.position")
+    @issue_custom_fields = IssueCustomField.find(:all, :order => "#{CustomField.table_name}.position")
     @trackers = Tracker.all
     @root_projects = Project.find(:all,
                                   :conditions => "parent_id IS NULL AND status = #{Project::STATUS_ACTIVE}",
                                   :order => 'name')
     @project = Project.new(params[:project])
     if request.get?
-      @custom_values = ProjectCustomField.find(:all, :order => "#{CustomField.table_name}.position").collect { |x| CustomValue.new(:custom_field => x, :customized => @project) }
       @project.trackers = Tracker.all
       @project.is_public = Setting.default_projects_public?
       @project.enabled_module_names = Redmine::AccessControl.available_project_modules
     else
-      @project.custom_fields = CustomField.find(params[:custom_field_ids]) if params[:custom_field_ids]
-      @custom_values = ProjectCustomField.find(:all, :order => "#{CustomField.table_name}.position").collect { |x| CustomValue.new(:custom_field => x, :customized => @project, :value => (params[:custom_fields] ? params["custom_fields"][x.id.to_s] : nil)) }
-      @project.custom_values = @custom_values
       @project.enabled_module_names = params[:enabled_modules]
       if @project.save
         flash[:notice] = l(:notice_successful_create)
@@ -88,7 +84,6 @@ class ProjectsController < ApplicationController
 	
   # Show @project
   def show
-    @custom_values = @project.custom_values.find(:all, :include => :custom_field, :order => "#{CustomField.table_name}.position")
     @members_by_role = @project.members.find(:all, :include => [:user, :role], :order => 'position').group_by {|m| m.role}
     @subprojects = @project.children.find(:all, :conditions => Project.visible_by(User.current))
     @news = @project.news.find(:all, :limit => 5, :include => [ :author, :project ], :order => "#{News.table_name}.created_on DESC")
@@ -115,11 +110,10 @@ class ProjectsController < ApplicationController
     @root_projects = Project.find(:all,
                                   :conditions => ["parent_id IS NULL AND status = #{Project::STATUS_ACTIVE} AND id <> ?", @project.id],
                                   :order => 'name')
-    @custom_fields = IssueCustomField.find(:all)
+    @issue_custom_fields = IssueCustomField.find(:all, :order => "#{CustomField.table_name}.position")
     @issue_category ||= IssueCategory.new
     @member ||= @project.members.new
     @trackers = Tracker.all
-    @custom_values ||= ProjectCustomField.find(:all, :order => "#{CustomField.table_name}.position").collect { |x| @project.custom_values.find_by_custom_field_id(x.id) || CustomValue.new(:custom_field => x) }
     @repository ||= @project.repository
     @wiki ||= @project.wiki
   end
@@ -127,10 +121,6 @@ class ProjectsController < ApplicationController
   # Edit @project
   def edit
     if request.post?
-      if params[:custom_fields]
-        @custom_values = ProjectCustomField.find(:all, :order => "#{CustomField.table_name}.position").collect { |x| CustomValue.new(:custom_field => x, :customized => @project, :value => params["custom_fields"][x.id.to_s]) }
-        @project.custom_values = @custom_values
-      end
       @project.attributes = params[:project]
       if @project.save
         flash[:notice] = l(:notice_successful_update)
diff --git a/app/controllers/timelog_controller.rb b/app/controllers/timelog_controller.rb
index 2e257c5aa..cf1c844df 100644
--- a/app/controllers/timelog_controller.rb
+++ b/app/controllers/timelog_controller.rb
@@ -54,7 +54,7 @@ class TimelogController < ApplicationController
                            }
     
     # Add list and boolean custom fields as available criterias
-    @project.all_custom_fields.select {|cf| %w(list bool).include? cf.field_format }.each do |cf|
+    @project.all_issue_custom_fields.select {|cf| %w(list bool).include? cf.field_format }.each do |cf|
       @available_criterias["cf_#{cf.id}"] = {:sql => "(SELECT c.value FROM custom_values c WHERE c.custom_field_id = #{cf.id} AND c.customized_type = 'Issue' AND c.customized_id = issues.id)",
                                              :format => cf.field_format,
                                              :label => cf.name}
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index c37709661..eb8aa7bac 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -52,14 +52,11 @@ class UsersController < ApplicationController
   def add
     if request.get?
       @user = User.new(:language => Setting.default_language)
-      @custom_values = UserCustomField.find(:all, :order => "#{CustomField.table_name}.position").collect { |x| CustomValue.new(:custom_field => x, :customized => @user) }
     else
       @user = User.new(params[:user])
       @user.admin = params[:user][:admin] || false
       @user.login = params[:user][:login]
       @user.password, @user.password_confirmation = params[:password], params[:password_confirmation] unless @user.auth_source_id
-      @custom_values = UserCustomField.find(:all, :order => "#{CustomField.table_name}.position").collect { |x| CustomValue.new(:custom_field => x, :customized => @user, :value => (params[:custom_fields] ? params["custom_fields"][x.id.to_s] : nil)) }
-      @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)
@@ -71,16 +68,10 @@ class UsersController < ApplicationController
 
   def edit
     @user = User.find(params[:id])
-    if request.get?
-      @custom_values = UserCustomField.find(:all, :order => "#{CustomField.table_name}.position").collect { |x| @user.custom_values.find_by_custom_field_id(x.id) || CustomValue.new(:custom_field => x) }
-    else
+    if request.post?
       @user.admin = params[:user][:admin] if params[:user][:admin]
       @user.login = params[:user][:login] if params[:user][:login]
       @user.password, @user.password_confirmation = params[:password], params[:password_confirmation] unless params[:password].nil? or params[:password].empty? or @user.auth_source_id
-      if params[:custom_fields]
-        @custom_values = UserCustomField.find(:all, :order => "#{CustomField.table_name}.position").collect { |x| CustomValue.new(:custom_field => x, :customized => @user, :value => params["custom_fields"][x.id.to_s]) }
-        @user.custom_values = @custom_values
-      end
       if @user.update_attributes(params[:user])
         flash[:notice] = l(:notice_successful_update)
         # Give a string to redirect_to otherwise it would use status param as the response code
diff --git a/app/helpers/custom_fields_helper.rb b/app/helpers/custom_fields_helper.rb
index 61c8d6b36..540c6b4a1 100644
--- a/app/helpers/custom_fields_helper.rb
+++ b/app/helpers/custom_fields_helper.rb
@@ -25,37 +25,40 @@ module CustomFieldsHelper
   end
   
   # Return custom field html tag corresponding to its format
-  def custom_field_tag(custom_value)	
+  def custom_field_tag(name, custom_value)	
     custom_field = custom_value.custom_field
-    field_name = "custom_fields[#{custom_field.id}]"
-    field_id = "custom_fields_#{custom_field.id}"
+    field_name = "#{name}[custom_field_values][#{custom_field.id}]"
+    field_id = "#{name}_custom_field_values_#{custom_field.id}"
     
     case custom_field.field_format
     when "date"
-      text_field('custom_value', 'value', :name => field_name, :id => field_id, :size => 10) + 
+      text_field_tag(field_name, custom_value.value, :id => field_id, :size => 10) + 
       calendar_for(field_id)
     when "text"
-      text_area 'custom_value', 'value', :name => field_name, :id => field_id, :rows => 3, :style => 'width:99%'
+      text_area_tag(field_name, custom_value.value, :id => field_id, :rows => 3, :style => 'width:90%')
     when "bool"
-      check_box 'custom_value', 'value', :name => field_name, :id => field_id
+      check_box_tag(field_name, custom_value.value, :id => field_id)
     when "list"
-      select 'custom_value', 'value', custom_field.possible_values, { :include_blank => true }, :name => field_name, :id => field_id
+      blank_option = custom_field.is_required? ?
+                       (custom_field.default_value.blank? ? "<option value=\"\">--- #{l(:actionview_instancetag_blank_option)} ---</option>" : '') : 
+                       '<option></option>'
+      select_tag(field_name, blank_option + options_for_select(custom_field.possible_values, custom_value.value), :id => field_id)
     else
-      text_field 'custom_value', 'value', :name => field_name, :id => field_id
+      text_field_tag(field_name, custom_value.value, :id => field_id)
     end
   end
   
   # Return custom field label tag
-  def custom_field_label_tag(custom_value)
+  def custom_field_label_tag(name, custom_value)
     content_tag "label", custom_value.custom_field.name +
 	(custom_value.custom_field.is_required? ? " <span class=\"required\">*</span>" : ""),
-	:for => "custom_fields_#{custom_value.custom_field.id}",
+	:for => "#{name}_custom_field_values_#{custom_value.custom_field.id}",
 	:class => (custom_value.errors.empty? ? nil : "error" )
   end
   
   # Return custom field tag with its label tag
-  def custom_field_tag_with_label(custom_value)
-    custom_field_label_tag(custom_value) + custom_field_tag(custom_value)
+  def custom_field_tag_with_label(name, custom_value)
+    custom_field_label_tag(name, custom_value) + custom_field_tag(name, custom_value)
   end
 
   # Return a string used to display a custom value
diff --git a/app/helpers/issues_helper.rb b/app/helpers/issues_helper.rb
index f42002ec8..403697178 100644
--- a/app/helpers/issues_helper.rb
+++ b/app/helpers/issues_helper.rb
@@ -149,7 +149,7 @@ module IssuesHelper
                   ]
       # Export project custom fields if project is given
       # otherwise export custom fields marked as "For all projects"
-      custom_fields = project.nil? ? IssueCustomField.for_all : project.all_custom_fields
+      custom_fields = project.nil? ? IssueCustomField.for_all : project.all_issue_custom_fields
       custom_fields.each {|f| headers << f.name}
       # Description in the last column
       headers << l(:field_description)
diff --git a/app/models/issue.rb b/app/models/issue.rb
index d83b2ab02..326e234b0 100644
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -28,13 +28,12 @@ class Issue < ActiveRecord::Base
   has_many :journals, :as => :journalized, :dependent => :destroy
   has_many :attachments, :as => :container, :dependent => :destroy
   has_many :time_entries, :dependent => :delete_all
-  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_customizable
   acts_as_watchable
   acts_as_searchable :columns => ['subject', "#{table_name}.description"], :include => :project, :with => {:journal => :issue}
   acts_as_event :title => Proc.new {|o| "#{o.tracker.name} ##{o.id}: #{o.subject}"},
@@ -44,7 +43,6 @@ class Issue < ActiveRecord::Base
   validates_length_of :subject, :maximum => 255
   validates_inclusion_of :done_ratio, :in => 0..100
   validates_numericality_of :estimated_hours, :allow_nil => true
-  validates_associated :custom_values, :on => :update
 
   def after_initialize
     if new_record?
@@ -54,6 +52,11 @@ class Issue < ActiveRecord::Base
     end
   end
   
+  # Overrides Redmine::Acts::Customizable::InstanceMethods#available_custom_fields
+  def available_custom_fields
+    (project && tracker) ? project.all_issue_custom_fields.select {|c| tracker.custom_fields.include? c } : []
+  end
+  
   def copy_from(arg)
     issue = arg.is_a?(Issue) ? arg : Issue.find(arg)
     self.attributes = issue.attributes.dup
@@ -168,11 +171,6 @@ class Issue < ActiveRecord::Base
     end
   end
   
-  def custom_value_for(custom_field)
-    self.custom_values.each {|v| return v if v.custom_field_id == custom_field.id }
-    return nil
-  end
-  
   def init_journal(user, notes = "")
     @current_journal ||= Journal.new(:journalized => self, :user => user, :notes => notes)
     @issue_before_change = self.clone
diff --git a/app/models/project.rb b/app/models/project.rb
index f05ccb2af..a5ba246b1 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -22,7 +22,6 @@ class Project < ActiveRecord::Base
   
   has_many :members, :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 :enabled_modules, :dependent => :delete_all
   has_and_belongs_to_many :trackers, :order => "#{Tracker.table_name}.position"
   has_many :issues, :dependent => :destroy, :order => "#{Issue.table_name}.created_on DESC", :include => [:status, :tracker]
@@ -38,7 +37,7 @@ class Project < ActiveRecord::Base
   has_many :changesets, :through => :repository
   has_one :wiki, :dependent => :destroy
   # Custom field for the project issues
-  has_and_belongs_to_many :custom_fields, 
+  has_and_belongs_to_many :issue_custom_fields, 
                           :class_name => 'IssueCustomField',
                           :order => "#{CustomField.table_name}.position",
                           :join_table => "#{table_name_prefix}custom_fields_projects#{table_name_suffix}",
@@ -46,6 +45,7 @@ class Project < ActiveRecord::Base
                           
   acts_as_tree :order => "name", :counter_cache => true
 
+  acts_as_customizable
   acts_as_searchable :columns => ['name', 'description'], :project_key => 'id', :permission => nil
   acts_as_event :title => Proc.new {|o| "#{l(:label_project)}: #{o.name}"},
                 :url => Proc.new {|o| {:controller => 'projects', :action => 'show', :id => o.id}}
@@ -54,7 +54,6 @@ class Project < ActiveRecord::Base
   
   validates_presence_of :name, :identifier
   validates_uniqueness_of :name, :identifier
-  validates_associated :custom_values, :on => :update
   validates_associated :repository, :wiki
   validates_length_of :name, :maximum => 30
   validates_length_of :homepage, :maximum => 255
@@ -195,12 +194,8 @@ class Project < ActiveRecord::Base
   
   # 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)
-    all_custom_fields.select {|c| tracker.custom_fields.include? c }
-  end
-  
-  def all_custom_fields
-    @all_custom_fields ||= (IssueCustomField.for_all + custom_fields).uniq
+  def all_issue_custom_fields
+    @all_issue_custom_fields ||= (IssueCustomField.for_all + issue_custom_fields).uniq
   end
   
   def project
diff --git a/app/models/query.rb b/app/models/query.rb
index 4c72e23f2..27ab882c6 100644
--- a/app/models/query.rb
+++ b/app/models/query.rb
@@ -176,7 +176,7 @@ class Query < ActiveRecord::Base
       unless @project.active_children.empty?
         @available_filters["subproject_id"] = { :type => :list_subprojects, :order => 13, :values => @project.active_children.collect{|s| [s.name, s.id.to_s] } }
       end
-      add_custom_fields_filters(@project.all_custom_fields)
+      add_custom_fields_filters(@project.all_issue_custom_fields)
     else
       # global filters for cross project issue list
       add_custom_fields_filters(IssueCustomField.find(:all, :conditions => {:is_filter => true, :is_for_all => true}))
@@ -226,7 +226,7 @@ class Query < ActiveRecord::Base
     return @available_columns if @available_columns
     @available_columns = Query.available_columns
     @available_columns += (project ? 
-                            project.all_custom_fields :
+                            project.all_issue_custom_fields :
                             IssueCustomField.find(:all, :conditions => {:is_for_all => true})
                            ).collect {|cf| QueryCustomFieldColumn.new(cf) }      
   end
diff --git a/app/models/user.rb b/app/models/user.rb
index 5568027d5..a34b96861 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -37,12 +37,13 @@ class User < ActiveRecord::Base
 
   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_token, :dependent => :destroy, :class_name => 'Token', :conditions => "action='feeds'"
   belongs_to :auth_source
   
+  acts_as_customizable
+  
   attr_accessor :password, :password_confirmation
   attr_accessor :last_before_login_on
   # Prevents unauthorized assignments
@@ -60,7 +61,6 @@ class User < ActiveRecord::Base
   validates_length_of :mail, :maximum => 60, :allow_nil => true
   validates_length_of :password, :minimum => 4, :allow_nil => true
   validates_confirmation_of :password, :allow_nil => true
-  validates_associated :custom_values, :on => :update
 
   def before_create
     self.mail_notification = false
@@ -280,6 +280,10 @@ class AnonymousUser < User
     errors.add_to_base 'An anonymous user already exists.' if AnonymousUser.find(:first)
   end
   
+  def available_custom_fields
+    []
+  end
+  
   # Overrides a few properties
   def logged?; false end
   def admin; false end
diff --git a/app/views/account/register.rhtml b/app/views/account/register.rhtml
index 7cf4b6da3..4e2b5adf2 100644
--- a/app/views/account/register.rhtml
+++ b/app/views/account/register.rhtml
@@ -27,8 +27,8 @@
 <p><label for="user_language"><%=l(:field_language)%></label>
 <%= select("user", "language", lang_options_for_select) %></p>
 
-<% for @custom_value in @custom_values %>
-	<p><%= custom_field_tag_with_label @custom_value %></p>
+<% @user.custom_field_values.each do |value| %>
+	<p><%= custom_field_tag_with_label :user, value %></p>
 <% end %>
 <!--[eoform:user]-->
 </div>
diff --git a/app/views/issues/_form_custom_fields.rhtml b/app/views/issues/_form_custom_fields.rhtml
index 1268bb1f9..ebd4c3219 100644
--- a/app/views/issues/_form_custom_fields.rhtml
+++ b/app/views/issues/_form_custom_fields.rhtml
@@ -1,11 +1,12 @@
 <div class="splitcontentleft">
 <% i = 1 %>
-<% for @custom_value in values %>
-	<p><%= custom_field_tag_with_label @custom_value %></p>
-    <% if i == values.size / 2 %>
+<% split_on = @issue.custom_field_values.size / 2 %>
+<% @issue.custom_field_values.each do |value| %>
+	<p><%= custom_field_tag_with_label :issue, value %></p>
+<% if i == split_on -%>
 </div><div class="splitcontentright">
-    <% end %>
-    <% i += 1 %>
-<% end %>
+<% end -%>
+<% i += 1 -%>
+<% end -%>
 </div>
 <div style="clear:both;"> </div>
diff --git a/app/views/issues/show.rhtml b/app/views/issues/show.rhtml
index 57fbd05c7..a3b26be12 100644
--- a/app/views/issues/show.rhtml
+++ b/app/views/issues/show.rhtml
@@ -43,9 +43,9 @@
     <% end %>
 </tr>
 <tr>
-<% n = 0
-for custom_value in @custom_values %>
-    <td valign="top"><b><%= custom_value.custom_field.name %>:</b></td><td valign="top"><%= simple_format(h(show_value(custom_value))) %></td>
+<% n = 0 -%>
+<% @issue.custom_values.each do |value| -%>
+    <td valign="top"><b><%=h value.custom_field.name %>:</b></td><td valign="top"><%= simple_format(h(show_value(value))) %></td>
 <% n = n + 1
    if (n > 1) 
         n = 0 %>
diff --git a/app/views/projects/_form.rhtml b/app/views/projects/_form.rhtml
index 774e73977..11f7e3933 100644
--- a/app/views/projects/_form.rhtml
+++ b/app/views/projects/_form.rhtml
@@ -17,8 +17,8 @@
 <p><%= f.check_box :is_public %></p>
 <%= wikitoolbar_for 'project_description' %>
 
-<% for @custom_value in @custom_values %>
-	<p><%= custom_field_tag_with_label @custom_value %></p>
+<% @project.custom_field_values.each do |value| %>
+	<p><%= custom_field_tag_with_label :project, value %></p>
 <% end %>
 </div>
 
@@ -34,15 +34,15 @@
 </fieldset>
 <% end %>
 
-<% unless @custom_fields.empty? %>
+<% unless @issue_custom_fields.empty? %>
 <fieldset class="box"><legend><%=l(:label_custom_field_plural)%></legend>
-<% for custom_field in @custom_fields %>
+<% @issue_custom_fields.each do |custom_field| %>
     <label class="floating">
-	<%= check_box_tag 'project[custom_field_ids][]', custom_field.id, ((@project.custom_fields.include? custom_field) or custom_field.is_for_all?), (custom_field.is_for_all? ? {:disabled => "disabled"} : {}) %>
+	<%= check_box_tag 'project[issue_custom_field_ids][]', custom_field.id, (@project.all_issue_custom_fields.include? custom_field), (custom_field.is_for_all? ? {:disabled => "disabled"} : {}) %>
 	<%= custom_field.name %>
 	</label>
 <% end %>
-<%= hidden_field_tag 'project[custom_field_ids][]', '' %>
+<%= hidden_field_tag 'project[issue_custom_field_ids][]', '' %>
 </fieldset>
 <% end %>
 <!--[eoform:project]-->
diff --git a/app/views/projects/show.rhtml b/app/views/projects/show.rhtml
index 62b911937..6c82c80b4 100644
--- a/app/views/projects/show.rhtml
+++ b/app/views/projects/show.rhtml
@@ -10,7 +10,7 @@
 	<% if @project.parent %>
 	<li><%=l(:field_parent)%>: <%= link_to h(@project.parent.name), :controller => 'projects', :action => 'show', :id => @project.parent %></li>
 	<% end %>
-	<% for custom_value in @custom_values %>
+	<% @project.custom_values.each do |custom_value| %>
 	<% if !custom_value.value.empty? %>
 	   <li><%= custom_value.custom_field.name%>: <%=h show_value(custom_value) %></li>
 	<% end %>
diff --git a/app/views/users/_form.rhtml b/app/views/users/_form.rhtml
index 09a798468..799ebde47 100644
--- a/app/views/users/_form.rhtml
+++ b/app/views/users/_form.rhtml
@@ -8,9 +8,9 @@
 <p><%= f.text_field :mail, :required => true %></p>
 <p><%= f.select :language, lang_options_for_select %></p>
 
-<% for @custom_value in @custom_values %>
-	<p><%= custom_field_tag_with_label @custom_value %></p>
-<% end if @custom_values%>
+<% @user.custom_field_values.each do |value| %>
+	<p><%= custom_field_tag_with_label :user, value %></p>
+<% end %>
 
 <p><%= f.check_box :admin, :disabled => (@user == User.current) %></p>
 </div>
diff --git a/test/fixtures/custom_fields.yml b/test/fixtures/custom_fields.yml
index 9d88bc6fb..1005edae4 100644
--- a/test/fixtures/custom_fields.yml
+++ b/test/fixtures/custom_fields.yml
@@ -7,7 +7,10 @@ custom_fields_001:
   is_filter: true
   type: IssueCustomField
   max_length: 0
-  possible_values: MySQL|PostgreSQL|Oracle
+  possible_values: 
+  - MySQL
+  - PostgreSQL
+  - Oracle
   id: 1
   is_required: false
   field_format: list
@@ -33,7 +36,11 @@ custom_fields_003:
   is_filter: true
   type: ProjectCustomField
   max_length: 0
-  possible_values: Stable|Beta|Alpha|Planning
+  possible_values: 
+  - Stable
+  - Beta
+  - Alpha
+  - Planning
   id: 3
   is_required: true
   field_format: list
diff --git a/test/functional/issues_controller_test.rb b/test/functional/issues_controller_test.rb
index 32d2a7f41..ac1f4f834 100644
--- a/test/functional/issues_controller_test.rb
+++ b/test/functional/issues_controller_test.rb
@@ -170,7 +170,7 @@ class IssuesControllerTest < Test::Unit::TestCase
     assert_response :success
     assert_template 'new'
     
-    assert_tag :tag => 'input', :attributes => { :name => 'custom_fields[2]',
+    assert_tag :tag => 'input', :attributes => { :name => 'issue[custom_field_values][2]',
                                                  :value => 'Default string' }
   end
 
@@ -203,8 +203,8 @@ class IssuesControllerTest < Test::Unit::TestCase
                           :subject => 'This is the test_new issue',
                           :description => 'This is the description',
                           :priority_id => 5,
-                          :estimated_hours => ''},
-               :custom_fields => {'2' => 'Value for field 2'}
+                          :estimated_hours => '',
+                          :custom_field_values => {'2' => 'Value for field 2'}}
     assert_redirected_to 'issues/show'
     
     issue = Issue.find_by_subject('This is the test_new issue')
@@ -226,6 +226,50 @@ class IssuesControllerTest < Test::Unit::TestCase
     assert_redirected_to 'issues/show'
   end
   
+  def test_post_new_with_required_custom_field_and_without_custom_fields_param
+    field = IssueCustomField.find_by_name('Database')
+    field.update_attribute(:is_required, true)
+
+    @request.session[:user_id] = 2
+    post :new, :project_id => 1, 
+               :issue => {:tracker_id => 1,
+                          :subject => 'This is the test_new issue',
+                          :description => 'This is the description',
+                          :priority_id => 5}
+    assert_response :success
+    assert_template 'new'
+    issue = assigns(:issue)
+    assert_not_nil issue
+    assert_equal 'activerecord_error_invalid', issue.errors.on(:custom_values)
+  end
+  
+  def test_post_should_preserve_fields_values_on_validation_failure
+    @request.session[:user_id] = 2
+    post :new, :project_id => 1, 
+               :issue => {:tracker_id => 1,
+                          :subject => 'This is the test_new issue',
+                          # empty description
+                          :description => '',
+                          :priority_id => 6,
+                          :custom_field_values => {'1' => 'Oracle', '2' => 'Value for field 2'}}
+    assert_response :success
+    assert_template 'new'
+    
+    assert_tag :input, :attributes => { :name => 'issue[subject]',
+                                        :value => 'This is the test_new issue' }
+    assert_tag :select, :attributes => { :name => 'issue[priority_id]' },
+                        :child => { :tag => 'option', :attributes => { :selected => 'selected',
+                                                                       :value => '6' },
+                                                      :content => 'High' }  
+    # Custom fields
+    assert_tag :select, :attributes => { :name => 'issue[custom_field_values][1]' },
+                        :child => { :tag => 'option', :attributes => { :selected => 'selected',
+                                                                       :value => 'Oracle' },
+                                                      :content => 'Oracle' }  
+    assert_tag :input, :attributes => { :name => 'issue[custom_field_values][2]',
+                                        :value => 'Value for field 2'}
+  end
+  
   def test_copy_issue
     @request.session[:user_id] = 2
     get :new, :project_id => 1, :copy_from => 1
@@ -280,18 +324,28 @@ class IssuesControllerTest < Test::Unit::TestCase
     assert_select_rjs :show, "update"
   end
 
-  def test_post_edit
+  def test_post_edit_without_custom_fields_param
     @request.session[:user_id] = 2
     ActionMailer::Base.deliveries.clear
     
     issue = Issue.find(1)
+    assert_equal '125', issue.custom_value_for(2).value
     old_subject = issue.subject
     new_subject = 'Subject modified by IssuesControllerTest#test_post_edit'
     
-    post :edit, :id => 1, :issue => {:subject => new_subject}
+    assert_difference('Journal.count') do
+      assert_difference('JournalDetail.count', 2) do
+        post :edit, :id => 1, :issue => {:subject => new_subject,
+                                         :priority_id => '6',
+                                         :category_id => '1' # no change
+                                        }
+      end
+    end
     assert_redirected_to 'issues/show/1'
     issue.reload
     assert_equal new_subject, issue.subject
+    # Make sure custom fields were not cleared
+    assert_equal '125', issue.custom_value_for(2).value
     
     mail = ActionMailer::Base.deliveries.last
     assert_kind_of TMail::Mail, mail
@@ -299,6 +353,29 @@ class IssuesControllerTest < Test::Unit::TestCase
     assert mail.body.include?("Subject changed from #{old_subject} to #{new_subject}")
   end
   
+  def test_post_edit_with_custom_field_change
+    @request.session[:user_id] = 2
+    issue = Issue.find(1)
+    assert_equal '125', issue.custom_value_for(2).value
+    
+    assert_difference('Journal.count') do
+      assert_difference('JournalDetail.count', 3) do
+        post :edit, :id => 1, :issue => {:subject => 'Custom field change',
+                                         :priority_id => '6',
+                                         :category_id => '1', # no change
+                                         :custom_field_values => { '2' => 'New custom value' }
+                                        }
+      end
+    end
+    assert_redirected_to 'issues/show/1'
+    issue.reload
+    assert_equal 'New custom value', issue.custom_value_for(2).value
+    
+    mail = ActionMailer::Base.deliveries.last
+    assert_kind_of TMail::Mail, mail
+    assert mail.body.include?("Searchable field changed from 125 to New custom value")
+  end
+  
   def test_post_edit_with_status_and_assignee_change
     issue = Issue.find(1)
     assert_equal 1, issue.status_id
diff --git a/test/functional/projects_controller_test.rb b/test/functional/projects_controller_test.rb
index 5b7c29b18..88c0319ba 100644
--- a/test/functional/projects_controller_test.rb
+++ b/test/functional/projects_controller_test.rb
@@ -83,7 +83,7 @@ class ProjectsControllerTest < Test::Unit::TestCase
   def test_edit
     @request.session[:user_id] = 2 # manager
     post :edit, :id => 1, :project => {:name => 'Test changed name',
-                                       :custom_field_ids => ['']}
+                                       :issue_custom_field_ids => ['']}
     assert_redirected_to 'projects/settings/ecookbook'
     project = Project.find(1)
     assert_equal 'Test changed name', project.name
diff --git a/test/integration/admin_test.rb b/test/integration/admin_test.rb
index a424247cc..6e385873e 100644
--- a/test/integration/admin_test.rb
+++ b/test/integration/admin_test.rb
@@ -48,8 +48,9 @@ class AdminTest < ActionController::IntegrationTest
     post "projects/add", :project => { :name => "blog", 
                                        :description => "weblog",
                                        :identifier => "blog",
-                                       :is_public => 1 },
-                         'custom_fields[3]' => 'Beta'
+                                       :is_public => 1,
+                                       :custom_field_values => { '3' => 'Beta' }
+                                       }
     assert_redirected_to "admin/projects"
     assert_equal 'Successful creation.', flash[:notice]
     
diff --git a/test/unit/issue_test.rb b/test/unit/issue_test.rb
index 999c4480d..0d98f89d2 100644
--- a/test/unit/issue_test.rb
+++ b/test/unit/issue_test.rb
@@ -18,7 +18,13 @@
 require File.dirname(__FILE__) + '/../test_helper'
 
 class IssueTest < Test::Unit::TestCase
-  fixtures :projects, :users, :members, :trackers, :projects_trackers, :issue_statuses, :issue_categories, :enumerations, :issues, :custom_fields, :custom_values, :time_entries
+  fixtures :projects, :users, :members,
+           :trackers, :projects_trackers,
+           :issue_statuses, :issue_categories,
+           :enumerations,
+           :issues,
+           :custom_fields, :custom_fields_projects, :custom_fields_trackers, :custom_values,
+           :time_entries
 
   def test_create
     issue = Issue.new(:project_id => 1, :tracker_id => 1, :author_id => 3, :status_id => 1, :priority => Enumeration.get_values('IPRI').first, :subject => 'test_create', :description => 'IssueTest#test_create', :estimated_hours => '1:30')
@@ -27,6 +33,76 @@ class IssueTest < Test::Unit::TestCase
     assert_equal 1.5, issue.estimated_hours
   end
   
+  def test_create_with_required_custom_field
+    field = IssueCustomField.find_by_name('Database')
+    field.update_attribute(:is_required, true)
+    
+    issue = Issue.new(:project_id => 1, :tracker_id => 1, :author_id => 1, :status_id => 1, :subject => 'test_create', :description => 'IssueTest#test_create_with_required_custom_field')
+    assert issue.available_custom_fields.include?(field)
+    # No value for the custom field
+    assert !issue.save
+    assert_equal 'activerecord_error_invalid', issue.errors.on(:custom_values)
+    # Blank value
+    issue.custom_field_values = { field.id => '' }
+    assert !issue.save
+    assert_equal 'activerecord_error_invalid', issue.errors.on(:custom_values)
+    # Invalid value
+    issue.custom_field_values = { field.id => 'SQLServer' }
+    assert !issue.save
+    assert_equal 'activerecord_error_invalid', issue.errors.on(:custom_values)
+    # Valid value
+    issue.custom_field_values = { field.id => 'PostgreSQL' }
+    assert issue.save
+    issue.reload
+    assert_equal 'PostgreSQL', issue.custom_value_for(field).value
+  end
+  
+  def test_update_issue_with_required_custom_field
+    field = IssueCustomField.find_by_name('Database')
+    field.update_attribute(:is_required, true)
+    
+    issue = Issue.find(1)
+    assert_nil issue.custom_value_for(field)
+    assert issue.available_custom_fields.include?(field)
+    # No change to custom values, issue can be saved
+    assert issue.save
+    # Blank value
+    issue.custom_field_values = { field.id => '' }
+    assert !issue.save
+    # Valid value
+    issue.custom_field_values = { field.id => 'PostgreSQL' }
+    assert issue.save
+    issue.reload
+    assert_equal 'PostgreSQL', issue.custom_value_for(field).value
+  end
+  
+  def test_should_not_update_attributes_if_custom_fields_validation_fails
+    issue = Issue.find(1)
+    field = IssueCustomField.find_by_name('Database')
+    assert issue.available_custom_fields.include?(field)
+    
+    issue.custom_field_values = { field.id => 'Invalid' }
+    issue.subject = 'Should be not be saved'
+    assert !issue.save
+    
+    issue.reload
+    assert_equal "Can't print recipes", issue.subject
+  end
+  
+  def test_should_not_recreate_custom_values_objects_on_update
+    field = IssueCustomField.find_by_name('Database')
+    
+    issue = Issue.find(1)
+    issue.custom_field_values = { field.id => 'PostgreSQL' }
+    assert issue.save
+    custom_value = issue.custom_value_for(field)
+    issue.reload
+    issue.custom_field_values = { field.id => 'MySQL' }
+    assert issue.save
+    issue.reload
+    assert_equal custom_value.id, issue.custom_value_for(field).id
+  end
+  
   def test_category_based_assignment
     issue = Issue.create(:project_id => 1, :tracker_id => 1, :author_id => 3, :status_id => 1, :priority => Enumeration.get_values('IPRI').first, :subject => 'Assignment test', :description => 'Assignment test', :category_id => 1)
     assert_equal IssueCategory.find(1).assigned_to, issue.assigned_to
diff --git a/vendor/plugins/acts_as_customizable/init.rb b/vendor/plugins/acts_as_customizable/init.rb
new file mode 100644
index 000000000..9036aa579
--- /dev/null
+++ b/vendor/plugins/acts_as_customizable/init.rb
@@ -0,0 +1,2 @@
+require File.dirname(__FILE__) + '/lib/acts_as_customizable'
+ActiveRecord::Base.send(:include, Redmine::Acts::Customizable)
diff --git a/vendor/plugins/acts_as_customizable/lib/acts_as_customizable.rb b/vendor/plugins/acts_as_customizable/lib/acts_as_customizable.rb
new file mode 100644
index 000000000..05857d0a0
--- /dev/null
+++ b/vendor/plugins/acts_as_customizable/lib/acts_as_customizable.rb
@@ -0,0 +1,82 @@
+# redMine - project management software
+# Copyright (C) 2006-2008  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 Redmine
+  module Acts
+    module Customizable
+      def self.included(base)
+        base.extend ClassMethods
+      end
+
+      module ClassMethods
+        def acts_as_customizable(options = {})
+          return if self.included_modules.include?(Redmine::Acts::Customizable::InstanceMethods)
+          cattr_accessor :customizable_options
+          self.customizable_options = options
+          has_many :custom_values, :dependent => :delete_all, :as => :customized
+          before_validation_on_create { |customized| customized.custom_field_values }
+          # Trigger validation only if custom values were changed
+          validates_associated :custom_values, :on => :update, :if => Proc.new { |customized| customized.custom_field_values_changed? }
+          send :include, Redmine::Acts::Customizable::InstanceMethods
+          # Save custom values when saving the customized object
+          after_save :save_custom_field_values
+        end
+      end
+
+      module InstanceMethods
+        def self.included(base)
+          base.extend ClassMethods
+        end
+        
+        def available_custom_fields
+          CustomField.find(:all, :conditions => "type = '#{self.class.name}CustomField'",
+                                 :order => 'position')
+        end
+        
+        def custom_field_values=(values)
+          @custom_field_values_changed = true
+          values = values.stringify_keys
+          custom_field_values.each do |custom_value|
+            custom_value.value = values[custom_value.custom_field_id.to_s] if values.has_key?(custom_value.custom_field_id.to_s)
+          end if values.is_a?(Hash)
+        end
+        
+        def custom_field_values
+          @custom_field_values ||= available_custom_fields.collect { |x| custom_values.detect { |v| v.custom_field == x } || custom_values.build(:custom_field => x, :value => nil) }
+        end
+        
+        def custom_field_values_changed?
+          @custom_field_values_changed == true
+        end
+        
+        def custom_value_for(c)
+          field_id = (c.is_a?(CustomField) ? c.id : c.to_i)
+          custom_values.detect {|v| v.custom_field_id == field_id }
+        end
+        
+        def save_custom_field_values
+          custom_field_values.each(&:save)
+          @custom_field_values_changed = false
+          @custom_field_values = nil
+        end
+        
+        module ClassMethods
+        end
+      end
+    end
+  end
+end

From bd3191f80da433322fc9d2ec7b61ae6b89e216fa Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Fri, 27 Jun 2008 20:18:23 +0000
Subject: [PATCH 570/710] New rake task name in comments for creating sessions
 migration (#1520).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1593 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 config/environment.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/environment.rb b/config/environment.rb
index 7878eca47..f09c1009a 100644
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -31,7 +31,7 @@ Rails::Initializer.run do |config|
   # config.log_level = :debug
 
   # Use the database for sessions instead of the file system
-  # (create the session table with 'rake create_sessions_table')
+  # (create the session table with 'rake db:sessions:create')
   # config.action_controller.session_store = :active_record_store
   config.action_controller.session_store = :PStore
 

From 75a5dbd01dd4c57b96dd1fa322bc4d9ec9f865d1 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sat, 28 Jun 2008 11:34:53 +0000
Subject: [PATCH 571/710] Upgraded to Prototype 1.6.0.1.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1594 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 public/javascripts/context_menu.js |    8 +-
 public/javascripts/controls.js     |  848 +++---
 public/javascripts/dragdrop.js     |  146 +-
 public/javascripts/effects.js      |  760 ++---
 public/javascripts/prototype.js    | 4540 +++++++++++++++++++---------
 5 files changed, 4102 insertions(+), 2200 deletions(-)

diff --git a/public/javascripts/context_menu.js b/public/javascripts/context_menu.js
index 3e2d571fa..dfd72b1fa 100644
--- a/public/javascripts/context_menu.js
+++ b/public/javascripts/context_menu.js
@@ -28,11 +28,11 @@ ContextMenu.prototype = {
 	RightClick: function(e) {
 		this.hideMenu();
 		// do not show the context menu on links
-		if (Event.findElement(e, 'a') != document) { return; }
+		if (Event.findElement(e, 'a') != document && Event.findElement(e, 'a') != undefined) { return; }
 		// right-click simulated by Alt+Click with Opera
 		if (window.opera && !e.altKey) { return; }
 		var tr = Event.findElement(e, 'tr');
-		if ((tr == document) || !tr.hasClassName('hascontextmenu')) { return; }
+		if (tr == document || tr == undefined  || !tr.hasClassName('hascontextmenu')) { return; }
 		Event.stop(e);
 		if (!this.isSelected(tr)) {
 			this.unselectAll();
@@ -44,14 +44,14 @@ ContextMenu.prototype = {
 
   Click: function(e) {
   	this.hideMenu();
-  	if (Event.findElement(e, 'a') != document) { return; }
+  	if (Event.findElement(e, 'a') != document && Event.findElement(e, 'a') != undefined ) { return; }
     if (window.opera && e.altKey) {	return; }
     if (Event.isLeftClick(e) || (navigator.appVersion.match(/\bMSIE\b/))) {      
       var tr = Event.findElement(e, 'tr');
       if (tr!=document && tr.hasClassName('hascontextmenu')) {
         // a row was clicked, check if the click was on checkbox
         var box = Event.findElement(e, 'input');
-        if (box!=document) {
+        if (box!=document && box!=undefined) {
           // a checkbox may be clicked
           if (box.checked) {
             tr.addClassName('context-menu-selection');
diff --git a/public/javascripts/controls.js b/public/javascripts/controls.js
index 8c273f874..5aaf0bb2b 100644
--- a/public/javascripts/controls.js
+++ b/public/javascripts/controls.js
@@ -1,6 +1,6 @@
-// Copyright (c) 2005, 2006 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
-//           (c) 2005, 2006 Ivan Krstic (http://blogs.law.harvard.edu/ivan)
-//           (c) 2005, 2006 Jon Tirsen (http://www.tirsen.com)
+// Copyright (c) 2005-2008 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
+//           (c) 2005-2007 Ivan Krstic (http://blogs.law.harvard.edu/ivan)
+//           (c) 2005-2007 Jon Tirsen (http://www.tirsen.com)
 // Contributors:
 //  Richard Livsey
 //  Rahul Bhargava
@@ -37,22 +37,23 @@
 if(typeof Effect == 'undefined')
   throw("controls.js requires including script.aculo.us' effects.js library");
 
-var Autocompleter = {}
-Autocompleter.Base = function() {};
-Autocompleter.Base.prototype = {
+var Autocompleter = { }
+Autocompleter.Base = Class.create({
   baseInitialize: function(element, update, options) {
-    this.element     = $(element); 
+    element          = $(element)
+    this.element     = element; 
     this.update      = $(update);  
     this.hasFocus    = false; 
     this.changed     = false; 
     this.active      = false; 
     this.index       = 0;     
     this.entryCount  = 0;
+    this.oldElementValue = this.element.value;
 
     if(this.setOptions)
       this.setOptions(options);
     else
-      this.options = options || {};
+      this.options = options || { };
 
     this.options.paramName    = this.options.paramName || this.element.name;
     this.options.tokens       = this.options.tokens || [];
@@ -74,6 +75,9 @@ Autocompleter.Base.prototype = {
 
     if(typeof(this.options.tokens) == 'string') 
       this.options.tokens = new Array(this.options.tokens);
+    // Force carriage returns as token delimiters anyway
+    if (!this.options.tokens.include('\n'))
+      this.options.tokens.push('\n');
 
     this.observer = null;
     
@@ -81,15 +85,14 @@ Autocompleter.Base.prototype = {
 
     Element.hide(this.update);
 
-    Event.observe(this.element, "blur", this.onBlur.bindAsEventListener(this));
-    Event.observe(this.element, "keypress", this.onKeyPress.bindAsEventListener(this));
+    Event.observe(this.element, 'blur', this.onBlur.bindAsEventListener(this));
+    Event.observe(this.element, 'keydown', this.onKeyPress.bindAsEventListener(this));
   },
 
   show: function() {
     if(Element.getStyle(this.update, 'display')=='none') this.options.onShow(this.element, this.update);
     if(!this.iefix && 
-      (navigator.appVersion.indexOf('MSIE')>0) &&
-      (navigator.userAgent.indexOf('Opera')<0) &&
+      (Prototype.Browser.IE) &&
       (Element.getStyle(this.update, 'position')=='absolute')) {
       new Insertion.After(this.update, 
        '<iframe id="' + this.update.id + '_iefix" '+
@@ -139,17 +142,17 @@ Autocompleter.Base.prototype = {
        case Event.KEY_UP:
          this.markPrevious();
          this.render();
-         if(navigator.appVersion.indexOf('AppleWebKit')>0) Event.stop(event);
+         Event.stop(event);
          return;
        case Event.KEY_DOWN:
          this.markNext();
          this.render();
-         if(navigator.appVersion.indexOf('AppleWebKit')>0) Event.stop(event);
+         Event.stop(event);
          return;
       }
      else 
        if(event.keyCode==Event.KEY_TAB || event.keyCode==Event.KEY_RETURN || 
-         (navigator.appVersion.indexOf('AppleWebKit') > 0 && event.keyCode == 0)) return;
+         (Prototype.Browser.WebKit > 0 && event.keyCode == 0)) return;
 
     this.changed = true;
     this.hasFocus = true;
@@ -195,7 +198,6 @@ Autocompleter.Base.prototype = {
         this.index==i ? 
           Element.addClassName(this.getEntry(i),"selected") : 
           Element.removeClassName(this.getEntry(i),"selected");
-        
       if(this.hasFocus) { 
         this.show();
         this.active = true;
@@ -238,21 +240,22 @@ Autocompleter.Base.prototype = {
     }
     var value = '';
     if (this.options.select) {
-      var nodes = document.getElementsByClassName(this.options.select, selectedElement) || [];
+      var nodes = $(selectedElement).select('.' + this.options.select) || [];
       if(nodes.length>0) value = Element.collectTextNodes(nodes[0], this.options.select);
     } else
       value = Element.collectTextNodesIgnoreClass(selectedElement, 'informal');
     
-    var lastTokenPos = this.findLastToken();
-    if (lastTokenPos != -1) {
-      var newValue = this.element.value.substr(0, lastTokenPos + 1);
-      var whitespace = this.element.value.substr(lastTokenPos + 1).match(/^\s+/);
+    var bounds = this.getTokenBounds();
+    if (bounds[0] != -1) {
+      var newValue = this.element.value.substr(0, bounds[0]);
+      var whitespace = this.element.value.substr(bounds[0]).match(/^\s+/);
       if (whitespace)
         newValue += whitespace[0];
-      this.element.value = newValue + value;
+      this.element.value = newValue + value + this.element.value.substr(bounds[1]);
     } else {
       this.element.value = value;
     }
+    this.oldElementValue = this.element.value;
     this.element.focus();
     
     if (this.options.afterUpdateElement)
@@ -296,39 +299,48 @@ Autocompleter.Base.prototype = {
 
   onObserverEvent: function() {
     this.changed = false;   
+    this.tokenBounds = null;
     if(this.getToken().length>=this.options.minChars) {
-      this.startIndicator();
       this.getUpdatedChoices();
     } else {
       this.active = false;
       this.hide();
     }
+    this.oldElementValue = this.element.value;
   },
 
   getToken: function() {
-    var tokenPos = this.findLastToken();
-    if (tokenPos != -1)
-      var ret = this.element.value.substr(tokenPos + 1).replace(/^\s+/,'').replace(/\s+$/,'');
-    else
-      var ret = this.element.value;
-
-    return /\n/.test(ret) ? '' : ret;
+    var bounds = this.getTokenBounds();
+    return this.element.value.substring(bounds[0], bounds[1]).strip();
   },
 
-  findLastToken: function() {
-    var lastTokenPos = -1;
-
-    for (var i=0; i<this.options.tokens.length; i++) {
-      var thisTokenPos = this.element.value.lastIndexOf(this.options.tokens[i]);
-      if (thisTokenPos > lastTokenPos)
-        lastTokenPos = thisTokenPos;
+  getTokenBounds: function() {
+    if (null != this.tokenBounds) return this.tokenBounds;
+    var value = this.element.value;
+    if (value.strip().empty()) return [-1, 0];
+    var diff = arguments.callee.getFirstDifferencePos(value, this.oldElementValue);
+    var offset = (diff == this.oldElementValue.length ? 1 : 0);
+    var prevTokenPos = -1, nextTokenPos = value.length;
+    var tp;
+    for (var index = 0, l = this.options.tokens.length; index < l; ++index) {
+      tp = value.lastIndexOf(this.options.tokens[index], diff + offset - 1);
+      if (tp > prevTokenPos) prevTokenPos = tp;
+      tp = value.indexOf(this.options.tokens[index], diff + offset);
+      if (-1 != tp && tp < nextTokenPos) nextTokenPos = tp;
     }
-    return lastTokenPos;
+    return (this.tokenBounds = [prevTokenPos + 1, nextTokenPos]);
   }
-}
+});
 
-Ajax.Autocompleter = Class.create();
-Object.extend(Object.extend(Ajax.Autocompleter.prototype, Autocompleter.Base.prototype), {
+Autocompleter.Base.prototype.getTokenBounds.getFirstDifferencePos = function(newS, oldS) {
+  var boundary = Math.min(newS.length, oldS.length);
+  for (var index = 0; index < boundary; ++index)
+    if (newS[index] != oldS[index])
+      return index;
+  return boundary;
+};
+
+Ajax.Autocompleter = Class.create(Autocompleter.Base, {
   initialize: function(element, update, url, options) {
     this.baseInitialize(element, update, options);
     this.options.asynchronous  = true;
@@ -338,7 +350,9 @@ Object.extend(Object.extend(Ajax.Autocompleter.prototype, Autocompleter.Base.pro
   },
 
   getUpdatedChoices: function() {
-    entry = encodeURIComponent(this.options.paramName) + '=' + 
+    this.startIndicator();
+    
+    var entry = encodeURIComponent(this.options.paramName) + '=' + 
       encodeURIComponent(this.getToken());
 
     this.options.parameters = this.options.callback ?
@@ -346,14 +360,13 @@ Object.extend(Object.extend(Ajax.Autocompleter.prototype, Autocompleter.Base.pro
 
     if(this.options.defaultParams) 
       this.options.parameters += '&' + this.options.defaultParams;
-
+    
     new Ajax.Request(this.url, this.options);
   },
 
   onComplete: function(request) {
     this.updateChoices(request.responseText);
   }
-
 });
 
 // The local array autocompleter. Used when you'd prefer to
@@ -391,8 +404,7 @@ Object.extend(Object.extend(Ajax.Autocompleter.prototype, Autocompleter.Base.pro
 // In that case, the other options above will not apply unless
 // you support them.
 
-Autocompleter.Local = Class.create();
-Autocompleter.Local.prototype = Object.extend(new Autocompleter.Base(), {
+Autocompleter.Local = Class.create(Autocompleter.Base, {
   initialize: function(element, update, array, options) {
     this.baseInitialize(element, update, options);
     this.options.array = array;
@@ -448,13 +460,12 @@ Autocompleter.Local.prototype = Object.extend(new Autocompleter.Base(), {
           ret = ret.concat(partial.slice(0, instance.options.choices - ret.length))
         return "<ul>" + ret.join('') + "</ul>";
       }
-    }, options || {});
+    }, options || { });
   }
 });
 
-// AJAX in-place editor
-//
-// see documentation on http://wiki.script.aculo.us/scriptaculous/show/Ajax.InPlaceEditor
+// AJAX in-place editor and collection editor
+// Full rewrite by Christophe Porteneuve <tdd@tddsworld.com> (April 2007).
 
 // Use this if you notice weird scrolling problems on some browsers,
 // the DOM might be a bit confused when this gets called so do this
@@ -465,353 +476,472 @@ Field.scrollFreeActivate = function(field) {
   }, 1);
 }
 
-Ajax.InPlaceEditor = Class.create();
-Ajax.InPlaceEditor.defaultHighlightColor = "#FFFF99";
-Ajax.InPlaceEditor.prototype = {
+Ajax.InPlaceEditor = Class.create({
   initialize: function(element, url, options) {
     this.url = url;
-    this.element = $(element);
-
-    this.options = Object.extend({
-      paramName: "value",
-      okButton: true,
-      okText: "ok",
-      cancelLink: true,
-      cancelText: "cancel",
-      savingText: "Saving...",
-      clickToEditText: "Click to edit",
-      okText: "ok",
-      rows: 1,
-      onComplete: function(transport, element) {
-        new Effect.Highlight(element, {startcolor: this.options.highlightcolor});
-      },
-      onFailure: function(transport) {
-        alert("Error communicating with the server: " + transport.responseText.stripTags());
-      },
-      callback: function(form) {
-        return Form.serialize(form);
-      },
-      handleLineBreaks: true,
-      loadingText: 'Loading...',
-      savingClassName: 'inplaceeditor-saving',
-      loadingClassName: 'inplaceeditor-loading',
-      formClassName: 'inplaceeditor-form',
-      highlightcolor: Ajax.InPlaceEditor.defaultHighlightColor,
-      highlightendcolor: "#FFFFFF",
-      externalControl: null,
-      submitOnBlur: false,
-      ajaxOptions: {},
-      evalScripts: false
-    }, options || {});
-
-    if(!this.options.formId && this.element.id) {
-      this.options.formId = this.element.id + "-inplaceeditor";
-      if ($(this.options.formId)) {
-        // there's already a form with that name, don't specify an id
-        this.options.formId = null;
-      }
+    this.element = element = $(element);
+    this.prepareOptions();
+    this._controls = { };
+    arguments.callee.dealWithDeprecatedOptions(options); // DEPRECATION LAYER!!!
+    Object.extend(this.options, options || { });
+    if (!this.options.formId && this.element.id) {
+      this.options.formId = this.element.id + '-inplaceeditor';
+      if ($(this.options.formId))
+        this.options.formId = '';
     }
-    
-    if (this.options.externalControl) {
+    if (this.options.externalControl)
       this.options.externalControl = $(this.options.externalControl);
-    }
-    
-    this.originalBackground = Element.getStyle(this.element, 'background-color');
-    if (!this.originalBackground) {
-      this.originalBackground = "transparent";
-    }
-    
+    if (!this.options.externalControl)
+      this.options.externalControlOnly = false;
+    this._originalBackground = this.element.getStyle('background-color') || 'transparent';
     this.element.title = this.options.clickToEditText;
-    
-    this.onclickListener = this.enterEditMode.bindAsEventListener(this);
-    this.mouseoverListener = this.enterHover.bindAsEventListener(this);
-    this.mouseoutListener = this.leaveHover.bindAsEventListener(this);
-    Event.observe(this.element, 'click', this.onclickListener);
-    Event.observe(this.element, 'mouseover', this.mouseoverListener);
-    Event.observe(this.element, 'mouseout', this.mouseoutListener);
-    if (this.options.externalControl) {
-      Event.observe(this.options.externalControl, 'click', this.onclickListener);
-      Event.observe(this.options.externalControl, 'mouseover', this.mouseoverListener);
-      Event.observe(this.options.externalControl, 'mouseout', this.mouseoutListener);
-    }
+    this._boundCancelHandler = this.handleFormCancellation.bind(this);
+    this._boundComplete = (this.options.onComplete || Prototype.emptyFunction).bind(this);
+    this._boundFailureHandler = this.handleAJAXFailure.bind(this);
+    this._boundSubmitHandler = this.handleFormSubmission.bind(this);
+    this._boundWrapperHandler = this.wrapUp.bind(this);
+    this.registerListeners();
   },
-  enterEditMode: function(evt) {
-    if (this.saving) return;
-    if (this.editing) return;
-    this.editing = true;
-    this.onEnterEditMode();
-    if (this.options.externalControl) {
-      Element.hide(this.options.externalControl);
-    }
-    Element.hide(this.element);
-    this.createForm();
-    this.element.parentNode.insertBefore(this.form, this.element);
-    if (!this.options.loadTextURL) Field.scrollFreeActivate(this.editField);
-    // stop the event to avoid a page refresh in Safari
-    if (evt) {
-      Event.stop(evt);
-    }
-    return false;
+  checkForEscapeOrReturn: function(e) {
+    if (!this._editing || e.ctrlKey || e.altKey || e.shiftKey) return;
+    if (Event.KEY_ESC == e.keyCode)
+      this.handleFormCancellation(e);
+    else if (Event.KEY_RETURN == e.keyCode)
+      this.handleFormSubmission(e);
   },
-  createForm: function() {
-    this.form = document.createElement("form");
-    this.form.id = this.options.formId;
-    Element.addClassName(this.form, this.options.formClassName)
-    this.form.onsubmit = this.onSubmit.bind(this);
-
-    this.createEditField();
-
-    if (this.options.textarea) {
-      var br = document.createElement("br");
-      this.form.appendChild(br);
+  createControl: function(mode, handler, extraClasses) {
+    var control = this.options[mode + 'Control'];
+    var text = this.options[mode + 'Text'];
+    if ('button' == control) {
+      var btn = document.createElement('input');
+      btn.type = 'submit';
+      btn.value = text;
+      btn.className = 'editor_' + mode + '_button';
+      if ('cancel' == mode)
+        btn.onclick = this._boundCancelHandler;
+      this._form.appendChild(btn);
+      this._controls[mode] = btn;
+    } else if ('link' == control) {
+      var link = document.createElement('a');
+      link.href = '#';
+      link.appendChild(document.createTextNode(text));
+      link.onclick = 'cancel' == mode ? this._boundCancelHandler : this._boundSubmitHandler;
+      link.className = 'editor_' + mode + '_link';
+      if (extraClasses)
+        link.className += ' ' + extraClasses;
+      this._form.appendChild(link);
+      this._controls[mode] = link;
     }
-
-    if (this.options.okButton) {
-      okButton = document.createElement("input");
-      okButton.type = "submit";
-      okButton.value = this.options.okText;
-      okButton.className = 'editor_ok_button';
-      this.form.appendChild(okButton);
-    }
-
-    if (this.options.cancelLink) {
-      cancelLink = document.createElement("a");
-      cancelLink.href = "#";
-      cancelLink.appendChild(document.createTextNode(this.options.cancelText));
-      cancelLink.onclick = this.onclickCancel.bind(this);
-      cancelLink.className = 'editor_cancel';      
-      this.form.appendChild(cancelLink);
-    }
-  },
-  hasHTMLLineBreaks: function(string) {
-    if (!this.options.handleLineBreaks) return false;
-    return string.match(/<br/i) || string.match(/<p>/i);
-  },
-  convertHTMLLineBreaks: function(string) {
-    return string.replace(/<br>/gi, "\n").replace(/<br\/>/gi, "\n").replace(/<\/p>/gi, "\n").replace(/<p>/gi, "");
   },
   createEditField: function() {
-    var text;
-    if(this.options.loadTextURL) {
-      text = this.options.loadingText;
-    } else {
-      text = this.getText();
-    }
-
-    var obj = this;
-    
-    if (this.options.rows == 1 && !this.hasHTMLLineBreaks(text)) {
-      this.options.textarea = false;
-      var textField = document.createElement("input");
-      textField.obj = this;
-      textField.type = "text";
-      textField.name = this.options.paramName;
-      textField.value = text;
-      textField.style.backgroundColor = this.options.highlightcolor;
-      textField.className = 'editor_field';
+    var text = (this.options.loadTextURL ? this.options.loadingText : this.getText());
+    var fld;
+    if (1 >= this.options.rows && !/\r|\n/.test(this.getText())) {
+      fld = document.createElement('input');
+      fld.type = 'text';
       var size = this.options.size || this.options.cols || 0;
-      if (size != 0) textField.size = size;
-      if (this.options.submitOnBlur)
-        textField.onblur = this.onSubmit.bind(this);
-      this.editField = textField;
+      if (0 < size) fld.size = size;
     } else {
-      this.options.textarea = true;
-      var textArea = document.createElement("textarea");
-      textArea.obj = this;
-      textArea.name = this.options.paramName;
-      textArea.value = this.convertHTMLLineBreaks(text);
-      textArea.rows = this.options.rows;
-      textArea.cols = this.options.cols || 40;
-      textArea.className = 'editor_field';      
-      if (this.options.submitOnBlur)
-        textArea.onblur = this.onSubmit.bind(this);
-      this.editField = textArea;
+      fld = document.createElement('textarea');
+      fld.rows = (1 >= this.options.rows ? this.options.autoRows : this.options.rows);
+      fld.cols = this.options.cols || 40;
     }
-    
-    if(this.options.loadTextURL) {
+    fld.name = this.options.paramName;
+    fld.value = text; // No HTML breaks conversion anymore
+    fld.className = 'editor_field';
+    if (this.options.submitOnBlur)
+      fld.onblur = this._boundSubmitHandler;
+    this._controls.editor = fld;
+    if (this.options.loadTextURL)
       this.loadExternalText();
-    }
-    this.form.appendChild(this.editField);
+    this._form.appendChild(this._controls.editor);
+  },
+  createForm: function() {
+    var ipe = this;
+    function addText(mode, condition) {
+      var text = ipe.options['text' + mode + 'Controls'];
+      if (!text || condition === false) return;
+      ipe._form.appendChild(document.createTextNode(text));
+    };
+    this._form = $(document.createElement('form'));
+    this._form.id = this.options.formId;
+    this._form.addClassName(this.options.formClassName);
+    this._form.onsubmit = this._boundSubmitHandler;
+    this.createEditField();
+    if ('textarea' == this._controls.editor.tagName.toLowerCase())
+      this._form.appendChild(document.createElement('br'));
+    if (this.options.onFormCustomization)
+      this.options.onFormCustomization(this, this._form);
+    addText('Before', this.options.okControl || this.options.cancelControl);
+    this.createControl('ok', this._boundSubmitHandler);
+    addText('Between', this.options.okControl && this.options.cancelControl);
+    this.createControl('cancel', this._boundCancelHandler, 'editor_cancel');
+    addText('After', this.options.okControl || this.options.cancelControl);
+  },
+  destroy: function() {
+    if (this._oldInnerHTML)
+      this.element.innerHTML = this._oldInnerHTML;
+    this.leaveEditMode();
+    this.unregisterListeners();
+  },
+  enterEditMode: function(e) {
+    if (this._saving || this._editing) return;
+    this._editing = true;
+    this.triggerCallback('onEnterEditMode');
+    if (this.options.externalControl)
+      this.options.externalControl.hide();
+    this.element.hide();
+    this.createForm();
+    this.element.parentNode.insertBefore(this._form, this.element);
+    if (!this.options.loadTextURL)
+      this.postProcessEditField();
+    if (e) Event.stop(e);
+  },
+  enterHover: function(e) {
+    if (this.options.hoverClassName)
+      this.element.addClassName(this.options.hoverClassName);
+    if (this._saving) return;
+    this.triggerCallback('onEnterHover');
   },
   getText: function() {
     return this.element.innerHTML;
   },
+  handleAJAXFailure: function(transport) {
+    this.triggerCallback('onFailure', transport);
+    if (this._oldInnerHTML) {
+      this.element.innerHTML = this._oldInnerHTML;
+      this._oldInnerHTML = null;
+    }
+  },
+  handleFormCancellation: function(e) {
+    this.wrapUp();
+    if (e) Event.stop(e);
+  },
+  handleFormSubmission: function(e) {
+    var form = this._form;
+    var value = $F(this._controls.editor);
+    this.prepareSubmission();
+    var params = this.options.callback(form, value) || '';
+    if (Object.isString(params))
+      params = params.toQueryParams();
+    params.editorId = this.element.id;
+    if (this.options.htmlResponse) {
+      var options = Object.extend({ evalScripts: true }, this.options.ajaxOptions);
+      Object.extend(options, {
+        parameters: params,
+        onComplete: this._boundWrapperHandler,
+        onFailure: this._boundFailureHandler
+      });
+      new Ajax.Updater({ success: this.element }, this.url, options);
+    } else {
+      var options = Object.extend({ method: 'get' }, this.options.ajaxOptions);
+      Object.extend(options, {
+        parameters: params,
+        onComplete: this._boundWrapperHandler,
+        onFailure: this._boundFailureHandler
+      });
+      new Ajax.Request(this.url, options);
+    }
+    if (e) Event.stop(e);
+  },
+  leaveEditMode: function() {
+    this.element.removeClassName(this.options.savingClassName);
+    this.removeForm();
+    this.leaveHover();
+    this.element.style.backgroundColor = this._originalBackground;
+    this.element.show();
+    if (this.options.externalControl)
+      this.options.externalControl.show();
+    this._saving = false;
+    this._editing = false;
+    this._oldInnerHTML = null;
+    this.triggerCallback('onLeaveEditMode');
+  },
+  leaveHover: function(e) {
+    if (this.options.hoverClassName)
+      this.element.removeClassName(this.options.hoverClassName);
+    if (this._saving) return;
+    this.triggerCallback('onLeaveHover');
+  },
   loadExternalText: function() {
-    Element.addClassName(this.form, this.options.loadingClassName);
-    this.editField.disabled = true;
-    new Ajax.Request(
-      this.options.loadTextURL,
-      Object.extend({
-        asynchronous: true,
-        onComplete: this.onLoadedExternalText.bind(this)
-      }, this.options.ajaxOptions)
-    );
+    this._form.addClassName(this.options.loadingClassName);
+    this._controls.editor.disabled = true;
+    var options = Object.extend({ method: 'get' }, this.options.ajaxOptions);
+    Object.extend(options, {
+      parameters: 'editorId=' + encodeURIComponent(this.element.id),
+      onComplete: Prototype.emptyFunction,
+      onSuccess: function(transport) {
+        this._form.removeClassName(this.options.loadingClassName);
+        var text = transport.responseText;
+        if (this.options.stripLoadedTextTags)
+          text = text.stripTags();
+        this._controls.editor.value = text;
+        this._controls.editor.disabled = false;
+        this.postProcessEditField();
+      }.bind(this),
+      onFailure: this._boundFailureHandler
+    });
+    new Ajax.Request(this.options.loadTextURL, options);
   },
-  onLoadedExternalText: function(transport) {
-    Element.removeClassName(this.form, this.options.loadingClassName);
-    this.editField.disabled = false;
-    this.editField.value = transport.responseText.stripTags();
-    Field.scrollFreeActivate(this.editField);
+  postProcessEditField: function() {
+    var fpc = this.options.fieldPostCreation;
+    if (fpc)
+      $(this._controls.editor)['focus' == fpc ? 'focus' : 'activate']();
   },
-  onclickCancel: function() {
-    this.onComplete();
-    this.leaveEditMode();
-    return false;
+  prepareOptions: function() {
+    this.options = Object.clone(Ajax.InPlaceEditor.DefaultOptions);
+    Object.extend(this.options, Ajax.InPlaceEditor.DefaultCallbacks);
+    [this._extraDefaultOptions].flatten().compact().each(function(defs) {
+      Object.extend(this.options, defs);
+    }.bind(this));
   },
-  onFailure: function(transport) {
-    this.options.onFailure(transport);
-    if (this.oldInnerHTML) {
-      this.element.innerHTML = this.oldInnerHTML;
-      this.oldInnerHTML = null;
-    }
-    return false;
-  },
-  onSubmit: function() {
-    // onLoading resets these so we need to save them away for the Ajax call
-    var form = this.form;
-    var value = this.editField.value;
-    
-    // do this first, sometimes the ajax call returns before we get a chance to switch on Saving...
-    // which means this will actually switch on Saving... *after* we've left edit mode causing Saving...
-    // to be displayed indefinitely
-    this.onLoading();
-    
-    if (this.options.evalScripts) {
-      new Ajax.Request(
-        this.url, Object.extend({
-          parameters: this.options.callback(form, value),
-          onComplete: this.onComplete.bind(this),
-          onFailure: this.onFailure.bind(this),
-          asynchronous:true, 
-          evalScripts:true
-        }, this.options.ajaxOptions));
-    } else  {
-      new Ajax.Updater(
-        { success: this.element,
-          // don't update on failure (this could be an option)
-          failure: null }, 
-        this.url, Object.extend({
-          parameters: this.options.callback(form, value),
-          onComplete: this.onComplete.bind(this),
-          onFailure: this.onFailure.bind(this)
-        }, this.options.ajaxOptions));
-    }
-    // stop the event to avoid a page refresh in Safari
-    if (arguments.length > 1) {
-      Event.stop(arguments[0]);
-    }
-    return false;
-  },
-  onLoading: function() {
-    this.saving = true;
+  prepareSubmission: function() {
+    this._saving = true;
     this.removeForm();
     this.leaveHover();
     this.showSaving();
   },
-  showSaving: function() {
-    this.oldInnerHTML = this.element.innerHTML;
-    this.element.innerHTML = this.options.savingText;
-    Element.addClassName(this.element, this.options.savingClassName);
-    this.element.style.backgroundColor = this.originalBackground;
-    Element.show(this.element);
+  registerListeners: function() {
+    this._listeners = { };
+    var listener;
+    $H(Ajax.InPlaceEditor.Listeners).each(function(pair) {
+      listener = this[pair.value].bind(this);
+      this._listeners[pair.key] = listener;
+      if (!this.options.externalControlOnly)
+        this.element.observe(pair.key, listener);
+      if (this.options.externalControl)
+        this.options.externalControl.observe(pair.key, listener);
+    }.bind(this));
   },
   removeForm: function() {
-    if(this.form) {
-      if (this.form.parentNode) Element.remove(this.form);
-      this.form = null;
+    if (!this._form) return;
+    this._form.remove();
+    this._form = null;
+    this._controls = { };
+  },
+  showSaving: function() {
+    this._oldInnerHTML = this.element.innerHTML;
+    this.element.innerHTML = this.options.savingText;
+    this.element.addClassName(this.options.savingClassName);
+    this.element.style.backgroundColor = this._originalBackground;
+    this.element.show();
+  },
+  triggerCallback: function(cbName, arg) {
+    if ('function' == typeof this.options[cbName]) {
+      this.options[cbName](this, arg);
     }
   },
-  enterHover: function() {
-    if (this.saving) return;
-    this.element.style.backgroundColor = this.options.highlightcolor;
-    if (this.effect) {
-      this.effect.cancel();
-    }
-    Element.addClassName(this.element, this.options.hoverClassName)
+  unregisterListeners: function() {
+    $H(this._listeners).each(function(pair) {
+      if (!this.options.externalControlOnly)
+        this.element.stopObserving(pair.key, pair.value);
+      if (this.options.externalControl)
+        this.options.externalControl.stopObserving(pair.key, pair.value);
+    }.bind(this));
   },
-  leaveHover: function() {
-    if (this.options.backgroundColor) {
-      this.element.style.backgroundColor = this.oldBackground;
-    }
-    Element.removeClassName(this.element, this.options.hoverClassName)
-    if (this.saving) return;
-    this.effect = new Effect.Highlight(this.element, {
-      startcolor: this.options.highlightcolor,
-      endcolor: this.options.highlightendcolor,
-      restorecolor: this.originalBackground
-    });
-  },
-  leaveEditMode: function() {
-    Element.removeClassName(this.element, this.options.savingClassName);
-    this.removeForm();
-    this.leaveHover();
-    this.element.style.backgroundColor = this.originalBackground;
-    Element.show(this.element);
-    if (this.options.externalControl) {
-      Element.show(this.options.externalControl);
-    }
-    this.editing = false;
-    this.saving = false;
-    this.oldInnerHTML = null;
-    this.onLeaveEditMode();
-  },
-  onComplete: function(transport) {
+  wrapUp: function(transport) {
     this.leaveEditMode();
-    this.options.onComplete.bind(this)(transport, this.element);
-  },
-  onEnterEditMode: function() {},
-  onLeaveEditMode: function() {},
-  dispose: function() {
-    if (this.oldInnerHTML) {
-      this.element.innerHTML = this.oldInnerHTML;
-    }
-    this.leaveEditMode();
-    Event.stopObserving(this.element, 'click', this.onclickListener);
-    Event.stopObserving(this.element, 'mouseover', this.mouseoverListener);
-    Event.stopObserving(this.element, 'mouseout', this.mouseoutListener);
-    if (this.options.externalControl) {
-      Event.stopObserving(this.options.externalControl, 'click', this.onclickListener);
-      Event.stopObserving(this.options.externalControl, 'mouseover', this.mouseoverListener);
-      Event.stopObserving(this.options.externalControl, 'mouseout', this.mouseoutListener);
-    }
-  }
-};
-
-Ajax.InPlaceCollectionEditor = Class.create();
-Object.extend(Ajax.InPlaceCollectionEditor.prototype, Ajax.InPlaceEditor.prototype);
-Object.extend(Ajax.InPlaceCollectionEditor.prototype, {
-  createEditField: function() {
-    if (!this.cached_selectTag) {
-      var selectTag = document.createElement("select");
-      var collection = this.options.collection || [];
-      var optionTag;
-      collection.each(function(e,i) {
-        optionTag = document.createElement("option");
-        optionTag.value = (e instanceof Array) ? e[0] : e;
-        if((typeof this.options.value == 'undefined') && 
-          ((e instanceof Array) ? this.element.innerHTML == e[1] : e == optionTag.value)) optionTag.selected = true;
-        if(this.options.value==optionTag.value) optionTag.selected = true;
-        optionTag.appendChild(document.createTextNode((e instanceof Array) ? e[1] : e));
-        selectTag.appendChild(optionTag);
-      }.bind(this));
-      this.cached_selectTag = selectTag;
-    }
-
-    this.editField = this.cached_selectTag;
-    if(this.options.loadTextURL) this.loadExternalText();
-    this.form.appendChild(this.editField);
-    this.options.callback = function(form, value) {
-      return "value=" + encodeURIComponent(value);
-    }
+    // Can't use triggerCallback due to backward compatibility: requires
+    // binding + direct element
+    this._boundComplete(transport, this.element);
   }
 });
 
+Object.extend(Ajax.InPlaceEditor.prototype, {
+  dispose: Ajax.InPlaceEditor.prototype.destroy
+});
+
+Ajax.InPlaceCollectionEditor = Class.create(Ajax.InPlaceEditor, {
+  initialize: function($super, element, url, options) {
+    this._extraDefaultOptions = Ajax.InPlaceCollectionEditor.DefaultOptions;
+    $super(element, url, options);
+  },
+
+  createEditField: function() {
+    var list = document.createElement('select');
+    list.name = this.options.paramName;
+    list.size = 1;
+    this._controls.editor = list;
+    this._collection = this.options.collection || [];
+    if (this.options.loadCollectionURL)
+      this.loadCollection();
+    else
+      this.checkForExternalText();
+    this._form.appendChild(this._controls.editor);
+  },
+
+  loadCollection: function() {
+    this._form.addClassName(this.options.loadingClassName);
+    this.showLoadingText(this.options.loadingCollectionText);
+    var options = Object.extend({ method: 'get' }, this.options.ajaxOptions);
+    Object.extend(options, {
+      parameters: 'editorId=' + encodeURIComponent(this.element.id),
+      onComplete: Prototype.emptyFunction,
+      onSuccess: function(transport) {
+        var js = transport.responseText.strip();
+        if (!/^\[.*\]$/.test(js)) // TODO: improve sanity check
+          throw 'Server returned an invalid collection representation.';
+        this._collection = eval(js);
+        this.checkForExternalText();
+      }.bind(this),
+      onFailure: this.onFailure
+    });
+    new Ajax.Request(this.options.loadCollectionURL, options);
+  },
+
+  showLoadingText: function(text) {
+    this._controls.editor.disabled = true;
+    var tempOption = this._controls.editor.firstChild;
+    if (!tempOption) {
+      tempOption = document.createElement('option');
+      tempOption.value = '';
+      this._controls.editor.appendChild(tempOption);
+      tempOption.selected = true;
+    }
+    tempOption.update((text || '').stripScripts().stripTags());
+  },
+
+  checkForExternalText: function() {
+    this._text = this.getText();
+    if (this.options.loadTextURL)
+      this.loadExternalText();
+    else
+      this.buildOptionList();
+  },
+
+  loadExternalText: function() {
+    this.showLoadingText(this.options.loadingText);
+    var options = Object.extend({ method: 'get' }, this.options.ajaxOptions);
+    Object.extend(options, {
+      parameters: 'editorId=' + encodeURIComponent(this.element.id),
+      onComplete: Prototype.emptyFunction,
+      onSuccess: function(transport) {
+        this._text = transport.responseText.strip();
+        this.buildOptionList();
+      }.bind(this),
+      onFailure: this.onFailure
+    });
+    new Ajax.Request(this.options.loadTextURL, options);
+  },
+
+  buildOptionList: function() {
+    this._form.removeClassName(this.options.loadingClassName);
+    this._collection = this._collection.map(function(entry) {
+      return 2 === entry.length ? entry : [entry, entry].flatten();
+    });
+    var marker = ('value' in this.options) ? this.options.value : this._text;
+    var textFound = this._collection.any(function(entry) {
+      return entry[0] == marker;
+    }.bind(this));
+    this._controls.editor.update('');
+    var option;
+    this._collection.each(function(entry, index) {
+      option = document.createElement('option');
+      option.value = entry[0];
+      option.selected = textFound ? entry[0] == marker : 0 == index;
+      option.appendChild(document.createTextNode(entry[1]));
+      this._controls.editor.appendChild(option);
+    }.bind(this));
+    this._controls.editor.disabled = false;
+    Field.scrollFreeActivate(this._controls.editor);
+  }
+});
+
+//**** DEPRECATION LAYER FOR InPlace[Collection]Editor! ****
+//**** This only  exists for a while,  in order to  let ****
+//**** users adapt to  the new API.  Read up on the new ****
+//**** API and convert your code to it ASAP!            ****
+
+Ajax.InPlaceEditor.prototype.initialize.dealWithDeprecatedOptions = function(options) {
+  if (!options) return;
+  function fallback(name, expr) {
+    if (name in options || expr === undefined) return;
+    options[name] = expr;
+  };
+  fallback('cancelControl', (options.cancelLink ? 'link' : (options.cancelButton ? 'button' :
+    options.cancelLink == options.cancelButton == false ? false : undefined)));
+  fallback('okControl', (options.okLink ? 'link' : (options.okButton ? 'button' :
+    options.okLink == options.okButton == false ? false : undefined)));
+  fallback('highlightColor', options.highlightcolor);
+  fallback('highlightEndColor', options.highlightendcolor);
+};
+
+Object.extend(Ajax.InPlaceEditor, {
+  DefaultOptions: {
+    ajaxOptions: { },
+    autoRows: 3,                                // Use when multi-line w/ rows == 1
+    cancelControl: 'link',                      // 'link'|'button'|false
+    cancelText: 'cancel',
+    clickToEditText: 'Click to edit',
+    externalControl: null,                      // id|elt
+    externalControlOnly: false,
+    fieldPostCreation: 'activate',              // 'activate'|'focus'|false
+    formClassName: 'inplaceeditor-form',
+    formId: null,                               // id|elt
+    highlightColor: '#ffff99',
+    highlightEndColor: '#ffffff',
+    hoverClassName: '',
+    htmlResponse: true,
+    loadingClassName: 'inplaceeditor-loading',
+    loadingText: 'Loading...',
+    okControl: 'button',                        // 'link'|'button'|false
+    okText: 'ok',
+    paramName: 'value',
+    rows: 1,                                    // If 1 and multi-line, uses autoRows
+    savingClassName: 'inplaceeditor-saving',
+    savingText: 'Saving...',
+    size: 0,
+    stripLoadedTextTags: false,
+    submitOnBlur: false,
+    textAfterControls: '',
+    textBeforeControls: '',
+    textBetweenControls: ''
+  },
+  DefaultCallbacks: {
+    callback: function(form) {
+      return Form.serialize(form);
+    },
+    onComplete: function(transport, element) {
+      // For backward compatibility, this one is bound to the IPE, and passes
+      // the element directly.  It was too often customized, so we don't break it.
+      new Effect.Highlight(element, {
+        startcolor: this.options.highlightColor, keepBackgroundImage: true });
+    },
+    onEnterEditMode: null,
+    onEnterHover: function(ipe) {
+      ipe.element.style.backgroundColor = ipe.options.highlightColor;
+      if (ipe._effect)
+        ipe._effect.cancel();
+    },
+    onFailure: function(transport, ipe) {
+      alert('Error communication with the server: ' + transport.responseText.stripTags());
+    },
+    onFormCustomization: null, // Takes the IPE and its generated form, after editor, before controls.
+    onLeaveEditMode: null,
+    onLeaveHover: function(ipe) {
+      ipe._effect = new Effect.Highlight(ipe.element, {
+        startcolor: ipe.options.highlightColor, endcolor: ipe.options.highlightEndColor,
+        restorecolor: ipe._originalBackground, keepBackgroundImage: true
+      });
+    }
+  },
+  Listeners: {
+    click: 'enterEditMode',
+    keydown: 'checkForEscapeOrReturn',
+    mouseover: 'enterHover',
+    mouseout: 'leaveHover'
+  }
+});
+
+Ajax.InPlaceCollectionEditor.DefaultOptions = {
+  loadingCollectionText: 'Loading options...'
+};
+
 // Delayed observer, like Form.Element.Observer, 
 // but waits for delay after last key input
 // Ideal for live-search fields
 
-Form.Element.DelayedObserver = Class.create();
-Form.Element.DelayedObserver.prototype = {
+Form.Element.DelayedObserver = Class.create({
   initialize: function(element, delay, callback) {
     this.delay     = delay || 0.5;
     this.element   = $(element);
@@ -830,4 +960,4 @@ Form.Element.DelayedObserver.prototype = {
     this.timer = null;
     this.callback(this.element, $F(this.element));
   }
-};
+});
diff --git a/public/javascripts/dragdrop.js b/public/javascripts/dragdrop.js
index c71ddb827..bf5cfea66 100644
--- a/public/javascripts/dragdrop.js
+++ b/public/javascripts/dragdrop.js
@@ -1,10 +1,10 @@
-// Copyright (c) 2005, 2006 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
-//           (c) 2005, 2006 Sammi Williams (http://www.oriontransfer.co.nz, sammi@oriontransfer.co.nz)
+// Copyright (c) 2005-2008 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
+//           (c) 2005-2007 Sammi Williams (http://www.oriontransfer.co.nz, sammi@oriontransfer.co.nz)
 // 
 // script.aculo.us is freely distributable under the terms of an MIT-style license.
 // For details, see the script.aculo.us web site: http://script.aculo.us/
 
-if(typeof Effect == 'undefined')
+if(Object.isUndefined(Effect))
   throw("dragdrop.js requires including script.aculo.us' effects.js library");
 
 var Droppables = {
@@ -20,14 +20,13 @@ var Droppables = {
       greedy:     true,
       hoverclass: null,
       tree:       false
-    }, arguments[1] || {});
+    }, arguments[1] || { });
 
     // cache containers
     if(options.containment) {
       options._containers = [];
       var containment = options.containment;
-      if((typeof containment == 'object') && 
-        (containment.constructor == Array)) {
+      if(Object.isArray(containment)) {
         containment.each( function(c) { options._containers.push($(c)) });
       } else {
         options._containers.push($(containment));
@@ -87,21 +86,23 @@ var Droppables = {
 
   show: function(point, element) {
     if(!this.drops.length) return;
-    var affected = [];
+    var drop, affected = [];
     
-    if(this.last_active) this.deactivate(this.last_active);
     this.drops.each( function(drop) {
       if(Droppables.isAffected(point, element, drop))
         affected.push(drop);
     });
         
-    if(affected.length>0) {
+    if(affected.length>0)
       drop = Droppables.findDeepestChild(affected);
+
+    if(this.last_active && this.last_active != drop) this.deactivate(this.last_active);
+    if (drop) {
       Position.within(drop.element, point[0], point[1]);
       if(drop.onHover)
         drop.onHover(element, drop.element, Position.overlap(drop.overlap, drop.element));
       
-      Droppables.activate(drop);
+      if (drop != this.last_active) Droppables.activate(drop);
     }
   },
 
@@ -110,8 +111,10 @@ var Droppables = {
     Position.prepare();
 
     if (this.isAffected([Event.pointerX(event), Event.pointerY(event)], element, this.last_active))
-      if (this.last_active.onDrop) 
-        this.last_active.onDrop(element, this.last_active.element, event);
+      if (this.last_active.onDrop) {
+        this.last_active.onDrop(element, this.last_active.element, event); 
+        return true; 
+      }
   },
 
   reset: function() {
@@ -219,10 +222,7 @@ var Draggables = {
 
 /*--------------------------------------------------------------------------*/
 
-var Draggable = Class.create();
-Draggable._dragging    = {};
-
-Draggable.prototype = {
+var Draggable = Class.create({
   initialize: function(element) {
     var defaults = {
       handle: false,
@@ -233,7 +233,7 @@ Draggable.prototype = {
         });
       },
       endeffect: function(element) {
-        var toOpacity = typeof element._opacity == 'number' ? element._opacity : 1.0;
+        var toOpacity = Object.isNumber(element._opacity) ? element._opacity : 1.0;
         new Effect.Opacity(element, {duration:0.2, from:0.7, to:toOpacity, 
           queue: {scope:'_draggable', position:'end'},
           afterFinish: function(){ 
@@ -243,6 +243,7 @@ Draggable.prototype = {
       },
       zindex: 1000,
       revert: false,
+      quiet: false,
       scroll: false,
       scrollSensitivity: 20,
       scrollSpeed: 15,
@@ -250,7 +251,7 @@ Draggable.prototype = {
       delay: 0
     };
     
-    if(!arguments[1] || typeof arguments[1].endeffect == 'undefined')
+    if(!arguments[1] || Object.isUndefined(arguments[1].endeffect))
       Object.extend(defaults, {
         starteffect: function(element) {
           element._opacity = Element.getOpacity(element);
@@ -259,11 +260,11 @@ Draggable.prototype = {
         }
       });
     
-    var options = Object.extend(defaults, arguments[1] || {});
+    var options = Object.extend(defaults, arguments[1] || { });
 
     this.element = $(element);
     
-    if(options.handle && (typeof options.handle == 'string'))
+    if(options.handle && Object.isString(options.handle))
       this.handle = this.element.down('.'+options.handle, 0);
     
     if(!this.handle) this.handle = $(options.handle);
@@ -276,7 +277,6 @@ Draggable.prototype = {
 
     Element.makePositioned(this.element); // fix IE    
 
-    this.delta    = this.currentDelta();
     this.options  = options;
     this.dragging = false;   
 
@@ -298,17 +298,17 @@ Draggable.prototype = {
   },
   
   initDrag: function(event) {
-    if(typeof Draggable._dragging[this.element] != 'undefined' &&
+    if(!Object.isUndefined(Draggable._dragging[this.element]) &&
       Draggable._dragging[this.element]) return;
     if(Event.isLeftClick(event)) {    
       // abort on form elements, fixes a Firefox issue
       var src = Event.element(event);
-      if(src.tagName && (
-        src.tagName=='INPUT' ||
-        src.tagName=='SELECT' ||
-        src.tagName=='OPTION' ||
-        src.tagName=='BUTTON' ||
-        src.tagName=='TEXTAREA')) return;
+      if((tag_name = src.tagName.toUpperCase()) && (
+        tag_name=='INPUT' ||
+        tag_name=='SELECT' ||
+        tag_name=='OPTION' ||
+        tag_name=='BUTTON' ||
+        tag_name=='TEXTAREA')) return;
         
       var pointer = [Event.pointerX(event), Event.pointerY(event)];
       var pos     = Position.cumulativeOffset(this.element);
@@ -321,6 +321,8 @@ Draggable.prototype = {
   
   startDrag: function(event) {
     this.dragging = true;
+    if(!this.delta)
+      this.delta = this.currentDelta();
     
     if(this.options.zindex) {
       this.originalZ = parseInt(Element.getStyle(this.element,'z-index') || 0);
@@ -329,7 +331,9 @@ Draggable.prototype = {
     
     if(this.options.ghosting) {
       this._clone = this.element.cloneNode(true);
-      Position.absolutize(this.element);
+      this.element._originallyAbsolute = (this.element.getStyle('position') == 'absolute');
+      if (!this.element._originallyAbsolute)
+        Position.absolutize(this.element);
       this.element.parentNode.insertBefore(this._clone, this.element);
     }
     
@@ -351,8 +355,12 @@ Draggable.prototype = {
   
   updateDrag: function(event, pointer) {
     if(!this.dragging) this.startDrag(event);
-    Position.prepare();
-    Droppables.show(pointer, this.element);
+    
+    if(!this.options.quiet){
+      Position.prepare();
+      Droppables.show(pointer, this.element);
+    }
+    
     Draggables.notify('onDrag', this, event);
     
     this.draw(pointer);
@@ -380,30 +388,44 @@ Draggable.prototype = {
     }
     
     // fix AppleWebKit rendering
-    if(navigator.appVersion.indexOf('AppleWebKit')>0) window.scrollBy(0,0);
+    if(Prototype.Browser.WebKit) window.scrollBy(0,0);
     
     Event.stop(event);
   },
   
   finishDrag: function(event, success) {
     this.dragging = false;
+    
+    if(this.options.quiet){
+      Position.prepare();
+      var pointer = [Event.pointerX(event), Event.pointerY(event)];
+      Droppables.show(pointer, this.element);
+    }
 
     if(this.options.ghosting) {
-      Position.relativize(this.element);
+      if (!this.element._originallyAbsolute)
+        Position.relativize(this.element);
+      delete this.element._originallyAbsolute;
       Element.remove(this._clone);
       this._clone = null;
     }
 
-    if(success) Droppables.fire(event, this.element);
+    var dropped = false; 
+    if(success) { 
+      dropped = Droppables.fire(event, this.element); 
+      if (!dropped) dropped = false; 
+    }
+    if(dropped && this.options.onDropped) this.options.onDropped(this.element);
     Draggables.notify('onEnd', this, event);
 
     var revert = this.options.revert;
-    if(revert && typeof revert == 'function') revert = revert(this.element);
+    if(revert && Object.isFunction(revert)) revert = revert(this.element);
     
     var d = this.currentDelta();
     if(revert && this.options.reverteffect) {
-      this.options.reverteffect(this.element, 
-        d[1]-this.delta[1], d[0]-this.delta[0]);
+      if (dropped == 0 || revert != 'failure')
+        this.options.reverteffect(this.element,
+          d[1]-this.delta[1], d[0]-this.delta[0]);
     } else {
       this.delta = d;
     }
@@ -451,15 +473,15 @@ Draggable.prototype = {
     }.bind(this));
     
     if(this.options.snap) {
-      if(typeof this.options.snap == 'function') {
+      if(Object.isFunction(this.options.snap)) {
         p = this.options.snap(p[0],p[1],this);
       } else {
-      if(this.options.snap instanceof Array) {
+      if(Object.isArray(this.options.snap)) {
         p = p.map( function(v, i) {
-          return Math.round(v/this.options.snap[i])*this.options.snap[i] }.bind(this))
+          return (v/this.options.snap[i]).round()*this.options.snap[i] }.bind(this))
       } else {
         p = p.map( function(v) {
-          return Math.round(v/this.options.snap)*this.options.snap }.bind(this))
+          return (v/this.options.snap).round()*this.options.snap }.bind(this))
       }
     }}
     
@@ -543,12 +565,13 @@ Draggable.prototype = {
     }
     return { top: T, left: L, width: W, height: H };
   }
-}
+});
+
+Draggable._dragging = { };
 
 /*--------------------------------------------------------------------------*/
 
-var SortableObserver = Class.create();
-SortableObserver.prototype = {
+var SortableObserver = Class.create({
   initialize: function(element, observer) {
     this.element   = $(element);
     this.observer  = observer;
@@ -564,15 +587,15 @@ SortableObserver.prototype = {
     if(this.lastValue != Sortable.serialize(this.element))
       this.observer(this.element)
   }
-}
+});
 
 var Sortable = {
   SERIALIZE_RULE: /^[^_\-](?:[A-Za-z0-9\-\_]*)[_](.*)$/,
   
-  sortables: {},
+  sortables: { },
   
   _findRootElement: function(element) {
-    while (element.tagName != "BODY") {  
+    while (element.tagName.toUpperCase() != "BODY") {  
       if(element.id && Sortable.sortables[element.id]) return element;
       element = element.parentNode;
     }
@@ -612,13 +635,20 @@ var Sortable = {
       delay:       0,
       hoverclass:  null,
       ghosting:    false,
+      quiet:       false, 
       scroll:      false,
       scrollSensitivity: 20,
       scrollSpeed: 15,
       format:      this.SERIALIZE_RULE,
+      
+      // these take arrays of elements or ids and can be 
+      // used for better initialization performance
+      elements:    false,
+      handles:     false,
+      
       onChange:    Prototype.emptyFunction,
       onUpdate:    Prototype.emptyFunction
-    }, arguments[1] || {});
+    }, arguments[1] || { });
 
     // clear any old sortable with same element
     this.destroy(element);
@@ -626,6 +656,7 @@ var Sortable = {
     // build options for the draggables
     var options_for_draggable = {
       revert:      true,
+      quiet:       options.quiet,
       scroll:      options.scroll,
       scrollSpeed: options.scrollSpeed,
       scrollSensitivity: options.scrollSensitivity,
@@ -679,10 +710,9 @@ var Sortable = {
       options.droppables.push(element);
     }
 
-    (this.findElements(element, options) || []).each( function(e) {
-      // handles are per-draggable
-      var handle = options.handle ? 
-        $(e).down('.'+options.handle,0) : e;    
+    (options.elements || this.findElements(element, options) || []).each( function(e,i) {
+      var handle = options.handles ? $(options.handles[i]) :
+        (options.handle ? $(e).select('.' + options.handle)[0] : e); 
       options.draggables.push(
         new Draggable(e, Object.extend(options_for_draggable, { handle: handle })));
       Droppables.add(e, options_for_droppable);
@@ -842,7 +872,7 @@ var Sortable = {
       only: sortableOptions.only,
       name: element.id,
       format: sortableOptions.format
-    }, arguments[1] || {});
+    }, arguments[1] || { });
     
     var root = {
       id: null,
@@ -866,7 +896,7 @@ var Sortable = {
 
   sequence: function(element) {
     element = $(element);
-    var options = Object.extend(this.options(element), arguments[1] || {});
+    var options = Object.extend(this.options(element), arguments[1] || { });
     
     return $(this.findElements(element, options) || []).map( function(item) {
       return item.id.match(options.format) ? item.id.match(options.format)[1] : '';
@@ -875,9 +905,9 @@ var Sortable = {
 
   setSequence: function(element, new_sequence) {
     element = $(element);
-    var options = Object.extend(this.options(element), arguments[2] || {});
+    var options = Object.extend(this.options(element), arguments[2] || { });
     
-    var nodeMap = {};
+    var nodeMap = { };
     this.findElements(element, options).each( function(n) {
         if (n.id.match(options.format))
             nodeMap[n.id.match(options.format)[1]] = [n, n.parentNode];
@@ -895,7 +925,7 @@ var Sortable = {
   
   serialize: function(element) {
     element = $(element);
-    var options = Object.extend(Sortable.options(element), arguments[1] || {});
+    var options = Object.extend(Sortable.options(element), arguments[1] || { });
     var name = encodeURIComponent(
       (arguments[1] && arguments[1].name) ? arguments[1].name : element.id);
     
@@ -919,7 +949,7 @@ Element.isParent = function(child, element) {
   return Element.isParent(child.parentNode, element);
 }
 
-Element.findChildren = function(element, only, recursive, tagName) {    
+Element.findChildren = function(element, only, recursive, tagName) {   
   if(!element.hasChildNodes()) return null;
   tagName = tagName.toUpperCase();
   if(only) only = [only].flatten();
diff --git a/public/javascripts/effects.js b/public/javascripts/effects.js
index 3b02eda2b..f030b5dbe 100644
--- a/public/javascripts/effects.js
+++ b/public/javascripts/effects.js
@@ -1,4 +1,4 @@
-// Copyright (c) 2005, 2006 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
+// Copyright (c) 2005-2008 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us)
 // Contributors:
 //  Justin Palmer (http://encytemedia.com/)
 //  Mark Pilgrim (http://diveintomark.org/)
@@ -11,17 +11,17 @@
 // returns self (or first argument) if not convertable  
 String.prototype.parseColor = function() {  
   var color = '#';
-  if(this.slice(0,4) == 'rgb(') {  
+  if (this.slice(0,4) == 'rgb(') {  
     var cols = this.slice(4,this.length-1).split(',');  
     var i=0; do { color += parseInt(cols[i]).toColorPart() } while (++i<3);  
   } else {  
-    if(this.slice(0,1) == '#') {  
-      if(this.length==4) for(var i=1;i<4;i++) color += (this.charAt(i) + this.charAt(i)).toLowerCase();  
-      if(this.length==7) color = this.toLowerCase();  
+    if (this.slice(0,1) == '#') {  
+      if (this.length==4) for(var i=1;i<4;i++) color += (this.charAt(i) + this.charAt(i)).toLowerCase();  
+      if (this.length==7) color = this.toLowerCase();  
     }  
   }  
-  return(color.length==7 ? color : (arguments[0] || this));  
-}
+  return (color.length==7 ? color : (arguments[0] || this));  
+};
 
 /*--------------------------------------------------------------------------*/
 
@@ -30,7 +30,7 @@ Element.collectTextNodes = function(element) {
     return (node.nodeType==3 ? node.nodeValue : 
       (node.hasChildNodes() ? Element.collectTextNodes(node) : ''));
   }).flatten().join('');
-}
+};
 
 Element.collectTextNodesIgnoreClass = function(element, className) {  
   return $A($(element).childNodes).collect( function(node) {
@@ -38,47 +38,18 @@ Element.collectTextNodesIgnoreClass = function(element, className) {
       ((node.hasChildNodes() && !Element.hasClassName(node,className)) ? 
         Element.collectTextNodesIgnoreClass(node, className) : ''));
   }).flatten().join('');
-}
+};
 
 Element.setContentZoom = function(element, percent) {
   element = $(element);  
   element.setStyle({fontSize: (percent/100) + 'em'});   
-  if(navigator.appVersion.indexOf('AppleWebKit')>0) window.scrollBy(0,0);
+  if (Prototype.Browser.WebKit) window.scrollBy(0,0);
   return element;
-}
+};
 
-Element.getOpacity = function(element){
-  element = $(element);
-  var opacity;
-  if (opacity = element.getStyle('opacity'))  
-    return parseFloat(opacity);  
-  if (opacity = (element.getStyle('filter') || '').match(/alpha\(opacity=(.*)\)/))  
-    if(opacity[1]) return parseFloat(opacity[1]) / 100;  
-  return 1.0;  
-}
-
-Element.setOpacity = function(element, value){  
-  element= $(element);  
-  if (value == 1){
-    element.setStyle({ opacity: 
-      (/Gecko/.test(navigator.userAgent) && !/Konqueror|Safari|KHTML/.test(navigator.userAgent)) ? 
-      0.999999 : 1.0 });
-    if(/MSIE/.test(navigator.userAgent) && !window.opera)  
-      element.setStyle({filter: Element.getStyle(element,'filter').replace(/alpha\([^\)]*\)/gi,'')});  
-  } else {  
-    if(value < 0.00001) value = 0;  
-    element.setStyle({opacity: value});
-    if(/MSIE/.test(navigator.userAgent) && !window.opera)  
-      element.setStyle(
-        { filter: element.getStyle('filter').replace(/alpha\([^\)]*\)/gi,'') +
-            'alpha(opacity='+value*100+')' });  
-  }
-  return element;
-}  
- 
-Element.getInlineOpacity = function(element){  
+Element.getInlineOpacity = function(element){
   return $(element).style.opacity || '';
-}  
+};
 
 Element.forceRerendering = function(element) {
   try {
@@ -91,31 +62,63 @@ Element.forceRerendering = function(element) {
 
 /*--------------------------------------------------------------------------*/
 
-Array.prototype.call = function() {
-  var args = arguments;
-  this.each(function(f){ f.apply(this, args) });
-}
-
-/*--------------------------------------------------------------------------*/
-
 var Effect = {
   _elementDoesNotExistError: {
     name: 'ElementDoesNotExistError',
     message: 'The specified DOM element does not exist, but is required for this effect to operate'
   },
+  Transitions: {
+    linear: Prototype.K,
+    sinoidal: function(pos) {
+      return (-Math.cos(pos*Math.PI)/2) + 0.5;
+    },
+    reverse: function(pos) {
+      return 1-pos;
+    },
+    flicker: function(pos) {
+      var pos = ((-Math.cos(pos*Math.PI)/4) + 0.75) + Math.random()/4;
+      return pos > 1 ? 1 : pos;
+    },
+    wobble: function(pos) {
+      return (-Math.cos(pos*Math.PI*(9*pos))/2) + 0.5;
+    },
+    pulse: function(pos, pulses) { 
+      pulses = pulses || 5; 
+      return (
+        ((pos % (1/pulses)) * pulses).round() == 0 ? 
+              ((pos * pulses * 2) - (pos * pulses * 2).floor()) : 
+          1 - ((pos * pulses * 2) - (pos * pulses * 2).floor())
+        );
+    },
+    spring: function(pos) { 
+      return 1 - (Math.cos(pos * 4.5 * Math.PI) * Math.exp(-pos * 6)); 
+    },
+    none: function(pos) {
+      return 0;
+    },
+    full: function(pos) {
+      return 1;
+    }
+  },
+  DefaultOptions: {
+    duration:   1.0,   // seconds
+    fps:        100,   // 100= assume 66fps max.
+    sync:       false, // true for combining
+    from:       0.0,
+    to:         1.0,
+    delay:      0.0,
+    queue:      'parallel'
+  },
   tagifyText: function(element) {
-    if(typeof Builder == 'undefined')
-      throw("Effect.tagifyText requires including script.aculo.us' builder.js library");
-      
     var tagifyStyle = 'position:relative';
-    if(/MSIE/.test(navigator.userAgent) && !window.opera) tagifyStyle += ';zoom:1';
+    if (Prototype.Browser.IE) tagifyStyle += ';zoom:1';
     
     element = $(element);
     $A(element.childNodes).each( function(child) {
-      if(child.nodeType==3) {
+      if (child.nodeType==3) {
         child.nodeValue.toArray().each( function(character) {
           element.insertBefore(
-            Builder.node('span',{style: tagifyStyle},
+            new Element('span', {style: tagifyStyle}).update(
               character == ' ' ? String.fromCharCode(160) : character), 
               child);
         });
@@ -125,8 +128,8 @@ var Effect = {
   },
   multiple: function(element, effect) {
     var elements;
-    if(((typeof element == 'object') || 
-        (typeof element == 'function')) && 
+    if (((typeof element == 'object') || 
+        Object.isFunction(element)) && 
        (element.length))
       elements = element;
     else
@@ -135,7 +138,7 @@ var Effect = {
     var options = Object.extend({
       speed: 0.1,
       delay: 0.0
-    }, arguments[2] || {});
+    }, arguments[2] || { });
     var masterDelay = options.delay;
 
     $A(elements).each( function(element, index) {
@@ -152,53 +155,20 @@ var Effect = {
     effect = (effect || 'appear').toLowerCase();
     var options = Object.extend({
       queue: { position:'end', scope:(element.id || 'global'), limit: 1 }
-    }, arguments[2] || {});
+    }, arguments[2] || { });
     Effect[element.visible() ? 
       Effect.PAIRS[effect][1] : Effect.PAIRS[effect][0]](element, options);
   }
 };
 
-var Effect2 = Effect; // deprecated
-
-/* ------------- transitions ------------- */
-
-Effect.Transitions = {
-  linear: Prototype.K,
-  sinoidal: function(pos) {
-    return (-Math.cos(pos*Math.PI)/2) + 0.5;
-  },
-  reverse: function(pos) {
-    return 1-pos;
-  },
-  flicker: function(pos) {
-    return ((-Math.cos(pos*Math.PI)/4) + 0.75) + Math.random()/4;
-  },
-  wobble: function(pos) {
-    return (-Math.cos(pos*Math.PI*(9*pos))/2) + 0.5;
-  },
-  pulse: function(pos, pulses) { 
-    pulses = pulses || 5; 
-    return (
-      Math.round((pos % (1/pulses)) * pulses) == 0 ? 
-            ((pos * pulses * 2) - Math.floor(pos * pulses * 2)) : 
-        1 - ((pos * pulses * 2) - Math.floor(pos * pulses * 2))
-      );
-  },
-  none: function(pos) {
-    return 0;
-  },
-  full: function(pos) {
-    return 1;
-  }
-};
+Effect.DefaultOptions.transition = Effect.Transitions.sinoidal;
 
 /* ------------- core effects ------------- */
 
-Effect.ScopedQueue = Class.create();
-Object.extend(Object.extend(Effect.ScopedQueue.prototype, Enumerable), {
+Effect.ScopedQueue = Class.create(Enumerable, {
   initialize: function() {
     this.effects  = [];
-    this.interval = null;
+    this.interval = null;    
   },
   _each: function(iterator) {
     this.effects._each(iterator);
@@ -206,7 +176,7 @@ Object.extend(Object.extend(Effect.ScopedQueue.prototype, Enumerable), {
   add: function(effect) {
     var timestamp = new Date().getTime();
     
-    var position = (typeof effect.options.queue == 'string') ? 
+    var position = Object.isString(effect.options.queue) ? 
       effect.options.queue : effect.options.queue.position;
     
     switch(position) {
@@ -229,115 +199,111 @@ Object.extend(Object.extend(Effect.ScopedQueue.prototype, Enumerable), {
     effect.startOn  += timestamp;
     effect.finishOn += timestamp;
 
-    if(!effect.options.queue.limit || (this.effects.length < effect.options.queue.limit))
+    if (!effect.options.queue.limit || (this.effects.length < effect.options.queue.limit))
       this.effects.push(effect);
     
-    if(!this.interval) 
-      this.interval = setInterval(this.loop.bind(this), 40);
+    if (!this.interval)
+      this.interval = setInterval(this.loop.bind(this), 15);
   },
   remove: function(effect) {
     this.effects = this.effects.reject(function(e) { return e==effect });
-    if(this.effects.length == 0) {
+    if (this.effects.length == 0) {
       clearInterval(this.interval);
       this.interval = null;
     }
   },
   loop: function() {
     var timePos = new Date().getTime();
-    this.effects.invoke('loop', timePos);
+    for(var i=0, len=this.effects.length;i<len;i++) 
+      this.effects[i] && this.effects[i].loop(timePos);
   }
 });
 
 Effect.Queues = {
   instances: $H(),
   get: function(queueName) {
-    if(typeof queueName != 'string') return queueName;
+    if (!Object.isString(queueName)) return queueName;
     
-    if(!this.instances[queueName])
-      this.instances[queueName] = new Effect.ScopedQueue();
-      
-    return this.instances[queueName];
+    return this.instances.get(queueName) ||
+      this.instances.set(queueName, new Effect.ScopedQueue());
   }
-}
+};
 Effect.Queue = Effect.Queues.get('global');
 
-Effect.DefaultOptions = {
-  transition: Effect.Transitions.sinoidal,
-  duration:   1.0,   // seconds
-  fps:        25.0,  // max. 25fps due to Effect.Queue implementation
-  sync:       false, // true for combining
-  from:       0.0,
-  to:         1.0,
-  delay:      0.0,
-  queue:      'parallel'
-}
-
-Effect.Base = function() {};
-Effect.Base.prototype = {
+Effect.Base = Class.create({
   position: null,
   start: function(options) {
-    this.options      = Object.extend(Object.extend({},Effect.DefaultOptions), options || {});
+    function codeForEvent(options,eventName){
+      return (
+        (options[eventName+'Internal'] ? 'this.options.'+eventName+'Internal(this);' : '') +
+        (options[eventName] ? 'this.options.'+eventName+'(this);' : '')
+      );
+    }
+    if (options && options.transition === false) options.transition = Effect.Transitions.linear;
+    this.options      = Object.extend(Object.extend({ },Effect.DefaultOptions), options || { });
     this.currentFrame = 0;
     this.state        = 'idle';
     this.startOn      = this.options.delay*1000;
-    this.finishOn     = this.startOn + (this.options.duration*1000);
+    this.finishOn     = this.startOn+(this.options.duration*1000);
+    this.fromToDelta  = this.options.to-this.options.from;
+    this.totalTime    = this.finishOn-this.startOn;
+    this.totalFrames  = this.options.fps*this.options.duration;
+    
+    eval('this.render = function(pos){ '+
+      'if (this.state=="idle"){this.state="running";'+
+      codeForEvent(this.options,'beforeSetup')+
+      (this.setup ? 'this.setup();':'')+ 
+      codeForEvent(this.options,'afterSetup')+
+      '};if (this.state=="running"){'+
+      'pos=this.options.transition(pos)*'+this.fromToDelta+'+'+this.options.from+';'+
+      'this.position=pos;'+
+      codeForEvent(this.options,'beforeUpdate')+
+      (this.update ? 'this.update(pos);':'')+
+      codeForEvent(this.options,'afterUpdate')+
+      '}}');
+    
     this.event('beforeStart');
-    if(!this.options.sync)
-      Effect.Queues.get(typeof this.options.queue == 'string' ? 
+    if (!this.options.sync)
+      Effect.Queues.get(Object.isString(this.options.queue) ? 
         'global' : this.options.queue.scope).add(this);
   },
   loop: function(timePos) {
-    if(timePos >= this.startOn) {
-      if(timePos >= this.finishOn) {
+    if (timePos >= this.startOn) {
+      if (timePos >= this.finishOn) {
         this.render(1.0);
         this.cancel();
         this.event('beforeFinish');
-        if(this.finish) this.finish(); 
+        if (this.finish) this.finish(); 
         this.event('afterFinish');
         return;  
       }
-      var pos   = (timePos - this.startOn) / (this.finishOn - this.startOn);
-      var frame = Math.round(pos * this.options.fps * this.options.duration);
-      if(frame > this.currentFrame) {
+      var pos   = (timePos - this.startOn) / this.totalTime,
+          frame = (pos * this.totalFrames).round();
+      if (frame > this.currentFrame) {
         this.render(pos);
         this.currentFrame = frame;
       }
     }
   },
-  render: function(pos) {
-    if(this.state == 'idle') {
-      this.state = 'running';
-      this.event('beforeSetup');
-      if(this.setup) this.setup();
-      this.event('afterSetup');
-    }
-    if(this.state == 'running') {
-      if(this.options.transition) pos = this.options.transition(pos);
-      pos *= (this.options.to-this.options.from);
-      pos += this.options.from;
-      this.position = pos;
-      this.event('beforeUpdate');
-      if(this.update) this.update(pos);
-      this.event('afterUpdate');
-    }
-  },
   cancel: function() {
-    if(!this.options.sync)
-      Effect.Queues.get(typeof this.options.queue == 'string' ? 
+    if (!this.options.sync)
+      Effect.Queues.get(Object.isString(this.options.queue) ? 
         'global' : this.options.queue.scope).remove(this);
     this.state = 'finished';
   },
   event: function(eventName) {
-    if(this.options[eventName + 'Internal']) this.options[eventName + 'Internal'](this);
-    if(this.options[eventName]) this.options[eventName](this);
+    if (this.options[eventName + 'Internal']) this.options[eventName + 'Internal'](this);
+    if (this.options[eventName]) this.options[eventName](this);
   },
   inspect: function() {
-    return '#<Effect:' + $H(this).inspect() + ',options:' + $H(this.options).inspect() + '>';
+    var data = $H();
+    for(property in this)
+      if (!Object.isFunction(this[property])) data.set(property, this[property]);
+    return '#<Effect:' + data.inspect() + ',options:' + $H(this.options).inspect() + '>';
   }
-}
+});
 
-Effect.Parallel = Class.create();
-Object.extend(Object.extend(Effect.Parallel.prototype, Effect.Base.prototype), {
+Effect.Parallel = Class.create(Effect.Base, {
   initialize: function(effects) {
     this.effects = effects || [];
     this.start(arguments[1]);
@@ -350,35 +316,45 @@ Object.extend(Object.extend(Effect.Parallel.prototype, Effect.Base.prototype), {
       effect.render(1.0);
       effect.cancel();
       effect.event('beforeFinish');
-      if(effect.finish) effect.finish(position);
+      if (effect.finish) effect.finish(position);
       effect.event('afterFinish');
     });
   }
 });
 
-Effect.Event = Class.create();
-Object.extend(Object.extend(Effect.Event.prototype, Effect.Base.prototype), {
+Effect.Tween = Class.create(Effect.Base, {
+  initialize: function(object, from, to) {
+    object = Object.isString(object) ? $(object) : object;
+    var args = $A(arguments), method = args.last(), 
+      options = args.length == 5 ? args[3] : null;
+    this.method = Object.isFunction(method) ? method.bind(object) :
+      Object.isFunction(object[method]) ? object[method].bind(object) : 
+      function(value) { object[method] = value };
+    this.start(Object.extend({ from: from, to: to }, options || { }));
+  },
+  update: function(position) {
+    this.method(position);
+  }
+});
+
+Effect.Event = Class.create(Effect.Base, {
   initialize: function() {
-    var options = Object.extend({
-      duration: 0
-    }, arguments[0] || {});
-    this.start(options);
+    this.start(Object.extend({ duration: 0 }, arguments[0] || { }));
   },
   update: Prototype.emptyFunction
 });
 
-Effect.Opacity = Class.create();
-Object.extend(Object.extend(Effect.Opacity.prototype, Effect.Base.prototype), {
+Effect.Opacity = Class.create(Effect.Base, {
   initialize: function(element) {
     this.element = $(element);
-    if(!this.element) throw(Effect._elementDoesNotExistError);
+    if (!this.element) throw(Effect._elementDoesNotExistError);
     // make this work on IE on elements without 'layout'
-    if(/MSIE/.test(navigator.userAgent) && !window.opera && (!this.element.currentStyle.hasLayout))
+    if (Prototype.Browser.IE && (!this.element.currentStyle.hasLayout))
       this.element.setStyle({zoom: 1});
     var options = Object.extend({
       from: this.element.getOpacity() || 0.0,
       to:   1.0
-    }, arguments[1] || {});
+    }, arguments[1] || { });
     this.start(options);
   },
   update: function(position) {
@@ -386,36 +362,30 @@ Object.extend(Object.extend(Effect.Opacity.prototype, Effect.Base.prototype), {
   }
 });
 
-Effect.Move = Class.create();
-Object.extend(Object.extend(Effect.Move.prototype, Effect.Base.prototype), {
+Effect.Move = Class.create(Effect.Base, {
   initialize: function(element) {
     this.element = $(element);
-    if(!this.element) throw(Effect._elementDoesNotExistError);
+    if (!this.element) throw(Effect._elementDoesNotExistError);
     var options = Object.extend({
       x:    0,
       y:    0,
       mode: 'relative'
-    }, arguments[1] || {});
+    }, arguments[1] || { });
     this.start(options);
   },
   setup: function() {
-    // Bug in Opera: Opera returns the "real" position of a static element or
-    // relative element that does not have top/left explicitly set.
-    // ==> Always set top and left for position relative elements in your stylesheets 
-    // (to 0 if you do not need them) 
     this.element.makePositioned();
     this.originalLeft = parseFloat(this.element.getStyle('left') || '0');
     this.originalTop  = parseFloat(this.element.getStyle('top')  || '0');
-    if(this.options.mode == 'absolute') {
-      // absolute movement, so we need to calc deltaX and deltaY
+    if (this.options.mode == 'absolute') {
       this.options.x = this.options.x - this.originalLeft;
       this.options.y = this.options.y - this.originalTop;
     }
   },
   update: function(position) {
     this.element.setStyle({
-      left: Math.round(this.options.x  * position + this.originalLeft) + 'px',
-      top:  Math.round(this.options.y  * position + this.originalTop)  + 'px'
+      left: (this.options.x  * position + this.originalLeft).round() + 'px',
+      top:  (this.options.y  * position + this.originalTop).round()  + 'px'
     });
   }
 });
@@ -423,30 +393,29 @@ Object.extend(Object.extend(Effect.Move.prototype, Effect.Base.prototype), {
 // for backwards compatibility
 Effect.MoveBy = function(element, toTop, toLeft) {
   return new Effect.Move(element, 
-    Object.extend({ x: toLeft, y: toTop }, arguments[3] || {}));
+    Object.extend({ x: toLeft, y: toTop }, arguments[3] || { }));
 };
 
-Effect.Scale = Class.create();
-Object.extend(Object.extend(Effect.Scale.prototype, Effect.Base.prototype), {
+Effect.Scale = Class.create(Effect.Base, {
   initialize: function(element, percent) {
     this.element = $(element);
-    if(!this.element) throw(Effect._elementDoesNotExistError);
+    if (!this.element) throw(Effect._elementDoesNotExistError);
     var options = Object.extend({
       scaleX: true,
       scaleY: true,
       scaleContent: true,
       scaleFromCenter: false,
-      scaleMode: 'box',        // 'box' or 'contents' or {} with provided values
+      scaleMode: 'box',        // 'box' or 'contents' or { } with provided values
       scaleFrom: 100.0,
       scaleTo:   percent
-    }, arguments[2] || {});
+    }, arguments[2] || { });
     this.start(options);
   },
   setup: function() {
     this.restoreAfterFinish = this.options.restoreAfterFinish || false;
     this.elementPositioning = this.element.getStyle('position');
     
-    this.originalStyle = {};
+    this.originalStyle = { };
     ['top','left','width','height','fontSize'].each( function(k) {
       this.originalStyle[k] = this.element.style[k];
     }.bind(this));
@@ -456,7 +425,7 @@ Object.extend(Object.extend(Effect.Scale.prototype, Effect.Base.prototype), {
     
     var fontSize = this.element.getStyle('font-size') || '100%';
     ['em','px','%','pt'].each( function(fontSizeType) {
-      if(fontSize.indexOf(fontSizeType)>0) {
+      if (fontSize.indexOf(fontSizeType)>0) {
         this.fontSize     = parseFloat(fontSize);
         this.fontSizeType = fontSizeType;
       }
@@ -465,60 +434,61 @@ Object.extend(Object.extend(Effect.Scale.prototype, Effect.Base.prototype), {
     this.factor = (this.options.scaleTo - this.options.scaleFrom)/100;
     
     this.dims = null;
-    if(this.options.scaleMode=='box')
+    if (this.options.scaleMode=='box')
       this.dims = [this.element.offsetHeight, this.element.offsetWidth];
-    if(/^content/.test(this.options.scaleMode))
+    if (/^content/.test(this.options.scaleMode))
       this.dims = [this.element.scrollHeight, this.element.scrollWidth];
-    if(!this.dims)
+    if (!this.dims)
       this.dims = [this.options.scaleMode.originalHeight,
                    this.options.scaleMode.originalWidth];
   },
   update: function(position) {
     var currentScale = (this.options.scaleFrom/100.0) + (this.factor * position);
-    if(this.options.scaleContent && this.fontSize)
+    if (this.options.scaleContent && this.fontSize)
       this.element.setStyle({fontSize: this.fontSize * currentScale + this.fontSizeType });
     this.setDimensions(this.dims[0] * currentScale, this.dims[1] * currentScale);
   },
   finish: function(position) {
-    if(this.restoreAfterFinish) this.element.setStyle(this.originalStyle);
+    if (this.restoreAfterFinish) this.element.setStyle(this.originalStyle);
   },
   setDimensions: function(height, width) {
-    var d = {};
-    if(this.options.scaleX) d.width = Math.round(width) + 'px';
-    if(this.options.scaleY) d.height = Math.round(height) + 'px';
-    if(this.options.scaleFromCenter) {
+    var d = { };
+    if (this.options.scaleX) d.width = width.round() + 'px';
+    if (this.options.scaleY) d.height = height.round() + 'px';
+    if (this.options.scaleFromCenter) {
       var topd  = (height - this.dims[0])/2;
       var leftd = (width  - this.dims[1])/2;
-      if(this.elementPositioning == 'absolute') {
-        if(this.options.scaleY) d.top = this.originalTop-topd + 'px';
-        if(this.options.scaleX) d.left = this.originalLeft-leftd + 'px';
+      if (this.elementPositioning == 'absolute') {
+        if (this.options.scaleY) d.top = this.originalTop-topd + 'px';
+        if (this.options.scaleX) d.left = this.originalLeft-leftd + 'px';
       } else {
-        if(this.options.scaleY) d.top = -topd + 'px';
-        if(this.options.scaleX) d.left = -leftd + 'px';
+        if (this.options.scaleY) d.top = -topd + 'px';
+        if (this.options.scaleX) d.left = -leftd + 'px';
       }
     }
     this.element.setStyle(d);
   }
 });
 
-Effect.Highlight = Class.create();
-Object.extend(Object.extend(Effect.Highlight.prototype, Effect.Base.prototype), {
+Effect.Highlight = Class.create(Effect.Base, {
   initialize: function(element) {
     this.element = $(element);
-    if(!this.element) throw(Effect._elementDoesNotExistError);
-    var options = Object.extend({ startcolor: '#ffff99' }, arguments[1] || {});
+    if (!this.element) throw(Effect._elementDoesNotExistError);
+    var options = Object.extend({ startcolor: '#ffff99' }, arguments[1] || { });
     this.start(options);
   },
   setup: function() {
     // Prevent executing on elements not in the layout flow
-    if(this.element.getStyle('display')=='none') { this.cancel(); return; }
+    if (this.element.getStyle('display')=='none') { this.cancel(); return; }
     // Disable background image during the effect
-    this.oldStyle = {
-      backgroundImage: this.element.getStyle('background-image') };
-    this.element.setStyle({backgroundImage: 'none'});
-    if(!this.options.endcolor)
+    this.oldStyle = { };
+    if (!this.options.keepBackgroundImage) {
+      this.oldStyle.backgroundImage = this.element.getStyle('background-image');
+      this.element.setStyle({backgroundImage: 'none'});
+    }
+    if (!this.options.endcolor)
       this.options.endcolor = this.element.getStyle('background-color').parseColor('#ffffff');
-    if(!this.options.restorecolor)
+    if (!this.options.restorecolor)
       this.options.restorecolor = this.element.getStyle('background-color');
     // init color calculations
     this._base  = $R(0,2).map(function(i){ return parseInt(this.options.startcolor.slice(i*2+1,i*2+3),16) }.bind(this));
@@ -526,7 +496,7 @@ Object.extend(Object.extend(Effect.Highlight.prototype, Effect.Base.prototype),
   },
   update: function(position) {
     this.element.setStyle({backgroundColor: $R(0,2).inject('#',function(m,v,i){
-      return m+(Math.round(this._base[i]+(this._delta[i]*position)).toColorPart()); }.bind(this)) });
+      return m+((this._base[i]+(this._delta[i]*position)).round().toColorPart()); }.bind(this)) });
   },
   finish: function() {
     this.element.setStyle(Object.extend(this.oldStyle, {
@@ -535,30 +505,21 @@ Object.extend(Object.extend(Effect.Highlight.prototype, Effect.Base.prototype),
   }
 });
 
-Effect.ScrollTo = Class.create();
-Object.extend(Object.extend(Effect.ScrollTo.prototype, Effect.Base.prototype), {
-  initialize: function(element) {
-    this.element = $(element);
-    this.start(arguments[1] || {});
-  },
-  setup: function() {
-    Position.prepare();
-    var offsets = Position.cumulativeOffset(this.element);
-    if(this.options.offset) offsets[1] += this.options.offset;
-    var max = window.innerHeight ? 
-      window.height - window.innerHeight :
-      document.body.scrollHeight - 
-        (document.documentElement.clientHeight ? 
-          document.documentElement.clientHeight : document.body.clientHeight);
-    this.scrollStart = Position.deltaY;
-    this.delta = (offsets[1] > max ? max : offsets[1]) - this.scrollStart;
-  },
-  update: function(position) {
-    Position.prepare();
-    window.scrollTo(Position.deltaX, 
-      this.scrollStart + (position*this.delta));
-  }
-});
+Effect.ScrollTo = function(element) {
+  var options = arguments[1] || { },
+    scrollOffsets = document.viewport.getScrollOffsets(),
+    elementOffsets = $(element).cumulativeOffset(),
+    max = (window.height || document.body.scrollHeight) - document.viewport.getHeight();  
+
+  if (options.offset) elementOffsets[1] += options.offset;
+
+  return new Effect.Tween(null,
+    scrollOffsets.top,
+    elementOffsets[1] > max ? max : elementOffsets[1],
+    options,
+    function(p){ scrollTo(scrollOffsets.left, p.round()) }
+  );
+};
 
 /* ------------- combination effects ------------- */
 
@@ -566,14 +527,15 @@ Effect.Fade = function(element) {
   element = $(element);
   var oldOpacity = element.getInlineOpacity();
   var options = Object.extend({
-  from: element.getOpacity() || 1.0,
-  to:   0.0,
-  afterFinishInternal: function(effect) { 
-    if(effect.options.to!=0) return;
-    effect.element.hide().setStyle({opacity: oldOpacity}); 
-  }}, arguments[1] || {});
+    from: element.getOpacity() || 1.0,
+    to:   0.0,
+    afterFinishInternal: function(effect) { 
+      if (effect.options.to!=0) return;
+      effect.element.hide().setStyle({opacity: oldOpacity}); 
+    }
+  }, arguments[1] || { });
   return new Effect.Opacity(element,options);
-}
+};
 
 Effect.Appear = function(element) {
   element = $(element);
@@ -586,9 +548,9 @@ Effect.Appear = function(element) {
   },
   beforeSetup: function(effect) {
     effect.element.setOpacity(effect.options.from).show(); 
-  }}, arguments[1] || {});
+  }}, arguments[1] || { });
   return new Effect.Opacity(element,options);
-}
+};
 
 Effect.Puff = function(element) {
   element = $(element);
@@ -610,9 +572,9 @@ Effect.Puff = function(element) {
       },
       afterFinishInternal: function(effect) {
          effect.effects[0].element.hide().setStyle(oldStyle); }
-     }, arguments[1] || {})
+     }, arguments[1] || { })
    );
-}
+};
 
 Effect.BlindUp = function(element) {
   element = $(element);
@@ -624,9 +586,9 @@ Effect.BlindUp = function(element) {
       afterFinishInternal: function(effect) {
         effect.element.hide().undoClipping();
       } 
-    }, arguments[1] || {})
+    }, arguments[1] || { })
   );
-}
+};
 
 Effect.BlindDown = function(element) {
   element = $(element);
@@ -643,8 +605,8 @@ Effect.BlindDown = function(element) {
     afterFinishInternal: function(effect) {
       effect.element.undoClipping();
     }
-  }, arguments[1] || {}));
-}
+  }, arguments[1] || { }));
+};
 
 Effect.SwitchOff = function(element) {
   element = $(element);
@@ -665,8 +627,8 @@ Effect.SwitchOff = function(element) {
         }
       })
     }
-  }, arguments[1] || {}));
-}
+  }, arguments[1] || { }));
+};
 
 Effect.DropOut = function(element) {
   element = $(element);
@@ -685,29 +647,35 @@ Effect.DropOut = function(element) {
         afterFinishInternal: function(effect) {
           effect.effects[0].element.hide().undoPositioned().setStyle(oldStyle);
         } 
-      }, arguments[1] || {}));
-}
+      }, arguments[1] || { }));
+};
 
 Effect.Shake = function(element) {
   element = $(element);
+  var options = Object.extend({
+    distance: 20,
+    duration: 0.5
+  }, arguments[1] || {});
+  var distance = parseFloat(options.distance);
+  var split = parseFloat(options.duration) / 10.0;
   var oldStyle = {
     top: element.getStyle('top'),
     left: element.getStyle('left') };
-    return new Effect.Move(element, 
-      { x:  20, y: 0, duration: 0.05, afterFinishInternal: function(effect) {
+    return new Effect.Move(element,
+      { x:  distance, y: 0, duration: split, afterFinishInternal: function(effect) {
     new Effect.Move(effect.element,
-      { x: -40, y: 0, duration: 0.1,  afterFinishInternal: function(effect) {
+      { x: -distance*2, y: 0, duration: split*2,  afterFinishInternal: function(effect) {
     new Effect.Move(effect.element,
-      { x:  40, y: 0, duration: 0.1,  afterFinishInternal: function(effect) {
+      { x:  distance*2, y: 0, duration: split*2,  afterFinishInternal: function(effect) {
     new Effect.Move(effect.element,
-      { x: -40, y: 0, duration: 0.1,  afterFinishInternal: function(effect) {
+      { x: -distance*2, y: 0, duration: split*2,  afterFinishInternal: function(effect) {
     new Effect.Move(effect.element,
-      { x:  40, y: 0, duration: 0.1,  afterFinishInternal: function(effect) {
+      { x:  distance*2, y: 0, duration: split*2,  afterFinishInternal: function(effect) {
     new Effect.Move(effect.element,
-      { x: -20, y: 0, duration: 0.05, afterFinishInternal: function(effect) {
+      { x: -distance, y: 0, duration: split, afterFinishInternal: function(effect) {
         effect.element.undoPositioned().setStyle(oldStyle);
   }}) }}) }}) }}) }}) }});
-}
+};
 
 Effect.SlideDown = function(element) {
   element = $(element).cleanWhitespace();
@@ -723,7 +691,7 @@ Effect.SlideDown = function(element) {
     afterSetup: function(effect) {
       effect.element.makePositioned();
       effect.element.down().makePositioned();
-      if(window.opera) effect.element.setStyle({top: ''});
+      if (window.opera) effect.element.setStyle({top: ''});
       effect.element.makeClipping().setStyle({height: '0px'}).show(); 
     },
     afterUpdateInternal: function(effect) {
@@ -733,23 +701,25 @@ Effect.SlideDown = function(element) {
     afterFinishInternal: function(effect) {
       effect.element.undoClipping().undoPositioned();
       effect.element.down().undoPositioned().setStyle({bottom: oldInnerBottom}); }
-    }, arguments[1] || {})
+    }, arguments[1] || { })
   );
-}
+};
 
 Effect.SlideUp = function(element) {
   element = $(element).cleanWhitespace();
   var oldInnerBottom = element.down().getStyle('bottom');
+  var elementDimensions = element.getDimensions();
   return new Effect.Scale(element, window.opera ? 0 : 1,
    Object.extend({ scaleContent: false, 
     scaleX: false, 
     scaleMode: 'box',
     scaleFrom: 100,
+    scaleMode: {originalHeight: elementDimensions.height, originalWidth: elementDimensions.width},
     restoreAfterFinish: true,
-    beforeStartInternal: function(effect) {
+    afterSetup: function(effect) {
       effect.element.makePositioned();
       effect.element.down().makePositioned();
-      if(window.opera) effect.element.setStyle({top: ''});
+      if (window.opera) effect.element.setStyle({top: ''});
       effect.element.makeClipping().show();
     },  
     afterUpdateInternal: function(effect) {
@@ -757,12 +727,12 @@ Effect.SlideUp = function(element) {
         (effect.dims[0] - effect.element.clientHeight) + 'px' });
     },
     afterFinishInternal: function(effect) {
-      effect.element.hide().undoClipping().undoPositioned().setStyle({bottom: oldInnerBottom});
-      effect.element.down().undoPositioned();
+      effect.element.hide().undoClipping().undoPositioned();
+      effect.element.down().undoPositioned().setStyle({bottom: oldInnerBottom});
     }
-   }, arguments[1] || {})
+   }, arguments[1] || { })
   );
-}
+};
 
 // Bug in opera makes the TD containing this element expand for a instance after finish 
 Effect.Squish = function(element) {
@@ -775,7 +745,7 @@ Effect.Squish = function(element) {
       effect.element.hide().undoClipping(); 
     }
   });
-}
+};
 
 Effect.Grow = function(element) {
   element = $(element);
@@ -784,7 +754,7 @@ Effect.Grow = function(element) {
     moveTransition: Effect.Transitions.sinoidal,
     scaleTransition: Effect.Transitions.sinoidal,
     opacityTransition: Effect.Transitions.full
-  }, arguments[1] || {});
+  }, arguments[1] || { });
   var oldStyle = {
     top: element.style.top,
     left: element.style.left,
@@ -849,7 +819,7 @@ Effect.Grow = function(element) {
       )
     }
   });
-}
+};
 
 Effect.Shrink = function(element) {
   element = $(element);
@@ -858,7 +828,7 @@ Effect.Shrink = function(element) {
     moveTransition: Effect.Transitions.sinoidal,
     scaleTransition: Effect.Transitions.sinoidal,
     opacityTransition: Effect.Transitions.none
-  }, arguments[1] || {});
+  }, arguments[1] || { });
   var oldStyle = {
     top: element.style.top,
     left: element.style.left,
@@ -903,11 +873,11 @@ Effect.Shrink = function(element) {
            effect.effects[0].element.hide().undoClipping().undoPositioned().setStyle(oldStyle); }
        }, options)
   );
-}
+};
 
 Effect.Pulsate = function(element) {
   element = $(element);
-  var options    = arguments[1] || {};
+  var options    = arguments[1] || { };
   var oldOpacity = element.getInlineOpacity();
   var transition = options.transition || Effect.Transitions.sinoidal;
   var reverser   = function(pos){ return transition(1-Effect.Transitions.pulse(pos, options.pulses)) };
@@ -916,7 +886,7 @@ Effect.Pulsate = function(element) {
     Object.extend(Object.extend({  duration: 2.0, from: 0,
       afterFinishInternal: function(effect) { effect.element.setStyle({opacity: oldOpacity}); }
     }, options), {transition: reverser}));
-}
+};
 
 Effect.Fold = function(element) {
   element = $(element);
@@ -936,37 +906,71 @@ Effect.Fold = function(element) {
       afterFinishInternal: function(effect) {
         effect.element.hide().undoClipping().setStyle(oldStyle);
       } });
-  }}, arguments[1] || {}));
+  }}, arguments[1] || { }));
 };
 
-Effect.Morph = Class.create();
-Object.extend(Object.extend(Effect.Morph.prototype, Effect.Base.prototype), {
+Effect.Morph = Class.create(Effect.Base, {
   initialize: function(element) {
     this.element = $(element);
-    if(!this.element) throw(Effect._elementDoesNotExistError);
+    if (!this.element) throw(Effect._elementDoesNotExistError);
     var options = Object.extend({
-      style: ''
-    }, arguments[1] || {});
+      style: { }
+    }, arguments[1] || { });
+    
+    if (!Object.isString(options.style)) this.style = $H(options.style);
+    else {
+      if (options.style.include(':'))
+        this.style = options.style.parseStyle();
+      else {
+        this.element.addClassName(options.style);
+        this.style = $H(this.element.getStyles());
+        this.element.removeClassName(options.style);
+        var css = this.element.getStyles();
+        this.style = this.style.reject(function(style) {
+          return style.value == css[style.key];
+        });
+        options.afterFinishInternal = function(effect) {
+          effect.element.addClassName(effect.options.style);
+          effect.transforms.each(function(transform) {
+            effect.element.style[transform.style] = '';
+          });
+        }
+      }
+    }
     this.start(options);
   },
+  
   setup: function(){
     function parseColor(color){
-      if(!color || ['rgba(0, 0, 0, 0)','transparent'].include(color)) color = '#ffffff';
+      if (!color || ['rgba(0, 0, 0, 0)','transparent'].include(color)) color = '#ffffff';
       color = color.parseColor();
       return $R(0,2).map(function(i){
         return parseInt( color.slice(i*2+1,i*2+3), 16 ) 
       });
     }
-    this.transforms = this.options.style.parseStyle().map(function(property){
-      var originalValue = this.element.getStyle(property[0]);
-      return $H({ 
-        style: property[0], 
-        originalValue: property[1].unit=='color' ? 
-          parseColor(originalValue) : parseFloat(originalValue || 0), 
-        targetValue: property[1].unit=='color' ? 
-          parseColor(property[1].value) : property[1].value,
-        unit: property[1].unit
-      });
+    this.transforms = this.style.map(function(pair){
+      var property = pair[0], value = pair[1], unit = null;
+
+      if (value.parseColor('#zzzzzz') != '#zzzzzz') {
+        value = value.parseColor();
+        unit  = 'color';
+      } else if (property == 'opacity') {
+        value = parseFloat(value);
+        if (Prototype.Browser.IE && (!this.element.currentStyle.hasLayout))
+          this.element.setStyle({zoom: 1});
+      } else if (Element.CSS_LENGTH.test(value)) {
+          var components = value.match(/^([\+\-]?[0-9\.]+)(.*)$/);
+          value = parseFloat(components[1]);
+          unit = (components.length == 3) ? components[2] : null;
+      }
+
+      var originalValue = this.element.getStyle(property);
+      return { 
+        style: property.camelize(), 
+        originalValue: unit=='color' ? parseColor(originalValue) : parseFloat(originalValue || 0), 
+        targetValue: unit=='color' ? parseColor(value) : value,
+        unit: unit
+      };
     }.bind(this)).reject(function(transform){
       return (
         (transform.originalValue == transform.targetValue) ||
@@ -978,32 +982,35 @@ Object.extend(Object.extend(Effect.Morph.prototype, Effect.Base.prototype), {
     });
   },
   update: function(position) {
-    var style = $H(), value = null;
-    this.transforms.each(function(transform){
-      value = transform.unit=='color' ?
-        $R(0,2).inject('#',function(m,v,i){
-          return m+(Math.round(transform.originalValue[i]+
-            (transform.targetValue[i] - transform.originalValue[i])*position)).toColorPart() }) : 
-        transform.originalValue + Math.round(
-          ((transform.targetValue - transform.originalValue) * position) * 1000)/1000 + transform.unit;
-      style[transform.style] = value;
-    });
-    this.element.setStyle(style);
+    var style = { }, transform, i = this.transforms.length;
+    while(i--)
+      style[(transform = this.transforms[i]).style] = 
+        transform.unit=='color' ? '#'+
+          (Math.round(transform.originalValue[0]+
+            (transform.targetValue[0]-transform.originalValue[0])*position)).toColorPart() +
+          (Math.round(transform.originalValue[1]+
+            (transform.targetValue[1]-transform.originalValue[1])*position)).toColorPart() +
+          (Math.round(transform.originalValue[2]+
+            (transform.targetValue[2]-transform.originalValue[2])*position)).toColorPart() :
+        (transform.originalValue +
+          (transform.targetValue - transform.originalValue) * position).toFixed(3) + 
+            (transform.unit === null ? '' : transform.unit);
+    this.element.setStyle(style, true);
   }
 });
 
-Effect.Transform = Class.create();
-Object.extend(Effect.Transform.prototype, {
+Effect.Transform = Class.create({
   initialize: function(tracks){
     this.tracks  = [];
-    this.options = arguments[1] || {};
+    this.options = arguments[1] || { };
     this.addTracks(tracks);
   },
   addTracks: function(tracks){
     tracks.each(function(track){
-      var data = $H(track).values().first();
+      track = $H(track);
+      var data = track.values().first();
       this.tracks.push($H({
-        ids:     $H(track).keys().first(),
+        ids:     track.keys().first(),
         effect:  Effect.Morph,
         options: { style: data }
       }));
@@ -1013,76 +1020,101 @@ Object.extend(Effect.Transform.prototype, {
   play: function(){
     return new Effect.Parallel(
       this.tracks.map(function(track){
-        var elements = [$(track.ids) || $$(track.ids)].flatten();
-        return elements.map(function(e){ return new track.effect(e, Object.extend({ sync:true }, track.options)) });
+        var ids = track.get('ids'), effect = track.get('effect'), options = track.get('options');
+        var elements = [$(ids) || $$(ids)].flatten();
+        return elements.map(function(e){ return new effect(e, Object.extend({ sync:true }, options)) });
       }).flatten(),
       this.options
     );
   }
 });
 
-Element.CSS_PROPERTIES = ['azimuth', 'backgroundAttachment', 'backgroundColor', 'backgroundImage', 
-  'backgroundPosition', 'backgroundRepeat', 'borderBottomColor', 'borderBottomStyle', 
-  'borderBottomWidth', 'borderCollapse', 'borderLeftColor', 'borderLeftStyle', 'borderLeftWidth',
-  'borderRightColor', 'borderRightStyle', 'borderRightWidth', 'borderSpacing', 'borderTopColor',
-  'borderTopStyle', 'borderTopWidth', 'bottom', 'captionSide', 'clear', 'clip', 'color', 'content',
-  'counterIncrement', 'counterReset', 'cssFloat', 'cueAfter', 'cueBefore', 'cursor', 'direction',
-  'display', 'elevation', 'emptyCells', 'fontFamily', 'fontSize', 'fontSizeAdjust', 'fontStretch',
-  'fontStyle', 'fontVariant', 'fontWeight', 'height', 'left', 'letterSpacing', 'lineHeight',
-  'listStyleImage', 'listStylePosition', 'listStyleType', 'marginBottom', 'marginLeft', 'marginRight',
-  'marginTop', 'markerOffset', 'marks', 'maxHeight', 'maxWidth', 'minHeight', 'minWidth', 'opacity',
-  'orphans', 'outlineColor', 'outlineOffset', 'outlineStyle', 'outlineWidth', 'overflowX', 'overflowY',
-  'paddingBottom', 'paddingLeft', 'paddingRight', 'paddingTop', 'page', 'pageBreakAfter', 'pageBreakBefore',
-  'pageBreakInside', 'pauseAfter', 'pauseBefore', 'pitch', 'pitchRange', 'position', 'quotes',
-  'richness', 'right', 'size', 'speakHeader', 'speakNumeral', 'speakPunctuation', 'speechRate', 'stress',
-  'tableLayout', 'textAlign', 'textDecoration', 'textIndent', 'textShadow', 'textTransform', 'top',
-  'unicodeBidi', 'verticalAlign', 'visibility', 'voiceFamily', 'volume', 'whiteSpace', 'widows',
-  'width', 'wordSpacing', 'zIndex'];
+Element.CSS_PROPERTIES = $w(
+  'backgroundColor backgroundPosition borderBottomColor borderBottomStyle ' + 
+  'borderBottomWidth borderLeftColor borderLeftStyle borderLeftWidth ' +
+  'borderRightColor borderRightStyle borderRightWidth borderSpacing ' +
+  'borderTopColor borderTopStyle borderTopWidth bottom clip color ' +
+  'fontSize fontWeight height left letterSpacing lineHeight ' +
+  'marginBottom marginLeft marginRight marginTop markerOffset maxHeight '+
+  'maxWidth minHeight minWidth opacity outlineColor outlineOffset ' +
+  'outlineWidth paddingBottom paddingLeft paddingRight paddingTop ' +
+  'right textIndent top width wordSpacing zIndex');
   
 Element.CSS_LENGTH = /^(([\+\-]?[0-9\.]+)(em|ex|px|in|cm|mm|pt|pc|\%))|0$/;
 
+String.__parseStyleElement = document.createElement('div');
 String.prototype.parseStyle = function(){
-  var element = Element.extend(document.createElement('div'));
-  element.innerHTML = '<div style="' + this + '"></div>';
-  var style = element.down().style, styleRules = $H();
+  var style, styleRules = $H();
+  if (Prototype.Browser.WebKit)
+    style = new Element('div',{style:this}).style;
+  else {
+    String.__parseStyleElement.innerHTML = '<div style="' + this + '"></div>';
+    style = String.__parseStyleElement.childNodes[0].style;
+  }
   
   Element.CSS_PROPERTIES.each(function(property){
-   if(style[property]) styleRules[property] = style[property]; 
+    if (style[property]) styleRules.set(property, style[property]); 
   });
   
-  var result = $H();
-  
-  styleRules.each(function(pair){
-    var property = pair[0], value = pair[1], unit = null;
-    
-    if(value.parseColor('#zzzzzz') != '#zzzzzz') {
-      value = value.parseColor();
-      unit  = 'color';
-    } else if(Element.CSS_LENGTH.test(value)) 
-      var components = value.match(/^([\+\-]?[0-9\.]+)(.*)$/),
-          value = parseFloat(components[1]), unit = (components.length == 3) ? components[2] : null;
-    
-    result[property.underscore().dasherize()] = $H({ value:value, unit:unit });
-  }.bind(this));
-  
-  return result;
+  if (Prototype.Browser.IE && this.include('opacity'))
+    styleRules.set('opacity', this.match(/opacity:\s*((?:0|1)?(?:\.\d*)?)/)[1]);
+
+  return styleRules;
 };
 
-Element.morph = function(element, style) {
-  new Effect.Morph(element, Object.extend({ style: style }, arguments[2] || {}));
-  return element;
+if (document.defaultView && document.defaultView.getComputedStyle) {
+  Element.getStyles = function(element) {
+    var css = document.defaultView.getComputedStyle($(element), null);
+    return Element.CSS_PROPERTIES.inject({ }, function(styles, property) {
+      styles[property] = css[property];
+      return styles;
+    });
+  };
+} else {
+  Element.getStyles = function(element) {
+    element = $(element);
+    var css = element.currentStyle, styles;
+    styles = Element.CSS_PROPERTIES.inject({ }, function(hash, property) {
+      hash.set(property, css[property]);
+      return hash;
+    });
+    if (!styles.opacity) styles.set('opacity', element.getOpacity());
+    return styles;
+  };
 };
 
-['setOpacity','getOpacity','getInlineOpacity','forceRerendering','setContentZoom',
- 'collectTextNodes','collectTextNodesIgnoreClass','morph'].each( 
-  function(f) { Element.Methods[f] = Element[f]; }
+Effect.Methods = {
+  morph: function(element, style) {
+    element = $(element);
+    new Effect.Morph(element, Object.extend({ style: style }, arguments[2] || { }));
+    return element;
+  },
+  visualEffect: function(element, effect, options) {
+    element = $(element)
+    var s = effect.dasherize().camelize(), klass = s.charAt(0).toUpperCase() + s.substring(1);
+    new Effect[klass](element, options);
+    return element;
+  },
+  highlight: function(element, options) {
+    element = $(element);
+    new Effect.Highlight(element, options);
+    return element;
+  }
+};
+
+$w('fade appear grow shrink fold blindUp blindDown slideUp slideDown '+
+  'pulsate shake puff squish switchOff dropOut').each(
+  function(effect) { 
+    Effect.Methods[effect] = function(element, options){
+      element = $(element);
+      Effect[effect.charAt(0).toUpperCase() + effect.substring(1)](element, options);
+      return element;
+    }
+  }
 );
 
-Element.Methods.visualEffect = function(element, effect, options) {
-  s = effect.gsub(/_/, '-').camelize();
-  effect_class = s.charAt(0).toUpperCase() + s.substring(1);
-  new Effect[effect_class](element, options);
-  return $(element);
-};
+$w('getInlineOpacity forceRerendering setContentZoom collectTextNodes collectTextNodesIgnoreClass getStyles').each( 
+  function(f) { Effect.Methods[f] = Element[f]; }
+);
 
-Element.addMethods();
\ No newline at end of file
+Element.addMethods(Effect.Methods);
diff --git a/public/javascripts/prototype.js b/public/javascripts/prototype.js
index 2735d10dc..546f9fe44 100644
--- a/public/javascripts/prototype.js
+++ b/public/javascripts/prototype.js
@@ -1,43 +1,114 @@
-/*  Prototype JavaScript framework, version 1.5.0
+/*  Prototype JavaScript framework, version 1.6.0.1
  *  (c) 2005-2007 Sam Stephenson
  *
  *  Prototype is freely distributable under the terms of an MIT-style license.
- *  For details, see the Prototype web site: http://prototype.conio.net/
+ *  For details, see the Prototype web site: http://www.prototypejs.org/
  *
-/*--------------------------------------------------------------------------*/
+ *--------------------------------------------------------------------------*/
 
 var Prototype = {
-  Version: '1.5.0',
-  BrowserFeatures: {
-    XPath: !!document.evaluate
+  Version: '1.6.0.1',
+
+  Browser: {
+    IE:     !!(window.attachEvent && !window.opera),
+    Opera:  !!window.opera,
+    WebKit: navigator.userAgent.indexOf('AppleWebKit/') > -1,
+    Gecko:  navigator.userAgent.indexOf('Gecko') > -1 && navigator.userAgent.indexOf('KHTML') == -1,
+    MobileSafari: !!navigator.userAgent.match(/Apple.*Mobile.*Safari/)
   },
 
-  ScriptFragment: '(?:<script.*?>)((\n|\r|.)*?)(?:<\/script>)',
-  emptyFunction: function() {},
-  K: function(x) { return x }
-}
+  BrowserFeatures: {
+    XPath: !!document.evaluate,
+    ElementExtensions: !!window.HTMLElement,
+    SpecificElementExtensions:
+      document.createElement('div').__proto__ &&
+      document.createElement('div').__proto__ !==
+        document.createElement('form').__proto__
+  },
 
+  ScriptFragment: '<script[^>]*>([\\S\\s]*?)<\/script>',
+  JSONFilter: /^\/\*-secure-([\s\S]*)\*\/\s*$/,
+
+  emptyFunction: function() { },
+  K: function(x) { return x }
+};
+
+if (Prototype.Browser.MobileSafari)
+  Prototype.BrowserFeatures.SpecificElementExtensions = false;
+
+
+/* Based on Alex Arnell's inheritance implementation. */
 var Class = {
   create: function() {
-    return function() {
+    var parent = null, properties = $A(arguments);
+    if (Object.isFunction(properties[0]))
+      parent = properties.shift();
+
+    function klass() {
       this.initialize.apply(this, arguments);
     }
-  }
-}
 
-var Abstract = new Object();
+    Object.extend(klass, Class.Methods);
+    klass.superclass = parent;
+    klass.subclasses = [];
+
+    if (parent) {
+      var subclass = function() { };
+      subclass.prototype = parent.prototype;
+      klass.prototype = new subclass;
+      parent.subclasses.push(klass);
+    }
+
+    for (var i = 0; i < properties.length; i++)
+      klass.addMethods(properties[i]);
+
+    if (!klass.prototype.initialize)
+      klass.prototype.initialize = Prototype.emptyFunction;
+
+    klass.prototype.constructor = klass;
+
+    return klass;
+  }
+};
+
+Class.Methods = {
+  addMethods: function(source) {
+    var ancestor   = this.superclass && this.superclass.prototype;
+    var properties = Object.keys(source);
+
+    if (!Object.keys({ toString: true }).length)
+      properties.push("toString", "valueOf");
+
+    for (var i = 0, length = properties.length; i < length; i++) {
+      var property = properties[i], value = source[property];
+      if (ancestor && Object.isFunction(value) &&
+          value.argumentNames().first() == "$super") {
+        var method = value, value = Object.extend((function(m) {
+          return function() { return ancestor[m].apply(this, arguments) };
+        })(property).wrap(method), {
+          valueOf:  function() { return method },
+          toString: function() { return method.toString() }
+        });
+      }
+      this.prototype[property] = value;
+    }
+
+    return this;
+  }
+};
+
+var Abstract = { };
 
 Object.extend = function(destination, source) {
-  for (var property in source) {
+  for (var property in source)
     destination[property] = source[property];
-  }
   return destination;
-}
+};
 
 Object.extend(Object, {
   inspect: function(object) {
     try {
-      if (object === undefined) return 'undefined';
+      if (Object.isUndefined(object)) return 'undefined';
       if (object === null) return 'null';
       return object.inspect ? object.inspect() : object.toString();
     } catch (e) {
@@ -46,6 +117,37 @@ Object.extend(Object, {
     }
   },
 
+  toJSON: function(object) {
+    var type = typeof object;
+    switch (type) {
+      case 'undefined':
+      case 'function':
+      case 'unknown': return;
+      case 'boolean': return object.toString();
+    }
+
+    if (object === null) return 'null';
+    if (object.toJSON) return object.toJSON();
+    if (Object.isElement(object)) return;
+
+    var results = [];
+    for (var property in object) {
+      var value = Object.toJSON(object[property]);
+      if (!Object.isUndefined(value))
+        results.push(property.toJSON() + ': ' + value);
+    }
+
+    return '{' + results.join(', ') + '}';
+  },
+
+  toQueryString: function(object) {
+    return $H(object).toQueryString();
+  },
+
+  toHTML: function(object) {
+    return object && object.toHTML ? object.toHTML() : String.interpret(object);
+  },
+
   keys: function(object) {
     var keys = [];
     for (var property in object)
@@ -61,41 +163,101 @@ Object.extend(Object, {
   },
 
   clone: function(object) {
-    return Object.extend({}, object);
+    return Object.extend({ }, object);
+  },
+
+  isElement: function(object) {
+    return object && object.nodeType == 1;
+  },
+
+  isArray: function(object) {
+    return object && object.constructor === Array;
+  },
+
+  isHash: function(object) {
+    return object instanceof Hash;
+  },
+
+  isFunction: function(object) {
+    return typeof object == "function";
+  },
+
+  isString: function(object) {
+    return typeof object == "string";
+  },
+
+  isNumber: function(object) {
+    return typeof object == "number";
+  },
+
+  isUndefined: function(object) {
+    return typeof object == "undefined";
   }
 });
 
-Function.prototype.bind = function() {
-  var __method = this, args = $A(arguments), object = args.shift();
-  return function() {
-    return __method.apply(object, args.concat($A(arguments)));
-  }
-}
-
-Function.prototype.bindAsEventListener = function(object) {
-  var __method = this, args = $A(arguments), object = args.shift();
-  return function(event) {
-    return __method.apply(object, [( event || window.event)].concat(args).concat($A(arguments)));
-  }
-}
-
-Object.extend(Number.prototype, {
-  toColorPart: function() {
-    var digits = this.toString(16);
-    if (this < 16) return '0' + digits;
-    return digits;
+Object.extend(Function.prototype, {
+  argumentNames: function() {
+    var names = this.toString().match(/^[\s\(]*function[^(]*\((.*?)\)/)[1].split(",").invoke("strip");
+    return names.length == 1 && !names[0] ? [] : names;
   },
 
-  succ: function() {
-    return this + 1;
+  bind: function() {
+    if (arguments.length < 2 && Object.isUndefined(arguments[0])) return this;
+    var __method = this, args = $A(arguments), object = args.shift();
+    return function() {
+      return __method.apply(object, args.concat($A(arguments)));
+    }
   },
 
-  times: function(iterator) {
-    $R(0, this, true).each(iterator);
-    return this;
+  bindAsEventListener: function() {
+    var __method = this, args = $A(arguments), object = args.shift();
+    return function(event) {
+      return __method.apply(object, [event || window.event].concat(args));
+    }
+  },
+
+  curry: function() {
+    if (!arguments.length) return this;
+    var __method = this, args = $A(arguments);
+    return function() {
+      return __method.apply(this, args.concat($A(arguments)));
+    }
+  },
+
+  delay: function() {
+    var __method = this, args = $A(arguments), timeout = args.shift() * 1000;
+    return window.setTimeout(function() {
+      return __method.apply(__method, args);
+    }, timeout);
+  },
+
+  wrap: function(wrapper) {
+    var __method = this;
+    return function() {
+      return wrapper.apply(this, [__method.bind(this)].concat($A(arguments)));
+    }
+  },
+
+  methodize: function() {
+    if (this._methodized) return this._methodized;
+    var __method = this;
+    return this._methodized = function() {
+      return __method.apply(null, [this].concat($A(arguments)));
+    };
   }
 });
 
+Function.prototype.defer = Function.prototype.delay.curry(0.01);
+
+Date.prototype.toJSON = function() {
+  return '"' + this.getUTCFullYear() + '-' +
+    (this.getUTCMonth() + 1).toPaddedString(2) + '-' +
+    this.getUTCDate().toPaddedString(2) + 'T' +
+    this.getUTCHours().toPaddedString(2) + ':' +
+    this.getUTCMinutes().toPaddedString(2) + ':' +
+    this.getUTCSeconds().toPaddedString(2) + 'Z"';
+};
+
 var Try = {
   these: function() {
     var returnValue;
@@ -105,17 +267,22 @@ var Try = {
       try {
         returnValue = lambda();
         break;
-      } catch (e) {}
+      } catch (e) { }
     }
 
     return returnValue;
   }
-}
+};
+
+RegExp.prototype.match = RegExp.prototype.test;
+
+RegExp.escape = function(str) {
+  return String(str).replace(/([.*+?^=!:${}()|[\]\/\\])/g, '\\$1');
+};
 
 /*--------------------------------------------------------------------------*/
 
-var PeriodicalExecuter = Class.create();
-PeriodicalExecuter.prototype = {
+var PeriodicalExecuter = Class.create({
   initialize: function(callback, frequency) {
     this.callback = callback;
     this.frequency = frequency;
@@ -128,6 +295,10 @@ PeriodicalExecuter.prototype = {
     this.timer = setInterval(this.onTimerEvent.bind(this), this.frequency * 1000);
   },
 
+  execute: function() {
+    this.callback(this);
+  },
+
   stop: function() {
     if (!this.timer) return;
     clearInterval(this.timer);
@@ -138,16 +309,26 @@ PeriodicalExecuter.prototype = {
     if (!this.currentlyExecuting) {
       try {
         this.currentlyExecuting = true;
-        this.callback(this);
+        this.execute();
       } finally {
         this.currentlyExecuting = false;
       }
     }
   }
-}
-String.interpret = function(value){
-  return value == null ? '' : String(value);
-}
+});
+Object.extend(String, {
+  interpret: function(value) {
+    return value == null ? '' : String(value);
+  },
+  specialChar: {
+    '\b': '\\b',
+    '\t': '\\t',
+    '\n': '\\n',
+    '\f': '\\f',
+    '\r': '\\r',
+    '\\': '\\\\'
+  }
+});
 
 Object.extend(String.prototype, {
   gsub: function(pattern, replacement) {
@@ -168,7 +349,7 @@ Object.extend(String.prototype, {
 
   sub: function(pattern, replacement, count) {
     replacement = this.gsub.prepareReplacement(replacement);
-    count = count === undefined ? 1 : count;
+    count = Object.isUndefined(count) ? 1 : count;
 
     return this.gsub(pattern, function(match) {
       if (--count < 0) return match[0];
@@ -178,14 +359,14 @@ Object.extend(String.prototype, {
 
   scan: function(pattern, iterator) {
     this.gsub(pattern, iterator);
-    return this;
+    return String(this);
   },
 
   truncate: function(length, truncation) {
     length = length || 30;
-    truncation = truncation === undefined ? '...' : truncation;
+    truncation = Object.isUndefined(truncation) ? '...' : truncation;
     return this.length > length ?
-      this.slice(0, length - truncation.length) + truncation : this;
+      this.slice(0, length - truncation.length) + truncation : String(this);
   },
 
   strip: function() {
@@ -213,35 +394,34 @@ Object.extend(String.prototype, {
   },
 
   escapeHTML: function() {
-    var div = document.createElement('div');
-    var text = document.createTextNode(this);
-    div.appendChild(text);
-    return div.innerHTML;
+    var self = arguments.callee;
+    self.text.data = this;
+    return self.div.innerHTML;
   },
 
   unescapeHTML: function() {
-    var div = document.createElement('div');
+    var div = new Element('div');
     div.innerHTML = this.stripTags();
     return div.childNodes[0] ? (div.childNodes.length > 1 ?
-      $A(div.childNodes).inject('',function(memo,node){ return memo+node.nodeValue }) :
+      $A(div.childNodes).inject('', function(memo, node) { return memo+node.nodeValue }) :
       div.childNodes[0].nodeValue) : '';
   },
 
   toQueryParams: function(separator) {
     var match = this.strip().match(/([^?#]*)(#.*)?$/);
-    if (!match) return {};
+    if (!match) return { };
 
-    return match[1].split(separator || '&').inject({}, function(hash, pair) {
+    return match[1].split(separator || '&').inject({ }, function(hash, pair) {
       if ((pair = pair.split('='))[0]) {
-        var name = decodeURIComponent(pair[0]);
-        var value = pair[1] ? decodeURIComponent(pair[1]) : undefined;
+        var key = decodeURIComponent(pair.shift());
+        var value = pair.length > 1 ? pair.join('=') : pair[0];
+        if (value != undefined) value = decodeURIComponent(value);
 
-        if (hash[name] !== undefined) {
-          if (hash[name].constructor != Array)
-            hash[name] = [hash[name]];
-          if (value) hash[name].push(value);
+        if (key in hash) {
+          if (!Object.isArray(hash[key])) hash[key] = [hash[key]];
+          hash[key].push(value);
         }
-        else hash[name] = value;
+        else hash[key] = value;
       }
       return hash;
     });
@@ -256,6 +436,10 @@ Object.extend(String.prototype, {
       String.fromCharCode(this.charCodeAt(this.length - 1) + 1);
   },
 
+  times: function(count) {
+    return count < 1 ? '' : new Array(count + 1).join(this);
+  },
+
   camelize: function() {
     var parts = this.split('-'), len = parts.length;
     if (len == 1) return parts[0];
@@ -270,7 +454,7 @@ Object.extend(String.prototype, {
     return camelized;
   },
 
-  capitalize: function(){
+  capitalize: function() {
     return this.charAt(0).toUpperCase() + this.substring(1).toLowerCase();
   },
 
@@ -283,52 +467,131 @@ Object.extend(String.prototype, {
   },
 
   inspect: function(useDoubleQuotes) {
-    var escapedString = this.replace(/\\/g, '\\\\');
-    if (useDoubleQuotes)
-      return '"' + escapedString.replace(/"/g, '\\"') + '"';
-    else
-      return "'" + escapedString.replace(/'/g, '\\\'') + "'";
+    var escapedString = this.gsub(/[\x00-\x1f\\]/, function(match) {
+      var character = String.specialChar[match[0]];
+      return character ? character : '\\u00' + match[0].charCodeAt().toPaddedString(2, 16);
+    });
+    if (useDoubleQuotes) return '"' + escapedString.replace(/"/g, '\\"') + '"';
+    return "'" + escapedString.replace(/'/g, '\\\'') + "'";
+  },
+
+  toJSON: function() {
+    return this.inspect(true);
+  },
+
+  unfilterJSON: function(filter) {
+    return this.sub(filter || Prototype.JSONFilter, '#{1}');
+  },
+
+  isJSON: function() {
+    var str = this;
+    if (str.blank()) return false;
+    str = this.replace(/\\./g, '@').replace(/"[^"\\\n\r]*"/g, '');
+    return (/^[,:{}\[\]0-9.\-+Eaeflnr-u \n\r\t]*$/).test(str);
+  },
+
+  evalJSON: function(sanitize) {
+    var json = this.unfilterJSON();
+    try {
+      if (!sanitize || json.isJSON()) return eval('(' + json + ')');
+    } catch (e) { }
+    throw new SyntaxError('Badly formed JSON string: ' + this.inspect());
+  },
+
+  include: function(pattern) {
+    return this.indexOf(pattern) > -1;
+  },
+
+  startsWith: function(pattern) {
+    return this.indexOf(pattern) === 0;
+  },
+
+  endsWith: function(pattern) {
+    var d = this.length - pattern.length;
+    return d >= 0 && this.lastIndexOf(pattern) === d;
+  },
+
+  empty: function() {
+    return this == '';
+  },
+
+  blank: function() {
+    return /^\s*$/.test(this);
+  },
+
+  interpolate: function(object, pattern) {
+    return new Template(this, pattern).evaluate(object);
+  }
+});
+
+if (Prototype.Browser.WebKit || Prototype.Browser.IE) Object.extend(String.prototype, {
+  escapeHTML: function() {
+    return this.replace(/&/g,'&amp;').replace(/</g,'&lt;').replace(/>/g,'&gt;');
+  },
+  unescapeHTML: function() {
+    return this.replace(/&amp;/g,'&').replace(/&lt;/g,'<').replace(/&gt;/g,'>');
   }
 });
 
 String.prototype.gsub.prepareReplacement = function(replacement) {
-  if (typeof replacement == 'function') return replacement;
+  if (Object.isFunction(replacement)) return replacement;
   var template = new Template(replacement);
   return function(match) { return template.evaluate(match) };
-}
+};
 
 String.prototype.parseQuery = String.prototype.toQueryParams;
 
-var Template = Class.create();
-Template.Pattern = /(^|.|\r|\n)(#\{(.*?)\})/;
-Template.prototype = {
+Object.extend(String.prototype.escapeHTML, {
+  div:  document.createElement('div'),
+  text: document.createTextNode('')
+});
+
+with (String.prototype.escapeHTML) div.appendChild(text);
+
+var Template = Class.create({
   initialize: function(template, pattern) {
     this.template = template.toString();
-    this.pattern  = pattern || Template.Pattern;
+    this.pattern = pattern || Template.Pattern;
   },
 
   evaluate: function(object) {
-    return this.template.gsub(this.pattern, function(match) {
-      var before = match[1];
-      if (before == '\\') return match[2];
-      return before + String.interpret(object[match[3]]);
-    });
-  }
-}
+    if (Object.isFunction(object.toTemplateReplacements))
+      object = object.toTemplateReplacements();
 
-var $break    = new Object();
-var $continue = new Object();
+    return this.template.gsub(this.pattern, function(match) {
+      if (object == null) return '';
+
+      var before = match[1] || '';
+      if (before == '\\') return match[2];
+
+      var ctx = object, expr = match[3];
+      var pattern = /^([^.[]+|\[((?:.*?[^\\])?)\])(\.|\[|$)/;
+      match = pattern.exec(expr);
+      if (match == null) return before;
+
+      while (match != null) {
+        var comp = match[1].startsWith('[') ? match[2].gsub('\\\\]', ']') : match[1];
+        ctx = ctx[comp];
+        if (null == ctx || '' == match[3]) break;
+        expr = expr.substring('[' == match[3] ? match[1].length : match[0].length);
+        match = pattern.exec(expr);
+      }
+
+      return before + String.interpret(ctx);
+    }.bind(this));
+  }
+});
+Template.Pattern = /(^|.|\r|\n)(#\{(.*?)\})/;
+
+var $break = { };
 
 var Enumerable = {
-  each: function(iterator) {
+  each: function(iterator, context) {
     var index = 0;
+    iterator = iterator.bind(context);
     try {
       this._each(function(value) {
-        try {
-          iterator(value, index++);
-        } catch (e) {
-          if (e != $continue) throw e;
-        }
+        iterator(value, index++);
       });
     } catch (e) {
       if (e != $break) throw e;
@@ -336,40 +599,45 @@ var Enumerable = {
     return this;
   },
 
-  eachSlice: function(number, iterator) {
+  eachSlice: function(number, iterator, context) {
+    iterator = iterator ? iterator.bind(context) : Prototype.K;
     var index = -number, slices = [], array = this.toArray();
     while ((index += number) < array.length)
       slices.push(array.slice(index, index+number));
-    return slices.map(iterator);
+    return slices.collect(iterator, context);
   },
 
-  all: function(iterator) {
+  all: function(iterator, context) {
+    iterator = iterator ? iterator.bind(context) : Prototype.K;
     var result = true;
     this.each(function(value, index) {
-      result = result && !!(iterator || Prototype.K)(value, index);
+      result = result && !!iterator(value, index);
       if (!result) throw $break;
     });
     return result;
   },
 
-  any: function(iterator) {
+  any: function(iterator, context) {
+    iterator = iterator ? iterator.bind(context) : Prototype.K;
     var result = false;
     this.each(function(value, index) {
-      if (result = !!(iterator || Prototype.K)(value, index))
+      if (result = !!iterator(value, index))
         throw $break;
     });
     return result;
   },
 
-  collect: function(iterator) {
+  collect: function(iterator, context) {
+    iterator = iterator ? iterator.bind(context) : Prototype.K;
     var results = [];
     this.each(function(value, index) {
-      results.push((iterator || Prototype.K)(value, index));
+      results.push(iterator(value, index));
     });
     return results;
   },
 
-  detect: function(iterator) {
+  detect: function(iterator, context) {
+    iterator = iterator.bind(context);
     var result;
     this.each(function(value, index) {
       if (iterator(value, index)) {
@@ -380,7 +648,8 @@ var Enumerable = {
     return result;
   },
 
-  findAll: function(iterator) {
+  findAll: function(iterator, context) {
+    iterator = iterator.bind(context);
     var results = [];
     this.each(function(value, index) {
       if (iterator(value, index))
@@ -389,17 +658,24 @@ var Enumerable = {
     return results;
   },
 
-  grep: function(pattern, iterator) {
+  grep: function(filter, iterator, context) {
+    iterator = iterator ? iterator.bind(context) : Prototype.K;
     var results = [];
+
+    if (Object.isString(filter))
+      filter = new RegExp(filter);
+
     this.each(function(value, index) {
-      var stringValue = value.toString();
-      if (stringValue.match(pattern))
-        results.push((iterator || Prototype.K)(value, index));
-    })
+      if (filter.match(value))
+        results.push(iterator(value, index));
+    });
     return results;
   },
 
   include: function(object) {
+    if (Object.isFunction(this.indexOf))
+      if (this.indexOf(object) != -1) return true;
+
     var found = false;
     this.each(function(value) {
       if (value == object) {
@@ -411,14 +687,15 @@ var Enumerable = {
   },
 
   inGroupsOf: function(number, fillWith) {
-    fillWith = fillWith === undefined ? null : fillWith;
+    fillWith = Object.isUndefined(fillWith) ? null : fillWith;
     return this.eachSlice(number, function(slice) {
       while(slice.length < number) slice.push(fillWith);
       return slice;
     });
   },
 
-  inject: function(memo, iterator) {
+  inject: function(memo, iterator, context) {
+    iterator = iterator.bind(context);
     this.each(function(value, index) {
       memo = iterator(memo, value, index);
     });
@@ -432,30 +709,33 @@ var Enumerable = {
     });
   },
 
-  max: function(iterator) {
+  max: function(iterator, context) {
+    iterator = iterator ? iterator.bind(context) : Prototype.K;
     var result;
     this.each(function(value, index) {
-      value = (iterator || Prototype.K)(value, index);
-      if (result == undefined || value >= result)
+      value = iterator(value, index);
+      if (result == null || value >= result)
         result = value;
     });
     return result;
   },
 
-  min: function(iterator) {
+  min: function(iterator, context) {
+    iterator = iterator ? iterator.bind(context) : Prototype.K;
     var result;
     this.each(function(value, index) {
-      value = (iterator || Prototype.K)(value, index);
-      if (result == undefined || value < result)
+      value = iterator(value, index);
+      if (result == null || value < result)
         result = value;
     });
     return result;
   },
 
-  partition: function(iterator) {
+  partition: function(iterator, context) {
+    iterator = iterator ? iterator.bind(context) : Prototype.K;
     var trues = [], falses = [];
     this.each(function(value, index) {
-      ((iterator || Prototype.K)(value, index) ?
+      (iterator(value, index) ?
         trues : falses).push(value);
     });
     return [trues, falses];
@@ -463,13 +743,14 @@ var Enumerable = {
 
   pluck: function(property) {
     var results = [];
-    this.each(function(value, index) {
+    this.each(function(value) {
       results.push(value[property]);
     });
     return results;
   },
 
-  reject: function(iterator) {
+  reject: function(iterator, context) {
+    iterator = iterator.bind(context);
     var results = [];
     this.each(function(value, index) {
       if (!iterator(value, index))
@@ -478,7 +759,8 @@ var Enumerable = {
     return results;
   },
 
-  sortBy: function(iterator) {
+  sortBy: function(iterator, context) {
+    iterator = iterator.bind(context);
     return this.map(function(value, index) {
       return {value: value, criteria: iterator(value, index)};
     }).sort(function(left, right) {
@@ -493,7 +775,7 @@ var Enumerable = {
 
   zip: function() {
     var iterator = Prototype.K, args = $A(arguments);
-    if (typeof args.last() == 'function')
+    if (Object.isFunction(args.last()))
       iterator = args.pop();
 
     var collections = [this].concat(args).map($A);
@@ -509,31 +791,42 @@ var Enumerable = {
   inspect: function() {
     return '#<Enumerable:' + this.toArray().inspect() + '>';
   }
-}
+};
 
 Object.extend(Enumerable, {
   map:     Enumerable.collect,
   find:    Enumerable.detect,
   select:  Enumerable.findAll,
+  filter:  Enumerable.findAll,
   member:  Enumerable.include,
-  entries: Enumerable.toArray
+  entries: Enumerable.toArray,
+  every:   Enumerable.all,
+  some:    Enumerable.any
 });
-var $A = Array.from = function(iterable) {
+function $A(iterable) {
   if (!iterable) return [];
-  if (iterable.toArray) {
-    return iterable.toArray();
-  } else {
-    var results = [];
-    for (var i = 0, length = iterable.length; i < length; i++)
-      results.push(iterable[i]);
+  if (iterable.toArray) return iterable.toArray();
+  var length = iterable.length, results = new Array(length);
+  while (length--) results[length] = iterable[length];
+  return results;
+}
+
+if (Prototype.Browser.WebKit) {
+  function $A(iterable) {
+    if (!iterable) return [];
+    if (!(Object.isFunction(iterable) && iterable == '[object NodeList]') &&
+        iterable.toArray) return iterable.toArray();
+    var length = iterable.length, results = new Array(length);
+    while (length--) results[length] = iterable[length];
     return results;
   }
 }
 
+Array.from = $A;
+
 Object.extend(Array.prototype, Enumerable);
 
-if (!Array.prototype._reverse)
-  Array.prototype._reverse = Array.prototype.reverse;
+if (!Array.prototype._reverse) Array.prototype._reverse = Array.prototype.reverse;
 
 Object.extend(Array.prototype, {
   _each: function(iterator) {
@@ -562,7 +855,7 @@ Object.extend(Array.prototype, {
 
   flatten: function() {
     return this.inject([], function(array, value) {
-      return array.concat(value && value.constructor == Array ?
+      return array.concat(Object.isArray(value) ?
         value.flatten() : [value]);
     });
   },
@@ -574,12 +867,6 @@ Object.extend(Array.prototype, {
     });
   },
 
-  indexOf: function(object) {
-    for (var i = 0, length = this.length; i < length; i++)
-      if (this[i] == object) return i;
-    return -1;
-  },
-
   reverse: function(inline) {
     return (inline !== false ? this : this.toArray())._reverse();
   },
@@ -588,9 +875,17 @@ Object.extend(Array.prototype, {
     return this.length > 1 ? this : this[0];
   },
 
-  uniq: function() {
-    return this.inject([], function(array, value) {
-      return array.include(value) ? array : array.concat([value]);
+  uniq: function(sorted) {
+    return this.inject([], function(array, value, index) {
+      if (0 == index || (sorted ? array.last() != value : !array.include(value)))
+        array.push(value);
+      return array;
+    });
+  },
+
+  intersect: function(array) {
+    return this.uniq().findAll(function(item) {
+      return array.detect(function(value) { return item === value });
     });
   },
 
@@ -604,125 +899,187 @@ Object.extend(Array.prototype, {
 
   inspect: function() {
     return '[' + this.map(Object.inspect).join(', ') + ']';
+  },
+
+  toJSON: function() {
+    var results = [];
+    this.each(function(object) {
+      var value = Object.toJSON(object);
+      if (!Object.isUndefined(value)) results.push(value);
+    });
+    return '[' + results.join(', ') + ']';
   }
 });
 
+// use native browser JS 1.6 implementation if available
+if (Object.isFunction(Array.prototype.forEach))
+  Array.prototype._each = Array.prototype.forEach;
+
+if (!Array.prototype.indexOf) Array.prototype.indexOf = function(item, i) {
+  i || (i = 0);
+  var length = this.length;
+  if (i < 0) i = length + i;
+  for (; i < length; i++)
+    if (this[i] === item) return i;
+  return -1;
+};
+
+if (!Array.prototype.lastIndexOf) Array.prototype.lastIndexOf = function(item, i) {
+  i = isNaN(i) ? this.length : (i < 0 ? this.length + i : i) + 1;
+  var n = this.slice(0, i).reverse().indexOf(item);
+  return (n < 0) ? n : i - n - 1;
+};
+
 Array.prototype.toArray = Array.prototype.clone;
 
-function $w(string){
+function $w(string) {
+  if (!Object.isString(string)) return [];
   string = string.strip();
   return string ? string.split(/\s+/) : [];
 }
 
-if(window.opera){
-  Array.prototype.concat = function(){
+if (Prototype.Browser.Opera){
+  Array.prototype.concat = function() {
     var array = [];
-    for(var i = 0, length = this.length; i < length; i++) array.push(this[i]);
-    for(var i = 0, length = arguments.length; i < length; i++) {
-      if(arguments[i].constructor == Array) {
-        for(var j = 0, arrayLength = arguments[i].length; j < arrayLength; j++)
+    for (var i = 0, length = this.length; i < length; i++) array.push(this[i]);
+    for (var i = 0, length = arguments.length; i < length; i++) {
+      if (Object.isArray(arguments[i])) {
+        for (var j = 0, arrayLength = arguments[i].length; j < arrayLength; j++)
           array.push(arguments[i][j]);
       } else {
         array.push(arguments[i]);
       }
     }
     return array;
-  }
+  };
 }
-var Hash = function(obj) {
-  Object.extend(this, obj || {});
-};
+Object.extend(Number.prototype, {
+  toColorPart: function() {
+    return this.toPaddedString(2, 16);
+  },
 
-Object.extend(Hash, {
-  toQueryString: function(obj) {
-    var parts = [];
+  succ: function() {
+    return this + 1;
+  },
 
-	  this.prototype._each.call(obj, function(pair) {
-      if (!pair.key) return;
+  times: function(iterator) {
+    $R(0, this, true).each(iterator);
+    return this;
+  },
 
-      if (pair.value && pair.value.constructor == Array) {
-        var values = pair.value.compact();
-        if (values.length < 2) pair.value = values.reduce();
-        else {
-        	key = encodeURIComponent(pair.key);
-          values.each(function(value) {
-            value = value != undefined ? encodeURIComponent(value) : '';
-            parts.push(key + '=' + encodeURIComponent(value));
-          });
-          return;
-        }
-      }
-      if (pair.value == undefined) pair[1] = '';
-      parts.push(pair.map(encodeURIComponent).join('='));
-	  });
+  toPaddedString: function(length, radix) {
+    var string = this.toString(radix || 10);
+    return '0'.times(length - string.length) + string;
+  },
 
-    return parts.join('&');
+  toJSON: function() {
+    return isFinite(this) ? this.toString() : 'null';
   }
 });
 
-Object.extend(Hash.prototype, Enumerable);
-Object.extend(Hash.prototype, {
-  _each: function(iterator) {
-    for (var key in this) {
-      var value = this[key];
-      if (value && value == Hash.prototype[key]) continue;
-
-      var pair = [key, value];
-      pair.key = key;
-      pair.value = value;
-      iterator(pair);
-    }
-  },
-
-  keys: function() {
-    return this.pluck('key');
-  },
-
-  values: function() {
-    return this.pluck('value');
-  },
-
-  merge: function(hash) {
-    return $H(hash).inject(this, function(mergedHash, pair) {
-      mergedHash[pair.key] = pair.value;
-      return mergedHash;
-    });
-  },
-
-  remove: function() {
-    var result;
-    for(var i = 0, length = arguments.length; i < length; i++) {
-      var value = this[arguments[i]];
-      if (value !== undefined){
-        if (result === undefined) result = value;
-        else {
-          if (result.constructor != Array) result = [result];
-          result.push(value)
-        }
-      }
-      delete this[arguments[i]];
-    }
-    return result;
-  },
-
-  toQueryString: function() {
-    return Hash.toQueryString(this);
-  },
-
-  inspect: function() {
-    return '#<Hash:{' + this.map(function(pair) {
-      return pair.map(Object.inspect).join(': ');
-    }).join(', ') + '}>';
-  }
+$w('abs round ceil floor').each(function(method){
+  Number.prototype[method] = Math[method].methodize();
 });
-
 function $H(object) {
-  if (object && object.constructor == Hash) return object;
   return new Hash(object);
 };
-ObjectRange = Class.create();
-Object.extend(ObjectRange.prototype, Enumerable);
-Object.extend(ObjectRange.prototype, {
+
+var Hash = Class.create(Enumerable, (function() {
+
+  function toQueryPair(key, value) {
+    if (Object.isUndefined(value)) return key;
+    return key + '=' + encodeURIComponent(String.interpret(value));
+  }
+
+  return {
+    initialize: function(object) {
+      this._object = Object.isHash(object) ? object.toObject() : Object.clone(object);
+    },
+
+    _each: function(iterator) {
+      for (var key in this._object) {
+        var value = this._object[key], pair = [key, value];
+        pair.key = key;
+        pair.value = value;
+        iterator(pair);
+      }
+    },
+
+    set: function(key, value) {
+      return this._object[key] = value;
+    },
+
+    get: function(key) {
+      return this._object[key];
+    },
+
+    unset: function(key) {
+      var value = this._object[key];
+      delete this._object[key];
+      return value;
+    },
+
+    toObject: function() {
+      return Object.clone(this._object);
+    },
+
+    keys: function() {
+      return this.pluck('key');
+    },
+
+    values: function() {
+      return this.pluck('value');
+    },
+
+    index: function(value) {
+      var match = this.detect(function(pair) {
+        return pair.value === value;
+      });
+      return match && match.key;
+    },
+
+    merge: function(object) {
+      return this.clone().update(object);
+    },
+
+    update: function(object) {
+      return new Hash(object).inject(this, function(result, pair) {
+        result.set(pair.key, pair.value);
+        return result;
+      });
+    },
+
+    toQueryString: function() {
+      return this.map(function(pair) {
+        var key = encodeURIComponent(pair.key), values = pair.value;
+
+        if (values && typeof values == 'object') {
+          if (Object.isArray(values))
+            return values.map(toQueryPair.curry(key)).join('&');
+        }
+        return toQueryPair(key, values);
+      }).join('&');
+    },
+
+    inspect: function() {
+      return '#<Hash:{' + this.map(function(pair) {
+        return pair.map(Object.inspect).join(': ');
+      }).join(', ') + '}>';
+    },
+
+    toJSON: function() {
+      return Object.toJSON(this.toObject());
+    },
+
+    clone: function() {
+      return new Hash(this);
+    }
+  }
+})());
+
+Hash.prototype.toTemplateReplacements = Hash.prototype.toObject;
+Hash.from = $H;
+var ObjectRange = Class.create(Enumerable, {
   initialize: function(start, end, exclusive) {
     this.start = start;
     this.end = end;
@@ -748,7 +1105,7 @@ Object.extend(ObjectRange.prototype, {
 
 var $R = function(start, end, exclusive) {
   return new ObjectRange(start, end, exclusive);
-}
+};
 
 var Ajax = {
   getTransport: function() {
@@ -760,7 +1117,7 @@ var Ajax = {
   },
 
   activeRequestCount: 0
-}
+};
 
 Ajax.Responders = {
   responders: [],
@@ -780,10 +1137,10 @@ Ajax.Responders = {
 
   dispatch: function(callback, request, transport, json) {
     this.each(function(responder) {
-      if (typeof responder[callback] == 'function') {
+      if (Object.isFunction(responder[callback])) {
         try {
           responder[callback].apply(responder, [request, transport, json]);
-        } catch (e) {}
+        } catch (e) { }
       }
     });
   }
@@ -792,49 +1149,45 @@ Ajax.Responders = {
 Object.extend(Ajax.Responders, Enumerable);
 
 Ajax.Responders.register({
-  onCreate: function() {
-    Ajax.activeRequestCount++;
-  },
-  onComplete: function() {
-    Ajax.activeRequestCount--;
-  }
+  onCreate:   function() { Ajax.activeRequestCount++ },
+  onComplete: function() { Ajax.activeRequestCount-- }
 });
 
-Ajax.Base = function() {};
-Ajax.Base.prototype = {
-  setOptions: function(options) {
+Ajax.Base = Class.create({
+  initialize: function(options) {
     this.options = {
       method:       'post',
       asynchronous: true,
       contentType:  'application/x-www-form-urlencoded',
       encoding:     'UTF-8',
-      parameters:   ''
-    }
-    Object.extend(this.options, options || {});
+      parameters:   '',
+      evalJSON:     true,
+      evalJS:       true
+    };
+    Object.extend(this.options, options || { });
 
     this.options.method = this.options.method.toLowerCase();
-    if (typeof this.options.parameters == 'string')
+
+    if (Object.isString(this.options.parameters))
       this.options.parameters = this.options.parameters.toQueryParams();
+    else if (Object.isHash(this.options.parameters))
+      this.options.parameters = this.options.parameters.toObject();
   }
-}
+});
 
-Ajax.Request = Class.create();
-Ajax.Request.Events =
-  ['Uninitialized', 'Loading', 'Loaded', 'Interactive', 'Complete'];
-
-Ajax.Request.prototype = Object.extend(new Ajax.Base(), {
+Ajax.Request = Class.create(Ajax.Base, {
   _complete: false,
 
-  initialize: function(url, options) {
+  initialize: function($super, url, options) {
+    $super(options);
     this.transport = Ajax.getTransport();
-    this.setOptions(options);
     this.request(url);
   },
 
   request: function(url) {
     this.url = url;
     this.method = this.options.method;
-    var params = this.options.parameters;
+    var params = Object.clone(this.options.parameters);
 
     if (!['get', 'post'].include(this.method)) {
       // simulate other verbs over post
@@ -842,28 +1195,31 @@ Ajax.Request.prototype = Object.extend(new Ajax.Base(), {
       this.method = 'post';
     }
 
-    params = Hash.toQueryString(params);
-    if (params && /Konqueror|Safari|KHTML/.test(navigator.userAgent)) params += '&_='
+    this.parameters = params;
 
-    // when GET, append parameters to URL
-    if (this.method == 'get' && params)
-      this.url += (this.url.indexOf('?') > -1 ? '&' : '?') + params;
+    if (params = Object.toQueryString(params)) {
+      // when GET, append parameters to URL
+      if (this.method == 'get')
+        this.url += (this.url.include('?') ? '&' : '?') + params;
+      else if (/Konqueror|Safari|KHTML/.test(navigator.userAgent))
+        params += '&_=';
+    }
 
     try {
-      Ajax.Responders.dispatch('onCreate', this, this.transport);
+      var response = new Ajax.Response(this);
+      if (this.options.onCreate) this.options.onCreate(response);
+      Ajax.Responders.dispatch('onCreate', this, response);
 
       this.transport.open(this.method.toUpperCase(), this.url,
         this.options.asynchronous);
 
-      if (this.options.asynchronous)
-        setTimeout(function() { this.respondToReadyState(1) }.bind(this), 10);
+      if (this.options.asynchronous) this.respondToReadyState.bind(this).defer(1);
 
       this.transport.onreadystatechange = this.onStateChange.bind(this);
       this.setRequestHeaders();
 
-      var body = this.method == 'post' ? (this.options.postBody || params) : null;
-
-      this.transport.send(body);
+      this.body = this.method == 'post' ? (this.options.postBody || params) : null;
+      this.transport.send(this.body);
 
       /* Force Firefox to handle ready state 4 for synchronous requests */
       if (!this.options.asynchronous && this.transport.overrideMimeType)
@@ -905,7 +1261,7 @@ Ajax.Request.prototype = Object.extend(new Ajax.Base(), {
     if (typeof this.options.requestHeaders == 'object') {
       var extras = this.options.requestHeaders;
 
-      if (typeof extras.push == 'function')
+      if (Object.isFunction(extras.push))
         for (var i = 0, length = extras.length; i < length; i += 2)
           headers[extras[i]] = extras[i+1];
       else
@@ -917,32 +1273,39 @@ Ajax.Request.prototype = Object.extend(new Ajax.Base(), {
   },
 
   success: function() {
-    return !this.transport.status
-        || (this.transport.status >= 200 && this.transport.status < 300);
+    var status = this.getStatus();
+    return !status || (status >= 200 && status < 300);
+  },
+
+  getStatus: function() {
+    try {
+      return this.transport.status || 0;
+    } catch (e) { return 0 }
   },
 
   respondToReadyState: function(readyState) {
-    var state = Ajax.Request.Events[readyState];
-    var transport = this.transport, json = this.evalJSON();
+    var state = Ajax.Request.Events[readyState], response = new Ajax.Response(this);
 
     if (state == 'Complete') {
       try {
         this._complete = true;
-        (this.options['on' + this.transport.status]
+        (this.options['on' + response.status]
          || this.options['on' + (this.success() ? 'Success' : 'Failure')]
-         || Prototype.emptyFunction)(transport, json);
+         || Prototype.emptyFunction)(response, response.headerJSON);
       } catch (e) {
         this.dispatchException(e);
       }
 
-      if ((this.getHeader('Content-type') || 'text/javascript').strip().
-        match(/^(text|application)\/(x-)?(java|ecma)script(;.*)?$/i))
-          this.evalResponse();
+      var contentType = response.getHeader('Content-type');
+      if (this.options.evalJS == 'force'
+          || (this.options.evalJS && contentType
+          && contentType.match(/^\s*(text|application)\/(x-)?(java|ecma)script(;.*)?\s*$/i)))
+        this.evalResponse();
     }
 
     try {
-      (this.options['on' + state] || Prototype.emptyFunction)(transport, json);
-      Ajax.Responders.dispatch('on' + state, this, transport, json);
+      (this.options['on' + state] || Prototype.emptyFunction)(response, response.headerJSON);
+      Ajax.Responders.dispatch('on' + state, this, response, response.headerJSON);
     } catch (e) {
       this.dispatchException(e);
     }
@@ -959,16 +1322,9 @@ Ajax.Request.prototype = Object.extend(new Ajax.Base(), {
     } catch (e) { return null }
   },
 
-  evalJSON: function() {
-    try {
-      var json = this.getHeader('X-JSON');
-      return json ? eval('(' + json + ')') : null;
-    } catch (e) { return null }
-  },
-
   evalResponse: function() {
     try {
-      return eval(this.transport.responseText);
+      return eval((this.transport.responseText || '').unfilterJSON());
     } catch (e) {
       this.dispatchException(e);
     }
@@ -980,57 +1336,126 @@ Ajax.Request.prototype = Object.extend(new Ajax.Base(), {
   }
 });
 
-Ajax.Updater = Class.create();
+Ajax.Request.Events =
+  ['Uninitialized', 'Loading', 'Loaded', 'Interactive', 'Complete'];
 
-Object.extend(Object.extend(Ajax.Updater.prototype, Ajax.Request.prototype), {
-  initialize: function(container, url, options) {
-    this.container = {
-      success: (container.success || container),
-      failure: (container.failure || (container.success ? null : container))
+Ajax.Response = Class.create({
+  initialize: function(request){
+    this.request = request;
+    var transport  = this.transport  = request.transport,
+        readyState = this.readyState = transport.readyState;
+
+    if((readyState > 2 && !Prototype.Browser.IE) || readyState == 4) {
+      this.status       = this.getStatus();
+      this.statusText   = this.getStatusText();
+      this.responseText = String.interpret(transport.responseText);
+      this.headerJSON   = this._getHeaderJSON();
     }
 
-    this.transport = Ajax.getTransport();
-    this.setOptions(options);
-
-    var onComplete = this.options.onComplete || Prototype.emptyFunction;
-    this.options.onComplete = (function(transport, param) {
-      this.updateContent();
-      onComplete(transport, param);
-    }).bind(this);
-
-    this.request(url);
+    if(readyState == 4) {
+      var xml = transport.responseXML;
+      this.responseXML  = Object.isUndefined(xml) ? null : xml;
+      this.responseJSON = this._getResponseJSON();
+    }
   },
 
-  updateContent: function() {
-    var receiver = this.container[this.success() ? 'success' : 'failure'];
-    var response = this.transport.responseText;
+  status:      0,
+  statusText: '',
 
-    if (!this.options.evalScripts) response = response.stripScripts();
+  getStatus: Ajax.Request.prototype.getStatus,
 
-    if (receiver = $(receiver)) {
-      if (this.options.insertion)
-        new this.options.insertion(receiver, response);
-      else
-        receiver.update(response);
+  getStatusText: function() {
+    try {
+      return this.transport.statusText || '';
+    } catch (e) { return '' }
+  },
+
+  getHeader: Ajax.Request.prototype.getHeader,
+
+  getAllHeaders: function() {
+    try {
+      return this.getAllResponseHeaders();
+    } catch (e) { return null }
+  },
+
+  getResponseHeader: function(name) {
+    return this.transport.getResponseHeader(name);
+  },
+
+  getAllResponseHeaders: function() {
+    return this.transport.getAllResponseHeaders();
+  },
+
+  _getHeaderJSON: function() {
+    var json = this.getHeader('X-JSON');
+    if (!json) return null;
+    json = decodeURIComponent(escape(json));
+    try {
+      return json.evalJSON(this.request.options.sanitizeJSON);
+    } catch (e) {
+      this.request.dispatchException(e);
     }
+  },
 
-    if (this.success()) {
-      if (this.onComplete)
-        setTimeout(this.onComplete.bind(this), 10);
+  _getResponseJSON: function() {
+    var options = this.request.options;
+    if (!options.evalJSON || (options.evalJSON != 'force' &&
+      !(this.getHeader('Content-type') || '').include('application/json')) ||
+        this.responseText.blank())
+          return null;
+    try {
+      return this.responseText.evalJSON(options.sanitizeJSON);
+    } catch (e) {
+      this.request.dispatchException(e);
     }
   }
 });
 
-Ajax.PeriodicalUpdater = Class.create();
-Ajax.PeriodicalUpdater.prototype = Object.extend(new Ajax.Base(), {
-  initialize: function(container, url, options) {
-    this.setOptions(options);
+Ajax.Updater = Class.create(Ajax.Request, {
+  initialize: function($super, container, url, options) {
+    this.container = {
+      success: (container.success || container),
+      failure: (container.failure || (container.success ? null : container))
+    };
+
+    options = Object.clone(options);
+    var onComplete = options.onComplete;
+    options.onComplete = (function(response, json) {
+      this.updateContent(response.responseText);
+      if (Object.isFunction(onComplete)) onComplete(response, json);
+    }).bind(this);
+
+    $super(url, options);
+  },
+
+  updateContent: function(responseText) {
+    var receiver = this.container[this.success() ? 'success' : 'failure'],
+        options = this.options;
+
+    if (!options.evalScripts) responseText = responseText.stripScripts();
+
+    if (receiver = $(receiver)) {
+      if (options.insertion) {
+        if (Object.isString(options.insertion)) {
+          var insertion = { }; insertion[options.insertion] = responseText;
+          receiver.insert(insertion);
+        }
+        else options.insertion(receiver, responseText);
+      }
+      else receiver.update(responseText);
+    }
+  }
+});
+
+Ajax.PeriodicalUpdater = Class.create(Ajax.Base, {
+  initialize: function($super, container, url, options) {
+    $super(options);
     this.onComplete = this.options.onComplete;
 
     this.frequency = (this.options.frequency || 2);
     this.decay = (this.options.decay || 1);
 
-    this.updater = {};
+    this.updater = { };
     this.container = container;
     this.url = url;
 
@@ -1048,15 +1473,14 @@ Ajax.PeriodicalUpdater.prototype = Object.extend(new Ajax.Base(), {
     (this.onComplete || Prototype.emptyFunction).apply(this, arguments);
   },
 
-  updateComplete: function(request) {
+  updateComplete: function(response) {
     if (this.options.decay) {
-      this.decay = (request.responseText == this.lastText ?
+      this.decay = (response.responseText == this.lastText ?
         this.decay * this.options.decay : 1);
 
-      this.lastText = request.responseText;
+      this.lastText = response.responseText;
     }
-    this.timer = setTimeout(this.onTimerEvent.bind(this),
-      this.decay * this.frequency * 1000);
+    this.timer = this.onTimerEvent.bind(this).delay(this.decay * this.frequency);
   },
 
   onTimerEvent: function() {
@@ -1069,7 +1493,7 @@ function $(element) {
       elements.push($(arguments[i]));
     return elements;
   }
-  if (typeof element == 'string')
+  if (Object.isString(element))
     element = document.getElementById(element);
   return Element.extend(element);
 }
@@ -1080,63 +1504,51 @@ if (Prototype.BrowserFeatures.XPath) {
     var query = document.evaluate(expression, $(parentElement) || document,
       null, XPathResult.ORDERED_NODE_SNAPSHOT_TYPE, null);
     for (var i = 0, length = query.snapshotLength; i < length; i++)
-      results.push(query.snapshotItem(i));
+      results.push(Element.extend(query.snapshotItem(i)));
     return results;
   };
 }
 
-document.getElementsByClassName = function(className, parentElement) {
-  if (Prototype.BrowserFeatures.XPath) {
-    var q = ".//*[contains(concat(' ', @class, ' '), ' " + className + " ')]";
-    return document._getElementsByXPath(q, parentElement);
-  } else {
-    var children = ($(parentElement) || document.body).getElementsByTagName('*');
-    var elements = [], child;
-    for (var i = 0, length = children.length; i < length; i++) {
-      child = children[i];
-      if (Element.hasClassName(child, className))
-        elements.push(Element.extend(child));
-    }
-    return elements;
-  }
-};
-
 /*--------------------------------------------------------------------------*/
 
-if (!window.Element)
-  var Element = new Object();
+if (!window.Node) var Node = { };
 
-Element.extend = function(element) {
-  if (!element || _nativeExtensions || element.nodeType == 3) return element;
+if (!Node.ELEMENT_NODE) {
+  // DOM level 2 ECMAScript Language Binding
+  Object.extend(Node, {
+    ELEMENT_NODE: 1,
+    ATTRIBUTE_NODE: 2,
+    TEXT_NODE: 3,
+    CDATA_SECTION_NODE: 4,
+    ENTITY_REFERENCE_NODE: 5,
+    ENTITY_NODE: 6,
+    PROCESSING_INSTRUCTION_NODE: 7,
+    COMMENT_NODE: 8,
+    DOCUMENT_NODE: 9,
+    DOCUMENT_TYPE_NODE: 10,
+    DOCUMENT_FRAGMENT_NODE: 11,
+    NOTATION_NODE: 12
+  });
+}
 
-  if (!element._extended && element.tagName && element != window) {
-    var methods = Object.clone(Element.Methods), cache = Element.extend.cache;
-
-    if (element.tagName == 'FORM')
-      Object.extend(methods, Form.Methods);
-    if (['INPUT', 'TEXTAREA', 'SELECT'].include(element.tagName))
-      Object.extend(methods, Form.Element.Methods);
-
-    Object.extend(methods, Element.Methods.Simulated);
-
-    for (var property in methods) {
-      var value = methods[property];
-      if (typeof value == 'function' && !(property in element))
-        element[property] = cache.findOrStore(value);
+(function() {
+  var element = this.Element;
+  this.Element = function(tagName, attributes) {
+    attributes = attributes || { };
+    tagName = tagName.toLowerCase();
+    var cache = Element.cache;
+    if (Prototype.Browser.IE && attributes.name) {
+      tagName = '<' + tagName + ' name="' + attributes.name + '">';
+      delete attributes.name;
+      return Element.writeAttribute(document.createElement(tagName), attributes);
     }
-  }
+    if (!cache[tagName]) cache[tagName] = Element.extend(document.createElement(tagName));
+    return Element.writeAttribute(cache[tagName].cloneNode(false), attributes);
+  };
+  Object.extend(this.Element, element || { });
+}).call(window);
 
-  element._extended = true;
-  return element;
-};
-
-Element.extend.cache = {
-  findOrStore: function(value) {
-    return this[value] = this[value] || function() {
-      return value.apply(null, [this].concat($A(arguments)));
-    }
-  }
-};
+Element.cache = { };
 
 Element.Methods = {
   visible: function(element) {
@@ -1165,28 +1577,74 @@ Element.Methods = {
     return element;
   },
 
-  update: function(element, html) {
-    html = typeof html == 'undefined' ? '' : html.toString();
-    $(element).innerHTML = html.stripScripts();
-    setTimeout(function() {html.evalScripts()}, 10);
+  update: function(element, content) {
+    element = $(element);
+    if (content && content.toElement) content = content.toElement();
+    if (Object.isElement(content)) return element.update().insert(content);
+    content = Object.toHTML(content);
+    element.innerHTML = content.stripScripts();
+    content.evalScripts.bind(content).defer();
     return element;
   },
 
-  replace: function(element, html) {
+  replace: function(element, content) {
     element = $(element);
-    html = typeof html == 'undefined' ? '' : html.toString();
-    if (element.outerHTML) {
-      element.outerHTML = html.stripScripts();
-    } else {
+    if (content && content.toElement) content = content.toElement();
+    else if (!Object.isElement(content)) {
+      content = Object.toHTML(content);
       var range = element.ownerDocument.createRange();
-      range.selectNodeContents(element);
-      element.parentNode.replaceChild(
-        range.createContextualFragment(html.stripScripts()), element);
+      range.selectNode(element);
+      content.evalScripts.bind(content).defer();
+      content = range.createContextualFragment(content.stripScripts());
     }
-    setTimeout(function() {html.evalScripts()}, 10);
+    element.parentNode.replaceChild(content, element);
     return element;
   },
 
+  insert: function(element, insertions) {
+    element = $(element);
+
+    if (Object.isString(insertions) || Object.isNumber(insertions) ||
+        Object.isElement(insertions) || (insertions && (insertions.toElement || insertions.toHTML)))
+          insertions = {bottom:insertions};
+
+    var content, t, range;
+
+    for (position in insertions) {
+      content  = insertions[position];
+      position = position.toLowerCase();
+      t = Element._insertionTranslations[position];
+
+      if (content && content.toElement) content = content.toElement();
+      if (Object.isElement(content)) {
+        t.insert(element, content);
+        continue;
+      }
+
+      content = Object.toHTML(content);
+
+      range = element.ownerDocument.createRange();
+      t.initializeRange(element, range);
+      t.insert(element, range.createContextualFragment(content.stripScripts()));
+
+      content.evalScripts.bind(content).defer();
+    }
+
+    return element;
+  },
+
+  wrap: function(element, wrapper, attributes) {
+    element = $(element);
+    if (Object.isElement(wrapper))
+      $(wrapper).writeAttribute(attributes || { });
+    else if (Object.isString(wrapper)) wrapper = new Element(wrapper, attributes);
+    else wrapper = new Element('div', wrapper);
+    if (element.parentNode)
+      element.parentNode.replaceChild(wrapper, element);
+    wrapper.appendChild(element);
+    return wrapper;
+  },
+
   inspect: function(element) {
     element = $(element);
     var result = '<' + element.tagName.toLowerCase();
@@ -1212,7 +1670,13 @@ Element.Methods = {
   },
 
   descendants: function(element) {
-    return $A($(element).getElementsByTagName('*'));
+    return $(element).getElementsBySelector("*");
+  },
+
+  firstDescendant: function(element) {
+    element = $(element).firstChild;
+    while (element && element.nodeType != 1) element = element.nextSibling;
+    return $(element);
   },
 
   immediateDescendants: function(element) {
@@ -1236,48 +1700,96 @@ Element.Methods = {
   },
 
   match: function(element, selector) {
-    if (typeof selector == 'string')
+    if (Object.isString(selector))
       selector = new Selector(selector);
     return selector.match($(element));
   },
 
   up: function(element, expression, index) {
-    return Selector.findElement($(element).ancestors(), expression, index);
+    element = $(element);
+    if (arguments.length == 1) return $(element.parentNode);
+    var ancestors = element.ancestors();
+    return expression ? Selector.findElement(ancestors, expression, index) :
+      ancestors[index || 0];
   },
 
   down: function(element, expression, index) {
-    return Selector.findElement($(element).descendants(), expression, index);
+    element = $(element);
+    if (arguments.length == 1) return element.firstDescendant();
+    var descendants = element.descendants();
+    return expression ? Selector.findElement(descendants, expression, index) :
+      descendants[index || 0];
   },
 
   previous: function(element, expression, index) {
-    return Selector.findElement($(element).previousSiblings(), expression, index);
+    element = $(element);
+    if (arguments.length == 1) return $(Selector.handlers.previousElementSibling(element));
+    var previousSiblings = element.previousSiblings();
+    return expression ? Selector.findElement(previousSiblings, expression, index) :
+      previousSiblings[index || 0];
   },
 
   next: function(element, expression, index) {
-    return Selector.findElement($(element).nextSiblings(), expression, index);
+    element = $(element);
+    if (arguments.length == 1) return $(Selector.handlers.nextElementSibling(element));
+    var nextSiblings = element.nextSiblings();
+    return expression ? Selector.findElement(nextSiblings, expression, index) :
+      nextSiblings[index || 0];
   },
 
-  getElementsBySelector: function() {
+  select: function() {
     var args = $A(arguments), element = $(args.shift());
     return Selector.findChildElements(element, args);
   },
 
-  getElementsByClassName: function(element, className) {
-    return document.getElementsByClassName(className, element);
+  adjacent: function() {
+    var args = $A(arguments), element = $(args.shift());
+    return Selector.findChildElements(element.parentNode, args).without(element);
+  },
+
+  identify: function(element) {
+    element = $(element);
+    var id = element.readAttribute('id'), self = arguments.callee;
+    if (id) return id;
+    do { id = 'anonymous_element_' + self.counter++ } while ($(id));
+    element.writeAttribute('id', id);
+    return id;
   },
 
   readAttribute: function(element, name) {
     element = $(element);
-    if (document.all && !window.opera) {
-      var t = Element._attributeTranslations;
+    if (Prototype.Browser.IE) {
+      var t = Element._attributeTranslations.read;
       if (t.values[name]) return t.values[name](element, name);
-      if (t.names[name])  name = t.names[name];
-      var attribute = element.attributes[name];
-      if(attribute) return attribute.nodeValue;
+      if (t.names[name]) name = t.names[name];
+      if (name.include(':')) {
+        return (!element.attributes || !element.attributes[name]) ? null :
+         element.attributes[name].value;
+      }
     }
     return element.getAttribute(name);
   },
 
+  writeAttribute: function(element, name, value) {
+    element = $(element);
+    var attributes = { }, t = Element._attributeTranslations.write;
+
+    if (typeof name == 'object') attributes = name;
+    else attributes[name] = Object.isUndefined(value) ? true : value;
+
+    for (var attr in attributes) {
+      name = t.names[attr] || attr;
+      value = attributes[attr];
+      if (t.values[attr]) name = t.values[attr](element, value);
+      if (value === false || value === null)
+        element.removeAttribute(name);
+      else if (value === true)
+        element.setAttribute(name, name);
+      else element.setAttribute(name, value);
+    }
+    return element;
+  },
+
   getHeight: function(element) {
     return $(element).getDimensions().height;
   },
@@ -1293,39 +1805,28 @@ Element.Methods = {
   hasClassName: function(element, className) {
     if (!(element = $(element))) return;
     var elementClassName = element.className;
-    if (elementClassName.length == 0) return false;
-    if (elementClassName == className ||
-        elementClassName.match(new RegExp("(^|\\s)" + className + "(\\s|$)")))
-      return true;
-    return false;
+    return (elementClassName.length > 0 && (elementClassName == className ||
+      new RegExp("(^|\\s)" + className + "(\\s|$)").test(elementClassName)));
   },
 
   addClassName: function(element, className) {
     if (!(element = $(element))) return;
-    Element.classNames(element).add(className);
+    if (!element.hasClassName(className))
+      element.className += (element.className ? ' ' : '') + className;
     return element;
   },
 
   removeClassName: function(element, className) {
     if (!(element = $(element))) return;
-    Element.classNames(element).remove(className);
+    element.className = element.className.replace(
+      new RegExp("(^|\\s+)" + className + "(\\s+|$)"), ' ').strip();
     return element;
   },
 
   toggleClassName: function(element, className) {
     if (!(element = $(element))) return;
-    Element.classNames(element)[element.hasClassName(className) ? 'remove' : 'add'](className);
-    return element;
-  },
-
-  observe: function() {
-    Event.observe.apply(Event, arguments);
-    return $A(arguments).first();
-  },
-
-  stopObserving: function() {
-    Event.stopObserving.apply(Event, arguments);
-    return $A(arguments).first();
+    return element[element.hasClassName(className) ?
+      'removeClassName' : 'addClassName'](className);
   },
 
   // removes whitespace-only text node children
@@ -1342,74 +1843,76 @@ Element.Methods = {
   },
 
   empty: function(element) {
-    return $(element).innerHTML.match(/^\s*$/);
+    return $(element).innerHTML.blank();
   },
 
   descendantOf: function(element, ancestor) {
     element = $(element), ancestor = $(ancestor);
+    var originalAncestor = ancestor;
+
+    if (element.compareDocumentPosition)
+      return (element.compareDocumentPosition(ancestor) & 8) === 8;
+
+    if (element.sourceIndex && !Prototype.Browser.Opera) {
+      var e = element.sourceIndex, a = ancestor.sourceIndex,
+       nextAncestor = ancestor.nextSibling;
+      if (!nextAncestor) {
+        do { ancestor = ancestor.parentNode; }
+        while (!(nextAncestor = ancestor.nextSibling) && ancestor.parentNode);
+      }
+      if (nextAncestor) return (e > a && e < nextAncestor.sourceIndex);
+    }
+
     while (element = element.parentNode)
-      if (element == ancestor) return true;
+      if (element == originalAncestor) return true;
     return false;
   },
 
   scrollTo: function(element) {
     element = $(element);
-    var pos = Position.cumulativeOffset(element);
+    var pos = element.cumulativeOffset();
     window.scrollTo(pos[0], pos[1]);
     return element;
   },
 
   getStyle: function(element, style) {
     element = $(element);
-    if (['float','cssFloat'].include(style))
-      style = (typeof element.style.styleFloat != 'undefined' ? 'styleFloat' : 'cssFloat');
-    style = style.camelize();
+    style = style == 'float' ? 'cssFloat' : style.camelize();
     var value = element.style[style];
     if (!value) {
-      if (document.defaultView && document.defaultView.getComputedStyle) {
-        var css = document.defaultView.getComputedStyle(element, null);
-        value = css ? css[style] : null;
-      } else if (element.currentStyle) {
-        value = element.currentStyle[style];
-      }
-    }
-
-    if((value == 'auto') && ['width','height'].include(style) && (element.getStyle('display') != 'none'))
-      value = element['offset'+style.capitalize()] + 'px';
-
-    if (window.opera && ['left', 'top', 'right', 'bottom'].include(style))
-      if (Element.getStyle(element, 'position') == 'static') value = 'auto';
-    if(style == 'opacity') {
-      if(value) return parseFloat(value);
-      if(value = (element.getStyle('filter') || '').match(/alpha\(opacity=(.*)\)/))
-        if(value[1]) return parseFloat(value[1]) / 100;
-      return 1.0;
+      var css = document.defaultView.getComputedStyle(element, null);
+      value = css ? css[style] : null;
     }
+    if (style == 'opacity') return value ? parseFloat(value) : 1.0;
     return value == 'auto' ? null : value;
   },
 
-  setStyle: function(element, style) {
+  getOpacity: function(element) {
+    return $(element).getStyle('opacity');
+  },
+
+  setStyle: function(element, styles) {
     element = $(element);
-    for (var name in style) {
-      var value = style[name];
-      if(name == 'opacity') {
-        if (value == 1) {
-          value = (/Gecko/.test(navigator.userAgent) &&
-            !/Konqueror|Safari|KHTML/.test(navigator.userAgent)) ? 0.999999 : 1.0;
-          if(/MSIE/.test(navigator.userAgent) && !window.opera)
-            element.style.filter = element.getStyle('filter').replace(/alpha\([^\)]*\)/gi,'');
-        } else if(value == '') {
-          if(/MSIE/.test(navigator.userAgent) && !window.opera)
-            element.style.filter = element.getStyle('filter').replace(/alpha\([^\)]*\)/gi,'');
-        } else {
-          if(value < 0.00001) value = 0;
-          if(/MSIE/.test(navigator.userAgent) && !window.opera)
-            element.style.filter = element.getStyle('filter').replace(/alpha\([^\)]*\)/gi,'') +
-              'alpha(opacity='+value*100+')';
-        }
-      } else if(['float','cssFloat'].include(name)) name = (typeof element.style.styleFloat != 'undefined') ? 'styleFloat' : 'cssFloat';
-      element.style[name.camelize()] = value;
+    var elementStyle = element.style, match;
+    if (Object.isString(styles)) {
+      element.style.cssText += ';' + styles;
+      return styles.include('opacity') ?
+        element.setOpacity(styles.match(/opacity:\s*(\d?\.?\d*)/)[1]) : element;
     }
+    for (var property in styles)
+      if (property == 'opacity') element.setOpacity(styles[property]);
+      else
+        elementStyle[(property == 'float' || property == 'cssFloat') ?
+          (Object.isUndefined(elementStyle.styleFloat) ? 'cssFloat' : 'styleFloat') :
+            property] = styles[property];
+
+    return element;
+  },
+
+  setOpacity: function(element, value) {
+    element = $(element);
+    element.style.opacity = (value == 1 || value === '') ? '' :
+      (value < 0.00001) ? 0 : value;
     return element;
   },
 
@@ -1468,8 +1971,8 @@ Element.Methods = {
   makeClipping: function(element) {
     element = $(element);
     if (element._overflow) return element;
-    element._overflow = element.style.overflow || 'auto';
-    if ((Element.getStyle(element, 'overflow') || 'visible') != 'hidden')
+    element._overflow = Element.getStyle(element, 'overflow') || 'auto';
+    if (element._overflow !== 'hidden')
       element.style.overflow = 'hidden';
     return element;
   },
@@ -1480,232 +1983,2207 @@ Element.Methods = {
     element.style.overflow = element._overflow == 'auto' ? '' : element._overflow;
     element._overflow = null;
     return element;
-  }
-};
-
-Object.extend(Element.Methods, {childOf: Element.Methods.descendantOf});
-
-Element._attributeTranslations = {};
-
-Element._attributeTranslations.names = {
-  colspan:   "colSpan",
-  rowspan:   "rowSpan",
-  valign:    "vAlign",
-  datetime:  "dateTime",
-  accesskey: "accessKey",
-  tabindex:  "tabIndex",
-  enctype:   "encType",
-  maxlength: "maxLength",
-  readonly:  "readOnly",
-  longdesc:  "longDesc"
-};
-
-Element._attributeTranslations.values = {
-  _getAttr: function(element, attribute) {
-    return element.getAttribute(attribute, 2);
   },
 
-  _flag: function(element, attribute) {
-    return $(element).hasAttribute(attribute) ? attribute : null;
+  cumulativeOffset: function(element) {
+    var valueT = 0, valueL = 0;
+    do {
+      valueT += element.offsetTop  || 0;
+      valueL += element.offsetLeft || 0;
+      element = element.offsetParent;
+    } while (element);
+    return Element._returnOffset(valueL, valueT);
   },
 
-  style: function(element) {
-    return element.style.cssText.toLowerCase();
-  },
-
-  title: function(element) {
-    var node = element.getAttributeNode('title');
-    return node.specified ? node.nodeValue : null;
-  }
-};
-
-Object.extend(Element._attributeTranslations.values, {
-  href: Element._attributeTranslations.values._getAttr,
-  src:  Element._attributeTranslations.values._getAttr,
-  disabled: Element._attributeTranslations.values._flag,
-  checked:  Element._attributeTranslations.values._flag,
-  readonly: Element._attributeTranslations.values._flag,
-  multiple: Element._attributeTranslations.values._flag
-});
-
-Element.Methods.Simulated = {
-  hasAttribute: function(element, attribute) {
-    var t = Element._attributeTranslations;
-    attribute = t.names[attribute] || attribute;
-    return $(element).getAttributeNode(attribute).specified;
-  }
-};
-
-// IE is missing .innerHTML support for TABLE-related elements
-if (document.all && !window.opera){
-  Element.Methods.update = function(element, html) {
-    element = $(element);
-    html = typeof html == 'undefined' ? '' : html.toString();
-    var tagName = element.tagName.toUpperCase();
-    if (['THEAD','TBODY','TR','TD'].include(tagName)) {
-      var div = document.createElement('div');
-      switch (tagName) {
-        case 'THEAD':
-        case 'TBODY':
-          div.innerHTML = '<table><tbody>' +  html.stripScripts() + '</tbody></table>';
-          depth = 2;
-          break;
-        case 'TR':
-          div.innerHTML = '<table><tbody><tr>' +  html.stripScripts() + '</tr></tbody></table>';
-          depth = 3;
-          break;
-        case 'TD':
-          div.innerHTML = '<table><tbody><tr><td>' +  html.stripScripts() + '</td></tr></tbody></table>';
-          depth = 4;
+  positionedOffset: function(element) {
+    var valueT = 0, valueL = 0;
+    do {
+      valueT += element.offsetTop  || 0;
+      valueL += element.offsetLeft || 0;
+      element = element.offsetParent;
+      if (element) {
+        if (element.tagName == 'BODY') break;
+        var p = Element.getStyle(element, 'position');
+        if (p == 'relative' || p == 'absolute') break;
       }
-      $A(element.childNodes).each(function(node){
-        element.removeChild(node)
-      });
-      depth.times(function(){ div = div.firstChild });
+    } while (element);
+    return Element._returnOffset(valueL, valueT);
+  },
 
-      $A(div.childNodes).each(
-        function(node){ element.appendChild(node) });
-    } else {
-      element.innerHTML = html.stripScripts();
+  absolutize: function(element) {
+    element = $(element);
+    if (element.getStyle('position') == 'absolute') return;
+    // Position.prepare(); // To be done manually by Scripty when it needs it.
+
+    var offsets = element.positionedOffset();
+    var top     = offsets[1];
+    var left    = offsets[0];
+    var width   = element.clientWidth;
+    var height  = element.clientHeight;
+
+    element._originalLeft   = left - parseFloat(element.style.left  || 0);
+    element._originalTop    = top  - parseFloat(element.style.top || 0);
+    element._originalWidth  = element.style.width;
+    element._originalHeight = element.style.height;
+
+    element.style.position = 'absolute';
+    element.style.top    = top + 'px';
+    element.style.left   = left + 'px';
+    element.style.width  = width + 'px';
+    element.style.height = height + 'px';
+    return element;
+  },
+
+  relativize: function(element) {
+    element = $(element);
+    if (element.getStyle('position') == 'relative') return;
+    // Position.prepare(); // To be done manually by Scripty when it needs it.
+
+    element.style.position = 'relative';
+    var top  = parseFloat(element.style.top  || 0) - (element._originalTop || 0);
+    var left = parseFloat(element.style.left || 0) - (element._originalLeft || 0);
+
+    element.style.top    = top + 'px';
+    element.style.left   = left + 'px';
+    element.style.height = element._originalHeight;
+    element.style.width  = element._originalWidth;
+    return element;
+  },
+
+  cumulativeScrollOffset: function(element) {
+    var valueT = 0, valueL = 0;
+    do {
+      valueT += element.scrollTop  || 0;
+      valueL += element.scrollLeft || 0;
+      element = element.parentNode;
+    } while (element);
+    return Element._returnOffset(valueL, valueT);
+  },
+
+  getOffsetParent: function(element) {
+    if (element.offsetParent) return $(element.offsetParent);
+    if (element == document.body) return $(element);
+
+    while ((element = element.parentNode) && element != document.body)
+      if (Element.getStyle(element, 'position') != 'static')
+        return $(element);
+
+    return $(document.body);
+  },
+
+  viewportOffset: function(forElement) {
+    var valueT = 0, valueL = 0;
+
+    var element = forElement;
+    do {
+      valueT += element.offsetTop  || 0;
+      valueL += element.offsetLeft || 0;
+
+      // Safari fix
+      if (element.offsetParent == document.body &&
+        Element.getStyle(element, 'position') == 'absolute') break;
+
+    } while (element = element.offsetParent);
+
+    element = forElement;
+    do {
+      if (!Prototype.Browser.Opera || element.tagName == 'BODY') {
+        valueT -= element.scrollTop  || 0;
+        valueL -= element.scrollLeft || 0;
+      }
+    } while (element = element.parentNode);
+
+    return Element._returnOffset(valueL, valueT);
+  },
+
+  clonePosition: function(element, source) {
+    var options = Object.extend({
+      setLeft:    true,
+      setTop:     true,
+      setWidth:   true,
+      setHeight:  true,
+      offsetTop:  0,
+      offsetLeft: 0
+    }, arguments[2] || { });
+
+    // find page position of source
+    source = $(source);
+    var p = source.viewportOffset();
+
+    // find coordinate system to use
+    element = $(element);
+    var delta = [0, 0];
+    var parent = null;
+    // delta [0,0] will do fine with position: fixed elements,
+    // position:absolute needs offsetParent deltas
+    if (Element.getStyle(element, 'position') == 'absolute') {
+      parent = element.getOffsetParent();
+      delta = parent.viewportOffset();
     }
-    setTimeout(function() {html.evalScripts()}, 10);
+
+    // correct by body offsets (fixes Safari)
+    if (parent == document.body) {
+      delta[0] -= document.body.offsetLeft;
+      delta[1] -= document.body.offsetTop;
+    }
+
+    // set position
+    if (options.setLeft)   element.style.left  = (p[0] - delta[0] + options.offsetLeft) + 'px';
+    if (options.setTop)    element.style.top   = (p[1] - delta[1] + options.offsetTop) + 'px';
+    if (options.setWidth)  element.style.width = source.offsetWidth + 'px';
+    if (options.setHeight) element.style.height = source.offsetHeight + 'px';
     return element;
   }
 };
 
-Object.extend(Element, Element.Methods);
+Element.Methods.identify.counter = 1;
 
-var _nativeExtensions = false;
+Object.extend(Element.Methods, {
+  getElementsBySelector: Element.Methods.select,
+  childElements: Element.Methods.immediateDescendants
+});
 
-if(/Konqueror|Safari|KHTML/.test(navigator.userAgent))
-  ['', 'Form', 'Input', 'TextArea', 'Select'].each(function(tag) {
-    var className = 'HTML' + tag + 'Element';
-    if(window[className]) return;
-    var klass = window[className] = {};
-    klass.prototype = document.createElement(tag ? tag.toLowerCase() : 'div').__proto__;
+Element._attributeTranslations = {
+  write: {
+    names: {
+      className: 'class',
+      htmlFor:   'for'
+    },
+    values: { }
+  }
+};
+
+
+if (!document.createRange || Prototype.Browser.Opera) {
+  Element.Methods.insert = function(element, insertions) {
+    element = $(element);
+
+    if (Object.isString(insertions) || Object.isNumber(insertions) ||
+        Object.isElement(insertions) || (insertions && (insertions.toElement || insertions.toHTML)))
+          insertions = { bottom: insertions };
+
+    var t = Element._insertionTranslations, content, position, pos, tagName;
+
+    for (position in insertions) {
+      content  = insertions[position];
+      position = position.toLowerCase();
+      pos      = t[position];
+
+      if (content && content.toElement) content = content.toElement();
+      if (Object.isElement(content)) {
+        pos.insert(element, content);
+        continue;
+      }
+
+      content = Object.toHTML(content);
+      tagName = ((position == 'before' || position == 'after')
+        ? element.parentNode : element).tagName.toUpperCase();
+
+      if (t.tags[tagName]) {
+        var fragments = Element._getContentFromAnonymousElement(tagName, content.stripScripts());
+        if (position == 'top' || position == 'after') fragments.reverse();
+        fragments.each(pos.insert.curry(element));
+      }
+      else element.insertAdjacentHTML(pos.adjacency, content.stripScripts());
+
+      content.evalScripts.bind(content).defer();
+    }
+
+    return element;
+  };
+}
+
+if (Prototype.Browser.Opera) {
+  Element.Methods.getStyle = Element.Methods.getStyle.wrap(
+    function(proceed, element, style) {
+      switch (style) {
+        case 'left': case 'top': case 'right': case 'bottom':
+          if (proceed(element, 'position') === 'static') return null;
+        case 'height': case 'width':
+          // returns '0px' for hidden elements; we want it to return null
+          if (!Element.visible(element)) return null;
+
+          // returns the border-box dimensions rather than the content-box
+          // dimensions, so we subtract padding and borders from the value
+          var dim = parseInt(proceed(element, style), 10);
+
+          if (dim !== element['offset' + style.capitalize()])
+            return dim + 'px';
+
+          var properties;
+          if (style === 'height') {
+            properties = ['border-top-width', 'padding-top',
+             'padding-bottom', 'border-bottom-width'];
+          }
+          else {
+            properties = ['border-left-width', 'padding-left',
+             'padding-right', 'border-right-width'];
+          }
+          return properties.inject(dim, function(memo, property) {
+            var val = proceed(element, property);
+            return val === null ? memo : memo - parseInt(val, 10);
+          }) + 'px';
+        default: return proceed(element, style);
+      }
+    }
+  );
+
+  Element.Methods.readAttribute = Element.Methods.readAttribute.wrap(
+    function(proceed, element, attribute) {
+      if (attribute === 'title') return element.title;
+      return proceed(element, attribute);
+    }
+  );
+}
+
+else if (Prototype.Browser.IE) {
+  $w('positionedOffset getOffsetParent viewportOffset').each(function(method) {
+    Element.Methods[method] = Element.Methods[method].wrap(
+      function(proceed, element) {
+        element = $(element);
+        var position = element.getStyle('position');
+        if (position != 'static') return proceed(element);
+        element.setStyle({ position: 'relative' });
+        var value = proceed(element);
+        element.setStyle({ position: position });
+        return value;
+      }
+    );
   });
 
+  Element.Methods.getStyle = function(element, style) {
+    element = $(element);
+    style = (style == 'float' || style == 'cssFloat') ? 'styleFloat' : style.camelize();
+    var value = element.style[style];
+    if (!value && element.currentStyle) value = element.currentStyle[style];
+
+    if (style == 'opacity') {
+      if (value = (element.getStyle('filter') || '').match(/alpha\(opacity=(.*)\)/))
+        if (value[1]) return parseFloat(value[1]) / 100;
+      return 1.0;
+    }
+
+    if (value == 'auto') {
+      if ((style == 'width' || style == 'height') && (element.getStyle('display') != 'none'))
+        return element['offset' + style.capitalize()] + 'px';
+      return null;
+    }
+    return value;
+  };
+
+  Element.Methods.setOpacity = function(element, value) {
+    function stripAlpha(filter){
+      return filter.replace(/alpha\([^\)]*\)/gi,'');
+    }
+    element = $(element);
+    var currentStyle = element.currentStyle;
+    if ((currentStyle && !currentStyle.hasLayout) ||
+      (!currentStyle && element.style.zoom == 'normal'))
+        element.style.zoom = 1;
+
+    var filter = element.getStyle('filter'), style = element.style;
+    if (value == 1 || value === '') {
+      (filter = stripAlpha(filter)) ?
+        style.filter = filter : style.removeAttribute('filter');
+      return element;
+    } else if (value < 0.00001) value = 0;
+    style.filter = stripAlpha(filter) +
+      'alpha(opacity=' + (value * 100) + ')';
+    return element;
+  };
+
+  Element._attributeTranslations = {
+    read: {
+      names: {
+        'class': 'className',
+        'for':   'htmlFor'
+      },
+      values: {
+        _getAttr: function(element, attribute) {
+          return element.getAttribute(attribute, 2);
+        },
+        _getAttrNode: function(element, attribute) {
+          var node = element.getAttributeNode(attribute);
+          return node ? node.value : "";
+        },
+        _getEv: function(element, attribute) {
+          attribute = element.getAttribute(attribute);
+          return attribute ? attribute.toString().slice(23, -2) : null;
+        },
+        _flag: function(element, attribute) {
+          return $(element).hasAttribute(attribute) ? attribute : null;
+        },
+        style: function(element) {
+          return element.style.cssText.toLowerCase();
+        },
+        title: function(element) {
+          return element.title;
+        }
+      }
+    }
+  };
+
+  Element._attributeTranslations.write = {
+    names: Object.clone(Element._attributeTranslations.read.names),
+    values: {
+      checked: function(element, value) {
+        element.checked = !!value;
+      },
+
+      style: function(element, value) {
+        element.style.cssText = value ? value : '';
+      }
+    }
+  };
+
+  Element._attributeTranslations.has = {};
+
+  $w('colSpan rowSpan vAlign dateTime accessKey tabIndex ' +
+      'encType maxLength readOnly longDesc').each(function(attr) {
+    Element._attributeTranslations.write.names[attr.toLowerCase()] = attr;
+    Element._attributeTranslations.has[attr.toLowerCase()] = attr;
+  });
+
+  (function(v) {
+    Object.extend(v, {
+      href:        v._getAttr,
+      src:         v._getAttr,
+      type:        v._getAttr,
+      action:      v._getAttrNode,
+      disabled:    v._flag,
+      checked:     v._flag,
+      readonly:    v._flag,
+      multiple:    v._flag,
+      onload:      v._getEv,
+      onunload:    v._getEv,
+      onclick:     v._getEv,
+      ondblclick:  v._getEv,
+      onmousedown: v._getEv,
+      onmouseup:   v._getEv,
+      onmouseover: v._getEv,
+      onmousemove: v._getEv,
+      onmouseout:  v._getEv,
+      onfocus:     v._getEv,
+      onblur:      v._getEv,
+      onkeypress:  v._getEv,
+      onkeydown:   v._getEv,
+      onkeyup:     v._getEv,
+      onsubmit:    v._getEv,
+      onreset:     v._getEv,
+      onselect:    v._getEv,
+      onchange:    v._getEv
+    });
+  })(Element._attributeTranslations.read.values);
+}
+
+else if (Prototype.Browser.Gecko && /rv:1\.8\.0/.test(navigator.userAgent)) {
+  Element.Methods.setOpacity = function(element, value) {
+    element = $(element);
+    element.style.opacity = (value == 1) ? 0.999999 :
+      (value === '') ? '' : (value < 0.00001) ? 0 : value;
+    return element;
+  };
+}
+
+else if (Prototype.Browser.WebKit) {
+  Element.Methods.setOpacity = function(element, value) {
+    element = $(element);
+    element.style.opacity = (value == 1 || value === '') ? '' :
+      (value < 0.00001) ? 0 : value;
+
+    if (value == 1)
+      if(element.tagName == 'IMG' && element.width) {
+        element.width++; element.width--;
+      } else try {
+        var n = document.createTextNode(' ');
+        element.appendChild(n);
+        element.removeChild(n);
+      } catch (e) { }
+
+    return element;
+  };
+
+  // Safari returns margins on body which is incorrect if the child is absolutely
+  // positioned.  For performance reasons, redefine Element#cumulativeOffset for
+  // KHTML/WebKit only.
+  Element.Methods.cumulativeOffset = function(element) {
+    var valueT = 0, valueL = 0;
+    do {
+      valueT += element.offsetTop  || 0;
+      valueL += element.offsetLeft || 0;
+      if (element.offsetParent == document.body)
+        if (Element.getStyle(element, 'position') == 'absolute') break;
+
+      element = element.offsetParent;
+    } while (element);
+
+    return Element._returnOffset(valueL, valueT);
+  };
+}
+
+if (Prototype.Browser.IE || Prototype.Browser.Opera) {
+  // IE and Opera are missing .innerHTML support for TABLE-related and SELECT elements
+  Element.Methods.update = function(element, content) {
+    element = $(element);
+
+    if (content && content.toElement) content = content.toElement();
+    if (Object.isElement(content)) return element.update().insert(content);
+
+    content = Object.toHTML(content);
+    var tagName = element.tagName.toUpperCase();
+
+    if (tagName in Element._insertionTranslations.tags) {
+      $A(element.childNodes).each(function(node) { element.removeChild(node) });
+      Element._getContentFromAnonymousElement(tagName, content.stripScripts())
+        .each(function(node) { element.appendChild(node) });
+    }
+    else element.innerHTML = content.stripScripts();
+
+    content.evalScripts.bind(content).defer();
+    return element;
+  };
+}
+
+if (document.createElement('div').outerHTML) {
+  Element.Methods.replace = function(element, content) {
+    element = $(element);
+
+    if (content && content.toElement) content = content.toElement();
+    if (Object.isElement(content)) {
+      element.parentNode.replaceChild(content, element);
+      return element;
+    }
+
+    content = Object.toHTML(content);
+    var parent = element.parentNode, tagName = parent.tagName.toUpperCase();
+
+    if (Element._insertionTranslations.tags[tagName]) {
+      var nextSibling = element.next();
+      var fragments = Element._getContentFromAnonymousElement(tagName, content.stripScripts());
+      parent.removeChild(element);
+      if (nextSibling)
+        fragments.each(function(node) { parent.insertBefore(node, nextSibling) });
+      else
+        fragments.each(function(node) { parent.appendChild(node) });
+    }
+    else element.outerHTML = content.stripScripts();
+
+    content.evalScripts.bind(content).defer();
+    return element;
+  };
+}
+
+Element._returnOffset = function(l, t) {
+  var result = [l, t];
+  result.left = l;
+  result.top = t;
+  return result;
+};
+
+Element._getContentFromAnonymousElement = function(tagName, html) {
+  var div = new Element('div'), t = Element._insertionTranslations.tags[tagName];
+  div.innerHTML = t[0] + html + t[1];
+  t[2].times(function() { div = div.firstChild });
+  return $A(div.childNodes);
+};
+
+Element._insertionTranslations = {
+  before: {
+    adjacency: 'beforeBegin',
+    insert: function(element, node) {
+      element.parentNode.insertBefore(node, element);
+    },
+    initializeRange: function(element, range) {
+      range.setStartBefore(element);
+    }
+  },
+  top: {
+    adjacency: 'afterBegin',
+    insert: function(element, node) {
+      element.insertBefore(node, element.firstChild);
+    },
+    initializeRange: function(element, range) {
+      range.selectNodeContents(element);
+      range.collapse(true);
+    }
+  },
+  bottom: {
+    adjacency: 'beforeEnd',
+    insert: function(element, node) {
+      element.appendChild(node);
+    }
+  },
+  after: {
+    adjacency: 'afterEnd',
+    insert: function(element, node) {
+      element.parentNode.insertBefore(node, element.nextSibling);
+    },
+    initializeRange: function(element, range) {
+      range.setStartAfter(element);
+    }
+  },
+  tags: {
+    TABLE:  ['<table>',                '</table>',                   1],
+    TBODY:  ['<table><tbody>',         '</tbody></table>',           2],
+    TR:     ['<table><tbody><tr>',     '</tr></tbody></table>',      3],
+    TD:     ['<table><tbody><tr><td>', '</td></tr></tbody></table>', 4],
+    SELECT: ['<select>',               '</select>',                  1]
+  }
+};
+
+(function() {
+  this.bottom.initializeRange = this.top.initializeRange;
+  Object.extend(this.tags, {
+    THEAD: this.tags.TBODY,
+    TFOOT: this.tags.TBODY,
+    TH:    this.tags.TD
+  });
+}).call(Element._insertionTranslations);
+
+Element.Methods.Simulated = {
+  hasAttribute: function(element, attribute) {
+    attribute = Element._attributeTranslations.has[attribute] || attribute;
+    var node = $(element).getAttributeNode(attribute);
+    return node && node.specified;
+  }
+};
+
+Element.Methods.ByTag = { };
+
+Object.extend(Element, Element.Methods);
+
+if (!Prototype.BrowserFeatures.ElementExtensions &&
+    document.createElement('div').__proto__) {
+  window.HTMLElement = { };
+  window.HTMLElement.prototype = document.createElement('div').__proto__;
+  Prototype.BrowserFeatures.ElementExtensions = true;
+}
+
+Element.extend = (function() {
+  if (Prototype.BrowserFeatures.SpecificElementExtensions)
+    return Prototype.K;
+
+  var Methods = { }, ByTag = Element.Methods.ByTag;
+
+  var extend = Object.extend(function(element) {
+    if (!element || element._extendedByPrototype ||
+        element.nodeType != 1 || element == window) return element;
+
+    var methods = Object.clone(Methods),
+      tagName = element.tagName, property, value;
+
+    // extend methods for specific tags
+    if (ByTag[tagName]) Object.extend(methods, ByTag[tagName]);
+
+    for (property in methods) {
+      value = methods[property];
+      if (Object.isFunction(value) && !(property in element))
+        element[property] = value.methodize();
+    }
+
+    element._extendedByPrototype = Prototype.emptyFunction;
+    return element;
+
+  }, {
+    refresh: function() {
+      // extend methods for all tags (Safari doesn't need this)
+      if (!Prototype.BrowserFeatures.ElementExtensions) {
+        Object.extend(Methods, Element.Methods);
+        Object.extend(Methods, Element.Methods.Simulated);
+      }
+    }
+  });
+
+  extend.refresh();
+  return extend;
+})();
+
+Element.hasAttribute = function(element, attribute) {
+  if (element.hasAttribute) return element.hasAttribute(attribute);
+  return Element.Methods.Simulated.hasAttribute(element, attribute);
+};
+
 Element.addMethods = function(methods) {
-  Object.extend(Element.Methods, methods || {});
+  var F = Prototype.BrowserFeatures, T = Element.Methods.ByTag;
+
+  if (!methods) {
+    Object.extend(Form, Form.Methods);
+    Object.extend(Form.Element, Form.Element.Methods);
+    Object.extend(Element.Methods.ByTag, {
+      "FORM":     Object.clone(Form.Methods),
+      "INPUT":    Object.clone(Form.Element.Methods),
+      "SELECT":   Object.clone(Form.Element.Methods),
+      "TEXTAREA": Object.clone(Form.Element.Methods)
+    });
+  }
+
+  if (arguments.length == 2) {
+    var tagName = methods;
+    methods = arguments[1];
+  }
+
+  if (!tagName) Object.extend(Element.Methods, methods || { });
+  else {
+    if (Object.isArray(tagName)) tagName.each(extend);
+    else extend(tagName);
+  }
+
+  function extend(tagName) {
+    tagName = tagName.toUpperCase();
+    if (!Element.Methods.ByTag[tagName])
+      Element.Methods.ByTag[tagName] = { };
+    Object.extend(Element.Methods.ByTag[tagName], methods);
+  }
 
   function copy(methods, destination, onlyIfAbsent) {
     onlyIfAbsent = onlyIfAbsent || false;
-    var cache = Element.extend.cache;
     for (var property in methods) {
       var value = methods[property];
+      if (!Object.isFunction(value)) continue;
       if (!onlyIfAbsent || !(property in destination))
-        destination[property] = cache.findOrStore(value);
+        destination[property] = value.methodize();
     }
   }
 
-  if (typeof HTMLElement != 'undefined') {
+  function findDOMClass(tagName) {
+    var klass;
+    var trans = {
+      "OPTGROUP": "OptGroup", "TEXTAREA": "TextArea", "P": "Paragraph",
+      "FIELDSET": "FieldSet", "UL": "UList", "OL": "OList", "DL": "DList",
+      "DIR": "Directory", "H1": "Heading", "H2": "Heading", "H3": "Heading",
+      "H4": "Heading", "H5": "Heading", "H6": "Heading", "Q": "Quote",
+      "INS": "Mod", "DEL": "Mod", "A": "Anchor", "IMG": "Image", "CAPTION":
+      "TableCaption", "COL": "TableCol", "COLGROUP": "TableCol", "THEAD":
+      "TableSection", "TFOOT": "TableSection", "TBODY": "TableSection", "TR":
+      "TableRow", "TH": "TableCell", "TD": "TableCell", "FRAMESET":
+      "FrameSet", "IFRAME": "IFrame"
+    };
+    if (trans[tagName]) klass = 'HTML' + trans[tagName] + 'Element';
+    if (window[klass]) return window[klass];
+    klass = 'HTML' + tagName + 'Element';
+    if (window[klass]) return window[klass];
+    klass = 'HTML' + tagName.capitalize() + 'Element';
+    if (window[klass]) return window[klass];
+
+    window[klass] = { };
+    window[klass].prototype = document.createElement(tagName).__proto__;
+    return window[klass];
+  }
+
+  if (F.ElementExtensions) {
     copy(Element.Methods, HTMLElement.prototype);
     copy(Element.Methods.Simulated, HTMLElement.prototype, true);
-    copy(Form.Methods, HTMLFormElement.prototype);
-    [HTMLInputElement, HTMLTextAreaElement, HTMLSelectElement].each(function(klass) {
-      copy(Form.Element.Methods, klass.prototype);
-    });
-    _nativeExtensions = true;
   }
+
+  if (F.SpecificElementExtensions) {
+    for (var tag in Element.Methods.ByTag) {
+      var klass = findDOMClass(tag);
+      if (Object.isUndefined(klass)) continue;
+      copy(T[tag], klass.prototype);
+    }
+  }
+
+  Object.extend(Element, Element.Methods);
+  delete Element.ByTag;
+
+  if (Element.extend.refresh) Element.extend.refresh();
+  Element.cache = { };
+};
+
+document.viewport = {
+  getDimensions: function() {
+    var dimensions = { };
+    var B = Prototype.Browser;
+    $w('width height').each(function(d) {
+      var D = d.capitalize();
+      dimensions[d] = (B.WebKit && !document.evaluate) ? self['inner' + D] :
+        (B.Opera) ? document.body['client' + D] : document.documentElement['client' + D];
+    });
+    return dimensions;
+  },
+
+  getWidth: function() {
+    return this.getDimensions().width;
+  },
+
+  getHeight: function() {
+    return this.getDimensions().height;
+  },
+
+  getScrollOffsets: function() {
+    return Element._returnOffset(
+      window.pageXOffset || document.documentElement.scrollLeft || document.body.scrollLeft,
+      window.pageYOffset || document.documentElement.scrollTop || document.body.scrollTop);
+  }
+};
+/* Portions of the Selector class are derived from Jack Slocum’s DomQuery,
+ * part of YUI-Ext version 0.40, distributed under the terms of an MIT-style
+ * license.  Please see http://www.yui-ext.com/ for more information. */
+
+var Selector = Class.create({
+  initialize: function(expression) {
+    this.expression = expression.strip();
+    this.compileMatcher();
+  },
+
+  shouldUseXPath: function() {
+    if (!Prototype.BrowserFeatures.XPath) return false;
+
+    var e = this.expression;
+
+    // Safari 3 chokes on :*-of-type and :empty
+    if (Prototype.Browser.WebKit &&
+     (e.include("-of-type") || e.include(":empty")))
+      return false;
+
+    // XPath can't do namespaced attributes, nor can it read
+    // the "checked" property from DOM nodes
+    if ((/(\[[\w-]*?:|:checked)/).test(this.expression))
+      return false;
+
+    return true;
+  },
+
+  compileMatcher: function() {
+    if (this.shouldUseXPath())
+      return this.compileXPathMatcher();
+
+    var e = this.expression, ps = Selector.patterns, h = Selector.handlers,
+        c = Selector.criteria, le, p, m;
+
+    if (Selector._cache[e]) {
+      this.matcher = Selector._cache[e];
+      return;
+    }
+
+    this.matcher = ["this.matcher = function(root) {",
+                    "var r = root, h = Selector.handlers, c = false, n;"];
+
+    while (e && le != e && (/\S/).test(e)) {
+      le = e;
+      for (var i in ps) {
+        p = ps[i];
+        if (m = e.match(p)) {
+          this.matcher.push(Object.isFunction(c[i]) ? c[i](m) :
+    	      new Template(c[i]).evaluate(m));
+          e = e.replace(m[0], '');
+          break;
+        }
+      }
+    }
+
+    this.matcher.push("return h.unique(n);\n}");
+    eval(this.matcher.join('\n'));
+    Selector._cache[this.expression] = this.matcher;
+  },
+
+  compileXPathMatcher: function() {
+    var e = this.expression, ps = Selector.patterns,
+        x = Selector.xpath, le, m;
+
+    if (Selector._cache[e]) {
+      this.xpath = Selector._cache[e]; return;
+    }
+
+    this.matcher = ['.//*'];
+    while (e && le != e && (/\S/).test(e)) {
+      le = e;
+      for (var i in ps) {
+        if (m = e.match(ps[i])) {
+          this.matcher.push(Object.isFunction(x[i]) ? x[i](m) :
+            new Template(x[i]).evaluate(m));
+          e = e.replace(m[0], '');
+          break;
+        }
+      }
+    }
+
+    this.xpath = this.matcher.join('');
+    Selector._cache[this.expression] = this.xpath;
+  },
+
+  findElements: function(root) {
+    root = root || document;
+    if (this.xpath) return document._getElementsByXPath(this.xpath, root);
+    return this.matcher(root);
+  },
+
+  match: function(element) {
+    this.tokens = [];
+
+    var e = this.expression, ps = Selector.patterns, as = Selector.assertions;
+    var le, p, m;
+
+    while (e && le !== e && (/\S/).test(e)) {
+      le = e;
+      for (var i in ps) {
+        p = ps[i];
+        if (m = e.match(p)) {
+          // use the Selector.assertions methods unless the selector
+          // is too complex.
+          if (as[i]) {
+            this.tokens.push([i, Object.clone(m)]);
+            e = e.replace(m[0], '');
+          } else {
+            // reluctantly do a document-wide search
+            // and look for a match in the array
+            return this.findElements(document).include(element);
+          }
+        }
+      }
+    }
+
+    var match = true, name, matches;
+    for (var i = 0, token; token = this.tokens[i]; i++) {
+      name = token[0], matches = token[1];
+      if (!Selector.assertions[name](element, matches)) {
+        match = false; break;
+      }
+    }
+
+    return match;
+  },
+
+  toString: function() {
+    return this.expression;
+  },
+
+  inspect: function() {
+    return "#<Selector:" + this.expression.inspect() + ">";
+  }
+});
+
+Object.extend(Selector, {
+  _cache: { },
+
+  xpath: {
+    descendant:   "//*",
+    child:        "/*",
+    adjacent:     "/following-sibling::*[1]",
+    laterSibling: '/following-sibling::*',
+    tagName:      function(m) {
+      if (m[1] == '*') return '';
+      return "[local-name()='" + m[1].toLowerCase() +
+             "' or local-name()='" + m[1].toUpperCase() + "']";
+    },
+    className:    "[contains(concat(' ', @class, ' '), ' #{1} ')]",
+    id:           "[@id='#{1}']",
+    attrPresence: function(m) {
+      m[1] = m[1].toLowerCase();
+      return new Template("[@#{1}]").evaluate(m);
+    },
+    attr: function(m) {
+      m[1] = m[1].toLowerCase();
+      m[3] = m[5] || m[6];
+      return new Template(Selector.xpath.operators[m[2]]).evaluate(m);
+    },
+    pseudo: function(m) {
+      var h = Selector.xpath.pseudos[m[1]];
+      if (!h) return '';
+      if (Object.isFunction(h)) return h(m);
+      return new Template(Selector.xpath.pseudos[m[1]]).evaluate(m);
+    },
+    operators: {
+      '=':  "[@#{1}='#{3}']",
+      '!=': "[@#{1}!='#{3}']",
+      '^=': "[starts-with(@#{1}, '#{3}')]",
+      '$=': "[substring(@#{1}, (string-length(@#{1}) - string-length('#{3}') + 1))='#{3}']",
+      '*=': "[contains(@#{1}, '#{3}')]",
+      '~=': "[contains(concat(' ', @#{1}, ' '), ' #{3} ')]",
+      '|=': "[contains(concat('-', @#{1}, '-'), '-#{3}-')]"
+    },
+    pseudos: {
+      'first-child': '[not(preceding-sibling::*)]',
+      'last-child':  '[not(following-sibling::*)]',
+      'only-child':  '[not(preceding-sibling::* or following-sibling::*)]',
+      'empty':       "[count(*) = 0 and (count(text()) = 0 or translate(text(), ' \t\r\n', '') = '')]",
+      'checked':     "[@checked]",
+      'disabled':    "[@disabled]",
+      'enabled':     "[not(@disabled)]",
+      'not': function(m) {
+        var e = m[6], p = Selector.patterns,
+            x = Selector.xpath, le, v;
+
+        var exclusion = [];
+        while (e && le != e && (/\S/).test(e)) {
+          le = e;
+          for (var i in p) {
+            if (m = e.match(p[i])) {
+              v = Object.isFunction(x[i]) ? x[i](m) : new Template(x[i]).evaluate(m);
+              exclusion.push("(" + v.substring(1, v.length - 1) + ")");
+              e = e.replace(m[0], '');
+              break;
+            }
+          }
+        }
+        return "[not(" + exclusion.join(" and ") + ")]";
+      },
+      'nth-child':      function(m) {
+        return Selector.xpath.pseudos.nth("(count(./preceding-sibling::*) + 1) ", m);
+      },
+      'nth-last-child': function(m) {
+        return Selector.xpath.pseudos.nth("(count(./following-sibling::*) + 1) ", m);
+      },
+      'nth-of-type':    function(m) {
+        return Selector.xpath.pseudos.nth("position() ", m);
+      },
+      'nth-last-of-type': function(m) {
+        return Selector.xpath.pseudos.nth("(last() + 1 - position()) ", m);
+      },
+      'first-of-type':  function(m) {
+        m[6] = "1"; return Selector.xpath.pseudos['nth-of-type'](m);
+      },
+      'last-of-type':   function(m) {
+        m[6] = "1"; return Selector.xpath.pseudos['nth-last-of-type'](m);
+      },
+      'only-of-type':   function(m) {
+        var p = Selector.xpath.pseudos; return p['first-of-type'](m) + p['last-of-type'](m);
+      },
+      nth: function(fragment, m) {
+        var mm, formula = m[6], predicate;
+        if (formula == 'even') formula = '2n+0';
+        if (formula == 'odd')  formula = '2n+1';
+        if (mm = formula.match(/^(\d+)$/)) // digit only
+          return '[' + fragment + "= " + mm[1] + ']';
+        if (mm = formula.match(/^(-?\d*)?n(([+-])(\d+))?/)) { // an+b
+          if (mm[1] == "-") mm[1] = -1;
+          var a = mm[1] ? Number(mm[1]) : 1;
+          var b = mm[2] ? Number(mm[2]) : 0;
+          predicate = "[((#{fragment} - #{b}) mod #{a} = 0) and " +
+          "((#{fragment} - #{b}) div #{a} >= 0)]";
+          return new Template(predicate).evaluate({
+            fragment: fragment, a: a, b: b });
+        }
+      }
+    }
+  },
+
+  criteria: {
+    tagName:      'n = h.tagName(n, r, "#{1}", c);   c = false;',
+    className:    'n = h.className(n, r, "#{1}", c); c = false;',
+    id:           'n = h.id(n, r, "#{1}", c);        c = false;',
+    attrPresence: 'n = h.attrPresence(n, r, "#{1}"); c = false;',
+    attr: function(m) {
+      m[3] = (m[5] || m[6]);
+      return new Template('n = h.attr(n, r, "#{1}", "#{3}", "#{2}"); c = false;').evaluate(m);
+    },
+    pseudo: function(m) {
+      if (m[6]) m[6] = m[6].replace(/"/g, '\\"');
+      return new Template('n = h.pseudo(n, "#{1}", "#{6}", r, c); c = false;').evaluate(m);
+    },
+    descendant:   'c = "descendant";',
+    child:        'c = "child";',
+    adjacent:     'c = "adjacent";',
+    laterSibling: 'c = "laterSibling";'
+  },
+
+  patterns: {
+    // combinators must be listed first
+    // (and descendant needs to be last combinator)
+    laterSibling: /^\s*~\s*/,
+    child:        /^\s*>\s*/,
+    adjacent:     /^\s*\+\s*/,
+    descendant:   /^\s/,
+
+    // selectors follow
+    tagName:      /^\s*(\*|[\w\-]+)(\b|$)?/,
+    id:           /^#([\w\-\*]+)(\b|$)/,
+    className:    /^\.([\w\-\*]+)(\b|$)/,
+    pseudo:       /^:((first|last|nth|nth-last|only)(-child|-of-type)|empty|checked|(en|dis)abled|not)(\((.*?)\))?(\b|$|(?=\s)|(?=:))/,
+    attrPresence: /^\[([\w]+)\]/,
+    attr:         /\[((?:[\w-]*:)?[\w-]+)\s*(?:([!^$*~|]?=)\s*((['"])([^\4]*?)\4|([^'"][^\]]*?)))?\]/
+  },
+
+  // for Selector.match and Element#match
+  assertions: {
+    tagName: function(element, matches) {
+      return matches[1].toUpperCase() == element.tagName.toUpperCase();
+    },
+
+    className: function(element, matches) {
+      return Element.hasClassName(element, matches[1]);
+    },
+
+    id: function(element, matches) {
+      return element.id === matches[1];
+    },
+
+    attrPresence: function(element, matches) {
+      return Element.hasAttribute(element, matches[1]);
+    },
+
+    attr: function(element, matches) {
+      var nodeValue = Element.readAttribute(element, matches[1]);
+      return Selector.operators[matches[2]](nodeValue, matches[3]);
+    }
+  },
+
+  handlers: {
+    // UTILITY FUNCTIONS
+    // joins two collections
+    concat: function(a, b) {
+      for (var i = 0, node; node = b[i]; i++)
+        a.push(node);
+      return a;
+    },
+
+    // marks an array of nodes for counting
+    mark: function(nodes) {
+      for (var i = 0, node; node = nodes[i]; i++)
+        node._counted = true;
+      return nodes;
+    },
+
+    unmark: function(nodes) {
+      for (var i = 0, node; node = nodes[i]; i++)
+        node._counted = undefined;
+      return nodes;
+    },
+
+    // mark each child node with its position (for nth calls)
+    // "ofType" flag indicates whether we're indexing for nth-of-type
+    // rather than nth-child
+    index: function(parentNode, reverse, ofType) {
+      parentNode._counted = true;
+      if (reverse) {
+        for (var nodes = parentNode.childNodes, i = nodes.length - 1, j = 1; i >= 0; i--) {
+          var node = nodes[i];
+          if (node.nodeType == 1 && (!ofType || node._counted)) node.nodeIndex = j++;
+        }
+      } else {
+        for (var i = 0, j = 1, nodes = parentNode.childNodes; node = nodes[i]; i++)
+          if (node.nodeType == 1 && (!ofType || node._counted)) node.nodeIndex = j++;
+      }
+    },
+
+    // filters out duplicates and extends all nodes
+    unique: function(nodes) {
+      if (nodes.length == 0) return nodes;
+      var results = [], n;
+      for (var i = 0, l = nodes.length; i < l; i++)
+        if (!(n = nodes[i])._counted) {
+          n._counted = true;
+          results.push(Element.extend(n));
+        }
+      return Selector.handlers.unmark(results);
+    },
+
+    // COMBINATOR FUNCTIONS
+    descendant: function(nodes) {
+      var h = Selector.handlers;
+      for (var i = 0, results = [], node; node = nodes[i]; i++)
+        h.concat(results, node.getElementsByTagName('*'));
+      return results;
+    },
+
+    child: function(nodes) {
+      var h = Selector.handlers;
+      for (var i = 0, results = [], node; node = nodes[i]; i++) {
+        for (var j = 0, child; child = node.childNodes[j]; j++)
+          if (child.nodeType == 1 && child.tagName != '!') results.push(child);
+      }
+      return results;
+    },
+
+    adjacent: function(nodes) {
+      for (var i = 0, results = [], node; node = nodes[i]; i++) {
+        var next = this.nextElementSibling(node);
+        if (next) results.push(next);
+      }
+      return results;
+    },
+
+    laterSibling: function(nodes) {
+      var h = Selector.handlers;
+      for (var i = 0, results = [], node; node = nodes[i]; i++)
+        h.concat(results, Element.nextSiblings(node));
+      return results;
+    },
+
+    nextElementSibling: function(node) {
+      while (node = node.nextSibling)
+	      if (node.nodeType == 1) return node;
+      return null;
+    },
+
+    previousElementSibling: function(node) {
+      while (node = node.previousSibling)
+        if (node.nodeType == 1) return node;
+      return null;
+    },
+
+    // TOKEN FUNCTIONS
+    tagName: function(nodes, root, tagName, combinator) {
+      tagName = tagName.toUpperCase();
+      var results = [], h = Selector.handlers;
+      if (nodes) {
+        if (combinator) {
+          // fastlane for ordinary descendant combinators
+          if (combinator == "descendant") {
+            for (var i = 0, node; node = nodes[i]; i++)
+              h.concat(results, node.getElementsByTagName(tagName));
+            return results;
+          } else nodes = this[combinator](nodes);
+          if (tagName == "*") return nodes;
+        }
+        for (var i = 0, node; node = nodes[i]; i++)
+          if (node.tagName.toUpperCase() == tagName) results.push(node);
+        return results;
+      } else return root.getElementsByTagName(tagName);
+    },
+
+    id: function(nodes, root, id, combinator) {
+      var targetNode = $(id), h = Selector.handlers;
+      if (!targetNode) return [];
+      if (!nodes && root == document) return [targetNode];
+      if (nodes) {
+        if (combinator) {
+          if (combinator == 'child') {
+            for (var i = 0, node; node = nodes[i]; i++)
+              if (targetNode.parentNode == node) return [targetNode];
+          } else if (combinator == 'descendant') {
+            for (var i = 0, node; node = nodes[i]; i++)
+              if (Element.descendantOf(targetNode, node)) return [targetNode];
+          } else if (combinator == 'adjacent') {
+            for (var i = 0, node; node = nodes[i]; i++)
+              if (Selector.handlers.previousElementSibling(targetNode) == node)
+                return [targetNode];
+          } else nodes = h[combinator](nodes);
+        }
+        for (var i = 0, node; node = nodes[i]; i++)
+          if (node == targetNode) return [targetNode];
+        return [];
+      }
+      return (targetNode && Element.descendantOf(targetNode, root)) ? [targetNode] : [];
+    },
+
+    className: function(nodes, root, className, combinator) {
+      if (nodes && combinator) nodes = this[combinator](nodes);
+      return Selector.handlers.byClassName(nodes, root, className);
+    },
+
+    byClassName: function(nodes, root, className) {
+      if (!nodes) nodes = Selector.handlers.descendant([root]);
+      var needle = ' ' + className + ' ';
+      for (var i = 0, results = [], node, nodeClassName; node = nodes[i]; i++) {
+        nodeClassName = node.className;
+        if (nodeClassName.length == 0) continue;
+        if (nodeClassName == className || (' ' + nodeClassName + ' ').include(needle))
+          results.push(node);
+      }
+      return results;
+    },
+
+    attrPresence: function(nodes, root, attr) {
+      if (!nodes) nodes = root.getElementsByTagName("*");
+      var results = [];
+      for (var i = 0, node; node = nodes[i]; i++)
+        if (Element.hasAttribute(node, attr)) results.push(node);
+      return results;
+    },
+
+    attr: function(nodes, root, attr, value, operator) {
+      if (!nodes) nodes = root.getElementsByTagName("*");
+      var handler = Selector.operators[operator], results = [];
+      for (var i = 0, node; node = nodes[i]; i++) {
+        var nodeValue = Element.readAttribute(node, attr);
+        if (nodeValue === null) continue;
+        if (handler(nodeValue, value)) results.push(node);
+      }
+      return results;
+    },
+
+    pseudo: function(nodes, name, value, root, combinator) {
+      if (nodes && combinator) nodes = this[combinator](nodes);
+      if (!nodes) nodes = root.getElementsByTagName("*");
+      return Selector.pseudos[name](nodes, value, root);
+    }
+  },
+
+  pseudos: {
+    'first-child': function(nodes, value, root) {
+      for (var i = 0, results = [], node; node = nodes[i]; i++) {
+        if (Selector.handlers.previousElementSibling(node)) continue;
+          results.push(node);
+      }
+      return results;
+    },
+    'last-child': function(nodes, value, root) {
+      for (var i = 0, results = [], node; node = nodes[i]; i++) {
+        if (Selector.handlers.nextElementSibling(node)) continue;
+          results.push(node);
+      }
+      return results;
+    },
+    'only-child': function(nodes, value, root) {
+      var h = Selector.handlers;
+      for (var i = 0, results = [], node; node = nodes[i]; i++)
+        if (!h.previousElementSibling(node) && !h.nextElementSibling(node))
+          results.push(node);
+      return results;
+    },
+    'nth-child':        function(nodes, formula, root) {
+      return Selector.pseudos.nth(nodes, formula, root);
+    },
+    'nth-last-child':   function(nodes, formula, root) {
+      return Selector.pseudos.nth(nodes, formula, root, true);
+    },
+    'nth-of-type':      function(nodes, formula, root) {
+      return Selector.pseudos.nth(nodes, formula, root, false, true);
+    },
+    'nth-last-of-type': function(nodes, formula, root) {
+      return Selector.pseudos.nth(nodes, formula, root, true, true);
+    },
+    'first-of-type':    function(nodes, formula, root) {
+      return Selector.pseudos.nth(nodes, "1", root, false, true);
+    },
+    'last-of-type':     function(nodes, formula, root) {
+      return Selector.pseudos.nth(nodes, "1", root, true, true);
+    },
+    'only-of-type':     function(nodes, formula, root) {
+      var p = Selector.pseudos;
+      return p['last-of-type'](p['first-of-type'](nodes, formula, root), formula, root);
+    },
+
+    // handles the an+b logic
+    getIndices: function(a, b, total) {
+      if (a == 0) return b > 0 ? [b] : [];
+      return $R(1, total).inject([], function(memo, i) {
+        if (0 == (i - b) % a && (i - b) / a >= 0) memo.push(i);
+        return memo;
+      });
+    },
+
+    // handles nth(-last)-child, nth(-last)-of-type, and (first|last)-of-type
+    nth: function(nodes, formula, root, reverse, ofType) {
+      if (nodes.length == 0) return [];
+      if (formula == 'even') formula = '2n+0';
+      if (formula == 'odd')  formula = '2n+1';
+      var h = Selector.handlers, results = [], indexed = [], m;
+      h.mark(nodes);
+      for (var i = 0, node; node = nodes[i]; i++) {
+        if (!node.parentNode._counted) {
+          h.index(node.parentNode, reverse, ofType);
+          indexed.push(node.parentNode);
+        }
+      }
+      if (formula.match(/^\d+$/)) { // just a number
+        formula = Number(formula);
+        for (var i = 0, node; node = nodes[i]; i++)
+          if (node.nodeIndex == formula) results.push(node);
+      } else if (m = formula.match(/^(-?\d*)?n(([+-])(\d+))?/)) { // an+b
+        if (m[1] == "-") m[1] = -1;
+        var a = m[1] ? Number(m[1]) : 1;
+        var b = m[2] ? Number(m[2]) : 0;
+        var indices = Selector.pseudos.getIndices(a, b, nodes.length);
+        for (var i = 0, node, l = indices.length; node = nodes[i]; i++) {
+          for (var j = 0; j < l; j++)
+            if (node.nodeIndex == indices[j]) results.push(node);
+        }
+      }
+      h.unmark(nodes);
+      h.unmark(indexed);
+      return results;
+    },
+
+    'empty': function(nodes, value, root) {
+      for (var i = 0, results = [], node; node = nodes[i]; i++) {
+        // IE treats comments as element nodes
+        if (node.tagName == '!' || (node.firstChild && !node.innerHTML.match(/^\s*$/))) continue;
+        results.push(node);
+      }
+      return results;
+    },
+
+    'not': function(nodes, selector, root) {
+      var h = Selector.handlers, selectorType, m;
+      var exclusions = new Selector(selector).findElements(root);
+      h.mark(exclusions);
+      for (var i = 0, results = [], node; node = nodes[i]; i++)
+        if (!node._counted) results.push(node);
+      h.unmark(exclusions);
+      return results;
+    },
+
+    'enabled': function(nodes, value, root) {
+      for (var i = 0, results = [], node; node = nodes[i]; i++)
+        if (!node.disabled) results.push(node);
+      return results;
+    },
+
+    'disabled': function(nodes, value, root) {
+      for (var i = 0, results = [], node; node = nodes[i]; i++)
+        if (node.disabled) results.push(node);
+      return results;
+    },
+
+    'checked': function(nodes, value, root) {
+      for (var i = 0, results = [], node; node = nodes[i]; i++)
+        if (node.checked) results.push(node);
+      return results;
+    }
+  },
+
+  operators: {
+    '=':  function(nv, v) { return nv == v; },
+    '!=': function(nv, v) { return nv != v; },
+    '^=': function(nv, v) { return nv.startsWith(v); },
+    '$=': function(nv, v) { return nv.endsWith(v); },
+    '*=': function(nv, v) { return nv.include(v); },
+    '~=': function(nv, v) { return (' ' + nv + ' ').include(' ' + v + ' '); },
+    '|=': function(nv, v) { return ('-' + nv.toUpperCase() + '-').include('-' + v.toUpperCase() + '-'); }
+  },
+
+  matchElements: function(elements, expression) {
+    var matches = new Selector(expression).findElements(), h = Selector.handlers;
+    h.mark(matches);
+    for (var i = 0, results = [], element; element = elements[i]; i++)
+      if (element._counted) results.push(element);
+    h.unmark(matches);
+    return results;
+  },
+
+  findElement: function(elements, expression, index) {
+    if (Object.isNumber(expression)) {
+      index = expression; expression = false;
+    }
+    return Selector.matchElements(elements, expression || '*')[index || 0];
+  },
+
+  findChildElements: function(element, expressions) {
+    var exprs = expressions.join(',');
+    expressions = [];
+    exprs.scan(/(([\w#:.~>+()\s-]+|\*|\[.*?\])+)\s*(,|$)/, function(m) {
+      expressions.push(m[1].strip());
+    });
+    var results = [], h = Selector.handlers;
+    for (var i = 0, l = expressions.length, selector; i < l; i++) {
+      selector = new Selector(expressions[i].strip());
+      h.concat(results, selector.findElements(element));
+    }
+    return (l > 1) ? h.unique(results) : results;
+  }
+});
+
+if (Prototype.Browser.IE) {
+  // IE returns comment nodes on getElementsByTagName("*").
+  // Filter them out.
+  Selector.handlers.concat = function(a, b) {
+    for (var i = 0, node; node = b[i]; i++)
+      if (node.tagName !== "!") a.push(node);
+    return a;
+  };
 }
 
-var Toggle = new Object();
-Toggle.display = Element.toggle;
+function $$() {
+  return Selector.findChildElements(document, $A(arguments));
+}
+var Form = {
+  reset: function(form) {
+    $(form).reset();
+    return form;
+  },
+
+  serializeElements: function(elements, options) {
+    if (typeof options != 'object') options = { hash: !!options };
+    else if (Object.isUndefined(options.hash)) options.hash = true;
+    var key, value, submitted = false, submit = options.submit;
+
+    var data = elements.inject({ }, function(result, element) {
+      if (!element.disabled && element.name) {
+        key = element.name; value = $(element).getValue();
+        if (value != null && (element.type != 'submit' || (!submitted &&
+            submit !== false && (!submit || key == submit) && (submitted = true)))) {
+          if (key in result) {
+            // a key is already present; construct an array of values
+            if (!Object.isArray(result[key])) result[key] = [result[key]];
+            result[key].push(value);
+          }
+          else result[key] = value;
+        }
+      }
+      return result;
+    });
+
+    return options.hash ? data : Object.toQueryString(data);
+  }
+};
+
+Form.Methods = {
+  serialize: function(form, options) {
+    return Form.serializeElements(Form.getElements(form), options);
+  },
+
+  getElements: function(form) {
+    return $A($(form).getElementsByTagName('*')).inject([],
+      function(elements, child) {
+        if (Form.Element.Serializers[child.tagName.toLowerCase()])
+          elements.push(Element.extend(child));
+        return elements;
+      }
+    );
+  },
+
+  getInputs: function(form, typeName, name) {
+    form = $(form);
+    var inputs = form.getElementsByTagName('input');
+
+    if (!typeName && !name) return $A(inputs).map(Element.extend);
+
+    for (var i = 0, matchingInputs = [], length = inputs.length; i < length; i++) {
+      var input = inputs[i];
+      if ((typeName && input.type != typeName) || (name && input.name != name))
+        continue;
+      matchingInputs.push(Element.extend(input));
+    }
+
+    return matchingInputs;
+  },
+
+  disable: function(form) {
+    form = $(form);
+    Form.getElements(form).invoke('disable');
+    return form;
+  },
+
+  enable: function(form) {
+    form = $(form);
+    Form.getElements(form).invoke('enable');
+    return form;
+  },
+
+  findFirstElement: function(form) {
+    var elements = $(form).getElements().findAll(function(element) {
+      return 'hidden' != element.type && !element.disabled;
+    });
+    var firstByIndex = elements.findAll(function(element) {
+      return element.hasAttribute('tabIndex') && element.tabIndex >= 0;
+    }).sortBy(function(element) { return element.tabIndex }).first();
+
+    return firstByIndex ? firstByIndex : elements.find(function(element) {
+      return ['input', 'select', 'textarea'].include(element.tagName.toLowerCase());
+    });
+  },
+
+  focusFirstElement: function(form) {
+    form = $(form);
+    form.findFirstElement().activate();
+    return form;
+  },
+
+  request: function(form, options) {
+    form = $(form), options = Object.clone(options || { });
+
+    var params = options.parameters, action = form.readAttribute('action') || '';
+    if (action.blank()) action = window.location.href;
+    options.parameters = form.serialize(true);
+
+    if (params) {
+      if (Object.isString(params)) params = params.toQueryParams();
+      Object.extend(options.parameters, params);
+    }
+
+    if (form.hasAttribute('method') && !options.method)
+      options.method = form.method;
+
+    return new Ajax.Request(action, options);
+  }
+};
 
 /*--------------------------------------------------------------------------*/
 
-Abstract.Insertion = function(adjacency) {
-  this.adjacency = adjacency;
-}
+Form.Element = {
+  focus: function(element) {
+    $(element).focus();
+    return element;
+  },
 
-Abstract.Insertion.prototype = {
-  initialize: function(element, content) {
-    this.element = $(element);
-    this.content = content.stripScripts();
+  select: function(element) {
+    $(element).select();
+    return element;
+  }
+};
 
-    if (this.adjacency && this.element.insertAdjacentHTML) {
-      try {
-        this.element.insertAdjacentHTML(this.adjacency, this.content);
-      } catch (e) {
-        var tagName = this.element.tagName.toUpperCase();
-        if (['TBODY', 'TR'].include(tagName)) {
-          this.insertContent(this.contentFromAnonymousTable()._reverse());
-        } else {
-          throw e;
-        }
+Form.Element.Methods = {
+  serialize: function(element) {
+    element = $(element);
+    if (!element.disabled && element.name) {
+      var value = element.getValue();
+      if (value != undefined) {
+        var pair = { };
+        pair[element.name] = value;
+        return Object.toQueryString(pair);
       }
+    }
+    return '';
+  },
+
+  getValue: function(element) {
+    element = $(element);
+    var method = element.tagName.toLowerCase();
+    return Form.Element.Serializers[method](element);
+  },
+
+  setValue: function(element, value) {
+    element = $(element);
+    var method = element.tagName.toLowerCase();
+    Form.Element.Serializers[method](element, value);
+    return element;
+  },
+
+  clear: function(element) {
+    $(element).value = '';
+    return element;
+  },
+
+  present: function(element) {
+    return $(element).value != '';
+  },
+
+  activate: function(element) {
+    element = $(element);
+    try {
+      element.focus();
+      if (element.select && (element.tagName.toLowerCase() != 'input' ||
+          !['button', 'reset', 'submit'].include(element.type)))
+        element.select();
+    } catch (e) { }
+    return element;
+  },
+
+  disable: function(element) {
+    element = $(element);
+    element.blur();
+    element.disabled = true;
+    return element;
+  },
+
+  enable: function(element) {
+    element = $(element);
+    element.disabled = false;
+    return element;
+  }
+};
+
+/*--------------------------------------------------------------------------*/
+
+var Field = Form.Element;
+var $F = Form.Element.Methods.getValue;
+
+/*--------------------------------------------------------------------------*/
+
+Form.Element.Serializers = {
+  input: function(element, value) {
+    switch (element.type.toLowerCase()) {
+      case 'checkbox':
+      case 'radio':
+        return Form.Element.Serializers.inputSelector(element, value);
+      default:
+        return Form.Element.Serializers.textarea(element, value);
+    }
+  },
+
+  inputSelector: function(element, value) {
+    if (Object.isUndefined(value)) return element.checked ? element.value : null;
+    else element.checked = !!value;
+  },
+
+  textarea: function(element, value) {
+    if (Object.isUndefined(value)) return element.value;
+    else element.value = value;
+  },
+
+  select: function(element, index) {
+    if (Object.isUndefined(index))
+      return this[element.type == 'select-one' ?
+        'selectOne' : 'selectMany'](element);
+    else {
+      var opt, value, single = !Object.isArray(index);
+      for (var i = 0, length = element.length; i < length; i++) {
+        opt = element.options[i];
+        value = this.optionValue(opt);
+        if (single) {
+          if (value == index) {
+            opt.selected = true;
+            return;
+          }
+        }
+        else opt.selected = index.include(value);
+      }
+    }
+  },
+
+  selectOne: function(element) {
+    var index = element.selectedIndex;
+    return index >= 0 ? this.optionValue(element.options[index]) : null;
+  },
+
+  selectMany: function(element) {
+    var values, length = element.length;
+    if (!length) return null;
+
+    for (var i = 0, values = []; i < length; i++) {
+      var opt = element.options[i];
+      if (opt.selected) values.push(this.optionValue(opt));
+    }
+    return values;
+  },
+
+  optionValue: function(opt) {
+    // extend element because hasAttribute may not be native
+    return Element.extend(opt).hasAttribute('value') ? opt.value : opt.text;
+  }
+};
+
+/*--------------------------------------------------------------------------*/
+
+Abstract.TimedObserver = Class.create(PeriodicalExecuter, {
+  initialize: function($super, element, frequency, callback) {
+    $super(callback, frequency);
+    this.element   = $(element);
+    this.lastValue = this.getValue();
+  },
+
+  execute: function() {
+    var value = this.getValue();
+    if (Object.isString(this.lastValue) && Object.isString(value) ?
+        this.lastValue != value : String(this.lastValue) != String(value)) {
+      this.callback(this.element, value);
+      this.lastValue = value;
+    }
+  }
+});
+
+Form.Element.Observer = Class.create(Abstract.TimedObserver, {
+  getValue: function() {
+    return Form.Element.getValue(this.element);
+  }
+});
+
+Form.Observer = Class.create(Abstract.TimedObserver, {
+  getValue: function() {
+    return Form.serialize(this.element);
+  }
+});
+
+/*--------------------------------------------------------------------------*/
+
+Abstract.EventObserver = Class.create({
+  initialize: function(element, callback) {
+    this.element  = $(element);
+    this.callback = callback;
+
+    this.lastValue = this.getValue();
+    if (this.element.tagName.toLowerCase() == 'form')
+      this.registerFormCallbacks();
+    else
+      this.registerCallback(this.element);
+  },
+
+  onElementEvent: function() {
+    var value = this.getValue();
+    if (this.lastValue != value) {
+      this.callback(this.element, value);
+      this.lastValue = value;
+    }
+  },
+
+  registerFormCallbacks: function() {
+    Form.getElements(this.element).each(this.registerCallback, this);
+  },
+
+  registerCallback: function(element) {
+    if (element.type) {
+      switch (element.type.toLowerCase()) {
+        case 'checkbox':
+        case 'radio':
+          Event.observe(element, 'click', this.onElementEvent.bind(this));
+          break;
+        default:
+          Event.observe(element, 'change', this.onElementEvent.bind(this));
+          break;
+      }
+    }
+  }
+});
+
+Form.Element.EventObserver = Class.create(Abstract.EventObserver, {
+  getValue: function() {
+    return Form.Element.getValue(this.element);
+  }
+});
+
+Form.EventObserver = Class.create(Abstract.EventObserver, {
+  getValue: function() {
+    return Form.serialize(this.element);
+  }
+});
+if (!window.Event) var Event = { };
+
+Object.extend(Event, {
+  KEY_BACKSPACE: 8,
+  KEY_TAB:       9,
+  KEY_RETURN:   13,
+  KEY_ESC:      27,
+  KEY_LEFT:     37,
+  KEY_UP:       38,
+  KEY_RIGHT:    39,
+  KEY_DOWN:     40,
+  KEY_DELETE:   46,
+  KEY_HOME:     36,
+  KEY_END:      35,
+  KEY_PAGEUP:   33,
+  KEY_PAGEDOWN: 34,
+  KEY_INSERT:   45,
+
+  cache: { },
+
+  relatedTarget: function(event) {
+    var element;
+    switch(event.type) {
+      case 'mouseover': element = event.fromElement; break;
+      case 'mouseout':  element = event.toElement;   break;
+      default: return null;
+    }
+    return Element.extend(element);
+  }
+});
+
+Event.Methods = (function() {
+  var isButton;
+
+  if (Prototype.Browser.IE) {
+    var buttonMap = { 0: 1, 1: 4, 2: 2 };
+    isButton = function(event, code) {
+      return event.button == buttonMap[code];
+    };
+
+  } else if (Prototype.Browser.WebKit) {
+    isButton = function(event, code) {
+      switch (code) {
+        case 0: return event.which == 1 && !event.metaKey;
+        case 1: return event.which == 1 && event.metaKey;
+        default: return false;
+      }
+    };
+
+  } else {
+    isButton = function(event, code) {
+      return event.which ? (event.which === code + 1) : (event.button === code);
+    };
+  }
+
+  return {
+    isLeftClick:   function(event) { return isButton(event, 0) },
+    isMiddleClick: function(event) { return isButton(event, 1) },
+    isRightClick:  function(event) { return isButton(event, 2) },
+
+    element: function(event) {
+      var node = Event.extend(event).target;
+      return Element.extend(node.nodeType == Node.TEXT_NODE ? node.parentNode : node);
+    },
+
+    findElement: function(event, expression) {
+      var element = Event.element(event);
+      if (!expression) return element;
+      var elements = [element].concat(element.ancestors());
+      return Selector.findElement(elements, expression, 0);
+    },
+
+    pointer: function(event) {
+      return {
+        x: event.pageX || (event.clientX +
+          (document.documentElement.scrollLeft || document.body.scrollLeft)),
+        y: event.pageY || (event.clientY +
+          (document.documentElement.scrollTop || document.body.scrollTop))
+      };
+    },
+
+    pointerX: function(event) { return Event.pointer(event).x },
+    pointerY: function(event) { return Event.pointer(event).y },
+
+    stop: function(event) {
+      Event.extend(event);
+      event.preventDefault();
+      event.stopPropagation();
+      event.stopped = true;
+    }
+  };
+})();
+
+Event.extend = (function() {
+  var methods = Object.keys(Event.Methods).inject({ }, function(m, name) {
+    m[name] = Event.Methods[name].methodize();
+    return m;
+  });
+
+  if (Prototype.Browser.IE) {
+    Object.extend(methods, {
+      stopPropagation: function() { this.cancelBubble = true },
+      preventDefault:  function() { this.returnValue = false },
+      inspect: function() { return "[object Event]" }
+    });
+
+    return function(event) {
+      if (!event) return false;
+      if (event._extendedByPrototype) return event;
+
+      event._extendedByPrototype = Prototype.emptyFunction;
+      var pointer = Event.pointer(event);
+      Object.extend(event, {
+        target: event.srcElement,
+        relatedTarget: Event.relatedTarget(event),
+        pageX:  pointer.x,
+        pageY:  pointer.y
+      });
+      return Object.extend(event, methods);
+    };
+
+  } else {
+    Event.prototype = Event.prototype || document.createEvent("HTMLEvents").__proto__;
+    Object.extend(Event.prototype, methods);
+    return Prototype.K;
+  }
+})();
+
+Object.extend(Event, (function() {
+  var cache = Event.cache;
+
+  function getEventID(element) {
+    if (element._eventID) return element._eventID;
+    arguments.callee.id = arguments.callee.id || 1;
+    return element._eventID = ++arguments.callee.id;
+  }
+
+  function getDOMEventName(eventName) {
+    if (eventName && eventName.include(':')) return "dataavailable";
+    return eventName;
+  }
+
+  function getCacheForID(id) {
+    return cache[id] = cache[id] || { };
+  }
+
+  function getWrappersForEventName(id, eventName) {
+    var c = getCacheForID(id);
+    return c[eventName] = c[eventName] || [];
+  }
+
+  function createWrapper(element, eventName, handler) {
+    var id = getEventID(element);
+    var c = getWrappersForEventName(id, eventName);
+    if (c.pluck("handler").include(handler)) return false;
+
+    var wrapper = function(event) {
+      if (!Event || !Event.extend ||
+        (event.eventName && event.eventName != eventName))
+          return false;
+
+      Event.extend(event);
+      handler.call(element, event)
+    };
+
+    wrapper.handler = handler;
+    c.push(wrapper);
+    return wrapper;
+  }
+
+  function findWrapper(id, eventName, handler) {
+    var c = getWrappersForEventName(id, eventName);
+    return c.find(function(wrapper) { return wrapper.handler == handler });
+  }
+
+  function destroyWrapper(id, eventName, handler) {
+    var c = getCacheForID(id);
+    if (!c[eventName]) return false;
+    c[eventName] = c[eventName].without(findWrapper(id, eventName, handler));
+  }
+
+  function destroyCache() {
+    for (var id in cache)
+      for (var eventName in cache[id])
+        cache[id][eventName] = null;
+  }
+
+  if (window.attachEvent) {
+    window.attachEvent("onunload", destroyCache);
+  }
+
+  return {
+    observe: function(element, eventName, handler) {
+      element = $(element);
+      var name = getDOMEventName(eventName);
+
+      var wrapper = createWrapper(element, eventName, handler);
+      if (!wrapper) return element;
+
+      if (element.addEventListener) {
+        element.addEventListener(name, wrapper, false);
+      } else {
+        element.attachEvent("on" + name, wrapper);
+      }
+
+      return element;
+    },
+
+    stopObserving: function(element, eventName, handler) {
+      element = $(element);
+      var id = getEventID(element), name = getDOMEventName(eventName);
+
+      if (!handler && eventName) {
+        getWrappersForEventName(id, eventName).each(function(wrapper) {
+          element.stopObserving(eventName, wrapper.handler);
+        });
+        return element;
+
+      } else if (!eventName) {
+        Object.keys(getCacheForID(id)).each(function(eventName) {
+          element.stopObserving(eventName);
+        });
+        return element;
+      }
+
+      var wrapper = findWrapper(id, eventName, handler);
+      if (!wrapper) return element;
+
+      if (element.removeEventListener) {
+        element.removeEventListener(name, wrapper, false);
+      } else {
+        element.detachEvent("on" + name, wrapper);
+      }
+
+      destroyWrapper(id, eventName, handler);
+
+      return element;
+    },
+
+    fire: function(element, eventName, memo) {
+      element = $(element);
+      if (element == document && document.createEvent && !element.dispatchEvent)
+        element = document.documentElement;
+
+      if (document.createEvent) {
+        var event = document.createEvent("HTMLEvents");
+        event.initEvent("dataavailable", true, true);
+      } else {
+        var event = document.createEventObject();
+        event.eventType = "ondataavailable";
+      }
+
+      event.eventName = eventName;
+      event.memo = memo || { };
+
+      if (document.createEvent) {
+        element.dispatchEvent(event);
+      } else {
+        element.fireEvent(event.eventType, event);
+      }
+
+      return Event.extend(event);
+    }
+  };
+})());
+
+Object.extend(Event, Event.Methods);
+
+Element.addMethods({
+  fire:          Event.fire,
+  observe:       Event.observe,
+  stopObserving: Event.stopObserving
+});
+
+Object.extend(document, {
+  fire:          Element.Methods.fire.methodize(),
+  observe:       Element.Methods.observe.methodize(),
+  stopObserving: Element.Methods.stopObserving.methodize()
+});
+
+(function() {
+  /* Support for the DOMContentLoaded event is based on work by Dan Webb,
+     Matthias Miller, Dean Edwards and John Resig. */
+
+  var timer, fired = false;
+
+  function fireContentLoadedEvent() {
+    if (fired) return;
+    if (timer) window.clearInterval(timer);
+    document.fire("dom:loaded");
+    fired = true;
+  }
+
+  if (document.addEventListener) {
+    if (Prototype.Browser.WebKit) {
+      timer = window.setInterval(function() {
+        if (/loaded|complete/.test(document.readyState))
+          fireContentLoadedEvent();
+      }, 0);
+
+      Event.observe(window, "load", fireContentLoadedEvent);
+
     } else {
-      this.range = this.element.ownerDocument.createRange();
-      if (this.initializeRange) this.initializeRange();
-      this.insertContent([this.range.createContextualFragment(this.content)]);
+      document.addEventListener("DOMContentLoaded",
+        fireContentLoadedEvent, false);
     }
 
-    setTimeout(function() {content.evalScripts()}, 10);
+  } else {
+    document.write("<script id=__onDOMContentLoaded defer src=//:><\/script>");
+    $("__onDOMContentLoaded").onreadystatechange = function() {
+      if (this.readyState == "complete") {
+        this.onreadystatechange = null;
+        fireContentLoadedEvent();
+      }
+    };
+  }
+})();
+/*------------------------------- DEPRECATED -------------------------------*/
+
+Hash.toQueryString = Object.toQueryString;
+
+var Toggle = { display: Element.toggle };
+
+Element.Methods.childOf = Element.Methods.descendantOf;
+
+var Insertion = {
+  Before: function(element, content) {
+    return Element.insert(element, {before:content});
   },
 
-  contentFromAnonymousTable: function() {
-    var div = document.createElement('div');
-    div.innerHTML = '<table><tbody>' + this.content + '</tbody></table>';
-    return $A(div.childNodes[0].childNodes[0].childNodes);
-  }
-}
-
-var Insertion = new Object();
-
-Insertion.Before = Class.create();
-Insertion.Before.prototype = Object.extend(new Abstract.Insertion('beforeBegin'), {
-  initializeRange: function() {
-    this.range.setStartBefore(this.element);
+  Top: function(element, content) {
+    return Element.insert(element, {top:content});
   },
 
-  insertContent: function(fragments) {
-    fragments.each((function(fragment) {
-      this.element.parentNode.insertBefore(fragment, this.element);
-    }).bind(this));
-  }
-});
-
-Insertion.Top = Class.create();
-Insertion.Top.prototype = Object.extend(new Abstract.Insertion('afterBegin'), {
-  initializeRange: function() {
-    this.range.selectNodeContents(this.element);
-    this.range.collapse(true);
+  Bottom: function(element, content) {
+    return Element.insert(element, {bottom:content});
   },
 
-  insertContent: function(fragments) {
-    fragments.reverse(false).each((function(fragment) {
-      this.element.insertBefore(fragment, this.element.firstChild);
-    }).bind(this));
+  After: function(element, content) {
+    return Element.insert(element, {after:content});
   }
-});
+};
 
-Insertion.Bottom = Class.create();
-Insertion.Bottom.prototype = Object.extend(new Abstract.Insertion('beforeEnd'), {
-  initializeRange: function() {
-    this.range.selectNodeContents(this.element);
-    this.range.collapse(this.element);
+var $continue = new Error('"throw $continue" is deprecated, use "return" instead');
+
+// This should be moved to script.aculo.us; notice the deprecated methods
+// further below, that map to the newer Element methods.
+var Position = {
+  // set to true if needed, warning: firefox performance problems
+  // NOT neeeded for page scrolling, only if draggable contained in
+  // scrollable elements
+  includeScrollOffsets: false,
+
+  // must be called before calling withinIncludingScrolloffset, every time the
+  // page is scrolled
+  prepare: function() {
+    this.deltaX =  window.pageXOffset
+                || document.documentElement.scrollLeft
+                || document.body.scrollLeft
+                || 0;
+    this.deltaY =  window.pageYOffset
+                || document.documentElement.scrollTop
+                || document.body.scrollTop
+                || 0;
   },
 
-  insertContent: function(fragments) {
-    fragments.each((function(fragment) {
-      this.element.appendChild(fragment);
-    }).bind(this));
-  }
-});
+  // caches x/y coordinate pair to use with overlap
+  within: function(element, x, y) {
+    if (this.includeScrollOffsets)
+      return this.withinIncludingScrolloffsets(element, x, y);
+    this.xcomp = x;
+    this.ycomp = y;
+    this.offset = Element.cumulativeOffset(element);
 
-Insertion.After = Class.create();
-Insertion.After.prototype = Object.extend(new Abstract.Insertion('afterEnd'), {
-  initializeRange: function() {
-    this.range.setStartAfter(this.element);
+    return (y >= this.offset[1] &&
+            y <  this.offset[1] + element.offsetHeight &&
+            x >= this.offset[0] &&
+            x <  this.offset[0] + element.offsetWidth);
   },
 
-  insertContent: function(fragments) {
-    fragments.each((function(fragment) {
-      this.element.parentNode.insertBefore(fragment,
-        this.element.nextSibling);
-    }).bind(this));
+  withinIncludingScrolloffsets: function(element, x, y) {
+    var offsetcache = Element.cumulativeScrollOffset(element);
+
+    this.xcomp = x + offsetcache[0] - this.deltaX;
+    this.ycomp = y + offsetcache[1] - this.deltaY;
+    this.offset = Element.cumulativeOffset(element);
+
+    return (this.ycomp >= this.offset[1] &&
+            this.ycomp <  this.offset[1] + element.offsetHeight &&
+            this.xcomp >= this.offset[0] &&
+            this.xcomp <  this.offset[0] + element.offsetWidth);
+  },
+
+  // within must be called directly before
+  overlap: function(mode, element) {
+    if (!mode) return 0;
+    if (mode == 'vertical')
+      return ((this.offset[1] + element.offsetHeight) - this.ycomp) /
+        element.offsetHeight;
+    if (mode == 'horizontal')
+      return ((this.offset[0] + element.offsetWidth) - this.xcomp) /
+        element.offsetWidth;
+  },
+
+  // Deprecation layer -- use newer Element methods now (1.5.2).
+
+  cumulativeOffset: Element.Methods.cumulativeOffset,
+
+  positionedOffset: Element.Methods.positionedOffset,
+
+  absolutize: function(element) {
+    Position.prepare();
+    return Element.absolutize(element);
+  },
+
+  relativize: function(element) {
+    Position.prepare();
+    return Element.relativize(element);
+  },
+
+  realOffset: Element.Methods.cumulativeScrollOffset,
+
+  offsetParent: Element.Methods.getOffsetParent,
+
+  page: Element.Methods.viewportOffset,
+
+  clone: function(source, target, options) {
+    options = options || { };
+    return Element.clonePosition(target, source, options);
   }
-});
+};
+
+/*--------------------------------------------------------------------------*/
+
+if (!document.getElementsByClassName) document.getElementsByClassName = function(instanceMethods){
+  function iter(name) {
+    return name.blank() ? null : "[contains(concat(' ', @class, ' '), ' " + name + " ')]";
+  }
+
+  instanceMethods.getElementsByClassName = Prototype.BrowserFeatures.XPath ?
+  function(element, className) {
+    className = className.toString().strip();
+    var cond = /\s/.test(className) ? $w(className).map(iter).join('') : iter(className);
+    return cond ? document._getElementsByXPath('.//*' + cond, element) : [];
+  } : function(element, className) {
+    className = className.toString().strip();
+    var elements = [], classNames = (/\s/.test(className) ? $w(className) : null);
+    if (!classNames && !className) return elements;
+
+    var nodes = $(element).getElementsByTagName('*');
+    className = ' ' + className + ' ';
+
+    for (var i = 0, child, cn; child = nodes[i]; i++) {
+      if (child.className && (cn = ' ' + child.className + ' ') && (cn.include(className) ||
+          (classNames && classNames.all(function(name) {
+            return !name.toString().blank() && cn.include(' ' + name + ' ');
+          }))))
+        elements.push(Element.extend(child));
+    }
+    return elements;
+  };
+
+  return function(className, parentElement) {
+    return $(parentElement || document.body).getElementsByClassName(className);
+  };
+}(Element.Methods);
 
 /*--------------------------------------------------------------------------*/
 
@@ -1741,775 +4219,7 @@ Element.ClassNames.prototype = {
 };
 
 Object.extend(Element.ClassNames.prototype, Enumerable);
-var Selector = Class.create();
-Selector.prototype = {
-  initialize: function(expression) {
-    this.params = {classNames: []};
-    this.expression = expression.toString().strip();
-    this.parseExpression();
-    this.compileMatcher();
-  },
-
-  parseExpression: function() {
-    function abort(message) { throw 'Parse error in selector: ' + message; }
-
-    if (this.expression == '')  abort('empty expression');
-
-    var params = this.params, expr = this.expression, match, modifier, clause, rest;
-    while (match = expr.match(/^(.*)\[([a-z0-9_:-]+?)(?:([~\|!]?=)(?:"([^"]*)"|([^\]\s]*)))?\]$/i)) {
-      params.attributes = params.attributes || [];
-      params.attributes.push({name: match[2], operator: match[3], value: match[4] || match[5] || ''});
-      expr = match[1];
-    }
-
-    if (expr == '*') return this.params.wildcard = true;
-
-    while (match = expr.match(/^([^a-z0-9_-])?([a-z0-9_-]+)(.*)/i)) {
-      modifier = match[1], clause = match[2], rest = match[3];
-      switch (modifier) {
-        case '#':       params.id = clause; break;
-        case '.':       params.classNames.push(clause); break;
-        case '':
-        case undefined: params.tagName = clause.toUpperCase(); break;
-        default:        abort(expr.inspect());
-      }
-      expr = rest;
-    }
-
-    if (expr.length > 0) abort(expr.inspect());
-  },
-
-  buildMatchExpression: function() {
-    var params = this.params, conditions = [], clause;
-
-    if (params.wildcard)
-      conditions.push('true');
-    if (clause = params.id)
-      conditions.push('element.readAttribute("id") == ' + clause.inspect());
-    if (clause = params.tagName)
-      conditions.push('element.tagName.toUpperCase() == ' + clause.inspect());
-    if ((clause = params.classNames).length > 0)
-      for (var i = 0, length = clause.length; i < length; i++)
-        conditions.push('element.hasClassName(' + clause[i].inspect() + ')');
-    if (clause = params.attributes) {
-      clause.each(function(attribute) {
-        var value = 'element.readAttribute(' + attribute.name.inspect() + ')';
-        var splitValueBy = function(delimiter) {
-          return value + ' && ' + value + '.split(' + delimiter.inspect() + ')';
-        }
-
-        switch (attribute.operator) {
-          case '=':       conditions.push(value + ' == ' + attribute.value.inspect()); break;
-          case '~=':      conditions.push(splitValueBy(' ') + '.include(' + attribute.value.inspect() + ')'); break;
-          case '|=':      conditions.push(
-                            splitValueBy('-') + '.first().toUpperCase() == ' + attribute.value.toUpperCase().inspect()
-                          ); break;
-          case '!=':      conditions.push(value + ' != ' + attribute.value.inspect()); break;
-          case '':
-          case undefined: conditions.push('element.hasAttribute(' + attribute.name.inspect() + ')'); break;
-          default:        throw 'Unknown operator ' + attribute.operator + ' in selector';
-        }
-      });
-    }
-
-    return conditions.join(' && ');
-  },
-
-  compileMatcher: function() {
-    this.match = new Function('element', 'if (!element.tagName) return false; \
-      element = $(element); \
-      return ' + this.buildMatchExpression());
-  },
-
-  findElements: function(scope) {
-    var element;
-
-    if (element = $(this.params.id))
-      if (this.match(element))
-        if (!scope || Element.childOf(element, scope))
-          return [element];
-
-    scope = (scope || document).getElementsByTagName(this.params.tagName || '*');
-
-    var results = [];
-    for (var i = 0, length = scope.length; i < length; i++)
-      if (this.match(element = scope[i]))
-        results.push(Element.extend(element));
-
-    return results;
-  },
-
-  toString: function() {
-    return this.expression;
-  }
-}
-
-Object.extend(Selector, {
-  matchElements: function(elements, expression) {
-    var selector = new Selector(expression);
-    return elements.select(selector.match.bind(selector)).map(Element.extend);
-  },
-
-  findElement: function(elements, expression, index) {
-    if (typeof expression == 'number') index = expression, expression = false;
-    return Selector.matchElements(elements, expression || '*')[index || 0];
-  },
-
-  findChildElements: function(element, expressions) {
-    return expressions.map(function(expression) {
-      return expression.match(/[^\s"]+(?:"[^"]*"[^\s"]+)*/g).inject([null], function(results, expr) {
-        var selector = new Selector(expr);
-        return results.inject([], function(elements, result) {
-          return elements.concat(selector.findElements(result || element));
-        });
-      });
-    }).flatten();
-  }
-});
-
-function $$() {
-  return Selector.findChildElements(document, $A(arguments));
-}
-var Form = {
-  reset: function(form) {
-    $(form).reset();
-    return form;
-  },
-
-  serializeElements: function(elements, getHash) {
-    var data = elements.inject({}, function(result, element) {
-      if (!element.disabled && element.name) {
-        var key = element.name, value = $(element).getValue();
-        if (value != undefined) {
-          if (result[key]) {
-            if (result[key].constructor != Array) result[key] = [result[key]];
-            result[key].push(value);
-          }
-          else result[key] = value;
-        }
-      }
-      return result;
-    });
-
-    return getHash ? data : Hash.toQueryString(data);
-  }
-};
-
-Form.Methods = {
-  serialize: function(form, getHash) {
-    return Form.serializeElements(Form.getElements(form), getHash);
-  },
-
-  getElements: function(form) {
-    return $A($(form).getElementsByTagName('*')).inject([],
-      function(elements, child) {
-        if (Form.Element.Serializers[child.tagName.toLowerCase()])
-          elements.push(Element.extend(child));
-        return elements;
-      }
-    );
-  },
-
-  getInputs: function(form, typeName, name) {
-    form = $(form);
-    var inputs = form.getElementsByTagName('input');
-
-    if (!typeName && !name) return $A(inputs).map(Element.extend);
-
-    for (var i = 0, matchingInputs = [], length = inputs.length; i < length; i++) {
-      var input = inputs[i];
-      if ((typeName && input.type != typeName) || (name && input.name != name))
-        continue;
-      matchingInputs.push(Element.extend(input));
-    }
-
-    return matchingInputs;
-  },
-
-  disable: function(form) {
-    form = $(form);
-    form.getElements().each(function(element) {
-      element.blur();
-      element.disabled = 'true';
-    });
-    return form;
-  },
-
-  enable: function(form) {
-    form = $(form);
-    form.getElements().each(function(element) {
-      element.disabled = '';
-    });
-    return form;
-  },
-
-  findFirstElement: function(form) {
-    return $(form).getElements().find(function(element) {
-      return element.type != 'hidden' && !element.disabled &&
-        ['input', 'select', 'textarea'].include(element.tagName.toLowerCase());
-    });
-  },
-
-  focusFirstElement: function(form) {
-    form = $(form);
-    form.findFirstElement().activate();
-    return form;
-  }
-}
-
-Object.extend(Form, Form.Methods);
 
 /*--------------------------------------------------------------------------*/
 
-Form.Element = {
-  focus: function(element) {
-    $(element).focus();
-    return element;
-  },
-
-  select: function(element) {
-    $(element).select();
-    return element;
-  }
-}
-
-Form.Element.Methods = {
-  serialize: function(element) {
-    element = $(element);
-    if (!element.disabled && element.name) {
-      var value = element.getValue();
-      if (value != undefined) {
-        var pair = {};
-        pair[element.name] = value;
-        return Hash.toQueryString(pair);
-      }
-    }
-    return '';
-  },
-
-  getValue: function(element) {
-    element = $(element);
-    var method = element.tagName.toLowerCase();
-    return Form.Element.Serializers[method](element);
-  },
-
-  clear: function(element) {
-    $(element).value = '';
-    return element;
-  },
-
-  present: function(element) {
-    return $(element).value != '';
-  },
-
-  activate: function(element) {
-    element = $(element);
-    element.focus();
-    if (element.select && ( element.tagName.toLowerCase() != 'input' ||
-      !['button', 'reset', 'submit'].include(element.type) ) )
-      element.select();
-    return element;
-  },
-
-  disable: function(element) {
-    element = $(element);
-    element.disabled = true;
-    return element;
-  },
-
-  enable: function(element) {
-    element = $(element);
-    element.blur();
-    element.disabled = false;
-    return element;
-  }
-}
-
-Object.extend(Form.Element, Form.Element.Methods);
-var Field = Form.Element;
-var $F = Form.Element.getValue;
-
-/*--------------------------------------------------------------------------*/
-
-Form.Element.Serializers = {
-  input: function(element) {
-    switch (element.type.toLowerCase()) {
-      case 'checkbox':
-      case 'radio':
-        return Form.Element.Serializers.inputSelector(element);
-      default:
-        return Form.Element.Serializers.textarea(element);
-    }
-  },
-
-  inputSelector: function(element) {
-    return element.checked ? element.value : null;
-  },
-
-  textarea: function(element) {
-    return element.value;
-  },
-
-  select: function(element) {
-    return this[element.type == 'select-one' ?
-      'selectOne' : 'selectMany'](element);
-  },
-
-  selectOne: function(element) {
-    var index = element.selectedIndex;
-    return index >= 0 ? this.optionValue(element.options[index]) : null;
-  },
-
-  selectMany: function(element) {
-    var values, length = element.length;
-    if (!length) return null;
-
-    for (var i = 0, values = []; i < length; i++) {
-      var opt = element.options[i];
-      if (opt.selected) values.push(this.optionValue(opt));
-    }
-    return values;
-  },
-
-  optionValue: function(opt) {
-    // extend element because hasAttribute may not be native
-    return Element.extend(opt).hasAttribute('value') ? opt.value : opt.text;
-  }
-}
-
-/*--------------------------------------------------------------------------*/
-
-Abstract.TimedObserver = function() {}
-Abstract.TimedObserver.prototype = {
-  initialize: function(element, frequency, callback) {
-    this.frequency = frequency;
-    this.element   = $(element);
-    this.callback  = callback;
-
-    this.lastValue = this.getValue();
-    this.registerCallback();
-  },
-
-  registerCallback: function() {
-    setInterval(this.onTimerEvent.bind(this), this.frequency * 1000);
-  },
-
-  onTimerEvent: function() {
-    var value = this.getValue();
-    var changed = ('string' == typeof this.lastValue && 'string' == typeof value
-      ? this.lastValue != value : String(this.lastValue) != String(value));
-    if (changed) {
-      this.callback(this.element, value);
-      this.lastValue = value;
-    }
-  }
-}
-
-Form.Element.Observer = Class.create();
-Form.Element.Observer.prototype = Object.extend(new Abstract.TimedObserver(), {
-  getValue: function() {
-    return Form.Element.getValue(this.element);
-  }
-});
-
-Form.Observer = Class.create();
-Form.Observer.prototype = Object.extend(new Abstract.TimedObserver(), {
-  getValue: function() {
-    return Form.serialize(this.element);
-  }
-});
-
-/*--------------------------------------------------------------------------*/
-
-Abstract.EventObserver = function() {}
-Abstract.EventObserver.prototype = {
-  initialize: function(element, callback) {
-    this.element  = $(element);
-    this.callback = callback;
-
-    this.lastValue = this.getValue();
-    if (this.element.tagName.toLowerCase() == 'form')
-      this.registerFormCallbacks();
-    else
-      this.registerCallback(this.element);
-  },
-
-  onElementEvent: function() {
-    var value = this.getValue();
-    if (this.lastValue != value) {
-      this.callback(this.element, value);
-      this.lastValue = value;
-    }
-  },
-
-  registerFormCallbacks: function() {
-    Form.getElements(this.element).each(this.registerCallback.bind(this));
-  },
-
-  registerCallback: function(element) {
-    if (element.type) {
-      switch (element.type.toLowerCase()) {
-        case 'checkbox':
-        case 'radio':
-          Event.observe(element, 'click', this.onElementEvent.bind(this));
-          break;
-        default:
-          Event.observe(element, 'change', this.onElementEvent.bind(this));
-          break;
-      }
-    }
-  }
-}
-
-Form.Element.EventObserver = Class.create();
-Form.Element.EventObserver.prototype = Object.extend(new Abstract.EventObserver(), {
-  getValue: function() {
-    return Form.Element.getValue(this.element);
-  }
-});
-
-Form.EventObserver = Class.create();
-Form.EventObserver.prototype = Object.extend(new Abstract.EventObserver(), {
-  getValue: function() {
-    return Form.serialize(this.element);
-  }
-});
-if (!window.Event) {
-  var Event = new Object();
-}
-
-Object.extend(Event, {
-  KEY_BACKSPACE: 8,
-  KEY_TAB:       9,
-  KEY_RETURN:   13,
-  KEY_ESC:      27,
-  KEY_LEFT:     37,
-  KEY_UP:       38,
-  KEY_RIGHT:    39,
-  KEY_DOWN:     40,
-  KEY_DELETE:   46,
-  KEY_HOME:     36,
-  KEY_END:      35,
-  KEY_PAGEUP:   33,
-  KEY_PAGEDOWN: 34,
-
-  element: function(event) {
-    return event.target || event.srcElement;
-  },
-
-  isLeftClick: function(event) {
-    return (((event.which) && (event.which == 1)) ||
-            ((event.button) && (event.button == 1)));
-  },
-
-  pointerX: function(event) {
-    return event.pageX || (event.clientX +
-      (document.documentElement.scrollLeft || document.body.scrollLeft));
-  },
-
-  pointerY: function(event) {
-    return event.pageY || (event.clientY +
-      (document.documentElement.scrollTop || document.body.scrollTop));
-  },
-
-  stop: function(event) {
-    if (event.preventDefault) {
-      event.preventDefault();
-      event.stopPropagation();
-    } else {
-      event.returnValue = false;
-      event.cancelBubble = true;
-    }
-  },
-
-  // find the first node with the given tagName, starting from the
-  // node the event was triggered on; traverses the DOM upwards
-  findElement: function(event, tagName) {
-    var element = Event.element(event);
-    while (element.parentNode && (!element.tagName ||
-        (element.tagName.toUpperCase() != tagName.toUpperCase())))
-      element = element.parentNode;
-    return element;
-  },
-
-  observers: false,
-
-  _observeAndCache: function(element, name, observer, useCapture) {
-    if (!this.observers) this.observers = [];
-    if (element.addEventListener) {
-      this.observers.push([element, name, observer, useCapture]);
-      element.addEventListener(name, observer, useCapture);
-    } else if (element.attachEvent) {
-      this.observers.push([element, name, observer, useCapture]);
-      element.attachEvent('on' + name, observer);
-    }
-  },
-
-  unloadCache: function() {
-    if (!Event.observers) return;
-    for (var i = 0, length = Event.observers.length; i < length; i++) {
-      Event.stopObserving.apply(this, Event.observers[i]);
-      Event.observers[i][0] = null;
-    }
-    Event.observers = false;
-  },
-
-  observe: function(element, name, observer, useCapture) {
-    element = $(element);
-    useCapture = useCapture || false;
-
-    if (name == 'keypress' &&
-        (navigator.appVersion.match(/Konqueror|Safari|KHTML/)
-        || element.attachEvent))
-      name = 'keydown';
-
-    Event._observeAndCache(element, name, observer, useCapture);
-  },
-
-  stopObserving: function(element, name, observer, useCapture) {
-    element = $(element);
-    useCapture = useCapture || false;
-
-    if (name == 'keypress' &&
-        (navigator.appVersion.match(/Konqueror|Safari|KHTML/)
-        || element.detachEvent))
-      name = 'keydown';
-
-    if (element.removeEventListener) {
-      element.removeEventListener(name, observer, useCapture);
-    } else if (element.detachEvent) {
-      try {
-        element.detachEvent('on' + name, observer);
-      } catch (e) {}
-    }
-  }
-});
-
-/* prevent memory leaks in IE */
-if (navigator.appVersion.match(/\bMSIE\b/))
-  Event.observe(window, 'unload', Event.unloadCache, false);
-var Position = {
-  // set to true if needed, warning: firefox performance problems
-  // NOT neeeded for page scrolling, only if draggable contained in
-  // scrollable elements
-  includeScrollOffsets: false,
-
-  // must be called before calling withinIncludingScrolloffset, every time the
-  // page is scrolled
-  prepare: function() {
-    this.deltaX =  window.pageXOffset
-                || document.documentElement.scrollLeft
-                || document.body.scrollLeft
-                || 0;
-    this.deltaY =  window.pageYOffset
-                || document.documentElement.scrollTop
-                || document.body.scrollTop
-                || 0;
-  },
-
-  realOffset: function(element) {
-    var valueT = 0, valueL = 0;
-    do {
-      valueT += element.scrollTop  || 0;
-      valueL += element.scrollLeft || 0;
-      element = element.parentNode;
-    } while (element);
-    return [valueL, valueT];
-  },
-
-  cumulativeOffset: function(element) {
-    var valueT = 0, valueL = 0;
-    do {
-      valueT += element.offsetTop  || 0;
-      valueL += element.offsetLeft || 0;
-      element = element.offsetParent;
-    } while (element);
-    return [valueL, valueT];
-  },
-
-  positionedOffset: function(element) {
-    var valueT = 0, valueL = 0;
-    do {
-      valueT += element.offsetTop  || 0;
-      valueL += element.offsetLeft || 0;
-      element = element.offsetParent;
-      if (element) {
-        if(element.tagName=='BODY') break;
-        var p = Element.getStyle(element, 'position');
-        if (p == 'relative' || p == 'absolute') break;
-      }
-    } while (element);
-    return [valueL, valueT];
-  },
-
-  offsetParent: function(element) {
-    if (element.offsetParent) return element.offsetParent;
-    if (element == document.body) return element;
-
-    while ((element = element.parentNode) && element != document.body)
-      if (Element.getStyle(element, 'position') != 'static')
-        return element;
-
-    return document.body;
-  },
-
-  // caches x/y coordinate pair to use with overlap
-  within: function(element, x, y) {
-    if (this.includeScrollOffsets)
-      return this.withinIncludingScrolloffsets(element, x, y);
-    this.xcomp = x;
-    this.ycomp = y;
-    this.offset = this.cumulativeOffset(element);
-
-    return (y >= this.offset[1] &&
-            y <  this.offset[1] + element.offsetHeight &&
-            x >= this.offset[0] &&
-            x <  this.offset[0] + element.offsetWidth);
-  },
-
-  withinIncludingScrolloffsets: function(element, x, y) {
-    var offsetcache = this.realOffset(element);
-
-    this.xcomp = x + offsetcache[0] - this.deltaX;
-    this.ycomp = y + offsetcache[1] - this.deltaY;
-    this.offset = this.cumulativeOffset(element);
-
-    return (this.ycomp >= this.offset[1] &&
-            this.ycomp <  this.offset[1] + element.offsetHeight &&
-            this.xcomp >= this.offset[0] &&
-            this.xcomp <  this.offset[0] + element.offsetWidth);
-  },
-
-  // within must be called directly before
-  overlap: function(mode, element) {
-    if (!mode) return 0;
-    if (mode == 'vertical')
-      return ((this.offset[1] + element.offsetHeight) - this.ycomp) /
-        element.offsetHeight;
-    if (mode == 'horizontal')
-      return ((this.offset[0] + element.offsetWidth) - this.xcomp) /
-        element.offsetWidth;
-  },
-
-  page: function(forElement) {
-    var valueT = 0, valueL = 0;
-
-    var element = forElement;
-    do {
-      valueT += element.offsetTop  || 0;
-      valueL += element.offsetLeft || 0;
-
-      // Safari fix
-      if (element.offsetParent==document.body)
-        if (Element.getStyle(element,'position')=='absolute') break;
-
-    } while (element = element.offsetParent);
-
-    element = forElement;
-    do {
-      if (!window.opera || element.tagName=='BODY') {
-        valueT -= element.scrollTop  || 0;
-        valueL -= element.scrollLeft || 0;
-      }
-    } while (element = element.parentNode);
-
-    return [valueL, valueT];
-  },
-
-  clone: function(source, target) {
-    var options = Object.extend({
-      setLeft:    true,
-      setTop:     true,
-      setWidth:   true,
-      setHeight:  true,
-      offsetTop:  0,
-      offsetLeft: 0
-    }, arguments[2] || {})
-
-    // find page position of source
-    source = $(source);
-    var p = Position.page(source);
-
-    // find coordinate system to use
-    target = $(target);
-    var delta = [0, 0];
-    var parent = null;
-    // delta [0,0] will do fine with position: fixed elements,
-    // position:absolute needs offsetParent deltas
-    if (Element.getStyle(target,'position') == 'absolute') {
-      parent = Position.offsetParent(target);
-      delta = Position.page(parent);
-    }
-
-    // correct by body offsets (fixes Safari)
-    if (parent == document.body) {
-      delta[0] -= document.body.offsetLeft;
-      delta[1] -= document.body.offsetTop;
-    }
-
-    // set position
-    if(options.setLeft)   target.style.left  = (p[0] - delta[0] + options.offsetLeft) + 'px';
-    if(options.setTop)    target.style.top   = (p[1] - delta[1] + options.offsetTop) + 'px';
-    if(options.setWidth)  target.style.width = source.offsetWidth + 'px';
-    if(options.setHeight) target.style.height = source.offsetHeight + 'px';
-  },
-
-  absolutize: function(element) {
-    element = $(element);
-    if (element.style.position == 'absolute') return;
-    Position.prepare();
-
-    var offsets = Position.positionedOffset(element);
-    var top     = offsets[1];
-    var left    = offsets[0];
-    var width   = element.clientWidth;
-    var height  = element.clientHeight;
-
-    element._originalLeft   = left - parseFloat(element.style.left  || 0);
-    element._originalTop    = top  - parseFloat(element.style.top || 0);
-    element._originalWidth  = element.style.width;
-    element._originalHeight = element.style.height;
-
-    element.style.position = 'absolute';
-    element.style.top    = top + 'px';
-    element.style.left   = left + 'px';
-    element.style.width  = width + 'px';
-    element.style.height = height + 'px';
-  },
-
-  relativize: function(element) {
-    element = $(element);
-    if (element.style.position == 'relative') return;
-    Position.prepare();
-
-    element.style.position = 'relative';
-    var top  = parseFloat(element.style.top  || 0) - (element._originalTop || 0);
-    var left = parseFloat(element.style.left || 0) - (element._originalLeft || 0);
-
-    element.style.top    = top + 'px';
-    element.style.left   = left + 'px';
-    element.style.height = element._originalHeight;
-    element.style.width  = element._originalWidth;
-  }
-}
-
-// Safari returns margins on body which is incorrect if the child is absolutely
-// positioned.  For performance reasons, redefine Position.cumulativeOffset for
-// KHTML/WebKit only.
-if (/Konqueror|Safari|KHTML/.test(navigator.userAgent)) {
-  Position.cumulativeOffset = function(element) {
-    var valueT = 0, valueL = 0;
-    do {
-      valueT += element.offsetTop  || 0;
-      valueL += element.offsetLeft || 0;
-      if (element.offsetParent == document.body)
-        if (Element.getStyle(element, 'position') == 'absolute') break;
-
-      element = element.offsetParent;
-    } while (element);
-
-    return [valueL, valueT];
-  }
-}
-
 Element.addMethods();
\ No newline at end of file

From fa88a592fd19f28b0b2ed0da0b2ee3dd5aba1d4e Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 29 Jun 2008 08:14:13 +0000
Subject: [PATCH 572/710] Fixed #1545: migration on fresh install fails (broken
 by r1592).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1595 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 db/migrate/001_setup.rb | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/db/migrate/001_setup.rb b/db/migrate/001_setup.rb
index 1160dd5ef..13960ba8c 100644
--- a/db/migrate/001_setup.rb
+++ b/db/migrate/001_setup.rb
@@ -16,7 +16,8 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class Setup < ActiveRecord::Migration
-
+  
+  class User < ActiveRecord::Base; end
   # model removed
   class Permission < ActiveRecord::Base; end
   
@@ -284,13 +285,15 @@ class Setup < ActiveRecord::Migration
     Permission.create :controller => "versions", :action => "destroy_file", :description => "button_delete", :sort => 1322
     
     # create default administrator account
-    user = User.create :firstname => "Redmine", :lastname => "Admin", :mail => "admin@somenet.foo", :mail_notification => true, :language => "en"
-    user.login = "admin"
-    user.password = "admin"
-    user.admin = true
-    user.save
-    
-    
+    user = User.create :login => "admin",
+                       :hashed_password => "d033e22ae348aeb5660fc2140aec35850c4da997",
+                       :admin => true,
+                       :firstname => "Redmine",
+                       :lastname => "Admin",
+                       :mail => "admin@somenet.foo",
+                       :mail_notification => true,
+                       :language => "en",
+                       :status => 1
   end
 
   def self.down

From 22c9a438993ba365d2d66d32bd87941b512f4b1a Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 29 Jun 2008 08:55:37 +0000
Subject: [PATCH 573/710] Fixed: associated revisions are displayed in wrong
 order on issue view (#1546).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1596 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/models/issue.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/issue.rb b/app/models/issue.rb
index 326e234b0..b19e64883 100644
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -28,7 +28,7 @@ class Issue < ActiveRecord::Base
   has_many :journals, :as => :journalized, :dependent => :destroy
   has_many :attachments, :as => :container, :dependent => :destroy
   has_many :time_entries, :dependent => :delete_all
-  has_and_belongs_to_many :changesets, :order => "revision ASC"
+  has_and_belongs_to_many :changesets, :order => "#{Changeset.table_name}.committed_on ASC, #{Changeset.table_name}.id 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

From 0344719482d47c7e69761c6f2d550f3cd98efa93 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 29 Jun 2008 09:03:03 +0000
Subject: [PATCH 574/710] Makes importer work with Trac 0.8.x (#1540).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1597 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 lib/tasks/migrate_from_trac.rake | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/lib/tasks/migrate_from_trac.rake b/lib/tasks/migrate_from_trac.rake
index 4226d79c0..50048634b 100644
--- a/lib/tasks/migrate_from_trac.rake
+++ b/lib/tasks/migrate_from_trac.rake
@@ -98,6 +98,11 @@ namespace :redmine do
             nil
           end
         end
+
+        def description
+          # Attribute is named descr in Trac v0.8.x
+          has_attribute?(:descr) ? read_attribute(:descr) : read_attribute(:description)
+        end
       end
       
       class TracTicketCustom < ActiveRecord::Base

From a40add57de53ed3f5b0c91028ce45d9f4ec902d3 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 29 Jun 2008 09:08:58 +0000
Subject: [PATCH 575/710] Adds HTML titles to forums related views.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1598 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/boards/index.rhtml  | 2 ++
 app/views/boards/show.rhtml   | 2 ++
 app/views/messages/show.rhtml | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/app/views/boards/index.rhtml b/app/views/boards/index.rhtml
index 8d4560653..655352a96 100644
--- a/app/views/boards/index.rhtml
+++ b/app/views/boards/index.rhtml
@@ -38,3 +38,5 @@
 <% content_for :header_tags do %>
   <%= auto_discovery_link_tag(:atom, {:controller => 'projects', :action => 'activity', :id => @project, :format => 'atom', :show_messages => 1, :key => User.current.rss_key}) %>
 <% end %>
+
+<% html_title l(:label_board_plural) %>
diff --git a/app/views/boards/show.rhtml b/app/views/boards/show.rhtml
index 26d17ae56..5b0c208a3 100644
--- a/app/views/boards/show.rhtml
+++ b/app/views/boards/show.rhtml
@@ -57,3 +57,5 @@
 <% else %>
 <p class="nodata"><%= l(:label_no_data) %></p>
 <% end %>
+
+<% html_title h(@board.name) %>
diff --git a/app/views/messages/show.rhtml b/app/views/messages/show.rhtml
index 07508fbfd..7e5975bfd 100644
--- a/app/views/messages/show.rhtml
+++ b/app/views/messages/show.rhtml
@@ -54,3 +54,5 @@
 <% content_for :header_tags do %>
   <%= stylesheet_link_tag 'scm' %>
 <% end %>
+
+<% html_title h(@topic.subject) %>

From 00593f2f345f51565535257cf183b004c1087a21 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 29 Jun 2008 09:41:42 +0000
Subject: [PATCH 576/710] Reduces memory usage when importing large git
 repositories (#1482).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1599 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/models/repository/git.rb            |  6 ++---
 lib/redmine/scm/adapters/git_adapter.rb | 33 ++++++++++++++++---------
 2 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/app/models/repository/git.rb b/app/models/repository/git.rb
index 7213588ac..2f440fe29 100644
--- a/app/models/repository/git.rb
+++ b/app/models/repository/git.rb
@@ -44,10 +44,8 @@ class Repository::Git < Repository
       scm_revision = scm_info.lastrev.scmid
 
       unless changesets.find_by_scmid(scm_revision)
-
-        revisions = scm.revisions('', db_revision, nil)
-        transaction do
-          revisions.reverse_each do |revision|
+        scm.revisions('', db_revision, nil, :reverse => true) do |revision|
+          transaction do
             changeset = Changeset.create(:repository => self,
                                          :revision => revision.identifier,
                                          :scmid => revision.scmid,
diff --git a/lib/redmine/scm/adapters/git_adapter.rb b/lib/redmine/scm/adapters/git_adapter.rb
index d05b4fb38..30d624001 100644
--- a/lib/redmine/scm/adapters/git_adapter.rb
+++ b/lib/redmine/scm/adapters/git_adapter.rb
@@ -139,10 +139,10 @@ module Redmine
         def revisions(path, identifier_from, identifier_to, options={})
           revisions = Revisions.new
           cmd = "#{GIT_BIN} --git-dir #{target('')} log --raw "
+          cmd << " --reverse" if options[:reverse]
           cmd << " -n #{options[:limit].to_i} " if (!options.nil?) && options[:limit]
           cmd << " #{shell_quote(identifier_from + '..')} " if identifier_from
           cmd << " #{shell_quote identifier_to} " if identifier_to
-          #cmd << " HEAD " if !identifier_to
           shellout(cmd) do |io|
             files=[]
             changeset = {}
@@ -155,13 +155,18 @@ module Redmine
                 value = $1
                 if (parsing_descr == 1 || parsing_descr == 2)
                   parsing_descr = 0
-                  revisions << Revision.new({:identifier => changeset[:commit],
-                                             :scmid => changeset[:commit],
-                                             :author => changeset[:author],
-                                             :time => Time.parse(changeset[:date]),
-                                             :message => changeset[:description],
-                                             :paths => files
-                                            })
+                  revision = Revision.new({:identifier => changeset[:commit],
+                                           :scmid => changeset[:commit],
+                                           :author => changeset[:author],
+                                           :time => Time.parse(changeset[:date]),
+                                           :message => changeset[:description],
+                                           :paths => files
+                                          })
+                  if block_given?
+                    yield revision
+                  else
+                    revisions << revision
+                  end
                   changeset = {}
                   files = []
                   revno = revno + 1
@@ -190,14 +195,20 @@ module Redmine
               end
             end	
 
-            revisions << Revision.new({:identifier => changeset[:commit],
+            if changeset[:commit]
+              revision = Revision.new({:identifier => changeset[:commit],
                                        :scmid => changeset[:commit],
                                        :author => changeset[:author],
                                        :time => Time.parse(changeset[:date]),
                                        :message => changeset[:description],
                                        :paths => files
-                                      }) if changeset[:commit]
-
+                                      })
+              if block_given?
+                yield revision
+              else
+                revisions << revision
+              end
+            end
           end
 
           return nil if $? && $?.exitstatus != 0

From a0f707e54b092f62aa0a04be9a80741c937ab3a5 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 29 Jun 2008 09:50:42 +0000
Subject: [PATCH 577/710] Fixed: Entourage (and some old client) fails to
 correctly render notification styles (#1425).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1600 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/mailer/layout.text.html.rhtml | 32 ++++++++++++++++++++-----
 1 file changed, 26 insertions(+), 6 deletions(-)

diff --git a/app/views/mailer/layout.text.html.rhtml b/app/views/mailer/layout.text.html.rhtml
index b78e92bdd..c95c94501 100644
--- a/app/views/mailer/layout.text.html.rhtml
+++ b/app/views/mailer/layout.text.html.rhtml
@@ -1,12 +1,32 @@
 <html>
 <head>
 <style>
-body { font-family: Verdana, sans-serif; font-size: 0.8em; color:#484848; }
-body h1 { font-family: "Trebuchet MS", Verdana, sans-serif; font-size: 1.2em; margin: 0;}
-a, a:link, a:visited{ color: #2A5685; }
-a:hover, a:active{ color: #c61a1a; }
-hr { width: 100%; height: 1px; background: #ccc; border: 0; }
-.footer { font-size: 0.8em; font-style: italic; }
+body {
+  font-family: Verdana, sans-serif;
+  font-size: 0.8em;
+  color:#484848;
+}
+h1 {
+  font-family: "Trebuchet MS", Verdana, sans-serif;
+  font-size: 1.2em;
+  margin: 0px;
+}
+a, a:link, a:visited {
+  color: #2A5685;
+}
+a:hover, a:active {
+  color: #c61a1a;
+}
+hr {
+  width: 100%;
+  height: 1px;
+  background: #ccc;
+  border: 0;
+}
+.footer {
+  font-size: 0.8em;
+  font-style: italic;
+}
 </style>
 </head>
 <body>

From 94cf4f258ff61bac4708c9a8dcba5c50b8adcf94 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 29 Jun 2008 11:13:10 +0000
Subject: [PATCH 578/710] Wider SVG graphs in repository stats.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1601 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/repositories_controller.rb |  6 +++---
 app/views/repositories/stats.rhtml         | 15 +++++++--------
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb
index 99e2b7203..7b3387347 100644
--- a/app/controllers/repositories_controller.rb
+++ b/app/controllers/repositories_controller.rb
@@ -228,7 +228,7 @@ private
   
     graph = SVG::Graph::Bar.new(
       :height => 300,
-      :width => 500,
+      :width => 800,
       :fields => fields.reverse,
       :stack => :side,
       :scale_integers => true,
@@ -270,8 +270,8 @@ private
     fields = fields.collect {|c| c.gsub(%r{<.+@.+>}, '') }
     
     graph = SVG::Graph::BarHorizontal.new(
-      :height => 300,
-      :width => 500,
+      :height => 400,
+      :width => 800,
       :fields => fields,
       :stack => :side,
       :scale_integers => true,
diff --git a/app/views/repositories/stats.rhtml b/app/views/repositories/stats.rhtml
index 76ce892d5..1e617577e 100644
--- a/app/views/repositories/stats.rhtml
+++ b/app/views/repositories/stats.rhtml
@@ -1,13 +1,12 @@
 <h2><%= l(:label_statistics) %></h2>
 
-<table width="100%">
-<tr><td>
-<%= tag("embed", :width => 500, :height => 300, :type => "image/svg+xml", :src => url_for(:controller => 'repositories', :action => 'graph', :id => @project, :graph => "commits_per_month")) %>
-</td><td>
-<%= tag("embed", :width => 500, :height => 300, :type => "image/svg+xml", :src => url_for(:controller => 'repositories', :action => 'graph', :id => @project, :graph => "commits_per_author")) %>
-</td></tr>
-</table>
-<br />
+<p>
+<%= tag("embed", :width => 800, :height => 300, :type => "image/svg+xml", :src => url_for(:controller => 'repositories', :action => 'graph', :id => @project, :graph => "commits_per_month")) %>
+</p>
+<p>
+<%= tag("embed", :width => 800, :height => 400, :type => "image/svg+xml", :src => url_for(:controller => 'repositories', :action => 'graph', :id => @project, :graph => "commits_per_author")) %>
+</p>
+
 <p><%= link_to l(:button_back), :action => 'show', :id => @project %></p>
 
 <% html_title(l(:label_repository), l(:label_statistics)) -%>

From 1424b0f215082fff57d840dc715f5875bea45ef0 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 29 Jun 2008 12:01:20 +0000
Subject: [PATCH 579/710] Addq "please select" to activity select box if no
 activity is set as default (#937).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1602 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/issues_controller.rb  | 3 +--
 app/controllers/timelog_controller.rb | 1 -
 app/helpers/timelog_helper.rb         | 8 ++++++++
 app/views/issues/_edit.rhtml          | 2 +-
 app/views/timelog/edit.rhtml          | 2 +-
 5 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index 49b443238..5bc65d2e4 100644
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -43,6 +43,7 @@ class IssuesController < ApplicationController
   helper :sort
   include SortHelper
   include IssuesHelper
+  helper :timelog
 
   def index
     sort_init "#{Issue.table_name}.id", "desc"
@@ -99,7 +100,6 @@ class IssuesController < ApplicationController
     @journals.reverse! if User.current.wants_comments_in_reverse_order?
     @allowed_statuses = @issue.new_statuses_allowed_to(User.current)
     @edit_allowed = User.current.allowed_to?(:edit_issues, @project)
-    @activities = Enumeration::get_values('ACTI')
     @priorities = Enumeration::get_values('IPRI')
     @time_entry = TimeEntry.new
     respond_to do |format|
@@ -157,7 +157,6 @@ class IssuesController < ApplicationController
   
   def edit
     @allowed_statuses = @issue.new_statuses_allowed_to(User.current)
-    @activities = Enumeration::get_values('ACTI')
     @priorities = Enumeration::get_values('IPRI')
     @edit_allowed = User.current.allowed_to?(:edit_issues, @project)
     
diff --git a/app/controllers/timelog_controller.rb b/app/controllers/timelog_controller.rb
index cf1c844df..9f539d459 100644
--- a/app/controllers/timelog_controller.rb
+++ b/app/controllers/timelog_controller.rb
@@ -183,7 +183,6 @@ class TimelogController < ApplicationController
       redirect_to(params[:back_url].blank? ? {:action => 'details', :project_id => @time_entry.project} : params[:back_url])
       return
     end    
-    @activities = Enumeration::get_values('ACTI')
   end
   
   def destroy
diff --git a/app/helpers/timelog_helper.rb b/app/helpers/timelog_helper.rb
index 7fd70e744..2c1ae5285 100644
--- a/app/helpers/timelog_helper.rb
+++ b/app/helpers/timelog_helper.rb
@@ -16,6 +16,14 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 module TimelogHelper
+  def activity_collection_for_select_options
+    activities = Enumeration::get_values('ACTI')
+    collection = []
+    collection << [ "--- #{l(:actionview_instancetag_blank_option)} ---", '' ] unless activities.detect(&:is_default)
+    activities.each { |a| collection << [a.name, a.id] }
+    collection
+  end
+  
   def select_hours(data, criteria, value)
     data.select {|row| row[criteria] == value}
   end
diff --git a/app/views/issues/_edit.rhtml b/app/views/issues/_edit.rhtml
index 49f198a63..914f7b9c4 100644
--- a/app/views/issues/_edit.rhtml
+++ b/app/views/issues/_edit.rhtml
@@ -21,7 +21,7 @@
         <p><%= time_entry.text_field :hours, :size => 6, :label => :label_spent_time %> <%= l(:field_hours) %></p>
         </div>
         <div class="splitcontentright">
-        <p><%= time_entry.select :activity_id, (@activities.collect {|p| [p.name, p.id]}) %></p>
+        <p><%= time_entry.select :activity_id, activity_collection_for_select_options %></p>
         </div>
         <p><%= time_entry.text_field :comments, :size => 60 %></p>
         <% end %>
diff --git a/app/views/timelog/edit.rhtml b/app/views/timelog/edit.rhtml
index f9dae8a99..7e8cc4591 100644
--- a/app/views/timelog/edit.rhtml
+++ b/app/views/timelog/edit.rhtml
@@ -9,7 +9,7 @@
 <p><%= f.text_field :spent_on, :size => 10, :required => true %><%= calendar_for('time_entry_spent_on') %></p>
 <p><%= f.text_field :hours, :size => 6, :required => true %></p>
 <p><%= f.text_field :comments, :size => 100 %></p>
-<p><%= f.select :activity_id, (@activities.collect {|p| [p.name, p.id]}), :required => true %></p>
+<p><%= f.select :activity_id, activity_collection_for_select_options, :required => true %></p>
 </div>
 
 <%= submit_tag l(:button_save) %>

From 32fa1a4e90ebe51e5b3858f82e0efb0f08defe78 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 29 Jun 2008 12:16:58 +0000
Subject: [PATCH 580/710] Do not silently ignore timelog validation failure on
 issue edit.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1603 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/issues_controller.rb | 2 +-
 app/views/issues/_edit.rhtml         | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index 5bc65d2e4..e844d242f 100644
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -175,7 +175,7 @@ class IssuesController < ApplicationController
       @time_entry.attributes = params[:time_entry]
       attachments = attach_files(@issue, params[:attachments])
       attachments.each {|a| journal.details << JournalDetail.new(:property => 'attachment', :prop_key => a.id, :value => a.filename)}
-      if @issue.save
+      if (@time_entry.hours.nil? || @time_entry.valid?) && @issue.save
         # Log spend time
         if current_role.allowed_to?(:log_time)
           @time_entry.save
diff --git a/app/views/issues/_edit.rhtml b/app/views/issues/_edit.rhtml
index 914f7b9c4..ba59c3ae9 100644
--- a/app/views/issues/_edit.rhtml
+++ b/app/views/issues/_edit.rhtml
@@ -4,6 +4,7 @@
                                        :class => nil,
                                        :multipart => true} do |f| %>
     <%= error_messages_for 'issue' %>
+    <%= error_messages_for 'time_entry' %>
     <div class="box">
     <% if @edit_allowed || !@allowed_statuses.empty? %>
         <fieldset class="tabular"><legend><%= l(:label_change_properties) %>

From 5d6e9494ad49b3329da20bbd0e35bec8656886b4 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 29 Jun 2008 12:23:07 +0000
Subject: [PATCH 581/710] Translations updates: * Traditional Chinese
 (ChunChang Luo) * Finnish (Jani Tiainen) * Lithuanian (Sergej Jegorov)

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1604 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 lang/fi.yml    | 170 ++++++++++++++++++++++++-------------------------
 lang/lt.yml    |  23 +++----
 lang/zh-tw.yml |  54 ++++++++--------
 3 files changed, 124 insertions(+), 123 deletions(-)

diff --git a/lang/fi.yml b/lang/fi.yml
index ad719dd6c..27f3415c6 100644
--- a/lang/fi.yml
+++ b/lang/fi.yml
@@ -16,7 +16,7 @@ actionview_datehelper_time_in_words_minute_less_than: vähemmän kuin minuuttia
 actionview_datehelper_time_in_words_minute_plural: %d minuuttia
 actionview_datehelper_time_in_words_minute_single: 1 minuutti
 actionview_datehelper_time_in_words_second_less_than: vähemmän kuin sekuntin
-actionview_datehelper_time_in_words_second_less_than_plural: vähemmän kuin %d sekunttia
+actionview_datehelper_time_in_words_second_less_than_plural: vähemmän kuin %d sekuntia
 actionview_instancetag_blank_option: Valitse, ole hyvä
 
 activerecord_error_inclusion: ei ole listalla
@@ -34,7 +34,7 @@ activerecord_error_not_a_number: ei ole numero
 activerecord_error_not_a_date: ei ole oikea päivä
 activerecord_error_greater_than_start_date: tulee olla aloituspäivän jälkeinen
 activerecord_error_not_same_project: ei kuulu samaan projektiin
-activerecord_error_circular_dependency: Tämä suhde loisi kiertävän suhteen.
+activerecord_error_circular_dependency: Tämä suhde loisi kehän.
 
 general_fmt_age: %d v.
 general_fmt_age_plural: %d vuotta
@@ -49,19 +49,19 @@ general_text_yes: 'kyllä'
 general_lang_name: 'Finnish (Suomi)'
 general_csv_separator: ','
 general_csv_decimal_separator: '.'
-general_csv_encoding: ISO-8859-1
-general_pdf_encoding: ISO-8859-1
+general_csv_encoding: ISO-8859-15
+general_pdf_encoding: ISO-8859-15
 general_day_names: Maanantai,Tiistai,Keskiviikko,Torstai,Perjantai,Lauantai,Sunnuntai
 general_first_day_of_week: '1'
 
 notice_account_updated: Tilin päivitys onnistui.
-notice_account_invalid_creditentials: Väärä käyttäjä tai salasana
+notice_account_invalid_creditentials: Virheellinen käyttäjätunnus tai salasana
 notice_account_password_updated: Salasanan päivitys onnistui.
 notice_account_wrong_password: Väärä salasana
 notice_account_register_done: Tilin luonti onnistui. Aktivoidaksesi tilin seuraa linkkiä joka välitettiin sähköpostiisi.
 notice_account_unknown_email: Tuntematon käyttäjä.
-notice_can_t_change_password: Tämä tili käyttää ulkoista autentikointi järjestelmää. Mahdotonta muuttaa salasanaa.
-notice_account_lost_email_sent: Sinulle on lähetetty sähköposti jossa on ohje miten vaihdat salasanasi.
+notice_can_t_change_password: Tämä tili käyttää ulkoista tunnistautumisjärjestelmää. Salasanaa ei voi muuttaa.
+notice_account_lost_email_sent: Sinulle on lähetetty sähköposti jossa on ohje kuinka vaihdat salasanasi.
 notice_account_activated: Tilisi on nyt aktivoitu, voit kirjautua sisälle.
 notice_successful_create: Luonti onnistui.
 notice_successful_update: Päivitys onnistui.
@@ -72,20 +72,20 @@ notice_locking_conflict: Toinen käyttäjä on päivittänyt tiedot.
 notice_not_authorized: Sinulla ei ole oikeutta näyttää tätä sivua.
 notice_email_sent: Sähköposti on lähetty osoitteeseen %s
 notice_email_error: Sähköpostilähetyksessä tapahtui virhe (%s)
-notice_feeds_access_key_reseted: RSS pääsy avaimesi on nollaantunut.
+notice_feeds_access_key_reseted: RSS salasana on nollaantunut.
 notice_failed_to_save_issues: "%d Tapahtum(an/ien) tallennus epäonnistui %d valitut: %s."
 notice_no_issue_selected: "Tapahtumia ei ole valittu! Valitse tapahtumat joita haluat muokata."
 notice_account_pending: "Tilisi on luotu ja odottaa ylläpitäjän hyväksyntää."
-notice_default_data_loaded: Vakio asetusten palautus onnistui.
+notice_default_data_loaded: Vakioasetusten palautus onnistui.
 
-error_can_t_load_default_data: "Vakio asetuksia ei voitu ladata: %s"
-error_scm_not_found: "Syötettä ja/tai versiota ei löydy säiliöstä."
-error_scm_command_failed: "Säiliöön pääsyssä tapahtui virhe: %s"
+error_can_t_load_default_data: "Vakioasetuksia ei voitu ladata: %s"
+error_scm_not_found: "Syötettä ja/tai versiota ei löydy tietovarastosta."
+error_scm_command_failed: "Tietovarastoon pääsyssä tapahtui virhe: %s"
 
 mail_subject_lost_password: Sinun %s salasanasi
-mail_body_lost_password: 'Vaihtaaksesi salasanasi, paina seuraavaa linkkiä:'
+mail_body_lost_password: 'Vaihtaaksesi salasanasi, napsauta seuraavaa linkkiä:'
 mail_subject_register: %s tilin aktivointi
-mail_body_register: 'Aktivoidaksesi tilisi, paina seuraavaa linkkiä:'
+mail_body_register: 'Aktivoidaksesi tilisi, napsauta seuraavaa linkkiä:'
 mail_body_account_information_external: Voit nyt käyttää "%s" tiliäsi kirjautuaksesi järjestelmään.
 mail_body_account_information: Sinun tilin tiedot
 mail_subject_account_activation_request: %s tilin aktivointi pyyntö
@@ -98,8 +98,8 @@ field_name: Nimi
 field_description: Kuvaus
 field_summary: Yhteenveto
 field_is_required: Vaaditaan
-field_firstname: Etu nimi
-field_lastname: Suku nimi
+field_firstname: Etunimi
+field_lastname: Sukunimi
 field_mail: Sähköposti
 field_filename: Tiedosto
 field_filesize: Koko
@@ -110,9 +110,9 @@ field_updated_on: Päivitetty
 field_field_format: Muoto
 field_is_for_all: Kaikille projekteille
 field_possible_values: Mahdolliset arvot
-field_regexp: Säännönmukainen ilmentymä (reg exp)
-field_min_length: Minimi pituus
-field_max_length: Maksimi pituus
+field_regexp: Säännöllinen lauseke (reg exp)
+field_min_length: Minimipituus
+field_max_length: Maksimipituus
 field_value: Arvo
 field_category: Luokka
 field_title: Otsikko
@@ -121,18 +121,18 @@ field_issue: Tapahtuma
 field_status: Tila
 field_notes: Muistiinpanot
 field_is_closed: Tapahtuma suljettu
-field_is_default: Vakio arvo
+field_is_default: Vakioarvo
 field_tracker: Tapahtuma
 field_subject: Aihe
 field_due_date: Määräaika
 field_assigned_to: Nimetty
 field_priority: Prioriteetti
-field_fixed_version: Kohde versio
+field_fixed_version: Kohdeversio
 field_user: Käyttäjä
 field_role: Rooli
 field_homepage: Kotisivu
 field_is_public: Julkinen
-field_parent: Alaprojekti
+field_parent: Aliprojekti
 field_is_in_chlog: Tapahtumat näytetään muutoslokissa
 field_is_in_roadmap: Tapahtumat näytetään roadmap näkymässä
 field_login: Kirjautuminen
@@ -146,23 +146,23 @@ field_new_password: Uusi salasana
 field_password_confirmation: Vahvistus
 field_version: Versio
 field_type: Tyyppi
-field_host: Isäntä
+field_host: Verkko-osoite
 field_port: Portti
 field_account: Tili
 field_base_dn: Base DN
-field_attr_login: Kirjautumis määre
-field_attr_firstname: Etuminen määre
-field_attr_lastname: Sukunimen määre
-field_attr_mail: Sähköpostin määre
+field_attr_login: Kirjautumismääre
+field_attr_firstname: Etuminenmääre
+field_attr_lastname: Sukunimenmääre
+field_attr_mail: Sähköpostinmääre
 field_onthefly: Automaattinen käyttäjien luonti
 field_start_date: Alku
 field_done_ratio: %% Tehty
-field_auth_source: Autentikointi muoto
+field_auth_source: Varmennusmuoto
 field_hide_mail: Piiloita sähköpostiosoitteeni
 field_comments: Kommentti
 field_url: URL
-field_start_page: Aloitus sivu
-field_subproject: Alaprojekti
+field_start_page: Aloitussivu
+field_subproject: Aliprojekti
 field_hours: Tuntia
 field_activity: Historia
 field_spent_on: Päivä
@@ -176,32 +176,32 @@ field_estimated_hours: Arvioitu aika
 field_column_names: Saraketta
 field_time_zone: Aikavyöhyke
 field_searchable: Haettava
-field_default_value: Vakio arvo
+field_default_value: Vakioarvo
 
 setting_app_title: Ohjelman otsikko
 setting_app_subtitle: Ohjelman alaotsikko
-setting_welcome_text: Tervetulo teksti
-setting_default_language: Vakio kieli
-setting_login_required: Pakollinen autentikointi
-setting_self_registration: Tee-Se-Itse rekisteröinti
-setting_attachment_max_size: Liitteen maksimi koko
-setting_issues_export_limit: Tapahtumien vienti rajoite
+setting_welcome_text: Tervehdysteksti
+setting_default_language: Vakiokieli
+setting_login_required: Pakollinen kirjautuminen
+setting_self_registration: Itserekisteröinti
+setting_attachment_max_size: Liitteen maksimikoko
+setting_issues_export_limit: Tapahtumien vientirajoite
 setting_mail_from: Lähettäjän sähköpostiosoite
-setting_bcc_recipients: Blind carbon copy vastaanottajat (bcc)
-setting_host_name: Isännän nimi
+setting_bcc_recipients: Vastaanottajat piilokopiona (bcc)
+setting_host_name: Verkko-osoite
 setting_text_formatting: Tekstin muotoilu
 setting_wiki_compression: Wiki historian pakkaus
 setting_feeds_limit: Syötteen sisällön raja
-setting_autofetch_changesets: Automaatisen haun souritukset
-setting_sys_api_enabled: Salli WS säiliön hallintaan
+setting_autofetch_changesets: Automaattisten muutosjoukkojen haku
+setting_sys_api_enabled: Salli WS tietovaraston hallintaan
 setting_commit_ref_keywords: Viittaavat hakusanat
 setting_commit_fix_keywords: Korjaavat hakusanat
 setting_autologin: Automaatinen kirjautuminen
 setting_date_format: Päivän muoto
 setting_time_format: Ajan muoto
 setting_cross_project_issue_relations: Salli projektien väliset tapahtuminen suhteet
-setting_issue_list_default_columns: Vakio sarakkeiden näyttö tapahtuma listauksessa
-setting_repositories_encodings: Säiliön koodaus
+setting_issue_list_default_columns: Vakiosarakkeiden näyttö tapahtumalistauksessa
+setting_repositories_encodings: Tietovaraston koodaus
 setting_emails_footer: Sähköpostin alatunniste
 setting_protocol: Protokolla
 setting_per_page_options: Sivun objektien määrän asetukset
@@ -236,8 +236,8 @@ label_workflow: Työnkulku
 label_issue_status: Tapahtuman tila
 label_issue_status_plural: Tapahtumien tilat
 label_issue_status_new: Uusi tila
-label_issue_category: Tapahtuma luokka
-label_issue_category_plural: Tapahtuma luokat
+label_issue_category: Tapahtumaluokka
+label_issue_category_plural: Tapahtumaluokat
 label_issue_category_new: Uusi luokka
 label_custom_field: Räätälöity kenttä
 label_custom_field_plural: Räätälöidyt kentät
@@ -250,9 +250,9 @@ label_please_login: Kirjaudu ole hyvä
 label_register: Rekisteröidy
 label_password_lost: Hukattu salasana
 label_home: Koti
-label_my_page: Minun sivu
-label_my_account: Minun tili
-label_my_projects: Minun projektit
+label_my_page: Omasivu
+label_my_account: Oma tili
+label_my_projects: Omat projektit
 label_administration: Ylläpito
 label_login: Kirjaudu sisään
 label_logout: Kirjaudu ulos
@@ -267,11 +267,11 @@ label_activity: Historia
 label_new: Uusi
 label_logged_as: Kirjauduttu nimellä
 label_environment: Ympäristö
-label_authentication: Autentikointi
-label_auth_source: Autentikointi tapa
-label_auth_source_new: Uusi autentikointi tapa
-label_auth_source_plural: Autentikointi tavat
-label_subproject_plural: Alaprojektit
+label_authentication: Varmennus
+label_auth_source: Varmennustapa
+label_auth_source_new: Uusi varmennustapa
+label_auth_source_plural: Varmennustavat
+label_subproject_plural: Aliprojektit
 label_min_max_length: Min - Max pituudet
 label_list: Lista
 label_date: Päivä
@@ -342,8 +342,8 @@ label_query_plural: Räätälöidyt haut
 label_query_new: Uusi haku
 label_filter_add: Lisää suodatin
 label_filter_plural: Suodattimet
-label_equals: yhtä kuin
-label_not_equals: epäsuuri kuin
+label_equals: sama kuin
+label_not_equals: eri kuin
 label_in_less_than: pienempi kuin
 label_in_more_than: suurempi kuin
 label_today: tänään
@@ -354,8 +354,8 @@ label_ago: päiviä sitten
 label_contains: sisältää
 label_not_contains: ei sisällä
 label_day_plural: päivää
-label_repository: Säiliö
-label_repository_plural: Säiliöt
+label_repository: Tietovarasto
+label_repository_plural: Tietovarastot
 label_browse: Selaus
 label_modification: %d muutos
 label_modification_plural: %d muutettu
@@ -367,7 +367,7 @@ label_deleted: poistettu
 label_latest_revision: Viimeisin versio
 label_latest_revision_plural: Viimeisimmät versiot
 label_view_revisions: Näytä versiot
-label_max_size: Maksimi koko
+label_max_size: Suurin koko
 label_sort_highest: Siirrä ylimmäiseksi
 label_sort_higher: Siirrä ylös
 label_sort_lower: Siirrä alas
@@ -412,15 +412,15 @@ label_loading: Lataa...
 label_relation_new: Uusi suhde
 label_relation_delete: Poista suhde
 label_relates_to: liittyy
-label_duplicates: kaksoiskappale
+label_duplicates: kopio
 label_blocks: estää
 label_blocked_by: estetty
 label_precedes: edeltää
 label_follows: seuraa
-label_end_to_start: loppu alkuun
-label_end_to_end: loppu loppuun
-label_start_to_start: alku alkuun
-label_start_to_end: alku loppuun
+label_end_to_start: lopusta alkuun
+label_end_to_end: lopusta loppuun
+label_start_to_start: alusta alkuun
+label_start_to_end: alusta loppuun
 label_stay_logged_in: Pysy kirjautuneena
 label_disabled: poistettu käytöstä
 label_show_completed_versions: Näytä valmiit versiot
@@ -440,14 +440,14 @@ label_week: Viikko
 label_language_based: Pohjautuen käyttäjän kieleen
 label_sort_by: Lajittele %s
 label_send_test_email: Lähetä testi sähköposti
-label_feeds_access_key_created_on: RSS pääsy avain luotiin %s sitten
+label_feeds_access_key_created_on: RSS salasana luotiin %s sitten
 label_module_plural: Moduulit
 label_added_time_by: Lisännyt %s %s sitten
 label_updated_time: Päivitetty %s sitten
 label_jump_to_a_project: Siirry projektiin...
 label_file_plural: Tiedostot
 label_changeset_plural: Muutosryhmät
-label_default_columns: Vakio sarakkeet
+label_default_columns: Vakiosarakkeet
 label_no_change_option: (Ei muutosta)
 label_bulk_edit_selected_issues: Perusmuotoile valitut tapahtumat
 label_theme: Teema
@@ -458,8 +458,8 @@ label_user_mail_option_selected: "Kaikista tapahtumista vain valitsemistani proj
 label_user_mail_option_none: "Vain tapahtumista joita valvon tai olen mukana"
 label_user_mail_no_self_notified: "En halua muistutusta muutoksista joita itse teen"
 label_registration_activation_by_email: tilin aktivointi sähköpostitse
-label_registration_manual_activation: manuaalinen tilin aktivointi
-label_registration_automatic_activation: automaattinen tilin aktivointi
+label_registration_manual_activation: tilin aktivointi käsin
+label_registration_automatic_activation: tilin aktivointi automaattisesti
 label_display_per_page: 'Per sivu: %s'
 label_age: Ikä
 label_change_properties: Vaihda asetuksia
@@ -508,7 +508,7 @@ status_locked: lukittu
 
 text_select_mail_notifications: Valitse tapahtumat joista tulisi lähettää sähköpostimuistutus.
 text_regexp_info: esim. ^[A-Z0-9]+$
-text_min_max_length_info: 0 tarkoitta, ei rajoitusta
+text_min_max_length_info: 0 tarkoittaa, ei rajoitusta
 text_project_destroy_confirmation: Oletko varma että haluat poistaa tämän projektin ja kaikki siihen kuuluvat tiedot?
 text_workflow_edit: Valitse rooli ja tapahtuma muokataksesi työnkulkua
 text_are_you_sure: Oletko varma?
@@ -522,7 +522,7 @@ text_project_identifier_info: 'Pienet kirjaimet (a-z), numerot ja viivat ovat sa
 text_caracters_maximum: %d merkkiä enintään.
 text_caracters_minimum: Täytyy olla vähintään %d merkkiä pitkä.
 text_length_between: Pituus välillä %d ja %d merkkiä.
-text_tracker_no_workflow: Ei työnkulkua määritelty tälle tapahtumalle
+text_tracker_no_workflow: Työnkulkua ei määritelty tälle tapahtumalle
 text_unallowed_characters: Kiellettyjä merkkejä
 text_comma_separated: Useat arvot sallittu (pilkku eroteltuna).
 text_issues_ref_in_commit_messages: Liitän ja korjaan ongelmia syötetyssä viestissä
@@ -532,8 +532,8 @@ text_wiki_destroy_confirmation: Oletko varma että haluat poistaa tämän wiki:n
 text_issue_category_destroy_question: Jotkut tapahtumat (%d) ovat nimetty tälle luokalle. Mitä haluat tehdä?
 text_issue_category_destroy_assignments: Poista luokan tehtävät
 text_issue_category_reassign_to: Vaihda tapahtuma tähän luokkaan
-text_user_mail_option: "Valitesemattomille projekteille, saat vain muistutuksen asioista joita seuraat tai olet mukana (esim. tapahtumat joissa olet tekijä tai nimettynä)."
-text_no_configuration_data: "Rooleja, tikettejä, tapahtumien tiloja ja työnkulkua ei vielä olla määritelty.\nOn erittäin suotavaa ladata vakioasetukset. Voit muuttaa sitä latauksen jälkeen."
+text_user_mail_option: "Valitsemattomille projekteille, saat vain muistutuksen asioista joita seuraat tai olet mukana (esim. tapahtumat joissa olet tekijä tai nimettynä)."
+text_no_configuration_data: "Rooleja, tapahtumien tiloja ja työnkulkua ei vielä olla määritelty.\nOn erittäin suotavaa ladata vakioasetukset. Voit muuttaa sitä latauksen jälkeen."
 text_load_default_configuration: Lataa vakioasetukset
 
 default_role_manager: Päälikkö
@@ -558,7 +558,7 @@ default_priority_immediate: Valitön
 default_activity_design: Suunnittelu
 default_activity_development: Kehitys
 
-enumeration_issue_priorities: Tapahtuman prioriteetit
+enumeration_issue_priorities: Tapahtuman tärkeysjärjestys
 enumeration_doc_categories: Dokumentin luokat
 enumeration_activities: Historia (ajan seuranta)
 label_associated_revisions: Liittyvät versiot
@@ -579,15 +579,15 @@ project_module_issue_tracking: Tapahtuman seuranta
 project_module_wiki: Wiki
 project_module_files: Tiedostot
 project_module_documents: Dokumentit
-project_module_repository: Säiliö
+project_module_repository: Tietovarasto
 project_module_news: Uutiset
 project_module_time_tracking: Ajan seuranta
-text_file_repository_writable: Kirjoitettava tiedosto säiliö
+text_file_repository_writable: Kirjoitettava tiedostovarasto
 text_default_administrator_account_changed: Vakio hallinoijan tunnus muutettu
 text_rmagick_available: RMagick saatavilla (valinnainen)
 button_configure: Asetukset
 label_plugins: Lisäosat
-label_ldap_authentication: LDAP autentikointi
+label_ldap_authentication: LDAP tunnistautuminen
 label_downloads_abbr: D/L
 label_add_another_file: Lisää uusi tiedosto
 label_this_month: tässä kuussa
@@ -610,7 +610,7 @@ label_date_to: ''
 setting_activity_days_default: Päivien esittäminen projektien historiassa
 label_date_from: ''
 label_in: ''
-setting_display_subprojects_issues: Näytä alaprojektien tapahtumat pääprojektissa oletusarvoisesti
+setting_display_subprojects_issues: Näytä aliprojektien tapahtumat pääprojektissa oletusarvoisesti
 field_comments_sorting: Näytä kommentit
 label_reverse_chronological_order: Käänteisessä aikajärjestyksessä
 label_preferences: Asetukset
@@ -618,15 +618,15 @@ setting_default_projects_public: Uudet projektit ovat oletuksena julkisia
 label_overall_activity: Kokonaishistoria
 error_scm_annotate: "Merkintää ei ole tai siihen ei voi lisätä selityksiä."
 label_planning: Suunnittelu
-text_subprojects_destroy_warning: 'Tämän alaprojekti(t): %s tullaan myös poistamaan.'
-label_and_its_subprojects: %s and its subprojects
-mail_body_reminder: "%d issue(s) that are assigned to you are due in the next %d days:"
-mail_subject_reminder: "%d issue(s) due in the next days"
-text_user_wrote: '%s wrote:'
-label_duplicated_by: duplicated by
-setting_enabled_scm: Enabled SCM
-text_enumeration_category_reassign_to: 'Reassign them to this value:'
-text_enumeration_destroy_question: '%d objects are assigned to this value.'
+text_subprojects_destroy_warning: 'Tämän aliprojekti(t): %s tullaan myös poistamaan.'
+label_and_its_subprojects: %s ja aliprojektit
+mail_body_reminder: "%d sinulle nimettyä tapahtuma(a) erääntyy %d päivä sisään:"
+mail_subject_reminder: "%d tapahtuma(a) erääntyy lähipäivinä"
+text_user_wrote: '%s kirjoitti:'
+label_duplicated_by: kopioinut
+setting_enabled_scm: Versionhallinta käytettävissä
+text_enumeration_category_reassign_to: 'Siirrä täksi arvoksi:'
+text_enumeration_destroy_question: '%d kohdetta on sijoitettu tälle arvolle.'
 label_incoming_emails: Incoming emails
 label_generate_key: Generate a key
 setting_mail_handler_api_enabled: Enable WS for incoming emails
diff --git a/lang/lt.yml b/lang/lt.yml
index df2e2b471..0f80a94d8 100644
--- a/lang/lt.yml
+++ b/lang/lt.yml
@@ -622,14 +622,15 @@ label_planning: Planavimas
 text_subprojects_destroy_warning: 'Šis(ie) subprojektas(ai): %s taip pat bus ištrintas(i).'
 label_and_its_subprojects: %s projektas ir jo subprojektai
 
-mail_body_reminder: "%d issue(s) that are assigned to you are due in the next %d days:"
-mail_subject_reminder: "%d issue(s) due in the next days"
-text_user_wrote: '%s wrote:'
-label_duplicated_by: duplicated by
-setting_enabled_scm: Enabled SCM
-text_enumeration_category_reassign_to: 'Reassign them to this value:'
-text_enumeration_destroy_question: '%d objects are assigned to this value.'
-label_incoming_emails: Incoming emails
-label_generate_key: Generate a key
-setting_mail_handler_api_enabled: Enable WS for incoming emails
-setting_mail_handler_api_key: API key
+mail_body_reminder: "%d darbas(ai), kurie yra jums priskirti, baigiasi po %d dienų(os):"
+mail_subject_reminder: "%d darbas(ai) po kelių dienų"
+text_user_wrote: '%s parašė:'
+label_duplicated_by: susiejo
+setting_enabled_scm: Įgalintas SCM
+text_enumeration_category_reassign_to: 'Priskirti juos šiai reikšmei:'
+text_enumeration_destroy_question: '%d objektai priskirti šiai reikšmei.'
+label_incoming_emails: Įeinantys laiškai
+label_generate_key: Generuoti raktą
+setting_mail_handler_api_enabled: Įgalinti WS įeinantiems laiškams
+setting_mail_handler_api_key: API raktas
+
diff --git a/lang/zh-tw.yml b/lang/zh-tw.yml
index 26ffa9461..9b43ed45e 100644
--- a/lang/zh-tw.yml
+++ b/lang/zh-tw.yml
@@ -113,7 +113,7 @@ field_created_on: 建立日期
 field_updated_on: 更新
 field_field_format: 格式
 field_is_for_all: 給所有專案
-field_possible_values: Possible values
+field_possible_values: 可能值
 field_regexp: 正規表示式
 field_min_length: 最小長度
 field_max_length: 最大長度
@@ -156,9 +156,9 @@ field_account: 帳戶
 field_base_dn: Base DN
 field_attr_login: 登入屬性
 field_attr_firstname: 名字屬性
-field_attr_lastname: Lastname attribute
-field_attr_mail: Email attribute
-field_onthefly: On-the-fly user creation
+field_attr_lastname: 姓氏屬性
+field_attr_mail: 電子郵件信箱屬性
+field_onthefly: 即時建立使用者
 field_start_date: 開始日期
 field_done_ratio: 完成百分比
 field_auth_source: 認證模式
@@ -171,13 +171,13 @@ field_hours: 小時
 field_activity: 活動
 field_spent_on: 日期
 field_identifier: 代碼
-field_is_filter: Used as a filter
-field_issue_to_id: Related issue
+field_is_filter: 用來作為過濾器
+field_issue_to_id: 相關項目
 field_delay: 逾期
 field_assignable: 項目可被分派至此角色
-field_redirect_existing_links: Redirect existing links
+field_redirect_existing_links: 重新導向現有連結
 field_estimated_hours: 預估工時
-field_column_names: Columns
+field_column_names: 欄位
 field_time_zone: 時區
 field_searchable: 可用做搜尋條件
 field_default_value: 預設值
@@ -196,7 +196,7 @@ setting_bcc_recipients: 使用密件副本 (BCC)
 setting_host_name: 主機名稱
 setting_text_formatting: 文字格式
 setting_wiki_compression: 壓縮 Wiki 歷史文章
-setting_feeds_limit: Feed content limit
+setting_feeds_limit: RSS 新聞限制
 setting_autofetch_changesets: 自動取得送交版次
 setting_default_projects_public: 新建立之專案預設為「公開」
 setting_sys_api_enabled: 啟用管理版本庫之網頁服務 (Web Service)
@@ -215,6 +215,8 @@ setting_user_format: 使用者顯示格式
 setting_activity_days_default: 專案活動顯示天數
 setting_display_subprojects_issues: 預設於父專案中顯示子專案的項目
 setting_enabled_scm: 啟用的 SCM
+setting_mail_handler_api_enabled: 啟用處理傳入電子郵件的服務
+setting_mail_handler_api_key: API 金鑰
 
 project_module_issue_tracking: 項目追蹤
 project_module_time_tracking: 工時追蹤
@@ -332,7 +334,7 @@ label_version_new: 建立新的版本
 label_version_plural: 版本
 label_confirmation: 確認
 label_export_to: 匯出至
-label_read: Read...
+label_read: 讀取...
 label_public_projects: 公開專案
 label_open_issues: 進行中
 label_open_issues_plural: 進行中
@@ -344,7 +346,7 @@ label_current_status: 目前狀態
 label_new_statuses_allowed: 可變更至以下狀態
 label_all: 全部
 label_none: 空值
-label_nobody: nobody
+label_nobody: 無名
 label_next: 下一頁
 label_previous: 上一頁
 label_used_by: Used by
@@ -354,7 +356,7 @@ label_per_page: 每頁
 label_calendar: 日曆
 label_months_from: 個月, 開始月份
 label_gantt: 甘特圖
-label_internal: Internal
+label_internal: 內部
 label_last_changes: 最近 %d 個變更
 label_change_view_all: 檢視所有變更
 label_personalize_page: 自訂版面
@@ -455,10 +457,10 @@ label_blocks: 阻擋
 label_blocked_by: 被阻擋
 label_precedes: 優先於
 label_follows: 跟隨於
-label_end_to_start: end to start
-label_end_to_end: end to end
-label_start_to_start: start to start
-label_start_to_end: start to end
+label_end_to_start: 結束─開始
+label_end_to_end: 結束─結束
+label_start_to_start: 開始─開始
+label_start_to_end: 開始─結束
 label_stay_logged_in: 維持已登入狀態
 label_disabled: 關閉
 label_show_completed_versions: 顯示已完成的版本
@@ -502,7 +504,7 @@ label_registration_activation_by_email: 透過電子郵件啟用帳戶
 label_registration_manual_activation: 手動啟用帳戶
 label_registration_automatic_activation: 自動啟用帳戶
 label_display_per_page: '每頁顯示: %s 個'
-label_age: Age
+label_age: 年齡
 label_change_properties: 變更屬性
 label_general: 一般
 label_more: 更多 »
@@ -516,6 +518,8 @@ label_preferences: 偏好選項
 label_chronological_order: 以時間由遠至近排序
 label_reverse_chronological_order: 以時間由近至遠排序
 label_planning: 計劃表
+label_incoming_emails: 傳入的電子郵件
+label_generate_key: 產生金鑰
 
 button_login: 登入
 button_submit: 送出
@@ -533,10 +537,10 @@ button_clear: 清除
 button_lock: 鎖定
 button_unlock: 解除鎖定
 button_download: 下載
-button_list: List
+button_list: 清單
 button_view: 檢視
 button_move: 移動
-button_back: Back
+button_back: 返回
 button_cancel: 取消
 button_activate: 啟用
 button_sort: 排序
@@ -586,8 +590,8 @@ text_wiki_destroy_confirmation: 您確定要刪除這個 wiki 和其中的所有
 text_issue_category_destroy_question: 有 (%d) 個項目被指派到此分類. 請選擇您想要的動作？
 text_issue_category_destroy_assignments: 移除這些項目的分類
 text_issue_category_reassign_to: 重新指派這些項目至其它分類
-text_user_mail_option: "For unselected projects, you will only receive notifications about things you watch or you're involved in (eg. issues you're the author or assignee)."
-text_no_configuration_data: "Roles, trackers, issue statuses and workflow have not been configured yet.\nIt is highly recommended to load the default configuration. You will be able to modify it once loaded."
+text_user_mail_option: "對於那些未被選擇的專案，將只會接收到您正在觀察中，或是參與中的項目通知。（「參與中的項目」包含您建立的或是指派給您的項目）"
+text_no_configuration_data: "角色、追蹤器、項目狀態與流程尚未被設定完成。\n強烈建議您先載入預設的設定，然後修改成您想要的設定。"
 text_load_default_configuration: 載入預設組態
 text_status_changed_by_changeset: 已套用至變更集 %s.
 text_issues_destroy_confirmation: '確定刪除已選擇的項目？'
@@ -600,6 +604,8 @@ text_destroy_time_entries: 刪除已報工的時數
 text_assign_time_entries_to_project: 指定已報工的時數至專案中
 text_reassign_time_entries: '重新指定已報工的時數至此項目：'
 text_user_wrote: '%s 先前提到:'
+text_enumeration_destroy_question: '目前有 %d 個物件使用此列舉值。'
+text_enumeration_category_reassign_to: '重新設定其列舉值為：'
 
 default_role_manager: 管理人員
 default_role_developper: 開發人員
@@ -626,9 +632,3 @@ default_activity_development: 開發
 enumeration_issue_priorities: 項目優先權
 enumeration_doc_categories: 文件分類
 enumeration_activities: 活動 (時間追蹤)
-text_enumeration_category_reassign_to: 'Reassign them to this value:'
-text_enumeration_destroy_question: '%d objects are assigned to this value.'
-label_incoming_emails: Incoming emails
-label_generate_key: Generate a key
-setting_mail_handler_api_enabled: Enable WS for incoming emails
-setting_mail_handler_api_key: API key

From 47064c02f1445235c0fa3f69b25a3b29bcc2eca4 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 29 Jun 2008 19:50:07 +0000
Subject: [PATCH 582/710] Makes issue update link work without javascript
 (#1337).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1605 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/helpers/application_helper.rb | 2 +-
 app/views/issues/show.rhtml       | 2 +-
 public/javascripts/application.js | 6 ++++++
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 16904c251..4ba3445b7 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -51,7 +51,7 @@ module ApplicationHelper
     link_to(name, "#", :onclick => onclick)
   end
   
-  def show_and_goto_link(name, id, options={})
+  def show_and_goto_js(id, options={})
     onclick = "Element.show('#{id}'); "
     onclick << (options[:focus] ? "Form.Element.focus('#{options[:focus]}'); " : "this.blur(); ")
     onclick << "Element.scrollTo('#{id}'); "
diff --git a/app/views/issues/show.rhtml b/app/views/issues/show.rhtml
index a3b26be12..b71a02ee7 100644
--- a/app/views/issues/show.rhtml
+++ b/app/views/issues/show.rhtml
@@ -1,5 +1,5 @@
 <div class="contextual">
-<%= show_and_goto_link(l(:button_update), 'update', :class => 'icon icon-edit', :accesskey => accesskey(:edit)) if authorize_for('issues', 'edit') %>
+<%= link_to_if_authorized(l(:button_update), {:controller => 'issues', :action => 'edit', :id => @issue }, :onclick => 'showAndScrollTo("update", "notes"); return false;', :class => 'icon icon-edit', :accesskey => accesskey(:edit)) %>
 <%= link_to_if_authorized l(:button_log_time), {:controller => 'timelog', :action => 'edit', :issue_id => @issue}, :class => 'icon icon-time' %>
 <%= watcher_tag(@issue, User.current) %>
 <%= link_to_if_authorized l(:button_copy), {:controller => 'issues', :action => 'new', :project_id => @project, :copy_from => @issue }, :class => 'icon icon-copy' %>
diff --git a/public/javascripts/application.js b/public/javascripts/application.js
index 4e5b67e55..1674044f8 100644
--- a/public/javascripts/application.js
+++ b/public/javascripts/application.js
@@ -10,6 +10,12 @@ function checkAll (id, checked) {
 	}
 }
 
+function showAndScrollTo(id, focus) {
+	Element.show(id);
+	if (focus!=null) { Form.Element.focus(focus); }
+	Element.scrollTo(id);
+}
+
 var fileFieldCount = 1;
 
 function addFileField() {

From 0f5a34b7ab8bc217c404fe7335b74843cb03fbce Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 29 Jun 2008 19:51:14 +0000
Subject: [PATCH 583/710] Removes no longer needed helper method (r1605).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1606 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/helpers/application_helper.rb | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 4ba3445b7..090d7b058 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -51,14 +51,6 @@ module ApplicationHelper
     link_to(name, "#", :onclick => onclick)
   end
   
-  def show_and_goto_js(id, options={})
-    onclick = "Element.show('#{id}'); "
-    onclick << (options[:focus] ? "Form.Element.focus('#{options[:focus]}'); " : "this.blur(); ")
-    onclick << "Element.scrollTo('#{id}'); "
-    onclick << "return false;"
-    link_to(name, "#", options.merge(:onclick => onclick))
-  end
-  
   def image_to_function(name, function, html_options = {})
     html_options.symbolize_keys!
     tag(:input, html_options.merge({ 

From b29b39290a35059af29d3c747deafe25d222be7f Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 29 Jun 2008 19:56:20 +0000
Subject: [PATCH 584/710] Redirects back after clicking watch/unwatch links
 without javascript (#1337).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1607 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/watchers_controller.rb | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/controllers/watchers_controller.rb b/app/controllers/watchers_controller.rb
index 206dc0843..014779b7f 100644
--- a/app/controllers/watchers_controller.rb
+++ b/app/controllers/watchers_controller.rb
@@ -23,18 +23,22 @@ class WatchersController < ApplicationController
     user = User.current
     @watched.add_watcher(user)
     respond_to do |format|
-      format.html { render :text => 'Watcher added.', :layout => true }
+      format.html { redirect_to :back }
       format.js { render(:update) {|page| page.replace_html 'watcher', watcher_link(@watched, user)} }
     end
+  rescue RedirectBackError
+    render :text => 'Watcher added.', :layout => true
   end
   
   def remove
     user = User.current
     @watched.remove_watcher(user)
     respond_to do |format|
-      format.html { render :text => 'Watcher removed.', :layout => true }
+      format.html { redirect_to :back }
       format.js { render(:update) {|page| page.replace_html 'watcher', watcher_link(@watched, user)} }
     end
+  rescue RedirectBackError
+    render :text => 'Watcher removed.', :layout => true
   end
 
 private

From ee608f24f4f1126a53460df623ad50b2fd625c5d Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Mon, 30 Jun 2008 17:31:50 +0000
Subject: [PATCH 585/710] Fixed: Comment too long message when updating issue
 (#1550).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1608 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/models/time_entry.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/time_entry.rb b/app/models/time_entry.rb
index 61b53d1c0..759f9bed0 100644
--- a/app/models/time_entry.rb
+++ b/app/models/time_entry.rb
@@ -32,7 +32,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 :comments, :maximum => 255
+  validates_length_of :comments, :maximum => 255, :allow_nil => true
 
   def after_initialize
     if new_record? && self.activity.nil?

From 87a16f395a754ff3bb703322e714af47705faeaa Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Mon, 30 Jun 2008 17:35:40 +0000
Subject: [PATCH 586/710] Fixes relative paths to images in wiki_syntax.html
 (#1218).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1609 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 public/help/wiki_syntax.html | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/public/help/wiki_syntax.html b/public/help/wiki_syntax.html
index 6a0e10022..846fe1bf7 100644
--- a/public/help/wiki_syntax.html
+++ b/public/help/wiki_syntax.html
@@ -22,13 +22,13 @@ table td h3 { font-size: 1.2em; text-align: left; }
 
 <table width="100%">
 <tr><th colspan="3">Font Styles</th></tr>
-<tr><th><img src="../../images/jstoolbar/bt_strong.png" style="border: 1px solid #bbb;" alt="Strong" /></th><td width="50%">*Strong*</td><td width="50%"><strong>Strong</strong></td></tr>
-<tr><th><img src="../../images/jstoolbar/bt_em.png" style="border: 1px solid #bbb;" alt="Italic" /></th><td>_Italic_</td><td><em>Italic</em></td></tr>
-<tr><th><img src="../../images/jstoolbar/bt_ins.png" style="border: 1px solid #bbb;" alt="Underline" /></th><td>+Underline+</td><td><ins>Underline</ins></td></tr>
-<tr><th><img src="../../images/jstoolbar/bt_del.png" style="border: 1px solid #bbb;" alt="Deleted" /></th><td>-Deleted-</td><td><del>Deleted</del></td></tr>
+<tr><th><img src="../images/jstoolbar/bt_strong.png" style="border: 1px solid #bbb;" alt="Strong" /></th><td width="50%">*Strong*</td><td width="50%"><strong>Strong</strong></td></tr>
+<tr><th><img src="../images/jstoolbar/bt_em.png" style="border: 1px solid #bbb;" alt="Italic" /></th><td>_Italic_</td><td><em>Italic</em></td></tr>
+<tr><th><img src="../images/jstoolbar/bt_ins.png" style="border: 1px solid #bbb;" alt="Underline" /></th><td>+Underline+</td><td><ins>Underline</ins></td></tr>
+<tr><th><img src="../images/jstoolbar/bt_del.png" style="border: 1px solid #bbb;" alt="Deleted" /></th><td>-Deleted-</td><td><del>Deleted</del></td></tr>
 <tr><th></th><td>??Quote??</td><td><cite>Quote</cite></td></tr>
-<tr><th><img src="../../images/jstoolbar/bt_code.png" style="border: 1px solid #bbb;" alt="Inline Code" /></th><td>@Inline Code@</td><td><code>Inline Code</code></td></tr>
-<tr><th><img src="../../images/jstoolbar/bt_pre.png" style="border: 1px solid #bbb;" alt="Preformatted text" /></th><td>&lt;pre><br />&nbsp;lines<br />&nbsp;of code<br />&lt;/pre></td><td>
+<tr><th><img src="../images/jstoolbar/bt_code.png" style="border: 1px solid #bbb;" alt="Inline Code" /></th><td>@Inline Code@</td><td><code>Inline Code</code></td></tr>
+<tr><th><img src="../images/jstoolbar/bt_pre.png" style="border: 1px solid #bbb;" alt="Preformatted text" /></th><td>&lt;pre><br />&nbsp;lines<br />&nbsp;of code<br />&lt;/pre></td><td>
 <pre>
  lines
  of code
@@ -36,27 +36,27 @@ table td h3 { font-size: 1.2em; text-align: left; }
 </td></tr>
 
 <tr><th colspan="3">Lists</th></tr>
-<tr><th><img src="../../images/jstoolbar/bt_ul.png" style="border: 1px solid #bbb;" alt="Unordered list" /></th><td>* Item 1<br />* Item 2</td><td><ul><li>Item 1</li><li>Item 2</li></ul></td></tr>
-<tr><th><img src="../../images/jstoolbar/bt_ol.png" style="border: 1px solid #bbb;" alt="Ordered list" /></th><td># Item 1<br /># Item 2</td><td><ol><li>Item 1</li><li>Item 2</li></ol></td></tr>
+<tr><th><img src="../images/jstoolbar/bt_ul.png" style="border: 1px solid #bbb;" alt="Unordered list" /></th><td>* Item 1<br />* Item 2</td><td><ul><li>Item 1</li><li>Item 2</li></ul></td></tr>
+<tr><th><img src="../images/jstoolbar/bt_ol.png" style="border: 1px solid #bbb;" alt="Ordered list" /></th><td># Item 1<br /># Item 2</td><td><ol><li>Item 1</li><li>Item 2</li></ol></td></tr>
 
 <tr><th colspan="3">Headings</th></tr>
-<tr><th><img src="../../images/jstoolbar/bt_h1.png" style="border: 1px solid #bbb;" alt="Heading 1" /></th><td>h1. Title 1</td><td><h1>Title 1</h1></td></tr>
-<tr><th><img src="../../images/jstoolbar/bt_h2.png" style="border: 1px solid #bbb;" alt="Heading 2" /></th><td>h2. Title 2</td><td><h2>Title 2</h2></td></tr>
-<tr><th><img src="../../images/jstoolbar/bt_h3.png" style="border: 1px solid #bbb;" alt="Heading 3" /></th><td>h3. Title 3</td><td><h3>Title 3</h3></td></tr>
+<tr><th><img src="../images/jstoolbar/bt_h1.png" style="border: 1px solid #bbb;" alt="Heading 1" /></th><td>h1. Title 1</td><td><h1>Title 1</h1></td></tr>
+<tr><th><img src="../images/jstoolbar/bt_h2.png" style="border: 1px solid #bbb;" alt="Heading 2" /></th><td>h2. Title 2</td><td><h2>Title 2</h2></td></tr>
+<tr><th><img src="../images/jstoolbar/bt_h3.png" style="border: 1px solid #bbb;" alt="Heading 3" /></th><td>h3. Title 3</td><td><h3>Title 3</h3></td></tr>
 
 <tr><th colspan="3">Links</th></tr>
 <tr><th></th><td>http://foo.bar</td><td><a href="#">http://foo.bar</a></td></tr>
 <tr><th></th><td>"Foo":http://foo.bar</td><td><a href="#">Foo</a></td></tr>
 
 <tr><th colspan="3">Redmine links</th></tr>
-<tr><th><img src="../../images/jstoolbar/bt_link.png" style="border: 1px solid #bbb;" alt="Link to a Wiki page" /></th><td>[[Wiki page]]</td><td><a href="#">Wiki page</a></td></tr>
+<tr><th><img src="../images/jstoolbar/bt_link.png" style="border: 1px solid #bbb;" alt="Link to a Wiki page" /></th><td>[[Wiki page]]</td><td><a href="#">Wiki page</a></td></tr>
 <tr><th></th><td>Issue #12</td><td>Issue <a href="#">#12</a></td></tr>
 <tr><th></th><td>Revision r43</td><td>Revision <a href="#">r43</a></td></tr>
 <tr><th></th><td>commit:"f30e13e43"</td><td><a href="#">f30e13e4</a></td></tr>
 <tr><th></th><td>source:some/file</td><td><a href="#">source:some/file</a></td></tr>
 
 <tr><th colspan="3">Inline images</th></tr>
-<tr><th><img src="../../images/jstoolbar/bt_img.png" style="border: 1px solid #bbb;" alt="Image" /></th><td>!<em>image_url</em>!</td><td></td></tr>
+<tr><th><img src="../images/jstoolbar/bt_img.png" style="border: 1px solid #bbb;" alt="Image" /></th><td>!<em>image_url</em>!</td><td></td></tr>
 <tr><th></th><td>!<em>attached_image</em>!</td><td></td></tr>
 </table>
 

From 72076d391e44f7510365b13491c624ac9404f7a6 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Mon, 30 Jun 2008 17:57:53 +0000
Subject: [PATCH 587/710] Fixed: issues always created with default tracker
 (#1553).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1610 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/issues_controller.rb      | 3 ++-
 test/fixtures/projects_trackers.yml       | 4 ++++
 test/functional/issues_controller_test.rb | 3 ++-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index e844d242f..6014116b3 100644
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -115,7 +115,8 @@ class IssuesController < ApplicationController
     @issue = Issue.new
     @issue.copy_from(params[:copy_from]) if params[:copy_from]
     @issue.project = @project
-    @issue.tracker ||= @project.trackers.find(params[:tracker_id] ? params[:tracker_id] : :first)
+    # Tracker must be set before custom field values
+    @issue.tracker ||= @project.trackers.find((params[:issue] && params[:issue][:tracker_id]) || params[:tracker_id] || :first)
     if @issue.tracker.nil?
       flash.now[:error] = 'No tracker is associated to this project. Please check the Project settings.'
       render :nothing => true, :layout => true
diff --git a/test/fixtures/projects_trackers.yml b/test/fixtures/projects_trackers.yml
index 8eb7d85ab..31f7f943a 100644
--- a/test/fixtures/projects_trackers.yml
+++ b/test/fixtures/projects_trackers.yml
@@ -38,3 +38,7 @@ projects_trackers_010:
 projects_trackers_011: 
   project_id: 4
   tracker_id: 2
+projects_trackers_012: 
+  project_id: 1
+  tracker_id: 3
+  
\ No newline at end of file
diff --git a/test/functional/issues_controller_test.rb b/test/functional/issues_controller_test.rb
index ac1f4f834..22f9a3baf 100644
--- a/test/functional/issues_controller_test.rb
+++ b/test/functional/issues_controller_test.rb
@@ -199,7 +199,7 @@ class IssuesControllerTest < Test::Unit::TestCase
   def test_post_new
     @request.session[:user_id] = 2
     post :new, :project_id => 1, 
-               :issue => {:tracker_id => 1,
+               :issue => {:tracker_id => 3,
                           :subject => 'This is the test_new issue',
                           :description => 'This is the description',
                           :priority_id => 5,
@@ -210,6 +210,7 @@ class IssuesControllerTest < Test::Unit::TestCase
     issue = Issue.find_by_subject('This is the test_new issue')
     assert_not_nil issue
     assert_equal 2, issue.author_id
+    assert_equal 3, issue.tracker_id
     assert_nil issue.estimated_hours
     v = issue.custom_values.find_by_custom_field_id(2)
     assert_not_nil v

From be57c20cd8392e8454f2e68d3ab2ce9d044c12e9 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Mon, 30 Jun 2008 21:52:29 +0000
Subject: [PATCH 588/710] Fixes quick jump to a revision.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1611 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/repositories/revision.rhtml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/repositories/revision.rhtml b/app/views/repositories/revision.rhtml
index a43aa4536..d0ff1de6d 100644
--- a/app/views/repositories/revision.rhtml
+++ b/app/views/repositories/revision.rhtml
@@ -13,9 +13,9 @@
   <% end -%>
   &#187;&nbsp;
   
-  <% form_tag do %>
+  <% form_tag({:controller => 'repositories', :action => 'revision', :id => @project, :rev => nil}, :method => :get) do %>
     <%= text_field_tag 'rev', @rev, :size => 5 %>
-    <%= submit_tag 'OK' %>
+    <%= submit_tag 'OK', :name => nil %>
   <% end %>
 </div>
 

From 9703f576d96c113f9c73a87f85ad7da3241525b2 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Wed, 2 Jul 2008 17:27:16 +0000
Subject: [PATCH 589/710] Escapes HTML tags.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1612 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/account/show.rhtml  | 6 +++---
 app/views/projects/show.rhtml | 2 +-
 app/views/users/list.rhtml    | 8 ++++----
 app/views/welcome/index.rhtml | 2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/views/account/show.rhtml b/app/views/account/show.rhtml
index 97212b377..2d0731b42 100644
--- a/app/views/account/show.rhtml
+++ b/app/views/account/show.rhtml
@@ -1,7 +1,7 @@
 <h2><%=h @user.name %></h2>
 
 <p>
-<%= mail_to @user.mail unless @user.pref.hide_mail %>
+<%= mail_to(h(@user.mail)) unless @user.pref.hide_mail %>
 <ul>
     <li><%=l(:label_registered_on)%>: <%= format_date(@user.created_on) %></li>
 <% for custom_value in @custom_values %>
@@ -16,8 +16,8 @@
 <h3><%=l(:label_project_plural)%></h3>
 <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>
+	<li><%= link_to(h(membership.project.name), :controller => 'projects', :action => 'show', :id => membership.project) %>
+    (<%=h membership.role.name %>, <%= format_date(membership.created_on) %>)</li>
 <% end %>
 </ul>
 <% end %>
diff --git a/app/views/projects/show.rhtml b/app/views/projects/show.rhtml
index 6c82c80b4..d058ecf0f 100644
--- a/app/views/projects/show.rhtml
+++ b/app/views/projects/show.rhtml
@@ -3,7 +3,7 @@
 <div class="splitcontentleft">
 	<%= textilizable @project.description %>	
 	<ul>
-	<% unless @project.homepage.blank? %><li><%=l(:field_homepage)%>: <%= auto_link @project.homepage %></li><% end %>
+	<% unless @project.homepage.blank? %><li><%=l(:field_homepage)%>: <%= auto_link(h(@project.homepage)) %></li><% end %>
     <% if @subprojects.any? %>
  	<li><%=l(:label_subproject_plural)%>: <%= @subprojects.collect{|p| link_to(h(p.name), :action => 'show', :id => p)}.join(", ") %></li>
     <% end %>
diff --git a/app/views/users/list.rhtml b/app/views/users/list.rhtml
index d89672d19..a6b0e5429 100644
--- a/app/views/users/list.rhtml
+++ b/app/views/users/list.rhtml
@@ -26,10 +26,10 @@
   <tbody>
 <% for user in @users -%>
   <tr class="user <%= cycle("odd", "even") %> <%= %w(anon active registered locked)[user.status] %>">
-	<td class="username"><%= link_to user.login, :action => 'edit', :id => user %></td>
-	<td class="firstname"><%= user.firstname %></td>
-	<td class="lastname"><%= user.lastname %></td>
-	<td class="email"><%= user.mail %></td>
+	<td class="username"><%= link_to h(user.login), :action => 'edit', :id => user %></td>
+	<td class="firstname"><%= h(user.firstname) %></td>
+	<td class="lastname"><%= h(user.lastname) %></td>
+	<td class="email"><%= h(user.mail) %></td>
 	<td align="center"><%= image_tag('true.png') if user.admin? %></td>
 	<td class="created_on" align="center"><%= format_time(user.created_on) %></td>
 	<td class="last_login_on" align="center"><%= format_time(user.last_login_on) unless user.last_login_on.nil? %></td>
diff --git a/app/views/welcome/index.rhtml b/app/views/welcome/index.rhtml
index 8c25897bd..855248c5e 100644
--- a/app/views/welcome/index.rhtml
+++ b/app/views/welcome/index.rhtml
@@ -18,7 +18,7 @@
 		<ul>
 		<% for project in @projects %>
 			<li>
-			<%= link_to project.name, :controller => 'projects', :action => 'show', :id => project %> (<%= format_time(project.created_on) %>)
+			<%= link_to h(project.name), :controller => 'projects', :action => 'show', :id => project %> (<%= format_time(project.created_on) %>)
 			<%= textilizable project.short_description, :project => project %>
 			</li>
 		<% end %>

From 22558f77094dce4d489dac410abd7b74e48cdcb0 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Thu, 3 Jul 2008 16:22:51 +0000
Subject: [PATCH 590/710] Fixes test broken by r1610.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1616 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 test/unit/project_test.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/unit/project_test.rb b/test/unit/project_test.rb
index f24e7d44f..91fab8208 100644
--- a/test/unit/project_test.rb
+++ b/test/unit/project_test.rb
@@ -118,6 +118,7 @@ class ProjectTest < Test::Unit::TestCase
   
   def test_rolled_up_trackers
     parent = Project.find(1)
+    parent.trackers = Tracker.find([1,2])
     child = parent.children.find(3)
   
     assert_equal [1, 2], parent.tracker_ids

From 7cdd88a6ce3632c801223b33e5ccc2b9fc13651e Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Fri, 4 Jul 2008 17:58:14 +0000
Subject: [PATCH 591/710] Merged Rails 2.1 compatibility branch.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1623 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/projects_controller.rb        |   2 +-
 app/helpers/repositories_helper.rb            |   4 +
 app/models/user_preference.rb                 |   6 +-
 .../repositories/_dir_list_content.rhtml      |   4 +-
 app/views/repositories/_navigation.rhtml      |   4 +-
 app/views/repositories/_revisions.rhtml       |   2 +-
 app/views/repositories/changes.rhtml          |   6 +-
 app/views/repositories/revision.rhtml         |   2 +-
 config/boot.rb                                | 120 +++++-
 config/environment.rb                         |  31 +-
 config/initializers/10-patches.rb             |  17 +
 config/initializers/20-mime_types.rb          |   4 +
 config/initializers/30-redmine.rb             |   7 +
 db/migrate/072_add_enumerations_position.rb   |   2 +-
 db/migrate/078_add_custom_fields_position.rb  |   2 +-
 lib/tabular_form_builder.rb                   |   2 +-
 script/dbconsole                              |   3 +
 script/performance/request                    |   3 +
 script/process/inspector                      |   3 +
 test/functional/projects_controller_test.rb   |   2 +-
 test/integration/issues_test.rb               |   3 +
 test/test_helper.rb                           |  17 -
 test/unit/role_test.rb                        |   2 +-
 test/unit/tracker_test.rb                     |   2 +-
 vendor/plugins/acts_as_versioned/Rakefile     | 362 +++++++++---------
 .../lib/acts_as_versioned.rb                  | 195 ++++++----
 .../acts_as_versioned/test/abstract_unit.rb   |  27 +-
 .../acts_as_versioned/test/fixtures/widget.rb |   2 +-
 .../acts_as_versioned/test/migration_test.rb  |  22 +-
 .../acts_as_versioned/test/versioned_test.rb  | 172 +++++----
 vendor/plugins/rfpdf/init.rb                  |   8 +-
 vendor/plugins/rfpdf/lib/rfpdf/view.rb        |  12 +-
 32 files changed, 629 insertions(+), 421 deletions(-)
 create mode 100644 config/initializers/10-patches.rb
 create mode 100644 config/initializers/20-mime_types.rb
 create mode 100644 config/initializers/30-redmine.rb
 create mode 100644 script/dbconsole
 create mode 100644 script/performance/request
 create mode 100644 script/process/inspector

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index a37ae09a8..87a93c815 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -52,7 +52,7 @@ class ProjectsController < ApplicationController
     respond_to do |format|
       format.html { 
         @project_tree = projects.group_by {|p| p.parent || p}
-        @project_tree.each_key {|p| @project_tree[p] -= [p]} 
+        @project_tree.keys.each {|p| @project_tree[p] -= [p]} 
       }
       format.atom {
         render_feed(projects.sort_by(&:created_on).reverse.slice(0, Setting.feeds_limit.to_i), 
diff --git a/app/helpers/repositories_helper.rb b/app/helpers/repositories_helper.rb
index e94ae2e7f..4ef337c26 100644
--- a/app/helpers/repositories_helper.rb
+++ b/app/helpers/repositories_helper.rb
@@ -22,6 +22,10 @@ module RepositoriesHelper
     txt.to_s[0,8]
   end
   
+  def to_path_param(path)
+    path.to_s.split(%r{[/\\]}).select {|p| !p.blank?}
+  end
+  
   def to_utf8(str)
     return str if /\A[\r\n\t\x20-\x7e]*\Z/n.match(str) # for us-ascii
     @encodings ||= Setting.repositories_encodings.split(',').collect(&:strip)
diff --git a/app/models/user_preference.rb b/app/models/user_preference.rb
index 73e4a50c6..3daa7a740 100644
--- a/app/models/user_preference.rb
+++ b/app/models/user_preference.rb
@@ -42,8 +42,10 @@ class UserPreference < ActiveRecord::Base
     if attribute_present? attr_name
       super
     else
-      self.others ||= {}
-      self.others.store attr_name, value
+      h = read_attribute(:others).dup || {}
+      h.update(attr_name => value)
+      write_attribute(:others, h)
+      value
     end
   end
   
diff --git a/app/views/repositories/_dir_list_content.rhtml b/app/views/repositories/_dir_list_content.rhtml
index c30216533..20473a264 100644
--- a/app/views/repositories/_dir_list_content.rhtml
+++ b/app/views/repositories/_dir_list_content.rhtml
@@ -4,14 +4,14 @@
 <tr id="<%= tr_id %>" class="<%= params[:parent_id] %> entry <%= entry.kind %>">
 <td style="padding-left: <%=18 * depth%>px;" class="filename">
 <% if entry.is_dir? %>
-<span class="expander" onclick="<%=  remote_function :url => {:action => 'browse', :id => @project, :path => entry.path, :rev => @rev, :depth => (depth + 1), :parent_id => tr_id},
+<span class="expander" onclick="<%=  remote_function :url => {:action => 'browse', :id => @project, :path => to_path_param(entry.path), :rev => @rev, :depth => (depth + 1), :parent_id => tr_id},
                   :update => { :success => tr_id },
                   :position => :after,
                   :success => "scmEntryLoaded('#{tr_id}')",
                   :condition => "scmEntryClick('#{tr_id}')"%>">&nbsp</span>
 <% end %>
 <%=  link_to h(entry.name),
-          {:action => (entry.is_dir? ? 'browse' : 'changes'), :id => @project, :path => entry.path, :rev => @rev},
+          {:action => (entry.is_dir? ? 'browse' : 'changes'), :id => @project, :path => to_path_param(entry.path), :rev => @rev},
           :class => (entry.is_dir? ? 'icon icon-folder' : 'icon icon-file')%>
 </td>
 <td class="size"><%= (entry.size ? number_to_human_size(entry.size) : "?") unless entry.is_dir? %></td>
diff --git a/app/views/repositories/_navigation.rhtml b/app/views/repositories/_navigation.rhtml
index b7ac989bc..25a15f496 100644
--- a/app/views/repositories/_navigation.rhtml
+++ b/app/views/repositories/_navigation.rhtml
@@ -10,10 +10,10 @@ dirs.each do |dir|
     link_path << '/' unless link_path.empty?
     link_path << "#{dir}" 
     %>
-    / <%= link_to h(dir), :action => 'browse', :id => @project, :path => link_path, :rev => @rev %>
+    / <%= link_to h(dir), :action => 'browse', :id => @project, :path => to_path_param(link_path), :rev => @rev %>
 <% end %>
 <% if filename %>
-    / <%= link_to h(filename), :action => 'changes', :id => @project, :path => "#{link_path}/#{filename}", :rev => @rev %>
+    / <%= link_to h(filename), :action => 'changes', :id => @project, :path => to_path_param("#{link_path}/#{filename}"), :rev => @rev %>
 <% end %>
 
 <%= "@ #{revision}" if revision %>
diff --git a/app/views/repositories/_revisions.rhtml b/app/views/repositories/_revisions.rhtml
index 1bcf0208c..a938fecb8 100644
--- a/app/views/repositories/_revisions.rhtml
+++ b/app/views/repositories/_revisions.rhtml
@@ -1,4 +1,4 @@
-<% form_tag({:controller => 'repositories', :action => 'diff', :id => @project, :path => path}, :method => :get) do %>
+<% form_tag({:controller => 'repositories', :action => 'diff', :id => @project, :path => to_path_param(path)}, :method => :get) do %>
 <table class="list changesets">
 <thead><tr>
 <th>#</th>
diff --git a/app/views/repositories/changes.rhtml b/app/views/repositories/changes.rhtml
index 341c6cba5..85695ec45 100644
--- a/app/views/repositories/changes.rhtml
+++ b/app/views/repositories/changes.rhtml
@@ -4,12 +4,12 @@
 
 <p>
 <% if @repository.supports_cat? %>
-    <%= link_to l(:button_view), {:action => 'entry', :id => @project, :path => @path, :rev => @rev } %> |
+    <%= link_to l(:button_view), {:action => 'entry', :id => @project, :path => to_path_param(@path), :rev => @rev } %> |
 <% end %>
 <% if @repository.supports_annotate? %>
-    <%= link_to l(:button_annotate), {:action => 'annotate', :id => @project, :path => @path, :rev => @rev } %> |
+    <%= link_to l(:button_annotate), {:action => 'annotate', :id => @project, :path => to_path_param(@path), :rev => @rev } %> |
 <% end %>
-<%= link_to(l(:button_download), {:action => 'entry', :id => @project, :path => @path, :rev => @rev, :format => 'raw' }) if @repository.supports_cat? %>
+<%= link_to(l(:button_download), {:action => 'entry', :id => @project, :path => to_path_param(@path), :rev => @rev, :format => 'raw' }) if @repository.supports_cat? %>
 <%= "(#{number_to_human_size(@entry.size)})" if @entry.size %>
 </p>
 
diff --git a/app/views/repositories/revision.rhtml b/app/views/repositories/revision.rhtml
index d0ff1de6d..04c0e2108 100644
--- a/app/views/repositories/revision.rhtml
+++ b/app/views/repositories/revision.rhtml
@@ -55,7 +55,7 @@
 <%= "(#{change.revision})" unless change.revision.blank?  %></td>
 <td align="right">
 <% if change.action == "M" %>
-<%= link_to l(:label_view_diff), :action => 'diff', :id => @project, :path => without_leading_slash(change.relative_path), :rev => @changeset.revision %>
+<%= link_to l(:label_view_diff), :action => 'diff', :id => @project, :path => to_path_param(change.relative_path), :rev => @changeset.revision %>
 <% end %>
 </td>
 </tr>
diff --git a/config/boot.rb b/config/boot.rb
index 9fcd50fe3..cd21fb9ea 100644
--- a/config/boot.rb
+++ b/config/boot.rb
@@ -1,19 +1,109 @@
-# Don't change this file. Configuration is done in config/environment.rb and config/environments/*.rb
+# Don't change this file!
+# Configure your app in config/environment.rb and config/environments/*.rb
 
-unless defined?(RAILS_ROOT)
-  root_path = File.join(File.dirname(__FILE__), '..')
-  unless RUBY_PLATFORM =~ /mswin32/
-    require 'pathname'
-    root_path = Pathname.new(root_path).cleanpath(true).to_s
+RAILS_ROOT = "#{File.dirname(__FILE__)}/.." unless defined?(RAILS_ROOT)
+
+module Rails
+  class << self
+    def boot!
+      unless booted?
+        preinitialize
+        pick_boot.run
+      end
+    end
+
+    def booted?
+      defined? Rails::Initializer
+    end
+
+    def pick_boot
+      (vendor_rails? ? VendorBoot : GemBoot).new
+    end
+
+    def vendor_rails?
+      File.exist?("#{RAILS_ROOT}/vendor/rails")
+    end
+
+    def preinitialize
+      load(preinitializer_path) if File.exist?(preinitializer_path)
+    end
+
+    def preinitializer_path
+      "#{RAILS_ROOT}/config/preinitializer.rb"
+    end
+  end
+
+  class Boot
+    def run
+      load_initializer
+      Rails::Initializer.run(:set_load_path)
+    end
+  end
+
+  class VendorBoot < Boot
+    def load_initializer
+      require "#{RAILS_ROOT}/vendor/rails/railties/lib/initializer"
+      Rails::Initializer.run(:install_gem_spec_stubs)
+    end
+  end
+
+  class GemBoot < Boot
+    def load_initializer
+      self.class.load_rubygems
+      load_rails_gem
+      require 'initializer'
+    end
+
+    def load_rails_gem
+      if version = self.class.gem_version
+        gem 'rails', version
+      else
+        gem 'rails'
+      end
+    rescue Gem::LoadError => load_error
+      $stderr.puts %(Missing the Rails #{version} gem. Please `gem install -v=#{version} rails`, update your RAILS_GEM_VERSION setting in config/environment.rb for the Rails version you do have installed, or comment out RAILS_GEM_VERSION to use the latest version installed.)
+      exit 1
+    end
+
+    class << self
+      def rubygems_version
+        Gem::RubyGemsVersion if defined? Gem::RubyGemsVersion
+      end
+
+      def gem_version
+        if defined? RAILS_GEM_VERSION
+          RAILS_GEM_VERSION
+        elsif ENV.include?('RAILS_GEM_VERSION')
+          ENV['RAILS_GEM_VERSION']
+        else
+          parse_gem_version(read_environment_rb)
+        end
+      end
+
+      def load_rubygems
+        require 'rubygems'
+
+        unless rubygems_version >= '0.9.4'
+          $stderr.puts %(Rails requires RubyGems >= 0.9.4 (you have #{rubygems_version}). Please `gem update --system` and try again.)
+          exit 1
+        end
+
+      rescue LoadError
+        $stderr.puts %(Rails requires RubyGems >= 0.9.4. Please install RubyGems and try again: http://rubygems.rubyforge.org)
+        exit 1
+      end
+
+      def parse_gem_version(text)
+        $1 if text =~ /^[^#]*RAILS_GEM_VERSION\s*=\s*["']([!~<>=]*\s*[\d.]+)["']/
+      end
+
+      private
+        def read_environment_rb
+          File.read("#{RAILS_ROOT}/config/environment.rb")
+        end
+    end
   end
-  RAILS_ROOT = root_path
 end
 
-if File.directory?("#{RAILS_ROOT}/vendor/rails")
-  require "#{RAILS_ROOT}/vendor/rails/railties/lib/initializer"
-else
-  require 'rubygems'
-  require 'initializer'
-end
-
-Rails::Initializer.run(:set_load_path)
+# All that for this:
+Rails.boot!
diff --git a/config/environment.rb b/config/environment.rb
index f09c1009a..b0f16c3e1 100644
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -5,7 +5,7 @@
 # ENV['RAILS_ENV'] ||= 'production'
 
 # Specifies gem version of Rails to use when vendor/rails is not present
-RAILS_GEM_VERSION = '2.0.2' unless defined? RAILS_GEM_VERSION
+RAILS_GEM_VERSION = '2.1.0' unless defined? RAILS_GEM_VERSION
 
 # Bootstrap the Rails environment, frameworks, and default configuration
 require File.join(File.dirname(__FILE__), 'boot')
@@ -71,32 +71,3 @@ Rails::Initializer.run do |config|
 	config.action_mailer.delivery_method = :smtp  
 
 end
-
-ActiveRecord::Errors.default_error_messages = {
-  :inclusion => "activerecord_error_inclusion",
-  :exclusion => "activerecord_error_exclusion",
-  :invalid => "activerecord_error_invalid",
-  :confirmation => "activerecord_error_confirmation",
-  :accepted  => "activerecord_error_accepted",
-  :empty => "activerecord_error_empty",
-  :blank => "activerecord_error_blank",
-  :too_long => "activerecord_error_too_long",
-  :too_short => "activerecord_error_too_short",
-  :wrong_length => "activerecord_error_wrong_length",
-  :taken => "activerecord_error_taken",
-  :not_a_number => "activerecord_error_not_a_number"
-}
-
-ActionView::Base.field_error_proc = Proc.new{ |html_tag, instance| "#{html_tag}" }
-
-Mime::SET << Mime::CSV unless Mime::SET.include?(Mime::CSV)
-Mime::Type.register 'application/pdf', :pdf
-
-GLoc.set_config :default_language => :en
-GLoc.clear_strings
-GLoc.set_kcode
-GLoc.load_localized_strings
-GLoc.set_config(:raise_string_not_found_errors => false)
-
-require 'redmine'
-
diff --git a/config/initializers/10-patches.rb b/config/initializers/10-patches.rb
new file mode 100644
index 000000000..fcc091997
--- /dev/null
+++ b/config/initializers/10-patches.rb
@@ -0,0 +1,17 @@
+
+ActiveRecord::Errors.default_error_messages = {
+  :inclusion => "activerecord_error_inclusion",
+  :exclusion => "activerecord_error_exclusion",
+  :invalid => "activerecord_error_invalid",
+  :confirmation => "activerecord_error_confirmation",
+  :accepted  => "activerecord_error_accepted",
+  :empty => "activerecord_error_empty",
+  :blank => "activerecord_error_blank",
+  :too_long => "activerecord_error_too_long",
+  :too_short => "activerecord_error_too_short",
+  :wrong_length => "activerecord_error_wrong_length",
+  :taken => "activerecord_error_taken",
+  :not_a_number => "activerecord_error_not_a_number"
+}
+
+ActionView::Base.field_error_proc = Proc.new{ |html_tag, instance| "#{html_tag}" }
diff --git a/config/initializers/20-mime_types.rb b/config/initializers/20-mime_types.rb
new file mode 100644
index 000000000..269742b16
--- /dev/null
+++ b/config/initializers/20-mime_types.rb
@@ -0,0 +1,4 @@
+# Add new mime types for use in respond_to blocks:
+
+Mime::SET << Mime::CSV unless Mime::SET.include?(Mime::CSV)
+Mime::Type.register 'application/pdf', :pdf
diff --git a/config/initializers/30-redmine.rb b/config/initializers/30-redmine.rb
new file mode 100644
index 000000000..f2a9f6a30
--- /dev/null
+++ b/config/initializers/30-redmine.rb
@@ -0,0 +1,7 @@
+GLoc.set_config :default_language => :en
+GLoc.clear_strings
+GLoc.set_kcode
+GLoc.load_localized_strings
+GLoc.set_config(:raise_string_not_found_errors => false)
+
+require 'redmine'
diff --git a/db/migrate/072_add_enumerations_position.rb b/db/migrate/072_add_enumerations_position.rb
index e0beaf395..22558a6e9 100644
--- a/db/migrate/072_add_enumerations_position.rb
+++ b/db/migrate/072_add_enumerations_position.rb
@@ -1,7 +1,7 @@
 class AddEnumerationsPosition < ActiveRecord::Migration
   def self.up
     add_column(:enumerations, :position, :integer, :default => 1) unless Enumeration.column_names.include?('position')
-    Enumeration.find(:all).group_by(&:opt).each_value  do |enums|
+    Enumeration.find(:all).group_by(&:opt).each do |opt, enums|
       enums.each_with_index do |enum, i|
         # do not call model callbacks
         Enumeration.update_all "position = #{i+1}", {:id => enum.id}
diff --git a/db/migrate/078_add_custom_fields_position.rb b/db/migrate/078_add_custom_fields_position.rb
index 7ee8abb58..1c42ae732 100644
--- a/db/migrate/078_add_custom_fields_position.rb
+++ b/db/migrate/078_add_custom_fields_position.rb
@@ -1,7 +1,7 @@
 class AddCustomFieldsPosition < ActiveRecord::Migration
   def self.up
     add_column(:custom_fields, :position, :integer, :default => 1)
-    CustomField.find(:all).group_by(&:type).each_value  do |fields|
+    CustomField.find(:all).group_by(&:type).each  do |t, fields|
       fields.each_with_index do |field, i|
         # do not call model callbacks
         CustomField.update_all "position = #{i+1}", {:id => field.id}
diff --git a/lib/tabular_form_builder.rb b/lib/tabular_form_builder.rb
index 5b331fe3f..88e35a6d2 100644
--- a/lib/tabular_form_builder.rb
+++ b/lib/tabular_form_builder.rb
@@ -22,7 +22,7 @@ class TabularFormBuilder < ActionView::Helpers::FormBuilder
   
   def initialize(object_name, object, template, options, proc)
     set_language_if_valid options.delete(:lang)
-    @object_name, @object, @template, @options, @proc = object_name, object, template, options, proc        
+    super
   end      
       
   (field_helpers - %w(radio_button hidden_field) + %w(date_select)).each do |selector|
diff --git a/script/dbconsole b/script/dbconsole
new file mode 100644
index 000000000..caa60ce82
--- /dev/null
+++ b/script/dbconsole
@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+require File.dirname(__FILE__) + '/../config/boot'
+require 'commands/dbconsole'
diff --git a/script/performance/request b/script/performance/request
new file mode 100644
index 000000000..ae3f38c74
--- /dev/null
+++ b/script/performance/request
@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+require File.dirname(__FILE__) + '/../../config/boot'
+require 'commands/performance/request'
diff --git a/script/process/inspector b/script/process/inspector
new file mode 100644
index 000000000..bf25ad86d
--- /dev/null
+++ b/script/process/inspector
@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+require File.dirname(__FILE__) + '/../../config/boot'
+require 'commands/process/inspector'
diff --git a/test/functional/projects_controller_test.rb b/test/functional/projects_controller_test.rb
index 88c0319ba..88a9fae60 100644
--- a/test/functional/projects_controller_test.rb
+++ b/test/functional/projects_controller_test.rb
@@ -38,7 +38,7 @@ class ProjectsControllerTest < Test::Unit::TestCase
     assert_template 'index'
     assert_not_nil assigns(:project_tree)
     # Root project as hash key
-    assert assigns(:project_tree).has_key?(Project.find(1))
+    assert assigns(:project_tree).keys.include?(Project.find(1))
     # Subproject in corresponding value
     assert assigns(:project_tree)[Project.find(1)].include?(Project.find(3))
   end
diff --git a/test/integration/issues_test.rb b/test/integration/issues_test.rb
index 1b57ba8f8..2ef933fc2 100644
--- a/test/integration/issues_test.rb
+++ b/test/integration/issues_test.rb
@@ -20,8 +20,11 @@ require "#{File.dirname(__FILE__)}/../test_helper"
 class IssuesTest < ActionController::IntegrationTest
   fixtures :projects, 
            :users,
+           :roles,
+           :members,
            :trackers,
            :projects_trackers,
+           :enabled_modules,
            :issue_statuses,
            :issues,
            :enumerations,
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 1340f9c35..f61b88d8c 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -65,20 +65,3 @@ class Test::Unit::TestCase
     Attachment.storage_path = "#{RAILS_ROOT}/tmp/test/attachments"
   end
 end
-
-
-# ActionController::TestUploadedFile bug
-# see http://dev.rubyonrails.org/ticket/4635
-class String
-  def original_filename
-    "testfile.txt"
-  end
-  
-  def content_type
-    "text/plain"
-  end
-  
-  def read
-    self.to_s
-  end
-end
diff --git a/test/unit/role_test.rb b/test/unit/role_test.rb
index 5e0d16753..b98af2e36 100644
--- a/test/unit/role_test.rb
+++ b/test/unit/role_test.rb
@@ -26,7 +26,7 @@ class RoleTest < Test::Unit::TestCase
     
     target = Role.new(:name => 'Target')
     assert target.save
-    assert target.workflows.copy(source)
+    target.workflows.copy(source)
     target.reload
     assert_equal 90, target.workflows.size
   end
diff --git a/test/unit/tracker_test.rb b/test/unit/tracker_test.rb
index 406bdd6db..6dab8890c 100644
--- a/test/unit/tracker_test.rb
+++ b/test/unit/tracker_test.rb
@@ -26,7 +26,7 @@ class TrackerTest < Test::Unit::TestCase
     
     target = Tracker.new(:name => 'Target')
     assert target.save
-    assert target.workflows.copy(source)
+    target.workflows.copy(source)
     target.reload
     assert_equal 89, target.workflows.size
   end
diff --git a/vendor/plugins/acts_as_versioned/Rakefile b/vendor/plugins/acts_as_versioned/Rakefile
index 3ae69e961..5bccb5d8d 100644
--- a/vendor/plugins/acts_as_versioned/Rakefile
+++ b/vendor/plugins/acts_as_versioned/Rakefile
@@ -1,182 +1,182 @@
-require 'rubygems'
-
-Gem::manage_gems
-
-require 'rake/rdoctask'
-require 'rake/packagetask'
-require 'rake/gempackagetask'
-require 'rake/testtask'
-require 'rake/contrib/rubyforgepublisher'
-
-PKG_NAME           = 'acts_as_versioned'
-PKG_VERSION        = '0.3.1'
-PKG_FILE_NAME      = "#{PKG_NAME}-#{PKG_VERSION}"
-PROD_HOST          = "technoweenie@bidwell.textdrive.com"
-RUBY_FORGE_PROJECT = 'ar-versioned'
-RUBY_FORGE_USER    = 'technoweenie'
-
-desc 'Default: run unit tests.'
-task :default => :test
-
-desc 'Test the calculations plugin.'
-Rake::TestTask.new(:test) do |t|
-  t.libs << 'lib'
-  t.pattern = 'test/**/*_test.rb'
-  t.verbose = true
-end
-
-desc 'Generate documentation for the calculations plugin.'
-Rake::RDocTask.new(:rdoc) do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = "#{PKG_NAME} -- Simple versioning with active record models"
-  rdoc.options << '--line-numbers --inline-source'
-  rdoc.rdoc_files.include('README', 'CHANGELOG', 'RUNNING_UNIT_TESTS')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
-
-spec = Gem::Specification.new do |s|
-  s.name            = PKG_NAME
-  s.version         = PKG_VERSION
-  s.platform        = Gem::Platform::RUBY
-  s.summary         = "Simple versioning with active record models"
-  s.files           = FileList["{lib,test}/**/*"].to_a + %w(README MIT-LICENSE CHANGELOG RUNNING_UNIT_TESTS)
-  s.files.delete      "acts_as_versioned_plugin.sqlite.db"
-  s.files.delete      "acts_as_versioned_plugin.sqlite3.db"
-  s.files.delete      "test/debug.log"
-  s.require_path    = 'lib'
-  s.autorequire     = 'acts_as_versioned'
-  s.has_rdoc        = true
-  s.test_files      = Dir['test/**/*_test.rb']
-  s.add_dependency    'activerecord', '>= 1.10.1'
-  s.add_dependency    'activesupport', '>= 1.1.1'
-  s.author          = "Rick Olson"
-  s.email           = "technoweenie@gmail.com"
-  s.homepage        = "http://techno-weenie.net"
-end
-
-Rake::GemPackageTask.new(spec) do |pkg|
-  pkg.need_tar = true
-end
-
-desc "Publish the API documentation"
-task :pdoc => [:rdoc] do
-  Rake::RubyForgePublisher.new(RUBY_FORGE_PROJECT, RUBY_FORGE_USER).upload
-end
-
-desc 'Publish the gem and API docs'
-task :publish => [:pdoc, :rubyforge_upload]
-
-desc "Publish the release files to RubyForge."
-task :rubyforge_upload => :package do
-  files = %w(gem tgz).map { |ext| "pkg/#{PKG_FILE_NAME}.#{ext}" }
-
-  if RUBY_FORGE_PROJECT then
-    require 'net/http'
-    require 'open-uri'
-
-    project_uri = "http://rubyforge.org/projects/#{RUBY_FORGE_PROJECT}/"
-    project_data = open(project_uri) { |data| data.read }
-    group_id = project_data[/[?&]group_id=(\d+)/, 1]
-    raise "Couldn't get group id" unless group_id
-
-    # This echos password to shell which is a bit sucky
-    if ENV["RUBY_FORGE_PASSWORD"]
-      password = ENV["RUBY_FORGE_PASSWORD"]
-    else
-      print "#{RUBY_FORGE_USER}@rubyforge.org's password: "
-      password = STDIN.gets.chomp
-    end
-
-    login_response = Net::HTTP.start("rubyforge.org", 80) do |http|
-      data = [
-        "login=1",
-        "form_loginname=#{RUBY_FORGE_USER}",
-        "form_pw=#{password}"
-      ].join("&")
-      http.post("/account/login.php", data)
-    end
-
-    cookie = login_response["set-cookie"]
-    raise "Login failed" unless cookie
-    headers = { "Cookie" => cookie }
-
-    release_uri = "http://rubyforge.org/frs/admin/?group_id=#{group_id}"
-    release_data = open(release_uri, headers) { |data| data.read }
-    package_id = release_data[/[?&]package_id=(\d+)/, 1]
-    raise "Couldn't get package id" unless package_id
-
-    first_file = true
-    release_id = ""
-
-    files.each do |filename|
-      basename  = File.basename(filename)
-      file_ext  = File.extname(filename)
-      file_data = File.open(filename, "rb") { |file| file.read }
-
-      puts "Releasing #{basename}..."
-
-      release_response = Net::HTTP.start("rubyforge.org", 80) do |http|
-        release_date = Time.now.strftime("%Y-%m-%d %H:%M")
-        type_map = {
-          ".zip"    => "3000",
-          ".tgz"    => "3110",
-          ".gz"     => "3110",
-          ".gem"    => "1400"
-        }; type_map.default = "9999"
-        type = type_map[file_ext]
-        boundary = "rubyqMY6QN9bp6e4kS21H4y0zxcvoor"
-
-        query_hash = if first_file then
-          {
-            "group_id" => group_id,
-            "package_id" => package_id,
-            "release_name" => PKG_FILE_NAME,
-            "release_date" => release_date,
-            "type_id" => type,
-            "processor_id" => "8000", # Any
-            "release_notes" => "",
-            "release_changes" => "",
-            "preformatted" => "1",
-            "submit" => "1"
-          }
-        else
-          {
-            "group_id" => group_id,
-            "release_id" => release_id,
-            "package_id" => package_id,
-            "step2" => "1",
-            "type_id" => type,
-            "processor_id" => "8000", # Any
-            "submit" => "Add This File"
-          }
-        end
-
-        query = "?" + query_hash.map do |(name, value)|
-          [name, URI.encode(value)].join("=")
-        end.join("&")
-
-        data = [
-          "--" + boundary,
-          "Content-Disposition: form-data; name=\"userfile\"; filename=\"#{basename}\"",
-          "Content-Type: application/octet-stream",
-          "Content-Transfer-Encoding: binary",
-          "", file_data, ""
-          ].join("\x0D\x0A")
-
-        release_headers = headers.merge(
-          "Content-Type" => "multipart/form-data; boundary=#{boundary}"
-        )
-
-        target = first_file ? "/frs/admin/qrs.php" : "/frs/admin/editrelease.php"
-        http.post(target + query, data, release_headers)
-      end
-
-      if first_file then
-        release_id = release_response.body[/release_id=(\d+)/, 1]
-        raise("Couldn't get release id") unless release_id
-      end
-
-      first_file = false
-    end
-  end
+require 'rubygems'
+
+Gem::manage_gems
+
+require 'rake/rdoctask'
+require 'rake/packagetask'
+require 'rake/gempackagetask'
+require 'rake/testtask'
+require 'rake/contrib/rubyforgepublisher'
+
+PKG_NAME           = 'acts_as_versioned'
+PKG_VERSION        = '0.3.1'
+PKG_FILE_NAME      = "#{PKG_NAME}-#{PKG_VERSION}"
+PROD_HOST          = "technoweenie@bidwell.textdrive.com"
+RUBY_FORGE_PROJECT = 'ar-versioned'
+RUBY_FORGE_USER    = 'technoweenie'
+
+desc 'Default: run unit tests.'
+task :default => :test
+
+desc 'Test the calculations plugin.'
+Rake::TestTask.new(:test) do |t|
+  t.libs << 'lib'
+  t.pattern = 'test/**/*_test.rb'
+  t.verbose = true
+end
+
+desc 'Generate documentation for the calculations plugin.'
+Rake::RDocTask.new(:rdoc) do |rdoc|
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title    = "#{PKG_NAME} -- Simple versioning with active record models"
+  rdoc.options << '--line-numbers --inline-source'
+  rdoc.rdoc_files.include('README', 'CHANGELOG', 'RUNNING_UNIT_TESTS')
+  rdoc.rdoc_files.include('lib/**/*.rb')
+end
+
+spec = Gem::Specification.new do |s|
+  s.name            = PKG_NAME
+  s.version         = PKG_VERSION
+  s.platform        = Gem::Platform::RUBY
+  s.summary         = "Simple versioning with active record models"
+  s.files           = FileList["{lib,test}/**/*"].to_a + %w(README MIT-LICENSE CHANGELOG RUNNING_UNIT_TESTS)
+  s.files.delete      "acts_as_versioned_plugin.sqlite.db"
+  s.files.delete      "acts_as_versioned_plugin.sqlite3.db"
+  s.files.delete      "test/debug.log"
+  s.require_path    = 'lib'
+  s.autorequire     = 'acts_as_versioned'
+  s.has_rdoc        = true
+  s.test_files      = Dir['test/**/*_test.rb']
+  s.add_dependency    'activerecord', '>= 1.10.1'
+  s.add_dependency    'activesupport', '>= 1.1.1'
+  s.author          = "Rick Olson"
+  s.email           = "technoweenie@gmail.com"
+  s.homepage        = "http://techno-weenie.net"
+end
+
+Rake::GemPackageTask.new(spec) do |pkg|
+  pkg.need_tar = true
+end
+
+desc "Publish the API documentation"
+task :pdoc => [:rdoc] do
+  Rake::RubyForgePublisher.new(RUBY_FORGE_PROJECT, RUBY_FORGE_USER).upload
+end
+
+desc 'Publish the gem and API docs'
+task :publish => [:pdoc, :rubyforge_upload]
+
+desc "Publish the release files to RubyForge."
+task :rubyforge_upload => :package do
+  files = %w(gem tgz).map { |ext| "pkg/#{PKG_FILE_NAME}.#{ext}" }
+
+  if RUBY_FORGE_PROJECT then
+    require 'net/http'
+    require 'open-uri'
+
+    project_uri = "http://rubyforge.org/projects/#{RUBY_FORGE_PROJECT}/"
+    project_data = open(project_uri) { |data| data.read }
+    group_id = project_data[/[?&]group_id=(\d+)/, 1]
+    raise "Couldn't get group id" unless group_id
+
+    # This echos password to shell which is a bit sucky
+    if ENV["RUBY_FORGE_PASSWORD"]
+      password = ENV["RUBY_FORGE_PASSWORD"]
+    else
+      print "#{RUBY_FORGE_USER}@rubyforge.org's password: "
+      password = STDIN.gets.chomp
+    end
+
+    login_response = Net::HTTP.start("rubyforge.org", 80) do |http|
+      data = [
+        "login=1",
+        "form_loginname=#{RUBY_FORGE_USER}",
+        "form_pw=#{password}"
+      ].join("&")
+      http.post("/account/login.php", data)
+    end
+
+    cookie = login_response["set-cookie"]
+    raise "Login failed" unless cookie
+    headers = { "Cookie" => cookie }
+
+    release_uri = "http://rubyforge.org/frs/admin/?group_id=#{group_id}"
+    release_data = open(release_uri, headers) { |data| data.read }
+    package_id = release_data[/[?&]package_id=(\d+)/, 1]
+    raise "Couldn't get package id" unless package_id
+
+    first_file = true
+    release_id = ""
+
+    files.each do |filename|
+      basename  = File.basename(filename)
+      file_ext  = File.extname(filename)
+      file_data = File.open(filename, "rb") { |file| file.read }
+
+      puts "Releasing #{basename}..."
+
+      release_response = Net::HTTP.start("rubyforge.org", 80) do |http|
+        release_date = Time.now.strftime("%Y-%m-%d %H:%M")
+        type_map = {
+          ".zip"    => "3000",
+          ".tgz"    => "3110",
+          ".gz"     => "3110",
+          ".gem"    => "1400"
+        }; type_map.default = "9999"
+        type = type_map[file_ext]
+        boundary = "rubyqMY6QN9bp6e4kS21H4y0zxcvoor"
+
+        query_hash = if first_file then
+          {
+            "group_id" => group_id,
+            "package_id" => package_id,
+            "release_name" => PKG_FILE_NAME,
+            "release_date" => release_date,
+            "type_id" => type,
+            "processor_id" => "8000", # Any
+            "release_notes" => "",
+            "release_changes" => "",
+            "preformatted" => "1",
+            "submit" => "1"
+          }
+        else
+          {
+            "group_id" => group_id,
+            "release_id" => release_id,
+            "package_id" => package_id,
+            "step2" => "1",
+            "type_id" => type,
+            "processor_id" => "8000", # Any
+            "submit" => "Add This File"
+          }
+        end
+
+        query = "?" + query_hash.map do |(name, value)|
+          [name, URI.encode(value)].join("=")
+        end.join("&")
+
+        data = [
+          "--" + boundary,
+          "Content-Disposition: form-data; name=\"userfile\"; filename=\"#{basename}\"",
+          "Content-Type: application/octet-stream",
+          "Content-Transfer-Encoding: binary",
+          "", file_data, ""
+          ].join("\x0D\x0A")
+
+        release_headers = headers.merge(
+          "Content-Type" => "multipart/form-data; boundary=#{boundary}"
+        )
+
+        target = first_file ? "/frs/admin/qrs.php" : "/frs/admin/editrelease.php"
+        http.post(target + query, data, release_headers)
+      end
+
+      if first_file then
+        release_id = release_response.body[/release_id=(\d+)/, 1]
+        raise("Couldn't get release id") unless release_id
+      end
+
+      first_file = false
+    end
+  end
 end
\ No newline at end of file
diff --git a/vendor/plugins/acts_as_versioned/lib/acts_as_versioned.rb b/vendor/plugins/acts_as_versioned/lib/acts_as_versioned.rb
index 5e6f6e636..bba10c437 100644
--- a/vendor/plugins/acts_as_versioned/lib/acts_as_versioned.rb
+++ b/vendor/plugins/acts_as_versioned/lib/acts_as_versioned.rb
@@ -22,7 +22,7 @@
 module ActiveRecord #:nodoc:
   module Acts #:nodoc:
     # Specify this act if you want to save a copy of the row in a versioned table.  This assumes there is a 
-    # versioned table ready and that your model has a version field.  This works with optimisic locking if the lock_version
+    # versioned table ready and that your model has a version field.  This works with optimistic locking if the lock_version
     # column is present as well.
     #
     # The class for the versioned model is derived the first time it is seen. Therefore, if you change your database schema you have to restart
@@ -49,9 +49,24 @@ module ActiveRecord #:nodoc:
     #   page.revert_to(page.versions.last) # using versioned instance
     #   page.title         # => 'hello world'
     #
+    #   page.versions.earliest # efficient query to find the first version
+    #   page.versions.latest   # efficient query to find the most recently created version
+    #
+    #
+    # Simple Queries to page between versions
+    #
+    #   page.versions.before(version) 
+    #   page.versions.after(version)
+    #
+    # Access the previous/next versions from the versioned model itself
+    #
+    #   version = page.versions.latest
+    #   version.previous # go back one version
+    #   version.next     # go forward one version
+    #
     # See ActiveRecord::Acts::Versioned::ClassMethods#acts_as_versioned for configuration options
     module Versioned
-      CALLBACKS = [:set_new_version, :save_version_on_create, :save_version?, :clear_changed_attributes]
+      CALLBACKS = [:set_new_version, :save_version_on_create, :save_version?, :clear_altered_attributes]
       def self.included(base) # :nodoc:
         base.extend ClassMethods
       end
@@ -80,7 +95,7 @@ module ActiveRecord #:nodoc:
         #     end
         #
         # * <tt>if_changed</tt> - Simple way of specifying attributes that are required to be changed before saving a model.  This takes
-        #   either a symbol or array of symbols.  WARNING - This will attempt to overwrite any attribute setters you may have.  
+        #   either a symbol or array of symbols.  WARNING - This will attempt to overwrite any attribute setters you may have.
         #   Use this instead if you want to write your own attribute setters (and ignore if_changed):
         # 
         #     def name=(new_name)
@@ -133,7 +148,7 @@ module ActiveRecord #:nodoc:
         #       # that create_table does
         #       Post.create_versioned_table
         #     end
-        #   
+        # 
         #     def self.down
         #       Post.drop_versioned_table
         #     end
@@ -157,11 +172,11 @@ module ActiveRecord #:nodoc:
           return if self.included_modules.include?(ActiveRecord::Acts::Versioned::ActMethods)
 
           send :include, ActiveRecord::Acts::Versioned::ActMethods
-          
+
           cattr_accessor :versioned_class_name, :versioned_foreign_key, :versioned_table_name, :versioned_inheritance_column, 
-            :version_column, :max_version_limit, :track_changed_attributes, :version_condition, :version_sequence_name, :non_versioned_columns,
+            :version_column, :max_version_limit, :track_altered_attributes, :version_condition, :version_sequence_name, :non_versioned_columns,
             :version_association_options
-            
+
           # legacy
           alias_method :non_versioned_fields,  :non_versioned_columns
           alias_method :non_versioned_fields=, :non_versioned_columns=
@@ -171,7 +186,7 @@ module ActiveRecord #:nodoc:
             alias_method :non_versioned_fields=, :non_versioned_columns=
           end
 
-          send :attr_accessor, :changed_attributes
+          send :attr_accessor, :altered_attributes
 
           self.versioned_class_name         = options[:class_name]  || "Version"
           self.versioned_foreign_key        = options[:foreign_key] || self.to_s.foreign_key
@@ -184,8 +199,7 @@ module ActiveRecord #:nodoc:
           self.non_versioned_columns        = [self.primary_key, inheritance_column, 'version', 'lock_version', versioned_inheritance_column]
           self.version_association_options  = {
                                                 :class_name  => "#{self.to_s}::#{versioned_class_name}",
-                                                :foreign_key => "#{versioned_foreign_key}",
-                                                :order       => 'version',
+                                                :foreign_key => versioned_foreign_key,
                                                 :dependent   => :delete_all
                                               }.merge(options[:association_options] || {})
 
@@ -194,20 +208,30 @@ module ActiveRecord #:nodoc:
             silence_warnings do
               self.const_set(extension_module_name, Module.new(&extension))
             end
-            
+
             options[:extend] = self.const_get(extension_module_name)
           end
 
           class_eval do
-            has_many :versions, version_association_options
+            has_many :versions, version_association_options do
+              # finds earliest version of this record
+              def earliest
+                @earliest ||= find(:first, :order => 'version')
+              end
+
+              # find latest version of this record
+              def latest
+                @latest ||= find(:first, :order => 'version desc')
+              end
+            end
             before_save  :set_new_version
             after_create :save_version_on_create
             after_update :save_version
             after_save   :clear_old_versions
-            after_save   :clear_changed_attributes
-            
+            after_save   :clear_altered_attributes
+
             unless options[:if_changed].nil?
-              self.track_changed_attributes = true
+              self.track_altered_attributes = true
               options[:if_changed] = [options[:if_changed]] unless options[:if_changed].is_a?(Array)
               options[:if_changed].each do |attr_name|
                 define_method("#{attr_name}=") do |value|
@@ -215,15 +239,40 @@ module ActiveRecord #:nodoc:
                 end
               end
             end
-            
+
             include options[:extend] if options[:extend].is_a?(Module)
           end
 
           # create the dynamic versioned model
           const_set(versioned_class_name, Class.new(ActiveRecord::Base)).class_eval do
             def self.reloadable? ; false ; end
+            # find first version before the given version
+            def self.before(version)
+              find :first, :order => 'version desc',
+                :conditions => ["#{original_class.versioned_foreign_key} = ? and version < ?", version.send(original_class.versioned_foreign_key), version.version]
+            end
+
+            # find first version after the given version.
+            def self.after(version)
+              find :first, :order => 'version',
+                :conditions => ["#{original_class.versioned_foreign_key} = ? and version > ?", version.send(original_class.versioned_foreign_key), version.version]
+            end
+
+            def previous
+              self.class.before(self)
+            end
+
+            def next
+              self.class.after(self)
+            end
+
+            def versions_count
+              page.version
+            end
           end
-          
+
+          versioned_class.cattr_accessor :original_class
+          versioned_class.original_class = self
           versioned_class.set_table_name versioned_table_name
           versioned_class.belongs_to self.to_s.demodulize.underscore.to_sym, 
             :class_name  => "::#{self.to_s}", 
@@ -232,17 +281,22 @@ module ActiveRecord #:nodoc:
           versioned_class.set_sequence_name version_sequence_name if version_sequence_name
         end
       end
-    
+
       module ActMethods
         def self.included(base) # :nodoc:
           base.extend ClassMethods
         end
-        
+
+        # Finds a specific version of this record
+        def find_version(version = nil)
+          self.class.find_version(id, version)
+        end
+
         # Saves a version of the model if applicable
         def save_version
           save_version_on_create if save_version?
         end
-        
+
         # Saves a version of the model in the versioned table.  This is called in the after_save callback by default
         def save_version_on_create
           rev = self.class.versioned_class.new
@@ -263,16 +317,8 @@ module ActiveRecord #:nodoc:
           end
         end
 
-        # Finds a specific version of this model.
-        def find_version(version)
-          return version if version.is_a?(self.class.versioned_class)
-          return nil if version.is_a?(ActiveRecord::Base)
-          find_versions(:conditions => ['version = ?', version], :limit => 1).first
-        end
-        
-        # Finds versions of this model.  Takes an options hash like <tt>find</tt>
-        def find_versions(options = {})
-          versions.find(:all, options)
+        def versions_count
+          version
         end
 
         # Reverts a model to a given version.  Takes either a version number or an instance of the versioned model
@@ -280,14 +326,14 @@ module ActiveRecord #:nodoc:
           if version.is_a?(self.class.versioned_class)
             return false unless version.send(self.class.versioned_foreign_key) == self.id and !version.new_record?
           else
-            return false unless version = find_version(version)
+            return false unless version = versions.find_by_version(version)
           end
           self.clone_versioned_model(version, self)
           self.send("#{self.class.version_column}=", version.version)
           true
         end
 
-        # Reverts a model to a given version and saves the model.  
+        # Reverts a model to a given version and saves the model.
         # Takes either a version number or an instance of the versioned model
         def revert_to!(version)
           revert_to(version) ? save_without_revision : false
@@ -313,36 +359,36 @@ module ActiveRecord #:nodoc:
         def versioned_attributes
           self.attributes.keys.select { |k| !self.class.non_versioned_columns.include?(k) }
         end
-        
+
         # If called with no parameters, gets whether the current model has changed and needs to be versioned.
         # If called with a single parameter, gets whether the parameter has changed.
         def changed?(attr_name = nil)
           attr_name.nil? ?
-            (!self.class.track_changed_attributes || (changed_attributes && changed_attributes.length > 0)) :
-            (changed_attributes && changed_attributes.include?(attr_name.to_s))
+            (!self.class.track_altered_attributes || (altered_attributes && altered_attributes.length > 0)) :
+            (altered_attributes && altered_attributes.include?(attr_name.to_s))
         end
-        
+
         # keep old dirty? method
         alias_method :dirty?, :changed?
-        
+
         # Clones a model.  Used when saving a new version or reverting a model's version.
         def clone_versioned_model(orig_model, new_model)
           self.versioned_attributes.each do |key|
-            new_model.send("#{key}=", orig_model.attributes[key]) if orig_model.has_attribute?(key)
+            new_model.send("#{key}=", orig_model.send(key)) if orig_model.has_attribute?(key)
           end
-          
+
           if orig_model.is_a?(self.class.versioned_class)
             new_model[new_model.class.inheritance_column] = orig_model[self.class.versioned_inheritance_column]
           elsif new_model.is_a?(self.class.versioned_class)
             new_model[self.class.versioned_inheritance_column] = orig_model[orig_model.class.inheritance_column]
           end
         end
-        
+
         # Checks whether a new version shall be saved or not.  Calls <tt>version_condition_met?</tt> and <tt>changed?</tt>.
         def save_version?
           version_condition_met? && changed?
         end
-        
+
         # Checks condition set in the :if option to check whether a revision should be created or not.  Override this for
         # custom version condition checking.
         def version_condition_met?
@@ -353,7 +399,7 @@ module ActiveRecord #:nodoc:
             version_condition.call(self)
           else
             version_condition
-          end          
+          end
         end
 
         # Executes the block with the versioning callbacks disabled.
@@ -378,43 +424,45 @@ module ActiveRecord #:nodoc:
 
         def empty_callback() end #:nodoc:
 
-        protected          
+        protected
           # sets the new version before saving, unless you're using optimistic locking.  In that case, let it take care of the version.
           def set_new_version
             self.send("#{self.class.version_column}=", self.next_version) if new_record? || (!locking_enabled? && save_version?)
           end
-          
+
           # Gets the next available version for the current record, or 1 for a new record
           def next_version
             return 1 if new_record?
             (versions.calculate(:max, :version) || 0) + 1
           end
-          
+
           # clears current changed attributes.  Called after save.
-          def clear_changed_attributes
-            self.changed_attributes = []
+          def clear_altered_attributes
+            self.altered_attributes = []
           end
 
           def write_changed_attribute(attr_name, attr_value)
             # Convert to db type for comparison. Avoids failing Float<=>String comparisons.
             attr_value_for_db = self.class.columns_hash[attr_name.to_s].type_cast(attr_value)
-            (self.changed_attributes ||= []) << attr_name.to_s unless self.changed?(attr_name) || self.send(attr_name) == attr_value_for_db
+            (self.altered_attributes ||= []) << attr_name.to_s unless self.changed?(attr_name) || self.send(attr_name) == attr_value_for_db
             write_attribute(attr_name, attr_value_for_db)
           end
 
-        private
-          CALLBACKS.each do |attr_name| 
-            alias_method "orig_#{attr_name}".to_sym, attr_name
-          end
-
         module ClassMethods
           # Finds a specific version of a specific row of this model
-          def find_version(id, version)
-            find_versions(id, 
-              :conditions => ["#{versioned_foreign_key} = ? AND version = ?", id, version], 
-              :limit => 1).first
+          def find_version(id, version = nil)
+            return find(id) unless version
+
+            conditions = ["#{versioned_foreign_key} = ? AND version = ?", id, version]
+            options = { :conditions => conditions, :limit => 1 }
+
+            if result = find_versions(id, options).first
+              result
+            else
+              raise RecordNotFound, "Couldn't find #{name} with ID=#{id} and VERSION=#{version}"
+            end
           end
-        
+
           # Finds versions of a specific model.  Takes an options hash like <tt>find</tt>
           def find_versions(id, options = {})
             versioned_class.find :all, {
@@ -426,7 +474,7 @@ module ActiveRecord #:nodoc:
           def versioned_columns
             self.columns.select { |c| !non_versioned_columns.include?(c.name) }
           end
-    
+
           # Returns an instance of the dynamic versioned model
           def versioned_class
             const_get versioned_class_name
@@ -438,36 +486,40 @@ module ActiveRecord #:nodoc:
             if !self.content_columns.find { |c| %w(version lock_version).include? c.name }
               self.connection.add_column table_name, :version, :integer
             end
-            
+
             self.connection.create_table(versioned_table_name, create_table_options) do |t|
               t.column versioned_foreign_key, :integer
               t.column :version, :integer
             end
-            
+
             updated_col = nil
             self.versioned_columns.each do |col| 
               updated_col = col if !updated_col && %(updated_at updated_on).include?(col.name)
               self.connection.add_column versioned_table_name, col.name, col.type, 
                 :limit => col.limit, 
-                :default => col.default
+                :default => col.default,
+                :scale => col.scale,
+                :precision => col.precision
             end
-        
+
             if type_col = self.columns_hash[inheritance_column]
               self.connection.add_column versioned_table_name, versioned_inheritance_column, type_col.type, 
                 :limit => type_col.limit, 
-                :default => type_col.default
+                :default => type_col.default,
+                :scale => type_col.scale,
+                :precision => type_col.precision
             end
-    
+
             if updated_col.nil?
               self.connection.add_column versioned_table_name, :updated_at, :timestamp
             end
           end
-          
+
           # Rake migration task to drop the versioned table
           def drop_versioned_table
             self.connection.drop_table versioned_table_name
           end
-          
+
           # Executes the block with the versioning callbacks disabled.
           #
           #   Foo.without_revision do
@@ -476,17 +528,18 @@ module ActiveRecord #:nodoc:
           #
           def without_revision(&block)
             class_eval do 
-              CALLBACKS.each do |attr_name| 
+              CALLBACKS.each do |attr_name|
+                alias_method "orig_#{attr_name}".to_sym, attr_name
                 alias_method attr_name, :empty_callback
               end
             end
-            result = block.call
+            block.call
+          ensure
             class_eval do 
               CALLBACKS.each do |attr_name|
                 alias_method attr_name, "orig_#{attr_name}".to_sym
               end
             end
-            result
           end
 
           # Turns off optimistic locking for the duration of the block
@@ -501,7 +554,7 @@ module ActiveRecord #:nodoc:
             result = block.call
             ActiveRecord::Base.lock_optimistically = true if current
             result
-          end          
+          end
         end
       end
     end
diff --git a/vendor/plugins/acts_as_versioned/test/abstract_unit.rb b/vendor/plugins/acts_as_versioned/test/abstract_unit.rb
index 1740db8dc..86f50620c 100644
--- a/vendor/plugins/acts_as_versioned/test/abstract_unit.rb
+++ b/vendor/plugins/acts_as_versioned/test/abstract_unit.rb
@@ -1,12 +1,21 @@
+$:.unshift(File.dirname(__FILE__) + '/../../../rails/activesupport/lib')
+$:.unshift(File.dirname(__FILE__) + '/../../../rails/activerecord/lib')
 $:.unshift(File.dirname(__FILE__) + '/../lib')
-
 require 'test/unit'
-require File.expand_path(File.join(File.dirname(__FILE__), '../../../../config/environment.rb'))
-require 'active_record/fixtures'
+begin
+  require 'active_support'
+  require 'active_record'
+  require 'active_record/fixtures'
+rescue LoadError
+  require 'rubygems'
+  retry
+end
+require 'acts_as_versioned'
 
 config = YAML::load(IO.read(File.dirname(__FILE__) + '/database.yml'))
 ActiveRecord::Base.logger = Logger.new(File.dirname(__FILE__) + "/debug.log")
-ActiveRecord::Base.establish_connection(config[ENV['DB'] || 'sqlite'])
+ActiveRecord::Base.configurations = {'test' => config[ENV['DB'] || 'sqlite3']}
+ActiveRecord::Base.establish_connection(ActiveRecord::Base.configurations['test'])
 
 load(File.dirname(__FILE__) + "/schema.rb")
 
@@ -19,17 +28,9 @@ if ENV['DB'] == 'postgresql'
 end
 
 Test::Unit::TestCase.fixture_path = File.dirname(__FILE__) + "/fixtures/"
-$LOAD_PATH.unshift(Test::Unit::TestCase.fixture_path)
+$:.unshift(Test::Unit::TestCase.fixture_path)
 
 class Test::Unit::TestCase #:nodoc:
-  def create_fixtures(*table_names)
-    if block_given?
-      Fixtures.create_fixtures(Test::Unit::TestCase.fixture_path, table_names) { yield }
-    else
-      Fixtures.create_fixtures(Test::Unit::TestCase.fixture_path, table_names)
-    end
-  end
-
   # Turn off transactional fixtures if you're working with MyISAM tables in MySQL
   self.use_transactional_fixtures = true
   
diff --git a/vendor/plugins/acts_as_versioned/test/fixtures/widget.rb b/vendor/plugins/acts_as_versioned/test/fixtures/widget.rb
index 3c38f2fcf..086ac2b40 100644
--- a/vendor/plugins/acts_as_versioned/test/fixtures/widget.rb
+++ b/vendor/plugins/acts_as_versioned/test/fixtures/widget.rb
@@ -1,6 +1,6 @@
 class Widget < ActiveRecord::Base
   acts_as_versioned :sequence_name => 'widgets_seq', :association_options => {
-    :dependent => nil, :order => 'version desc'
+    :dependent => :nullify, :order => 'version desc'
   }
   non_versioned_columns << 'foo'
 end
\ No newline at end of file
diff --git a/vendor/plugins/acts_as_versioned/test/migration_test.rb b/vendor/plugins/acts_as_versioned/test/migration_test.rb
index d85e95883..4ead4a8fe 100644
--- a/vendor/plugins/acts_as_versioned/test/migration_test.rb
+++ b/vendor/plugins/acts_as_versioned/test/migration_test.rb
@@ -9,9 +9,14 @@ if ActiveRecord::Base.connection.supports_migrations?
   class MigrationTest < Test::Unit::TestCase
     self.use_transactional_fixtures = false
     def teardown
-      ActiveRecord::Base.connection.initialize_schema_information
-      ActiveRecord::Base.connection.update "UPDATE schema_info SET version = 0"
-
+      if ActiveRecord::Base.connection.respond_to?(:initialize_schema_information)
+        ActiveRecord::Base.connection.initialize_schema_information
+        ActiveRecord::Base.connection.update "UPDATE schema_info SET version = 0"
+      else
+        ActiveRecord::Base.connection.initialize_schema_migrations_table
+        ActiveRecord::Base.connection.assume_migrated_upto_version(0)
+      end
+      
       Thing.connection.drop_table "things" rescue nil
       Thing.connection.drop_table "thing_versions" rescue nil
       Thing.reset_column_information
@@ -21,8 +26,17 @@ if ActiveRecord::Base.connection.supports_migrations?
       assert_raises(ActiveRecord::StatementInvalid) { Thing.create :title => 'blah blah' }
       # take 'er up
       ActiveRecord::Migrator.up(File.dirname(__FILE__) + '/fixtures/migrations/')
-      t = Thing.create :title => 'blah blah'
+      t = Thing.create :title => 'blah blah', :price => 123.45, :type => 'Thing'
       assert_equal 1, t.versions.size
+      
+      # check that the price column has remembered its value correctly
+      assert_equal t.price,  t.versions.first.price
+      assert_equal t.title,  t.versions.first.title
+      assert_equal t[:type], t.versions.first[:type]
+      
+      # make sure that the precision of the price column has been preserved
+      assert_equal 7, Thing::Version.columns.find{|c| c.name == "price"}.precision
+      assert_equal 2, Thing::Version.columns.find{|c| c.name == "price"}.scale
 
       # now lets take 'er back down
       ActiveRecord::Migrator.down(File.dirname(__FILE__) + '/fixtures/migrations/')
diff --git a/vendor/plugins/acts_as_versioned/test/versioned_test.rb b/vendor/plugins/acts_as_versioned/test/versioned_test.rb
index c1e1a4b98..a7bc2082b 100644
--- a/vendor/plugins/acts_as_versioned/test/versioned_test.rb
+++ b/vendor/plugins/acts_as_versioned/test/versioned_test.rb
@@ -4,9 +4,10 @@ require File.join(File.dirname(__FILE__), 'fixtures/widget')
 
 class VersionedTest < Test::Unit::TestCase
   fixtures :pages, :page_versions, :locked_pages, :locked_pages_revisions, :authors, :landmarks, :landmark_versions
+  set_fixture_class :page_versions => Page::Version
 
   def test_saves_versioned_copy
-    p = Page.create :title => 'first title', :body => 'first body'
+    p = Page.create! :title => 'first title', :body => 'first body'
     assert !p.new_record?
     assert_equal 1, p.versions.size
     assert_equal 1, p.version
@@ -16,13 +17,13 @@ class VersionedTest < Test::Unit::TestCase
   def test_saves_without_revision
     p = pages(:welcome)
     old_versions = p.versions.count
-    
+
     p.save_without_revision
-    
+
     p.without_revision do
       p.update_attributes :title => 'changed'
     end
-    
+
     assert_equal old_versions, p.versions.count
   end
 
@@ -30,7 +31,7 @@ class VersionedTest < Test::Unit::TestCase
     p = pages(:welcome)
     assert_equal 24, p.version
     assert_equal 'Welcome to the weblog', p.title
-    
+
     assert p.revert_to!(p.versions.first.version), "Couldn't revert to 23"
     assert_equal 23, p.version
     assert_equal 'Welcome to the weblg', p.title
@@ -57,56 +58,56 @@ class VersionedTest < Test::Unit::TestCase
     p = pages(:welcome)
     assert_equal 24, p.version
     assert_equal 'Welcome to the weblog', p.title
-    
+
     assert p.revert_to!(p.versions.first), "Couldn't revert to 23"
     assert_equal 23, p.version
     assert_equal 'Welcome to the weblg', p.title
   end
-  
+
   def test_rollback_fails_with_invalid_revision
     p = locked_pages(:welcome)
     assert !p.revert_to!(locked_pages(:thinking))
   end
 
   def test_saves_versioned_copy_with_options
-    p = LockedPage.create :title => 'first title'
+    p = LockedPage.create! :title => 'first title'
     assert !p.new_record?
     assert_equal 1, p.versions.size
     assert_instance_of LockedPage.versioned_class, p.versions.first
   end
-  
+
   def test_rollback_with_version_number_with_options
     p = locked_pages(:welcome)
     assert_equal 'Welcome to the weblog', p.title
     assert_equal 'LockedPage', p.versions.first.version_type
-    
+
     assert p.revert_to!(p.versions.first.version), "Couldn't revert to 23"
     assert_equal 'Welcome to the weblg', p.title
     assert_equal 'LockedPage', p.versions.first.version_type
   end
-  
+
   def test_rollback_with_version_class_with_options
     p = locked_pages(:welcome)
     assert_equal 'Welcome to the weblog', p.title
     assert_equal 'LockedPage', p.versions.first.version_type
-    
+
     assert p.revert_to!(p.versions.first), "Couldn't revert to 1"
     assert_equal 'Welcome to the weblg', p.title
     assert_equal 'LockedPage', p.versions.first.version_type
   end
-  
+
   def test_saves_versioned_copy_with_sti
-    p = SpecialLockedPage.create :title => 'first title'
+    p = SpecialLockedPage.create! :title => 'first title'
     assert !p.new_record?
     assert_equal 1, p.versions.size
     assert_instance_of LockedPage.versioned_class, p.versions.first
     assert_equal 'SpecialLockedPage', p.versions.first.version_type
   end
-  
+
   def test_rollback_with_version_number_with_sti
     p = locked_pages(:thinking)
     assert_equal 'So I was thinking', p.title
-    
+
     assert p.revert_to!(p.versions.first.version), "Couldn't revert to 1"
     assert_equal 'So I was thinking!!!', p.title
     assert_equal 'SpecialLockedPage', p.versions.first.version_type
@@ -115,11 +116,11 @@ class VersionedTest < Test::Unit::TestCase
   def test_lock_version_works_with_versioning
     p = locked_pages(:thinking)
     p2 = LockedPage.find(p.id)
-    
+
     p.title = 'fresh title'
     p.save
     assert_equal 2, p.versions.size # limit!
-    
+
     assert_raises(ActiveRecord::StaleObjectError) do
       p2.title = 'stale title'
       p2.save
@@ -127,15 +128,15 @@ class VersionedTest < Test::Unit::TestCase
   end
 
   def test_version_if_condition
-    p = Page.create :title => "title"
+    p = Page.create! :title => "title"
     assert_equal 1, p.version
-    
+
     Page.feeling_good = false
     p.save
     assert_equal 1, p.version
     Page.feeling_good = true
   end
-  
+
   def test_version_if_condition2
     # set new if condition
     Page.class_eval do
@@ -143,46 +144,46 @@ class VersionedTest < Test::Unit::TestCase
       alias_method :old_feeling_good, :feeling_good?
       alias_method :feeling_good?, :new_feeling_good
     end
-    
-    p = Page.create :title => "title"
+
+    p = Page.create! :title => "title"
     assert_equal 1, p.version # version does not increment
     assert_equal 1, p.versions(true).size
-    
+
     p.update_attributes(:title => 'new title')
     assert_equal 1, p.version # version does not increment
     assert_equal 1, p.versions(true).size
-    
+
     p.update_attributes(:title => 'a title')
     assert_equal 2, p.version
     assert_equal 2, p.versions(true).size
-    
+
     # reset original if condition
     Page.class_eval { alias_method :feeling_good?, :old_feeling_good }
   end
-  
+
   def test_version_if_condition_with_block
     # set new if condition
     old_condition = Page.version_condition
     Page.version_condition = Proc.new { |page| page.title[0..0] == 'b' }
-    
-    p = Page.create :title => "title"
+
+    p = Page.create! :title => "title"
     assert_equal 1, p.version # version does not increment
     assert_equal 1, p.versions(true).size
-    
+
     p.update_attributes(:title => 'a title')
     assert_equal 1, p.version # version does not increment
     assert_equal 1, p.versions(true).size
-    
+
     p.update_attributes(:title => 'b title')
     assert_equal 2, p.version
     assert_equal 2, p.versions(true).size
-    
+
     # reset original if condition
     Page.version_condition = old_condition
   end
 
   def test_version_no_limit
-    p = Page.create :title => "title", :body => 'first body'
+    p = Page.create! :title => "title", :body => 'first body'
     p.save
     p.save
     5.times do |i|
@@ -191,7 +192,7 @@ class VersionedTest < Test::Unit::TestCase
   end
 
   def test_version_max_limit
-    p = LockedPage.create :title => "title"
+    p = LockedPage.create! :title => "title"
     p.update_attributes(:title => "title1")
     p.update_attributes(:title => "title2")
     5.times do |i|
@@ -199,31 +200,29 @@ class VersionedTest < Test::Unit::TestCase
       assert p.versions(true).size <= 2, "locked version can only store 2 versions"
     end
   end
-  
-  def test_track_changed_attributes_default_value
-    assert !Page.track_changed_attributes
-    assert LockedPage.track_changed_attributes
-    assert SpecialLockedPage.track_changed_attributes
+
+  def test_track_altered_attributes_default_value
+    assert !Page.track_altered_attributes
+    assert LockedPage.track_altered_attributes
+    assert SpecialLockedPage.track_altered_attributes
   end
-  
+
   def test_version_order
     assert_equal 23, pages(:welcome).versions.first.version
     assert_equal 24, pages(:welcome).versions.last.version
-    assert_equal 23, pages(:welcome).find_versions.first.version
-    assert_equal 24, pages(:welcome).find_versions.last.version
   end
-  
-  def test_track_changed_attributes    
-    p = LockedPage.create :title => "title"
+
+  def test_track_altered_attributes
+    p = LockedPage.create! :title => "title"
     assert_equal 1, p.lock_version
     assert_equal 1, p.versions(true).size
-    
+
     p.title = 'title'
     assert !p.save_version?
     p.save
     assert_equal 2, p.lock_version # still increments version because of optimistic locking
     assert_equal 1, p.versions(true).size
-    
+
     p.title = 'updated title'
     assert p.save_version?
     p.save
@@ -236,27 +235,38 @@ class VersionedTest < Test::Unit::TestCase
     assert_equal 4, p.lock_version
     assert_equal 2, p.versions(true).size # version 1 deleted
   end
-    
+
   def assert_page_title(p, i, version_field = :version)
     p.title = "title#{i}"
     p.save
     assert_equal "title#{i}", p.title
     assert_equal (i+4), p.send(version_field)
   end
-  
+
   def test_find_versions
     assert_equal 2, locked_pages(:welcome).versions.size
-    assert_equal 1, locked_pages(:welcome).find_versions(:conditions => ['title LIKE ?', '%weblog%']).length
-    assert_equal 2, locked_pages(:welcome).find_versions(:conditions => ['title LIKE ?', '%web%']).length
-    assert_equal 0, locked_pages(:thinking).find_versions(:conditions => ['title LIKE ?', '%web%']).length
-    assert_equal 2, locked_pages(:welcome).find_versions.length
+    assert_equal 1, locked_pages(:welcome).versions.find(:all, :conditions => ['title LIKE ?', '%weblog%']).length
+    assert_equal 2, locked_pages(:welcome).versions.find(:all, :conditions => ['title LIKE ?', '%web%']).length
+    assert_equal 0, locked_pages(:thinking).versions.find(:all, :conditions => ['title LIKE ?', '%web%']).length
+    assert_equal 2, locked_pages(:welcome).versions.length
   end
-  
+
+  def test_find_version
+    assert_equal page_versions(:welcome_1), Page.find_version(pages(:welcome).id, 23)
+    assert_equal page_versions(:welcome_2), Page.find_version(pages(:welcome).id, 24)
+    assert_equal pages(:welcome), Page.find_version(pages(:welcome).id)
+
+    assert_equal page_versions(:welcome_1), pages(:welcome).find_version(23)
+    assert_equal page_versions(:welcome_2), pages(:welcome).find_version(24)
+    assert_equal pages(:welcome), pages(:welcome).find_version
+
+    assert_raise(ActiveRecord::RecordNotFound) { Page.find_version(pages(:welcome).id, 1) }
+    assert_raise(ActiveRecord::RecordNotFound) { Page.find_version(0, 23) }
+  end
+
   def test_with_sequence
     assert_equal 'widgets_seq', Widget.versioned_class.sequence_name
-    Widget.create :name => 'new widget'
-    Widget.create :name => 'new widget'
-    Widget.create :name => 'new widget'
+    3.times { Widget.create! :name => 'new widget' }
     assert_equal 3, Widget.count
     assert_equal 3, Widget.versioned_class.count
   end
@@ -268,26 +278,26 @@ class VersionedTest < Test::Unit::TestCase
   def test_has_many_through_with_custom_association
     assert_equal [authors(:caged), authors(:mly)], pages(:welcome).revisors
   end
-  
+
   def test_referential_integrity
     pages(:welcome).destroy
     assert_equal 0, Page.count
     assert_equal 0, Page::Version.count
   end
-  
+
   def test_association_options
     association = Page.reflect_on_association(:versions)
     options = association.options
     assert_equal :delete_all, options[:dependent]
     assert_equal 'version', options[:order]
-    
+
     association = Widget.reflect_on_association(:versions)
     options = association.options
-    assert_nil options[:dependent]
+    assert_equal :nullify, options[:dependent]
     assert_equal 'version desc', options[:order]
     assert_equal 'widget_id', options[:foreign_key]
-    
-    widget = Widget.create :name => 'new widget'
+
+    widget = Widget.create! :name => 'new widget'
     assert_equal 1, Widget.count
     assert_equal 1, Widget.versioned_class.count
     widget.destroy
@@ -300,14 +310,38 @@ class VersionedTest < Test::Unit::TestCase
     page_version = page.versions.last
     assert_equal page, page_version.page
   end
-  
-  def test_unchanged_attributes
-    landmarks(:washington).attributes = landmarks(:washington).attributes
+
+  def test_unaltered_attributes
+    landmarks(:washington).attributes = landmarks(:washington).attributes.except("id")
     assert !landmarks(:washington).changed?
   end
-  
+
   def test_unchanged_string_attributes
-    landmarks(:washington).attributes = landmarks(:washington).attributes.inject({}) { |params, (key, value)| params.update key => value.to_s }
+    landmarks(:washington).attributes = landmarks(:washington).attributes.except("id").inject({}) { |params, (key, value)| params.update(key => value.to_s) }
     assert !landmarks(:washington).changed?
   end
-end
+
+  def test_should_find_earliest_version
+    assert_equal page_versions(:welcome_1), pages(:welcome).versions.earliest
+  end
+
+  def test_should_find_latest_version
+    assert_equal page_versions(:welcome_2), pages(:welcome).versions.latest
+  end
+
+  def test_should_find_previous_version
+    assert_equal page_versions(:welcome_1), page_versions(:welcome_2).previous
+    assert_equal page_versions(:welcome_1), pages(:welcome).versions.before(page_versions(:welcome_2))
+  end
+
+  def test_should_find_next_version
+    assert_equal page_versions(:welcome_2), page_versions(:welcome_1).next
+    assert_equal page_versions(:welcome_2), pages(:welcome).versions.after(page_versions(:welcome_1))
+  end
+
+  def test_should_find_version_count
+    assert_equal 24, pages(:welcome).versions_count
+    assert_equal 24, page_versions(:welcome_1).versions_count
+    assert_equal 24, page_versions(:welcome_2).versions_count
+  end
+end
\ No newline at end of file
diff --git a/vendor/plugins/rfpdf/init.rb b/vendor/plugins/rfpdf/init.rb
index 7e51d9eba..339bacfdb 100644
--- a/vendor/plugins/rfpdf/init.rb
+++ b/vendor/plugins/rfpdf/init.rb
@@ -1,3 +1,9 @@
 require 'rfpdf'
 
-ActionView::Base::register_template_handler 'rfpdf', RFPDF::View
\ No newline at end of file
+begin
+  ActionView::Template::register_template_handler 'rfpdf', RFPDF::View
+rescue NameError
+  # Rails < 2.1
+  RFPDF::View.backward_compatibility_mode = true
+  ActionView::Base::register_template_handler 'rfpdf', RFPDF::View
+end
diff --git a/vendor/plugins/rfpdf/lib/rfpdf/view.rb b/vendor/plugins/rfpdf/lib/rfpdf/view.rb
index 185811202..6b6267331 100644
--- a/vendor/plugins/rfpdf/lib/rfpdf/view.rb
+++ b/vendor/plugins/rfpdf/lib/rfpdf/view.rb
@@ -30,6 +30,8 @@
 module RFPDF
   
   class View
+    @@backward_compatibility_mode = false
+    cattr_accessor :backward_compatibility_mode
     
     def initialize(action_view)
       @action_view = action_view
@@ -45,6 +47,14 @@ module RFPDF
         :temp_dir => "#{File.expand_path(RAILS_ROOT)}/tmp"
       }.merge(@action_view.controller.instance_eval{ @options_for_rfpdf } || {}).with_indifferent_access
     end
+    
+    def self.compilable?
+      false
+    end
+
+    def compilable?
+      self.class.compilable?
+    end
 
     def render(template, local_assigns = {})
 			@pdf_name = "Default.pdf" if @pdf_name.nil?
@@ -66,7 +76,7 @@ module RFPDF
 			  local_assigns.each do |key,val|
 		  		class << self; self; end.send(:define_method,key){ val }
 				end
-        ERB.new(template).result(binding)
+        ERB.new(@@backward_compatibility_mode == true ? template : template.source).result(binding) 
       end
     end
 

From 5d0b53544c859506cc7f2e52f0a5243e50bca5e9 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Fri, 4 Jul 2008 18:03:43 +0000
Subject: [PATCH 592/710] Updated INSTALL doc.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1624 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 doc/INSTALL | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/doc/INSTALL b/doc/INSTALL
index ab35bd1b8..87a2b38d5 100644
--- a/doc/INSTALL
+++ b/doc/INSTALL
@@ -7,19 +7,16 @@ http://www.redmine.org/
 
 == Requirements
 
-* Ruby on Rails 2.0.2 (not Rails 2.1)
-* A database (see compatibility below)
+* Ruby on Rails 2.1
+* A database:
+  * MySQL (tested with MySQL 5)
+  * PostgreSQL (tested with PostgreSQL 8.1)
+  * SQLite (tested with SQLite 3)
 
 Optional:
 * SVN binaries >= 1.3 (needed for repository browsing, must be available in PATH)
 * RMagick (gantt export to png)
 
-Supported databases:
-* MySQL (tested with MySQL 5)
-* PostgreSQL (tested with PostgreSQL 8.1)
-* SQLite (tested with SQLite 3)
-
-
 == Installation
 
 1. Uncompress the program archive

From fc42dd2cef3f1e43af19f6455011cdd5d298aef5 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Fri, 4 Jul 2008 18:55:45 +0000
Subject: [PATCH 593/710] Email delivery configuration moved to an unversioned
 YAML file (config/email.yml, see the sample file) (#1412). Email delivery is
 disabled. It's automatically turned on when configuration is found.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1625 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/settings_controller.rb  |  1 +
 app/views/settings/_notifications.rhtml |  6 ++++++
 config/email.yml.example                | 21 +++++++++++++++++++++
 config/environment.rb                   | 24 ++++--------------------
 config/environments/test.rb             |  1 +
 config/environments/test_pgsql.rb       |  3 ++-
 config/environments/test_sqlite3.rb     |  3 ++-
 config/initializers/40-email.rb         | 17 +++++++++++++++++
 doc/INSTALL                             | 10 +++++-----
 doc/UPGRADING                           |  8 +++-----
 lang/bg.yml                             |  1 +
 lang/cs.yml                             |  1 +
 lang/da.yml                             |  1 +
 lang/de.yml                             |  1 +
 lang/en.yml                             |  1 +
 lang/es.yml                             |  1 +
 lang/fi.yml                             |  1 +
 lang/fr.yml                             |  1 +
 lang/he.yml                             |  1 +
 lang/hu.yml                             |  1 +
 lang/it.yml                             |  1 +
 lang/ja.yml                             |  1 +
 lang/ko.yml                             |  1 +
 lang/lt.yml                             |  1 +
 lang/nl.yml                             |  1 +
 lang/no.yml                             |  1 +
 lang/pl.yml                             |  1 +
 lang/pt-br.yml                          |  1 +
 lang/pt.yml                             |  1 +
 lang/ro.yml                             |  1 +
 lang/ru.yml                             |  1 +
 lang/sr.yml                             |  1 +
 lang/sv.yml                             |  1 +
 lang/th.yml                             |  1 +
 lang/uk.yml                             |  1 +
 lang/zh-tw.yml                          |  1 +
 lang/zh.yml                             |  1 +
 37 files changed, 89 insertions(+), 32 deletions(-)
 create mode 100644 config/email.yml.example
 create mode 100644 config/initializers/40-email.rb

diff --git a/app/controllers/settings_controller.rb b/app/controllers/settings_controller.rb
index c7c8751dd..59b9c67e1 100644
--- a/app/controllers/settings_controller.rb
+++ b/app/controllers/settings_controller.rb
@@ -39,6 +39,7 @@ class SettingsController < ApplicationController
     end
     @options = {}
     @options[:user_format] = User::USER_FORMATS.keys.collect {|f| [User.current.name(f), f.to_s] }
+    @deliveries = ActionMailer::Base.perform_deliveries
   end
   
   def plugin
diff --git a/app/views/settings/_notifications.rhtml b/app/views/settings/_notifications.rhtml
index 1a472d606..36701463a 100644
--- a/app/views/settings/_notifications.rhtml
+++ b/app/views/settings/_notifications.rhtml
@@ -1,3 +1,4 @@
+<% if @deliveries %>
 <% form_tag({:action => 'edit', :tab => 'notifications'}) do %>
 
 <div class="box tabular settings">
@@ -28,3 +29,8 @@
 
 <%= submit_tag l(:button_save) %>
 <% end %>
+<% else %>
+<div class="nodata">
+<%= simple_format(l(:text_email_delivery_not_configured)) %>
+</div>
+<% end %>
diff --git a/config/email.yml.example b/config/email.yml.example
new file mode 100644
index 000000000..a67c12279
--- /dev/null
+++ b/config/email.yml.example
@@ -0,0 +1,21 @@
+# Outgoing email settings
+
+production:
+  delivery_method: :smtp
+  smtp_settings:
+    address: smtp.somenet.foo
+    port: 25
+    domain: somenet.foo
+    authentication: :login
+    user_name: redmine@somenet.foo
+    password: redmine
+  
+development:
+  delivery_method: :smtp
+  smtp_settings:
+    address: 127.0.0.1
+    port: 25
+    domain: somenet.foo
+    authentication: :login
+    user_name: redmine@somenet.foo
+    password: redmine
diff --git a/config/environment.rb b/config/environment.rb
index b0f16c3e1..9a3bf4b1d 100644
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -49,25 +49,9 @@ Rails::Initializer.run do |config|
   # Use Active Record's schema dumper instead of SQL when creating the test database
   # (enables use of different database adapters for development and test environments)
   # config.active_record.schema_format = :ruby
-
-  # See Rails::Configuration for more options
   
-	# SMTP server configuration
-	config.action_mailer.smtp_settings = {
-		:address => "127.0.0.1",
-		:port => 25,
-		:domain => "somenet.foo",
-		:authentication => :login,
-		:user_name => "redmine@somenet.foo",
-		:password => "redmine",
-	}
-	
-	config.action_mailer.perform_deliveries = true
-
-	# Tell ActionMailer not to deliver emails to the real world.
-	# The :test delivery method accumulates sent emails in the
-	# ActionMailer::Base.deliveries array.
-	#config.action_mailer.delivery_method = :test
-	config.action_mailer.delivery_method = :smtp  
-
+  # Deliveries are disabled by default. Do NOT modify this section.
+  # Define your email configuration in email.yml instead.
+  # It will automatically turn deliveries on
+  config.action_mailer.perform_deliveries = false
 end
diff --git a/config/environments/test.rb b/config/environments/test.rb
index 9ba9ae0f8..7c821da07 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -13,4 +13,5 @@ config.whiny_nils    = true
 config.action_controller.consider_all_requests_local = true
 config.action_controller.perform_caching             = false
 
+config.action_mailer.perform_deliveries = true
 config.action_mailer.delivery_method = :test
diff --git a/config/environments/test_pgsql.rb b/config/environments/test_pgsql.rb
index 35bb19bee..7c821da07 100644
--- a/config/environments/test_pgsql.rb
+++ b/config/environments/test_pgsql.rb
@@ -13,4 +13,5 @@ config.whiny_nils    = true
 config.action_controller.consider_all_requests_local = true
 config.action_controller.perform_caching             = false
 
-config.action_mailer.delivery_method = :test
\ No newline at end of file
+config.action_mailer.perform_deliveries = true
+config.action_mailer.delivery_method = :test
diff --git a/config/environments/test_sqlite3.rb b/config/environments/test_sqlite3.rb
index 35bb19bee..7c821da07 100644
--- a/config/environments/test_sqlite3.rb
+++ b/config/environments/test_sqlite3.rb
@@ -13,4 +13,5 @@ config.whiny_nils    = true
 config.action_controller.consider_all_requests_local = true
 config.action_controller.perform_caching             = false
 
-config.action_mailer.delivery_method = :test
\ No newline at end of file
+config.action_mailer.perform_deliveries = true
+config.action_mailer.delivery_method = :test
diff --git a/config/initializers/40-email.rb b/config/initializers/40-email.rb
new file mode 100644
index 000000000..5b388ec59
--- /dev/null
+++ b/config/initializers/40-email.rb
@@ -0,0 +1,17 @@
+# Loads action_mailer settings from email.yml
+# and turns deliveries on if configuration file is found
+
+filename = File.join(File.dirname(__FILE__), '..', 'email.yml')
+if File.file?(filename)
+  mailconfig = YAML::load_file(filename)
+
+  if mailconfig.is_a?(Hash) && mailconfig.has_key?(Rails.env)
+    # Enable deliveries
+    ActionMailer::Base.perform_deliveries = true
+    
+    mailconfig[Rails.env].each do |k, v|
+      v.symbolize_keys! if v.respond_to?(:symbolize_keys!)
+      ActionMailer::Base.send("#{k}=", v)
+    end
+  end
+end
diff --git a/doc/INSTALL b/doc/INSTALL
index 87a2b38d5..13502f8d0 100644
--- a/doc/INSTALL
+++ b/doc/INSTALL
@@ -53,10 +53,10 @@ Optional:
    trackers, statuses, workflow) and adjust application settings
 
 
-== SMTP server Configuration
-
-In config/environment.rb, you can set parameters for your SMTP server:
-config.action_mailer.smtp_settings: SMTP server configuration
-config.action_mailer.perform_deliveries: set to false to disable mail delivering
+== Email delivery Configuration
 
+Copy config/email.yml.example to config/email.yml and edit this file
+to adjust your SMTP settings.
 Don't forget to restart the application after any change to this file.
+
+Please do not enter your SMTP settings in environment.rb.
diff --git a/doc/UPGRADING b/doc/UPGRADING
index 2edb2952a..1dd901171 100644
--- a/doc/UPGRADING
+++ b/doc/UPGRADING
@@ -10,15 +10,13 @@ http://www.redmine.org/
 1. Uncompress the program archive in a new directory
    
 3. Copy your database settings (RAILS_ROOT/config/database.yml)
+   and SMTP settings (RAILS_ROOT/config/email.yml)
    into the new config directory
    
-4. Enter your SMTP settings in config/environment.rb
-   Do not replace this file with the old one
-   
-5. Migrate your database (please make a backup before doing this):
+4. Migrate your database (please make a backup before doing this):
    rake db:migrate RAILS_ENV="production"
 
-6. Copy the RAILS_ROOT/files directory content into your new installation
+5. Copy the RAILS_ROOT/files directory content into your new installation
    This directory contains all the attached files
 
 
diff --git a/lang/bg.yml b/lang/bg.yml
index fd6e7e6cf..c87e3bebc 100644
--- a/lang/bg.yml
+++ b/lang/bg.yml
@@ -631,3 +631,4 @@ label_incoming_emails: Incoming emails
 label_generate_key: Generate a key
 setting_mail_handler_api_enabled: Enable WS for incoming emails
 setting_mail_handler_api_key: API key
+text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."
diff --git a/lang/cs.yml b/lang/cs.yml
index 2c760722b..6669c6cf3 100644
--- a/lang/cs.yml
+++ b/lang/cs.yml
@@ -636,3 +636,4 @@ label_incoming_emails: Incoming emails
 label_generate_key: Generate a key
 setting_mail_handler_api_enabled: Enable WS for incoming emails
 setting_mail_handler_api_key: API key
+text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."
diff --git a/lang/da.yml b/lang/da.yml
index d51d30817..cf40e1763 100644
--- a/lang/da.yml
+++ b/lang/da.yml
@@ -633,3 +633,4 @@ label_incoming_emails: Incoming emails
 label_generate_key: Generate a key
 setting_mail_handler_api_enabled: Enable WS for incoming emails
 setting_mail_handler_api_key: API key
+text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."
diff --git a/lang/de.yml b/lang/de.yml
index 2bc0a16f7..adc3dd4e9 100644
--- a/lang/de.yml
+++ b/lang/de.yml
@@ -632,3 +632,4 @@ label_incoming_emails: Incoming emails
 label_generate_key: Generate a key
 setting_mail_handler_api_enabled: Enable WS for incoming emails
 setting_mail_handler_api_key: API key
+text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."
diff --git a/lang/en.yml b/lang/en.yml
index 180a70565..791094674 100644
--- a/lang/en.yml
+++ b/lang/en.yml
@@ -606,6 +606,7 @@ text_reassign_time_entries: 'Reassign reported hours to this issue:'
 text_user_wrote: '%s wrote:'
 text_enumeration_destroy_question: '%d objects are assigned to this value.'
 text_enumeration_category_reassign_to: 'Reassign them to this value:'
+text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."
 
 default_role_manager: Manager
 default_role_developper: Developer
diff --git a/lang/es.yml b/lang/es.yml
index 44d48190b..4205402e4 100644
--- a/lang/es.yml
+++ b/lang/es.yml
@@ -634,3 +634,4 @@ label_incoming_emails: Incoming emails
 label_generate_key: Generate a key
 setting_mail_handler_api_enabled: Enable WS for incoming emails
 setting_mail_handler_api_key: API key
+text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."
diff --git a/lang/fi.yml b/lang/fi.yml
index 27f3415c6..b69b07557 100644
--- a/lang/fi.yml
+++ b/lang/fi.yml
@@ -631,3 +631,4 @@ label_incoming_emails: Incoming emails
 label_generate_key: Generate a key
 setting_mail_handler_api_enabled: Enable WS for incoming emails
 setting_mail_handler_api_key: API key
+text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."
diff --git a/lang/fr.yml b/lang/fr.yml
index 89b0b4c86..5b0f04fb0 100644
--- a/lang/fr.yml
+++ b/lang/fr.yml
@@ -606,6 +606,7 @@ text_reassign_time_entries: 'Reporter les heures sur cette demande:'
 text_user_wrote: '%s a écrit:'
 text_enumeration_destroy_question: 'Cette valeur est affectée à %d objets.'
 text_enumeration_category_reassign_to: 'Réaffecter les objets à cette valeur:'
+text_email_delivery_not_configured: "L'envoi de mail n'est pas configuré, les notifications sont désactivées.\nConfigurez votre serveur SMTP dans config/email.yml et redémarrez l'application pour les activer."
 
 default_role_manager: Manager
 default_role_developper: Développeur
diff --git a/lang/he.yml b/lang/he.yml
index 501cfdc9b..030e09dcc 100644
--- a/lang/he.yml
+++ b/lang/he.yml
@@ -631,3 +631,4 @@ label_incoming_emails: Incoming emails
 label_generate_key: Generate a key
 setting_mail_handler_api_enabled: Enable WS for incoming emails
 setting_mail_handler_api_key: API key
+text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."
diff --git a/lang/hu.yml b/lang/hu.yml
index 6f88eb962..046916b7a 100644
--- a/lang/hu.yml
+++ b/lang/hu.yml
@@ -632,3 +632,4 @@ label_incoming_emails: Beérkezett levelek
 label_generate_key: Kulcs generálása
 setting_mail_handler_api_enabled: Web Service engedélyezése a beérkezett levelekhez
 setting_mail_handler_api_key: API kulcs
+text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."
diff --git a/lang/it.yml b/lang/it.yml
index 14dc86fff..eb835400e 100644
--- a/lang/it.yml
+++ b/lang/it.yml
@@ -631,3 +631,4 @@ label_incoming_emails: Incoming emails
 label_generate_key: Generate a key
 setting_mail_handler_api_enabled: Enable WS for incoming emails
 setting_mail_handler_api_key: API key
+text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."
diff --git a/lang/ja.yml b/lang/ja.yml
index 5bdc3b554..cba410f6d 100644
--- a/lang/ja.yml
+++ b/lang/ja.yml
@@ -632,3 +632,4 @@ label_incoming_emails: Incoming emails
 label_generate_key: Generate a key
 setting_mail_handler_api_enabled: Enable WS for incoming emails
 setting_mail_handler_api_key: API key
+text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."
diff --git a/lang/ko.yml b/lang/ko.yml
index 8e0d35ef4..2b5b0eb0a 100644
--- a/lang/ko.yml
+++ b/lang/ko.yml
@@ -631,3 +631,4 @@ label_incoming_emails: Incoming emails
 label_generate_key: Generate a key
 setting_mail_handler_api_enabled: Enable WS for incoming emails
 setting_mail_handler_api_key: API key
+text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."
diff --git a/lang/lt.yml b/lang/lt.yml
index 0f80a94d8..52b6b6fc8 100644
--- a/lang/lt.yml
+++ b/lang/lt.yml
@@ -634,3 +634,4 @@ label_generate_key: Generuoti raktą
 setting_mail_handler_api_enabled: Įgalinti WS įeinantiems laiškams
 setting_mail_handler_api_key: API raktas
 
+text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."
diff --git a/lang/nl.yml b/lang/nl.yml
index d1facc7a6..09cdc3c08 100644
--- a/lang/nl.yml
+++ b/lang/nl.yml
@@ -632,3 +632,4 @@ label_incoming_emails: Incoming emails
 label_generate_key: Generate a key
 setting_mail_handler_api_enabled: Enable WS for incoming emails
 setting_mail_handler_api_key: API key
+text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."
diff --git a/lang/no.yml b/lang/no.yml
index bf25a15a5..eb1ff59ca 100644
--- a/lang/no.yml
+++ b/lang/no.yml
@@ -632,3 +632,4 @@ label_incoming_emails: Incoming emails
 label_generate_key: Generate a key
 setting_mail_handler_api_enabled: Enable WS for incoming emails
 setting_mail_handler_api_key: API key
+text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."
diff --git a/lang/pl.yml b/lang/pl.yml
index 28c5f19d4..9c5a382b0 100644
--- a/lang/pl.yml
+++ b/lang/pl.yml
@@ -631,3 +631,4 @@ label_incoming_emails: Incoming emails
 label_generate_key: Generate a key
 setting_mail_handler_api_enabled: Enable WS for incoming emails
 setting_mail_handler_api_key: API key
+text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."
diff --git a/lang/pt-br.yml b/lang/pt-br.yml
index 04c3b347c..1582e568f 100644
--- a/lang/pt-br.yml
+++ b/lang/pt-br.yml
@@ -631,3 +631,4 @@ label_incoming_emails: Incoming emails
 label_generate_key: Generate a key
 setting_mail_handler_api_enabled: Enable WS for incoming emails
 setting_mail_handler_api_key: API key
+text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."
diff --git a/lang/pt.yml b/lang/pt.yml
index 5a1ffc2e0..a5b703fcf 100644
--- a/lang/pt.yml
+++ b/lang/pt.yml
@@ -631,3 +631,4 @@ label_incoming_emails: Incoming emails
 label_generate_key: Generate a key
 setting_mail_handler_api_enabled: Enable WS for incoming emails
 setting_mail_handler_api_key: API key
+text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."
diff --git a/lang/ro.yml b/lang/ro.yml
index 3a1696c7b..3fa154d48 100644
--- a/lang/ro.yml
+++ b/lang/ro.yml
@@ -631,3 +631,4 @@ label_incoming_emails: Incoming emails
 label_generate_key: Generate a key
 setting_mail_handler_api_enabled: Enable WS for incoming emails
 setting_mail_handler_api_key: API key
+text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."
diff --git a/lang/ru.yml b/lang/ru.yml
index 7d0707f7f..5d59ec1fb 100644
--- a/lang/ru.yml
+++ b/lang/ru.yml
@@ -635,3 +635,4 @@ label_incoming_emails: Incoming emails
 label_generate_key: Generate a key
 setting_mail_handler_api_enabled: Enable WS for incoming emails
 setting_mail_handler_api_key: API key
+text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."
diff --git a/lang/sr.yml b/lang/sr.yml
index 5b8e5d934..fa1b4d847 100644
--- a/lang/sr.yml
+++ b/lang/sr.yml
@@ -632,3 +632,4 @@ label_incoming_emails: Incoming emails
 label_generate_key: Generate a key
 setting_mail_handler_api_enabled: Enable WS for incoming emails
 setting_mail_handler_api_key: API key
+text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."
diff --git a/lang/sv.yml b/lang/sv.yml
index 4c6170f4a..9015099e7 100644
--- a/lang/sv.yml
+++ b/lang/sv.yml
@@ -632,3 +632,4 @@ label_incoming_emails: Incoming emails
 label_generate_key: Generate a key
 setting_mail_handler_api_enabled: Enable WS for incoming emails
 setting_mail_handler_api_key: API key
+text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."
diff --git a/lang/th.yml b/lang/th.yml
index e7f276a34..27f7b14cf 100644
--- a/lang/th.yml
+++ b/lang/th.yml
@@ -634,3 +634,4 @@ label_incoming_emails: Incoming emails
 label_generate_key: Generate a key
 setting_mail_handler_api_enabled: Enable WS for incoming emails
 setting_mail_handler_api_key: API key
+text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."
diff --git a/lang/uk.yml b/lang/uk.yml
index 275de0e4b..0286779be 100644
--- a/lang/uk.yml
+++ b/lang/uk.yml
@@ -633,3 +633,4 @@ label_incoming_emails: Incoming emails
 label_generate_key: Generate a key
 setting_mail_handler_api_enabled: Enable WS for incoming emails
 setting_mail_handler_api_key: API key
+text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."
diff --git a/lang/zh-tw.yml b/lang/zh-tw.yml
index 9b43ed45e..0e8fabef9 100644
--- a/lang/zh-tw.yml
+++ b/lang/zh-tw.yml
@@ -632,3 +632,4 @@ default_activity_development: 開發
 enumeration_issue_priorities: 項目優先權
 enumeration_doc_categories: 文件分類
 enumeration_activities: 活動 (時間追蹤)
+text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."
diff --git a/lang/zh.yml b/lang/zh.yml
index 2bd0880a5..1cde9f502 100644
--- a/lang/zh.yml
+++ b/lang/zh.yml
@@ -632,3 +632,4 @@ default_activity_development: 开发
 enumeration_issue_priorities: 问题优先级
 enumeration_doc_categories: 文档类别
 enumeration_activities: 活动（时间跟踪）
+text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."

From 1e6b8a482ae12d48fa72305d73891a2611db47c5 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sat, 5 Jul 2008 07:39:07 +0000
Subject: [PATCH 594/710] Removes calls to TimeZone#adjust (#1584).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1626 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/helpers/application_helper.rb | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 090d7b058..fdc541645 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -75,11 +75,7 @@ module ApplicationHelper
     return nil unless time
     time = time.to_time if time.is_a?(String)
     zone = User.current.time_zone
-    if time.utc?
-      local = zone ? zone.adjust(time) : time.getlocal
-    else
-      local = zone ? zone.adjust(time.getutc) : time
-    end
+    local = zone ? time.in_time_zone(zone) : (time.utc? ? time.utc_to_local : time)
     @date_format ||= (Setting.date_format.blank? || Setting.date_format.size < 2 ? l(:general_fmt_date) : Setting.date_format)
     @time_format ||= (Setting.time_format.blank? ? l(:general_fmt_time) : Setting.time_format)
     include_date ? local.strftime("#{@date_format} #{@time_format}") : local.strftime(@time_format)

From 12fbd06c02d44fdb96922154476302f002783e23 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sat, 5 Jul 2008 08:59:04 +0000
Subject: [PATCH 595/710] Display svn properties in the browser, svn >= 1.5.0
 only (#1581).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1627 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/repositories_controller.rb    |  4 +-
 app/helpers/repositories_helper.rb            | 10 +++++
 app/models/repository.rb                      |  4 ++
 app/views/repositories/browse.rhtml           |  1 +
 app/views/repositories/changes.rhtml          |  4 +-
 lib/redmine/scm/adapters/abstract_adapter.rb  | 28 +++++++++++-
 .../scm/adapters/subversion_adapter.rb        | 43 ++++++++++++++++++-
 public/stylesheets/application.css            |  4 ++
 ...repositories_subversion_controller_test.rb | 13 ++++++
 test/unit/subversion_adapter_test.rb          | 33 ++++++++++++++
 10 files changed, 139 insertions(+), 5 deletions(-)
 create mode 100644 test/unit/subversion_adapter_test.rb

diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb
index 7b3387347..13bba6200 100644
--- a/app/controllers/repositories_controller.rb
+++ b/app/controllers/repositories_controller.rb
@@ -66,6 +66,7 @@ class RepositoriesController < ApplicationController
       @entries ? render(:partial => 'dir_list_content') : render(:nothing => true)
     else
       show_error_not_found and return unless @entries
+      @properties = @repository.properties(@path, @rev)
       render :action => 'browse'
     end
   end
@@ -74,6 +75,7 @@ class RepositoriesController < ApplicationController
     @entry = @repository.entry(@path, @rev)
     show_error_not_found and return unless @entry
     @changesets = @repository.changesets_for_path(@path)
+    @properties = @repository.properties(@path, @rev)
   end
   
   def revisions
@@ -106,7 +108,7 @@ class RepositoriesController < ApplicationController
     else
       # Prevent empty lines when displaying a file with Windows style eol
       @content.gsub!("\r\n", "\n")
-    end
+   end
   end
   
   def annotate
diff --git a/app/helpers/repositories_helper.rb b/app/helpers/repositories_helper.rb
index 4ef337c26..59e1e0fb9 100644
--- a/app/helpers/repositories_helper.rb
+++ b/app/helpers/repositories_helper.rb
@@ -22,6 +22,16 @@ module RepositoriesHelper
     txt.to_s[0,8]
   end
   
+  def render_properties(properties)
+    unless properties.nil? || properties.empty?
+      content = ''
+      properties.keys.sort.each do |property|
+        content << content_tag('li', "<b>#{h property}</b>: <span>#{h properties[property]}</span>")
+      end
+      content_tag('ul', content, :class => 'properties')
+    end
+  end
+  
   def to_path_param(path)
     path.to_s.split(%r{[/\\]}).select {|p| !p.blank?}
   end
diff --git a/app/models/repository.rb b/app/models/repository.rb
index c7bf0dbf4..2a8728f92 100644
--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -59,6 +59,10 @@ class Repository < ActiveRecord::Base
     scm.entries(path, identifier)
   end
   
+  def properties(path, identifier=nil)
+    scm.properties(path, identifier)
+  end
+  
   def cat(path, identifier=nil)
     scm.cat(path, identifier)
   end
diff --git a/app/views/repositories/browse.rhtml b/app/views/repositories/browse.rhtml
index 868388f11..4029a77d2 100644
--- a/app/views/repositories/browse.rhtml
+++ b/app/views/repositories/browse.rhtml
@@ -7,6 +7,7 @@
 <h2><%= render :partial => 'navigation', :locals => { :path => @path, :kind => 'dir', :revision => @rev } %></h2>
 
 <%= render :partial => 'dir_list' %>
+<%= render_properties(@properties) %>
 
 <% content_for :header_tags do %>
 <%= stylesheet_link_tag "scm" %>
diff --git a/app/views/repositories/changes.rhtml b/app/views/repositories/changes.rhtml
index 85695ec45..ca5c58328 100644
--- a/app/views/repositories/changes.rhtml
+++ b/app/views/repositories/changes.rhtml
@@ -1,7 +1,5 @@
 <h2><%= render :partial => 'navigation', :locals => { :path => @path, :kind => (@entry ? @entry.kind : nil), :revision => @rev } %></h2>
 
-<h3><%=h @entry.name %></h3>
-
 <p>
 <% if @repository.supports_cat? %>
     <%= link_to l(:button_view), {:action => 'entry', :id => @project, :path => to_path_param(@path), :rev => @rev } %> |
@@ -13,6 +11,8 @@
 <%= "(#{number_to_human_size(@entry.size)})" if @entry.size %>
 </p>
 
+<%= render_properties(@properties) %>
+
 <%= render(:partial => 'revisions', 
            :locals => {:project => @project, :path => @path, :revisions => @changesets, :entry => @entry }) unless @changesets.empty? %>
 
diff --git a/lib/redmine/scm/adapters/abstract_adapter.rb b/lib/redmine/scm/adapters/abstract_adapter.rb
index 0bacda770..a876de937 100644
--- a/lib/redmine/scm/adapters/abstract_adapter.rb
+++ b/lib/redmine/scm/adapters/abstract_adapter.rb
@@ -24,6 +24,20 @@ module Redmine
       end
       
       class AbstractAdapter #:nodoc:
+        class << self
+          # Returns the version of the scm client
+          # Eg: [1, 5, 0]
+          def client_version
+            'Unknown version'
+          end
+          
+          # Returns the version string of the scm client
+          # Eg: '1.5.0'
+          def client_version_string
+            client_version.is_a?(Array) ? client_version.join('.') : client_version.to_s
+          end
+        end
+                
         def initialize(url, root_url=nil, login=nil, password=nil)
           @url = url
           @login = login if login && !login.empty?
@@ -77,6 +91,10 @@ module Redmine
         def entries(path=nil, identifier=nil)
           return nil
         end
+        
+        def properties(path, identifier=nil)
+          return nil
+        end
     
         def revisions(path=nil, identifier_from=nil, identifier_to=nil, options={})
           return nil
@@ -131,10 +149,18 @@ module Redmine
         end
             
         def logger
-          RAILS_DEFAULT_LOGGER
+          self.class.logger
         end
         
         def shellout(cmd, &block)
+          self.class.shellout(cmd, &block)
+        end
+        
+        def self.logger
+          RAILS_DEFAULT_LOGGER
+        end
+        
+        def self.shellout(cmd, &block)
           logger.debug "Shelling out: #{cmd}" if logger && logger.debug?
           begin
             IO.popen(cmd, "r+") do |io|
diff --git a/lib/redmine/scm/adapters/subversion_adapter.rb b/lib/redmine/scm/adapters/subversion_adapter.rb
index 7c98eee8b..90940715d 100644
--- a/lib/redmine/scm/adapters/subversion_adapter.rb
+++ b/lib/redmine/scm/adapters/subversion_adapter.rb
@@ -26,6 +26,25 @@ module Redmine
         # SVN executable name
         SVN_BIN = "svn"
         
+        class << self
+          def client_version
+            @@client_version ||= (svn_binary_version || 'Unknown version')
+          end
+          
+          def svn_binary_version
+            cmd = "#{SVN_BIN} --version"
+            version = nil
+            shellout(cmd) do |io|
+              # Read svn version in first returned line
+              if m = io.gets.match(%r{((\d+\.)+\d+)})
+                version = m[0].scan(%r{\d+}).collect(&:to_i)
+              end
+            end
+            return nil if $? && $?.exitstatus != 0
+            version
+          end
+        end
+        
         # Get info about the svn repository
         def info
           cmd = "#{SVN_BIN} info --xml #{target('')}"
@@ -87,7 +106,29 @@ module Redmine
           logger.debug("Found #{entries.size} entries in the repository for #{target(path)}") if logger && logger.debug?
           entries.sort_by_name
         end
-    
+        
+        def properties(path, identifier=nil)
+          # proplist xml output supported in svn 1.5.0 and higher
+          return nil if (self.class.client_version <=> [1, 5, 0]) < 0
+          
+          identifier = (identifier and identifier.to_i > 0) ? identifier.to_i : "HEAD"
+          cmd = "#{SVN_BIN} proplist --verbose --xml #{target(path)}@#{identifier}"
+          cmd << credentials_string
+          properties = {}
+          shellout(cmd) do |io|
+            output = io.read
+            begin
+              doc = REXML::Document.new(output)
+              doc.elements.each("properties/target/property") do |property|
+                properties[ property.attributes['name'] ] = property.text
+              end
+            rescue
+            end
+          end
+          return nil if $? && $?.exitstatus != 0
+          properties
+        end
+        
         def revisions(path=nil, identifier_from=nil, identifier_to=nil, options={})
           path ||= ''
           identifier_from = (identifier_from and identifier_from.to_i > 0) ? identifier_from.to_i : "HEAD"
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index c10dfbef1..8f092eaee 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -217,6 +217,10 @@ table#time-report tbody tr.last-level { font-style: normal; color: #555; }
 table#time-report tbody tr.total { font-style: normal; font-weight: bold; color: #555; background-color:#EEEEEE; }
 table#time-report .hours-dec { font-size: 0.9em; }
 
+ul.properties {padding:0; font-size: 0.9em; color: #777;}
+ul.properties li {list-style-type:none;}
+ul.properties li span {font-style:italic;}
+
 .total-hours { font-size: 110%; font-weight: bold; }
 .total-hours span.hours-int { font-size: 120%; }
 
diff --git a/test/functional/repositories_subversion_controller_test.rb b/test/functional/repositories_subversion_controller_test.rb
index 6af5cd5dd..35dfbb1a1 100644
--- a/test/functional/repositories_subversion_controller_test.rb
+++ b/test/functional/repositories_subversion_controller_test.rb
@@ -71,6 +71,19 @@ class RepositoriesSubversionControllerTest < Test::Unit::TestCase
       assert_not_nil assigns(:entries)
       assert_equal ['folder', '.project', 'helloworld.c', 'helloworld.rb', 'textfile.txt'], assigns(:entries).collect(&:name)
     end
+    
+    def test_changes
+      get :changes, :id => 1, :path => ['subversion_test', 'folder', 'helloworld.rb' ]
+      assert_response :success
+      assert_template 'changes'
+      # svn properties
+      assert_not_nil assigns(:properties)
+      assert_equal 'native', assigns(:properties)['svn:eol-style']
+      assert_tag :ul,
+                 :child => { :tag => 'li',
+                             :child => { :tag => 'b', :content => 'svn:eol-style' },
+                             :child => { :tag => 'span', :content => 'native' } }
+    end
       
     def test_entry
       get :entry, :id => 1, :path => ['subversion_test', 'helloworld.c']
diff --git a/test/unit/subversion_adapter_test.rb b/test/unit/subversion_adapter_test.rb
new file mode 100644
index 000000000..9f208839a
--- /dev/null
+++ b/test/unit/subversion_adapter_test.rb
@@ -0,0 +1,33 @@
+# redMine - project management software
+# Copyright (C) 2006-2008  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 'mkmf'
+
+require File.dirname(__FILE__) + '/../test_helper'
+
+class SubversionAdapterTest < Test::Unit::TestCase
+  
+  if find_executable0('svn')
+    def test_client_version
+      v = Redmine::Scm::Adapters::SubversionAdapter.client_version
+      assert v.is_a?(Array)
+    end
+  else
+    puts "Subversion binary NOT FOUND. Skipping unit tests !!!"
+    def test_fake; assert true end
+  end
+end

From 29fb8db9362c2c46b1d20c302257b4e1b5eb12b2 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sat, 5 Jul 2008 09:39:00 +0000
Subject: [PATCH 596/710] Adds MercurialAdapter.client_version and prevent @hg
 --version@ to be called on each request.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1628 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 lib/redmine/scm/adapters/mercurial_adapter.rb | 64 ++++++++++---------
 test/unit/mercurial_adapter_test.rb           | 52 ++++++++-------
 2 files changed, 62 insertions(+), 54 deletions(-)

diff --git a/lib/redmine/scm/adapters/mercurial_adapter.rb b/lib/redmine/scm/adapters/mercurial_adapter.rb
index a00ff4c49..a201db933 100644
--- a/lib/redmine/scm/adapters/mercurial_adapter.rb
+++ b/lib/redmine/scm/adapters/mercurial_adapter.rb
@@ -28,6 +28,39 @@ module Redmine
         TEMPLATE_NAME = "hg-template"
         TEMPLATE_EXTENSION = "tmpl"
         
+        class << self
+          def client_version
+            @@client_version ||= (hgversion || 'Unknown version')
+          end
+          
+          def hgversion  
+            # The hg version is expressed either as a
+            # release number (eg 0.9.5 or 1.0) or as a revision
+            # id composed of 12 hexa characters.
+            theversion = hgversion_from_command_line
+            if theversion.match(/^\d+(\.\d+)+/)
+              theversion.split(".").collect(&:to_i)
+            end
+          end
+          
+          def hgversion_from_command_line
+            %x{#{HG_BIN} --version}.match(/\(version (.*)\)/)[1]
+          end
+          
+          def template_path
+            @@template_path ||= template_path_for(client_version)
+          end
+          
+          def template_path_for(version)
+            if version.is_a?(String) or ((version <=> [0,9,5]) > 0)
+              ver = "1.0"
+            else
+              ver = "0.9.5"
+            end
+            "#{TEMPLATES_DIR}/#{TEMPLATE_NAME}-#{ver}.#{TEMPLATE_EXTENSION}"
+          end
+        end
+        
         def info
           cmd = "#{HG_BIN} -R #{target('')} root"
           root_url = nil
@@ -72,7 +105,7 @@ module Redmine
         # makes Mercurial produce a xml output.
         def revisions(path=nil, identifier_from=nil, identifier_to=nil, options={})  
           revisions = Revisions.new
-          cmd = "#{HG_BIN} --debug --encoding utf8 -R #{target('')} log -C --style #{self.template_path}"
+          cmd = "#{HG_BIN} --debug --encoding utf8 -R #{target('')} log -C --style #{self.class.template_path}"
           if identifier_from && identifier_to
             cmd << " -r #{identifier_from.to_i}:#{identifier_to.to_i}"
           elsif identifier_from
@@ -166,35 +199,6 @@ module Redmine
           return nil if $? && $?.exitstatus != 0
           blame
         end
-        
-        # The hg version version is expressed either as a
-        # release number (eg 0.9.5 or 1.0) or as a revision
-        # id composed of 12 hexa characters.
-        def hgversion  
-          theversion = hgversion_from_command_line
-          if theversion.match(/^\d+(\.\d+)+/)
-            theversion.split(".").collect(&:to_i)
-            #            elsif match = theversion.match(/[[:xdigit:]]{12}/)
-            #               match[0]
-          else
-            "Unknown version"
-          end
-        end
-        
-        def template_path
-          @template ||= begin
-                          if hgversion.is_a?(String) or ((hgversion <=> [0,9,5]) > 0)
-                            ver = "1.0"
-                          else
-                            ver = "0.9.5"
-                          end
-                          "#{TEMPLATES_DIR}/#{TEMPLATE_NAME}-#{ver}.#{TEMPLATE_EXTENSION}"
-                        end
-        end
-        
-        def hgversion_from_command_line
-          @hgversion ||= %x{#{HG_BIN} --version}.match(/\(version (.*)\)/)[1]
-        end
       end
     end
   end
diff --git a/test/unit/mercurial_adapter_test.rb b/test/unit/mercurial_adapter_test.rb
index 7c1ef85fd..4fecebe24 100644
--- a/test/unit/mercurial_adapter_test.rb
+++ b/test/unit/mercurial_adapter_test.rb
@@ -10,37 +10,41 @@ begin
     
     REPOSITORY_PATH = RAILS_ROOT.gsub(%r{config\/\.\.}, '') + '/tmp/test/mercurial_repository'
     
-    
-    def test_version_template_0_9_5
-      # 0.9.5
-      test_version_template_for("0.9.5", [0,9,5], "0.9.5")
+    def test_hgversion
+      to_test = { "0.9.5" => [0,9,5],
+                  "1.0" => [1,0],
+                  "1e4ddc9ac9f7+20080325" => nil,
+                  "1.0.1+20080525" => [1,0,1],
+                  "1916e629a29d" => nil}
+      
+      to_test.each do |s, v|
+        test_hgversion_for(s, v)
+      end
     end
     
-    def test_version_template_1_0
-      # 1.0
-      test_version_template_for("1.0", [1,0], "1.0")
-    end
-    
-    def test_version_template_1_0_win
-      test_version_template_for("1e4ddc9ac9f7+20080325", "Unknown version", "1.0")
-    end
-    
-    def test_version_template_1_0_1_win
-      test_version_template_for("1.0.1+20080525", [1,0,1], "1.0")
-    end
-    
-    def test_version_template_changeset_id
-      test_version_template_for("1916e629a29d", "Unknown version", "1.0")
+    def test_template_path
+      to_test = { [0,9,5] => "0.9.5",
+                  [1,0] => "1.0",
+                  "Unknown version" => "1.0",
+                  [1,0,1] => "1.0"}
+      
+      to_test.each do |v, template|
+        test_template_path_for(v, template)
+      end
     end
     
     private
     
-    def test_version_template_for(hgversion, version, templateversion)
-      Redmine::Scm::Adapters::MercurialAdapter.any_instance.stubs(:hgversion_from_command_line).returns(hgversion)
-      adapter = Redmine::Scm::Adapters::MercurialAdapter.new(REPOSITORY_PATH)
+    def test_hgversion_for(hgversion, version)
+      Redmine::Scm::Adapters::MercurialAdapter.expects(:hgversion_from_command_line).returns(hgversion)
+      adapter = Redmine::Scm::Adapters::MercurialAdapter
       assert_equal version, adapter.hgversion
-      assert_equal "#{TEMPLATES_DIR}/#{TEMPLATE_NAME}-#{templateversion}.#{TEMPLATE_EXTENSION}", adapter.template_path
-      assert File.exist?(adapter.template_path)
+    end
+    
+    def test_template_path_for(version, template)
+      adapter = Redmine::Scm::Adapters::MercurialAdapter
+      assert_equal "#{TEMPLATES_DIR}/#{TEMPLATE_NAME}-#{template}.#{TEMPLATE_EXTENSION}", adapter.template_path_for(version)
+      assert File.exist?(adapter.template_path_for(version))
     end
   end
   

From bc9a8494d2e67493e3ec701384fe5377207e8bcd Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 6 Jul 2008 12:24:14 +0000
Subject: [PATCH 597/710] Merged CHANGELOG from 0.7 stable.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1639 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 doc/CHANGELOG | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/doc/CHANGELOG b/doc/CHANGELOG
index 5fe6bfc4e..ac8cb6673 100644
--- a/doc/CHANGELOG
+++ b/doc/CHANGELOG
@@ -5,6 +5,18 @@ Copyright (C) 2006-2008  Jean-Philippe Lang
 http://www.redmine.org/
 
 
+== 2008-07-06 v0.7.3
+
+* Allow dot in firstnames and lastnames
+* Add project name to cross-project Atom feeds
+* Encoding set to utf8 in example database.yml
+* HTML titles on forums related views
+* Fixed: various XSS vulnerabilities
+* Fixed: Entourage (and some old client) fails to correctly render notification styles
+* Fixed: Fixed: timelog redirects inappropriately when :back_url is blank
+* Fixed: wrong relative paths to images in wiki_syntax.html
+
+
 == 2008-06-15 v0.7.2
 
 * "New Project" link on Projects page

From 8c6c3eab5cab4ba3e849fce5dba87eb0edb25285 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 6 Jul 2008 12:43:51 +0000
Subject: [PATCH 598/710] Fixes "source:" links URLs (r1617).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1640 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/helpers/application_helper.rb            | 7 ++++++-
 app/helpers/repositories_helper.rb           | 4 ----
 test/unit/helpers/application_helper_test.rb | 2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index fdc541645..6266dd951 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -112,6 +112,10 @@ module ApplicationHelper
     type ? CodeRay.scan(content, type).html : h(content)
   end
   
+  def to_path_param(path)
+    path.to_s.split(%r{[/\\]}).select {|p| !p.blank?}
+  end
+
   def pagination_links_full(paginator, count=nil, options={})
     page_param = options.delete(:page_param) || :page
     url_param = params.dup
@@ -349,7 +353,8 @@ module ApplicationHelper
             if project && project.repository
               name =~ %r{^[/\\]*(.*?)(@([0-9a-f]+))?(#(L\d+))?$}
               path, rev, anchor = $1, $3, $5
-              link = link_to h("#{prefix}:#{name}"), {:controller => 'repositories', :action => 'entry', :id => project, :path => path,
+              link = link_to h("#{prefix}:#{name}"), {:controller => 'repositories', :action => 'entry', :id => project,
+                                                      :path => to_path_param(path),
                                                       :rev => rev,
                                                       :anchor => anchor,
                                                       :format => (prefix == 'export' ? 'raw' : nil)},
diff --git a/app/helpers/repositories_helper.rb b/app/helpers/repositories_helper.rb
index 59e1e0fb9..852ed18d7 100644
--- a/app/helpers/repositories_helper.rb
+++ b/app/helpers/repositories_helper.rb
@@ -32,10 +32,6 @@ module RepositoriesHelper
     end
   end
   
-  def to_path_param(path)
-    path.to_s.split(%r{[/\\]}).select {|p| !p.blank?}
-  end
-  
   def to_utf8(str)
     return str if /\A[\r\n\t\x20-\x7e]*\Z/n.match(str) # for us-ascii
     @encodings ||= Setting.repositories_encodings.split(',').collect(&:strip)
diff --git a/test/unit/helpers/application_helper_test.rb b/test/unit/helpers/application_helper_test.rb
index 45eb2df90..d4f9e0247 100644
--- a/test/unit/helpers/application_helper_test.rb
+++ b/test/unit/helpers/application_helper_test.rb
@@ -81,7 +81,7 @@ class ApplicationHelperTest < HelperTestCase
     version_link = link_to('1.0', {:controller => 'versions', :action => 'show', :id => 2},
                                   :class => 'version')
 
-    source_url = {:controller => 'repositories', :action => 'entry', :id => 'ecookbook', :path => 'some/file'}
+    source_url = {:controller => 'repositories', :action => 'entry', :id => 'ecookbook', :path => ['some', 'file']}
     
     to_test = {
       # tickets

From d4f55a86fdc5aaf58db6e9f9a942f7adad68d4f6 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 6 Jul 2008 13:47:59 +0000
Subject: [PATCH 599/710] Adds project name to issues feed title (#1323).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1641 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/issues_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index 6014116b3..1e57f1f87 100644
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -66,7 +66,7 @@ class IssuesController < ApplicationController
                            :offset =>  @issue_pages.current.offset
       respond_to do |format|
         format.html { render :template => 'issues/index.rhtml', :layout => !request.xhr? }
-        format.atom { render_feed(@issues, :title => l(:label_issue_plural)) }
+        format.atom { render_feed(@issues, :title => "#{@project || Setting.app_title}: #{l(:label_issue_plural)}") }
         format.csv  { send_data(issues_to_csv(@issues, @project).read, :type => 'text/csv; header=present', :filename => 'export.csv') }
         format.pdf  { send_data(render(:template => 'issues/index.rfpdf', :layout => false), :type => 'application/pdf', :filename => 'export.pdf') }
       end

From bfba84d526f80e14d7c1422ac51a40803f828f9e Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 6 Jul 2008 13:57:10 +0000
Subject: [PATCH 600/710] Better naming of activity feed if only one kind of
 event is displayed (#1323).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1642 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/projects_controller.rb | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 87a93c815..3af77d1ac 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -311,7 +311,10 @@ class ProjectsController < ApplicationController
     
     respond_to do |format|
       format.html { render :layout => false if request.xhr? }
-      format.atom { render_feed(@events, :title => "#{@project || Setting.app_title}: #{l(:label_activity)}") }
+      format.atom {
+        title = (@scope.size == 1) ? l("label_#{@scope.first.singularize}_plural") : l(:label_activity)
+        render_feed(@events, :title => "#{@project || Setting.app_title}: #{title}")
+      }
     end
   end
   

From 40efaae6d5a2f48734caf4cdabd9537f923c0f47 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 6 Jul 2008 16:26:25 +0000
Subject: [PATCH 601/710] Mail handler: more control over issue attributes
 (#1110). Tracker, category and priority attributes can be specified in
 command line arguments and/or individually specified as overridable by email
 body keywords.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1643 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/models/mail_handler.rb                    | 33 +++++---
 extra/mail_handler/rdm-mailhandler.rb         | 65 ++++++++++++----
 lib/tasks/email.rake                          | 76 ++++++++++++++-----
 test/fixtures/issue_categories.yml            |  6 ++
 .../mail_handler/ticket_with_attributes.eml   | 43 +++++++++++
 test/unit/mail_handler_test.rb                | 40 +++++++++-
 6 files changed, 214 insertions(+), 49 deletions(-)
 create mode 100644 test/fixtures/mail_handler/ticket_with_attributes.eml

diff --git a/app/models/mail_handler.rb b/app/models/mail_handler.rb
index 124f7db74..109db2989 100644
--- a/app/models/mail_handler.rb
+++ b/app/models/mail_handler.rb
@@ -23,7 +23,14 @@ class MailHandler < ActionMailer::Base
   attr_reader :email, :user
 
   def self.receive(email, options={})
-    @@handler_options = options
+    @@handler_options = options.dup
+    
+    @@handler_options[:issue] ||= {}
+    
+    @@handler_options[:allow_override] = @@handler_options[:allow_override].split(',').collect(&:strip) if @@handler_options[:allow_override].is_a?(String)
+    @@handler_options[:allow_override] ||= []
+    # Project needs to be overridable if not specified
+    @@handler_options[:allow_override] << 'project' unless @@handler_options[:issue].has_key?(:project)
     super email
   end
   
@@ -66,11 +73,13 @@ class MailHandler < ActionMailer::Base
   # Creates a new issue
   def receive_issue
     project = target_project
-    # TODO: make the tracker configurable
-    tracker = project.trackers.find(:first)
+    tracker = (get_keyword(:tracker) && project.trackers.find_by_name(get_keyword(:tracker))) || project.trackers.find(:first)
+    category = (get_keyword(:category) && project.issue_categories.find_by_name(get_keyword(:category)))
+    priority = (get_keyword(:priority) && Enumeration.find_by_opt_and_name('IPRI', get_keyword(:priority)))
+
     # check permission
     raise UnauthorizedAction unless user.allowed_to?(:add_issues, project)
-    issue = Issue.new(:author => user, :project => project, :tracker => tracker)
+    issue = Issue.new(:author => user, :project => project, :tracker => tracker, :category => category, :priority => priority)
     issue.subject = email.subject.chomp
     issue.description = email.plain_text_body.chomp
     issue.save!
@@ -84,13 +93,7 @@ class MailHandler < ActionMailer::Base
     # TODO: other ways to specify project:
     # * parse the email To field
     # * specific project (eg. Setting.mail_handler_target_project)
-    identifier = if !@@handler_options[:project].blank?
-                   @@handler_options[:project]
-                 elsif email.plain_text_body =~ %r{^Project:[ \t]*(.+)$}i
-                    $1
-                 end
-                 
-    target = Project.find_by_identifier(identifier.to_s)
+    target = Project.find_by_identifier(get_keyword(:project))
     raise MissingInformation.new('Unable to determine target project') if target.nil?
     target
   end
@@ -120,6 +123,14 @@ class MailHandler < ActionMailer::Base
       end
     end
   end
+  
+  def get_keyword(attr)
+    if @@handler_options[:allow_override].include?(attr.to_s) && email.plain_text_body =~ /^#{attr}:[ \t]*(.+)$/i
+      $1.strip
+    elsif !@@handler_options[:issue][attr].blank?
+      @@handler_options[:issue][attr]
+    end
+  end
 end
 
 class TMail::Mail
diff --git a/extra/mail_handler/rdm-mailhandler.rb b/extra/mail_handler/rdm-mailhandler.rb
index 585afefef..87a6798fa 100644
--- a/extra/mail_handler/rdm-mailhandler.rb
+++ b/extra/mail_handler/rdm-mailhandler.rb
@@ -12,16 +12,22 @@ require 'getoptlong'
 class RedmineMailHandler
   VERSION = '0.1'
   
-  attr_accessor :verbose, :project, :url, :key
+  attr_accessor :verbose, :issue_attributes, :allow_override, :url, :key
 
   def initialize
+    self.issue_attributes = {}
+    
     opts = GetoptLong.new(
       [ '--help', '-h', GetoptLong::NO_ARGUMENT ],
       [ '--version', '-V', GetoptLong::NO_ARGUMENT ],
       [ '--verbose', '-v', GetoptLong::NO_ARGUMENT ],
       [ '--url', '-u', GetoptLong::REQUIRED_ARGUMENT ],
       [ '--key', '-k', GetoptLong::REQUIRED_ARGUMENT],
-      [ '--project', '-p', GetoptLong::REQUIRED_ARGUMENT ]
+      [ '--project', '-p', GetoptLong::REQUIRED_ARGUMENT ],
+      [ '--tracker', '-t', GetoptLong::REQUIRED_ARGUMENT],
+      [ '--category', GetoptLong::REQUIRED_ARGUMENT],
+      [ '--priority', GetoptLong::REQUIRED_ARGUMENT],
+      [ '--allow-override', '-o', GetoptLong::REQUIRED_ARGUMENT]
     )
 
     opts.each do |opt, arg|
@@ -36,8 +42,10 @@ class RedmineMailHandler
         self.verbose = true
       when '--version'
         puts VERSION; exit
-      when '--project'
-        self.project = arg.dup
+      when '--project', '--tracker', '--category', '--priority'
+        self.issue_attributes[opt.gsub(%r{^\-\-}, '')] = arg.dup
+      when '--allow-override'
+        self.allow_override = arg.dup
       end
     end
     
@@ -46,8 +54,11 @@ class RedmineMailHandler
   
   def submit(email)
     uri = url.gsub(%r{/*$}, '') + '/mail_handler'
+    
+    data = { 'key' => key, 'email' => email, 'allow_override' => allow_override }
+    issue_attributes.each { |attr, value| data["issue[#{attr}]"] = value }
+             
     debug "Posting to #{uri}..."
-    data = { 'key' => key, 'project' => project, 'email' => email }
     response = Net::HTTP.post_form(URI.parse(uri), data)
     debug "Response received: #{response.code}"
     response.code == 201 ? 0 : 1
@@ -56,17 +67,39 @@ class RedmineMailHandler
   private
   
   def usage
-    puts "Usage: rdm-mailhandler [options] --url=<Redmine URL> --key=<API key>"
-    puts "Reads an email from standard input and forward it to a Redmine server"
-    puts
-    puts "Options:"
-    puts "  --help             show this help"
-    puts "  --verbose          show extra information"
-    puts "  --project          identifier of the target project"
-    puts
-    puts "Examples:"
-    puts "  rdm-mailhandler --url http://redmine.domain.foo --key secret"
-    puts "  rdm-mailhandler --url https://redmine.domain.foo --key secret --project foo"
+    puts  <<-USAGE
+Usage: rdm-mailhandler [options] --url=<Redmine URL> --key=<API key>
+Reads an email from standard input and forward it to a Redmine server
+
+Required:
+  -u, --url                      URL of the Redmine server
+  -k, --key                      Redmine API key
+  
+General options:
+  -h, --help                     show this help
+  -v, --verbose                  show extra information
+  -V, --version                  show version information and exit
+
+Issue attributes control options:
+  -p, --project=PROJECT          identifier of the target project
+  -t, --tracker=TRACKER          name of the target tracker
+      --category=CATEGORY        name of the target category
+      --priority=PRIORITY        name of the target priority
+  -o, --allow-override=ATTRS     allow email content to override attributes
+                                 specified by previous options
+                                 ATTRS is a comma separated list of attributes
+      
+Examples:
+  # No project specified. Emails MUST contain the 'Project' keyword:
+  rdm-mailhandler --url http://redmine.domain.foo --key secret
+  
+  # Fixed project and default tracker specified, but emails can override
+  # both tracker and priority attributes:
+  rdm-mailhandler --url https://domain.foo/redmine --key secret \\
+                  --project foo \\
+                  --tracker bug \\
+                  --allow-override tracker,priority
+USAGE
     exit
   end
   
diff --git a/lib/tasks/email.rake b/lib/tasks/email.rake
index 01407c36d..daf0aa9bb 100644
--- a/lib/tasks/email.rake
+++ b/lib/tasks/email.rake
@@ -21,16 +21,31 @@ namespace :redmine do
     desc <<-END_DESC
 Read an email from standard input.
 
-Available options:
-  * project => identifier of the project the issue should be added to
-  
-Example:
-  rake redmine:email:receive project=foo RAILS_ENV="production"
+Issue attributes control options:
+  project=PROJECT          identifier of the target project
+  tracker=TRACKER          name of the target tracker
+  category=CATEGORY        name of the target category
+  priority=PRIORITY        name of the target priority
+  allow_override=ATTRS     allow email content to override attributes
+                           specified by previous options
+                           ATTRS is a comma separated list of attributes
+
+Examples:
+  # No project specified. Emails MUST contain the 'Project' keyword:
+  rake redmine:email:read RAILS_ENV="production" < raw_email
+
+  # Fixed project and default tracker specified, but emails can override
+  # both tracker and priority attributes:
+  rake redmine:email:read RAILS_ENV="production" \\
+                  project=foo \\
+                  tracker=bug \\
+                  allow_override=tracker,priority < raw_email
 END_DESC
 
-    task :receive => :environment do
-      options = {}
-      options[:project] = ENV['project'] if ENV['project']
+    task :read => :environment do
+      options = { :issue => {} }
+      %w(project tracker category priority).each { |a| options[:issue][a.to_sym] = ENV[a] if ENV[a] }
+      options[:allow_override] = ENV['allow_override'] if ENV['allow_override']
       
       MailHandler.receive(STDIN.read, options)
     end
@@ -39,17 +54,37 @@ END_DESC
 Read emails from an IMAP server.
 
 Available IMAP options:
-  * host      => IMAP server host (default: 127.0.0.1)
-  * port      => IMAP server port (default: 143)
-  * ssl       => Use SSL? (default: false)
-  * username  => IMAP account
-  * password  => IMAP password
-  * folder    => IMAP folder to read (default: INBOX)
-Other options:
-  * project   => identifier of the project the issue should be added to
+  host=HOST                IMAP server host (default: 127.0.0.1)
+  port=PORT                IMAP server port (default: 143)
+  ssl=SSL                  Use SSL? (default: false)
+  username=USERNAME        IMAP account
+  password=PASSWORD        IMAP password
+  folder=FOLDER            IMAP folder to read (default: INBOX)
+
+Issue attributes control options:
+  project=PROJECT          identifier of the target project
+  tracker=TRACKER          name of the target tracker
+  category=CATEGORY        name of the target category
+  priority=PRIORITY        name of the target priority
+  allow_override=ATTRS     allow email content to override attributes
+                           specified by previous options
+                           ATTRS is a comma separated list of attributes
   
-Example:
-  rake redmine:email:receive_iamp host=imap.foo.bar username=redmine@somenet.foo password=xxx project=foo RAILS_ENV="production"
+Examples:
+  # No project specified. Emails MUST contain the 'Project' keyword:
+  
+  rake redmine:email:receive_iamp RAILS_ENV="production" \\
+    host=imap.foo.bar username=redmine@somenet.foo password=xxx
+
+
+  # Fixed project and default tracker specified, but emails can override
+  # both tracker and priority attributes:
+  
+  rake redmine:email:receive_iamp RAILS_ENV="production" \\
+    host=imap.foo.bar username=redmine@somenet.foo password=xxx ssl=1 \\
+    project=foo \\
+    tracker=bug \\
+    allow_override=tracker,priority
 END_DESC
 
     task :receive_imap => :environment do
@@ -60,8 +95,9 @@ END_DESC
                       :password => ENV['password'],
                       :folder => ENV['folder']}
                       
-      options = {}
-      options[:project] = ENV['project'] if ENV['project']
+      options = { :issue => {} }
+      %w(project tracker category priority).each { |a| options[:issue][a.to_sym] = ENV[a] if ENV[a] }
+      options[:allow_override] = ENV['allow_override'] if ENV['allow_override']
 
       Redmine::IMAP.check(imap_options, options)
     end
diff --git a/test/fixtures/issue_categories.yml b/test/fixtures/issue_categories.yml
index 6c2a07b58..2b74b5977 100644
--- a/test/fixtures/issue_categories.yml
+++ b/test/fixtures/issue_categories.yml
@@ -9,3 +9,9 @@ issue_categories_002:
   project_id: 1
   assigned_to_id: 
   id: 2
+issue_categories_003: 
+  name: Stock management
+  project_id: 2
+  assigned_to_id: 
+  id: 3
+  
\ No newline at end of file
diff --git a/test/fixtures/mail_handler/ticket_with_attributes.eml b/test/fixtures/mail_handler/ticket_with_attributes.eml
new file mode 100644
index 000000000..118523496
--- /dev/null
+++ b/test/fixtures/mail_handler/ticket_with_attributes.eml
@@ -0,0 +1,43 @@
+Return-Path: <jsmith@somenet.foo>
+Received: from osiris ([127.0.0.1])
+	by OSIRIS
+	with hMailServer ; Sun, 22 Jun 2008 12:28:07 +0200
+Message-ID: <000501c8d452$a95cd7e0$0a00a8c0@osiris>
+From: "John Smith" <jsmith@somenet.foo>
+To: <redmine@somenet.foo>
+Subject: New ticket on a given project
+Date: Sun, 22 Jun 2008 12:28:07 +0200
+MIME-Version: 1.0
+Content-Type: text/plain;
+	format=flowed;
+	charset="iso-8859-1";
+	reply-type=original
+Content-Transfer-Encoding: 7bit
+X-Priority: 3
+X-MSMail-Priority: Normal
+X-Mailer: Microsoft Outlook Express 6.00.2900.2869
+X-MimeOLE: Produced By Microsoft MimeOLE V6.00.2900.2869
+
+Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Maecenas imperdiet 
+turpis et odio. Integer eget pede vel dolor euismod varius. Phasellus 
+blandit eleifend augue. Nulla facilisi. Duis id diam. Class aptent taciti 
+sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. In 
+in urna sed tellus aliquet lobortis. Morbi scelerisque tortor in dolor. Cras 
+sagittis odio eu lacus. Aliquam sem tortor, consequat sit amet, vestibulum 
+id, iaculis at, lectus. Fusce tortor libero, congue ut, euismod nec, luctus 
+eget, eros. Pellentesque tortor enim, feugiat in, dignissim eget, tristique 
+sed, mauris. Pellentesque habitant morbi tristique senectus et netus et 
+malesuada fames ac turpis egestas. Quisque sit amet libero. In hac habitasse 
+platea dictumst.
+
+Nulla et nunc. Duis pede. Donec et ipsum. Nam ut dui tincidunt neque 
+sollicitudin iaculis. Duis vitae dolor. Vestibulum eget massa. Sed lorem. 
+Nullam volutpat cursus erat. Cras felis dolor, lacinia quis, rutrum et, 
+dictum et, ligula. Sed erat nibh, gravida in, accumsan non, placerat sed, 
+massa. Sed sodales, ante fermentum ultricies sollicitudin, massa leo 
+pulvinar dui, a gravida orci mi eget odio. Nunc a lacus.
+
+Project: onlinestore
+Tracker: Feature request
+category: Stock management
+priority: Urgent
diff --git a/test/unit/mail_handler_test.rb b/test/unit/mail_handler_test.rb
index 6bb638f21..6e8a47c35 100644
--- a/test/unit/mail_handler_test.rb
+++ b/test/unit/mail_handler_test.rb
@@ -18,7 +18,15 @@
 require File.dirname(__FILE__) + '/../test_helper'
 
 class MailHandlerTest < Test::Unit::TestCase
-  fixtures :users, :projects, :enabled_modules, :roles, :members, :issues, :trackers, :enumerations
+  fixtures :users, :projects, 
+                   :enabled_modules,
+                   :roles,
+                   :members,
+                   :issues,
+                   :trackers,
+                   :projects_trackers,
+                   :enumerations,
+                   :issue_categories
   
   FIXTURES_PATH = File.dirname(__FILE__) + '/../fixtures/mail_handler'
   
@@ -38,8 +46,36 @@ class MailHandlerTest < Test::Unit::TestCase
     assert issue.description.include?('Lorem ipsum dolor sit amet, consectetuer adipiscing elit.')
   end
   
+  def test_add_issue_with_attributes_override
+    issue = submit_email('ticket_with_attributes.eml', :allow_override => 'tracker,category,priority')
+    assert issue.is_a?(Issue)
+    assert !issue.new_record?
+    issue.reload
+    assert_equal 'New ticket on a given project', issue.subject
+    assert_equal User.find_by_login('jsmith'), issue.author
+    assert_equal Project.find(2), issue.project
+    assert_equal 'Feature request', issue.tracker.to_s
+    assert_equal 'Stock management', issue.category.to_s
+    assert_equal 'Urgent', issue.priority.to_s
+    assert issue.description.include?('Lorem ipsum dolor sit amet, consectetuer adipiscing elit.')
+  end
+  
+  def test_add_issue_with_partial_attributes_override
+    issue = submit_email('ticket_with_attributes.eml', :issue => {:priority => 'High'}, :allow_override => ['tracker'])
+    assert issue.is_a?(Issue)
+    assert !issue.new_record?
+    issue.reload
+    assert_equal 'New ticket on a given project', issue.subject
+    assert_equal User.find_by_login('jsmith'), issue.author
+    assert_equal Project.find(2), issue.project
+    assert_equal 'Feature request', issue.tracker.to_s
+    assert_nil issue.category
+    assert_equal 'High', issue.priority.to_s
+    assert issue.description.include?('Lorem ipsum dolor sit amet, consectetuer adipiscing elit.')
+  end
+  
   def test_add_issue_with_attachment_to_specific_project
-    issue = submit_email('ticket_with_attachment.eml', :project => 'onlinestore')
+    issue = submit_email('ticket_with_attachment.eml', :issue => {:project => 'onlinestore'})
     assert issue.is_a?(Issue)
     assert !issue.new_record?
     issue.reload

From bb76561ca68e75d42cc8667dd38caefb4a67c80f Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Wed, 9 Jul 2008 17:16:37 +0000
Subject: [PATCH 602/710] Fixes Gantt chart with ruby 1.8.7 (#1606).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1647 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/projects/gantt.rhtml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/views/projects/gantt.rhtml b/app/views/projects/gantt.rhtml
index 071e0f324..b18bca34c 100644
--- a/app/views/projects/gantt.rhtml
+++ b/app/views/projects/gantt.rhtml
@@ -190,7 +190,6 @@ top = headers_height + 10
 	<%= i.status.name %>
 	<%= (i.done_ratio).to_i %>%
 	</div>
-	<% # === tooltip === %>
 	<div class="tooltip" style="position: absolute;top:<%= top %>px;left:<%= i_left %>px;width:<%= i_width %>px;height:12px;">
 	<span class="tip">
     <%= render_issue_tooltip i %>

From de3d5a88e4c70a06501cc51d7c2a1fcace4092a7 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Wed, 9 Jul 2008 17:25:19 +0000
Subject: [PATCH 603/710] Fixes links to entries on the revision view (Rails
 2.1 compatibility) (#1600).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1648 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/repositories/revision.rhtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/repositories/revision.rhtml b/app/views/repositories/revision.rhtml
index 04c0e2108..80ac3bd1a 100644
--- a/app/views/repositories/revision.rhtml
+++ b/app/views/repositories/revision.rhtml
@@ -50,7 +50,7 @@
 <% if change.action == "D" -%>
     <%= change.path -%>
 <% else -%>
-    <%= link_to change.path, :action => 'entry', :id => @project, :path => without_leading_slash(change.relative_path), :rev => @changeset.revision -%>
+    <%= link_to change.path, :action => 'entry', :id => @project, :path => to_path_param(change.relative_path), :rev => @changeset.revision -%>
 <% end -%>
 <%= "(#{change.revision})" unless change.revision.blank?  %></td>
 <td align="right">

From be4cc2f99e34316be4b8beb2e9040c5ea967a736 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Thu, 10 Jul 2008 12:31:49 +0000
Subject: [PATCH 604/710] Fixed: search engine may reveal private projects
 (#1613).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1649 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/models/journal.rb                         |   3 +-
 app/models/project.rb                         |  18 +--
 test/unit/search_test.rb                      | 134 ++++++++++++++++++
 .../lib/acts_as_searchable.rb                 |   2 +-
 4 files changed, 147 insertions(+), 10 deletions(-)
 create mode 100644 test/unit/search_test.rb

diff --git a/app/models/journal.rb b/app/models/journal.rb
index 67a3eee3b..8583f63de 100644
--- a/app/models/journal.rb
+++ b/app/models/journal.rb
@@ -28,7 +28,8 @@ class Journal < ActiveRecord::Base
   acts_as_searchable :columns => 'notes',
                      :include => {:issue => :project},
                      :project_key => "#{Issue.table_name}.project_id",
-                     :date_column => "#{Issue.table_name}.created_on"
+                     :date_column => "#{Issue.table_name}.created_on",
+                     :permission => :view_issues
   
   acts_as_event :title => Proc.new {|o| status = ((s = o.new_status) ? " (#{s})" : nil); "#{o.issue.tracker} ##{o.issue.id}#{status}: #{o.issue.subject}" },
                 :description => :notes,
diff --git a/app/models/project.rb b/app/models/project.rb
index a5ba246b1..67e6c0e39 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -112,16 +112,18 @@ class Project < ActiveRecord::Base
     end
     if user.admin?
       # no restriction
-    elsif user.logged?
-      statements << "#{Project.table_name}.is_public = #{connection.quoted_true}" if Role.non_member.allowed_to?(permission)
-      allowed_project_ids = user.memberships.select {|m| m.role.allowed_to?(permission)}.collect {|m| m.project_id}
-      statements << "#{Project.table_name}.id IN (#{allowed_project_ids.join(',')})" if allowed_project_ids.any?
-    elsif Role.anonymous.allowed_to?(permission)
-      # anonymous user allowed on public project
-      statements << "#{Project.table_name}.is_public = #{connection.quoted_true}" 
     else
-      # anonymous user is not authorized
       statements << "1=0"
+      if user.logged?
+        statements << "#{Project.table_name}.is_public = #{connection.quoted_true}" if Role.non_member.allowed_to?(permission)
+        allowed_project_ids = user.memberships.select {|m| m.role.allowed_to?(permission)}.collect {|m| m.project_id}
+        statements << "#{Project.table_name}.id IN (#{allowed_project_ids.join(',')})" if allowed_project_ids.any?
+      elsif Role.anonymous.allowed_to?(permission)
+        # anonymous user allowed on public project
+        statements << "#{Project.table_name}.is_public = #{connection.quoted_true}" 
+      else
+        # anonymous user is not authorized
+      end
     end
     statements.empty? ? base_statement : "((#{base_statement}) AND (#{statements.join(' OR ')}))"
   end
diff --git a/test/unit/search_test.rb b/test/unit/search_test.rb
new file mode 100644
index 000000000..e2cc8e766
--- /dev/null
+++ b/test/unit/search_test.rb
@@ -0,0 +1,134 @@
+# redMine - project management software
+# Copyright (C) 2006-2008  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 File.dirname(__FILE__) + '/../test_helper'
+
+class SearchTest < Test::Unit::TestCase
+  fixtures :users,
+           :members,
+           :projects,
+           :roles,
+           :enabled_modules,
+           :issues,
+           :trackers,
+           :journals,
+           :journal_details,
+           :repositories,
+           :changesets
+
+  def setup
+    @project = Project.find(1)
+    @issue_keyword = '%Unable to print recipes%'
+    @issue = Issue.find(1)
+    @changeset_keyword = '%very first commit%'
+    @changeset = Changeset.find(100)
+  end
+  
+  def test_search_by_anonymous
+    User.current = nil
+    
+    r = Issue.search(@issue_keyword)
+    assert r.include?(@issue)
+    r = Changeset.search(@changeset_keyword)
+    assert r.include?(@changeset)
+    
+    # Removes the :view_changesets permission from Anonymous role
+    remove_permission Role.anonymous, :view_changesets
+    
+    r = Issue.search(@issue_keyword)
+    assert r.include?(@issue)
+    r = Changeset.search(@changeset_keyword)
+    assert !r.include?(@changeset)
+    
+    # Make the project private
+    @project.update_attribute :is_public, false
+    r = Issue.search(@issue_keyword)
+    assert !r.include?(@issue)
+    r = Changeset.search(@changeset_keyword)
+    assert !r.include?(@changeset)
+  end
+  
+  def test_search_by_user
+    User.current = User.find_by_login('rhill')
+    assert User.current.memberships.empty?
+    
+    r = Issue.search(@issue_keyword)
+    assert r.include?(@issue)
+    r = Changeset.search(@changeset_keyword)
+    assert r.include?(@changeset)
+    
+    # Removes the :view_changesets permission from Non member role
+    remove_permission Role.non_member, :view_changesets
+    
+    r = Issue.search(@issue_keyword)
+    assert r.include?(@issue)
+    r = Changeset.search(@changeset_keyword)
+    assert !r.include?(@changeset)
+    
+    # Make the project private
+    @project.update_attribute :is_public, false
+    r = Issue.search(@issue_keyword)
+    assert !r.include?(@issue)
+    r = Changeset.search(@changeset_keyword)
+    assert !r.include?(@changeset)
+  end
+  
+  def test_search_by_allowed_member
+    User.current = User.find_by_login('jsmith')
+    assert User.current.projects.include?(@project)
+    
+    r = Issue.search(@issue_keyword)
+    assert r.include?(@issue)
+    r = Changeset.search(@changeset_keyword)
+    assert r.include?(@changeset)
+
+    # Make the project private
+    @project.update_attribute :is_public, false
+    r = Issue.search(@issue_keyword)
+    assert r.include?(@issue)
+    r = Changeset.search(@changeset_keyword)
+    assert r.include?(@changeset)
+  end
+
+  def test_search_by_unallowed_member
+    # Removes the :view_changesets permission from user's and non member role
+    remove_permission Role.find(1), :view_changesets
+    remove_permission Role.non_member, :view_changesets
+    
+    User.current = User.find_by_login('jsmith')
+    assert User.current.projects.include?(@project)
+    
+    r = Issue.search(@issue_keyword)
+    assert r.include?(@issue)
+    r = Changeset.search(@changeset_keyword)
+    assert !r.include?(@changeset)
+
+    # Make the project private
+    @project.update_attribute :is_public, false
+    r = Issue.search(@issue_keyword)
+    assert r.include?(@issue)
+    r = Changeset.search(@changeset_keyword)
+    assert !r.include?(@changeset)
+  end
+  
+  private
+  
+  def remove_permission(role, permission)
+    role.permissions = role.permissions - [ permission ]
+    role.save
+  end
+end
diff --git a/vendor/plugins/acts_as_searchable/lib/acts_as_searchable.rb b/vendor/plugins/acts_as_searchable/lib/acts_as_searchable.rb
index 1eb64c30f..2c773d70a 100644
--- a/vendor/plugins/acts_as_searchable/lib/acts_as_searchable.rb
+++ b/vendor/plugins/acts_as_searchable/lib/acts_as_searchable.rb
@@ -67,7 +67,7 @@ module Redmine
         module ClassMethods
           # Search the model for the given tokens
           # projects argument can be either nil (will search all projects), a project or an array of projects
-          def search(tokens, projects, options={})
+          def search(tokens, projects=nil, options={})
             tokens = [] << tokens unless tokens.is_a?(Array)
             projects = [] << projects unless projects.nil? || projects.is_a?(Array)
             

From d7eb689c745493b79f8debace522224012a88480 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Thu, 10 Jul 2008 13:36:28 +0000
Subject: [PATCH 605/710] Fixed: trailing period should not be included in
 redmine links of type class:id (#1612).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1650 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/helpers/application_helper.rb            | 2 +-
 test/unit/helpers/application_helper_test.rb | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 6266dd951..ad4c46440 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -298,7 +298,7 @@ module ApplicationHelper
     #     source:some/file#L120 -> Link to line 120 of the file
     #     source:some/file@52#L120 -> Link to line 120 of the file's revision 52
     #     export:some/file -> Force the download of the file
-    text = text.gsub(%r{([\s\(,\-\>]|^)(!)?(attachment|document|version|commit|source|export)?((#|r)(\d+)|(:)([^"\s<>][^\s<>]*|"[^"]+"))(?=[[:punct:]]|\s|<|$)}) do |m|
+    text = text.gsub(%r{([\s\(,\-\>]|^)(!)?(attachment|document|version|commit|source|export)?((#|r)(\d+)|(:)([^"\s<>][^\s<>]*?|"[^"]+?"))(?=(?=[[:punct:]]\W)|\s|<|$)}) do |m|
       leading, esc, prefix, sep, oid = $1, $2, $3, $5 || $7, $6 || $8
       link = nil
       if esc.nil?
diff --git a/test/unit/helpers/application_helper_test.rb b/test/unit/helpers/application_helper_test.rb
index d4f9e0247..56a36851b 100644
--- a/test/unit/helpers/application_helper_test.rb
+++ b/test/unit/helpers/application_helper_test.rb
@@ -82,6 +82,7 @@ class ApplicationHelperTest < HelperTestCase
                                   :class => 'version')
 
     source_url = {:controller => 'repositories', :action => 'entry', :id => 'ecookbook', :path => ['some', 'file']}
+    source_url_with_ext = {:controller => 'repositories', :action => 'entry', :id => 'ecookbook', :path => ['some', 'file.ext']}
     
     to_test = {
       # tickets
@@ -97,8 +98,15 @@ class ApplicationHelperTest < HelperTestCase
       'version:"1.0"'               => version_link,
       # source
       'source:/some/file'           => link_to('source:/some/file', source_url, :class => 'source'),
+      'source:/some/file.'          => link_to('source:/some/file', source_url, :class => 'source') + ".",
+      'source:/some/file.ext.'      => link_to('source:/some/file.ext', source_url_with_ext, :class => 'source') + ".",
+      'source:/some/file. '         => link_to('source:/some/file', source_url, :class => 'source') + ".",
+      'source:/some/file.ext. '     => link_to('source:/some/file.ext', source_url_with_ext, :class => 'source') + ".",
+      'source:/some/file, '         => link_to('source:/some/file', source_url, :class => 'source') + ",",
       'source:/some/file@52'        => link_to('source:/some/file@52', source_url.merge(:rev => 52), :class => 'source'),
+      'source:/some/file.ext@52'    => link_to('source:/some/file.ext@52', source_url_with_ext.merge(:rev => 52), :class => 'source'),
       'source:/some/file#L110'      => link_to('source:/some/file#L110', source_url.merge(:anchor => 'L110'), :class => 'source'),
+      'source:/some/file.ext#L110'  => link_to('source:/some/file.ext#L110', source_url_with_ext.merge(:anchor => 'L110'), :class => 'source'),
       'source:/some/file@52#L110'   => link_to('source:/some/file@52#L110', source_url.merge(:rev => 52, :anchor => 'L110'), :class => 'source'),
       'export:/some/file'           => link_to('export:/some/file', source_url.merge(:format => 'raw'), :class => 'source download'),
       # escaping

From 9ff53f97eecbe1f63b226dd3ea2666343316ce6a Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Thu, 10 Jul 2008 16:23:42 +0000
Subject: [PATCH 606/710] Do not use partial in PDF templates (not supported
 when using rfpdf with Rails 2.1) (#1619).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1651 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/issues/_pdf.rfpdf | 118 ------------------------------------
 app/views/issues/show.rfpdf | 118 +++++++++++++++++++++++++++++++++++-
 2 files changed, 117 insertions(+), 119 deletions(-)
 delete mode 100644 app/views/issues/_pdf.rfpdf

diff --git a/app/views/issues/_pdf.rfpdf b/app/views/issues/_pdf.rfpdf
deleted file mode 100644
index 6830506f6..000000000
--- a/app/views/issues/_pdf.rfpdf
+++ /dev/null
@@ -1,118 +0,0 @@
-<%	pdf.SetFontStyle('B',11)   	
-   	pdf.Cell(190,10, "#{issue.project.name} - #{issue.tracker.name} # #{issue.id}: #{issue.subject}")
-    pdf.Ln
-    
-    y0 = pdf.GetY
-    
-    pdf.SetFontStyle('B',9)
-    pdf.Cell(35,5, l(:field_status) + ":","LT")
-    pdf.SetFontStyle('',9)
-    pdf.Cell(60,5, issue.status.name,"RT")
-    pdf.SetFontStyle('B',9)
-    pdf.Cell(35,5, l(:field_priority) + ":","LT")
-    pdf.SetFontStyle('',9)
-    pdf.Cell(60,5, issue.priority.name,"RT")        
-    pdf.Ln
-    
-    pdf.SetFontStyle('B',9)
-    pdf.Cell(35,5, l(:field_author) + ":","L")
-    pdf.SetFontStyle('',9)
-    pdf.Cell(60,5, issue.author.name,"R")
-    pdf.SetFontStyle('B',9)
-    pdf.Cell(35,5, l(:field_category) + ":","L")
-    pdf.SetFontStyle('',9)
-    pdf.Cell(60,5, (issue.category ? issue.category.name : "-"),"R")
-    pdf.Ln   
-    
-    pdf.SetFontStyle('B',9)
-    pdf.Cell(35,5, l(:field_created_on) + ":","L")
-    pdf.SetFontStyle('',9)
-    pdf.Cell(60,5, format_date(issue.created_on),"R")
-    pdf.SetFontStyle('B',9)
-    pdf.Cell(35,5, l(:field_assigned_to) + ":","L")
-    pdf.SetFontStyle('',9)
-    pdf.Cell(60,5, (issue.assigned_to ? issue.assigned_to.name : "-"),"R")
-    pdf.Ln
-    
-    pdf.SetFontStyle('B',9)
-    pdf.Cell(35,5, l(:field_updated_on) + ":","LB")
-    pdf.SetFontStyle('',9)
-    pdf.Cell(60,5, format_date(issue.updated_on),"RB")
-    pdf.SetFontStyle('B',9)
-    pdf.Cell(35,5, l(:field_due_date) + ":","LB")
-    pdf.SetFontStyle('',9)
-    pdf.Cell(60,5, format_date(issue.due_date),"RB")
-    pdf.Ln
-    
-	for custom_value in issue.custom_values
-	    pdf.SetFontStyle('B',9)
-	    pdf.Cell(35,5, custom_value.custom_field.name + ":","L")
-	    pdf.SetFontStyle('',9)
-	    pdf.MultiCell(155,5, (show_value custom_value),"R")
-	end
-    
-    pdf.SetFontStyle('B',9)
-    pdf.Cell(35,5, l(:field_subject) + ":","LTB")
-    pdf.SetFontStyle('',9)
-    pdf.Cell(155,5, issue.subject,"RTB")
-    pdf.Ln    
-    
-    pdf.SetFontStyle('B',9)
-    pdf.Cell(35,5, l(:field_description) + ":")
-    pdf.SetFontStyle('',9)
-    pdf.MultiCell(155,5, issue.description,"BR")
-    
-    pdf.Line(pdf.GetX, y0, pdf.GetX, pdf.GetY)
-	pdf.Line(pdf.GetX, pdf.GetY, 170, pdf.GetY)
-
-    pdf.Ln
-    
-    if @issue.changesets.any? && User.current.allowed_to?(:view_changesets, issue.project)
-    	pdf.SetFontStyle('B',9)
-	    pdf.Cell(190,5, l(:label_associated_revisions), "B")
-	    pdf.Ln	
-		for changeset in @issue.changesets
-			pdf.SetFontStyle('B',8)
-		    pdf.Cell(190,5, format_time(changeset.committed_on) + " - " + changeset.committer)
-		    pdf.Ln
-			unless changeset.comments.blank?
-				pdf.SetFontStyle('',8)
-				pdf.MultiCell(190,5, changeset.comments)
-			end		
-			pdf.Ln
-		end
-	end
-	
-	pdf.SetFontStyle('B',9)
-    pdf.Cell(190,5, l(:label_history), "B")
-    pdf.Ln	
-	for journal in issue.journals.find(:all, :include => [:user, :details], :order => "#{Journal.table_name}.created_on ASC")
-		pdf.SetFontStyle('B',8)
-	    pdf.Cell(190,5, format_time(journal.created_on) + " - " + journal.user.name)
-	    pdf.Ln
-		pdf.SetFontStyle('I',8)
-		for detail in journal.details
-			pdf.Cell(190,5, "- " + show_detail(detail, true))
-			pdf.Ln
-		end
-		if journal.notes?
-			pdf.SetFontStyle('',8)
-			pdf.MultiCell(190,5, journal.notes)
-		end		
-		pdf.Ln
-	end
-	
-	if issue.attachments.any?
-	    pdf.SetFontStyle('B',9)
-	    pdf.Cell(190,5, l(:label_attachment_plural), "B")
-		pdf.Ln
-		for attachment in issue.attachments
-			pdf.SetFontStyle('',8)
-		    pdf.Cell(80,5, attachment.filename)
-			pdf.Cell(20,5, number_to_human_size(attachment.filesize),0,0,"R")
-			pdf.Cell(25,5, format_date(attachment.created_on),0,0,"R")
-			pdf.Cell(65,5, attachment.author.name,0,0,"R")
-			pdf.Ln
-		end
-	end
-%>
diff --git a/app/views/issues/show.rfpdf b/app/views/issues/show.rfpdf
index 08f2cb92d..73d9d66b5 100644
--- a/app/views/issues/show.rfpdf
+++ b/app/views/issues/show.rfpdf
@@ -4,7 +4,123 @@
 	pdf.footer_date = format_date(Date.today)
 	pdf.AddPage
 	
-	render :partial => 'issues/pdf', :locals => { :pdf => pdf, :issue => @issue }
+  	pdf.SetFontStyle('B',11)   	
+   	pdf.Cell(190,10, "#{@issue.project} - #{@issue.tracker} # #{@issue.id}: #{@issue.subject}")
+    pdf.Ln
+    
+    y0 = pdf.GetY
+    
+    pdf.SetFontStyle('B',9)
+    pdf.Cell(35,5, l(:field_status) + ":","LT")
+    pdf.SetFontStyle('',9)
+    pdf.Cell(60,5, @issue.status.name,"RT")
+    pdf.SetFontStyle('B',9)
+    pdf.Cell(35,5, l(:field_priority) + ":","LT")
+    pdf.SetFontStyle('',9)
+    pdf.Cell(60,5, @issue.priority.name,"RT")        
+    pdf.Ln
+    
+    pdf.SetFontStyle('B',9)
+    pdf.Cell(35,5, l(:field_author) + ":","L")
+    pdf.SetFontStyle('',9)
+    pdf.Cell(60,5, @issue.author.name,"R")
+    pdf.SetFontStyle('B',9)
+    pdf.Cell(35,5, l(:field_category) + ":","L")
+    pdf.SetFontStyle('',9)
+    pdf.Cell(60,5, (@issue.category ? @issue.category.name : "-"),"R")
+    pdf.Ln   
+    
+    pdf.SetFontStyle('B',9)
+    pdf.Cell(35,5, l(:field_created_on) + ":","L")
+    pdf.SetFontStyle('',9)
+    pdf.Cell(60,5, format_date(@issue.created_on),"R")
+    pdf.SetFontStyle('B',9)
+    pdf.Cell(35,5, l(:field_assigned_to) + ":","L")
+    pdf.SetFontStyle('',9)
+    pdf.Cell(60,5, (@issue.assigned_to ? @issue.assigned_to.name : "-"),"R")
+    pdf.Ln
+    
+    pdf.SetFontStyle('B',9)
+    pdf.Cell(35,5, l(:field_updated_on) + ":","LB")
+    pdf.SetFontStyle('',9)
+    pdf.Cell(60,5, format_date(@issue.updated_on),"RB")
+    pdf.SetFontStyle('B',9)
+    pdf.Cell(35,5, l(:field_due_date) + ":","LB")
+    pdf.SetFontStyle('',9)
+    pdf.Cell(60,5, format_date(@issue.due_date),"RB")
+    pdf.Ln
+    
+	for custom_value in @issue.custom_values
+	    pdf.SetFontStyle('B',9)
+	    pdf.Cell(35,5, custom_value.custom_field.name + ":","L")
+	    pdf.SetFontStyle('',9)
+	    pdf.MultiCell(155,5, (show_value custom_value),"R")
+	end
+    
+    pdf.SetFontStyle('B',9)
+    pdf.Cell(35,5, l(:field_subject) + ":","LTB")
+    pdf.SetFontStyle('',9)
+    pdf.Cell(155,5, @issue.subject,"RTB")
+    pdf.Ln    
+    
+    pdf.SetFontStyle('B',9)
+    pdf.Cell(35,5, l(:field_description) + ":")
+    pdf.SetFontStyle('',9)
+    pdf.MultiCell(155,5, @issue.description,"BR")
+    
+    pdf.Line(pdf.GetX, y0, pdf.GetX, pdf.GetY)
+	pdf.Line(pdf.GetX, pdf.GetY, 170, pdf.GetY)
+
+    pdf.Ln
+    
+    if @issue.changesets.any? && User.current.allowed_to?(:view_changesets, @issue.project)
+    	pdf.SetFontStyle('B',9)
+	    pdf.Cell(190,5, l(:label_associated_revisions), "B")
+	    pdf.Ln	
+		for changeset in @issue.changesets
+			pdf.SetFontStyle('B',8)
+		    pdf.Cell(190,5, format_time(changeset.committed_on) + " - " + changeset.committer)
+		    pdf.Ln
+			unless changeset.comments.blank?
+				pdf.SetFontStyle('',8)
+				pdf.MultiCell(190,5, changeset.comments)
+			end		
+			pdf.Ln
+		end
+	end
+	
+	pdf.SetFontStyle('B',9)
+    pdf.Cell(190,5, l(:label_history), "B")
+    pdf.Ln	
+	for journal in @issue.journals.find(:all, :include => [:user, :details], :order => "#{Journal.table_name}.created_on ASC")
+		pdf.SetFontStyle('B',8)
+	    pdf.Cell(190,5, format_time(journal.created_on) + " - " + journal.user.name)
+	    pdf.Ln
+		pdf.SetFontStyle('I',8)
+		for detail in journal.details
+			pdf.Cell(190,5, "- " + show_detail(detail, true))
+			pdf.Ln
+		end
+		if journal.notes?
+			pdf.SetFontStyle('',8)
+			pdf.MultiCell(190,5, journal.notes)
+		end		
+		pdf.Ln
+	end
+	
+	if @issue.attachments.any?
+	    pdf.SetFontStyle('B',9)
+	    pdf.Cell(190,5, l(:label_attachment_plural), "B")
+		pdf.Ln
+		for attachment in @issue.attachments
+			pdf.SetFontStyle('',8)
+		    pdf.Cell(80,5, attachment.filename)
+			pdf.Cell(20,5, number_to_human_size(attachment.filesize),0,0,"R")
+			pdf.Cell(25,5, format_date(attachment.created_on),0,0,"R")
+			pdf.Cell(65,5, attachment.author.name,0,0,"R")
+			pdf.Ln
+		end
+	end
 %>
 
 <%= pdf.Output %>

From 622b6121f48f0c3579502d2a9fb4975618177cec Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sat, 12 Jul 2008 09:06:19 +0000
Subject: [PATCH 607/710] Fixes nil error when svn binary version is unknown
 (#1607).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1652 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 lib/redmine/scm/adapters/abstract_adapter.rb   | 17 +++++++++++++----
 lib/redmine/scm/adapters/mercurial_adapter.rb  |  4 ++--
 lib/redmine/scm/adapters/subversion_adapter.rb |  4 ++--
 test/unit/mercurial_adapter_test.rb            |  2 +-
 4 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/lib/redmine/scm/adapters/abstract_adapter.rb b/lib/redmine/scm/adapters/abstract_adapter.rb
index a876de937..c48ed2068 100644
--- a/lib/redmine/scm/adapters/abstract_adapter.rb
+++ b/lib/redmine/scm/adapters/abstract_adapter.rb
@@ -26,15 +26,24 @@ module Redmine
       class AbstractAdapter #:nodoc:
         class << self
           # Returns the version of the scm client
-          # Eg: [1, 5, 0]
+          # Eg: [1, 5, 0] or [] if unknown
           def client_version
-            'Unknown version'
+            []
           end
           
           # Returns the version string of the scm client
-          # Eg: '1.5.0'
+          # Eg: '1.5.0' or 'Unknown version' if unknown
           def client_version_string
-            client_version.is_a?(Array) ? client_version.join('.') : client_version.to_s
+            v = client_version || 'Unknown version'
+            v.is_a?(Array) ? v.join('.') : v.to_s
+          end
+          
+          # Returns true if the current client version is above
+          # or equals the given one
+          # If option is :unknown is set to true, it will return
+          # true if the client version is unknown
+          def client_version_above?(v, options={})
+            ((client_version <=> v) >= 0) || (client_version.empty? && options[:unknown])
           end
         end
                 
diff --git a/lib/redmine/scm/adapters/mercurial_adapter.rb b/lib/redmine/scm/adapters/mercurial_adapter.rb
index a201db933..4eed776d8 100644
--- a/lib/redmine/scm/adapters/mercurial_adapter.rb
+++ b/lib/redmine/scm/adapters/mercurial_adapter.rb
@@ -30,7 +30,7 @@ module Redmine
         
         class << self
           def client_version
-            @@client_version ||= (hgversion || 'Unknown version')
+            @@client_version ||= (hgversion || [])
           end
           
           def hgversion  
@@ -52,7 +52,7 @@ module Redmine
           end
           
           def template_path_for(version)
-            if version.is_a?(String) or ((version <=> [0,9,5]) > 0)
+            if ((version <=> [0,9,5]) > 0) || version.empty?
               ver = "1.0"
             else
               ver = "0.9.5"
diff --git a/lib/redmine/scm/adapters/subversion_adapter.rb b/lib/redmine/scm/adapters/subversion_adapter.rb
index 90940715d..2b7f0192e 100644
--- a/lib/redmine/scm/adapters/subversion_adapter.rb
+++ b/lib/redmine/scm/adapters/subversion_adapter.rb
@@ -28,7 +28,7 @@ module Redmine
         
         class << self
           def client_version
-            @@client_version ||= (svn_binary_version || 'Unknown version')
+            @@client_version ||= (svn_binary_version || [])
           end
           
           def svn_binary_version
@@ -109,7 +109,7 @@ module Redmine
         
         def properties(path, identifier=nil)
           # proplist xml output supported in svn 1.5.0 and higher
-          return nil if (self.class.client_version <=> [1, 5, 0]) < 0
+          return nil unless self.class.client_version_above?([1, 5, 0])
           
           identifier = (identifier and identifier.to_i > 0) ? identifier.to_i : "HEAD"
           cmd = "#{SVN_BIN} proplist --verbose --xml #{target(path)}@#{identifier}"
diff --git a/test/unit/mercurial_adapter_test.rb b/test/unit/mercurial_adapter_test.rb
index 4fecebe24..a2673ad42 100644
--- a/test/unit/mercurial_adapter_test.rb
+++ b/test/unit/mercurial_adapter_test.rb
@@ -25,7 +25,7 @@ begin
     def test_template_path
       to_test = { [0,9,5] => "0.9.5",
                   [1,0] => "1.0",
-                  "Unknown version" => "1.0",
+                  [] => "1.0",
                   [1,0,1] => "1.0"}
       
       to_test.each do |v, template|

From b5444b5fcd84008a67a5486e373813dec1a371c8 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sat, 12 Jul 2008 09:42:18 +0000
Subject: [PATCH 608/710] Fixed: no :author method error on projects atom feed
 (#1623).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1653 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/models/project.rb                             |  3 ++-
 test/functional/projects_controller_test.rb       |  8 ++++++++
 vendor/plugins/acts_as_event/lib/acts_as_event.rb | 15 ++++++++-------
 3 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/app/models/project.rb b/app/models/project.rb
index 67e6c0e39..5679344bc 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -48,7 +48,8 @@ class Project < ActiveRecord::Base
   acts_as_customizable
   acts_as_searchable :columns => ['name', 'description'], :project_key => 'id', :permission => nil
   acts_as_event :title => Proc.new {|o| "#{l(:label_project)}: #{o.name}"},
-                :url => Proc.new {|o| {:controller => 'projects', :action => 'show', :id => o.id}}
+                :url => Proc.new {|o| {:controller => 'projects', :action => 'show', :id => o.id}},
+                :author => nil
 
   attr_protected :status, :enabled_module_names
   
diff --git a/test/functional/projects_controller_test.rb b/test/functional/projects_controller_test.rb
index 88a9fae60..f5f1c6733 100644
--- a/test/functional/projects_controller_test.rb
+++ b/test/functional/projects_controller_test.rb
@@ -42,6 +42,14 @@ class ProjectsControllerTest < Test::Unit::TestCase
     # Subproject in corresponding value
     assert assigns(:project_tree)[Project.find(1)].include?(Project.find(3))
   end
+  
+  def test_index_atom
+    get :index, :format => 'atom'
+    assert_response :success
+    assert_template 'common/feed.atom.rxml'
+    assert_select 'feed>title', :text => 'Redmine: Latest projects'
+    assert_select 'feed>entry', :count => Project.count(:conditions => Project.visible_by(User.current))
+  end
   
   def test_show_by_id
     get :show, :id => 1
diff --git a/vendor/plugins/acts_as_event/lib/acts_as_event.rb b/vendor/plugins/acts_as_event/lib/acts_as_event.rb
index d7f437a5e..0b7ad21f5 100644
--- a/vendor/plugins/acts_as_event/lib/acts_as_event.rb
+++ b/vendor/plugins/acts_as_event/lib/acts_as_event.rb
@@ -25,14 +25,15 @@ module Redmine
       module ClassMethods
         def acts_as_event(options = {})
           return if self.included_modules.include?(Redmine::Acts::Event::InstanceMethods)
-          options[:datetime] ||= :created_on
-          options[:title] ||= :title
-          options[:description] ||= :description
-          options[:author] ||= :author
-          options[:url] ||= {:controller => 'welcome'}
-          options[:type] ||= self.name.underscore.dasherize
+          default_options = { :datetime => :created_on,
+                              :title => :title,
+                              :description => :description,
+                              :author => :author,
+                              :url => {:controller => 'welcome'},
+                              :type => self.name.underscore.dasherize }
+                              
           cattr_accessor :event_options
-          self.event_options = options 
+          self.event_options = default_options.merge(options)
           send :include, Redmine::Acts::Event::InstanceMethods
         end
       end

From c28cbd5790e5f973b0e1da7242de56de82550bb9 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sat, 12 Jul 2008 10:17:14 +0000
Subject: [PATCH 609/710] Adds engines 2.1.0 plugin.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1654 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 vendor/plugins/engines/.gitignore             |   3 +
 vendor/plugins/engines/CHANGELOG              | 267 ++++++++++++++++++
 vendor/plugins/engines/MIT-LICENSE            |  21 ++
 vendor/plugins/engines/README                 |  83 ++++++
 vendor/plugins/engines/Rakefile               | 211 ++++++++++++++
 vendor/plugins/engines/about.yml              |   7 +
 vendor/plugins/engines/boot.rb                |  18 ++
 .../engines/generators/plugin_migration/USAGE |  45 +++
 .../plugin_migration_generator.rb             |  79 ++++++
 .../templates/plugin_migration.erb            |  13 +
 vendor/plugins/engines/init.rb                |   5 +
 vendor/plugins/engines/lib/engines.rb         | 174 ++++++++++++
 vendor/plugins/engines/lib/engines/assets.rb  |  38 +++
 vendor/plugins/engines/lib/engines/plugin.rb  | 126 +++++++++
 .../engines/lib/engines/plugin/list.rb        |  30 ++
 .../engines/lib/engines/plugin/loader.rb      |  18 ++
 .../engines/lib/engines/plugin/locator.rb     |  11 +
 .../engines/lib/engines/plugin/migrator.rb    |  74 +++++
 .../engines/rails_extensions/action_mailer.rb |  85 ++++++
 .../engines/rails_extensions/asset_helpers.rb | 119 ++++++++
 .../engines/rails_extensions/dependencies.rb  | 145 ++++++++++
 .../engines/rails_extensions/migrations.rb    | 161 +++++++++++
 .../lib/engines/rails_extensions/rails.rb     |  11 +
 .../lib/engines/rails_extensions/routing.rb   |  84 ++++++
 vendor/plugins/engines/lib/engines/testing.rb |  87 ++++++
 vendor/plugins/engines/tasks/engines.rake     | 178 ++++++++++++
 26 files changed, 2093 insertions(+)
 create mode 100644 vendor/plugins/engines/.gitignore
 create mode 100644 vendor/plugins/engines/CHANGELOG
 create mode 100644 vendor/plugins/engines/MIT-LICENSE
 create mode 100644 vendor/plugins/engines/README
 create mode 100644 vendor/plugins/engines/Rakefile
 create mode 100644 vendor/plugins/engines/about.yml
 create mode 100644 vendor/plugins/engines/boot.rb
 create mode 100644 vendor/plugins/engines/generators/plugin_migration/USAGE
 create mode 100644 vendor/plugins/engines/generators/plugin_migration/plugin_migration_generator.rb
 create mode 100644 vendor/plugins/engines/generators/plugin_migration/templates/plugin_migration.erb
 create mode 100644 vendor/plugins/engines/init.rb
 create mode 100644 vendor/plugins/engines/lib/engines.rb
 create mode 100644 vendor/plugins/engines/lib/engines/assets.rb
 create mode 100644 vendor/plugins/engines/lib/engines/plugin.rb
 create mode 100644 vendor/plugins/engines/lib/engines/plugin/list.rb
 create mode 100644 vendor/plugins/engines/lib/engines/plugin/loader.rb
 create mode 100644 vendor/plugins/engines/lib/engines/plugin/locator.rb
 create mode 100644 vendor/plugins/engines/lib/engines/plugin/migrator.rb
 create mode 100644 vendor/plugins/engines/lib/engines/rails_extensions/action_mailer.rb
 create mode 100644 vendor/plugins/engines/lib/engines/rails_extensions/asset_helpers.rb
 create mode 100644 vendor/plugins/engines/lib/engines/rails_extensions/dependencies.rb
 create mode 100644 vendor/plugins/engines/lib/engines/rails_extensions/migrations.rb
 create mode 100644 vendor/plugins/engines/lib/engines/rails_extensions/rails.rb
 create mode 100644 vendor/plugins/engines/lib/engines/rails_extensions/routing.rb
 create mode 100644 vendor/plugins/engines/lib/engines/testing.rb
 create mode 100644 vendor/plugins/engines/tasks/engines.rake

diff --git a/vendor/plugins/engines/.gitignore b/vendor/plugins/engines/.gitignore
new file mode 100644
index 000000000..721bd7dee
--- /dev/null
+++ b/vendor/plugins/engines/.gitignore
@@ -0,0 +1,3 @@
+.DS_Store
+test_app
+doc
\ No newline at end of file
diff --git a/vendor/plugins/engines/CHANGELOG b/vendor/plugins/engines/CHANGELOG
new file mode 100644
index 000000000..5742dcde1
--- /dev/null
+++ b/vendor/plugins/engines/CHANGELOG
@@ -0,0 +1,267 @@
+= EDGE
+
+* Refactored the view loading to work with changes in Edge Rails
+
+* Fixed integration of plugin migrations with the new, default timestamped migrations in Edge Rails
+
+* Refactored tests into the plugin itself - the plugin can now generate its own test_app harness and run tests within it.
+
+
+= 2.0.0 - (ANOTHER) MASSIVE INTERNAL REFACTORING
+
+* Engines now conforms to the new plugin loading mechanism, delegating plugin load order and lots of other things to Rails itself.
+
+
+
+= 1.2.2
+
+* Added the ability to code mix different types of files, cleaning up the existing code-mixing implementation slightly (Ticket #271)
+
+
+= 1.2.1
+
+* Added documentation to clarify some of the issues with Rails unloading classes that aren't required using "require_dependency" (Ticket #266)
+
+* Fixed a bug where test_help was being loaded when it wasn't needed, and was actually causing problems (Ticket #265)
+
+
+= 1.2.0 - MASSIVE INTERNAL REFACTORING
+
+* !!!Support for Rails < 1.2 has been dropped!!!; if you are using Rails =< 1.1.6, please use Engines 1.1.6, available from http://svn.rails-engines.org/engines/tags/rel_1.1.6
+
+* Engines are dead! Long live plugins! There is now no meaningful notion of an engine - all plugins can take advantage of the more powerful features that the engines plugin provides by including app directories, etc.
+
+* Init_engine.rb is no longer used; please use the plugin-standard init.rb instead.
+
+* Engines.start is no longer required; please use the config.plugins array provided by Rails instead
+
+* To get the most benefit from Engines, set config.plugins to ["engines", "*"] to load the engines plugin first, and then all other plugins in their normal order after.
+
+* Access all loaded plugins via the new Rails.plugins array, and by name using Rails.plugins[:plugin_name].
+
+* Access plugin metadata loaded automatically from about.yml: Rails.plugins[:name].about. Plugin#version is provided directly, for easy access.
+
+* Module.config is has been removed - use mattr_accessor instead, and initialize your default values via the init.rb mechanism.
+
+* Public asset helpers have been rewritten; instead of engine_stylesheet, now use stylesheet_link_tag :name, :plugin => "plugin_name"
+
+* Plugin migrations have been reworked to integrate into the main migration stream. Please run script/generate plugin_migration to create plugin migrations in your main application.
+
+* The fixture method for loading fixtures against any class has been removed; instead, engines will now provide a mechanism for loading fixtures from all plugins, by mirroring fixtures into a common location.
+
+* All references to engines have been removed; For example, any rake tasks which applied to engines now apply to all plugins. The default Rails rake tasks for plugins are overridden where necessary.
+
+* Layouts can now be shared via plugins - inspiration gratefully taken from PluginAWeek's plugin_routing :)
+
+* Actual routing from plugins is now possible, by including routes.rb in your plugin directory and using the from_plugin method in config/routes.rb (Ticket #182)
+
+* Controllers are no longer loaded twice if they're not present in the normal app/ directory (Ticket #177)
+
+* The preferred location for javascripts/stylesheets/etc is now 'assets' rather than 'public'
+
+* Ensure that plugins started before routing have their controllers appropriately added to config.controller_paths (Ticket #258)
+
+* Removed Engines.version - it's not longer relevant, now we're loading version information from about.yml files.
+
+* Added a huge amount of documentation to all new modules.
+
+* Added new warning message if installation of engines 1.2.x is attempted in a Rails 1.1.x application
+
+* Added details of the removal of the config method to UPGRADING
+
+* Removed the plugins:info rake task in favour of adding information to script/about via the Rails::Info module (Ticket #261)
+
+* Improved handling of testing and documentation tasks for plugins
+
+
+
+= 1.1.4
+
+* Fixed creation of multipart emails (Ticket #190)
+
+* Added a temporary fix to the code-mixing issue. In your engine's test/test_helper.rb, please add the following lines:
+
+   # Ensure that the code mixing and view loading from the application is disabled
+   Engines.disable_app_views_loading = true
+   Engines.disable_app_code_mixing = true
+
+  which will prevent code mixing for controllers and helpers, and loading views from the application. One thing to remember is to load any controllers/helpers using 'require_or_load' in your tests, to ensure that the engine behaviour is respected (Ticket #135)
+
+* Added tasks to easily test engines individually (Ticket #120)
+
+* Fixture extensions will now fail with an exception if the corresponding class cannot be loaded (Ticket #138)
+
+* Patch for new routing/controller loading in Rails 1.1.6. The routing code is now replaced with the contents of config.controller_paths, along with controller paths from any started engines (Ticket #196)
+
+* Rails' Configuration instance is now stored, and available from all engines and plugins.
+
+
+
+= 1.1.3
+
+* Fixed README to show 'models' rather than 'model' class (Ticket #167)
+* Fixed dependency loading to work with Rails 1.1.4 (Ticket #180)
+
+
+
+= 1.1.2
+
+* Added better fix to version checking (Ticket #130, jdell@gbdev.com).
+
+* Fixed generated init_engine.rb so that VERSION module doesn't cause probems (Ticket #131, japgolly@gmail.com)
+
+* Fixed error with Rails 1.0 when trying to ignore the engine_schema_info table (Ticket #132, snowblink@gmail.com)
+
+* Re-added old style rake tasks (Ticket #133)
+
+* No longer adding all subdirectories of <engine>/app or <engine>/lib, as this can cause issues when files are grouped in modules (Ticket #149, kasatani@gmail.com)
+
+* Fixed engine precidence ordering for Rails 1.1 (Ticket #146)
+
+* Added new Engines.each method to assist in processing the engines in the desired order (Ticket #146)
+
+* Fixed annoying error message at appears when starting the console in development mode (Ticket #134)
+
+* Engines is now super-careful about loading the correct version of Rails from vendor (Ticket #154)
+
+
+
+= 1.1.1
+
+* Fixed migration rake task failing when given a specific version (Ticket #115)
+
+* Added new rake task "test:engines" which will test engines (and other plugins) but ensure that the test database is cloned from development beforehand (Ticket #125)
+
+* Fixed issue where 'engine_schema_info' table was included in schema dumps (Ticket #87)
+
+* Fixed multi-part emails (Ticket #121)
+
+* Added an 'install.rb' file to new engines created by the bundled generator, which installs the engines plugin automatically if it doesn't already exist (Ticket #122)
+
+* Added a default VERSION module to generated engines (Ticket #123)
+
+* Refactored copying of engine's public files to a method of an Engine instance. You can now call Engines.get(:engine_name).copy_public_files (Ticket #108)
+
+* Changed engine generator templates from .rb files to .erb files (Ticket #106)
+
+* Fixed the test_helper.erb file to use the correct testing extensions and not load any schema - the schema will be cloned automatically via rake test:engines
+
+* Fixed problem when running with Rails 1.1.1 where version wasn't determined correctly (Ticket #129)
+
+* Fixed bug preventing engines from loading when both Rails 1.1.0 and 1.1.1 gems are installed and in use.
+
+* Updated version (d'oh!)
+
+
+
+= 1.1.0
+
+* Improved regexp matching for Rails 1.0 engines with peculiar paths
+
+* Engine instance objects can be accessed via Engines[:name], an alias for Engines.get(:name) (Ticket #99)
+
+* init_engine.rb is now processed as the final step in the Engine.start process, so it can access files within the lib directory, which is now in the $LOAD_PATH at that point. (Ticket #99)
+
+* Clarified MIT license (Ticket #98)
+
+* Updated Rake tasks to integrate smoothly with Rails 1.1 namespaces
+
+* Changed the version to "1.1.0 (svn)"
+
+* Added more information about using the plugin with Edge Rails to the README
+
+* moved extensions into lib/engines/ directory to enable use of Engines module in extension code.
+
+* Added conditional require_or_load method which attempts to detect the current Rails version. To use the Edge Rails version of the loading mechanism, add the line:
+
+*   Engines.config :edge, true
+
+* to your environment.rb file.
+
+* Merged changes from /branches/edge and /branches/rb_1.0 into /trunk
+
+* engine_schema_info now respects the prefix/suffixes set for ActiveRecord::Base (Ticket #67)
+
+* added ActiveRecord::Base.wrapped_table_name(name) method to assist in determining the correct table name
+
+
+
+= 1.0.6
+
+* Added ability to determine version information for engines: rake engine_info
+
+* Added a custom logger for the Engines module, to stop pollution of the Rails logs.
+
+* Added some more tests (in particular, see rails_engines/applications/engines_test).
+
+* Another attempt at solving Ticket #53 - controllers and helpers should now be loadable from modules, and if a full path (including RAILS_ROOT/ENGINES_ROOT) is given, it should be safely stripped from the require filename such that corresponding files can be located in any active engines. In other words, controller/helper overloading should now completely work, even if the controllers/helpers are in modules.
+
+* Added (finally) patch from Ticket #22 - ActionMailer helpers should now load
+
+* Removed support for Engines.start :engine, :engine_name => 'whatever'. It was pointless.
+
+* Fixed engine name referencing; engine_stylesheet/engine_javascript can now happily use shorthand engine names (i.e. :test == :test_engine) (Ticket #45)
+
+* Fixed minor documentation error ('Engine.start' ==> 'Engines.start') (Ticket #57)
+
+* Fixed double inclusion of RAILS_ROOT in engine_migrate rake task (Ticket #61)
+
+* Added ability to force config values even if given as a hash (Ticket #62)
+
+
+
+= 1.0.5
+
+* Fixed bug stopping fixtures from loading with PostgreSQL
+
+
+
+= 1.0.4
+
+* Another attempt at loading controllers within modules (Ticket #56)
+
+
+
+= 1.0.3
+
+* Fixed serious dependency bug stopping controllers being loaded (Ticket #56)
+
+
+
+= 1.0.2
+
+* Fixed bug with overloading controllers in modules from /app directory
+
+* Fixed exception thrown when public files couldn't be created; exception is now logged (Ticket #52)
+
+* Fixed problem with generated test_helper.rb file via File.expand_path (Ticket #50)
+
+
+
+= 1.0.1
+
+* Added engine generator for creation of new engines
+
+* Fixed 'Engine' typo in README
+
+* Fixed bug in fixtures extensions
+
+* Fixed /lib path management bug
+
+* Added method to determine public directory location from Engine object
+
+* Fixed bug in the error message in get_engine_dir()
+
+* Added proper component loading
+
+* Added preliminary tests for the config() methods module
+
+
+
+= pre-v170
+
+* Fixed copyright notices to point to DHH, rather than me.
+
+* Moved extension require statements into lib/engines.rb, so the will be loaded if another module/file calls require 'engines
+
+* Added a CHANGELOG file (this file)
diff --git a/vendor/plugins/engines/MIT-LICENSE b/vendor/plugins/engines/MIT-LICENSE
new file mode 100644
index 000000000..2718d6d4b
--- /dev/null
+++ b/vendor/plugins/engines/MIT-LICENSE
@@ -0,0 +1,21 @@
+Copyright (c) 2008 James Adam
+
+The MIT License
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
\ No newline at end of file
diff --git a/vendor/plugins/engines/README b/vendor/plugins/engines/README
new file mode 100644
index 000000000..e26101344
--- /dev/null
+++ b/vendor/plugins/engines/README
@@ -0,0 +1,83 @@
+The engines plugin enhances Rails' own plugin framework, making it simple to share controllers, helpers, models, public assets, routes and migrations in plugins.
+
+For more information, see http://rails-engines.org
+
+= Using the plugin
+
+Once you've installed the engines plugin, you'll need to add a single line to the top of config/environment.rb:
+
+  require File.join(File.dirname(__FILE__), '../vendor/plugins/engines/boot')
+  
+You should add this line just below the require for Rails' own boot.rb file. This will enabled the enhanced plugin loading mechanism automatically for you (i.e. you don't need to set config.plugin_loader manually).
+
+With that aside, you're now ready to start using more powerful plugins in your application. Read on to find out more about what the engines plugin enables.
+
+
+== Better plugins
+
+In addition to the regular set of plugin-supported files (lib, init.rb, tasks, generators, tests), plugins can carry the following when the engines plugin is also installed.
+
+
+=== Controllers, Helpers, and Views
+
+Include these files in an <tt>app</tt> directory just like you would in a normal Rails application. If you need to override a method, view or partial, create the corresponding file in your main <tt>app</tt> directory and it will be used instead.
+
+* Controllers & Helpers: See Engines::RailsExtensions::Dependencies for more information.
+* Views: now handled almost entirely by ActionView itself (see Engines::Plugin#add_plugin_view_paths for more information)
+
+=== Models
+
+Model code can similarly be placed in an <tt>app/models/</tt> directory. Unfortunately, it's not possible to automatically override methods within a model; if your application needs to change the way a model behaves, consider creating a subclass, or replacing the model entirely within your application's <tt>app/models/</tt> directory. See Engines::RailsExtensions::Dependencies for more information.
+
+IMPORTANT NOTE: when you load code from within plugins, it is typically not handled well by Rails in terms of unloading and reloading changes. Look here for more information - http://rails-engines.org/development/common-issues-when-overloading-code-from-plugins/
+
+=== Routes
+
+Include your route declarations in a <tt>routes.rb</tt> file at the root of your plugins, e.g.:
+
+  connect "/my/url", :controller => "some_controller"
+  my_named_route "do_stuff", :controller => "blah", :action => "stuff"
+  # etc.
+  
+You can then load these files into your application by declaring their inclusion in the application's <tt>config/routes.rb</tt>:
+
+  map.from_plugin :plugin_name
+
+See Engines::RailsExtensions::Routing for more information.
+  
+=== Migrations
+
+Migrations record the changes in your database as your application evolves. With engines 1.2, migrations from plugins can also join in this evolution as first-class entities. To add migrations to a plugin, include a <tt>db/migrate/</tt> folder and add migrations there as normal. These migrations can then be integrated into the main flow of database evolution by running the plugin_migration generator:
+
+  script/generate plugin_migration
+  
+This will produce a migration in your application. Running this migration (via <tt>rake db:migrate</tt>, as normal) will migrate the database according to the latest migrations in each plugin. See Engines::RailsExtensions::Migrations for more information.
+
+
+=== More powerful Rake tasks
+
+The engines plugin enhances and adds to the suite of default rake tasks for working with plugins. The <tt>doc:plugins</tt> task now includes controllers, helpers and models under <tt>app</tt>, and anything other code found under the plugin's <tt>code_paths</tt> attribute. New testing tasks have been added to run unit, functional and integration tests from plugins, whilst making it easier to load fixtures from plugins. See Engines::Testing for more details about testing, and run
+
+  rake -T
+  
+to see the set of rake tasks available.
+
+= Testing the engines plugin itself
+
+Because of the way the engines plugin modifies Rails, the simplest way to consistently test it against multiple versions is by generating a test harness application - a full Rails application that includes tests to verify the engines plugin behaviour in a real, running environment.
+
+Run the tests like this:
+
+  $ cd engines
+  $ rake test
+  
+This will generate a test_app directory within the engines plugin (using the default 'rails' command), import tests and code into that application and then run the test suite.
+
+If you wish to test against a specific version of Rails, run the tests with the RAILS environment variable set to the local directory containing your Rails checkout
+
+  $ rake test RAILS=/Users/james/Code/rails_edge_checkout
+  
+Alternatively, you can clone the latest version of Rails ('edge rails') from github like so:
+
+  $ rake test RAILS=edge
+  
diff --git a/vendor/plugins/engines/Rakefile b/vendor/plugins/engines/Rakefile
new file mode 100644
index 000000000..904fbb68f
--- /dev/null
+++ b/vendor/plugins/engines/Rakefile
@@ -0,0 +1,211 @@
+require 'rake'
+require 'rake/rdoctask'
+require 'tmpdir'
+
+task :default => :doc
+
+desc 'Generate documentation for the engines plugin.'
+Rake::RDocTask.new(:doc) do |doc|
+  doc.rdoc_dir = 'doc'
+  doc.title    = 'Engines'
+  doc.main     = "README"
+  doc.rdoc_files.include("README", "CHANGELOG", "MIT-LICENSE")
+  doc.rdoc_files.include('lib/**/*.rb')
+  doc.options << '--line-numbers' << '--inline-source'
+end
+
+desc 'Run the engine plugin tests within their test harness'
+task :cruise do
+  # checkout the project into a temporary directory
+  version = "rails_2.0"
+  test_dir = "#{Dir.tmpdir}/engines_plugin_#{version}_test"
+  puts "Checking out test harness for #{version} into #{test_dir}"
+  `svn co http://svn.rails-engines.org/test/engines/#{version} #{test_dir}`
+
+  # run all the tests in this project
+  Dir.chdir(test_dir)
+  load 'Rakefile'
+  puts "Running all tests in test harness"
+  ['db:migrate', 'test', 'test:plugins'].each do |t|
+    Rake::Task[t].invoke
+  end  
+end
+
+task :clean => [:clobber_doc, "test:clean"]
+
+namespace :test do
+  
+  # Yields a block with STDOUT and STDERR silenced. If you *really* want
+  # to output something, the block is yielded with the original output
+  # streams, i.e.
+  #
+  #   silence do |o, e|
+  #     puts 'hello!' # no output produced
+  #     o.puts 'hello!' # output on STDOUT
+  #   end
+  #
+  # (based on silence_stream in ActiveSupport.)
+  def silence
+    yield(STDOUT, STDERR) if ENV['VERBOSE']
+    streams = [STDOUT, STDERR]
+    actual_stdout = STDOUT.dup
+    actual_stderr = STDERR.dup
+    streams.each do |s| 
+      s.reopen(RUBY_PLATFORM =~ /mswin/ ? 'NUL:' : '/dev/null') 
+      s.sync = true
+    end
+    yield actual_stdout, actual_stderr
+  ensure
+    STDOUT.reopen(actual_stdout)
+    STDERR.reopen(actual_stderr)
+  end
+  
+  def test_app_dir
+    File.join(File.dirname(__FILE__), 'test_app')
+  end
+  
+  def run(cmd)
+    cmd = cmd.join(" && ") if cmd.is_a?(Array)
+    system(cmd) || raise("failed running '#{cmd}'")
+  end
+  
+  desc 'Remove the test application'
+  task :clean do
+    FileUtils.rm_r(test_app_dir) if File.exist?(test_app_dir)
+  end
+  
+  desc 'Build the test rails application (use RAILS=[edge,<directory>] to test against specific version)'
+  task :generate_app do
+    silence do |out, err|
+      out.puts "> Creating test application at #{test_app_dir}"
+        
+      if ENV['RAILS']
+        vendor_dir = File.join(test_app_dir, 'vendor')
+        FileUtils.mkdir_p vendor_dir
+        
+        if ENV['RAILS'] == 'edge'
+          out.puts "    Cloning Edge Rails from GitHub"
+          run "cd #{vendor_dir} && git clone --depth 1 git://github.com/rails/rails.git"
+        elsif ENV['RAILS'] =~ /\d\.\d\.\d/
+          if ENV['CURL']
+            out.puts "    Cloning Rails Tag #{ENV['RAILS']} from GitHub using curl and tar"
+            run ["cd #{vendor_dir}",
+                 "mkdir rails",
+                 "cd rails",
+                 "curl -s -L http://github.com/rails/rails/tarball/v2.1.0 | tar xzv --strip-components 1"]
+          else
+            out.puts "    Cloning Rails Tag #{ENV['RAILS']} from GitHub (can be slow - set CURL=true to use curl)"
+            run ["cd #{vendor_dir}",
+                 "git clone git://github.com/rails/rails.git",
+                 "cd rails",
+                 "git pull",
+                 "git checkout v#{ENV['RAILS']}"]
+          end
+        elsif File.exist?(ENV['RAILS'])
+          out.puts "    Linking rails from #{ENV['RAILS']}"
+          run "cd #{vendor_dir} && ln -s #{ENV['RAILS']} rails"
+        else
+          raise "Couldn't build test application from '#{ENV['RAILS']}'"
+        end
+      
+        out.puts "    generating rails default directory structure"
+        run "ruby #{File.join(vendor_dir, 'rails', 'railties', 'bin', 'rails')} #{test_app_dir}"
+      else
+        version = `rails --version`.chomp.split.last
+        out.puts "    building rails using the 'rails' command (rails version: #{version})"
+        run "rails #{test_app_dir}"
+      end
+    
+      # get the database config and schema in place
+      out.puts "    writing database.yml"
+      require 'yaml'
+      File.open(File.join(test_app_dir, 'config', 'database.yml'), 'w') do |f|
+        f.write(%w(development test).inject({}) do |h, env| 
+          h[env] = {"adapter" => "sqlite3", "database" => "engines_#{env}.sqlite3"} ; h
+        end.to_yaml)
+      end
+    end
+  end
+  
+  # We can't link the plugin, as it needs to be present for script/generate to find
+  # the plugin generator.
+  # TODO: find and +1/create issue for loading generators from symlinked plugins
+  desc 'Mirror the engines plugin into the test application'
+  task :copy_engines_plugin do
+    puts "> Copying engines plugin into test application"
+    engines_plugin = File.join(test_app_dir, "vendor", "plugins", "engines")
+    FileUtils.rm_r(engines_plugin) if File.exist?(engines_plugin)
+    FileUtils.mkdir_p(engines_plugin)
+    FileList["*"].exclude("test_app").each do |file|
+      FileUtils.cp_r(file, engines_plugin)
+    end
+  end
+  
+  def insert_line(line, options)
+    line = line + "\n"
+    target_file = File.join(test_app_dir, options[:into])
+    lines = File.readlines(target_file)
+    return if lines.include?(line)
+    
+    if options[:after]
+      if options[:after].is_a?(String)
+        after_line = options[:after] + "\n"
+      else
+        after_line = lines.find { |l| l =~ options[:after] }
+        raise "couldn't find a line matching #{options[:after].inspect} in #{target_file}" unless after_line
+      end
+      index = lines.index(after_line)
+      raise "couldn't find line '#{after_line}' in #{target_file}" unless index
+      lines.insert(index + 1, line)
+    else
+      lines << line
+    end
+    File.open(target_file, 'w') { |f| f.write lines.join }
+  end
+  
+  def mirror_test_files(src, dest=nil)
+    destination_dir = File.join(*([test_app_dir, dest].compact))
+    FileUtils.cp_r(File.join(File.dirname(__FILE__), 'test', src), destination_dir)
+  end
+  
+  desc 'Update the plugin and tests files in the test application from the plugin'
+  task :mirror_engine_files => [:test_app, :copy_engines_plugin] do
+    puts "> Modifying default config files to load engines plugin"
+    insert_line("require File.join(File.dirname(__FILE__), '../vendor/plugins/engines/boot')",
+                :into => 'config/environment.rb',
+                :after => "require File.join(File.dirname(__FILE__), 'boot')")
+                
+    insert_line('map.from_plugin :test_routing', :into => 'config/routes.rb', 
+                :after => /\AActionController::Routing::Routes/)
+                
+    insert_line("require 'engines_test_helper'", :into => 'test/test_helper.rb')
+    
+    puts "> Mirroring test application files into #{test_app_dir}"
+    mirror_test_files('app')
+    mirror_test_files('lib')
+    mirror_test_files('plugins', 'vendor')
+    mirror_test_files('unit', 'test')
+    mirror_test_files('functional', 'test')
+  end
+  
+  desc 'Prepare the engines test environment'
+  task :test_app do
+    version_tag = File.join(test_app_dir, 'RAILS_VERSION')
+    existing_version = File.read(version_tag).chomp rescue 'unknown'
+    if existing_version == ENV['RAILS']
+      puts "> Reusing existing test application (#{ENV['RAILS']})"
+    else
+      puts "> Recreating test application"
+      Rake::Task["test:clean"].invoke
+      Rake::Task["test:generate_app"].invoke
+      
+      File.open(version_tag, "w") { |f| f.write ENV['RAILS'] }
+    end
+  end
+end
+
+task :test => "test:mirror_engine_files" do
+  puts "> Loading the test application environment and running tests"
+  # We use exec here to replace the current running rake process
+  exec("cd #{test_app_dir} && rake")
+end
diff --git a/vendor/plugins/engines/about.yml b/vendor/plugins/engines/about.yml
new file mode 100644
index 000000000..619bd5a93
--- /dev/null
+++ b/vendor/plugins/engines/about.yml
@@ -0,0 +1,7 @@
+author: James Adam
+email: james.adam@gmail.com
+homepage: http://www.rails-engines.org
+summary: Enhances the plugin mechanism to perform more flexible sharing
+description: The Rails Engines plugin allows the sharing of almost any type of code or asset that you could use in a Rails application, including controllers, models, stylesheets, and views.
+license: MIT
+version: 2.1.0
\ No newline at end of file
diff --git a/vendor/plugins/engines/boot.rb b/vendor/plugins/engines/boot.rb
new file mode 100644
index 000000000..50fadc0ed
--- /dev/null
+++ b/vendor/plugins/engines/boot.rb
@@ -0,0 +1,18 @@
+begin
+  require 'rails/version'
+  unless Rails::VERSION::MAJOR >= 2 ||
+         (Rails::VERSION::MAJOR >= 1 && Rails::VERSION::MINOR >= 99)
+    raise "This version of the engines plugin requires Rails 2.0 or later!"
+  end
+end
+
+require File.join(File.dirname(__FILE__), 'lib/engines')
+
+# initialize Rails::Configuration with our own default values to spare users 
+# some hassle with the installation and keep the environment cleaner
+
+{ :default_plugin_locators => [Engines::Plugin::FileSystemLocator],
+  :default_plugin_loader => Engines::Plugin::Loader,
+  :default_plugins => [:engines, :all] }.each do |name, default|    
+  Rails::Configuration.send(:define_method, name) { default }
+end
\ No newline at end of file
diff --git a/vendor/plugins/engines/generators/plugin_migration/USAGE b/vendor/plugins/engines/generators/plugin_migration/USAGE
new file mode 100644
index 000000000..ae05db767
--- /dev/null
+++ b/vendor/plugins/engines/generators/plugin_migration/USAGE
@@ -0,0 +1,45 @@
+Description:
+  The plugin migration generator assists in working with schema additions 
+  required by plugins. Instead of running migrations from plugins directly,
+  the generator creates a regular Rails migration which will be responsible
+  for migrating the plugins from their current version to the latest version
+  installed.
+  
+  This is important because the set of application migrations remains an
+  accurate record of the state of the database, even as plugins are installed
+  and removed during the development process.
+
+Example:
+  ./script/generate plugin_migration [<plugin_name> <another_plugin_name> ...]
+
+  This will generate:
+
+    RAILS_ROOT
+      |- db
+          |-migrate
+              |- xxx_plugin_migrations.rb
+
+  which contains the migrations for the given plugin(s).
+  
+  
+Advanced Usage:
+
+There may be situations where you need *complete* control over the migrations
+of plugins in your application, migrating a certainly plugin down to X, and
+another plugin up to Y, where neither X or Y are the latest migrations for those
+plugins.
+
+For those unfortunate few, I have two pieces of advice:
+
+ 1. Why? This is a code smell [http://c2.com/xp/CodeSmell.html].
+ 
+ 2. Well, OK. Don't panic. You can completely control plugin migrations by
+    creating your own migrations. To manually migrate a plugin to a specific
+    version, simply use
+    
+      Engines.plugins[:your_plugin_name].migrate(version)
+      
+    where version is the integer of the migration this plugin should end
+    up at.
+    
+With great power comes great responsibility. Use this wisely.
\ No newline at end of file
diff --git a/vendor/plugins/engines/generators/plugin_migration/plugin_migration_generator.rb b/vendor/plugins/engines/generators/plugin_migration/plugin_migration_generator.rb
new file mode 100644
index 000000000..db9847744
--- /dev/null
+++ b/vendor/plugins/engines/generators/plugin_migration/plugin_migration_generator.rb
@@ -0,0 +1,79 @@
+# Generates a migration which migrates all plugins to their latest versions
+# within the database.
+class PluginMigrationGenerator < Rails::Generator::Base
+  
+  def initialize(runtime_args, runtime_options={})
+    super
+    @options = {:assigns => {}}
+    
+    ensure_plugin_schema_table_exists
+    get_plugins_to_migrate(runtime_args)
+    
+    if @plugins_to_migrate.empty?
+      puts "All plugins are migrated to their latest versions"
+      exit(0)
+    end
+
+    @options[:migration_file_name] = build_migration_name
+    @options[:assigns][:class_name] = build_migration_name.classify
+  end
+  
+  def manifest
+    record do |m|
+      m.migration_template 'plugin_migration.erb', 'db/migrate', @options
+    end
+  end
+  
+  protected
+  
+    # Create the plugin schema table if it doesn't already exist. See
+    # Engines::RailsExtensions::Migrations#initialize_schema_migrations_table_with_engine_additions
+    def ensure_plugin_schema_table_exists
+      ActiveRecord::Base.connection.initialize_schema_migrations_table
+    end
+
+    # Determine all the plugins which have migrations that aren't present
+    # according to the plugin schema information from the database.
+    def get_plugins_to_migrate(plugin_names)
+
+      # First, grab all the plugins which exist and have migrations
+      @plugins_to_migrate = if plugin_names.empty?
+        Engines.plugins
+      else
+        plugin_names.map do |name| 
+          Engines.plugins[name] ? Engines.plugins[name] : raise("Cannot find the plugin '#{name}'")
+        end
+      end
+      
+      @plugins_to_migrate.reject! { |p| p.latest_migration.nil? }
+      
+      # Then find the current versions from the database    
+      @current_versions = {}
+      @plugins_to_migrate.each do |plugin|
+        @current_versions[plugin.name] = Engines::Plugin::Migrator.current_version(plugin)
+      end
+
+      # Then find the latest versions from their migration directories
+      @new_versions = {}      
+      @plugins_to_migrate.each do |plugin|
+        @new_versions[plugin.name] = plugin.latest_migration
+      end
+      
+      # Remove any plugins that don't need migration
+      @plugins_to_migrate.map { |p| p.name }.each do |name|
+        @plugins_to_migrate.delete(Engines.plugins[name]) if @current_versions[name] == @new_versions[name]
+      end
+      
+      @options[:assigns][:plugins] = @plugins_to_migrate
+      @options[:assigns][:new_versions] = @new_versions
+      @options[:assigns][:current_versions] = @current_versions
+    end
+
+    # Construct a unique migration name based on the plugins involved and the
+    # versions they should reach after this migration is run.
+    def build_migration_name
+      @plugins_to_migrate.map do |plugin| 
+        "#{plugin.name}_to_version_#{@new_versions[plugin.name]}" 
+      end.join("_and_")
+    end  
+end
\ No newline at end of file
diff --git a/vendor/plugins/engines/generators/plugin_migration/templates/plugin_migration.erb b/vendor/plugins/engines/generators/plugin_migration/templates/plugin_migration.erb
new file mode 100644
index 000000000..044f62384
--- /dev/null
+++ b/vendor/plugins/engines/generators/plugin_migration/templates/plugin_migration.erb
@@ -0,0 +1,13 @@
+class <%= class_name %> < ActiveRecord::Migration
+  def self.up
+  <%- plugins.each do |plugin| -%>
+    Engines.plugins["<%= plugin.name %>"].migrate(<%= new_versions[plugin.name] %>)
+  <%- end -%>
+  end
+
+  def self.down
+  <%- plugins.each do |plugin| -%>
+    Engines.plugins["<%= plugin.name %>"].migrate(<%= current_versions[plugin.name] %>)
+  <%- end -%>
+  end
+end
diff --git a/vendor/plugins/engines/init.rb b/vendor/plugins/engines/init.rb
new file mode 100644
index 000000000..df9452632
--- /dev/null
+++ b/vendor/plugins/engines/init.rb
@@ -0,0 +1,5 @@
+# Only call Engines.init once, in the after_initialize block so that Rails
+# plugin reloading works when turned on
+config.after_initialize do
+  Engines.init if defined? :Engines
+end
diff --git a/vendor/plugins/engines/lib/engines.rb b/vendor/plugins/engines/lib/engines.rb
new file mode 100644
index 000000000..47886f5f1
--- /dev/null
+++ b/vendor/plugins/engines/lib/engines.rb
@@ -0,0 +1,174 @@
+require 'active_support'
+require File.join(File.dirname(__FILE__), 'engines/plugin')
+require File.join(File.dirname(__FILE__), 'engines/plugin/list')
+require File.join(File.dirname(__FILE__), 'engines/plugin/loader')
+require File.join(File.dirname(__FILE__), 'engines/plugin/locator')
+require File.join(File.dirname(__FILE__), 'engines/assets')
+require File.join(File.dirname(__FILE__), 'engines/rails_extensions/rails')
+
+# == Parameters
+#
+# The Engines module has a number of public configuration parameters:
+#
+# [+public_directory+]  The directory into which plugin assets should be
+#                       mirrored. Defaults to <tt>RAILS_ROOT/public/plugin_assets</tt>.
+# [+schema_info_table+] The table to use when storing plugin migration 
+#                       version information. Defaults to +plugin_schema_info+.
+#
+# Additionally, there are a few flags which control the behaviour of
+# some of the features the engines plugin adds to Rails:
+#
+# [+disable_application_view_loading+] A boolean flag determining whether
+#                                      or not views should be loaded from 
+#                                      the main <tt>app/views</tt> directory.
+#                                      Defaults to false; probably only 
+#                                      useful when testing your plugin.
+# [+disable_application_code_loading+] A boolean flag determining whether
+#                                      or not to load controllers/helpers 
+#                                      from the main +app+ directory,
+#                                      if corresponding code exists within 
+#                                      a plugin. Defaults to false; again, 
+#                                      probably only useful when testing 
+#                                      your plugin.
+# [+disable_code_mixing+] A boolean flag indicating whether all plugin
+#                         copies of a particular controller/helper should 
+#                         be loaded and allowed to override each other, 
+#                         or if the first matching file should be loaded 
+#                         instead. Defaults to false.
+#
+module Engines
+  # The set of all loaded plugins
+  mattr_accessor :plugins
+  self.plugins = Engines::Plugin::List.new  
+  
+  # List of extensions to load, can be changed in init.rb before calling Engines.init
+  mattr_accessor :rails_extensions
+  self.rails_extensions = %w(action_mailer asset_helpers routing migrations dependencies)
+  
+  # The name of the public directory to mirror public engine assets into.
+  # Defaults to <tt>RAILS_ROOT/public/plugin_assets</tt>.
+  mattr_accessor :public_directory
+  self.public_directory = File.join(RAILS_ROOT, 'public', 'plugin_assets')
+
+  # The table in which to store plugin schema information. Defaults to
+  # "plugin_schema_info".
+  mattr_accessor :schema_info_table
+  self.schema_info_table = "plugin_schema_info"
+
+  #--
+  # These attributes control the behaviour of the engines extensions
+  #++
+  
+  # Set this to true if views should *only* be loaded from plugins
+  mattr_accessor :disable_application_view_loading
+  self.disable_application_view_loading = false
+  
+  # Set this to true if controller/helper code shouldn't be loaded 
+  # from the application
+  mattr_accessor :disable_application_code_loading
+  self.disable_application_code_loading = false
+  
+  # Set this ti true if code should not be mixed (i.e. it will be loaded
+  # from the first valid path on $LOAD_PATH)
+  mattr_accessor :disable_code_mixing
+  self.disable_code_mixing = false
+  
+  # This is used to determine which files are candidates for the "code
+  # mixing" feature that the engines plugin provides, where classes from
+  # plugins can be loaded, and then code from the application loaded
+  # on top of that code to override certain methods.
+  mattr_accessor :code_mixing_file_types
+  self.code_mixing_file_types = %w(controller helper)
+  
+  class << self
+    def init
+      load_extensions
+      Engines::Assets.initialize_base_public_directory
+    end
+    
+    def logger
+      RAILS_DEFAULT_LOGGER
+    end
+    
+    def load_extensions
+      rails_extensions.each { |name| require "engines/rails_extensions/#{name}" }
+      # load the testing extensions, if we are in the test environment.
+      require "engines/testing" if RAILS_ENV == "test"
+    end
+    
+    def select_existing_paths(paths)
+      paths.select { |path| File.directory?(path) }
+    end  
+  
+    # The engines plugin will, by default, mix code from controllers and helpers,
+    # allowing application code to override specific methods in the corresponding
+    # controller or helper classes and modules. However, if other file types should
+    # also be mixed like this, they can be added by calling this method. For example,
+    # if you want to include "things" within your plugin and override them from
+    # your applications, you should use the following layout:
+    #
+    #   app/
+    #    +-- things/
+    #    |       +-- one_thing.rb
+    #    |       +-- another_thing.rb
+    #   ...
+    #   vendor/
+    #       +-- plugins/
+    #                +-- my_plugin/
+    #                           +-- app/
+    #                                +-- things/
+    #                                        +-- one_thing.rb
+    #                                        +-- another_thing.rb
+    #
+    # The important point here is that your "things" are named <whatever>_thing.rb,
+    # and that they are placed within plugin/app/things (the pluralized form of 'thing').
+    # 
+    # It's important to note that you'll also want to ensure that the "things" are
+    # on your load path in your plugin's init.rb:
+    #
+    #   Rails.plugins[:my_plugin].code_paths << "app/things"
+    #
+    def mix_code_from(*types)
+      self.code_mixing_file_types += types.map { |x| x.to_s.singularize }
+    end
+    
+    # A general purpose method to mirror a directory (+source+) into a destination
+    # directory, including all files and subdirectories. Files will not be mirrored
+    # if they are identical already (checked via FileUtils#identical?).
+    def mirror_files_from(source, destination)
+      return unless File.directory?(source)
+      
+      # TODO: use Rake::FileList#pathmap?    
+      source_files = Dir[source + "/**/*"]
+      source_dirs = source_files.select { |d| File.directory?(d) }
+      source_files -= source_dirs
+      
+      unless source_files.empty?
+        base_target_dir = File.join(destination, File.dirname(source_files.first))
+        FileUtils.mkdir_p(base_target_dir)
+      end
+      
+      source_dirs.each do |dir|
+        # strip down these paths so we have simple, relative paths we can
+        # add to the destination
+        target_dir = File.join(destination, dir.gsub(source, ''))
+        begin        
+          FileUtils.mkdir_p(target_dir)
+        rescue Exception => e
+          raise "Could not create directory #{target_dir}: \n" + e
+        end
+      end
+      
+      source_files.each do |file|
+        begin
+          target = File.join(destination, file.gsub(source, ''))
+          unless File.exist?(target) && FileUtils.identical?(file, target)
+            FileUtils.cp(file, target)
+          end 
+        rescue Exception => e
+          raise "Could not copy #{file} to #{target}: \n" + e 
+        end
+      end  
+    end   
+  end  
+end
\ No newline at end of file
diff --git a/vendor/plugins/engines/lib/engines/assets.rb b/vendor/plugins/engines/lib/engines/assets.rb
new file mode 100644
index 000000000..d0553299c
--- /dev/null
+++ b/vendor/plugins/engines/lib/engines/assets.rb
@@ -0,0 +1,38 @@
+module Engines
+  module Assets    
+    class << self      
+      @@readme = %{Files in this directory are automatically generated from your plugins.
+They are copied from the 'assets' directories of each plugin into this directory
+each time Rails starts (script/server, script/console... and so on).
+Any edits you make will NOT persist across the next server restart; instead you
+should edit the files within the <plugin_name>/assets/ directory itself.}     
+       
+      # Ensure that the plugin asset subdirectory of RAILS_ROOT/public exists, and
+      # that we've added a little warning message to instruct developers not to mess with
+      # the files inside, since they're automatically generated.
+      def initialize_base_public_directory
+        dir = Engines.public_directory
+        unless File.exist?(dir)
+          Engines.logger.debug "Creating public engine files directory '#{dir}'"
+          FileUtils.mkdir_p(dir)
+        end
+        readme = File.join(dir, "README")        
+        File.open(readme, 'w') { |f| f.puts @@readme } unless File.exist?(readme)
+      end
+    
+      # Replicates the subdirectories under the plugins's +assets+ (or +public+) 
+      # directory into the corresponding public directory. See also 
+      # Plugin#public_directory for more.
+      def mirror_files_for(plugin)
+        return if plugin.public_directory.nil?
+        begin 
+          Engines.logger.debug "Attempting to copy plugin assets from '#{plugin.public_directory}' to '#{Engines.public_directory}'"
+          Engines.mirror_files_from(plugin.public_directory, File.join(Engines.public_directory, plugin.name))      
+        rescue Exception => e
+          Engines.logger.warn "WARNING: Couldn't create the public file structure for plugin '#{plugin.name}'; Error follows:"
+          Engines.logger.warn e
+        end
+      end
+    end 
+  end
+end
\ No newline at end of file
diff --git a/vendor/plugins/engines/lib/engines/plugin.rb b/vendor/plugins/engines/lib/engines/plugin.rb
new file mode 100644
index 000000000..caa58f7cd
--- /dev/null
+++ b/vendor/plugins/engines/lib/engines/plugin.rb
@@ -0,0 +1,126 @@
+# An instance of Plugin is created for each plugin loaded by Rails, and
+# stored in the <tt>Engines.plugins</tt> PluginList 
+# (see Engines::RailsExtensions::RailsInitializer for more details).
+#
+#   Engines.plugins[:plugin_name]
+#
+# If this plugin contains paths in directories other than <tt>app/controllers</tt>,
+# <tt>app/helpers</tt>, <tt>app/models</tt> and <tt>components</tt>, authors can
+# declare this by adding extra paths to #code_paths:
+#
+#    Rails.plugin[:my_plugin].code_paths << "app/sweepers" << "vendor/my_lib"
+#
+# Other properties of the Plugin instance can also be set.
+module Engines
+  class Plugin < Rails::Plugin    
+    # Plugins can add code paths to this attribute in init.rb if they 
+    # need plugin directories to be added to the load path, i.e.
+    #
+    #   plugin.code_paths << 'app/other_classes'
+    #
+    # Defaults to ["app/controllers", "app/helpers", "app/models", "components"]
+    attr_accessor :code_paths
+
+    # Plugins can add paths to this attribute in init.rb if they need
+    # controllers loaded from additional locations. 
+    attr_accessor :controller_paths
+  
+    # The directory in this plugin to mirror into the shared directory
+    # under +public+.
+    #
+    # Defaults to "assets" (see default_public_directory).
+    attr_accessor :public_directory   
+    
+    protected
+  
+      # The default set of code paths which will be added to $LOAD_PATH
+      # and Dependencies.load_paths
+      def default_code_paths
+        # lib will actually be removed from the load paths when we call
+        # uniq! in #inject_into_load_paths, but it's important to keep it
+        # around (for the documentation tasks, for instance).
+        %w(app/controllers app/helpers app/models components lib)
+      end
+    
+      # The default set of code paths which will be added to the routing system
+      def default_controller_paths
+        %w(app/controllers components)
+      end
+
+      # Attempts to detect the directory to use for public files.
+      # If +assets+ exists in the plugin, this will be used. If +assets+ is missing
+      # but +public+ is found, +public+ will be used.
+      def default_public_directory
+        Engines.select_existing_paths(%w(assets public).map { |p| File.join(directory, p) }).first
+      end
+    
+    public
+  
+    def initialize(directory)
+      super directory
+      @code_paths = default_code_paths
+      @controller_paths = default_controller_paths
+      @public_directory = default_public_directory
+    end
+  
+    # Returns a list of paths this plugin wishes to make available in $LOAD_PATH
+    #
+    # Overwrites the correspondend method in the superclass  
+    def load_paths
+      report_nonexistant_or_empty_plugin! unless valid?
+      select_existing_paths :code_paths
+    end
+    
+    # Extends the superclass' load method to additionally mirror public assets
+    def load(initializer)
+      return if loaded?
+      super initializer
+      add_plugin_view_paths
+      Assets.mirror_files_for(self)
+    end    
+  
+    # for code_paths and controller_paths select those paths that actually 
+    # exist in the plugin's directory
+    def select_existing_paths(name)
+      Engines.select_existing_paths(self.send(name).map { |p| File.join(directory, p) })
+    end    
+
+    def add_plugin_view_paths
+      view_path = File.join(directory, 'app', 'views')
+      if File.exist?(view_path)
+        ActionController::Base.view_paths.insert(1, view_path) # push it just underneath the app
+        ActionView::TemplateFinder.process_view_paths(view_path)
+      end
+    end
+
+    # The path to this plugin's public files
+    def public_asset_directory
+      "#{File.basename(Engines.public_directory)}/#{name}"
+    end
+    
+    # The path to this plugin's routes file
+    def routes_path
+      File.join(directory, "routes.rb")
+    end
+
+    # The directory containing this plugin's migrations (<tt>plugin/db/migrate</tt>)
+    def migration_directory
+      File.join(self.directory, 'db', 'migrate')
+    end
+  
+    # Returns the version number of the latest migration for this plugin. Returns
+    # nil if this plugin has no migrations.
+    def latest_migration
+      migrations = Dir[migration_directory+"/*.rb"]
+      return nil if migrations.empty?
+      migrations.map { |p| File.basename(p) }.sort.last.match(/0*(\d+)\_/)[1].to_i
+    end
+  
+    # Migrate this plugin to the given version. See Engines::Plugin::Migrator for more
+    # information.   
+    def migrate(version = nil)
+      Engines::Plugin::Migrator.migrate_plugin(self, version)
+    end
+  end
+end
+
diff --git a/vendor/plugins/engines/lib/engines/plugin/list.rb b/vendor/plugins/engines/lib/engines/plugin/list.rb
new file mode 100644
index 000000000..316fa575f
--- /dev/null
+++ b/vendor/plugins/engines/lib/engines/plugin/list.rb
@@ -0,0 +1,30 @@
+# The PluginList class is an array, enhanced to allow access to loaded plugins
+# by name, and iteration over loaded plugins in order of priority. This array is used
+# by Engines::RailsExtensions::RailsInitializer to create the Engines.plugins array.
+#
+# Each loaded plugin has a corresponding Plugin instance within this array, and 
+# the order the plugins were loaded is reflected in the entries in this array.
+#
+# For more information, see the Rails module.
+module Engines
+  class Plugin
+    class List < Array
+      # Finds plugins with the set with the given name (accepts Strings or Symbols), or
+      # index. So, Engines.plugins[0] returns the first-loaded Plugin, and Engines.plugins[:engines]
+      # returns the Plugin instance for the engines plugin itself.
+      def [](name_or_index)
+        if name_or_index.is_a?(Fixnum)
+          super
+        else
+          self.find { |plugin| plugin.name.to_s == name_or_index.to_s }
+        end
+      end
+  
+      # Go through each plugin, highest priority first (last loaded first). Effectively,
+      # this is like <tt>Engines.plugins.reverse</tt>
+      def by_precedence
+        reverse
+      end
+    end
+  end
+end
\ No newline at end of file
diff --git a/vendor/plugins/engines/lib/engines/plugin/loader.rb b/vendor/plugins/engines/lib/engines/plugin/loader.rb
new file mode 100644
index 000000000..a5be5967b
--- /dev/null
+++ b/vendor/plugins/engines/lib/engines/plugin/loader.rb
@@ -0,0 +1,18 @@
+module Engines
+  class Plugin
+    class Loader < Rails::Plugin::Loader    
+      protected    
+        def register_plugin_as_loaded(plugin)
+          super plugin
+          Engines.plugins << plugin
+          register_to_routing(plugin)
+        end    
+        
+        # Registers the plugin's controller_paths for the routing system. 
+        def register_to_routing(plugin)
+          initializer.configuration.controller_paths += plugin.select_existing_paths(:controller_paths)
+          initializer.configuration.controller_paths.uniq!
+        end
+    end
+  end
+end
\ No newline at end of file
diff --git a/vendor/plugins/engines/lib/engines/plugin/locator.rb b/vendor/plugins/engines/lib/engines/plugin/locator.rb
new file mode 100644
index 000000000..1ff5c7626
--- /dev/null
+++ b/vendor/plugins/engines/lib/engines/plugin/locator.rb
@@ -0,0 +1,11 @@
+module Engines
+  class Plugin
+    class FileSystemLocator < Rails::Plugin::FileSystemLocator
+      def create_plugin(path)
+        plugin = Engines::Plugin.new(path)
+        plugin.valid? ? plugin : nil
+      end        
+    end
+  end
+end
+
diff --git a/vendor/plugins/engines/lib/engines/plugin/migrator.rb b/vendor/plugins/engines/lib/engines/plugin/migrator.rb
new file mode 100644
index 000000000..9a584d753
--- /dev/null
+++ b/vendor/plugins/engines/lib/engines/plugin/migrator.rb
@@ -0,0 +1,74 @@
+# The Plugin::Migrator class contains the logic to run migrations from
+# within plugin directories. The directory in which a plugin's migrations
+# should be is determined by the Plugin#migration_directory method.
+#
+# To migrate a plugin, you can simple call the migrate method (Plugin#migrate)
+# with the version number that plugin should be at. The plugin's migrations
+# will then be used to migrate up (or down) to the given version.
+#
+# For more information, see Engines::RailsExtensions::Migrations
+class Engines::Plugin::Migrator < ActiveRecord::Migrator
+
+  # We need to be able to set the 'current' engine being migrated.
+  cattr_accessor :current_plugin
+
+  # Runs the migrations from a plugin, up (or down) to the version given
+  def self.migrate_plugin(plugin, version)
+    self.current_plugin = plugin
+    # There seems to be a bug in Rails' own migrations, where migrating
+    # to the existing version causes all migrations to be run where that
+    # migration number doesn't exist (i.e. zero). We could fix this by
+    # removing the line if the version hits zero...?
+    return if current_version(plugin) == version
+    migrate(plugin.migration_directory, version)
+  end
+  
+  # Returns the name of the table used to store schema information about
+  # installed plugins.
+  #
+  # See Engines.schema_info_table for more details.
+  def self.schema_info_table_name
+    proper_table_name Engines.schema_info_table
+  end
+
+  # Returns the current version of the given plugin
+  def self.current_version(plugin=current_plugin)
+    result = ActiveRecord::Base.connection.select_one(<<-ESQL
+      SELECT version FROM #{schema_info_table_name} 
+      WHERE plugin_name = '#{plugin.name}'
+    ESQL
+    )
+    if result
+      result["version"].to_i
+    else
+      # There probably isn't an entry for this engine in the migration info table.
+      # We need to create that entry, and set the version to 0
+      ActiveRecord::Base.connection.execute(<<-ESQL
+        INSERT INTO #{schema_info_table_name} (version, plugin_name) 
+        VALUES (0,'#{plugin.name}')
+      ESQL
+      )      
+      0
+    end
+  end
+  
+  def migrated(plugin=current_plugin)
+    current = ActiveRecord::Base.connection.select_value(<<-ESQL
+      SELECT version FROM #{self.class.schema_info_table_name}
+      WHERE plugin_name = '#{plugin.name}'
+    ESQL
+    ).to_i
+    current ? (1..current).to_a : []
+  end
+  
+  # Sets the version of the plugin in Engines::Plugin::Migrator.current_plugin to
+  # the given version.
+  def record_version_state_after_migrating(version)
+    ActiveRecord::Base.connection.update(<<-ESQL
+      UPDATE #{self.class.schema_info_table_name} 
+      SET version = #{down? ? version.to_i - 1 : version.to_i} 
+      WHERE plugin_name = '#{self.current_plugin.name}'
+    ESQL
+    )
+  end
+end
diff --git a/vendor/plugins/engines/lib/engines/rails_extensions/action_mailer.rb b/vendor/plugins/engines/lib/engines/rails_extensions/action_mailer.rb
new file mode 100644
index 000000000..4b89978dc
--- /dev/null
+++ b/vendor/plugins/engines/lib/engines/rails_extensions/action_mailer.rb
@@ -0,0 +1,85 @@
+# The way ActionMailer is coded in terms of finding templates is very restrictive, to the point
+# where all templates for rendering must exist under the single base path. This is difficult to
+# work around without re-coding significant parts of the action mailer code.
+#
+# ---
+#
+# The MailTemplates module overrides two (private) methods from ActionMailer to enable mail 
+# templates within plugins:
+#
+# [+template_path+]             which now produces the contents of #template_paths
+# [+initialize_template_class+] which now find the first matching template and creates 
+#                               an ActionVew::Base instance with the correct view_paths
+#
+# Ideally ActionMailer would use the same template-location logic as ActionView, and the same
+# view paths as ActionController::Base.view_paths, but it currently does not.
+module Engines::RailsExtensions::ActionMailer
+  def self.included(base) #:nodoc:
+    base.class_eval do
+      # TODO commented this out because it seems to break ActionMailer
+      # how can this be fixed?
+      
+      alias_method_chain :template_path, :engine_additions
+      alias_method_chain :initialize_template_class, :engine_additions
+    end
+  end
+
+  private
+  
+    #--
+    # ActionMailer::Base#create uses two mechanisms to determine the proper template file(s)
+    # to load. Firstly, it searches within the template_root for files that much the explicit
+    # (or implicit) part encodings (like signup.text.plain.erb for the signup action). 
+    # This is how implicit multipart emails are built, by the way.
+    #
+    # Secondly, it then creates an ActionMailer::Base instance with it's view_paths parameter
+    # set to the template_root, so that ActionMailer will then take over rendering the
+    # templates.
+    #
+    # Ideally, ActionMailer would pass the same set of view paths as it gets in a normal
+    # request (i.e. ActionController::Base.view_paths), so that all possible view paths
+    # were searched. However, this seems to introduce some problems with helper modules.
+    #
+    # So instead, and because we have to fool these two independent parts of ActionMailer,
+    # we fudge with the mechanisms it uses to find the templates (via template_paths, and
+    # template_path_with_engine_additions), and then intercept the creation of the ActionView
+    # instance so we can set the view_paths (in initialize_template_class_with_engine_additions).
+    #++
+  
+    # Returns all possible template paths for the current mailer, including those
+    # within the loaded plugins.
+    def template_paths
+      paths = Engines.plugins.by_precedence.map { |p| "#{p.directory}/app/views/#{mailer_name}" }
+      paths.unshift(template_path_without_engine_additions) unless Engines.disable_application_view_loading
+      paths
+    end
+
+    # Return something that Dir[] can glob against. This method is called in 
+    # ActionMailer::Base#create! and used as part of an argument to Dir. We can
+    # take advantage of this by using some of the features of Dir.glob to search
+    # multiple paths for matching files.
+    def template_path_with_engine_additions
+      "{#{template_paths.join(",")}}"
+    end
+
+    # Return an instance of ActionView::Base with the view paths set to all paths
+    # in ActionController::Base.view_paths (i.e. including all plugin view paths)
+    def initialize_template_class_with_engine_additions(assigns)
+      # I'd like to just return this, but I get problems finding methods in helper
+      # modules if the method implemention from the regular class is not called
+      # 
+      # ActionView::Base.new(ActionController::Base.view_paths.dup, assigns, self)
+      renderer = initialize_template_class_without_engine_additions(assigns)
+      renderer.finder.view_paths = ActionController::Base.view_paths.dup
+      renderer
+    end
+end
+
+# We don't need to do this if ActionMailer hasn't been loaded.
+if Object.const_defined?(:ActionMailer) 
+  module ::ActionMailer #:nodoc:
+    class Base #:nodoc:
+      include Engines::RailsExtensions::ActionMailer
+    end
+  end
+end
\ No newline at end of file
diff --git a/vendor/plugins/engines/lib/engines/rails_extensions/asset_helpers.rb b/vendor/plugins/engines/lib/engines/rails_extensions/asset_helpers.rb
new file mode 100644
index 000000000..9fd1742c4
--- /dev/null
+++ b/vendor/plugins/engines/lib/engines/rails_extensions/asset_helpers.rb
@@ -0,0 +1,119 @@
+# The engines plugin makes it trivial to share public assets using plugins. 
+# To do this, include an <tt>assets</tt> directory within your plugin, and put
+# your javascripts, stylesheets and images in subdirectories of that folder:
+#
+#   my_plugin
+#     |- init.rb
+#     |- lib/
+#     |- assets/
+#          |- javascripts/
+#          |    |- my_functions.js
+#          |
+#          |- stylesheets/
+#          |    |- my_styles.css
+#          |
+#          |- images/
+#               |- my_face.jpg
+#
+# Files within the <tt>asset</tt> structure are automatically mirrored into
+# a publicly-accessible folder each time your application starts (see
+# Engines::Assets#mirror_assets).
+#
+#
+# == Using plugin assets in views
+#
+# It's also simple to use Rails' helpers in your views to use plugin assets.
+# The default helper methods have been enhanced by the engines plugin to accept
+# a <tt>:plugin</tt> option, indicating the plugin containing the desired asset.
+#
+# For example, it's easy to use plugin assets in your layouts:
+#
+#   <%= stylesheet_link_tag "my_styles", :plugin => "my_plugin", :media => "screen" %>
+#   <%= javascript_include_tag "my_functions", :plugin => "my_plugin" %>
+# 
+# ... and similarly in views and partials, it's easy to use plugin images:
+#
+#   <%= image_tag "my_face", :plugin => "my_plugin" %>
+#   <!-- or -->
+#   <%= image_path "my_face", :plugin => "my_plugin" %>
+#
+# Where the default helpers allow the specification of more than one file (i.e. the
+# javascript and stylesheet helpers), you can do similarly for multiple assets from 
+# within a single plugin.
+#
+# ---
+#
+# This module enhances four of the methods from ActionView::Helpers::AssetTagHelper:
+#
+#  * stylesheet_link_tag
+#  * javascript_include_tag
+#  * image_path
+#  * image_tag
+#
+# Each one of these methods now accepts the key/value pair <tt>:plugin => "plugin_name"</tt>,
+# which can be used to specify the originating plugin for any assets.
+#
+module Engines::RailsExtensions::AssetHelpers
+  def self.included(base) #:nodoc:
+    base.class_eval do
+      [:stylesheet_link_tag, :javascript_include_tag, :image_path, :image_tag].each do |m|
+        alias_method_chain m, :engine_additions
+      end
+    end
+  end
+
+  # Adds plugin functionality to Rails' default stylesheet_link_tag method.
+  def stylesheet_link_tag_with_engine_additions(*sources)
+    stylesheet_link_tag_without_engine_additions(*Engines::RailsExtensions::AssetHelpers.pluginify_sources("stylesheets", *sources))
+  end
+
+  # Adds plugin functionality to Rails' default javascript_include_tag method.  
+  def javascript_include_tag_with_engine_additions(*sources)
+    javascript_include_tag_without_engine_additions(*Engines::RailsExtensions::AssetHelpers.pluginify_sources("javascripts", *sources))
+  end
+
+  #--
+  # Our modified image_path now takes a 'plugin' option, though it doesn't require it
+  #++
+
+  # Adds plugin functionality to Rails' default image_path method.
+  def image_path_with_engine_additions(source, options={})
+    options.stringify_keys!
+    source = Engines::RailsExtensions::AssetHelpers.plugin_asset_path(options["plugin"], "images", source) if options["plugin"]
+    image_path_without_engine_additions(source)
+  end
+
+  # Adds plugin functionality to Rails' default image_tag method.
+  def image_tag_with_engine_additions(source, options={})
+    options.stringify_keys!
+    if options["plugin"]
+      source = Engines::RailsExtensions::AssetHelpers.plugin_asset_path(options["plugin"], "images", source)
+      options.delete("plugin")
+    end
+    image_tag_without_engine_additions(source, options)
+  end
+
+  #--
+  # The following are methods on this module directly because of the weird-freaky way
+  # Rails creates the helper instance that views actually get
+  #++
+
+  # Convert sources to the paths for the given plugin, if any plugin option is given
+  def self.pluginify_sources(type, *sources)
+    options = sources.last.is_a?(Hash) ? sources.pop.stringify_keys : { }
+    sources.map! { |s| plugin_asset_path(options["plugin"], type, s) } if options["plugin"]
+    options.delete("plugin") # we don't want it appearing in the HTML
+    sources << options # re-add options      
+  end  
+
+  # Returns the publicly-addressable relative URI for the given asset, type and plugin
+  def self.plugin_asset_path(plugin_name, type, asset)
+    raise "No plugin called '#{plugin_name}' - please use the full name of a loaded plugin." if Engines.plugins[plugin_name].nil?
+    "/#{Engines.plugins[plugin_name].public_asset_directory}/#{type}/#{asset}"
+  end
+  
+end
+
+module ::ActionView::Helpers::AssetTagHelper #:nodoc:
+  include Engines::RailsExtensions::AssetHelpers
+end
\ No newline at end of file
diff --git a/vendor/plugins/engines/lib/engines/rails_extensions/dependencies.rb b/vendor/plugins/engines/lib/engines/rails_extensions/dependencies.rb
new file mode 100644
index 000000000..82473419e
--- /dev/null
+++ b/vendor/plugins/engines/lib/engines/rails_extensions/dependencies.rb
@@ -0,0 +1,145 @@
+# One of the magic features that that engines plugin provides is the ability to
+# override selected methods in controllers and helpers from your application.
+# This is achieved by trapping requests to load those files, and then mixing in
+# code from plugins (in the order the plugins were loaded) before finally loading
+# any versions from the main +app+ directory.
+#
+# The behaviour of this extension is output to the log file for help when
+# debugging.
+#
+# == Example
+#
+# A plugin contains the following controller in <tt>plugin/app/controllers/my_controller.rb</tt>:
+#
+#   class MyController < ApplicationController
+#     def index
+#       @name = "HAL 9000"
+#     end
+#     def list
+#       @robots = Robot.find(:all)
+#     end
+#   end
+#
+# In one application that uses this plugin, we decide that the name used in the
+# index action should be "Robbie", not "HAL 9000". To override this single method,
+# we create the corresponding controller in our application 
+# (<tt>RAILS_ROOT/app/controllers/my_controller.rb</tt>), and redefine the method:
+#
+#   class MyController < ApplicationController
+#     def index
+#       @name = "Robbie"
+#     end
+#   end
+#
+# The list method remains as it was defined in the plugin controller.
+#
+# The same basic principle applies to helpers, and also views and partials (although
+# view overriding is performed in Engines::RailsExtensions::Templates; see that
+# module for more information).
+#
+# === What about models?
+#
+# Unfortunately, it's not possible to provide this kind of magic for models.
+# The only reason why it's possible for controllers and helpers is because
+# they can be recognised by their filenames ("whatever_controller", "jazz_helper"),
+# whereas models appear the same as any other typical Ruby library ("node",
+# "user", "image", etc.). 
+#
+# If mixing were allowed in models, it would mean code mixing for *every* 
+# file that was loaded via +require_or_load+, and this could result in
+# problems where, for example, a Node model might start to include 
+# functionality from another file called "node" somewhere else in the
+# <tt>$LOAD_PATH</tt>.
+#
+# One way to overcome this is to provide model functionality as a module in
+# a plugin, which developers can then include into their own model
+# implementations.
+#
+# Another option is to provide an abstract model (see the ActiveRecord::Base
+# documentation) and have developers subclass this model in their own
+# application if they must.
+#
+# ---
+#
+# The Engines::RailsExtensions::Dependencies module includes a method to
+# override Dependencies.require_or_load, which is called to load code needed
+# by Rails as it encounters constants that aren't defined.
+#
+# This method is enhanced with the code-mixing features described above.
+#
+module Engines::RailsExtensions::Dependencies
+  def self.included(base) #:nodoc:
+    base.class_eval { alias_method_chain :require_or_load, :engine_additions }
+  end
+
+  # Attempt to load the given file from any plugins, as well as the application.
+  # This performs the 'code mixing' magic, allowing application controllers and
+  # helpers to override single methods from those in plugins.
+  # If the file can be found in any plugins, it will be loaded first from those
+  # locations. Finally, the application version is loaded, using Ruby's behaviour
+  # to replace existing methods with their new definitions.
+  #
+  # If <tt>Engines.disable_code_mixing == true</tt>, the first controller/helper on the
+  # <tt>$LOAD_PATH</tt> will be used (plugins' +app+ directories are always lower on the
+  # <tt>$LOAD_PATH</tt> than the main +app+ directory).
+  #
+  # If <tt>Engines.disable_application_code_loading == true</tt>, controllers will
+  # not be loaded from the main +app+ directory *if* they are present in any
+  # plugins.
+  #
+  # Returns true if the file could be loaded (from anywhere); false otherwise -
+  # mirroring the behaviour of +require_or_load+ from Rails (which mirrors
+  # that of Ruby's own +require+, I believe).
+  def require_or_load_with_engine_additions(file_name, const_path=nil)
+    return require_or_load_without_engine_additions(file_name, const_path) if Engines.disable_code_mixing
+
+    file_loaded = false
+
+    # try and load the plugin code first
+    # can't use model, as there's nothing in the name to indicate that the file is a 'model' file
+    # rather than a library or anything else.
+    Engines.code_mixing_file_types.each do |file_type| 
+      # if we recognise this type
+      # (this regexp splits out the module/filename from any instances of app/#{type}, so that
+      #  modules are still respected.)
+      if file_name =~ /^(.*app\/#{file_type}s\/)?(.*_#{file_type})(\.rb)?$/
+        base_name = $2
+        # ... go through the plugins from first started to last, so that
+        # code with a high precedence (started later) will override lower precedence
+        # implementations
+        Engines.plugins.each do |plugin|
+          plugin_file_name = File.expand_path(File.join(plugin.directory, 'app', "#{file_type}s", base_name))
+          Engines.logger.debug("checking plugin '#{plugin.name}' for '#{base_name}'")
+          if File.file?("#{plugin_file_name}.rb")
+            Engines.logger.debug("==> loading from plugin '#{plugin.name}'")
+            file_loaded = true if require_or_load_without_engine_additions(plugin_file_name, const_path)
+          end
+        end
+    
+        # finally, load any application-specific controller classes using the 'proper'
+        # rails load mechanism, EXCEPT when we're testing engines and could load this file
+        # from an engine
+        if Engines.disable_application_code_loading
+          Engines.logger.debug("loading from application disabled.")
+        else
+          # Ensure we are only loading from the /app directory at this point
+          app_file_name = File.join(RAILS_ROOT, 'app', "#{file_type}s", "#{base_name}")
+          if File.file?("#{app_file_name}.rb")
+            Engines.logger.debug("loading from application: #{base_name}")
+            file_loaded = true if require_or_load_without_engine_additions(app_file_name, const_path)
+          else
+            Engines.logger.debug("(file not found in application)")
+          end
+        end        
+      end 
+    end
+
+    # if we managed to load a file, return true. If not, default to the original method.
+    # Note that this relies on the RHS of a boolean || not to be evaluated if the LHS is true.
+    file_loaded || require_or_load_without_engine_additions(file_name, const_path)
+  end  
+end
+
+module ::Dependencies #:nodoc:
+  include Engines::RailsExtensions::Dependencies
+end
\ No newline at end of file
diff --git a/vendor/plugins/engines/lib/engines/rails_extensions/migrations.rb b/vendor/plugins/engines/lib/engines/rails_extensions/migrations.rb
new file mode 100644
index 000000000..b36689882
--- /dev/null
+++ b/vendor/plugins/engines/lib/engines/rails_extensions/migrations.rb
@@ -0,0 +1,161 @@
+# Contains the enhancements to Rails' migrations system to support the 
+# Engines::Plugin::Migrator. See Engines::RailsExtensions::Migrations for more
+# information.
+
+require "engines/plugin/migrator"
+
+# = Plugins and Migrations: Background
+#
+# Rails uses migrations to describe changes to the databases as your application
+# evolves. Each change to your application - adding and removing models, most
+# commonly - might require tweaks to your schema in the form of new tables, or new
+# columns on existing tables, or possibly the removal of tables or columns. Migrations
+# can even include arbitrary code to *transform* data as the underlying schema
+# changes.
+# 
+# The point is that at any particular stage in your application's development, 
+# migrations serve to transform the database into a state where it is compatible
+# and appropriate at that time.
+# 
+# == What about plugins?
+# 
+# If you want to share models using plugins, chances are that you might also
+# want to include the corresponding migrations to create tables for those models.
+# With the engines plugin installed, plugins can carry migration data easily:
+# 
+#   vendor/
+#     |
+#     plugins/
+#       |
+#       my_plugin/
+#         |- init.rb
+#         |- lib/
+#         |- db/
+#             |-migrate/
+#                 |- 001_do_something.rb
+#                 |- 002_and_something_else.rb
+#                 |- ...
+# 
+# When you install a plugin which contains migrations, you are undertaking a
+# further step in the development of your application, the same as the addition
+# of any other code. With this in mind, you may want to 'roll back' the
+# installation of this plugin at some point, and the database should be able
+# to migrate back to the point without this plugin in it too.
+#
+# == An example
+#
+# For example, our current application is at version 14 (according to the
+# +schema_info+ table), when we decide that we want to add a tagging plugin. The
+# tagging plugin chosen includes migrations to create the tables it requires
+# (say, _tags_ and _taggings_, for instance), along with the models and helpers
+# one might expect.
+#
+# After installing this plugin, these tables should be created in our database.
+# Rather than running the migrations directly from the plugin, they should be
+# integrated into our main migration stream in order to accurately reflect the
+# state of our application's database *at this moment in time*.
+#
+#   $ script/generate plugin_migration
+#         exists  db/migrate
+#         create  db/migrate/015_migrate_tagging_plugin_to_version_3.rb
+#
+# This migration will take our application to version 15, and contains the following, 
+# typical migration code:
+# 
+#   class MigrateTaggingPluginToVersion3 < ActiveRecord::Migration
+#     def self.up
+#       Engines.plugins[:tagging].migrate(3)
+#     end
+#     def self.down
+#       Engines.plugins[:tagging].migrate(0)
+#     end
+#   end
+#
+# When we migrate our application up, using <tt>rake db:migrate</tt> as normal,
+# the plugin will be migrated up to its latest version (3 in this example). If we
+# ever decide to migrate the application back to the state it was in at version 14,
+# the plugin migrations will be taken back down to version 0 (which, typically,
+# would remove all tables the plugin migrations define).
+#
+# == Upgrading plugins
+#
+# It might happen that later in an application's life, we update to a new version of
+# the tagging plugin which requires some changes to our database. The tagging plugin
+# provides these changes in the form of its own migrations. 
+#
+# In this case, we just need to re-run the plugin_migration generator to create a 
+# new migration from the current revision to the newest one:
+#
+#   $ script/generate plugin_migration
+#        exists db/migrate
+#        create db/migrate/023_migrate_tagging_plugin_to_version_5.rb
+#
+# The contents of this migration are:
+#
+#   class MigrateTaggingPluginToVersion3 < ActiveRecord::Migration
+#     def self.up
+#       Engines.plugins[:tagging].migrate(5)
+#     end
+#     def self.down
+#       Engines.plugins[:tagging].migrate(3)
+#     end
+#   end
+#
+# Notice that if we were to migrate down to revision 22 or lower, the tagging plugin
+# will be migrated back down to version 3 - the version we were previously at.
+#
+#
+# = Creating migrations in plugins
+#
+# In order to use the plugin migration functionality that engines provides, a plugin 
+# only needs to provide regular migrations in a <tt>db/migrate</tt> folder within it.
+#
+# = Explicitly migrating plugins
+#
+# It's possible to migrate plugins within your own migrations, or any other code.
+# Simply get the Plugin instance, and its Plugin#migrate method with the version
+# you wish to end up at:
+#
+#   Engines.plugins[:whatever].migrate(version)
+#
+# ---
+#
+# The Engines::RailsExtensions::Migrations module defines extensions for Rails' 
+# migration systems. Specifically:
+#
+# * Adding a hook to initialize_schema_migrations_table to create the plugin schema
+#   info table.
+#
+module Engines::RailsExtensions::Migrations
+  def self.included(base) # :nodoc:
+    base.class_eval { alias_method_chain :initialize_schema_migrations_table, :engine_additions }
+  end
+
+  # Create the schema tables, and ensure that the plugin schema table
+  # is also initialized. The plugin schema info table is defined by
+  # Engines::Plugin::Migrator.schema_info_table_name.
+  def initialize_schema_migrations_table_with_engine_additions
+    initialize_schema_migrations_table_without_engine_additions
+
+    # create the plugin schema stuff.    
+    begin
+      execute <<-ESQL
+        CREATE TABLE #{Engines::Plugin::Migrator.schema_info_table_name} 
+          (plugin_name #{type_to_sql(:string)}, version #{type_to_sql(:integer)})
+      ESQL
+    rescue ActiveRecord::StatementInvalid
+      # Schema has been initialized
+    end
+  end
+end
+
+module ::ActiveRecord #:nodoc:
+  module ConnectionAdapters #:nodoc:
+    module SchemaStatements #:nodoc:
+      include Engines::RailsExtensions::Migrations
+    end
+  end
+end
+
+# Set ActiveRecord to ignore the plugin schema table by default
+::ActiveRecord::SchemaDumper.ignore_tables << Engines.schema_info_table
\ No newline at end of file
diff --git a/vendor/plugins/engines/lib/engines/rails_extensions/rails.rb b/vendor/plugins/engines/lib/engines/rails_extensions/rails.rb
new file mode 100644
index 000000000..3692d0d0e
--- /dev/null
+++ b/vendor/plugins/engines/lib/engines/rails_extensions/rails.rb
@@ -0,0 +1,11 @@
+# This is only here to allow for backwards compability with Engines that
+# have been implemented based on Engines for Rails 1.2. It is preferred that
+# the plugin list be accessed via Engines.plugins.
+
+module Rails
+  # Returns the Engines::Plugin::List from Engines.plugins. It is preferable to
+  # access Engines.plugins directly.
+  def self.plugins
+    Engines.plugins
+  end
+end
diff --git a/vendor/plugins/engines/lib/engines/rails_extensions/routing.rb b/vendor/plugins/engines/lib/engines/rails_extensions/routing.rb
new file mode 100644
index 000000000..5415c94e1
--- /dev/null
+++ b/vendor/plugins/engines/lib/engines/rails_extensions/routing.rb
@@ -0,0 +1,84 @@
+# Effective use of Rails' routes can help create a tidy and elegant set of URLs,
+# and is a significant part of creating an external API for your web application.
+# 
+# When developing plugins which contain controllers, it seems obvious that including
+# the corresponding routes would be extremely useful. This is particularly true
+# when exposing RESTful resources using the new REST-ian features of Rails.
+#
+# == Including routes in your plugin
+#
+# The engines plugin makes it possible to include a set of routes within your plugin
+# very simply, as it turns out. In your plugin, you simply include a <tt>routes.rb</tt> 
+# file like the one below at the root of your plugin:
+# 
+#   connect "/login", :controller => "my_plugin/account", :action => "login"
+#
+#   # add a named route
+#   logout "/logout", :controller => "my_plugin/account", :action => "logout"
+#
+#   # some restful stuff
+#   resources :things do |t|
+#     t.resources :other_things
+#   end
+# 
+# Everywhere in a normal <tt>RAILS_ROOT/config/routes.rb</tt> file 
+# where you might have <tt>map.connect</tt>, you just use <tt>connect</tt> in your 
+# plugin's <tt>routes.rb</tt>.
+# 
+# === Hooking it up in your application
+#
+# While it would be possible to have each plugin's routes automagically included into
+# the application's route set, to do so would actually be a stunningly bad idea. Route
+# priority is the key issue here. You, the application developer, needs to be in complete
+# control when it comes to specifying the priority of routes in your application, since 
+# the ordering of your routes directly affects how Rails will interpret incoming requests.
+# 
+# To add plugin routes into your application's <tt>routes.rb</tt> file, you need to explicitly 
+# map them in using the Engines::RailsExtensions::Routing#from_plugin method:
+# 
+#   ApplicationController::Routing::Routes.draw do |map|
+#
+#     map.connect "/app_stuff", :controller => "application_thing" # etc...
+#
+#     # This line includes the routes from the given plugin at this point, giving you
+#     # control over the priority of your application routes 
+#     map.from_plugin :your_plugin
+#
+#     map.connect ":controller/:action/:id"
+#   end
+# 
+# By including routes in plugins which have controllers, you can now share in a simple way 
+# a compact and elegant URL scheme which corresponds to those controllers.
+#
+# ---
+#
+# The Engines::RailsExtensions::Routing module defines extensions to Rails' 
+# routing (ActionController::Routing) mechanism such that routes can be loaded 
+# from a given plugin.
+#
+# The key method is Engines::RailsExtensions::Routing#from_plugin, which can be called 
+# within your application's <tt>config/routes.rb</tt> file to load plugin routes at that point.
+#
+module Engines::RailsExtensions::Routing
+  # Loads the set of routes from within a plugin and evaluates them at this
+  # point within an application's main <tt>routes.rb</tt> file.
+  #
+  # Plugin routes are loaded from <tt><plugin_root>/routes.rb</tt>.
+  def from_plugin(name)
+    map = self # to make 'map' available within the plugin route file
+    routes_path = Engines.plugins[name].routes_path
+    Engines.logger.debug "loading routes from #{routes_path}"
+    eval(IO.read(routes_path), binding, routes_path) if File.file?(routes_path)
+  end
+end
+
+  
+module ::ActionController #:nodoc:
+  module Routing #:nodoc:
+    class RouteSet #:nodoc:
+      class Mapper #:nodoc:
+        include Engines::RailsExtensions::Routing
+      end
+    end
+  end
+end
diff --git a/vendor/plugins/engines/lib/engines/testing.rb b/vendor/plugins/engines/lib/engines/testing.rb
new file mode 100644
index 000000000..2b3bdc994
--- /dev/null
+++ b/vendor/plugins/engines/lib/engines/testing.rb
@@ -0,0 +1,87 @@
+# Contains the enhancements to assist in testing plugins. See Engines::Testing
+# for more details.
+
+require 'test/unit'
+
+require 'tmpdir'
+require 'fileutils'
+
+# In most cases, Rails' own plugin testing mechanisms are sufficient. However, there
+# are cases where plugins can be given a helping hand in the testing arena. This module 
+# contains some methods to assist when testing plugins that contain fixtures.
+# 
+# == Fixtures and plugins
+#
+# Since Rails' own fixtures method is fairly strict about where files can be loaded from,
+# the simplest approach when running plugin tests with fixtures is to simply copy all
+# fixtures into a single temporary location and inform the standard Rails mechanism to
+# use this directory, rather than RAILS_ROOT/test/fixtures.
+#
+# The Engines::Testing#setup_plugin_fixtures method does this, copying all plugin fixtures
+# into the temporary location before and tests are performed. This behaviour is invoked
+# the the rake tasks provided by the Engines plugin, in the "test:plugins" namespace. If
+# necessary, you can invoke the task manually.
+#
+# If you wish to take advantage of this, add a call to the Engines::Testing.set_fixture_path
+# method somewhere before your tests (in a test_helper file, or above the TestCase itself).
+#
+# = Testing plugins
+#
+# Normally testing a plugin will require that Rails is loaded, unless you are including
+# a skeleton Rails environment or set of mocks within your plugin tests. If you require
+# the Rails environment to be started, you must ensure that this actually happens; while
+# it's not obvious, your tests do not automatically run with Rails loaded.
+#
+# The simplest way to setup plugin tests is to include a test helper with the following
+# contents:
+#
+#   # Load the normal Rails helper. This ensures the environment is loaded
+#   require File.expand_path(File.dirname(__FILE__) + '/../../../../test/test_helper')
+#   # Ensure that we are using the temporary fixture path
+#   Engines::Testing.set_fixture_path
+#
+# Then run tests using the provided tasks (<tt>test:plugins</tt>, or the tasks that the engines
+# plugin provides - <tt>test:plugins:units</tt>, etc.).
+#
+# Alternatively, you can explicitly load the environment by adpating the contents of the
+# default <tt>test_helper</tt>:
+#
+#   ENV["RAILS_ENV"] = "test"
+#   # Note that we are requiring config/environment from the root of the enclosing application.
+#   require File.expand_path(File.dirname(__FILE__) + "/../../../../config/environment")
+#   require 'test_help'
+#
+module Engines::Testing
+  mattr_accessor :temporary_fixtures_directory
+  self.temporary_fixtures_directory = FileUtils.mkdir_p(File.join(Dir.tmpdir, "rails_fixtures"))
+  
+  # Copies fixtures from plugins and the application into a temporary directory 
+  # (Engines::Testing.temporary_fixtures_directory). 
+  # 
+  # If a set of plugins is not given, fixtures are copied from all plugins in order 
+  # of precedence, meaning that plugins can 'overwrite' the fixtures of others if they are 
+  # loaded later; the application's fixtures are copied last, allowing any custom fixtures
+  # to override those in the plugins. If no argument is given, plugins are loaded via
+  # PluginList#by_precedence.
+  #
+  # This method is called by the engines-supplied plugin testing rake tasks
+  def self.setup_plugin_fixtures(plugins = Engines.plugins.by_precedence)
+    
+    # Copy all plugin fixtures, and then the application fixtures, into this directory
+    plugins.each do |plugin| 
+      plugin_fixtures_directory =  File.join(plugin.directory, "test", "fixtures")
+      if File.directory?(plugin_fixtures_directory)
+        Engines.mirror_files_from(plugin_fixtures_directory, self.temporary_fixtures_directory)
+      end
+    end
+    Engines.mirror_files_from(File.join(RAILS_ROOT, "test", "fixtures"),
+                              self.temporary_fixtures_directory)
+  end
+  
+  # Sets the fixture path used by Test::Unit::TestCase to the temporary
+  # directory which contains all plugin fixtures.
+  def self.set_fixture_path
+    Test::Unit::TestCase.fixture_path = self.temporary_fixtures_directory
+    $LOAD_PATH.unshift self.temporary_fixtures_directory
+  end
+end
\ No newline at end of file
diff --git a/vendor/plugins/engines/tasks/engines.rake b/vendor/plugins/engines/tasks/engines.rake
new file mode 100644
index 000000000..a88631f6e
--- /dev/null
+++ b/vendor/plugins/engines/tasks/engines.rake
@@ -0,0 +1,178 @@
+# This code lets us redefine existing Rake tasks, which is extremely
+# handy for modifying existing Rails rake tasks.
+# Credit for the original snippet of code goes to Jeremy Kemper
+# http://pastie.caboo.se/9620
+unless Rake::TaskManager.methods.include?('redefine_task')
+  module Rake
+    module TaskManager
+      def redefine_task(task_class, args, &block)
+        task_name, arg_names, deps = resolve_args([args])
+        task_name = task_class.scope_name(@scope, task_name)
+        deps = [deps] unless deps.respond_to?(:to_ary)
+        deps = deps.collect {|d| d.to_s }
+        task = @tasks[task_name.to_s] = task_class.new(task_name, self)
+        task.application = self
+        task.add_description(@last_description)
+        @last_description = nil
+        task.enhance(deps, &block)
+        task
+      end
+      
+    end
+    class Task
+      class << self
+        def redefine_task(args, &block)
+          Rake.application.redefine_task(self, [args], &block)
+        end
+      end
+    end
+  end
+end
+
+namespace :db do
+  namespace :migrate do
+    desc 'Migrate database and plugins to current status.'
+    task :all => [ 'db:migrate', 'db:migrate:plugins' ]
+    
+    desc 'Migrate plugins to current status.'
+    task :plugins => :environment do
+      Engines.plugins.each do |plugin|
+        next unless File.exists? plugin.migration_directory
+        puts "Migrating plugin #{plugin.name} ..."
+        plugin.migrate
+      end
+    end
+
+    desc 'Migrate a specified plugin.'
+    task({:plugin => :environment}, :name, :version) do |task, args|
+      name = args[:name] || ENV['NAME']
+      if plugin = Engines.plugins[name]
+        version = args[:version] || ENV['VERSION']
+        puts "Migrating #{plugin.name} to " + (version ? "version #{version}" : 'latest version') + " ..."
+        plugin.migrate(version ? version.to_i : nil)
+      else
+        puts "Plugin #{name} does not exist."
+      end
+    end    
+  end
+end
+
+
+namespace :db do  
+  namespace :fixtures do
+    namespace :plugins do
+      
+      desc "Load plugin fixtures into the current environment's database."
+      task :load => :environment do
+        require 'active_record/fixtures'
+        ActiveRecord::Base.establish_connection(RAILS_ENV.to_sym)
+        Dir.glob(File.join(RAILS_ROOT, 'vendor', 'plugins', ENV['PLUGIN'] || '**', 
+                 'test', 'fixtures', '*.yml')).each do |fixture_file|
+          Fixtures.create_fixtures(File.dirname(fixture_file), File.basename(fixture_file, '.*'))
+        end
+      end
+      
+    end
+  end
+end
+
+# this is just a modification of the original task in railties/lib/tasks/documentation.rake, 
+# because the default task doesn't support subdirectories like <plugin>/app or
+# <plugin>/component. These tasks now include every file under a plugin's code paths (see
+# Plugin#code_paths).
+namespace :doc do
+
+  plugins = FileList['vendor/plugins/**'].collect { |plugin| File.basename(plugin) }
+
+  namespace :plugins do
+
+    # Define doc tasks for each plugin
+    plugins.each do |plugin|
+      desc "Create plugin documentation for '#{plugin}'"
+      Rake::Task.redefine_task(plugin => :environment) do
+        plugin_base   = RAILS_ROOT + "/vendor/plugins/#{plugin}"
+        options       = []
+        files         = Rake::FileList.new
+        options << "-o doc/plugins/#{plugin}"
+        options << "--title '#{plugin.titlecase} Plugin Documentation'"
+        options << '--line-numbers' << '--inline-source'
+        options << '-T html'
+
+        # Include every file in the plugin's code_paths (see Plugin#code_paths)
+        if Engines.plugins[plugin]
+          files.include("#{plugin_base}/{#{Engines.plugins[plugin].code_paths.join(",")}}/**/*.rb")
+        end
+        if File.exists?("#{plugin_base}/README")
+          files.include("#{plugin_base}/README")    
+          options << "--main '#{plugin_base}/README'"
+        end
+        files.include("#{plugin_base}/CHANGELOG") if File.exists?("#{plugin_base}/CHANGELOG")
+
+        if files.empty?
+          puts "No source files found in #{plugin_base}. No documentation will be generated."
+        else
+          options << files.to_s
+          sh %(rdoc #{options * ' '})
+        end
+      end
+    end
+  end
+end
+
+
+
+namespace :test do
+  task :warn_about_multiple_plugin_testing_with_engines do
+    puts %{-~============== A Moste Polite Warninge ===========================~-
+
+You may experience issues testing multiple plugins at once when using
+the code-mixing features that the engines plugin provides. If you do
+experience any problems, please test plugins individually, i.e.
+
+  $ rake test:plugins PLUGIN=my_plugin
+
+or use the per-type plugin test tasks:
+
+  $ rake test:plugins:units
+  $ rake test:plugins:functionals
+  $ rake test:plugins:integration
+  $ rake test:plugins:all
+
+Report any issues on http://dev.rails-engines.org. Thanks!
+
+-~===============( ... as you were ... )============================~-}
+  end
+  
+  namespace :plugins do
+
+    desc "Run the plugin tests in vendor/plugins/**/test (or specify with PLUGIN=name)"
+    task :all => [:warn_about_multiple_plugin_testing_with_engines, 
+                  :units, :functionals, :integration]
+    
+    desc "Run all plugin unit tests"
+    Rake::TestTask.new(:units => :setup_plugin_fixtures) do |t|
+      t.pattern = "vendor/plugins/#{ENV['PLUGIN'] || "**"}/test/unit/**/*_test.rb"
+      t.verbose = true
+    end
+    
+    desc "Run all plugin functional tests"
+    Rake::TestTask.new(:functionals => :setup_plugin_fixtures) do |t|
+      t.pattern = "vendor/plugins/#{ENV['PLUGIN'] || "**"}/test/functional/**/*_test.rb"
+      t.verbose = true
+    end
+    
+    desc "Integration test engines"
+    Rake::TestTask.new(:integration => :setup_plugin_fixtures) do |t|
+      t.pattern = "vendor/plugins/#{ENV['PLUGIN'] || "**"}/test/integration/**/*_test.rb"
+      t.verbose = true
+    end
+
+    desc "Mirrors plugin fixtures into a single location to help plugin tests"
+    task :setup_plugin_fixtures => :environment do
+      Engines::Testing.setup_plugin_fixtures
+    end
+    
+    # Patch the default plugin testing task to have setup_plugin_fixtures as a prerequisite
+    Rake::Task["test:plugins"].prerequisites << "test:plugins:setup_plugin_fixtures"
+  end  
+end
\ No newline at end of file

From 0b1343834daaab9e95e48c45b9d7ec54fd906345 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sat, 12 Jul 2008 10:28:09 +0000
Subject: [PATCH 610/710] Translations updates.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1655 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 lang/hu.yml    |   2 +-
 lang/it.yml    | 428 ++++++++++++++++++++++++-------------------------
 lang/ru.yml    |  18 +--
 lang/zh-tw.yml |   2 +-
 4 files changed, 225 insertions(+), 225 deletions(-)

diff --git a/lang/hu.yml b/lang/hu.yml
index 046916b7a..630294c9d 100644
--- a/lang/hu.yml
+++ b/lang/hu.yml
@@ -632,4 +632,4 @@ label_incoming_emails: Beérkezett levelek
 label_generate_key: Kulcs generálása
 setting_mail_handler_api_enabled: Web Service engedélyezése a beérkezett levelekhez
 setting_mail_handler_api_key: API kulcs
-text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."
+text_email_delivery_not_configured: "Az E-mail küldés nincs konfigurálva, és az értesítések ki vannak kapcsolva.\nÁllítsd be az SMTP szervert a config/email.yml fájlban és indítsd újra az alkalmazást, hogy érvénybe lépjen."
diff --git a/lang/it.yml b/lang/it.yml
index eb835400e..fcc028c97 100644
--- a/lang/it.yml
+++ b/lang/it.yml
@@ -20,24 +20,24 @@ actionview_datehelper_time_in_words_second_less_than_plural: meno di %d secondi
 actionview_instancetag_blank_option: Scegli
 
 activerecord_error_inclusion: non è incluso nella lista
-activerecord_error_exclusion: e' riservato
-activerecord_error_invalid: non e' valido
+activerecord_error_exclusion: è riservato
+activerecord_error_invalid: non è valido
 activerecord_error_confirmation: non coincide con la conferma
 activerecord_error_accepted: deve essere accettato
 activerecord_error_empty: non puo' essere vuoto
 activerecord_error_blank: non puo' essere blank
-activerecord_error_too_long: e' troppo lungo/a
-activerecord_error_too_short: e' troppo corto/a
-activerecord_error_wrong_length: e' della lunghezza sbagliata
-activerecord_error_taken: e' gia' stato/a preso/a
-activerecord_error_not_a_number: non e' un numero
-activerecord_error_not_a_date: non e' una data valida
+activerecord_error_too_long: è troppo lungo/a
+activerecord_error_too_short: è troppo corto/a
+activerecord_error_wrong_length: è della lunghezza sbagliata
+activerecord_error_taken: è già stato/a preso/a
+activerecord_error_not_a_number: non è un numero
+activerecord_error_not_a_date: non è una data valida
 activerecord_error_greater_than_start_date: deve essere maggiore della data di partenza
-activerecord_error_not_same_project: doesn't belong to the same project
-activerecord_error_circular_dependency: This relation would create a circular dependency
+activerecord_error_not_same_project: non appartiene allo stesso progetto
+activerecord_error_circular_dependency: Questa relazione creerebbe una dipendenza circolare
 
-general_fmt_age: %d yr
-general_fmt_age_plural: %d yrs
+general_fmt_age: %d anno
+general_fmt_age_plural: %d anni
 general_fmt_date: %%d/%%m/%%Y
 general_fmt_datetime: %%d/%%m/%%Y %%I:%%M %%p
 general_fmt_datetime_short: %%b %%d, %%I:%%M %%p
@@ -69,13 +69,13 @@ notice_successful_delete: Eliminazione effettuata.
 notice_successful_connection: Connessione effettuata.
 notice_file_not_found: La pagina desiderata non esiste o è stata rimossa.
 notice_locking_conflict: Le informazioni sono state modificate da un altro utente.
-notice_not_authorized: You are not authorized to access this page.
-notice_email_sent: An email was sent to %s
-notice_email_error: An error occurred while sending mail (%s)
-notice_feeds_access_key_reseted: Your RSS access key was reseted.
+notice_not_authorized: Non sei autorizzato ad accedere a questa pagina.
+notice_email_sent: Una e-mail è stata spedita a %s
+notice_email_error: Si è verificato un errore durante l'invio di una e-mail (%s)
+notice_feeds_access_key_reseted: La tua chiave di accesso RSS è stata reimpostata.
 
 error_scm_not_found: "La risorsa e/o la versione non esistono nel repository."
-error_scm_command_failed: "An error occurred when trying to access the repository: %s"
+error_scm_command_failed: "Si è verificato un errore durante l'accesso al repository: %s"
 
 mail_subject_lost_password: Password %s
 mail_body_lost_password: 'Per cambiare la password, usate il seguente collegamento:'
@@ -111,21 +111,21 @@ field_project: Progetto
 field_issue: Issue
 field_status: Stato
 field_notes: Note
-field_is_closed: Chiude il contesto
+field_is_closed: Chiude la segnalazione
 field_is_default: Stato predefinito
 field_tracker: Tracker
 field_subject: Oggetto
 field_due_date: Data ultima
 field_assigned_to: Assegnato a
 field_priority: Priorita'
-field_fixed_version: Target version
+field_fixed_version: Versione prevista
 field_user: Utente
 field_role: Ruolo
 field_homepage: Homepage
 field_is_public: Pubblico
 field_parent: Sottoprogetto di
-field_is_in_chlog: Contesti mostrati nel changelog
-field_is_in_roadmap: Contesti mostrati nel roadmap
+field_is_in_chlog: Segnalazioni mostrate nel changelog
+field_is_in_roadmap: Segnalazioni mostrate nel roadmap
 field_login: Login
 field_mail_notification: Notifiche via e-mail
 field_admin: Amministratore
@@ -154,16 +154,16 @@ field_comments: Commento
 field_url: URL
 field_start_page: Pagina principale
 field_subproject: Sottoprogetto
-field_hours: Hours
-field_activity: Activity
+field_hours: Ore
+field_activity: Attività
 field_spent_on: Data
-field_identifier: Identifier
-field_is_filter: Used as a filter
-field_issue_to_id: Related issue
-field_delay: Delay
-field_assignable: Issues can be assigned to this role
-field_redirect_existing_links: Redirect existing links
-field_estimated_hours: Estimated time
+field_identifier: Identificativo
+field_is_filter: Usato come filtro
+field_issue_to_id: Segnalazioni correlate
+field_delay: Ritardo
+field_assignable: E' possibile assegnare segnalazioni a questo ruolo
+field_redirect_existing_links: Redirige i collegamenti esistenti
+field_estimated_hours: Tempo stimato
 field_default_value: Stato predefinito
 
 setting_app_title: Titolo applicazione
@@ -173,7 +173,7 @@ setting_default_language: Lingua di default
 setting_login_required: Autenticazione richiesta
 setting_self_registration: Auto-registrazione abilitata
 setting_attachment_max_size: Massima dimensione allegati
-setting_issues_export_limit: Limite esportazione contesti
+setting_issues_export_limit: Limite esportazione segnalazioni
 setting_mail_from: Indirizzo sorgente e-mail
 setting_host_name: Nome host
 setting_text_formatting: Formattazione testo
@@ -183,9 +183,9 @@ setting_autofetch_changesets: Acquisisci automaticamente le commit
 setting_sys_api_enabled: Abilita WS per la gestione del repository
 setting_commit_ref_keywords: Referencing keywords
 setting_commit_fix_keywords: Fixing keywords
-setting_autologin: Autologin
-setting_date_format: Date format
-setting_cross_project_issue_relations: Allow cross-project issue relations
+setting_autologin: Login automatico
+setting_date_format: Formato data
+setting_cross_project_issue_relations: Consenti la creazione di relazioni tra segnalazioni in progetti differenti
 
 label_user: Utente
 label_user_plural: Utenti
@@ -193,12 +193,12 @@ label_user_new: Nuovo utente
 label_project: Progetto
 label_project_new: Nuovo progetto
 label_project_plural: Progetti
-label_project_all: All Projects
+label_project_all: Tutti i progetti
 label_project_latest: Ultimi progetti registrati
-label_issue: Contesto
-label_issue_new: Nuovo contesto
-label_issue_plural: Contesti
-label_issue_view_all: Mostra tutti i contesti
+label_issue: Segnalazione
+label_issue_new: Nuova segnalazione
+label_issue_plural: Segnalazioni
+label_issue_view_all: Mostra tutte le segnalazioni
 label_document: Documento
 label_document_new: Nuovo documento
 label_document_plural: Documenti
@@ -213,11 +213,11 @@ label_tracker: Tracker
 label_tracker_plural: Tracker
 label_tracker_new: Nuovo tracker
 label_workflow: Workflow
-label_issue_status: Stato contesti
-label_issue_status_plural: Stati contesto
+label_issue_status: Stato segnalazioni
+label_issue_status_plural: Stati segnalazione
 label_issue_status_new: Nuovo stato
-label_issue_category: Categorie contesti
-label_issue_category_plural: Categorie contesto
+label_issue_category: Categorie segnalazioni
+label_issue_category_plural: Categorie segnalazioni
 label_issue_category_new: Nuova categoria
 label_custom_field: Campo personalizzato
 label_custom_field_plural: Campi personalizzati
@@ -237,8 +237,8 @@ label_administration: Amministrazione
 label_login: Login
 label_logout: Logout
 label_help: Aiuto
-label_reported_issues: Contesti segnalati
-label_assigned_to_me_issues: I miei contesti
+label_reported_issues: Segnalazioni
+label_assigned_to_me_issues: Le mie segnalazioni
 label_last_login: Ultimo collegamento
 label_last_updates: Ultimo aggiornamento
 label_last_updates_plural: %d ultimo aggiornamento
@@ -277,7 +277,7 @@ label_news_new: Aggiungi notizia
 label_news_plural: Notizie
 label_news_latest: Utime notizie
 label_news_view_all: Tutte le notizie
-label_change_log: Change log
+label_change_log: Elenco modifiche
 label_settings: Impostazioni
 label_overview: Panoramica
 label_version: Versione
@@ -315,7 +315,7 @@ label_comment_plural: Commenti
 label_comment_add: Aggiungi un commento
 label_comment_added: Commento aggiunto
 label_comment_delete: Elimina commenti
-label_query: Custom query
+label_query: Query personalizzata
 label_query_plural: Query personalizzate
 label_query_new: Nuova query
 label_filter_add: Aggiungi filtro
@@ -326,7 +326,7 @@ label_in_less_than: è minore di
 label_in_more_than: è maggiore di
 label_in: in
 label_today: oggi
-label_this_week: this week
+label_this_week: questa settimana
 label_less_than_ago: meno di giorni fa
 label_more_than_ago: più di giorni fa
 label_ago: giorni fa
@@ -334,7 +334,7 @@ label_contains: contiene
 label_not_contains: non contiene
 label_day_plural: giorni
 label_repository: Repository
-label_browse: Browse
+label_browse: Sfoglia
 label_modification: %d modifica
 label_modification_plural: %d modifiche
 label_revision: Versione
@@ -354,7 +354,7 @@ label_sort_lowest: Sposta in fondo
 label_roadmap: Roadmap
 label_roadmap_due_in: Da ultimare in 
 label_roadmap_overdue: %s late
-label_roadmap_no_issues: Nessun contesto per questa versione
+label_roadmap_no_issues: Nessuna segnalazione per questa versione
 label_search: Ricerca
 label_result_plural: Risultati
 label_all_words: Tutte le parole
@@ -369,7 +369,7 @@ label_current_version: Versione corrente
 label_preview: Anteprima
 label_feed_plural: Feed
 label_changes_details: Particolari di tutti i cambiamenti
-label_issue_tracking: tracking dei contesti
+label_issue_tracking: tracking delle segnalazioni
 label_spent_time: Tempo impiegato
 label_f_hour: %.2f ora
 label_f_hour_plural: %.2f ore
@@ -379,53 +379,53 @@ label_statistics: Statistiche
 label_commits_per_month: Commit per mese
 label_commits_per_author: Commit per autore
 label_view_diff: mostra differenze
-label_diff_inline: inline
-label_diff_side_by_side: side by side
+label_diff_inline: in linea
+label_diff_side_by_side: fianco a fianco
 label_options: Opzioni
 label_copy_workflow_from: Copia workflow da
 label_permissions_report: Report permessi
-label_watched_issues: Watched issues
-label_related_issues: Related issues
-label_applied_status: Applied status
-label_loading: Loading...
-label_relation_new: New relation
-label_relation_delete: Delete relation
-label_relates_to: related to
-label_duplicates: duplicates
-label_blocks: blocks
-label_blocked_by: blocked by
-label_precedes: precedes
-label_follows: follows
+label_watched_issues: Segnalazioni osservate
+label_related_issues: Segnalazioni correlate
+label_applied_status: Stato applicato
+label_loading: Caricamento...
+label_relation_new: Nuova relazione
+label_relation_delete: Elimina relazione
+label_relates_to: correlato a
+label_duplicates: duplicati
+label_blocks: blocchi
+label_blocked_by: bloccato da
+label_precedes: precede
+label_follows: segue
 label_end_to_start: end to start
 label_end_to_end: end to end
 label_start_to_start: start to start
 label_start_to_end: start to end
-label_stay_logged_in: Stay logged in
-label_disabled: disabled
-label_show_completed_versions: Show completed versions
-label_me: me
+label_stay_logged_in: Rimani collegato
+label_disabled: disabilitato
+label_show_completed_versions: Mostra versioni completate
+label_me: io
 label_board: Forum
-label_board_new: New forum
-label_board_plural: Forums
-label_topic_plural: Topics
-label_message_plural: Messages
-label_message_last: Last message
-label_message_new: New message
-label_reply_plural: Replies
-label_send_information: Send account information to the user
-label_year: Year
-label_month: Month
-label_week: Week
-label_date_from: From
-label_date_to: To
-label_language_based: Language based
-label_sort_by: Sort by %s
-label_send_test_email: Send a test email
-label_feeds_access_key_created_on: RSS access key created %s ago
-label_module_plural: Modules
-label_added_time_by: Added by %s %s ago
-label_updated_time: Updated %s ago
-label_jump_to_a_project: Jump to a project...
+label_board_new: Nuovo forum
+label_board_plural: Forum
+label_topic_plural: Argomenti
+label_message_plural: Messaggi
+label_message_last: Ultimo messaggio
+label_message_new: Nuovo messaggio
+label_reply_plural: Risposte
+label_send_information: Invia all'utente le informazioni relative all'account
+label_year: Anno
+label_month: Mese
+label_week: Settimana
+label_date_from: Da
+label_date_to: A
+label_language_based: Basato sul linguaggio
+label_sort_by: Ordina per %s
+label_send_test_email: Invia una e-mail di test
+label_feeds_access_key_created_on: chiave di accesso RSS creata %s fa
+label_module_plural: Moduli
+label_added_time_by: Aggiunto da %s %s fa
+label_updated_time: Aggiornato %s fa
+label_jump_to_a_project: Vai al progetto...
 
 button_login: Login
 button_submit: Invia
@@ -452,13 +452,13 @@ button_activate: Attiva
 button_sort: Ordina
 button_log_time: Registra tempo
 button_rollback: Ripristina questa versione
-button_watch: Watch
-button_unwatch: Unwatch
-button_reply: Reply
-button_archive: Archive
-button_unarchive: Unarchive
+button_watch: Osserva
+button_unwatch: Dimentica
+button_reply: Rispondi
+button_archive: Archivia
+button_unarchive: Ripristina
 button_reset: Reset
-button_rename: Rename
+button_rename: Rinomina
 
 status_active: attivo
 status_registered: registrato
@@ -476,24 +476,24 @@ text_journal_deleted: cancellato
 text_tip_task_begin_day: attività che iniziano in questa giornata
 text_tip_task_end_day: attività che terminano in questa giornata
 text_tip_task_begin_end_day: attività che iniziano e terminano in questa giornata
-text_project_identifier_info: 'Lower case letters (a-z), numbers and dashes allowed.<br />Once saved, the identifier can not be changed.'
+text_project_identifier_info: "Lettere minuscole (a-z), numeri e trattini permessi.<br />Una volta salvato, l'identificativo non può essere modificato."
 text_caracters_maximum: massimo %d caratteri.
 text_length_between: Lunghezza compresa tra %d e %d caratteri.
 text_tracker_no_workflow: Nessun workflow definito per questo tracker
-text_unallowed_characters: Unallowed characters
-text_comma_separated: Multiple values allowed (comma separated).
+text_unallowed_characters: Caratteri non permessi
+text_comma_separated: Valori multipli permessi (separati da virgola).
 text_issues_ref_in_commit_messages: Referencing and fixing issues in commit messages
 text_issue_added: "E' stata segnalata l'anomalia %s da %s."
 text_issue_updated: "L'anomalia %s e' stata aggiornata da %s."
 text_wiki_destroy_confirmation: Are you sure you want to delete this wiki and all its content ?
-text_issue_category_destroy_question: Some issues (%d) are assigned to this category. What do you want to do ?
-text_issue_category_destroy_assignments: Remove category assignments
-text_issue_category_reassign_to: Reassing issues to this category
+text_issue_category_destroy_question: Alcune segnalazioni (%d) risultano assegnate a questa categoria. Cosa vuoi fare ?
+text_issue_category_destroy_assignments: Rimuovi gli assegnamenti a questa categoria
+text_issue_category_reassign_to: Riassegna segnalazioni a questa categoria
 
 default_role_manager: Manager
 default_role_developper: Sviluppatore
 default_role_reporter: Reporter
-default_tracker_bug: Contesto
+default_tracker_bug: Segnalazione
 default_tracker_feature: Funzione
 default_tracker_support: Supporto
 default_issue_status_new: Nuovo/a
@@ -509,126 +509,126 @@ default_priority_normal: Normale
 default_priority_high: Alta
 default_priority_urgent: Urgente
 default_priority_immediate: Immediata
-default_activity_design: Design
-default_activity_development: Development
+default_activity_design: Progettazione
+default_activity_development: Sviluppo
 
-enumeration_issue_priorities: Priorità contesti
+enumeration_issue_priorities: Priorità segnalazioni
 enumeration_doc_categories: Categorie di documenti
 enumeration_activities: Attività (time tracking)
-label_file_plural: Files
-label_changeset_plural: Changesets
-field_column_names: Columns
-label_default_columns: Default columns
-setting_issue_list_default_columns: Default columns displayed on the issue list
-setting_repositories_encodings: Repositories encodings
-notice_no_issue_selected: "No issue is selected! Please, check the issues you want to edit."
-label_bulk_edit_selected_issues: Bulk edit selected issues
-label_no_change_option: (No change)
-notice_failed_to_save_issues: "Failed to save %d issue(s) on %d selected: %s."
-label_theme: Theme
-label_default: Default
-label_search_titles_only: Search titles only
-label_nobody: nobody
-button_change_password: Change password
+label_file_plural: File
+label_changeset_plural: Changeset
+field_column_names: Colonne
+label_default_columns: Colonne predefinite
+setting_issue_list_default_columns: Colonne predefinite mostrate nell'elenco segnalazioni
+setting_repositories_encodings: Codifiche dei repository
+notice_no_issue_selected: "Nessuna segnalazione selezionata! Seleziona le segnalazioni che intendi modificare."
+label_bulk_edit_selected_issues: Modifica massiva delle segnalazioni selezionate
+label_no_change_option: (Nessuna modifica)
+notice_failed_to_save_issues: "Impossibile salvare %d segnalazioni su %d selezionate: %s."
+label_theme: Tema
+label_default: Predefinito
+label_search_titles_only: Cerca solo nei titoli
+label_nobody: nessuno
+button_change_password: Modifica password
 text_user_mail_option: "For unselected projects, you will only receive notifications about things you watch or you're involved in (eg. issues you're the author or assignee)."
-label_user_mail_option_selected: "For any event on the selected projects only..."
-label_user_mail_option_all: "For any event on all my projects"
-label_user_mail_option_none: "Only for things I watch or I'm involved in"
-setting_emails_footer: Emails footer
+label_user_mail_option_selected: "Solo per gli eventi relativi ai progetti selezionati..."
+label_user_mail_option_all: "Per ogni evento relativo ad uno dei miei progetti"
+label_user_mail_option_none: "Solo per argomenti che osservo o che mi riguardano"
+setting_emails_footer: Piè di pagina e-mail
 label_float: Float
-button_copy: Copy
-mail_body_account_information_external: You can use your "%s" account to log in.
-mail_body_account_information: Your account information
-setting_protocol: Protocol
-label_user_mail_no_self_notified: "I don't want to be notified of changes that I make myself"
-setting_time_format: Time format
-label_registration_activation_by_email: account activation by email
-mail_subject_account_activation_request: %s account activation request
-mail_body_account_activation_request: 'A new user (%s) has registered. His account his pending your approval:'
-label_registration_automatic_activation: automatic account activation
-label_registration_manual_activation: manual account activation
-notice_account_pending: "Your account was created and is now pending administrator approval."
+button_copy: Copia
+mail_body_account_information_external: Puoi utilizzare il tuo account "%s" per accedere al sistema.
+mail_body_account_information: Le informazioni riguardanti il tuo account
+setting_protocol: Protocollo
+label_user_mail_no_self_notified: "Non voglio notifiche riguardanti modifiche da me apportate"
+setting_time_format: Formato ora
+label_registration_activation_by_email: attivazione account via e-mail
+mail_subject_account_activation_request: %s richiesta attivazione account
+mail_body_account_activation_request: 'Un nuovo utente (%s) ha effettuato la registrazione. Il suo account è in attesa di abilitazione da parte tua:'
+label_registration_automatic_activation: attivazione account automatica
+label_registration_manual_activation: attivazione account manuale
+notice_account_pending: "Il tuo account è stato creato ed è in attesa di attivazione da parte dell'amministratore."
 field_time_zone: Time zone
-text_caracters_minimum: Must be at least %d characters long.
-setting_bcc_recipients: Blind carbon copy recipients (bcc)
-button_annotate: Annotate
-label_issues_by: Issues by %s
-field_searchable: Searchable
-label_display_per_page: 'Per page: %s'
-setting_per_page_options: Objects per page options
-label_age: Age
-notice_default_data_loaded: Default configuration successfully loaded.
-text_load_default_configuration: Load the default configuration
-text_no_configuration_data: "Roles, trackers, issue statuses and workflow have not been configured yet.\nIt is highly recommended to load the default configuration. You will be able to modify it once loaded."
-error_can_t_load_default_data: "Default configuration could not be loaded: %s"
-button_update: Update
-label_change_properties: Change properties
-label_general: General
-label_repository_plural: Repositories
-label_associated_revisions: Associated revisions
-setting_user_format: Users display format
-text_status_changed_by_changeset: Applied in changeset %s.
-label_more: More
-text_issues_destroy_confirmation: 'Are you sure you want to delete the selected issue(s) ?'
+text_caracters_minimum: Deve essere lungo almeno %d caratteri.
+setting_bcc_recipients: Destinatari in copia nascosta (bcc)
+button_annotate: Annota
+label_issues_by: Segnalazioni di %s
+field_searchable: Ricercabile
+label_display_per_page: 'Per pagina: %s'
+setting_per_page_options: Opzioni oggetti per pagina
+label_age: Età
+notice_default_data_loaded: Configurazione di default caricata con successo.
+text_load_default_configuration: Carica la configurazione di default
+text_no_configuration_data: "Ruoli, tracker, stati delle segnalazioni e workflow non sono stati ancora configurati.\nIt is highly recommended to load the default configuration. You will be able to modify it once loaded."
+error_can_t_load_default_data: "Non è stato possibile caricare la configurazione di default : %s"
+button_update: Aggiorna
+label_change_properties: Modifica le proprietà
+label_general: Generale
+label_repository_plural: Repository
+label_associated_revisions: Revisioni associate
+setting_user_format: Formato visualizzazione utenti
+text_status_changed_by_changeset: Applicata nel changeset %s.
+label_more: Altro
+text_issues_destroy_confirmation: 'Sei sicuro di voler eliminare le segnalazioni selezionate?'
 label_scm: SCM
-text_select_project_modules: 'Select modules to enable for this project:'
-label_issue_added: Issue added
-label_issue_updated: Issue updated
-label_document_added: Document added
-label_message_posted: Message added
-label_file_added: File added
-label_news_added: News added
+text_select_project_modules: 'Seleziona i moduli abilitati per questo progetto:'
+label_issue_added: Segnalazioni aggiunte
+label_issue_updated: Segnalazioni aggiornate
+label_document_added: Documenti aggiunti
+label_message_posted: Messaggi aggiunti
+label_file_added: File aggiunti
+label_news_added: Notizie aggiunte
 project_module_boards: Boards
-project_module_issue_tracking: Issue tracking
+project_module_issue_tracking: Tracking delle segnalazioni
 project_module_wiki: Wiki
-project_module_files: Files
-project_module_documents: Documents
+project_module_files: File
+project_module_documents: Documenti
 project_module_repository: Repository
-project_module_news: News
+project_module_news: Notizie
 project_module_time_tracking: Time tracking
-text_file_repository_writable: File repository writable
-text_default_administrator_account_changed: Default administrator account changed
-text_rmagick_available: RMagick available (optional)
-button_configure: Configure
-label_plugins: Plugins
-label_ldap_authentication: LDAP authentication
+text_file_repository_writable: Repository dei file scrivibile
+text_default_administrator_account_changed: L'account amministrativo di default è stato modificato
+text_rmagick_available: RMagick disponibile (opzionale)
+button_configure: Configura
+label_plugins: Plugin
+label_ldap_authentication: Autenticazione LDAP
 label_downloads_abbr: D/L
-label_this_month: this month
-label_last_n_days: last %d days
-label_all_time: all time
-label_this_year: this year
-label_date_range: Date range
-label_last_week: last week
-label_yesterday: yesterday
-label_last_month: last month
-label_add_another_file: Add another file
-label_optional_description: Optional description
-text_destroy_time_entries_question: %.02f hours were reported on the issues you are about to delete. What do you want to do ?
-error_issue_not_found_in_project: 'The issue was not found or does not belong to this project'
-text_assign_time_entries_to_project: Assign reported hours to the project
-text_destroy_time_entries: Delete reported hours
-text_reassign_time_entries: 'Reassign reported hours to this issue:'
-setting_activity_days_default: Days displayed on project activity
-label_chronological_order: In chronological order
-field_comments_sorting: Display comments
-label_reverse_chronological_order: In reverse chronological order
-label_preferences: Preferences
-setting_display_subprojects_issues: Display subprojects issues on main projects by default
-label_overall_activity: Overall activity
-setting_default_projects_public: New projects are public by default
-error_scm_annotate: "The entry does not exist or can not be annotated."
-label_planning: Planning
-text_subprojects_destroy_warning: 'Its subproject(s): %s will be also deleted.'
-label_and_its_subprojects: %s and its subprojects
-mail_body_reminder: "%d issue(s) that are assigned to you are due in the next %d days:"
-mail_subject_reminder: "%d issue(s) due in the next days"
-text_user_wrote: '%s wrote:'
-label_duplicated_by: duplicated by
-setting_enabled_scm: Enabled SCM
-text_enumeration_category_reassign_to: 'Reassign them to this value:'
-text_enumeration_destroy_question: '%d objects are assigned to this value.'
-label_incoming_emails: Incoming emails
-label_generate_key: Generate a key
-setting_mail_handler_api_enabled: Enable WS for incoming emails
-setting_mail_handler_api_key: API key
-text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."
+label_this_month: questo mese
+label_last_n_days: ultimi %d giorni
+label_all_time: sempre
+label_this_year: quest'anno
+label_date_range: Intervallo di date
+label_last_week: ultima settimana
+label_yesterday: ieri
+label_last_month: ultimo mese
+label_add_another_file: Aggiungi un altro file
+label_optional_description: Descrizione opzionale
+text_destroy_time_entries_question: %.02f ore risultano spese sulle segnalazioni che stai per cancellare. Cosa vuoi fare ?
+error_issue_not_found_in_project: 'La segnalazione non è stata trovata o non appartiene al progetto'
+text_assign_time_entries_to_project: Assegna le ore segnalate al progetto
+text_destroy_time_entries: Elimina le ore segnalate
+text_reassign_time_entries: 'Riassegna le ore a questa segnalazione:'
+setting_activity_days_default: Giorni mostrati sulle attività di progetto
+label_chronological_order: In ordine cronologico
+field_comments_sorting: Mostra commenti
+label_reverse_chronological_order: In ordine cronologico inverso
+label_preferences: Preferenze
+setting_display_subprojects_issues: Mostra le segnalazioni dei sottoprogetti nel progetto principale per default
+label_overall_activity: Attività generale
+setting_default_projects_public: I nuovi progetti sono pubblici per default
+error_scm_annotate: "L'oggetto non esiste o non può essere annotato."
+label_planning: Pianificazione
+text_subprojects_destroy_warning: 'Anche i suoi sottoprogetti: %s verranno eliminati.'
+label_and_its_subprojects: %s ed i suoi sottoprogetti
+mail_body_reminder: "%d segnalazioni che ti sono state assegnate scadranno nei prossimi %d giorni:"
+mail_subject_reminder: "%d segnalazioni in scadenza nei prossimi giorni"
+text_user_wrote: '%s ha scritto:'
+label_duplicated_by: duplicato da
+setting_enabled_scm: SCM abilitato
+text_enumeration_category_reassign_to: 'Riassegnale a questo valore:'
+text_enumeration_destroy_question: '%d oggetti hanno un assegnamento su questo valore.'
+label_incoming_emails: E-mail in arrivo
+label_generate_key: Genera una chiave
+setting_mail_handler_api_enabled: Abilita WS per le e-mail in arrivo
+setting_mail_handler_api_key: chiave API
+text_email_delivery_not_configured: "La consegna via e-mail non è configurata e le notifiche sono disabilitate.\nConfigura il tuo server SMTP in config/email.yml e riavvia l'applicazione per abilitarle."
diff --git a/lang/ru.yml b/lang/ru.yml
index 5d59ec1fb..c0cac30a0 100644
--- a/lang/ru.yml
+++ b/lang/ru.yml
@@ -164,7 +164,7 @@ field_comments: Комментарий
 field_url: URL
 field_start_page: Стартовая страница
 field_subproject: Подпроект
-field_hours: Час(а)(ов)
+field_hours: Час(а,ов)
 field_activity: Деятельность
 field_spent_on: Дата
 field_identifier: Ун. идентификатор
@@ -407,7 +407,7 @@ label_diff_side_by_side: рядом
 label_options: Опции
 label_copy_workflow_from: Скопировать последовательность действий из 
 label_permissions_report: Отчет о правах доступа
-label_watched_issues: Просмотренные задачи 
+label_watched_issues: Просматриваемые задачи 
 label_related_issues: Связанные задачи
 label_applied_status: Применимый статус
 label_loading: Загрузка...
@@ -462,7 +462,7 @@ label_user_mail_option_selected: "Для всех событий только в
 label_user_mail_option_none: "Только для того, что я просматриваю или в чем я участвую"
 label_user_mail_no_self_notified: "Не извещать об изменениях которые я сделал сам"
 label_registration_activation_by_email: активация учетных записей по email
-label_registration_automatic_activation: автоматическая активация учтеных записей
+label_registration_automatic_activation: автоматическая активация учетных записей
 label_registration_manual_activation: активировать учетные записи вручную
 label_age: Возраст 
 label_change_properties: Изменить свойства
@@ -605,7 +605,7 @@ label_date_range: временной интервал
 label_last_week: последняя неделю
 label_yesterday: вчера
 label_last_month: последний месяц
-label_add_another_file: Добавить ещё один  файл
+label_add_another_file: Добавить ещё один файл
 label_optional_description: Описание (выборочно)
 text_destroy_time_entries_question: Вы собираетесь удалить %.02f часа(ов) прикрепленных за этой задачей.
 error_issue_not_found_in_project: Задача не была найдена или не прикреплена к этому проекту
@@ -631,8 +631,8 @@ label_duplicated_by: дублируется
 setting_enabled_scm: Задействовать SCM
 text_enumeration_category_reassign_to: 'Назначить им следующее значение:'
 text_enumeration_destroy_question: '%d объект(а,ов) связаны с этим значением.'
-label_incoming_emails: Incoming emails
-label_generate_key: Generate a key
-setting_mail_handler_api_enabled: Enable WS for incoming emails
-setting_mail_handler_api_key: API key
-text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."
+label_incoming_emails: Приём сообщений
+label_generate_key: Сгенерировать ключ
+setting_mail_handler_api_enabled: Включить веб-сервис для входящих сообщений
+setting_mail_handler_api_key: API ключ
+text_email_delivery_not_configured: "Параметры работы с почтовым сервером не настроены и функция уведомления по email не активна.\nНастроить параметры для вашего SMTP сервера вы можете в файле config/email.yml. Для применения изменений перезапустите приложение."
diff --git a/lang/zh-tw.yml b/lang/zh-tw.yml
index 0e8fabef9..bad6fcca5 100644
--- a/lang/zh-tw.yml
+++ b/lang/zh-tw.yml
@@ -606,6 +606,7 @@ text_reassign_time_entries: '重新指定已報工的時數至此項目：'
 text_user_wrote: '%s 先前提到:'
 text_enumeration_destroy_question: '目前有 %d 個物件使用此列舉值。'
 text_enumeration_category_reassign_to: '重新設定其列舉值為：'
+text_email_delivery_not_configured: "您尚未設定電子郵件傳送方式，因此提醒選項已被停用。\n請在 config/email.yml 中設定 SMTP 之後，重新啟動 Redmine，以啟用電子郵件提醒選項。"
 
 default_role_manager: 管理人員
 default_role_developper: 開發人員
@@ -632,4 +633,3 @@ default_activity_development: 開發
 enumeration_issue_priorities: 項目優先權
 enumeration_doc_categories: 文件分類
 enumeration_activities: 活動 (時間追蹤)
-text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."

From a01a5622616b3bc426e73c53670242ad4133742e Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sat, 12 Jul 2008 10:31:41 +0000
Subject: [PATCH 611/710] Fixed: Plugin's setting page is broken after
 upgrading to rails 2.1.0 (#1620).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1656 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/settings_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/settings_controller.rb b/app/controllers/settings_controller.rb
index 59b9c67e1..e20cb64b5 100644
--- a/app/controllers/settings_controller.rb
+++ b/app/controllers/settings_controller.rb
@@ -50,7 +50,7 @@ class SettingsController < ApplicationController
       flash[:notice] = l(:notice_successful_update)
       redirect_to :action => 'plugin', :id => params[:id]
     end
-    @partial = "../../vendor/plugins/#{plugin_id}/app/views/" + @plugin.settings[:partial]
+    @partial = @plugin.settings[:partial]
     @settings = Setting["plugin_#{plugin_id}"]
   end
 end

From 4e7336dac9aaf199547a6b908899b613e7f7581e Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sat, 12 Jul 2008 11:04:41 +0000
Subject: [PATCH 612/710] Fixes engines assets mirroring.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1657 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 vendor/plugins/engines/lib/engines.rb | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/vendor/plugins/engines/lib/engines.rb b/vendor/plugins/engines/lib/engines.rb
index 47886f5f1..0e1bdbc9b 100644
--- a/vendor/plugins/engines/lib/engines.rb
+++ b/vendor/plugins/engines/lib/engines.rb
@@ -143,11 +143,6 @@ module Engines
       source_dirs = source_files.select { |d| File.directory?(d) }
       source_files -= source_dirs
       
-      unless source_files.empty?
-        base_target_dir = File.join(destination, File.dirname(source_files.first))
-        FileUtils.mkdir_p(base_target_dir)
-      end
-      
       source_dirs.each do |dir|
         # strip down these paths so we have simple, relative paths we can
         # add to the destination

From 591407c5c81028eb3b5feeeabf7474adca626e29 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sat, 12 Jul 2008 11:12:33 +0000
Subject: [PATCH 613/710] Adds auto links tests.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1658 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 test/unit/helpers/application_helper_test.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/test/unit/helpers/application_helper_test.rb b/test/unit/helpers/application_helper_test.rb
index 56a36851b..9559b76cc 100644
--- a/test/unit/helpers/application_helper_test.rb
+++ b/test/unit/helpers/application_helper_test.rb
@@ -31,6 +31,8 @@ class ApplicationHelperTest < HelperTestCase
       'http://foo.bar' => '<a class="external" href="http://foo.bar">http://foo.bar</a>',
       'http://foo.bar/~user' => '<a class="external" href="http://foo.bar/~user">http://foo.bar/~user</a>',
       'http://foo.bar.' => '<a class="external" href="http://foo.bar">http://foo.bar</a>.',
+      'This is a link: http://foo.bar.' => 'This is a link: <a class="external" href="http://foo.bar">http://foo.bar</a>.',
+      'A link (eg. http://foo.bar).' => 'A link (eg. <a class="external" href="http://foo.bar">http://foo.bar</a>).',
       'http://foo.bar/foo.bar#foo.bar.' => '<a class="external" href="http://foo.bar/foo.bar#foo.bar">http://foo.bar/foo.bar#foo.bar</a>.',
       'www.foo.bar' => '<a class="external" href="http://www.foo.bar">www.foo.bar</a>',
       'http://foo.bar/page?p=1&t=z&s=' => '<a class="external" href="http://foo.bar/page?p=1&#38;t=z&#38;s=">http://foo.bar/page?p=1&#38;t=z&#38;s=</a>',

From c4eef6314e0e7030d002a2f40f1d4cee993afae6 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 13 Jul 2008 11:02:42 +0000
Subject: [PATCH 614/710] Menu item caption can be a Proc.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1659 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 lib/redmine/menu_manager.rb | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/lib/redmine/menu_manager.rb b/lib/redmine/menu_manager.rb
index af54b41fe..01c14083e 100644
--- a/lib/redmine/menu_manager.rb
+++ b/lib/redmine/menu_manager.rb
@@ -80,9 +80,10 @@ module Redmine
             else
               item.url
             end
-            #url = (project && item.url.is_a?(Hash)) ? {item.param => project}.merge(item.url) : (item.url.is_a?(Symbol) ? send(item.url) : item.url)
+            caption = item.caption(project)
+            caption = l(caption) if caption.is_a?(Symbol)
             links << content_tag('li', 
-              link_to(l(item.caption), url, (current_menu_item == item.name ? item.html_options.merge(:class => 'selected') : item.html_options)))
+              link_to(h(caption), url, (current_menu_item == item.name ? item.html_options.merge(:class => 'selected') : item.html_options)))
           end
         end
         links.empty? ? nil : content_tag('ul', links.join("\n"))
@@ -110,8 +111,11 @@ module Redmine
     class Mapper
       # Adds an item at the end of the menu. Available options:
       # * param: the parameter name that is used for the project id (default is :id)
-      # * if: a proc that is called before rendering the item, the item is displayed only if it returns true
-      # * caption: the localized string key that is used as the item label
+      # * if: a Proc that is called before rendering the item, the item is displayed only if it returns true
+      # * caption that can be:
+      #   * a localized string Symbol
+      #   * a String
+      #   * a Proc that can take the project as argument
       # * html_options: a hash of html options that are passed to link_to
       def push(name, url, options={})
         items << MenuItem.new(name, url, options)
@@ -133,13 +137,17 @@ module Redmine
         @url = url
         @condition = options[:if]
         @param = options[:param] || :id
-        @caption_key = options[:caption]
+        @caption = options[:caption]
         @html_options = options[:html] || {}
       end
       
-      def caption
-        # check if localized string exists on first render (after GLoc strings are loaded)
-        @caption ||= (@caption_key || (l_has_string?("label_#{@name}".to_sym) ? "label_#{@name}".to_sym : @name.to_s.humanize))
+      def caption(project=nil)
+        if @caption.is_a?(Proc)
+          @caption.call(project)
+        else
+          # check if localized string exists on first render (after GLoc strings are loaded)
+          @caption_key ||= (@caption || (l_has_string?("label_#{@name}".to_sym) ? "label_#{@name}".to_sym : @name.to_s.humanize))
+        end
       end
     end    
   end

From 7b8a4fc28bd22e8e463cc6c40be99766f0cc1410 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 13 Jul 2008 12:12:58 +0000
Subject: [PATCH 615/710] Menu mapper: add support for :before, :after and
 :last options to #push method and add #delete method.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1660 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 lib/redmine.rb                              |  2 +-
 lib/redmine/menu_manager.rb                 | 38 +++++++++++++++++----
 test/functional/projects_controller_test.rb | 29 ++++++++++++++++
 3 files changed, 61 insertions(+), 8 deletions(-)

diff --git a/lib/redmine.rb b/lib/redmine.rb
index 84eda9f72..6db32340f 100644
--- a/lib/redmine.rb
+++ b/lib/redmine.rb
@@ -130,5 +130,5 @@ Redmine::MenuManager.map :project_menu do |menu|
   menu.push :files, { :controller => 'projects', :action => 'list_files' }, :caption => :label_attachment_plural
   menu.push :repository, { :controller => 'repositories', :action => 'show' },
               :if => Proc.new { |p| p.repository && !p.repository.new_record? }
-  menu.push :settings, { :controller => 'projects', :action => 'settings' }
+  menu.push :settings, { :controller => 'projects', :action => 'settings' }, :last => true
 end
diff --git a/lib/redmine/menu_manager.rb b/lib/redmine/menu_manager.rb
index 01c14083e..11b7a72e8 100644
--- a/lib/redmine/menu_manager.rb
+++ b/lib/redmine/menu_manager.rb
@@ -92,11 +92,9 @@ module Redmine
     
     class << self
       def map(menu_name)
-        mapper = Mapper.new
-        yield mapper
         @items ||= {}
-        @items[menu_name.to_sym] ||= []
-        @items[menu_name.to_sym] += mapper.items
+        mapper = Mapper.new(menu_name.to_sym, @items)
+        yield mapper
       end
       
       def items(menu_name)
@@ -109,6 +107,14 @@ module Redmine
     end
     
     class Mapper
+      def initialize(menu, items)
+        items[menu] ||= []
+        @menu = menu
+        @menu_items = items[menu]
+      end
+      
+      @@last_items_count = Hash.new {|h,k| h[k] = 0}
+      
       # Adds an item at the end of the menu. Available options:
       # * param: the parameter name that is used for the project id (default is :id)
       # * if: a Proc that is called before rendering the item, the item is displayed only if it returns true
@@ -116,13 +122,31 @@ module Redmine
       #   * a localized string Symbol
       #   * a String
       #   * a Proc that can take the project as argument
+      # * before, after: specify where the menu item should be inserted (eg. :after => :activity)
+      # * last: menu item will stay at the end (eg. :last => true)
       # * html_options: a hash of html options that are passed to link_to
       def push(name, url, options={})
-        items << MenuItem.new(name, url, options)
+        options = options.dup
+        
+        # menu item position
+        if before = options.delete(:before)
+          position = @menu_items.index {|i| i.name == before}
+        elsif after = options.delete(:after)
+          position = @menu_items.index {|i| i.name == after}
+          position += 1 unless position.nil?
+        elsif options.delete(:last)
+          position = @menu_items.size
+          @@last_items_count[@menu] += 1
+        end
+        # default position
+        position ||= @menu_items.size - @@last_items_count[@menu]
+        
+        @menu_items.insert(position, MenuItem.new(name, url, options))
       end
       
-      def items
-        @items ||= []
+      # Removes a menu item
+      def delete(name)
+        @menu_items.delete_if {|i| i.name == name}
       end
     end
     
diff --git a/test/functional/projects_controller_test.rb b/test/functional/projects_controller_test.rb
index f5f1c6733..4f0a2f179 100644
--- a/test/functional/projects_controller_test.rb
+++ b/test/functional/projects_controller_test.rb
@@ -312,4 +312,33 @@ class ProjectsControllerTest < Test::Unit::TestCase
     assert_redirected_to 'admin/projects'
     assert Project.find(1).active?
   end
+  
+  def test_project_menu
+    assert_no_difference 'Redmine::MenuManager.items(:project_menu).size' do
+      Redmine::MenuManager.map :project_menu do |menu|
+        menu.push :foo, { :controller => 'projects', :action => 'show' }, :cation => 'Foo'
+        menu.push :bar, { :controller => 'projects', :action => 'show' }, :before => :activity
+        menu.push :hello, { :controller => 'projects', :action => 'show' }, :caption => Proc.new {|p| p.name.upcase }, :after => :bar
+      end
+      
+      get :show, :id => 1
+      assert_tag :div, :attributes => { :id => 'main-menu' },
+                       :descendant => { :tag => 'li', :child => { :tag => 'a', :content => 'Foo' } }
+  
+      assert_tag :div, :attributes => { :id => 'main-menu' },
+                       :descendant => { :tag => 'li', :child => { :tag => 'a', :content => 'Bar' },
+                                                      :before => { :tag => 'li', :child => { :tag => 'a', :content => 'ECOOKBOOK' } } }
+
+      assert_tag :div, :attributes => { :id => 'main-menu' },
+                       :descendant => { :tag => 'li', :child => { :tag => 'a', :content => 'ECOOKBOOK' },
+                                                      :before => { :tag => 'li', :child => { :tag => 'a', :content => 'Activity' } } }
+      
+      # Remove the menu items
+      Redmine::MenuManager.map :project_menu do |menu|
+        menu.delete :foo
+        menu.delete :bar
+        menu.delete :hello
+      end
+    end
+  end
 end

From ad497bdcbabbd1a3863846ff7a0cded369593f04 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 13 Jul 2008 12:25:01 +0000
Subject: [PATCH 616/710] Admin and Help links at the end of top menu.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1661 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 lib/redmine.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/redmine.rb b/lib/redmine.rb
index 6db32340f..22b60e949 100644
--- a/lib/redmine.rb
+++ b/lib/redmine.rb
@@ -98,8 +98,8 @@ Redmine::MenuManager.map :top_menu do |menu|
   menu.push :home, :home_path, :html => { :class => 'home' }
   menu.push :my_page, { :controller => 'my', :action => 'page' }, :html => { :class => 'mypage' }, :if => Proc.new { User.current.logged? }
   menu.push :projects, { :controller => 'projects', :action => 'index' }, :caption => :label_project_plural, :html => { :class => 'projects' }
-  menu.push :administration, { :controller => 'admin', :action => 'index' }, :html => { :class => 'admin' }, :if => Proc.new { User.current.admin? }
-  menu.push :help, Redmine::Info.help_url, :html => { :class => 'help' }
+  menu.push :administration, { :controller => 'admin', :action => 'index' }, :html => { :class => 'admin' }, :if => Proc.new { User.current.admin? }, :last => true
+  menu.push :help, Redmine::Info.help_url, :html => { :class => 'help' }, :last => true
 end
 
 Redmine::MenuManager.map :account_menu do |menu|

From 937cee726905330807f1a97807749f1fc474d45d Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 13 Jul 2008 13:25:37 +0000
Subject: [PATCH 617/710] Prevent blank menu caption.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1663 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 lib/redmine/menu_manager.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/redmine/menu_manager.rb b/lib/redmine/menu_manager.rb
index 11b7a72e8..a3dc3ca25 100644
--- a/lib/redmine/menu_manager.rb
+++ b/lib/redmine/menu_manager.rb
@@ -167,7 +167,9 @@ module Redmine
       
       def caption(project=nil)
         if @caption.is_a?(Proc)
-          @caption.call(project)
+          c = @caption.call(project).to_s
+          c = @name.to_s.humanize if c.blank?
+          c
         else
           # check if localized string exists on first render (after GLoc strings are loaded)
           @caption_key ||= (@caption || (l_has_string?("label_#{@name}".to_sym) ? "label_#{@name}".to_sym : @name.to_s.humanize))

From 9ba4075c88b6bf3c449ae890d6fd1a37c9d41f80 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 13 Jul 2008 21:01:38 +0000
Subject: [PATCH 618/710] Fixes search tests for Postgresql.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1664 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 test/unit/search_test.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/unit/search_test.rb b/test/unit/search_test.rb
index e2cc8e766..244b27a58 100644
--- a/test/unit/search_test.rb
+++ b/test/unit/search_test.rb
@@ -32,7 +32,7 @@ class SearchTest < Test::Unit::TestCase
 
   def setup
     @project = Project.find(1)
-    @issue_keyword = '%Unable to print recipes%'
+    @issue_keyword = '%unable to print recipes%'
     @issue = Issue.find(1)
     @changeset_keyword = '%very first commit%'
     @changeset = Changeset.find(100)

From 0eba42423af05a5507b8b1889b6904d5d5a5f79c Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 13 Jul 2008 21:44:38 +0000
Subject: [PATCH 619/710] Set order on wiki pages association.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1665 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/models/wiki.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/wiki.rb b/app/models/wiki.rb
index b6d6a9b50..3432a2bc7 100644
--- a/app/models/wiki.rb
+++ b/app/models/wiki.rb
@@ -17,7 +17,7 @@
 
 class Wiki < ActiveRecord::Base
   belongs_to :project
-  has_many :pages, :class_name => 'WikiPage', :dependent => :destroy
+  has_many :pages, :class_name => 'WikiPage', :dependent => :destroy, :order => 'title'
   has_many :redirects, :class_name => 'WikiRedirect', :dependent => :delete_all
   
   validates_presence_of :start_page

From fc07ba2a99fd7610f33de44e529ac7e518f48586 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 13 Jul 2008 21:55:13 +0000
Subject: [PATCH 620/710] Clear changesets and changes with raw sql when
 deleting a repository (#1627).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1666 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/models/repository.rb     | 11 ++++++++++-
 test/unit/repository_test.rb | 10 ++++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/app/models/repository.rb b/app/models/repository.rb
index 2a8728f92..9768e3e3c 100644
--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -17,9 +17,13 @@
 
 class Repository < ActiveRecord::Base
   belongs_to :project
-  has_many :changesets, :dependent => :destroy, :order => "#{Changeset.table_name}.committed_on DESC, #{Changeset.table_name}.id DESC"
+  has_many :changesets, :order => "#{Changeset.table_name}.committed_on DESC, #{Changeset.table_name}.id DESC"
   has_many :changes, :through => :changesets
   
+  # Raw SQL to delete changesets and changes in the database
+  # has_many :changesets, :dependent => :destroy is too slow for big repositories
+  before_destroy :clear_changesets
+  
   # Checks if the SCM is enabled when creating a repository
   validate_on_create { |r| r.errors.add(:type, :activerecord_error_invalid) unless Setting.enabled_scm.include?(r.class.name.demodulize) }
   
@@ -127,4 +131,9 @@ class Repository < ActiveRecord::Base
     root_url.strip!
     true
   end
+  
+  def clear_changesets
+    connection.delete("DELETE FROM changes WHERE changes.changeset_id IN (SELECT changesets.id FROM changesets WHERE changesets.repository_id = #{id})")
+    connection.delete("DELETE FROM changesets WHERE changesets.repository_id = #{id}")
+  end
 end
diff --git a/test/unit/repository_test.rb b/test/unit/repository_test.rb
index 03d836ef7..9ea9fdd45 100644
--- a/test/unit/repository_test.rb
+++ b/test/unit/repository_test.rb
@@ -45,6 +45,16 @@ class RepositoryTest < Test::Unit::TestCase
     assert_equal repository, project.repository
   end
   
+  def test_destroy
+    changesets = Changeset.count(:all, :conditions => "repository_id = 10")
+    changes = Change.count(:all, :conditions => "repository_id = 10", :include => :changeset)
+    assert_difference 'Changeset.count', -changesets do
+      assert_difference 'Change.count', -changes do
+        Repository.find(10).destroy
+      end
+    end
+  end
+  
   def test_should_not_create_with_disabled_scm
     # disable Subversion
     Setting.enabled_scm = ['Darcs', 'Git']

From 6d3c0dab015f22c0def1ad12be7c2d7bb1a56f18 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Mon, 14 Jul 2008 15:46:02 +0000
Subject: [PATCH 621/710] Javascript fix (#1636).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1667 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/issues/_list.rhtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/issues/_list.rhtml b/app/views/issues/_list.rhtml
index 000f79853..b42357894 100644
--- a/app/views/issues/_list.rhtml
+++ b/app/views/issues/_list.rhtml
@@ -1,7 +1,7 @@
 <% form_tag({}) do -%>	
 <table class="list issues">
     <thead><tr>
-        <th><%= link_to image_tag('toggle_check.png'), {}, :onclick => 'toggleIssuesSelection(this.up("form")); return false;',
+        <th><%= link_to image_tag('toggle_check.png'), {}, :onclick => 'toggleIssuesSelection(Element.up(this, "form")); return false;',
                                                            :title => "#{l(:button_check_all)}/#{l(:button_uncheck_all)}" %>
         </th>
 		<%= sort_header_tag("#{Issue.table_name}.id", :caption => '#', :default_order => 'desc') %>

From 025581bb284aa21a83cd9e64e28e3f284489bcfa Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Mon, 14 Jul 2008 17:29:06 +0000
Subject: [PATCH 622/710] Fixes boolean custom fields tags (broken by r1592)
 (#1640).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1668 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/helpers/custom_fields_helper.rb | 2 +-
 app/models/custom_value.rb          | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/helpers/custom_fields_helper.rb b/app/helpers/custom_fields_helper.rb
index 540c6b4a1..3c795dc1f 100644
--- a/app/helpers/custom_fields_helper.rb
+++ b/app/helpers/custom_fields_helper.rb
@@ -37,7 +37,7 @@ module CustomFieldsHelper
     when "text"
       text_area_tag(field_name, custom_value.value, :id => field_id, :rows => 3, :style => 'width:90%')
     when "bool"
-      check_box_tag(field_name, custom_value.value, :id => field_id)
+      check_box_tag(field_name, '1', custom_value.true?, :id => field_id) + hidden_field_tag(field_name, '0')
     when "list"
       blank_option = custom_field.is_required? ?
                        (custom_field.default_value.blank? ? "<option value=\"\">--- #{l(:actionview_instancetag_blank_option)} ---</option>" : '') : 
diff --git a/app/models/custom_value.rb b/app/models/custom_value.rb
index 98ce6b168..1d453baf0 100644
--- a/app/models/custom_value.rb
+++ b/app/models/custom_value.rb
@@ -25,6 +25,11 @@ class CustomValue < ActiveRecord::Base
     end
   end
   
+  # Returns true if the boolean custom value is true
+  def true?
+    self.value == '1'
+  end
+  
 protected
   def validate
     if value.blank?

From 7c6f191cf53c3b1b639f7a6dbd3d3cf3e6b1a2a5 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Wed, 16 Jul 2008 18:48:50 +0000
Subject: [PATCH 623/710] Fixed: Context menu overwritten by calendar on My
 Page (#1644).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1671 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 public/stylesheets/context_menu.css | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/public/stylesheets/context_menu.css b/public/stylesheets/context_menu.css
index e5a83be0d..a88b6c6c8 100644
--- a/public/stylesheets/context_menu.css
+++ b/public/stylesheets/context_menu.css
@@ -1,4 +1,4 @@
-#context-menu { position: absolute; z-index: 10;}
+#context-menu { position: absolute; z-index: 40;}
 
 #context-menu ul, #context-menu li, #context-menu a {
 	display:block;
@@ -20,7 +20,7 @@
 #context-menu li {
 	position:relative;
 	padding:1px;
-	z-index:9;
+	z-index:39;
 }
 #context-menu li.folder ul { position:absolute; left:168px; /* IE6 */ top:-2px; }
 #context-menu li.folder>ul { left:148px; }
@@ -42,7 +42,7 @@
 #context-menu li a.submenu { background:url("../images/sub.gif") right no-repeat; }
 #context-menu a:hover { border-color:gray; background-color:#eee; color:#2A5685; }
 #context-menu li.folder a:hover { background-color:#eee; }	
-#context-menu li.folder:hover { z-index:10; }		
+#context-menu li.folder:hover { z-index:40; }		
 #context-menu ul ul, #context-menu  li:hover ul ul { display:none; }
 #context-menu li:hover ul, #context-menu li:hover li:hover ul {	display:block; }
 

From 83385cbca8a26b43ecd865b261ec0621046aacc9 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Wed, 16 Jul 2008 19:10:29 +0000
Subject: [PATCH 624/710] Adds timelog link to the issue context menu (#1645).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1672 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/issues/context_menu.rhtml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/views/issues/context_menu.rhtml b/app/views/issues/context_menu.rhtml
index 69a5ec02a..af56782e8 100644
--- a/app/views/issues/context_menu.rhtml
+++ b/app/views/issues/context_menu.rhtml
@@ -53,6 +53,10 @@
 		<% end -%>
 		</ul>
 	</li>
+	<% if @can[:log_time] -%>
+	<li><%= context_menu_link l(:button_log_time), {:controller => 'timelog', :action => 'edit', :issue_id => @issue},
+	        :class => 'icon-time' %></li>
+	<% end %>
 	<li><%= context_menu_link l(:button_copy), {:controller => 'issues', :action => 'new', :project_id => @project, :copy_from => @issue},
 	        :class => 'icon-copy', :disabled => !@can[:copy] %></li>
 <% else -%>

From aef25a5e329f0fa5a36ecc0253e0eb39e3b2e2ee Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Wed, 16 Jul 2008 19:22:09 +0000
Subject: [PATCH 625/710] Fixes r1672.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1673 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/issues_controller.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index 1e57f1f87..c0f31814b 100644
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -333,6 +333,7 @@ class IssuesController < ApplicationController
     @project = projects.first if projects.size == 1
 
     @can = {:edit => (@project && User.current.allowed_to?(:edit_issues, @project)),
+            :log_time => (@project && User.current.allowed_to?(:log_time, @project)),
             :update => (@issue && (User.current.allowed_to?(:edit_issues, @project) || (User.current.allowed_to?(:change_status, @project) && !@allowed_statuses.empty?))),
             :move => (@project && User.current.allowed_to?(:move_issues, @project)),
             :copy => (@issue && @project.trackers.include?(@issue.tracker) && User.current.allowed_to?(:add_issues, @project)),

From 795220a1e6c9ccc702a79ed8696fe4722448a3c1 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Wed, 16 Jul 2008 19:33:15 +0000
Subject: [PATCH 626/710] Adds links to the user page on various views.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1674 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/helpers/application_helper.rb | 3 ++-
 app/models/user.rb                | 4 ++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index ad4c46440..ea7635483 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -92,7 +92,8 @@ module ApplicationHelper
   
   def authoring(created, author)
     time_tag = content_tag('acronym', distance_of_time_in_words(Time.now, created), :title => format_time(created))
-    l(:label_added_time_by, author || 'Anonymous', time_tag)
+    author_tag = (author.is_a?(User) && !author.anonymous?) ? link_to(h(author), :controller => 'account', :action => 'show', :id => author) : h(author || 'Anonymous')
+    l(:label_added_time_by, author_tag, time_tag)
   end
   
   def l_or_humanize(s)
diff --git a/app/models/user.rb b/app/models/user.rb
index a34b96861..55fe3ac0d 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -201,6 +201,10 @@ class User < ActiveRecord::Base
     true
   end
   
+  def anonymous?
+    !logged?
+  end
+  
   # Return user's role for project
   def role_for_project(project)
     # No role on archived projects

From 1701e0bd79aa4ed81b51a9bf63f07e0464460078 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Thu, 17 Jul 2008 16:27:29 +0000
Subject: [PATCH 627/710] Fixed: default configuration can not be loaded for
 :it, :pt and :ro languages (#1660).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1675 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 lang/it.yml                    | 10 ++++----
 lang/pt.yml                    |  2 +-
 lang/ro.yml                    |  2 +-
 test/unit/default_data_test.rb | 45 ++++++++++++++++++++++++++++++++++
 4 files changed, 52 insertions(+), 7 deletions(-)
 create mode 100644 test/unit/default_data_test.rb

diff --git a/lang/it.yml b/lang/it.yml
index fcc028c97..471ef49ed 100644
--- a/lang/it.yml
+++ b/lang/it.yml
@@ -496,12 +496,12 @@ default_role_reporter: Reporter
 default_tracker_bug: Segnalazione
 default_tracker_feature: Funzione
 default_tracker_support: Supporto
-default_issue_status_new: Nuovo/a
-default_issue_status_assigned: Assegnato/a
-default_issue_status_resolved: Risolto/a
+default_issue_status_new: Nuovo
+default_issue_status_assigned: Assegnato
+default_issue_status_resolved: Risolto
 default_issue_status_feedback: Feedback
-default_issue_status_closed: Chiuso/a
-default_issue_status_rejected: Rifiutato/a
+default_issue_status_closed: Chiuso
+default_issue_status_rejected: Rifiutato
 default_doc_category_user: Documentazione utente
 default_doc_category_tech: Documentazione tecnica
 default_priority_low: Bassa
diff --git a/lang/pt.yml b/lang/pt.yml
index a5b703fcf..ece12cd97 100644
--- a/lang/pt.yml
+++ b/lang/pt.yml
@@ -490,7 +490,7 @@ text_issue_category_destroy_question: Some issues (%d) are assigned to this cate
 text_issue_category_destroy_assignments: Remove category assignments
 text_issue_category_reassign_to: Reassing issues to this category
 
-default_role_manager: Analista de Negócio ou Gerente de Projeto
+default_role_manager: Gerente de Projeto
 default_role_developper: Desenvolvedor
 default_role_reporter: Analista de Suporte
 default_tracker_bug: Bug
diff --git a/lang/ro.yml b/lang/ro.yml
index 3fa154d48..50bbf29af 100644
--- a/lang/ro.yml
+++ b/lang/ro.yml
@@ -498,7 +498,7 @@ default_issue_status_new: Nou
 default_issue_status_assigned: Atribuit
 default_issue_status_resolved: Rezolvat
 default_issue_status_feedback: Feedback
-default_issue_status_closed: Rezolvat
+default_issue_status_closed: Closed
 default_issue_status_rejected: Respins
 default_doc_category_user: Documentatie
 default_doc_category_tech: Documentatie tehnica
diff --git a/test/unit/default_data_test.rb b/test/unit/default_data_test.rb
new file mode 100644
index 000000000..39616135e
--- /dev/null
+++ b/test/unit/default_data_test.rb
@@ -0,0 +1,45 @@
+# redMine - project management software
+# Copyright (C) 2006-2008  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 File.dirname(__FILE__) + '/../test_helper'
+
+class DefaultDataTest < Test::Unit::TestCase
+  fixtures :roles
+  
+  def test_no_data
+    assert !Redmine::DefaultData::Loader::no_data?
+    Role.delete_all("builtin = 0")
+    Tracker.delete_all
+    IssueStatus.delete_all
+    Enumeration.delete_all
+    assert Redmine::DefaultData::Loader::no_data?
+  end
+  
+  def test_load
+    GLoc.valid_languages.each do |lang|
+      begin
+        Role.delete_all("builtin = 0")
+        Tracker.delete_all
+        IssueStatus.delete_all
+        Enumeration.delete_all
+        assert Redmine::DefaultData::Loader::load(lang)
+      rescue ActiveRecord::RecordInvalid => e
+        assert false, ":#{lang} default data is invalid (#{e.message})."
+      end
+    end
+  end
+end

From 324495643ba05d24f6edc016f85fd4c8c6dbbf19 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sat, 19 Jul 2008 07:19:55 +0000
Subject: [PATCH 628/710] Small fix to gloc error messages translation.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1676 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 vendor/plugins/gloc-1.1.0/lib/gloc-rails.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vendor/plugins/gloc-1.1.0/lib/gloc-rails.rb b/vendor/plugins/gloc-1.1.0/lib/gloc-rails.rb
index aa65991b0..f05c4cddb 100644
--- a/vendor/plugins/gloc-1.1.0/lib/gloc-rails.rb
+++ b/vendor/plugins/gloc-1.1.0/lib/gloc-rails.rb
@@ -168,7 +168,7 @@ module ActiveRecord #:nodoc:
           if attr == "base"
             full_messages << (msg.is_a?(Symbol) ? l(msg) : msg)
           else
-            full_messages << @base.class.human_attribute_name(attr) + " " + (msg.is_a?(Symbol) ? l(msg) : msg)
+            full_messages << @base.class.human_attribute_name(attr) + " " + (msg.is_a?(Symbol) ? l(msg) : msg.to_s)
           end
         end
       end

From 93201e7386eb8bb2c69f110d934f04feb81ffe93 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sat, 19 Jul 2008 07:29:05 +0000
Subject: [PATCH 629/710] Fixed: Wiki Linking Fails on News Item Preview
 (#1661).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1677 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/news_controller.rb | 2 +-
 app/views/news/edit.rhtml          | 2 +-
 app/views/news/index.rhtml         | 2 +-
 app/views/news/new.rhtml           | 2 +-
 app/views/news/show.rhtml          | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/controllers/news_controller.rb b/app/controllers/news_controller.rb
index c9ba6b991..8c1a03a5b 100644
--- a/app/controllers/news_controller.rb
+++ b/app/controllers/news_controller.rb
@@ -18,7 +18,7 @@
 class NewsController < ApplicationController
   layout 'base'
   before_filter :find_news, :except => [:new, :index, :preview]
-  before_filter :find_project, :only => :new
+  before_filter :find_project, :only => [:new, :preview]
   before_filter :authorize, :except => [:index, :preview]
   before_filter :find_optional_project, :only => :index
   accept_key_auth :index
diff --git a/app/views/news/edit.rhtml b/app/views/news/edit.rhtml
index a7e5e6e36..4be566e0b 100644
--- a/app/views/news/edit.rhtml
+++ b/app/views/news/edit.rhtml
@@ -5,7 +5,7 @@
 <%= render :partial => 'form', :locals => { :f => f } %>
 <%= submit_tag l(:button_save) %>
 <%= link_to_remote l(:label_preview), 
-                   { :url => { :controller => 'news', :action => 'preview' },
+                   { :url => { :controller => 'news', :action => 'preview', :project_id => @project },
                      :method => 'post',
                      :update => 'preview',
                      :with => "Form.serialize('news-form')"
diff --git a/app/views/news/index.rhtml b/app/views/news/index.rhtml
index 87db8a5f7..9cac39002 100644
--- a/app/views/news/index.rhtml
+++ b/app/views/news/index.rhtml
@@ -12,7 +12,7 @@
 <%= render :partial => 'news/form', :locals => { :f => f } %>
 <%= submit_tag l(:button_create) %>
 <%= link_to_remote l(:label_preview), 
-                   { :url => { :controller => 'news', :action => 'preview' },
+                   { :url => { :controller => 'news', :action => 'preview', :project_id => @project },
                      :method => 'post',
                      :update => 'preview',
                      :with => "Form.serialize('news-form')"
diff --git a/app/views/news/new.rhtml b/app/views/news/new.rhtml
index 9208d8840..a4d29a0a9 100644
--- a/app/views/news/new.rhtml
+++ b/app/views/news/new.rhtml
@@ -5,7 +5,7 @@
 <%= render :partial => 'news/form', :locals => { :f => f } %>
 <%= submit_tag l(:button_create) %>
 <%= link_to_remote l(:label_preview), 
-                   { :url => { :controller => 'news', :action => 'preview' },
+                   { :url => { :controller => 'news', :action => 'preview', :project_id => @project },
                      :method => 'post',
                      :update => 'preview',
                      :with => "Form.serialize('news-form')"
diff --git a/app/views/news/show.rhtml b/app/views/news/show.rhtml
index cc9fe1fbb..78be9c247 100644
--- a/app/views/news/show.rhtml
+++ b/app/views/news/show.rhtml
@@ -15,7 +15,7 @@
 <%= render :partial => 'form', :locals => { :f => f } %>
 <%= submit_tag l(:button_save) %>
 <%= link_to_remote l(:label_preview), 
-                   { :url => { :controller => 'news', :action => 'preview' },
+                   { :url => { :controller => 'news', :action => 'preview', :project_id => @project },
                      :method => 'post',
                      :update => 'preview',
                      :with => "Form.serialize('news-form')"

From eb1d969237a9ed1bb41c6e10d5a9eb073f297e95 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sat, 19 Jul 2008 10:47:19 +0000
Subject: [PATCH 630/710] Improved on-the-fly account creation. If some
 attributes are missing (eg. not present in the LDAP) or are invalid, the
 registration form is displayed so that the user is able to fill or fix these
 attributes.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1678 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/account_controller.rb | 68 +++++++++++++++++----------
 app/models/auth_source.rb             |  5 +-
 app/models/auth_source_ldap.rb        |  5 +-
 app/models/user.rb                    | 15 +++---
 app/views/account/register.rhtml      |  4 +-
 app/views/auth_sources/_form.rhtml    |  8 +---
 test/integration/account_test.rb      | 48 +++++++++++++++++++
 7 files changed, 107 insertions(+), 46 deletions(-)

diff --git a/app/controllers/account_controller.rb b/app/controllers/account_controller.rb
index a9b8a1b82..1fe990007 100644
--- a/app/controllers/account_controller.rb
+++ b/app/controllers/account_controller.rb
@@ -44,7 +44,16 @@ class AccountController < ApplicationController
     else
       # Authenticate user
       user = User.try_to_login(params[:username], params[:password])
-      if user
+      if user.nil?
+        # Invalid credentials
+        flash.now[:error] = l(:notice_account_invalid_creditentials)
+      elsif user.new_record?
+        # Onthefly creation failed, display the registration form to fill/fix attributes
+        @user = user
+        session[:auth_source_registration] = {:login => user.login, :auth_source_id => user.auth_source_id }
+        render :action => 'register'
+      else
+        # Valid user
         self.logged_user = user
         # generate a key and set cookie if autologin
         if params[:autologin] && Setting.autologin?
@@ -52,12 +61,8 @@ class AccountController < ApplicationController
           cookies[:autologin] = { :value => token.value, :expires => 1.year.from_now }
         end
         redirect_back_or_default :controller => 'my', :action => 'page'
-      else
-        flash.now[:error] = l(:notice_account_invalid_creditentials)
       end
     end
-  rescue User::OnTheFlyCreationFailure
-    flash.now[:error] = 'Redmine could not retrieve the required information from the LDAP to create your account. Please, contact your Redmine administrator.'
   end
 
   # Log out current user and redirect to welcome page
@@ -107,39 +112,52 @@ class AccountController < ApplicationController
   
   # User self-registration
   def register
-    redirect_to(home_url) && return unless Setting.self_registration?
+    redirect_to(home_url) && return unless Setting.self_registration? || session[:auth_source_registration]
     if request.get?
+      session[:auth_source_registration] = nil
       @user = User.new(:language => Setting.default_language)
     else
       @user = User.new(params[:user])
       @user.admin = false
-      @user.login = params[:user][:login]
       @user.status = User::STATUS_REGISTERED
-      @user.password, @user.password_confirmation = params[:password], params[:password_confirmation]
-      case Setting.self_registration
-      when '1'
-        # Email activation
-        token = Token.new(:user => @user, :action => "register")
-        if @user.save and token.save
-          Mailer.deliver_register(token)
-          flash[:notice] = l(:notice_account_register_done)
-          redirect_to :action => 'login'
-        end
-      when '3'
-        # Automatic activation
+      if session[:auth_source_registration]
         @user.status = User::STATUS_ACTIVE
+        @user.login = session[:auth_source_registration][:login]
+        @user.auth_source_id = session[:auth_source_registration][:auth_source_id]
         if @user.save
+          session[:auth_source_registration] = nil
           self.logged_user = @user
           flash[:notice] = l(:notice_account_activated)
           redirect_to :controller => 'my', :action => 'account'
         end
       else
-        # Manual activation by the administrator
-        if @user.save
-          # Sends an email to the administrators
-          Mailer.deliver_account_activation_request(@user)
-          flash[:notice] = l(:notice_account_pending)
-          redirect_to :action => 'login'
+        @user.login = params[:user][:login]
+        @user.password, @user.password_confirmation = params[:password], params[:password_confirmation]
+        case Setting.self_registration
+        when '1'
+          # Email activation
+          token = Token.new(:user => @user, :action => "register")
+          if @user.save and token.save
+            Mailer.deliver_register(token)
+            flash[:notice] = l(:notice_account_register_done)
+            redirect_to :action => 'login'
+          end
+        when '3'
+          # Automatic activation
+          @user.status = User::STATUS_ACTIVE
+          if @user.save
+            self.logged_user = @user
+            flash[:notice] = l(:notice_account_activated)
+            redirect_to :controller => 'my', :action => 'account'
+          end
+        else
+          # Manual activation by the administrator
+          if @user.save
+            # Sends an email to the administrators
+            Mailer.deliver_account_activation_request(@user)
+            flash[:notice] = l(:notice_account_pending)
+            redirect_to :action => 'login'
+          end
         end
       end
     end
diff --git a/app/models/auth_source.rb b/app/models/auth_source.rb
index 47c121a13..a0a2cdc5f 100644
--- a/app/models/auth_source.rb
+++ b/app/models/auth_source.rb
@@ -20,10 +20,7 @@ class AuthSource < ActiveRecord::Base
   
   validates_presence_of :name
   validates_uniqueness_of :name
-  validates_length_of :name, :host, :maximum => 60
-  validates_length_of :account_password, :maximum => 60, :allow_nil => true
-  validates_length_of :account, :base_dn, :maximum => 255
-  validates_length_of :attr_login, :attr_firstname, :attr_lastname, :attr_mail, :maximum => 30
+  validates_length_of :name, :maximum => 60
 
   def authenticate(login, password)
   end
diff --git a/app/models/auth_source_ldap.rb b/app/models/auth_source_ldap.rb
index a438bd3c7..655ffd6d5 100644
--- a/app/models/auth_source_ldap.rb
+++ b/app/models/auth_source_ldap.rb
@@ -20,7 +20,10 @@ require 'iconv'
 
 class AuthSourceLdap < AuthSource 
   validates_presence_of :host, :port, :attr_login
-  validates_presence_of :attr_firstname, :attr_lastname, :attr_mail, :if => Proc.new { |a| a.onthefly_register? }
+  validates_length_of :name, :host, :account_password, :maximum => 60, :allow_nil => true
+  validates_length_of :account, :base_dn, :maximum => 255, :allow_nil => true
+  validates_length_of :attr_login, :attr_firstname, :attr_lastname, :attr_mail, :maximum => 30, :allow_nil => true
+  validates_numericality_of :port, :only_integer => true
   
   def after_initialize
     self.port = 389 if self.port == 0
diff --git a/app/models/user.rb b/app/models/user.rb
index 55fe3ac0d..5a839721c 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -103,19 +103,16 @@ class User < ActiveRecord::Base
       # user is not yet registered, try to authenticate with available sources
       attrs = AuthSource.authenticate(login, password)
       if attrs
-        onthefly = new(*attrs)
-        onthefly.login = login
-        onthefly.language = Setting.default_language
-        if onthefly.save
-          user = find(:first, :conditions => ["login=?", login])
+        user = new(*attrs)
+        user.login = login
+        user.language = Setting.default_language
+        if user.save
+          user.reload
           logger.info("User '#{user.login}' created from the LDAP") if logger
-        else
-          logger.error("User '#{onthefly.login}' found in LDAP but could not be created (#{onthefly.errors.full_messages.join(', ')})") if logger
-          raise OnTheFlyCreationFailure.new
         end
       end
     end    
-    user.update_attribute(:last_login_on, Time.now) if user
+    user.update_attribute(:last_login_on, Time.now) if user && !user.new_record?
     user
   rescue => text
     raise text
diff --git a/app/views/account/register.rhtml b/app/views/account/register.rhtml
index 4e2b5adf2..755a7ad4b 100644
--- a/app/views/account/register.rhtml
+++ b/app/views/account/register.rhtml
@@ -5,8 +5,9 @@
 
 <div class="box">
 <!--[form:user]-->
+<% if @user.auth_source_id.nil? %>
 <p><label for="user_login"><%=l(:field_login)%> <span class="required">*</span></label>
-<%= text_field 'user', 'login', :size => 25  %></p>
+<%= text_field 'user', 'login', :size => 25 %></p>
 
 <p><label for="password"><%=l(:field_password)%> <span class="required">*</span></label>
 <%= password_field_tag 'password', nil, :size => 25  %><br />
@@ -14,6 +15,7 @@
 
 <p><label for="password_confirmation"><%=l(:field_password_confirmation)%> <span class="required">*</span></label>
 <%= password_field_tag 'password_confirmation', nil, :size => 25  %></p>
+<% end %>
 
 <p><label for="user_firstname"><%=l(:field_firstname)%> <span class="required">*</span></label>
 <%= text_field 'user', 'firstname'  %></p>
diff --git a/app/views/auth_sources/_form.rhtml b/app/views/auth_sources/_form.rhtml
index 3d148c11f..9ffffafc7 100644
--- a/app/views/auth_sources/_form.rhtml
+++ b/app/views/auth_sources/_form.rhtml
@@ -22,14 +22,12 @@
 
 <p><label for="auth_source_base_dn"><%=l(:field_base_dn)%> <span class="required">*</span></label>
 <%= text_field 'auth_source', 'base_dn', :size => 60 %></p>
-</div>
 
-<div class="box">
 <p><label for="auth_source_onthefly_register"><%=l(:field_onthefly)%></label>
 <%= check_box 'auth_source', 'onthefly_register' %></p>
+</div>
 
-<p>
-<fieldset><legend><%=l(:label_attribute_plural)%></legend>
+<fieldset class="box"><legend><%=l(:label_attribute_plural)%></legend>
 <p><label for="auth_source_attr_login"><%=l(:field_login)%> <span class="required">*</span></label>
 <%= text_field 'auth_source', 'attr_login', :size => 20  %></p>
 
@@ -42,7 +40,5 @@
 <p><label for="auth_source_attr_mail"><%=l(:field_mail)%></label>
 <%= text_field 'auth_source', 'attr_mail', :size => 20  %></p>
 </fieldset>
-</p>
-</div>
 <!--[eoform:auth_source]-->
 
diff --git a/test/integration/account_test.rb b/test/integration/account_test.rb
index a01a3ba09..c349200d3 100644
--- a/test/integration/account_test.rb
+++ b/test/integration/account_test.rb
@@ -17,6 +17,12 @@
 
 require "#{File.dirname(__FILE__)}/../test_helper"
 
+begin
+  require 'mocha'
+rescue
+  # Won't run some tests
+end
+
 class AccountTest < ActionController::IntegrationTest
   fixtures :users
 
@@ -102,4 +108,46 @@ class AccountTest < ActionController::IntegrationTest
     assert_redirected_to 'account/login'
     log_user('newuser', 'newpass')
   end
+  
+  if Object.const_defined?(:Mocha)
+  
+  def test_onthefly_registration
+    # disable registration
+    Setting.self_registration = '0'
+    AuthSource.expects(:authenticate).returns([:login => 'foo', :firstname => 'Foo', :lastname => 'Smith', :mail => 'foo@bar.com', :auth_source_id => 66])
+  
+    post 'account/login', :username => 'foo', :password => 'bar'
+    assert_redirected_to 'my/page'
+    
+    user = User.find_by_login('foo')
+    assert user.is_a?(User)
+    assert_equal 66, user.auth_source_id
+    assert user.hashed_password.blank?
+  end
+  
+  def test_onthefly_registration_with_invalid_attributes
+    # disable registration
+    Setting.self_registration = '0'
+    AuthSource.expects(:authenticate).returns([:login => 'foo', :lastname => 'Smith', :auth_source_id => 66])
+    
+    post 'account/login', :username => 'foo', :password => 'bar'
+    assert_response :success
+    assert_template 'account/register'
+    assert_tag :input, :attributes => { :name => 'user[firstname]', :value => '' }
+    assert_tag :input, :attributes => { :name => 'user[lastname]', :value => 'Smith' }
+    assert_no_tag :input, :attributes => { :name => 'user[login]' }
+    assert_no_tag :input, :attributes => { :name => 'user[password]' }
+    
+    post 'account/register', :user => {:firstname => 'Foo', :lastname => 'Smith', :mail => 'foo@bar.com'}
+    assert_redirected_to 'my/account'
+    
+    user = User.find_by_login('foo')
+    assert user.is_a?(User)
+    assert_equal 66, user.auth_source_id
+    assert user.hashed_password.blank?
+  end
+  
+  else
+    puts 'Mocha is missing. Skipping tests.'
+  end
 end

From 1ddd9bb55bc359fb034a1a03662ab331a0ac43dd Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 20 Jul 2008 09:25:30 +0000
Subject: [PATCH 631/710] Fixed: dependency on ruby 1.8.7 introduced in r1660
 (#1643).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1679 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 lib/redmine/menu_manager.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/redmine/menu_manager.rb b/lib/redmine/menu_manager.rb
index a3dc3ca25..f6431928e 100644
--- a/lib/redmine/menu_manager.rb
+++ b/lib/redmine/menu_manager.rb
@@ -130,9 +130,9 @@ module Redmine
         
         # menu item position
         if before = options.delete(:before)
-          position = @menu_items.index {|i| i.name == before}
+          position = @menu_items.collect(&:name).index(before)
         elsif after = options.delete(:after)
-          position = @menu_items.index {|i| i.name == after}
+          position = @menu_items.collect(&:name).index(after)
           position += 1 unless position.nil?
         elsif options.delete(:last)
           position = @menu_items.size

From 83baccb71ac0e609ce72ebf322f73884548a9ba5 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 20 Jul 2008 09:50:33 +0000
Subject: [PATCH 632/710] Strikethru closed issue links (#1127).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1680 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/helpers/application_helper.rb  | 3 +++
 app/views/projects/roadmap.rhtml   | 2 +-
 app/views/versions/show.rhtml      | 2 +-
 public/stylesheets/application.css | 2 +-
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index ea7635483..6c69d8e6f 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -41,6 +41,9 @@ module ApplicationHelper
   end
   
   def link_to_issue(issue, options={})
+    options[:class] ||= ''
+    options[:class] << ' issue'
+    options[:class] << ' closed' if issue.closed?
     link_to "#{issue.tracker.name} ##{issue.id}", {:controller => "issues", :action => "show", :id => issue}, options
   end
   
diff --git a/app/views/projects/roadmap.rhtml b/app/views/projects/roadmap.rhtml
index a51b22fa9..0778d8138 100644
--- a/app/views/projects/roadmap.rhtml
+++ b/app/views/projects/roadmap.rhtml
@@ -20,7 +20,7 @@
     <fieldset class="related-issues"><legend><%= l(:label_related_issues) %></legend>
     <ul>
     <%- issues.each do |issue| -%>
-        <li class="issue <%= 'closed' if issue.closed? %>"><%= link_to_issue(issue) %>: <%=h issue.subject %></li>
+        <li><%= link_to_issue(issue) %>: <%=h issue.subject %></li>
     <%- end -%>
     </ul>
     </fieldset>
diff --git a/app/views/versions/show.rhtml b/app/views/versions/show.rhtml
index 7f81cf503..7f9518af8 100644
--- a/app/views/versions/show.rhtml
+++ b/app/views/versions/show.rhtml
@@ -38,7 +38,7 @@
 <fieldset class="related-issues"><legend><%= l(:label_related_issues) %></legend>
 <ul>
 <% issues.each do |issue| -%>
-    <li class="issue <%= 'closed' if issue.closed? %>"><%= link_to_issue(issue) %>: <%=h issue.subject %></li>
+    <li><%= link_to_issue(issue) %>: <%=h issue.subject %></li>
 <% end -%>
 </ul>
 </fieldset>
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 8f092eaee..f6c86b294 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -75,7 +75,7 @@ a, a:link, a:visited{ color: #2A5685; text-decoration: none; }
 a:hover, a:active{ color: #c61a1a; text-decoration: underline;}
 a img{ border: 0; }
 
-a.issue.closed, .issue.closed a { text-decoration: line-through; }
+a.issue.closed { text-decoration: line-through; }
 
 /***** Tables *****/
 table.list { border: 1px solid #e4e4e4;  border-collapse: collapse; width: 100%; margin-bottom: 4px; }

From be2b8a62f4d0d8bf413a5583fe644bd41a8ebf04 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 20 Jul 2008 17:26:07 +0000
Subject: [PATCH 633/710] Search engine: display total results count (#906) and
 count by result type.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1681 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/search_controller.rb          |  7 ++-
 app/helpers/search_helper.rb                  | 16 ++++++
 app/models/issue.rb                           |  5 +-
 app/models/journal.rb                         |  6 ---
 app/views/search/index.rhtml                  | 10 ++--
 public/stylesheets/application.css            |  6 ++-
 test/functional/search_controller_test.rb     |  8 +++
 test/unit/search_test.rb                      | 49 +++++++++++--------
 .../lib/acts_as_searchable.rb                 | 40 +++++++++------
 9 files changed, 101 insertions(+), 46 deletions(-)

diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb
index d4ef01bf8..50e42f088 100644
--- a/app/controllers/search_controller.rb
+++ b/app/controllers/search_controller.rb
@@ -72,15 +72,20 @@ class SearchController < ApplicationController
       @tokens.slice! 5..-1 if @tokens.size > 5
       # strings used in sql like statement
       like_tokens = @tokens.collect {|w| "%#{w.downcase}%"}      
+      
       @results = []
+      @results_by_type = Hash.new {|h,k| h[k] = 0}
+      
       limit = 10
       @scope.each do |s|
-        @results += s.singularize.camelcase.constantize.search(like_tokens, projects_to_search,
+        r, c = s.singularize.camelcase.constantize.search(like_tokens, projects_to_search,
           :all_words => @all_words,
           :titles_only => @titles_only,
           :limit => (limit+1),
           :offset => offset,
           :before => params[:previous].nil?)
+        @results += r
+        @results_by_type[s] += c
       end
       @results = @results.sort {|a,b| b.event_datetime <=> a.event_datetime}
       if params[:previous].nil?
diff --git a/app/helpers/search_helper.rb b/app/helpers/search_helper.rb
index d6a2fb949..92f2da8a5 100644
--- a/app/helpers/search_helper.rb
+++ b/app/helpers/search_helper.rb
@@ -36,6 +36,10 @@ module SearchHelper
     result
   end
   
+  def type_label(t)
+    l("label_#{t.singularize}_plural")
+  end
+  
   def project_select_tag
     options = [[l(:label_project_all), 'all']]
     options << [l(:label_my_projects), 'my_projects'] unless User.current.memberships.empty?
@@ -43,4 +47,16 @@ module SearchHelper
     options << [@project.name, ''] unless @project.nil?
     select_tag('scope', options_for_select(options, params[:scope].to_s)) if options.size > 1
   end
+  
+  def render_results_by_type(results_by_type)
+    links = []
+    # Sorts types by results count
+    results_by_type.keys.sort {|a, b| results_by_type[b] <=> results_by_type[a]}.each do |t|
+      c = results_by_type[t]
+      next if c == 0
+      text = "#{type_label(t)} (#{c})"
+      links << link_to(text, :q => params[:q], :titles_only => params[:title_only], :all_words => params[:all_words], :scope => params[:scope], t => 1)
+    end
+    ('<ul>' + links.map {|link| content_tag('li', link)}.join(' ') + '</ul>') unless links.empty?
+  end
 end
diff --git a/app/models/issue.rb b/app/models/issue.rb
index b19e64883..cae603dd8 100644
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -35,7 +35,10 @@ class Issue < ActiveRecord::Base
   
   acts_as_customizable
   acts_as_watchable
-  acts_as_searchable :columns => ['subject', "#{table_name}.description"], :include => :project, :with => {:journal => :issue}
+  acts_as_searchable :columns => ['subject', "#{table_name}.description", "#{Journal.table_name}.notes"],
+                     :include => [:project, :journals],
+                     # sort by id so that limited eager loading doesn't break with postgresql
+                     :order_column => "#{table_name}.id"
   acts_as_event :title => Proc.new {|o| "#{o.tracker.name} ##{o.id}: #{o.subject}"},
                 :url => Proc.new {|o| {:controller => 'issues', :action => 'show', :id => o.id}}                
   
diff --git a/app/models/journal.rb b/app/models/journal.rb
index 8583f63de..a427f84e3 100644
--- a/app/models/journal.rb
+++ b/app/models/journal.rb
@@ -25,12 +25,6 @@ class Journal < ActiveRecord::Base
   has_many :details, :class_name => "JournalDetail", :dependent => :delete_all
   attr_accessor :indice
   
-  acts_as_searchable :columns => 'notes',
-                     :include => {:issue => :project},
-                     :project_key => "#{Issue.table_name}.project_id",
-                     :date_column => "#{Issue.table_name}.created_on",
-                     :permission => :view_issues
-  
   acts_as_event :title => Proc.new {|o| status = ((s = o.new_status) ? " (#{s})" : nil); "#{o.issue.tracker} ##{o.issue.id}#{status}: #{o.issue.subject}" },
                 :description => :notes,
                 :author => :user,
diff --git a/app/views/search/index.rhtml b/app/views/search/index.rhtml
index b5cea4645..cb5b70a4c 100644
--- a/app/views/search/index.rhtml
+++ b/app/views/search/index.rhtml
@@ -10,7 +10,7 @@
 </p>
 <p>
 <% @object_types.each do |t| %>
-<label><%= check_box_tag t, 1, @scope.include?(t) %> <%= l("label_#{t.singularize}_plural")%></label>
+<label><%= check_box_tag t, 1, @scope.include?(t) %> <%= type_label(t) %></label>
 <% end %>
 </p>
 
@@ -19,12 +19,16 @@
 </div>
 
 <% if @results %>
-    <h3><%= l(:label_result_plural) %></h3>
+    <div id="search-results-counts">
+    <%= render_results_by_type(@results_by_type) unless @scope.size == 1 %>
+    </div>
+    
+    <h3><%= l(:label_result_plural) %> (<%= @results_by_type.values.sum %>)</h3>
     <dl id="search-results">
       <% @results.each do |e| %>
         <dt class="<%= e.event_type %>"><%= content_tag('span', h(e.project), :class => 'project') unless @project == e.project %> <%= link_to highlight_tokens(truncate(e.event_title, 255), @tokens), e.event_url %></dt>
         <dd><span class="description"><%= highlight_tokens(e.event_description, @tokens) %></span>
-        <span class="author"><%= format_time(e.event_datetime) %></span><dd>
+        <span class="author"><%= format_time(e.event_datetime) %></span></dd>
       <% end %>
     </dl>
 <% end %>
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index f6c86b294..018c71732 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -185,9 +185,13 @@ div#activity dt.me .time { border-bottom: 1px solid #999; }
 div#activity dt .time { color: #777; font-size: 80%; }
 div#activity dd .description, #search-results dd .description { font-style: italic; }
 div#activity span.project:after, #search-results span.project:after { content: " -"; }
-#search-results dd { margin-bottom: 1em; padding-left: 20px; margin-left:0px;}
 div#activity dd span.description, #search-results dd span.description { display:block; }
 
+#search-results dd { margin-bottom: 1em; padding-left: 20px; margin-left:0px; }
+div#search-results-counts {float:right;}
+div#search-results-counts ul { margin-top: 0.5em; }
+div#search-results-counts  li { list-style-type:none; float: left; margin-left: 1em; }
+  
 dt.issue { background-image: url(../images/ticket.png); }
 dt.issue-edit { background-image: url(../images/ticket_edit.png); }
 dt.issue-closed { background-image: url(../images/ticket_checked.png); }
diff --git a/test/functional/search_controller_test.rb b/test/functional/search_controller_test.rb
index 1c505620b..ce06ec298 100644
--- a/test/functional/search_controller_test.rb
+++ b/test/functional/search_controller_test.rb
@@ -32,9 +32,17 @@ class SearchControllerTest < Test::Unit::TestCase
     get :index, :q => 'recipe subproject commit', :submit => 'Search'
     assert_response :success
     assert_template 'index'
+    
     assert assigns(:results).include?(Issue.find(2))
     assert assigns(:results).include?(Issue.find(5))
     assert assigns(:results).include?(Changeset.find(101))
+    assert_tag :dt, :attributes => { :class => /issue/ },
+                    :child => { :tag => 'a',  :content => /Add ingredients categories/ },
+                    :sibling => { :tag => 'dd', :content => /should be classified by categories/ }
+    
+    assert assigns(:results_by_type).is_a?(Hash)
+    assert_equal 4, assigns(:results_by_type)['changesets']
+    assert_tag :a, :content => 'Changesets (4)'
   end
   
   def test_search_project_and_subprojects
diff --git a/test/unit/search_test.rb b/test/unit/search_test.rb
index 244b27a58..1b32df733 100644
--- a/test/unit/search_test.rb
+++ b/test/unit/search_test.rb
@@ -41,24 +41,24 @@ class SearchTest < Test::Unit::TestCase
   def test_search_by_anonymous
     User.current = nil
     
-    r = Issue.search(@issue_keyword)
+    r = Issue.search(@issue_keyword).first
     assert r.include?(@issue)
-    r = Changeset.search(@changeset_keyword)
+    r = Changeset.search(@changeset_keyword).first
     assert r.include?(@changeset)
     
     # Removes the :view_changesets permission from Anonymous role
     remove_permission Role.anonymous, :view_changesets
     
-    r = Issue.search(@issue_keyword)
+    r = Issue.search(@issue_keyword).first
     assert r.include?(@issue)
-    r = Changeset.search(@changeset_keyword)
+    r = Changeset.search(@changeset_keyword).first
     assert !r.include?(@changeset)
     
     # Make the project private
     @project.update_attribute :is_public, false
-    r = Issue.search(@issue_keyword)
+    r = Issue.search(@issue_keyword).first
     assert !r.include?(@issue)
-    r = Changeset.search(@changeset_keyword)
+    r = Changeset.search(@changeset_keyword).first
     assert !r.include?(@changeset)
   end
   
@@ -66,24 +66,24 @@ class SearchTest < Test::Unit::TestCase
     User.current = User.find_by_login('rhill')
     assert User.current.memberships.empty?
     
-    r = Issue.search(@issue_keyword)
+    r = Issue.search(@issue_keyword).first
     assert r.include?(@issue)
-    r = Changeset.search(@changeset_keyword)
+    r = Changeset.search(@changeset_keyword).first
     assert r.include?(@changeset)
     
     # Removes the :view_changesets permission from Non member role
     remove_permission Role.non_member, :view_changesets
     
-    r = Issue.search(@issue_keyword)
+    r = Issue.search(@issue_keyword).first
     assert r.include?(@issue)
-    r = Changeset.search(@changeset_keyword)
+    r = Changeset.search(@changeset_keyword).first
     assert !r.include?(@changeset)
     
     # Make the project private
     @project.update_attribute :is_public, false
-    r = Issue.search(@issue_keyword)
+    r = Issue.search(@issue_keyword).first
     assert !r.include?(@issue)
-    r = Changeset.search(@changeset_keyword)
+    r = Changeset.search(@changeset_keyword).first
     assert !r.include?(@changeset)
   end
   
@@ -91,16 +91,16 @@ class SearchTest < Test::Unit::TestCase
     User.current = User.find_by_login('jsmith')
     assert User.current.projects.include?(@project)
     
-    r = Issue.search(@issue_keyword)
+    r = Issue.search(@issue_keyword).first
     assert r.include?(@issue)
-    r = Changeset.search(@changeset_keyword)
+    r = Changeset.search(@changeset_keyword).first
     assert r.include?(@changeset)
 
     # Make the project private
     @project.update_attribute :is_public, false
-    r = Issue.search(@issue_keyword)
+    r = Issue.search(@issue_keyword).first
     assert r.include?(@issue)
-    r = Changeset.search(@changeset_keyword)
+    r = Changeset.search(@changeset_keyword).first
     assert r.include?(@changeset)
   end
 
@@ -112,19 +112,28 @@ class SearchTest < Test::Unit::TestCase
     User.current = User.find_by_login('jsmith')
     assert User.current.projects.include?(@project)
     
-    r = Issue.search(@issue_keyword)
+    r = Issue.search(@issue_keyword).first
     assert r.include?(@issue)
-    r = Changeset.search(@changeset_keyword)
+    r = Changeset.search(@changeset_keyword).first
     assert !r.include?(@changeset)
 
     # Make the project private
     @project.update_attribute :is_public, false
-    r = Issue.search(@issue_keyword)
+    r = Issue.search(@issue_keyword).first
     assert r.include?(@issue)
-    r = Changeset.search(@changeset_keyword)
+    r = Changeset.search(@changeset_keyword).first
     assert !r.include?(@changeset)
   end
   
+  def test_search_issue_with_multiple_hits_in_journals
+    i = Issue.find(1)
+    assert_equal 2, i.journals.count(:all, :conditions => "notes LIKE '%notes%'")
+    
+    r = Issue.search('%notes%').first
+    assert_equal 1, r.size
+    assert_equal i, r.first
+  end
+  
   private
   
   def remove_permission(role, permission)
diff --git a/vendor/plugins/acts_as_searchable/lib/acts_as_searchable.rb b/vendor/plugins/acts_as_searchable/lib/acts_as_searchable.rb
index 2c773d70a..fec933352 100644
--- a/vendor/plugins/acts_as_searchable/lib/acts_as_searchable.rb
+++ b/vendor/plugins/acts_as_searchable/lib/acts_as_searchable.rb
@@ -23,6 +23,12 @@ module Redmine
       end 
 
       module ClassMethods
+        # Options:
+        # * :columns - a column or an array of columns to search
+        # * :project_key - project foreign key (default to project_id)
+        # * :date_column - name of the datetime column (default to created_on)
+        # * :sort_order - name of the column used to sort results (default to :date_column or created_on)
+        # * :permission - permission required to search the model (default to :view_"objects")
         def acts_as_searchable(options = {})
           return if self.included_modules.include?(Redmine::Acts::Searchable::InstanceMethods)
   
@@ -49,6 +55,8 @@ module Redmine
             raise 'No date column defined defined.'
           end
           
+          searchable_options[:order_column] ||= searchable_options[:date_column]
+          
           # Permission needed to search this model
           searchable_options[:permission] = "view_#{self.name.underscore.pluralize}".to_sym unless searchable_options.has_key?(:permission)
           
@@ -65,15 +73,22 @@ module Redmine
         end
 
         module ClassMethods
-          # Search the model for the given tokens
+          # Searches the model for the given tokens
           # projects argument can be either nil (will search all projects), a project or an array of projects
+          # Returns the results and the results count
           def search(tokens, projects=nil, options={})
             tokens = [] << tokens unless tokens.is_a?(Array)
             projects = [] << projects unless projects.nil? || projects.is_a?(Array)
             
             find_options = {:include => searchable_options[:include]}
-            find_options[:limit] = options[:limit] if options[:limit]
-            find_options[:order] = "#{searchable_options[:date_column]} " + (options[:before] ? 'DESC' : 'ASC')
+            find_options[:order] = "#{searchable_options[:order_column]} " + (options[:before] ? 'DESC' : 'ASC')
+            
+            limit_options = {}
+            limit_options[:limit] = options[:limit] if options[:limit]
+            if options[:offset]
+              limit_options[:conditions] = "(#{searchable_options[:date_column]} " + (options[:before] ? '<' : '>') + "'#{connection.quoted_date(options[:offset])}')"
+            end
+            
             columns = searchable_options[:columns]
             columns.slice!(1..-1) if options[:titles_only]
             
@@ -94,9 +109,6 @@ module Redmine
             
             sql = (['(' + token_clauses.join(' OR ') + ')'] * tokens.size).join(options[:all_words] ? ' AND ' : ' OR ')
             
-            if options[:offset]
-              sql = "(#{sql}) AND (#{searchable_options[:date_column]} " + (options[:before] ? '<' : '>') + "'#{connection.quoted_date(options[:offset])}')"
-            end
             find_options[:conditions] = [sql, * (tokens * token_clauses.size).sort]
             
             project_conditions = []
@@ -104,16 +116,16 @@ module Redmine
                                                  Project.allowed_to_condition(User.current, searchable_options[:permission]))
             project_conditions << "#{searchable_options[:project_key]} IN (#{projects.collect(&:id).join(',')})" unless projects.nil?
             
-            results = with_scope(:find => {:conditions => project_conditions.join(' AND ')}) do
-              find(:all, find_options)
-            end            
-            if searchable_options[:with] && !options[:titles_only]
-              searchable_options[:with].each do |model, assoc|
-                results += model.to_s.camelcase.constantize.search(tokens, projects, options).collect {|r| r.send assoc}
+            results = []
+            results_count = 0
+            
+            with_scope(:find => {:conditions => project_conditions.join(' AND ')}) do
+              with_scope(:find => find_options) do
+                results_count = count(:all)
+                results = find(:all, limit_options)
               end
-              results.uniq!
             end
-            results
+            [results, results_count]
           end
         end
       end

From c39161a6fc61ab0b324f48bae41832f1a69efeae Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 20 Jul 2008 17:31:11 +0000
Subject: [PATCH 634/710] Fixed: searchable model can't be loaded if table is
 not yet created (#1421).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1682 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 .../acts_as_searchable/lib/acts_as_searchable.rb | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/vendor/plugins/acts_as_searchable/lib/acts_as_searchable.rb b/vendor/plugins/acts_as_searchable/lib/acts_as_searchable.rb
index fec933352..9ec0e7d6f 100644
--- a/vendor/plugins/acts_as_searchable/lib/acts_as_searchable.rb
+++ b/vendor/plugins/acts_as_searchable/lib/acts_as_searchable.rb
@@ -41,20 +41,8 @@ module Redmine
             searchable_options[:columns] = [] << searchable_options[:columns]
           end
 
-          if searchable_options[:project_key]
-          elsif column_names.include?('project_id')
-            searchable_options[:project_key] = "#{table_name}.project_id"
-          else
-            raise 'No project key defined.'
-          end
-          
-          if searchable_options[:date_column]
-          elsif column_names.include?('created_on')
-            searchable_options[:date_column] = "#{table_name}.created_on"
-          else
-            raise 'No date column defined defined.'
-          end
-          
+          searchable_options[:project_key] ||= "#{table_name}.project_id"
+          searchable_options[:date_column] ||= "#{table_name}.created_on"
           searchable_options[:order_column] ||= searchable_options[:date_column]
           
           # Permission needed to search this model

From 9d3dfea1ac8bf047c1cfc8dbfcb7ae4cdf286055 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Mon, 21 Jul 2008 19:13:46 +0000
Subject: [PATCH 635/710] Adds username to the password reminder email (#1668).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1683 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/mailer/lost_password.text.html.rhtml  | 2 ++
 app/views/mailer/lost_password.text.plain.rhtml | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/app/views/mailer/lost_password.text.html.rhtml b/app/views/mailer/lost_password.text.html.rhtml
index 26eacfa92..4dd570c94 100644
--- a/app/views/mailer/lost_password.text.html.rhtml
+++ b/app/views/mailer/lost_password.text.html.rhtml
@@ -1,2 +1,4 @@
 <p><%= l(:mail_body_lost_password) %><br />
 <%= auto_link(@url) %></p>
+
+<p><%= l(:field_login) %>: <b><%= @token.user.login %></b></p>
diff --git a/app/views/mailer/lost_password.text.plain.rhtml b/app/views/mailer/lost_password.text.plain.rhtml
index aec1b5b86..f5000ed7e 100644
--- a/app/views/mailer/lost_password.text.plain.rhtml
+++ b/app/views/mailer/lost_password.text.plain.rhtml
@@ -1,2 +1,4 @@
 <%= l(:mail_body_lost_password) %>
 <%= @url %>
+
+<%= l(:field_login) %>: <%= @token.user.login %>

From aaca2c50e563287f16cbce230ddbcc5d4e6dc972 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Mon, 21 Jul 2008 19:19:06 +0000
Subject: [PATCH 636/710] Fixed: 'search titles only' box ignored after one
 search is done on titles only.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1684 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 vendor/plugins/acts_as_searchable/lib/acts_as_searchable.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vendor/plugins/acts_as_searchable/lib/acts_as_searchable.rb b/vendor/plugins/acts_as_searchable/lib/acts_as_searchable.rb
index 9ec0e7d6f..9a81f363f 100644
--- a/vendor/plugins/acts_as_searchable/lib/acts_as_searchable.rb
+++ b/vendor/plugins/acts_as_searchable/lib/acts_as_searchable.rb
@@ -78,7 +78,7 @@ module Redmine
             end
             
             columns = searchable_options[:columns]
-            columns.slice!(1..-1) if options[:titles_only]
+            columns = columns[0..0] if options[:titles_only]
             
             token_clauses = columns.collect {|column| "(LOWER(#{column}) LIKE ?)"}
             

From 8a7bfc72b20a0a554812db7f8bb7bfdf3e2a21d4 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Tue, 22 Jul 2008 17:20:02 +0000
Subject: [PATCH 637/710] Move VersionsController#download to
 AttachmentsController.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1685 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/attachments_controller.rb      | 12 ++++++++----
 app/controllers/documents_controller.rb        |  9 ---------
 app/controllers/versions_controller.rb         |  9 ---------
 app/views/projects/list_files.rhtml            |  4 ++--
 test/fixtures/attachments.yml                  | 13 +++++++++++++
 test/functional/attachments_controller_test.rb |  5 +++++
 6 files changed, 28 insertions(+), 24 deletions(-)

diff --git a/app/controllers/attachments_controller.rb b/app/controllers/attachments_controller.rb
index 9ea9ac48e..07fee1269 100644
--- a/app/controllers/attachments_controller.rb
+++ b/app/controllers/attachments_controller.rb
@@ -17,7 +17,7 @@
 
 class AttachmentsController < ApplicationController
   layout 'base'
-  before_filter :find_project, :check_project_privacy
+  before_filter :find_project
 
   def show
     if @attachment.is_diff?
@@ -32,6 +32,8 @@ class AttachmentsController < ApplicationController
   end
   
   def download
+    @attachment.increment_download if @attachment.container.is_a?(Version)
+    
     # images are sent inline
     send_file @attachment.diskfile, :filename => filename_for_content_disposition(@attachment.filename),
                                     :type => @attachment.content_type, 
@@ -41,9 +43,11 @@ class AttachmentsController < ApplicationController
 private
   def find_project
     @attachment = Attachment.find(params[:id])
-    #render_404 and return false unless File.readable?(@attachment.diskfile)
     @project = @attachment.project
-  #rescue
-  #  render_404
+    permission = @attachment.container.is_a?(Version) ? :view_files : "view_#{@attachment.container.class.name.underscore.pluralize}".to_sym
+    allowed = User.current.allowed_to?(permission, @project)
+    allowed ? true : (User.current.logged? ? render_403 : require_login)
+  rescue ActiveRecord::RecordNotFound
+    render_404
   end
 end
diff --git a/app/controllers/documents_controller.rb b/app/controllers/documents_controller.rb
index 7e732b9b6..1f0784bb2 100644
--- a/app/controllers/documents_controller.rb
+++ b/app/controllers/documents_controller.rb
@@ -65,15 +65,6 @@ class DocumentsController < ApplicationController
     @document.destroy
     redirect_to :controller => 'documents', :action => 'index', :project_id => @project
   end
-
-  def download
-    @attachment = @document.attachments.find(params[:attachment_id])
-    @attachment.increment_download
-    send_file @attachment.diskfile, :filename => filename_for_content_disposition(@attachment.filename),
-                                    :type => @attachment.content_type
-  rescue
-    render_404
-  end 
   
   def add_attachment
     attachments = attach_files(@document, params[:attachments])
diff --git a/app/controllers/versions_controller.rb b/app/controllers/versions_controller.rb
index aeb802ccb..5d3393ed8 100644
--- a/app/controllers/versions_controller.rb
+++ b/app/controllers/versions_controller.rb
@@ -37,15 +37,6 @@ class VersionsController < ApplicationController
     flash[:error] = "Unable to delete version"
     redirect_to :controller => 'projects', :action => 'settings', :tab => 'versions', :id => @project
   end
-
-  def download
-    @attachment = @version.attachments.find(params[:attachment_id])
-    @attachment.increment_download
-    send_file @attachment.diskfile, :filename => filename_for_content_disposition(@attachment.filename),
-                                    :type => @attachment.content_type
-  rescue
-    render_404
-  end 
   
   def destroy_file
     @version.attachments.find(params[:attachment_id]).destroy
diff --git a/app/views/projects/list_files.rhtml b/app/views/projects/list_files.rhtml
index f385229ae..43687c50a 100644
--- a/app/views/projects/list_files.rhtml
+++ b/app/views/projects/list_files.rhtml
@@ -23,8 +23,8 @@
   <% for file in version.attachments %>		
   <tr class="<%= cycle("odd", "even") %>">
     <td></td>
-    <td><%= link_to(file.filename, {:controller => 'versions', :action => 'download', :id => version, :attachment_id => file},
-                                   :title => file.description) %></td>
+    <td><%= link_to(h(file.filename), {:controller => 'attachments', :action => 'download', :id => file},
+                                      :title => file.description) %></td>
     <td align="center"><%= format_time(file.created_on) %></td>
     <td align="center"><%= number_to_human_size(file.filesize) %></td>
     <td align="center"><%= file.downloads %></td>
diff --git a/test/fixtures/attachments.yml b/test/fixtures/attachments.yml
index a73d6b385..ec57aa6dd 100644
--- a/test/fixtures/attachments.yml
+++ b/test/fixtures/attachments.yml
@@ -73,3 +73,16 @@ attachments_006:
   filename: archive.zip
   author_id: 2
   content_type: application/octet-stream
+attachments_007: 
+  created_on: 2006-07-19 21:07:27 +02:00
+  container_type: Issue
+  container_id: 4
+  downloads: 0
+  disk_filename: 060719210727_archive.zip
+  digest: b91e08d0cf966d5c6ff411bd8c4cc3a2
+  id: 7
+  filesize: 157
+  filename: archive.zip
+  author_id: 1
+  content_type: application/octet-stream
+  
\ No newline at end of file
diff --git a/test/functional/attachments_controller_test.rb b/test/functional/attachments_controller_test.rb
index d088c0b0f..af73eb77e 100644
--- a/test/functional/attachments_controller_test.rb
+++ b/test/functional/attachments_controller_test.rb
@@ -56,4 +56,9 @@ class AttachmentsControllerTest < Test::Unit::TestCase
     assert_response :success
     assert_equal 'application/x-ruby', @response.content_type
   end
+  
+  def test_anonymous_on_private_private
+    get :download, :id => 7
+    assert_redirected_to 'account/login'
+  end
 end

From 9b579de9e234e378fb5081d79bea02d175495db7 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Tue, 22 Jul 2008 17:55:19 +0000
Subject: [PATCH 638/710] Appends the filename to the attachment url so that
 clients that ignore content-disposition http header get the real filename
 (#1649).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1686 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/attachments_controller.rb      |  3 +++
 app/helpers/application_helper.rb              | 11 +++++++++++
 app/helpers/issues_helper.rb                   |  4 ++--
 app/models/attachment.rb                       |  2 +-
 app/views/attachments/_links.rhtml             |  2 +-
 app/views/attachments/diff.rhtml               |  2 +-
 app/views/attachments/file.rhtml               |  2 +-
 app/views/projects/list_files.rhtml            |  3 +--
 config/routes.rb                               |  6 ++++--
 test/functional/attachments_controller_test.rb | 15 +++++++++++++++
 10 files changed, 40 insertions(+), 10 deletions(-)

diff --git a/app/controllers/attachments_controller.rb b/app/controllers/attachments_controller.rb
index 07fee1269..1e8f566e6 100644
--- a/app/controllers/attachments_controller.rb
+++ b/app/controllers/attachments_controller.rb
@@ -43,6 +43,9 @@ class AttachmentsController < ApplicationController
 private
   def find_project
     @attachment = Attachment.find(params[:id])
+    # Show 404 if the filename in the url is wrong
+    raise ActiveRecord::RecordNotFound if params[:filename] && params[:filename] != @attachment.filename
+    
     @project = @attachment.project
     permission = @attachment.container.is_a?(Version) ? :view_files : "view_#{@attachment.container.class.name.underscore.pluralize}".to_sym
     allowed = User.current.allowed_to?(permission, @project)
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 6c69d8e6f..6e39d093f 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -47,6 +47,17 @@ module ApplicationHelper
     link_to "#{issue.tracker.name} ##{issue.id}", {:controller => "issues", :action => "show", :id => issue}, options
   end
   
+  # Generates a link to an attachment.
+  # Options:
+  # * :text - Link text (default to attachment filename)
+  # * :download - Force download (default: false)
+  def link_to_attachment(attachment, options={})
+    text = options.delete(:text) || attachment.filename
+    action = options.delete(:download) ? 'download' : 'show'
+    
+    link_to(h(text), {:controller => 'attachments', :action => action, :id => attachment, :filename => attachment.filename }, options)
+  end
+  
   def toggle_link(name, id, options={})
     onclick = "Element.toggle('#{id}'); "
     onclick << (options[:focus] ? "Form.Element.focus('#{options[:focus]}'); " : "this.blur(); ")
diff --git a/app/helpers/issues_helper.rb b/app/helpers/issues_helper.rb
index 403697178..9e419ab43 100644
--- a/app/helpers/issues_helper.rb
+++ b/app/helpers/issues_helper.rb
@@ -95,9 +95,9 @@ module IssuesHelper
       label = content_tag('strong', label)
       old_value = content_tag("i", h(old_value)) if detail.old_value
       old_value = content_tag("strike", old_value) if detail.old_value and (!detail.value or detail.value.empty?)
-      if detail.property == 'attachment' && !value.blank? && Attachment.find_by_id(detail.prop_key)
+      if detail.property == 'attachment' && !value.blank? && a = Attachment.find_by_id(detail.prop_key)
         # Link to the attachment if it has not been removed
-        value = link_to(value, :controller => 'attachments', :action => 'show', :id => detail.prop_key)
+        value = link_to_attachment(a)
       else
         value = content_tag("i", h(value)) if value
       end
diff --git a/app/models/attachment.rb b/app/models/attachment.rb
index 7d6a74ebb..8f3f530c7 100644
--- a/app/models/attachment.rb
+++ b/app/models/attachment.rb
@@ -26,7 +26,7 @@ class Attachment < ActiveRecord::Base
   validates_length_of :disk_filename, :maximum => 255
 
   acts_as_event :title => :filename,
-                :url => Proc.new {|o| {:controller => 'attachments', :action => 'download', :id => o.id}}
+                :url => Proc.new {|o| {:controller => 'attachments', :action => 'download', :id => o.id, :filename => o.filename}}
 
   cattr_accessor :storage_path
   @@storage_path = "#{RAILS_ROOT}/files"
diff --git a/app/views/attachments/_links.rhtml b/app/views/attachments/_links.rhtml
index 9e3ac747c..9aae909fe 100644
--- a/app/views/attachments/_links.rhtml
+++ b/app/views/attachments/_links.rhtml
@@ -1,6 +1,6 @@
 <div class="attachments">
 <% for attachment in attachments %>
-<p><%= link_to attachment.filename, {:controller => 'attachments', :action => 'show', :id => attachment }, :class => 'icon icon-attachment' -%>
+<p><%= link_to_attachment attachment, :class => 'icon icon-attachment' -%>
 <%= h(" - #{attachment.description}") unless attachment.description.blank? %>
   <span class="size">(<%= number_to_human_size attachment.filesize %>)</span>
   <% if options[:delete_url] %>
diff --git a/app/views/attachments/diff.rhtml b/app/views/attachments/diff.rhtml
index 4a9f5c9bd..7b64dca17 100644
--- a/app/views/attachments/diff.rhtml
+++ b/app/views/attachments/diff.rhtml
@@ -3,7 +3,7 @@
 <div class="attachments">
 <p><%= h("#{@attachment.description} - ") unless @attachment.description.blank? %>
    <span class="author"><%= @attachment.author %>, <%= format_time(@attachment.created_on) %></span></p>
-<p><%= link_to l(:button_download), {:controller => 'attachments', :action => 'download', :id => @attachment } -%>
+<p><%= link_to_attachment @attachment, :text => l(:button_download), :download => true -%>
    <span class="size">(<%= number_to_human_size @attachment.filesize %>)</span></p>
 
 </div>
diff --git a/app/views/attachments/file.rhtml b/app/views/attachments/file.rhtml
index 7988d0aed..468c6b666 100644
--- a/app/views/attachments/file.rhtml
+++ b/app/views/attachments/file.rhtml
@@ -3,7 +3,7 @@
 <div class="attachments">
 <p><%= h("#{@attachment.description} - ") unless @attachment.description.blank? %>
    <span class="author"><%= @attachment.author %>, <%= format_time(@attachment.created_on) %></span></p>
-<p><%= link_to l(:button_download), {:controller => 'attachments', :action => 'download', :id => @attachment } -%>
+<p><%= link_to_attachment @attachment, :text => l(:button_download), :download => true -%>
    <span class="size">(<%= number_to_human_size @attachment.filesize %>)</span></p>
 
 </div>
diff --git a/app/views/projects/list_files.rhtml b/app/views/projects/list_files.rhtml
index 43687c50a..79e41f16d 100644
--- a/app/views/projects/list_files.rhtml
+++ b/app/views/projects/list_files.rhtml
@@ -23,8 +23,7 @@
   <% for file in version.attachments %>		
   <tr class="<%= cycle("odd", "even") %>">
     <td></td>
-    <td><%= link_to(h(file.filename), {:controller => 'attachments', :action => 'download', :id => file},
-                                      :title => file.description) %></td>
+    <td><%= link_to_attachment file, :download => true, :title => file.description %></td>
     <td align="center"><%= format_time(file.created_on) %></td>
     <td align="center"><%= number_to_human_size(file.filesize) %></td>
     <td align="center"><%= file.downloads %></td>
diff --git a/config/routes.rb b/config/routes.rb
index a77a8833b..c34052f86 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -32,8 +32,10 @@ ActionController::Routing::Routes.draw do |map|
     omap.repositories_revision 'repositories/revision/:id/:rev', :action => 'revision'
   end
   
-  map.connect 'attachments/:id', :controller => 'attachments', :action => 'show'
-  
+  map.connect 'attachments/:id', :controller => 'attachments', :action => 'show', :id => /\d+/
+  map.connect 'attachments/:id/:filename', :controller => 'attachments', :action => 'show', :id => /\d+/, :filename => /.*/
+  map.connect 'attachments/download/:id/:filename', :controller => 'attachments', :action => 'download', :id => /\d+/, :filename => /.*/
+   
   # Allow downloading Web Service WSDL as a file with an extension
   # instead of a file named 'wsdl'
   map.connect ':controller/service.wsdl', :action => 'wsdl'
diff --git a/test/functional/attachments_controller_test.rb b/test/functional/attachments_controller_test.rb
index af73eb77e..06a6343ba 100644
--- a/test/functional/attachments_controller_test.rb
+++ b/test/functional/attachments_controller_test.rb
@@ -33,6 +33,21 @@ class AttachmentsControllerTest < Test::Unit::TestCase
     User.current = nil
   end
   
+  def test_routing
+    assert_routing('/attachments/1', :controller => 'attachments', :action => 'show', :id => '1')
+    assert_routing('/attachments/1/filename.ext', :controller => 'attachments', :action => 'show', :id => '1', :filename => 'filename.ext')
+    assert_routing('/attachments/download/1', :controller => 'attachments', :action => 'download', :id => '1')
+    assert_routing('/attachments/download/1/filename.ext', :controller => 'attachments', :action => 'download', :id => '1', :filename => 'filename.ext')
+  end
+  
+  def test_recognizes
+    assert_recognizes({:controller => 'attachments', :action => 'show', :id => '1'}, '/attachments/1')
+    assert_recognizes({:controller => 'attachments', :action => 'show', :id => '1'}, '/attachments/show/1')
+    assert_recognizes({:controller => 'attachments', :action => 'show', :id => '1', :filename => 'filename.ext'}, '/attachments/1/filename.ext')
+    assert_recognizes({:controller => 'attachments', :action => 'download', :id => '1'}, '/attachments/download/1')
+    assert_recognizes({:controller => 'attachments', :action => 'download', :id => '1', :filename => 'filename.ext'},'/attachments/download/1/filename.ext')
+  end
+  
   def test_show_diff
     get :show, :id => 5
     assert_response :success

From a9932e3dbdce2d855dffc0f2458bcf19ef082433 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Tue, 22 Jul 2008 17:59:45 +0000
Subject: [PATCH 639/710] Adds mailto link on the user administration list
 (#1670).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1687 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/users/list.rhtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/users/list.rhtml b/app/views/users/list.rhtml
index a6b0e5429..0ef6b8aa4 100644
--- a/app/views/users/list.rhtml
+++ b/app/views/users/list.rhtml
@@ -29,7 +29,7 @@
 	<td class="username"><%= link_to h(user.login), :action => 'edit', :id => user %></td>
 	<td class="firstname"><%= h(user.firstname) %></td>
 	<td class="lastname"><%= h(user.lastname) %></td>
-	<td class="email"><%= h(user.mail) %></td>
+	<td class="email"><%= mail_to(h(user.mail)) %></td>
 	<td align="center"><%= image_tag('true.png') if user.admin? %></td>
 	<td class="created_on" align="center"><%= format_time(user.created_on) %></td>
 	<td class="last_login_on" align="center"><%= format_time(user.last_login_on) unless user.last_login_on.nil? %></td>

From 590a829a06d4106f7827ddf242a0de5c0ca3e197 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Tue, 22 Jul 2008 18:24:40 +0000
Subject: [PATCH 640/710] Removed unused exception definition (r1678).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1688 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/models/user.rb | 2 --
 1 file changed, 2 deletions(-)

diff --git a/app/models/user.rb b/app/models/user.rb
index 5a839721c..cabce3005 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -19,8 +19,6 @@ require "digest/sha1"
 
 class User < ActiveRecord::Base
 
-  class OnTheFlyCreationFailure < Exception; end
-
   # Account statuses
   STATUS_ANONYMOUS  = 0
   STATUS_ACTIVE     = 1

From 898fac293b3d8042de3c1747776fac90d3ed40fa Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Tue, 22 Jul 2008 18:52:00 +0000
Subject: [PATCH 641/710] Adds custom fields on time entries (#772).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1689 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/custom_fields_controller.rb |  2 ++
 app/controllers/issues_controller.rb        |  1 +
 app/helpers/custom_fields_helper.rb         |  1 +
 app/models/time_entry.rb                    |  1 +
 app/models/time_entry_custom_field.rb       | 23 +++++++++++++++++++++
 app/views/custom_fields/_form.rhtml         |  3 +++
 app/views/issues/_edit.rhtml                |  3 +++
 app/views/timelog/edit.rhtml                |  3 +++
 8 files changed, 37 insertions(+)
 create mode 100644 app/models/time_entry_custom_field.rb

diff --git a/app/controllers/custom_fields_controller.rb b/app/controllers/custom_fields_controller.rb
index 1e1c988d9..d30e89493 100644
--- a/app/controllers/custom_fields_controller.rb
+++ b/app/controllers/custom_fields_controller.rb
@@ -39,6 +39,8 @@ class CustomFieldsController < ApplicationController
         @custom_field = UserCustomField.new(params[:custom_field])
       when "ProjectCustomField" 
         @custom_field = ProjectCustomField.new(params[:custom_field])
+      when "TimeEntryCustomField" 
+        @custom_field = TimeEntryCustomField.new(params[:custom_field])
       else
         redirect_to :action => 'list'
         return
diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index c0f31814b..c8edd1726 100644
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -160,6 +160,7 @@ class IssuesController < ApplicationController
     @allowed_statuses = @issue.new_statuses_allowed_to(User.current)
     @priorities = Enumeration::get_values('IPRI')
     @edit_allowed = User.current.allowed_to?(:edit_issues, @project)
+    @time_entry = TimeEntry.new
     
     @notes = params[:notes]
     journal = @issue.init_journal(User.current, @notes)
diff --git a/app/helpers/custom_fields_helper.rb b/app/helpers/custom_fields_helper.rb
index 3c795dc1f..f61824e65 100644
--- a/app/helpers/custom_fields_helper.rb
+++ b/app/helpers/custom_fields_helper.rb
@@ -19,6 +19,7 @@ module CustomFieldsHelper
 
   def custom_fields_tabs
     tabs = [{:name => 'IssueCustomField', :label => :label_issue_plural},
+            {:name => 'TimeEntryCustomField', :label => :label_spent_time},
             {:name => 'ProjectCustomField', :label => :label_project_plural},
             {:name => 'UserCustomField', :label => :label_user_plural}
             ]
diff --git a/app/models/time_entry.rb b/app/models/time_entry.rb
index 759f9bed0..57a75604d 100644
--- a/app/models/time_entry.rb
+++ b/app/models/time_entry.rb
@@ -25,6 +25,7 @@ class TimeEntry < ActiveRecord::Base
   
   attr_protected :project_id, :user_id, :tyear, :tmonth, :tweek
 
+  acts_as_customizable
   acts_as_event :title => Proc.new {|o| "#{o.user}: #{lwr(:label_f_hour, o.hours)} (#{(o.issue || o.project).event_title})"},
                 :url => Proc.new {|o| {:controller => 'timelog', :action => 'details', :project_id => o.project}},
                 :author => :user,
diff --git a/app/models/time_entry_custom_field.rb b/app/models/time_entry_custom_field.rb
new file mode 100644
index 000000000..2ec3d27be
--- /dev/null
+++ b/app/models/time_entry_custom_field.rb
@@ -0,0 +1,23 @@
+# redMine - project management software
+# Copyright (C) 2008  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 TimeEntryCustomField < CustomField
+  def type_name
+    :label_spent_time
+  end
+end
+
diff --git a/app/views/custom_fields/_form.rhtml b/app/views/custom_fields/_form.rhtml
index 5e4eadf21..f4aee6870 100644
--- a/app/views/custom_fields/_form.rhtml
+++ b/app/views/custom_fields/_form.rhtml
@@ -105,6 +105,9 @@ when "IssueCustomField" %>
 <% when "ProjectCustomField" %>
     <p><%= f.check_box :is_required %></p>
 
+<% when "TimeEntryCustomField" %>
+    <p><%= f.check_box :is_required %></p>
+
 <% end %>
 </div>
 <%= javascript_tag "toggle_custom_field_format();" %>
diff --git a/app/views/issues/_edit.rhtml b/app/views/issues/_edit.rhtml
index ba59c3ae9..2c7a4286e 100644
--- a/app/views/issues/_edit.rhtml
+++ b/app/views/issues/_edit.rhtml
@@ -25,6 +25,9 @@
         <p><%= time_entry.select :activity_id, activity_collection_for_select_options %></p>
         </div>
         <p><%= time_entry.text_field :comments, :size => 60 %></p>
+        <% @time_entry.custom_field_values.each do |value| %>
+        	<p><%= custom_field_tag_with_label :time_entry, value %></p>
+        <% end %>
         <% end %>
     </fieldset>
     <% end %>
diff --git a/app/views/timelog/edit.rhtml b/app/views/timelog/edit.rhtml
index 7e8cc4591..0dd3503ec 100644
--- a/app/views/timelog/edit.rhtml
+++ b/app/views/timelog/edit.rhtml
@@ -10,6 +10,9 @@
 <p><%= f.text_field :hours, :size => 6, :required => true %></p>
 <p><%= f.text_field :comments, :size => 100 %></p>
 <p><%= f.select :activity_id, activity_collection_for_select_options, :required => true %></p>
+<% @time_entry.custom_field_values.each do |value| %>
+	<p><%= custom_field_tag_with_label :time_entry, value %></p>
+<% end %>
 </div>
 
 <%= submit_tag l(:button_save) %>

From f54c2d812d4d9d06827d3f5e08650f1dfd46f09e Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Tue, 22 Jul 2008 19:02:40 +0000
Subject: [PATCH 642/710] Adds custom fields to the time entries csv export.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1690 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/helpers/timelog_helper.rb | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/app/helpers/timelog_helper.rb b/app/helpers/timelog_helper.rb
index 2c1ae5285..2c1225a7c 100644
--- a/app/helpers/timelog_helper.rb
+++ b/app/helpers/timelog_helper.rb
@@ -53,6 +53,7 @@ module TimelogHelper
   def entries_to_csv(entries)
     ic = Iconv.new(l(:general_csv_encoding), 'UTF-8')    
     decimal_separator = l(:general_csv_decimal_separator)
+    custom_fields = TimeEntryCustomField.find(:all)
     export = StringIO.new
     CSV::Writer.generate(export, l(:general_csv_separator)) do |csv|
       # csv header fields
@@ -66,6 +67,9 @@ module TimelogHelper
                  l(:field_hours),
                  l(:field_comments)
                  ]
+      # Export custom fields
+      headers += custom_fields.collect(&:name)
+      
       csv << headers.collect {|c| begin; ic.iconv(c.to_s); rescue; c.to_s; end }
       # csv lines
       entries.each do |entry|
@@ -79,6 +83,8 @@ module TimelogHelper
                   entry.hours.to_s.gsub('.', decimal_separator),
                   entry.comments
                   ]
+        fields += custom_fields.collect {|f| show_value(entry.custom_value_for(f)) }
+                  
         csv << fields.collect {|c| begin; ic.iconv(c.to_s); rescue; c.to_s; end }
       end
     end

From d84d38983ac7a5f56fcfd25f01fbf5b3d6d498c1 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Tue, 22 Jul 2008 19:06:13 +0000
Subject: [PATCH 643/710] Adds boolean and list custom fields for time entries
 as criteria on timelog report.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1691 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/timelog_controller.rb | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/app/controllers/timelog_controller.rb b/app/controllers/timelog_controller.rb
index 9f539d459..605e7e61e 100644
--- a/app/controllers/timelog_controller.rb
+++ b/app/controllers/timelog_controller.rb
@@ -60,6 +60,13 @@ class TimelogController < ApplicationController
                                              :label => cf.name}
     end
     
+    # Add list and boolean time entry custom fields
+    TimeEntryCustomField.find(:all).select {|cf| %w(list bool).include? cf.field_format }.each do |cf|
+      @available_criterias["cf_#{cf.id}"] = {:sql => "(SELECT c.value FROM custom_values c WHERE c.custom_field_id = #{cf.id} AND c.customized_type = 'TimeEntry' AND c.customized_id = time_entries.id)",
+                                             :format => cf.field_format,
+                                             :label => cf.name}
+    end
+    
     @criterias = params[:criterias] || []
     @criterias = @criterias.select{|criteria| @available_criterias.has_key? criteria}
     @criterias.uniq!

From a17b62b455188208dccd38b312fb40d39c515757 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Tue, 22 Jul 2008 19:07:43 +0000
Subject: [PATCH 644/710] Fixes hard-coded table names in queries.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1692 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/timelog_controller.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/controllers/timelog_controller.rb b/app/controllers/timelog_controller.rb
index 605e7e61e..bf7b57d9d 100644
--- a/app/controllers/timelog_controller.rb
+++ b/app/controllers/timelog_controller.rb
@@ -55,14 +55,14 @@ class TimelogController < ApplicationController
     
     # Add list and boolean custom fields as available criterias
     @project.all_issue_custom_fields.select {|cf| %w(list bool).include? cf.field_format }.each do |cf|
-      @available_criterias["cf_#{cf.id}"] = {:sql => "(SELECT c.value FROM custom_values c WHERE c.custom_field_id = #{cf.id} AND c.customized_type = 'Issue' AND c.customized_id = issues.id)",
+      @available_criterias["cf_#{cf.id}"] = {:sql => "(SELECT c.value FROM #{CustomValue.table_name} c WHERE c.custom_field_id = #{cf.id} AND c.customized_type = 'Issue' AND c.customized_id = #{Issue.table_name}.id)",
                                              :format => cf.field_format,
                                              :label => cf.name}
     end
     
     # Add list and boolean time entry custom fields
     TimeEntryCustomField.find(:all).select {|cf| %w(list bool).include? cf.field_format }.each do |cf|
-      @available_criterias["cf_#{cf.id}"] = {:sql => "(SELECT c.value FROM custom_values c WHERE c.custom_field_id = #{cf.id} AND c.customized_type = 'TimeEntry' AND c.customized_id = time_entries.id)",
+      @available_criterias["cf_#{cf.id}"] = {:sql => "(SELECT c.value FROM #{CustomValue.table_name} c WHERE c.custom_field_id = #{cf.id} AND c.customized_type = 'TimeEntry' AND c.customized_id = #{TimeEntry.table_name}.id)",
                                              :format => cf.field_format,
                                              :label => cf.name}
     end

From 5564dfbbd5a31362fde86f27ac8beccd1661d6f8 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Tue, 22 Jul 2008 19:40:47 +0000
Subject: [PATCH 645/710] TOC rendered as an unordered list.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1693 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/wiki/export.rhtml        |  4 ++++
 lib/redmine/wiki_formatting.rb     |  6 +++---
 public/stylesheets/application.css | 20 ++++++++++----------
 3 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/app/views/wiki/export.rhtml b/app/views/wiki/export.rhtml
index 1ab5c13e4..94b4e6f0d 100644
--- a/app/views/wiki/export.rhtml
+++ b/app/views/wiki/export.rhtml
@@ -6,6 +6,10 @@
 <style>
 body { font:80% Verdana,Tahoma,Arial,sans-serif; }
 h1, h2, h3, h4 {  font-family: Trebuchet MS,Georgia,"Times New Roman",serif; }
+ul.toc { padding: 4px; margin-left: 0; }
+ul.toc li { list-style-type:none; }
+ul.toc li.heading2 { margin-left: 1em; }
+ul.toc li.heading3 { margin-left: 2em; }
 </style>
 </head>
 <body>
diff --git a/lib/redmine/wiki_formatting.rb b/lib/redmine/wiki_formatting.rb
index 952f636d3..11ec6803a 100644
--- a/lib/redmine/wiki_formatting.rb
+++ b/lib/redmine/wiki_formatting.rb
@@ -81,16 +81,16 @@ module Redmine
           div_class = 'toc'
           div_class << ' right' if $1 == '>'
           div_class << ' left' if $1 == '<'
-          out = "<div class=\"#{div_class}\">"
+          out = "<ul class=\"#{div_class}\">"
           @toc.each_with_index do |heading, index|
             # remove wiki links from the item
             toc_item = heading.last.gsub(/(\[\[|\]\])/, '')
             # remove styles
             # eg. %{color:red}Triggers% => Triggers
             toc_item.gsub! %r[%\{[^\}]*\}([^%]+)%], '\\1'
-            out << "<a href=\"##{index+1}\" class=\"heading#{heading.first}\">#{toc_item}</a>"
+            out << "<li class=\"heading#{heading.first}\"><a href=\"##{index+1}\">#{toc_item}</a></li>\n"
           end
-          out << '</div>'
+          out << '</ul>'
           out
         end
       end
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 018c71732..9ae4d1595 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -461,31 +461,31 @@ div.wiki pre {
     overflow-x: auto;
 }
 
-div.wiki div.toc {
+div.wiki ul.toc {
     background-color: #ffffdd;
     border: 1px solid #e4e4e4;
     padding: 4px;
     line-height: 1.2em;
     margin-bottom: 12px;
     margin-right: 12px;
+    margin-left: 0;
     display: table
 }
-* html div.wiki div.toc { width: 50%; } /* IE6 doesn't autosize div */
+* html div.wiki ul.toc { width: 50%; } /* IE6 doesn't autosize div */
 
-div.wiki div.toc.right { float: right; margin-left: 12px; margin-right: 0; width: auto; }
-div.wiki div.toc.left  { float: left; margin-right: 12px; margin-left: 0; width: auto; }
+div.wiki ul.toc.right { float: right; margin-left: 12px; margin-right: 0; width: auto; }
+div.wiki ul.toc.left  { float: left; margin-right: 12px; margin-left: 0; width: auto; }
+div.wiki ul.toc li { list-style-type:none;}
+div.wiki ul.toc li.heading2 { margin-left: 6px; }
+div.wiki ul.toc li.heading3 { margin-left: 12px; font-size: 0.8em; }
 
-div.wiki div.toc a {
-    display: block;
+div.wiki ul.toc a {
     font-size: 0.9em;
     font-weight: normal;
     text-decoration: none;
     color: #606060;
 }
-div.wiki div.toc a:hover { color: #c61a1a; text-decoration: underline;}
-
-div.wiki div.toc a.heading2 { margin-left: 6px; }
-div.wiki div.toc a.heading3 { margin-left: 12px; font-size: 0.8em; }
+div.wiki ul.toc a:hover { color: #c61a1a; text-decoration: underline;}
 
 /***** My page layout *****/
 .block-receiver {

From 9f92554319144effbab13b688b07d15cdafea89a Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sat, 26 Jul 2008 08:46:33 +0000
Subject: [PATCH 646/710] Redirect user to the previous page after logging in
 (#1679).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1695 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/application.rb             | 25 ++++++++++------------
 app/helpers/application_helper.rb          |  3 ++-
 app/views/account/login.rhtml              |  1 +
 test/functional/account_controller_test.rb | 11 ++++++++++
 4 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/app/controllers/application.rb b/app/controllers/application.rb
index 2daee50de..debe02162 100644
--- a/app/controllers/application.rb
+++ b/app/controllers/application.rb
@@ -15,6 +15,8 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
+require 'uri'
+
 class ApplicationController < ActionController::Base
   before_filter :user_setup, :check_if_login_required, :set_localization
   filter_parameter_logging :password
@@ -77,8 +79,7 @@ class ApplicationController < ActionController::Base
   
   def require_login
     if !User.current.logged?
-      store_location
-      redirect_to :controller => "account", :action => "login"
+      redirect_to :controller => "account", :action => "login", :back_url => request.request_uri
       return false
     end
     true
@@ -115,20 +116,16 @@ class ApplicationController < ActionController::Base
     end
   end
 
-  # store current uri in session.
-  # return to this location by calling redirect_back_or_default
-  def store_location
-    session[:return_to_params] = params
-  end
-
-  # move to the last store_location call or to the passed default one
   def redirect_back_or_default(default)
-    if session[:return_to_params].nil?
-      redirect_to default
-    else
-      redirect_to session[:return_to_params]
-      session[:return_to_params] = nil
+    back_url = params[:back_url]
+    if !back_url.blank?
+      uri = URI.parse(back_url)
+      # do not redirect user to another host
+      if uri.relative? || (uri.host == request.host)
+        redirect_to(back_url) and return
+      end
     end
+    redirect_to default
   end
   
   def render_403
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 6e39d093f..7bcec461e 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -451,7 +451,8 @@ module ApplicationHelper
   end
   
   def back_url_hidden_field_tag
-    hidden_field_tag 'back_url', (params[:back_url] || request.env['HTTP_REFERER'])
+    back_url = params[:back_url] || request.env['HTTP_REFERER']
+    hidden_field_tag('back_url', back_url) unless back_url.blank?
   end
   
   def check_all_links(form_name)
diff --git a/app/views/account/login.rhtml b/app/views/account/login.rhtml
index ea1a1cd44..d8c1f313f 100644
--- a/app/views/account/login.rhtml
+++ b/app/views/account/login.rhtml
@@ -1,5 +1,6 @@
 <div id="login-form">
 <% form_tag({:action=> "login"}) do %>
+<%= back_url_hidden_field_tag %>
 <table>
 <tr>
     <td align="right"><label for="username"><%=l(:field_login)%>:</label></td>
diff --git a/test/functional/account_controller_test.rb b/test/functional/account_controller_test.rb
index 666acf0dd..26218d177 100644
--- a/test/functional/account_controller_test.rb
+++ b/test/functional/account_controller_test.rb
@@ -44,6 +44,17 @@ class AccountControllerTest < Test::Unit::TestCase
     assert_nil assigns(:user)
   end
   
+  def test_login_should_redirect_to_back_url_param
+    # request.uri is "test.host" in test environment
+    post :login, :username => 'jsmith', :password => 'jsmith', :back_url => 'http://test.host/issues/show/1'
+    assert_redirected_to '/issues/show/1'
+  end
+  
+  def test_login_should_not_redirect_to_another_host
+    post :login, :username => 'jsmith', :password => 'jsmith', :back_url => 'http://test.foo/fake'
+    assert_redirected_to '/my/page'
+  end
+
   def test_login_with_wrong_password
     post :login, :username => 'admin', :password => 'bad'
     assert_response :success

From 6ddea3396b6b477591efc2372c2f5bceb9154e5a Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sat, 26 Jul 2008 09:05:26 +0000
Subject: [PATCH 647/710] Adds estimated hours to issue filters (#1678).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1696 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/models/query.rb     |  5 +++--
 test/unit/query_test.rb | 36 +++++++++++++++++++++++++-----------
 2 files changed, 28 insertions(+), 13 deletions(-)

diff --git a/app/models/query.rb b/app/models/query.rb
index 27ab882c6..0ce9a6a21 100644
--- a/app/models/query.rb
+++ b/app/models/query.rb
@@ -88,7 +88,7 @@ class Query < ActiveRecord::Base
                                  :date_past => [ ">t-", "<t-", "t-", "t", "w" ],
                                  :string => [ "=", "~", "!", "!~" ],
                                  :text => [  "~", "!~" ],
-                                 :integer => [ "=", ">=", "<=" ] }
+                                 :integer => [ "=", ">=", "<=", "!*", "*" ] }
 
   cattr_reader :operators_by_filter_type
 
@@ -152,7 +152,8 @@ class Query < ActiveRecord::Base
                            "updated_on" => { :type => :date_past, :order => 10 },
                            "start_date" => { :type => :date, :order => 11 },
                            "due_date" => { :type => :date, :order => 12 },
-                           "done_ratio" =>  { :type => :integer, :order => 13 }}                          
+                           "estimated_hours" => { :type => :integer, :order => 13 },
+                           "done_ratio" =>  { :type => :integer, :order => 14 }}
     
     user_values = []
     user_values << ["<< #{l(:label_me)} >>", "me"] if User.current.logged?
diff --git a/test/unit/query_test.rb b/test/unit/query_test.rb
index 3f77cd835..c243dfbad 100644
--- a/test/unit/query_test.rb
+++ b/test/unit/query_test.rb
@@ -26,11 +26,17 @@ class QueryTest < Test::Unit::TestCase
     assert !query.available_filters.has_key?('cf_3')
   end
   
+  def find_issues_with_query(query)
+    Issue.find :all,
+      :include => [ :assigned_to, :status, :tracker, :project, :priority ], 
+      :conditions => query.statement
+  end
+  
   def test_query_with_multiple_custom_fields
     query = Query.find(1)
     assert query.valid?
     assert query.statement.include?("#{CustomValue.table_name}.value IN ('MySQL')")
-    issues = Issue.find :all,:include => [ :assigned_to, :status, :tracker, :project, :priority ], :conditions => query.statement
+    issues = find_issues_with_query(query)
     assert_equal 1, issues.length
     assert_equal Issue.find(3), issues.first
   end
@@ -41,72 +47,80 @@ class QueryTest < Test::Unit::TestCase
     query.add_filter('cf_1', '!*', [''])
     assert query.statement.include?("#{Issue.table_name}.fixed_version_id IS NULL")
     assert query.statement.include?("#{CustomValue.table_name}.value IS NULL OR #{CustomValue.table_name}.value = ''")
-    issues = Issue.find :all,:include => [ :assigned_to, :status, :tracker, :project, :priority ], :conditions => query.statement
+    find_issues_with_query(query)
   end
   
+  def test_operator_none_for_integer
+    query = Query.new(:project => Project.find(1), :name => '_')
+    query.add_filter('estimated_hours', '!*', [''])
+    issues = find_issues_with_query(query)
+    assert !issues.empty?
+    assert issues.all? {|i| !i.estimated_hours}
+  end
+
   def test_operator_all
     query = Query.new(:project => Project.find(1), :name => '_')
     query.add_filter('fixed_version_id', '*', [''])
     query.add_filter('cf_1', '*', [''])
     assert query.statement.include?("#{Issue.table_name}.fixed_version_id IS NOT NULL")
     assert query.statement.include?("#{CustomValue.table_name}.value IS NOT NULL AND #{CustomValue.table_name}.value <> ''")
-    issues = Issue.find :all,:include => [ :assigned_to, :status, :tracker, :project, :priority ], :conditions => query.statement
+    find_issues_with_query(query)
   end
   
   def test_operator_greater_than
     query = Query.new(:project => Project.find(1), :name => '_')
     query.add_filter('done_ratio', '>=', ['40'])
     assert query.statement.include?("#{Issue.table_name}.done_ratio >= 40")
-    issues = Issue.find :all,:include => [ :assigned_to, :status, :tracker, :project, :priority ], :conditions => query.statement
+    find_issues_with_query(query)
   end
 
   def test_operator_in_more_than
     query = Query.new(:project => Project.find(1), :name => '_')
     query.add_filter('due_date', '>t+', ['15'])
     assert query.statement.include?("#{Issue.table_name}.due_date >=")
-    issues = Issue.find :all,:include => [ :assigned_to, :status, :tracker, :project, :priority ], :conditions => query.statement
+    find_issues_with_query(query)
   end
 
   def test_operator_in_less_than
     query = Query.new(:project => Project.find(1), :name => '_')
     query.add_filter('due_date', '<t+', ['15'])
     assert query.statement.include?("#{Issue.table_name}.due_date BETWEEN")
-    issues = Issue.find :all,:include => [ :assigned_to, :status, :tracker, :project, :priority ], :conditions => query.statement
+    find_issues_with_query(query)
   end
 
   def test_operator_today
     query = Query.new(:project => Project.find(1), :name => '_')
     query.add_filter('due_date', 't', [''])
     assert query.statement.include?("#{Issue.table_name}.due_date BETWEEN")
-    issues = Issue.find :all,:include => [ :assigned_to, :status, :tracker, :project, :priority ], :conditions => query.statement
+    find_issues_with_query(query)
   end
 
   def test_operator_this_week_on_date
     query = Query.new(:project => Project.find(1), :name => '_')
     query.add_filter('due_date', 'w', [''])
     assert query.statement.include?("#{Issue.table_name}.due_date BETWEEN")
-    issues = Issue.find :all,:include => [ :assigned_to, :status, :tracker, :project, :priority ], :conditions => query.statement
+    find_issues_with_query(query)
   end
 
   def test_operator_this_week_on_datetime
     query = Query.new(:project => Project.find(1), :name => '_')
     query.add_filter('created_on', 'w', [''])
     assert query.statement.include?("#{Issue.table_name}.created_on BETWEEN")
-    issues = Issue.find :all,:include => [ :assigned_to, :status, :tracker, :project, :priority ], :conditions => query.statement
+    find_issues_with_query(query)
   end
 
   def test_operator_contains
     query = Query.new(:project => Project.find(1), :name => '_')
     query.add_filter('subject', '~', ['string'])
     assert query.statement.include?("#{Issue.table_name}.subject LIKE '%string%'")
-    issues = Issue.find :all,:include => [ :assigned_to, :status, :tracker, :project, :priority ], :conditions => query.statement
+    find_issues_with_query(query)
   end
   
   def test_operator_does_not_contains
     query = Query.new(:project => Project.find(1), :name => '_')
     query.add_filter('subject', '!~', ['string'])
     assert query.statement.include?("#{Issue.table_name}.subject NOT LIKE '%string%'")
-    issues = Issue.find :all,:include => [ :assigned_to, :status, :tracker, :project, :priority ], :conditions => query.statement
+    find_issues_with_query(query)
   end
   
   def test_default_columns

From b68fd4c04bed4d8c9f7d0ad9d65125c36635c819 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sat, 26 Jul 2008 09:27:07 +0000
Subject: [PATCH 648/710] When moving an issue to another project, reassign it
 to the category with same name if any (#1653).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1697 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/models/issue.rb                |  4 +++-
 test/fixtures/issue_categories.yml |  5 +++++
 test/unit/issue_test.rb            | 15 ++++++++++++---
 3 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/app/models/issue.rb b/app/models/issue.rb
index cae603dd8..e2405a04c 100644
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -77,7 +77,9 @@ class Issue < ActiveRecord::Base
           self.relations_to.clear
         end
         # issue is moved to another project
-        self.category = nil 
+        # reassign to the category with same name if any
+        new_category = category.nil? ? nil : new_project.issue_categories.find_by_name(category.name)
+        self.category = new_category
         self.fixed_version = nil
         self.project = new_project
       end
diff --git a/test/fixtures/issue_categories.yml b/test/fixtures/issue_categories.yml
index 2b74b5977..aa2f70351 100644
--- a/test/fixtures/issue_categories.yml
+++ b/test/fixtures/issue_categories.yml
@@ -14,4 +14,9 @@ issue_categories_003:
   project_id: 2
   assigned_to_id: 
   id: 3
+issue_categories_004: 
+  name: Printing
+  project_id: 2
+  assigned_to_id: 
+  id: 4
   
\ No newline at end of file
diff --git a/test/unit/issue_test.rb b/test/unit/issue_test.rb
index 0d98f89d2..12b4da336 100644
--- a/test/unit/issue_test.rb
+++ b/test/unit/issue_test.rb
@@ -165,17 +165,26 @@ class IssueTest < Test::Unit::TestCase
     assert !issue1.reload.closed?
   end
   
-  def test_move_to_another_project
+  def test_move_to_another_project_with_same_category
     issue = Issue.find(1)
     assert issue.move_to(Project.find(2))
     issue.reload
     assert_equal 2, issue.project_id
-    # Category removed
-    assert_nil issue.category
+    # Category changes
+    assert_equal 4, issue.category_id
     # Make sure time entries were move to the target project
     assert_equal 2, issue.time_entries.first.project_id
   end
   
+  def test_move_to_another_project_without_same_category
+    issue = Issue.find(2)
+    assert issue.move_to(Project.find(2))
+    issue.reload
+    assert_equal 2, issue.project_id
+    # Category cleared
+    assert_nil issue.category_id
+  end
+  
   def test_issue_destroy
     Issue.find(1).destroy
     assert_nil Issue.find_by_id(1)

From 60d066f943c68a348fee3a8350dc5ba88878b69c Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sat, 26 Jul 2008 11:46:24 +0000
Subject: [PATCH 649/710] Wiki page hierarchy (#528). Parent page can be
 assigned on Rename screen.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1698 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/wiki_controller.rb         |  1 +
 app/helpers/application_helper.rb          |  3 +-
 app/helpers/wiki_helper.rb                 | 16 ++++++++
 app/models/wiki_page.rb                    | 21 ++++++++++-
 app/views/wiki/rename.rhtml                |  3 +-
 app/views/wiki/show.rhtml                  |  2 +
 app/views/wiki/special_page_index.rhtml    |  6 +--
 db/migrate/095_add_wiki_pages_parent_id.rb |  9 +++++
 lang/bg.yml                                |  1 +
 lang/cs.yml                                |  1 +
 lang/da.yml                                |  1 +
 lang/de.yml                                |  1 +
 lang/en.yml                                |  1 +
 lang/es.yml                                |  1 +
 lang/fi.yml                                |  1 +
 lang/fr.yml                                |  1 +
 lang/he.yml                                |  1 +
 lang/hu.yml                                |  1 +
 lang/it.yml                                |  1 +
 lang/ja.yml                                |  1 +
 lang/ko.yml                                |  1 +
 lang/lt.yml                                |  1 +
 lang/nl.yml                                |  1 +
 lang/no.yml                                |  1 +
 lang/pl.yml                                |  1 +
 lang/pt-br.yml                             |  1 +
 lang/pt.yml                                |  1 +
 lang/ro.yml                                |  1 +
 lang/ru.yml                                |  1 +
 lang/sr.yml                                |  1 +
 lang/sv.yml                                |  1 +
 lang/th.yml                                |  1 +
 lang/uk.yml                                |  1 +
 lang/zh-tw.yml                             |  1 +
 lang/zh.yml                                |  1 +
 test/fixtures/wiki_pages.yml               |  6 ++-
 test/functional/wiki_controller_test.rb    | 12 +++++-
 test/unit/wiki_page_test.rb                | 44 ++++++++++++++++++++++
 38 files changed, 139 insertions(+), 11 deletions(-)
 create mode 100644 db/migrate/095_add_wiki_pages_parent_id.rb

diff --git a/app/controllers/wiki_controller.rb b/app/controllers/wiki_controller.rb
index 8655cfed7..2430205cf 100644
--- a/app/controllers/wiki_controller.rb
+++ b/app/controllers/wiki_controller.rb
@@ -147,6 +147,7 @@ class WikiController < ApplicationController
                                       :joins => "LEFT JOIN #{WikiContent.table_name} ON #{WikiContent.table_name}.page_id = #{WikiPage.table_name}.id",
                                       :order => 'title'
       @pages_by_date = @pages.group_by {|p| p.updated_on.to_date}
+      @pages_by_parent_id = @pages.group_by(&:parent_id)
     # export wiki to a single html file
     when 'export'
       @pages = @wiki.pages.find :all, :order => 'title'
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 7bcec461e..f5ce7ecda 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -177,7 +177,8 @@ module ApplicationHelper
   end
   
   def breadcrumb(*args)
-    content_tag('p', args.join(' &#187; ') + ' &#187; ', :class => 'breadcrumb')
+    elements = args.flatten
+    elements.any? ? content_tag('p', args.join(' &#187; ') + ' &#187; ', :class => 'breadcrumb') : nil
   end
   
   def html_title(*args)
diff --git a/app/helpers/wiki_helper.rb b/app/helpers/wiki_helper.rb
index 980035bd4..d27ce3ea3 100644
--- a/app/helpers/wiki_helper.rb
+++ b/app/helpers/wiki_helper.rb
@@ -17,6 +17,22 @@
 
 module WikiHelper
 
+  def render_page_hierarchy(pages, node=nil)
+    content = ''
+    if pages[node]
+      content << "<ul class=\"pages-hierarchy\">\n"
+      pages[node].each do |page|
+        content << "<li>"
+        content << link_to(h(page.pretty_title), {:action => 'index', :page => page.title},
+                           :title => l(:label_updated_time, distance_of_time_in_words(Time.now, page.updated_on)))
+        content << "\n" + render_page_hierarchy(pages, page.id) if pages[page.id]
+        content << "</li>\n"
+      end
+      content << "</ul>\n"
+    end
+    content
+  end
+  
   def html_diff(wdiff)
     words = wdiff.words.collect{|word| h(word)}
     words_add = 0
diff --git a/app/models/wiki_page.rb b/app/models/wiki_page.rb
index 65fc1f68c..2416fab74 100644
--- a/app/models/wiki_page.rb
+++ b/app/models/wiki_page.rb
@@ -22,7 +22,8 @@ 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
-
+  acts_as_tree :order => 'title'
+  
   acts_as_event :title => Proc.new {|o| "#{l(:label_wiki)}: #{o.title}"},
                 :description => :text,
                 :datetime => :created_on,
@@ -110,6 +111,24 @@ class WikiPage < ActiveRecord::Base
   def editable_by?(usr)
     !protected? || usr.allowed_to?(:protect_wiki_pages, wiki.project)
   end
+  
+  def parent_title
+    @parent_title || (self.parent && self.parent.pretty_title)
+  end
+  
+  def parent_title=(t)
+    @parent_title = t
+    parent_page = t.blank? ? nil : self.wiki.find_page(t)
+    self.parent = parent_page
+  end
+  
+  protected
+  
+  def validate
+    errors.add(:parent_title, :activerecord_error_invalid) if !@parent_title.blank? && parent.nil?
+    errors.add(:parent_title, :activerecord_error_circular_dependency) if parent && (parent == self || parent.ancestors.include?(self))
+    errors.add(:parent_title, :activerecord_error_not_same_project) if parent && (parent.wiki_id != wiki_id)
+  end
 end
 
 class WikiDiff
diff --git a/app/views/wiki/rename.rhtml b/app/views/wiki/rename.rhtml
index 0c069f43d..260f9af8b 100644
--- a/app/views/wiki/rename.rhtml
+++ b/app/views/wiki/rename.rhtml
@@ -4,8 +4,9 @@
 
 <% labelled_tabular_form_for :wiki_page, @page, :url => { :action => 'rename' } do |f| %>
 <div class="box">
-<p><%= f.text_field :title, :required => true, :size => 255  %></p>
+<p><%= f.text_field :title, :required => true, :size => 100  %></p>
 <p><%= f.check_box :redirect_existing_links %></p>
+<p><%= f.text_field :parent_title, :size => 100  %></p>
 </div>
 <%= submit_tag l(:button_rename) %>
 <% end %>
diff --git a/app/views/wiki/show.rhtml b/app/views/wiki/show.rhtml
index 8092525bd..255b904f5 100644
--- a/app/views/wiki/show.rhtml
+++ b/app/views/wiki/show.rhtml
@@ -10,6 +10,8 @@
 <%= link_to(l(:label_history), {:action => 'history', :page => @page.title}, :class => 'icon icon-history') %>
 </div>
 
+<%= breadcrumb(@page.ancestors.reverse.collect {|parent| link_to h(parent.pretty_title), {:page => parent.title}}) %>
+
 <% if @content.version != @page.content.version %>
     <p>    
     <%= link_to(('&#171; ' + l(:label_previous)), :action => 'index', :page => @page.title, :version => (@content.version - 1)) + " - " if @content.version > 1 %>
diff --git a/app/views/wiki/special_page_index.rhtml b/app/views/wiki/special_page_index.rhtml
index f21cc3423..72b395ef7 100644
--- a/app/views/wiki/special_page_index.rhtml
+++ b/app/views/wiki/special_page_index.rhtml
@@ -4,11 +4,7 @@
 <p class="nodata"><%= l(:label_no_data) %></p>
 <% end %>
 
-<ul><% @pages.each do |page| %>
-    <li><%= link_to page.pretty_title, {:action => 'index', :page => page.title},
-                                       :title => l(:label_updated_time, distance_of_time_in_words(Time.now, page.updated_on)) %>
-    </li>
-<% end %></ul>
+<%= render_page_hierarchy(@pages_by_parent_id) %>
 
 <% content_for :sidebar do %>
   <%= render :partial => 'sidebar' %>
diff --git a/db/migrate/095_add_wiki_pages_parent_id.rb b/db/migrate/095_add_wiki_pages_parent_id.rb
new file mode 100644
index 000000000..36b922ec1
--- /dev/null
+++ b/db/migrate/095_add_wiki_pages_parent_id.rb
@@ -0,0 +1,9 @@
+class AddWikiPagesParentId < ActiveRecord::Migration
+  def self.up
+    add_column :wiki_pages, :parent_id, :integer, :default => nil
+  end
+
+  def self.down
+    remove_column :wiki_pages, :parent_id
+  end
+end
diff --git a/lang/bg.yml b/lang/bg.yml
index c87e3bebc..e8191dc20 100644
--- a/lang/bg.yml
+++ b/lang/bg.yml
@@ -632,3 +632,4 @@ label_generate_key: Generate a key
 setting_mail_handler_api_enabled: Enable WS for incoming emails
 setting_mail_handler_api_key: API key
 text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."
+field_parent_title: Parent page
diff --git a/lang/cs.yml b/lang/cs.yml
index 6669c6cf3..68273191a 100644
--- a/lang/cs.yml
+++ b/lang/cs.yml
@@ -637,3 +637,4 @@ label_generate_key: Generate a key
 setting_mail_handler_api_enabled: Enable WS for incoming emails
 setting_mail_handler_api_key: API key
 text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."
+field_parent_title: Parent page
diff --git a/lang/da.yml b/lang/da.yml
index cf40e1763..1b5aba69c 100644
--- a/lang/da.yml
+++ b/lang/da.yml
@@ -634,3 +634,4 @@ label_generate_key: Generate a key
 setting_mail_handler_api_enabled: Enable WS for incoming emails
 setting_mail_handler_api_key: API key
 text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."
+field_parent_title: Parent page
diff --git a/lang/de.yml b/lang/de.yml
index adc3dd4e9..dc2960c9c 100644
--- a/lang/de.yml
+++ b/lang/de.yml
@@ -633,3 +633,4 @@ label_generate_key: Generate a key
 setting_mail_handler_api_enabled: Enable WS for incoming emails
 setting_mail_handler_api_key: API key
 text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."
+field_parent_title: Parent page
diff --git a/lang/en.yml b/lang/en.yml
index 791094674..3cc788b8c 100644
--- a/lang/en.yml
+++ b/lang/en.yml
@@ -182,6 +182,7 @@ field_time_zone: Time zone
 field_searchable: Searchable
 field_default_value: Default value
 field_comments_sorting: Display comments
+field_parent_title: Parent page
 
 setting_app_title: Application title
 setting_app_subtitle: Application subtitle
diff --git a/lang/es.yml b/lang/es.yml
index 4205402e4..c753f367f 100644
--- a/lang/es.yml
+++ b/lang/es.yml
@@ -635,3 +635,4 @@ label_generate_key: Generate a key
 setting_mail_handler_api_enabled: Enable WS for incoming emails
 setting_mail_handler_api_key: API key
 text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."
+field_parent_title: Parent page
diff --git a/lang/fi.yml b/lang/fi.yml
index b69b07557..b48d8a319 100644
--- a/lang/fi.yml
+++ b/lang/fi.yml
@@ -632,3 +632,4 @@ label_generate_key: Generate a key
 setting_mail_handler_api_enabled: Enable WS for incoming emails
 setting_mail_handler_api_key: API key
 text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."
+field_parent_title: Parent page
diff --git a/lang/fr.yml b/lang/fr.yml
index 5b0f04fb0..b9d542da6 100644
--- a/lang/fr.yml
+++ b/lang/fr.yml
@@ -183,6 +183,7 @@ field_time_zone: Fuseau horaire
 field_searchable: Utilisé pour les recherches
 field_default_value: Valeur par défaut
 field_comments_sorting: Afficher les commentaires
+field_parent_title: Page parent
 
 setting_app_title: Titre de l'application
 setting_app_subtitle: Sous-titre de l'application
diff --git a/lang/he.yml b/lang/he.yml
index 030e09dcc..63aa2bb64 100644
--- a/lang/he.yml
+++ b/lang/he.yml
@@ -632,3 +632,4 @@ label_generate_key: Generate a key
 setting_mail_handler_api_enabled: Enable WS for incoming emails
 setting_mail_handler_api_key: API key
 text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."
+field_parent_title: Parent page
diff --git a/lang/hu.yml b/lang/hu.yml
index 630294c9d..9becbb349 100644
--- a/lang/hu.yml
+++ b/lang/hu.yml
@@ -633,3 +633,4 @@ label_generate_key: Kulcs generálása
 setting_mail_handler_api_enabled: Web Service engedélyezése a beérkezett levelekhez
 setting_mail_handler_api_key: API kulcs
 text_email_delivery_not_configured: "Az E-mail küldés nincs konfigurálva, és az értesítések ki vannak kapcsolva.\nÁllítsd be az SMTP szervert a config/email.yml fájlban és indítsd újra az alkalmazást, hogy érvénybe lépjen."
+field_parent_title: Parent page
diff --git a/lang/it.yml b/lang/it.yml
index 471ef49ed..e7a8772cc 100644
--- a/lang/it.yml
+++ b/lang/it.yml
@@ -632,3 +632,4 @@ label_generate_key: Genera una chiave
 setting_mail_handler_api_enabled: Abilita WS per le e-mail in arrivo
 setting_mail_handler_api_key: chiave API
 text_email_delivery_not_configured: "La consegna via e-mail non è configurata e le notifiche sono disabilitate.\nConfigura il tuo server SMTP in config/email.yml e riavvia l'applicazione per abilitarle."
+field_parent_title: Parent page
diff --git a/lang/ja.yml b/lang/ja.yml
index cba410f6d..f78fcdba4 100644
--- a/lang/ja.yml
+++ b/lang/ja.yml
@@ -633,3 +633,4 @@ label_generate_key: Generate a key
 setting_mail_handler_api_enabled: Enable WS for incoming emails
 setting_mail_handler_api_key: API key
 text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."
+field_parent_title: Parent page
diff --git a/lang/ko.yml b/lang/ko.yml
index 2b5b0eb0a..77672c601 100644
--- a/lang/ko.yml
+++ b/lang/ko.yml
@@ -632,3 +632,4 @@ label_generate_key: Generate a key
 setting_mail_handler_api_enabled: Enable WS for incoming emails
 setting_mail_handler_api_key: API key
 text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."
+field_parent_title: Parent page
diff --git a/lang/lt.yml b/lang/lt.yml
index 52b6b6fc8..706133bfe 100644
--- a/lang/lt.yml
+++ b/lang/lt.yml
@@ -635,3 +635,4 @@ setting_mail_handler_api_enabled: Įgalinti WS įeinantiems laiškams
 setting_mail_handler_api_key: API raktas
 
 text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."
+field_parent_title: Parent page
diff --git a/lang/nl.yml b/lang/nl.yml
index 09cdc3c08..3cfb0aa19 100644
--- a/lang/nl.yml
+++ b/lang/nl.yml
@@ -633,3 +633,4 @@ label_generate_key: Generate a key
 setting_mail_handler_api_enabled: Enable WS for incoming emails
 setting_mail_handler_api_key: API key
 text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."
+field_parent_title: Parent page
diff --git a/lang/no.yml b/lang/no.yml
index eb1ff59ca..0836bd48f 100644
--- a/lang/no.yml
+++ b/lang/no.yml
@@ -633,3 +633,4 @@ label_generate_key: Generate a key
 setting_mail_handler_api_enabled: Enable WS for incoming emails
 setting_mail_handler_api_key: API key
 text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."
+field_parent_title: Parent page
diff --git a/lang/pl.yml b/lang/pl.yml
index 9c5a382b0..278d56a88 100644
--- a/lang/pl.yml
+++ b/lang/pl.yml
@@ -632,3 +632,4 @@ label_generate_key: Generate a key
 setting_mail_handler_api_enabled: Enable WS for incoming emails
 setting_mail_handler_api_key: API key
 text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."
+field_parent_title: Parent page
diff --git a/lang/pt-br.yml b/lang/pt-br.yml
index 1582e568f..9276d768e 100644
--- a/lang/pt-br.yml
+++ b/lang/pt-br.yml
@@ -632,3 +632,4 @@ label_generate_key: Generate a key
 setting_mail_handler_api_enabled: Enable WS for incoming emails
 setting_mail_handler_api_key: API key
 text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."
+field_parent_title: Parent page
diff --git a/lang/pt.yml b/lang/pt.yml
index ece12cd97..a7647e31f 100644
--- a/lang/pt.yml
+++ b/lang/pt.yml
@@ -632,3 +632,4 @@ label_generate_key: Generate a key
 setting_mail_handler_api_enabled: Enable WS for incoming emails
 setting_mail_handler_api_key: API key
 text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."
+field_parent_title: Parent page
diff --git a/lang/ro.yml b/lang/ro.yml
index 50bbf29af..c3640d7e1 100644
--- a/lang/ro.yml
+++ b/lang/ro.yml
@@ -632,3 +632,4 @@ label_generate_key: Generate a key
 setting_mail_handler_api_enabled: Enable WS for incoming emails
 setting_mail_handler_api_key: API key
 text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."
+field_parent_title: Parent page
diff --git a/lang/ru.yml b/lang/ru.yml
index c0cac30a0..e8bda05b7 100644
--- a/lang/ru.yml
+++ b/lang/ru.yml
@@ -636,3 +636,4 @@ label_generate_key: Сгенерировать ключ
 setting_mail_handler_api_enabled: Включить веб-сервис для входящих сообщений
 setting_mail_handler_api_key: API ключ
 text_email_delivery_not_configured: "Параметры работы с почтовым сервером не настроены и функция уведомления по email не активна.\nНастроить параметры для вашего SMTP сервера вы можете в файле config/email.yml. Для применения изменений перезапустите приложение."
+field_parent_title: Parent page
diff --git a/lang/sr.yml b/lang/sr.yml
index fa1b4d847..688fa8ede 100644
--- a/lang/sr.yml
+++ b/lang/sr.yml
@@ -633,3 +633,4 @@ label_generate_key: Generate a key
 setting_mail_handler_api_enabled: Enable WS for incoming emails
 setting_mail_handler_api_key: API key
 text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."
+field_parent_title: Parent page
diff --git a/lang/sv.yml b/lang/sv.yml
index 9015099e7..58507a0b7 100644
--- a/lang/sv.yml
+++ b/lang/sv.yml
@@ -633,3 +633,4 @@ label_generate_key: Generate a key
 setting_mail_handler_api_enabled: Enable WS for incoming emails
 setting_mail_handler_api_key: API key
 text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."
+field_parent_title: Parent page
diff --git a/lang/th.yml b/lang/th.yml
index 27f7b14cf..a7f949c96 100644
--- a/lang/th.yml
+++ b/lang/th.yml
@@ -635,3 +635,4 @@ label_generate_key: Generate a key
 setting_mail_handler_api_enabled: Enable WS for incoming emails
 setting_mail_handler_api_key: API key
 text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."
+field_parent_title: Parent page
diff --git a/lang/uk.yml b/lang/uk.yml
index 0286779be..766ddaaab 100644
--- a/lang/uk.yml
+++ b/lang/uk.yml
@@ -634,3 +634,4 @@ label_generate_key: Generate a key
 setting_mail_handler_api_enabled: Enable WS for incoming emails
 setting_mail_handler_api_key: API key
 text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."
+field_parent_title: Parent page
diff --git a/lang/zh-tw.yml b/lang/zh-tw.yml
index bad6fcca5..82f26ab86 100644
--- a/lang/zh-tw.yml
+++ b/lang/zh-tw.yml
@@ -633,3 +633,4 @@ default_activity_development: 開發
 enumeration_issue_priorities: 項目優先權
 enumeration_doc_categories: 文件分類
 enumeration_activities: 活動 (時間追蹤)
+field_parent_title: Parent page
diff --git a/lang/zh.yml b/lang/zh.yml
index 1cde9f502..b4ae89ba7 100644
--- a/lang/zh.yml
+++ b/lang/zh.yml
@@ -633,3 +633,4 @@ enumeration_issue_priorities: 问题优先级
 enumeration_doc_categories: 文档类别
 enumeration_activities: 活动（时间跟踪）
 text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."
+field_parent_title: Parent page
diff --git a/test/fixtures/wiki_pages.yml b/test/fixtures/wiki_pages.yml
index ef7242430..e285441ff 100644
--- a/test/fixtures/wiki_pages.yml
+++ b/test/fixtures/wiki_pages.yml
@@ -4,23 +4,27 @@ wiki_pages_001:
   title: CookBook_documentation
   id: 1
   wiki_id: 1
-  protected: true  
+  protected: true
+  parent_id: 
 wiki_pages_002: 
   created_on: 2007-03-08 00:18:07 +01:00
   title: Another_page
   id: 2
   wiki_id: 1
   protected: false
+  parent_id: 
 wiki_pages_003: 
   created_on: 2007-03-08 00:18:07 +01:00
   title: Start_page
   id: 3
   wiki_id: 2
   protected: false
+  parent_id: 
 wiki_pages_004: 
   created_on: 2007-03-08 00:18:07 +01:00
   title: Page_with_an_inline_image
   id: 4
   wiki_id: 1
   protected: false
+  parent_id: 1
   
\ No newline at end of file
diff --git a/test/functional/wiki_controller_test.rb b/test/functional/wiki_controller_test.rb
index f1ae7a9c2..06d8cacf2 100644
--- a/test/functional/wiki_controller_test.rb
+++ b/test/functional/wiki_controller_test.rb
@@ -163,8 +163,16 @@ class WikiControllerTest < Test::Unit::TestCase
     pages = assigns(:pages)
     assert_not_nil pages
     assert_equal Project.find(1).wiki.pages.size, pages.size
-    assert_tag :tag => 'a', :attributes => { :href => '/wiki/ecookbook/CookBook_documentation' },
-                            :content => /CookBook documentation/
+    
+    assert_tag :ul, :attributes => { :class => 'pages-hierarchy' },
+                    :child => { :tag => 'li', :child => { :tag => 'a', :attributes => { :href => '/wiki/ecookbook/CookBook_documentation' },
+                                              :content => 'CookBook documentation' },
+                                :child => { :tag => 'ul',
+                                            :child => { :tag => 'li',
+                                                        :child => { :tag => 'a', :attributes => { :href => '/wiki/ecookbook/Page_with_an_inline_image' },
+                                                                                 :content => 'Page with an inline image' } } } },
+                    :child => { :tag => 'li', :child => { :tag => 'a', :attributes => { :href => '/wiki/ecookbook/Another_page' },
+                                                                       :content => 'Another page' } }
   end
   
   def test_not_found
diff --git a/test/unit/wiki_page_test.rb b/test/unit/wiki_page_test.rb
index bb8111176..e5ebeeea6 100644
--- a/test/unit/wiki_page_test.rb
+++ b/test/unit/wiki_page_test.rb
@@ -48,6 +48,50 @@ class WikiPageTest < Test::Unit::TestCase
     assert page.new_record?
   end
   
+  def test_parent_title
+    page = WikiPage.find_by_title('Another_page')
+    assert_nil page.parent_title
+    
+    page = WikiPage.find_by_title('Page_with_an_inline_image')
+    assert_equal 'CookBook documentation', page.parent_title
+  end
+  
+  def test_assign_parent
+    page = WikiPage.find_by_title('Another_page')
+    page.parent_title = 'CookBook documentation'
+    assert page.save
+    page.reload
+    assert_equal WikiPage.find_by_title('CookBook_documentation'), page.parent
+  end
+  
+  def test_unassign_parent
+    page = WikiPage.find_by_title('Page_with_an_inline_image')
+    page.parent_title = ''
+    assert page.save
+    page.reload
+    assert_nil page.parent
+  end
+  
+  def test_parent_validation
+    page = WikiPage.find_by_title('CookBook_documentation')
+    
+    # A page that doesn't exist
+    page.parent_title = 'Unknown title'
+    assert !page.save
+    assert_equal :activerecord_error_invalid, page.errors.on(:parent_title)
+    # A child page
+    page.parent_title = 'Page_with_an_inline_image'
+    assert !page.save
+    assert_equal :activerecord_error_circular_dependency, page.errors.on(:parent_title)
+    # The page itself
+    page.parent_title = 'CookBook_documentation'
+    assert !page.save
+    assert_equal :activerecord_error_circular_dependency, page.errors.on(:parent_title)
+
+    page.parent_title = 'Another_page'
+    assert page.save
+  end
+  
   def test_destroy
     page = WikiPage.find(1)
     page.destroy

From ec7d1359301b28a506d3c9e9ad5785cf84d3fcd9 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sat, 26 Jul 2008 12:54:54 +0000
Subject: [PATCH 650/710] Adds child_pages macro for wiki pages (#528).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1699 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/wiki_controller.rb                        | 5 ++++-
 app/helpers/application_helper.rb                         | 2 +-
 app/helpers/wiki_helper.rb                                | 2 +-
 app/views/common/_preview.rhtml                           | 2 +-
 lib/redmine/wiki_formatting/macros.rb                     | 6 ++++++
 test/fixtures/wiki_contents.yml                           | 2 +-
 test/functional/wiki_controller_test.rb                   | 8 +++++++-
 .../plugins/acts_as_tree/lib/active_record/acts/tree.rb   | 7 +++++++
 8 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/app/controllers/wiki_controller.rb b/app/controllers/wiki_controller.rb
index 2430205cf..5a5f3949f 100644
--- a/app/controllers/wiki_controller.rb
+++ b/app/controllers/wiki_controller.rb
@@ -165,7 +165,10 @@ class WikiController < ApplicationController
     page = @wiki.find_page(params[:page])
     # page is nil when previewing a new page
     return render_403 unless page.nil? || editable?(page)
-    @attachements = page.attachments if page
+    if page
+      @attachements = page.attachments
+      @previewed = page.content
+    end
     @text = params[:content][:text]
     render :partial => 'common/preview'
   end
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index f5ce7ecda..6d6eb9107 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -206,7 +206,7 @@ module ApplicationHelper
     options = args.last.is_a?(Hash) ? args.pop : {}
     case args.size
     when 1
-      obj = nil
+      obj = options[:object]
       text = args.shift
     when 2
       obj = args.shift
diff --git a/app/helpers/wiki_helper.rb b/app/helpers/wiki_helper.rb
index d27ce3ea3..0a6b810de 100644
--- a/app/helpers/wiki_helper.rb
+++ b/app/helpers/wiki_helper.rb
@@ -24,7 +24,7 @@ module WikiHelper
       pages[node].each do |page|
         content << "<li>"
         content << link_to(h(page.pretty_title), {:action => 'index', :page => page.title},
-                           :title => l(:label_updated_time, distance_of_time_in_words(Time.now, page.updated_on)))
+                           :title => (page.respond_to?(:updated_on) ? l(:label_updated_time, distance_of_time_in_words(Time.now, page.updated_on)) : nil))
         content << "\n" + render_page_hierarchy(pages, page.id) if pages[page.id]
         content << "</li>\n"
       end
diff --git a/app/views/common/_preview.rhtml b/app/views/common/_preview.rhtml
index e3bfc3a25..fd95f1188 100644
--- a/app/views/common/_preview.rhtml
+++ b/app/views/common/_preview.rhtml
@@ -1,3 +1,3 @@
 <fieldset class="preview"><legend><%= l(:label_preview) %></legend>
-<%= textilizable @text, :attachments => @attachements %>
+<%= textilizable @text, :attachments => @attachements, :object => @previewed %>
 </fieldset>
diff --git a/lib/redmine/wiki_formatting/macros.rb b/lib/redmine/wiki_formatting/macros.rb
index 0848aee4e..adfc590e4 100644
--- a/lib/redmine/wiki_formatting/macros.rb
+++ b/lib/redmine/wiki_formatting/macros.rb
@@ -77,6 +77,12 @@ module Redmine
         content_tag('dl', out)
       end
       
+      desc "Displays a list of child pages."
+      macro :child_pages do |obj, args|
+        raise 'This macro applies to wiki pages only.' unless obj.is_a?(WikiContent)
+        render_page_hierarchy(obj.page.descendants.group_by(&:parent_id), obj.page.id)
+      end
+      
       desc "Include a wiki page. Example:\n\n  !{{include(Foo)}}\n\nor to include a page of a specific project wiki:\n\n  !{{include(projectname:Foo)}}"
       macro :include do |obj, args|
         project = @project
diff --git a/test/fixtures/wiki_contents.yml b/test/fixtures/wiki_contents.yml
index 5d6d3f1de..8c53d4d97 100644
--- a/test/fixtures/wiki_contents.yml
+++ b/test/fixtures/wiki_contents.yml
@@ -2,7 +2,7 @@
 wiki_contents_001: 
   text: |-
     h1. CookBook documentation

-    

+    {{child_pages}}

     Some updated [[documentation]] here with gzipped history
   updated_on: 2007-03-07 00:10:51 +01:00
   page_id: 1
diff --git a/test/functional/wiki_controller_test.rb b/test/functional/wiki_controller_test.rb
index 06d8cacf2..bbfdc8e7f 100644
--- a/test/functional/wiki_controller_test.rb
+++ b/test/functional/wiki_controller_test.rb
@@ -32,10 +32,16 @@ class WikiControllerTest < Test::Unit::TestCase
   end
   
   def test_show_start_page
-    get :index, :id => 1
+    get :index, :id => 'ecookbook'
     assert_response :success
     assert_template 'show'
     assert_tag :tag => 'h1', :content => /CookBook documentation/
+
+    # child_pages macro
+    assert_tag :ul, :attributes => { :class => 'pages-hierarchy' },
+               :child => { :tag => 'li',
+                           :child => { :tag => 'a', :attributes => { :href => '/wiki/ecookbook/Page_with_an_inline_image' },
+                                                    :content => 'Page with an inline image' } }
   end
   
   def test_show_page_with_name
diff --git a/vendor/plugins/acts_as_tree/lib/active_record/acts/tree.rb b/vendor/plugins/acts_as_tree/lib/active_record/acts/tree.rb
index 1f00e90a9..6a6827ee6 100644
--- a/vendor/plugins/acts_as_tree/lib/active_record/acts/tree.rb
+++ b/vendor/plugins/acts_as_tree/lib/active_record/acts/tree.rb
@@ -70,6 +70,13 @@ module ActiveRecord
           nodes
         end
 
+        # Returns list of descendants.
+        #
+        #   root.descendants # => [child1, subchild1, subchild2]
+        def descendants
+          children + children.collect(&:children).flatten
+        end
+
         # Returns the root node of the tree.
         def root
           node = self

From 1721376542af256263d605a16c3981eca9e3733a Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 27 Jul 2008 10:23:07 +0000
Subject: [PATCH 651/710] Fixes tests (r1693).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1700 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 test/unit/helpers/application_helper_test.rb | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/test/unit/helpers/application_helper_test.rb b/test/unit/helpers/application_helper_test.rb
index 9559b76cc..eea4a83f8 100644
--- a/test/unit/helpers/application_helper_test.rb
+++ b/test/unit/helpers/application_helper_test.rb
@@ -214,14 +214,14 @@ h1. Another title
 
 RAW
 
-    expected = '<div class="toc">' +
-               '<a href="#1" class="heading1">Title</a>' +
-               '<a href="#2" class="heading2">Subtitle</a>' + 
-               '<a href="#3" class="heading2">Subtitle with red text</a>' +
-               '<a href="#4" class="heading1">Another title</a>' +
-               '</div>'
+    expected = '<ul class="toc">' +
+               '<li class="heading1"><a href="#1">Title</a></li>' +
+               '<li class="heading2"><a href="#2">Subtitle</a></li>' + 
+               '<li class="heading2"><a href="#3">Subtitle with red text</a></li>' +
+               '<li class="heading1"><a href="#4">Another title</a></li>' +
+               '</ul>'
                
-    assert textilizable(raw).include?(expected)
+    assert textilizable(raw).gsub("\n", "").include?(expected)
   end
   
   def test_blockquote

From a774c5c48b5e596770340b6ac27ea9f0a1e1141f Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 27 Jul 2008 17:54:09 +0000
Subject: [PATCH 652/710] Activity refactoring.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1701 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/projects_controller.rb        | 92 ++-----------------
 app/models/attachment.rb                      | 12 +++
 app/models/changeset.rb                       |  3 +
 app/models/document.rb                        |  3 +-
 app/models/issue.rb                           |  2 +
 app/models/journal.rb                         |  6 ++
 app/models/message.rb                         |  4 +-
 app/models/news.rb                            |  3 +-
 app/models/wiki_content.rb                    | 11 +++
 app/views/projects/activity.rhtml             |  4 +-
 lib/redmine.rb                                | 11 +++
 lib/redmine/activity.rb                       | 54 +++++++++++
 lib/redmine/activity/fetcher.rb               | 79 ++++++++++++++++
 test/functional/projects_controller_test.rb   | 61 +++---------
 test/unit/activity_test.rb                    | 71 ++++++++++++++
 .../plugins/acts_as_activity_provider/init.rb |  2 +
 .../lib/acts_as_activity_provider.rb          | 68 ++++++++++++++
 17 files changed, 353 insertions(+), 133 deletions(-)
 create mode 100644 lib/redmine/activity.rb
 create mode 100644 lib/redmine/activity/fetcher.rb
 create mode 100644 test/unit/activity_test.rb
 create mode 100644 vendor/plugins/acts_as_activity_provider/init.rb
 create mode 100644 vendor/plugins/acts_as_activity_provider/lib/acts_as_activity_provider.rb

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 3af77d1ac..ce4b24b8b 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -226,94 +226,22 @@ class ProjectsController < ApplicationController
 
     @date_to ||= Date.today + 1
     @date_from = @date_to - @days
+    @with_subprojects = params[:with_subprojects].nil? ? Setting.display_subprojects_issues? : (params[:with_subprojects] == '1')
     
-    @event_types = %w(issues news files documents changesets wiki_pages messages)
-    if @project
-      @event_types.delete('wiki_pages') unless @project.wiki
-      @event_types.delete('changesets') unless @project.repository
-      @event_types.delete('messages') unless @project.boards.any?
-      # only show what the user is allowed to view
-      @event_types = @event_types.select {|o| User.current.allowed_to?("view_#{o}".to_sym, @project)}
-      @with_subprojects = params[:with_subprojects].nil? ? Setting.display_subprojects_issues? : (params[:with_subprojects] == '1')
-    end
-    @scope = @event_types.select {|t| params["show_#{t}"]}
-    # default events if none is specified in parameters
-    @scope = (@event_types - %w(wiki_pages messages))if @scope.empty?
-    
-    @events = []    
-    
-    if @scope.include?('issues')
-      cond = ARCondition.new(Project.allowed_to_condition(User.current, :view_issues, :project => @project, :with_subprojects => @with_subprojects))
-      cond.add(["#{Issue.table_name}.created_on BETWEEN ? AND ?", @date_from, @date_to])
-      @events += Issue.find(:all, :include => [:project, :author, :tracker], :conditions => cond.conditions)
-      
-      cond = ARCondition.new(Project.allowed_to_condition(User.current, :view_issues, :project => @project, :with_subprojects => @with_subprojects))
-      cond.add(["#{Journal.table_name}.journalized_type = 'Issue' AND #{Journal.table_name}.created_on BETWEEN ? AND ?", @date_from, @date_to])
-      cond.add("#{JournalDetail.table_name}.prop_key = 'status_id' OR #{Journal.table_name}.notes <> ''")
-      @events += Journal.find(:all, :include => [{:issue => :project}, :details, :user], :conditions => cond.conditions)
-    end
-    
-    if @scope.include?('news')
-      cond = ARCondition.new(Project.allowed_to_condition(User.current, :view_news, :project => @project, :with_subprojects => @with_subprojects))
-      cond.add(["#{News.table_name}.created_on BETWEEN ? AND ?", @date_from, @date_to])
-      @events += News.find(:all, :include => [:project, :author], :conditions => cond.conditions)
-    end
-    
-    if @scope.include?('files')
-      cond = ARCondition.new(Project.allowed_to_condition(User.current, :view_files, :project => @project, :with_subprojects => @with_subprojects))
-      cond.add(["#{Attachment.table_name}.created_on BETWEEN ? AND ?", @date_from, @date_to])
-      @events += Attachment.find(:all, :select => "#{Attachment.table_name}.*", 
-                                       :joins => "LEFT JOIN #{Version.table_name} ON #{Attachment.table_name}.container_type='Version' AND #{Version.table_name}.id = #{Attachment.table_name}.container_id " +
-                                                 "LEFT JOIN #{Project.table_name} ON #{Version.table_name}.project_id = #{Project.table_name}.id",
-                                       :conditions => cond.conditions)
-    end
-    
-    if @scope.include?('documents')
-      cond = ARCondition.new(Project.allowed_to_condition(User.current, :view_documents, :project => @project, :with_subprojects => @with_subprojects))
-      cond.add(["#{Document.table_name}.created_on BETWEEN ? AND ?", @date_from, @date_to])
-      @events += Document.find(:all, :include => :project, :conditions => cond.conditions)
-      
-      cond = ARCondition.new(Project.allowed_to_condition(User.current, :view_documents, :project => @project, :with_subprojects => @with_subprojects))
-      cond.add(["#{Attachment.table_name}.created_on BETWEEN ? AND ?", @date_from, @date_to])
-      @events += Attachment.find(:all, :select => "#{Attachment.table_name}.*", 
-                                       :joins => "LEFT JOIN #{Document.table_name} ON #{Attachment.table_name}.container_type='Document' AND #{Document.table_name}.id = #{Attachment.table_name}.container_id " +
-                                                 "LEFT JOIN #{Project.table_name} ON #{Document.table_name}.project_id = #{Project.table_name}.id",
-                                       :conditions => cond.conditions)
-    end
-    
-    if @scope.include?('wiki_pages')
-      select = "#{WikiContent.versioned_table_name}.updated_on, #{WikiContent.versioned_table_name}.comments, " +
-               "#{WikiContent.versioned_table_name}.#{WikiContent.version_column}, #{WikiPage.table_name}.title, " +
-               "#{WikiContent.versioned_table_name}.page_id, #{WikiContent.versioned_table_name}.author_id, " +
-               "#{WikiContent.versioned_table_name}.id"
-      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 " +
-              "LEFT JOIN #{Project.table_name} ON #{Project.table_name}.id = #{Wiki.table_name}.project_id"
+    @activity = Redmine::Activity::Fetcher.new(User.current, :project => @project, :with_subprojects => @with_subprojects)
+    @activity.scope_select {|t| !params["show_#{t}"].nil?}
+    @activity.default_scope! if @activity.scope.empty?
 
-      cond = ARCondition.new(Project.allowed_to_condition(User.current, :view_wiki_pages, :project => @project, :with_subprojects => @with_subprojects))
-      cond.add(["#{WikiContent.versioned_table_name}.updated_on BETWEEN ? AND ?", @date_from, @date_to])
-      @events += WikiContent.versioned_class.find(:all, :select => select, :joins => joins, :conditions => cond.conditions)
-    end
-
-    if @scope.include?('changesets')
-      cond = ARCondition.new(Project.allowed_to_condition(User.current, :view_changesets, :project => @project, :with_subprojects => @with_subprojects))
-      cond.add(["#{Changeset.table_name}.committed_on BETWEEN ? AND ?", @date_from, @date_to])
-      @events += Changeset.find(:all, :include => {:repository => :project}, :conditions => cond.conditions)
-    end
-    
-    if @scope.include?('messages')
-      cond = ARCondition.new(Project.allowed_to_condition(User.current, :view_messages, :project => @project, :with_subprojects => @with_subprojects))
-      cond.add(["#{Message.table_name}.created_on BETWEEN ? AND ?", @date_from, @date_to])
-      @events += Message.find(:all, :include => [{:board => :project}, :author], :conditions => cond.conditions)
-    end
-    
-    @events_by_day = @events.group_by(&:event_date)
+    events = @activity.events(@date_from, @date_to)
     
     respond_to do |format|
-      format.html { render :layout => false if request.xhr? }
+      format.html { 
+        @events_by_day = events.group_by(&:event_date)
+        render :layout => false if request.xhr?
+      }
       format.atom {
         title = (@scope.size == 1) ? l("label_#{@scope.first.singularize}_plural") : l(:label_activity)
-        render_feed(@events, :title => "#{@project || Setting.app_title}: #{title}")
+        render_feed(events, :title => "#{@project || Setting.app_title}: #{title}")
       }
     end
   end
diff --git a/app/models/attachment.rb b/app/models/attachment.rb
index 8f3f530c7..95ba8491f 100644
--- a/app/models/attachment.rb
+++ b/app/models/attachment.rb
@@ -28,6 +28,18 @@ class Attachment < ActiveRecord::Base
   acts_as_event :title => :filename,
                 :url => Proc.new {|o| {:controller => 'attachments', :action => 'download', :id => o.id, :filename => o.filename}}
 
+  acts_as_activity_provider :type => 'files',
+                            :permission => :view_files,
+                            :find_options => {:select => "#{Attachment.table_name}.*", 
+                                              :joins => "LEFT JOIN #{Version.table_name} ON #{Attachment.table_name}.container_type='Version' AND #{Version.table_name}.id = #{Attachment.table_name}.container_id " +
+                                                        "LEFT JOIN #{Project.table_name} ON #{Version.table_name}.project_id = #{Project.table_name}.id"}
+  
+  acts_as_activity_provider :type => 'documents',
+                            :permission => :view_documents,
+                            :find_options => {:select => "#{Attachment.table_name}.*", 
+                                              :joins => "LEFT JOIN #{Document.table_name} ON #{Attachment.table_name}.container_type='Document' AND #{Document.table_name}.id = #{Attachment.table_name}.container_id " +
+                                                        "LEFT JOIN #{Project.table_name} ON #{Document.table_name}.project_id = #{Project.table_name}.id"}
+
   cattr_accessor :storage_path
   @@storage_path = "#{RAILS_ROOT}/files"
   
diff --git a/app/models/changeset.rb b/app/models/changeset.rb
index 41f5ed86a..0663af34e 100644
--- a/app/models/changeset.rb
+++ b/app/models/changeset.rb
@@ -30,6 +30,9 @@ class Changeset < ActiveRecord::Base
                      :include => {:repository => :project},
                      :project_key => "#{Repository.table_name}.project_id",
                      :date_column => 'committed_on'
+                     
+  acts_as_activity_provider :timestamp => "#{table_name}.committed_on",
+                            :find_options => {:include => {:repository => :project}}
   
   validates_presence_of :repository_id, :revision, :committed_on, :commit_date
   validates_uniqueness_of :revision, :scope => :repository_id
diff --git a/app/models/document.rb b/app/models/document.rb
index 9e2818fc7..627a2418f 100644
--- a/app/models/document.rb
+++ b/app/models/document.rb
@@ -24,7 +24,8 @@ class Document < ActiveRecord::Base
   acts_as_event :title => Proc.new {|o| "#{l(:label_document)}: #{o.title}"},
                 :author => Proc.new {|o| (a = o.attachments.find(:first, :order => "#{Attachment.table_name}.created_on ASC")) ? a.author : nil },
                 :url => Proc.new {|o| {:controller => 'documents', :action => 'show', :id => o.id}}
-
+  acts_as_activity_provider :find_options => {:include => :project}
+  
   validates_presence_of :project, :title, :category
   validates_length_of :title, :maximum => 60
 end
diff --git a/app/models/issue.rb b/app/models/issue.rb
index e2405a04c..7ebe9db99 100644
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -42,6 +42,8 @@ class Issue < ActiveRecord::Base
   acts_as_event :title => Proc.new {|o| "#{o.tracker.name} ##{o.id}: #{o.subject}"},
                 :url => Proc.new {|o| {:controller => 'issues', :action => 'show', :id => o.id}}                
   
+  acts_as_activity_provider :find_options => {:include => [:project, :author, :tracker]}
+  
   validates_presence_of :subject, :description, :priority, :project, :tracker, :author, :status
   validates_length_of :subject, :maximum => 255
   validates_inclusion_of :done_ratio, :in => 0..100
diff --git a/app/models/journal.rb b/app/models/journal.rb
index a427f84e3..71a51290b 100644
--- a/app/models/journal.rb
+++ b/app/models/journal.rb
@@ -31,6 +31,12 @@ class Journal < ActiveRecord::Base
                 :type => Proc.new {|o| (s = o.new_status) ? (s.is_closed? ? 'issue-closed' : 'issue-edit') : 'issue-note' },
                 :url => Proc.new {|o| {:controller => 'issues', :action => 'show', :id => o.issue.id, :anchor => "change-#{o.id}"}}
 
+  acts_as_activity_provider :type => 'issues',
+                            :permission => :view_issues,
+                            :find_options => {:include => [{:issue => :project}, :details, :user],
+                                              :conditions => "#{Journal.table_name}.journalized_type = 'Issue' AND" +
+                                                             " (#{JournalDetail.table_name}.prop_key = 'status_id' OR #{Journal.table_name}.notes <> '')"}
+  
   def save
     # Do not save an empty journal
     (details.empty? && notes.blank?) ? false : super
diff --git a/app/models/message.rb b/app/models/message.rb
index 888bffcc3..80df7a33a 100644
--- a/app/models/message.rb
+++ b/app/models/message.rb
@@ -31,7 +31,9 @@ class Message < ActiveRecord::Base
                 :type => Proc.new {|o| o.parent_id.nil? ? 'message' : 'reply'},
                 :url => Proc.new {|o| {:controller => 'messages', :action => 'show', :board_id => o.board_id}.merge(o.parent_id.nil? ? {:id => o.id} : 
                                                                                                                                        {:id => o.parent_id, :anchor => "message-#{o.id}"})}
-  
+
+  acts_as_activity_provider :find_options => {:include => [{:board => :project}, :author]}
+    
   attr_protected :locked, :sticky
   validates_presence_of :subject, :content
   validates_length_of :subject, :maximum => 255
diff --git a/app/models/news.rb b/app/models/news.rb
index 71e2a2d5e..4c4943b78 100644
--- a/app/models/news.rb
+++ b/app/models/news.rb
@@ -26,7 +26,8 @@ class News < ActiveRecord::Base
 
   acts_as_searchable :columns => ['title', "#{table_name}.description"], :include => :project
   acts_as_event :url => Proc.new {|o| {:controller => 'news', :action => 'show', :id => o.id}}
-
+  acts_as_activity_provider :find_options => {:include => [:project, :author]}
+  
   # returns latest news for projects visible by user
   def self.latest(user=nil, count=5)
     find(:all, :limit => count, :conditions => Project.visible_by(user), :include => [ :author, :project ], :order => "#{News.table_name}.created_on DESC")	
diff --git a/app/models/wiki_content.rb b/app/models/wiki_content.rb
index 724354ad6..f2ee39c4d 100644
--- a/app/models/wiki_content.rb
+++ b/app/models/wiki_content.rb
@@ -35,6 +35,17 @@ class WikiContent < ActiveRecord::Base
                   :type => 'wiki-page',
                   :url => Proc.new {|o| {:controller => 'wiki', :id => o.page.wiki.project_id, :page => o.page.title, :version => o.version}}
 
+    acts_as_activity_provider :type => 'wiki_pages',
+                              :timestamp => "#{WikiContent.versioned_table_name}.updated_on",
+                              :permission => :view_wiki_pages,
+                              :find_options => {:select => "#{WikiContent.versioned_table_name}.updated_on, #{WikiContent.versioned_table_name}.comments, " +
+                                                           "#{WikiContent.versioned_table_name}.#{WikiContent.version_column}, #{WikiPage.table_name}.title, " +
+                                                           "#{WikiContent.versioned_table_name}.page_id, #{WikiContent.versioned_table_name}.author_id, " +
+                                                           "#{WikiContent.versioned_table_name}.id",
+                                                :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 " +
+                                                          "LEFT JOIN #{Project.table_name} ON #{Project.table_name}.id = #{Wiki.table_name}.project_id"}
+
     def text=(plain)
       case Setting.wiki_compression
       when 'gzip'
diff --git a/app/views/projects/activity.rhtml b/app/views/projects/activity.rhtml
index c08cd06f9..fa25812ac 100644
--- a/app/views/projects/activity.rhtml
+++ b/app/views/projects/activity.rhtml
@@ -44,8 +44,8 @@
 <% content_for :sidebar do %>
 <% form_tag({}, :method => :get) do %>
 <h3><%= l(:label_activity) %></h3>
-<p><% @event_types.each do |t| %>
-<label><%= check_box_tag "show_#{t}", 1, @scope.include?(t) %> <%= l("label_#{t.singularize}_plural")%></label><br />
+<p><% @activity.event_types.each do |t| %>
+<label><%= check_box_tag "show_#{t}", 1, @activity.scope.include?(t) %> <%= l("label_#{t.singularize}_plural")%></label><br />
 <% end %></p>
 <% if @project && @project.active_children.any? %>
     <p><label><%= check_box_tag 'with_subprojects', 1, @with_subprojects %> <%=l(:label_subproject_plural)%></label></p>
diff --git a/lib/redmine.rb b/lib/redmine.rb
index 22b60e949..bd413c96c 100644
--- a/lib/redmine.rb
+++ b/lib/redmine.rb
@@ -1,5 +1,6 @@
 require 'redmine/access_control'
 require 'redmine/menu_manager'
+require 'redmine/activity'
 require 'redmine/mime_type'
 require 'redmine/core_ext'
 require 'redmine/themes'
@@ -132,3 +133,13 @@ Redmine::MenuManager.map :project_menu do |menu|
               :if => Proc.new { |p| p.repository && !p.repository.new_record? }
   menu.push :settings, { :controller => 'projects', :action => 'settings' }, :last => true
 end
+
+Redmine::Activity.map do |activity|
+  activity.register :issues, :class_name => %w(Issue Journal)
+  activity.register :changesets
+  activity.register :news
+  activity.register :documents, :class_name => %w(Document Attachment)
+  activity.register :files, :class_name => 'Attachment'
+  activity.register :wiki_pages, :class_name => 'WikiContent::Version', :default => false
+  activity.register :messages, :default => false
+end
diff --git a/lib/redmine/activity.rb b/lib/redmine/activity.rb
new file mode 100644
index 000000000..144ce95ed
--- /dev/null
+++ b/lib/redmine/activity.rb
@@ -0,0 +1,54 @@
+# Redmine - project management software
+# Copyright (C) 2006-2008  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 Redmine
+  module Activity
+  
+    mattr_accessor :available_event_types, :default_event_types, :providers
+    
+    @@available_event_types = []
+    @@default_event_types = []
+    @@providers = Hash.new {|h,k| h[k]=[] }
+
+    class << self
+      def map(&block)
+        yield self
+      end
+      
+      # Registers an activity provider
+      # 
+      # Options:
+      # * :class_name - one or more model(s) that provide these events (inferred from event_type by default)
+      # * :default - setting this option to false will make the events not displayed by default
+      # 
+      # Examples:
+      #   register :issues
+      #   register :myevents, :class_name => 'Meeting'
+      def register(event_type, options={})
+        options.assert_valid_keys(:class_name, :default)
+        
+        event_type = event_type.to_s
+        providers = options[:class_name] || event_type.classify
+        providers = ([] << providers) unless providers.is_a?(Array)
+        
+        @@available_event_types << event_type unless @@available_event_types.include?(event_type)
+        @@default_event_types << event_type unless options[:default] == false
+        @@providers[event_type] += providers
+      end
+    end
+  end
+end
diff --git a/lib/redmine/activity/fetcher.rb b/lib/redmine/activity/fetcher.rb
new file mode 100644
index 000000000..adaead564
--- /dev/null
+++ b/lib/redmine/activity/fetcher.rb
@@ -0,0 +1,79 @@
+# Redmine - project management software
+# Copyright (C) 2006-2008  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 Redmine
+  module Activity
+    # Class used to retrieve activity events
+    class Fetcher
+      attr_reader :user, :project, :scope
+      
+      # Needs to be unloaded in development mode
+      @@constantized_providers = Hash.new {|h,k| h[k] = Redmine::Activity.providers[k].collect {|t| t.constantize } }
+      
+      def initialize(user, options={})
+        options.assert_valid_keys(:project, :with_subprojects)
+        @user = user
+        @project = options[:project]
+        @options = options
+        
+        @scope = event_types
+      end
+      
+      # Returns an array of available event types
+      def event_types
+        return @event_types unless @event_types.nil?
+        
+        @event_types = Redmine::Activity.available_event_types
+        @event_types = @event_types.select {|o| @user.allowed_to?("view_#{o}".to_sym, @project)} if @project
+        @event_types
+      end
+      
+      # Yields to filter the activity scope
+      def scope_select(&block)
+        @scope = @scope.select {|t| yield t }
+      end
+      
+      # Sets the scope
+      def scope=(s)
+        @scope = s & event_types
+      end
+      
+      # Resets the scope to the default scope
+      def default_scope!
+        @scope = Redmine::Activity.default_event_types
+      end
+      
+      # Returns an array of events for the given date range
+      def events(from, to)
+        e = []
+        
+        @scope.each do |event_type|
+          constantized_providers(event_type).each do |provider|
+            e += provider.find_events(event_type, @user, from, to, @options)
+          end
+        end
+        e
+      end
+      
+      private
+      
+      def constantized_providers(event_type)
+        @@constantized_providers[event_type]
+      end
+    end
+  end
+end
diff --git a/test/functional/projects_controller_test.rb b/test/functional/projects_controller_test.rb
index 4f0a2f179..935d5ba7c 100644
--- a/test/functional/projects_controller_test.rb
+++ b/test/functional/projects_controller_test.rb
@@ -153,10 +153,6 @@ class ProjectsControllerTest < Test::Unit::TestCase
     assert_response :success
     assert_template 'activity'
     assert_not_nil assigns(:events_by_day)
-    assert_not_nil assigns(:events)
-
-    # subproject issue not included by default
-    assert !assigns(:events).include?(Issue.find(5))
     
     assert_tag :tag => "h3", 
                :content => /#{2.days.ago.to_date.day}/,
@@ -168,7 +164,9 @@ class ProjectsControllerTest < Test::Unit::TestCase
                    }
                  }
                }
-               
+  end
+  
+  def test_previous_project_activity
     get :activity, :id => 1, :from => 3.days.ago.to_date
     assert_response :success
     assert_template 'activity'
@@ -186,53 +184,24 @@ class ProjectsControllerTest < Test::Unit::TestCase
                }
   end
   
-  def test_activity_with_subprojects
-    get :activity, :id => 1, :with_subprojects => 1
-    assert_response :success
-    assert_template 'activity'
-    assert_not_nil assigns(:events)
-    
-    assert assigns(:events).include?(Issue.find(1))
-    assert !assigns(:events).include?(Issue.find(4))
-    # subproject issue
-    assert assigns(:events).include?(Issue.find(5))
-  end
-  
-  def test_global_activity_anonymous
+  def test_global_activity
     get :activity
     assert_response :success
     assert_template 'activity'
-    assert_not_nil assigns(:events)
+    assert_not_nil assigns(:events_by_day)
     
-    assert assigns(:events).include?(Issue.find(1))
-    # Issue of a private project
-    assert !assigns(:events).include?(Issue.find(4))
+    assert_tag :tag => "h3", 
+               :content => /#{5.day.ago.to_date.day}/,
+               :sibling => { :tag => "dl",
+                 :child => { :tag => "dt",
+                   :attributes => { :class => /issue/ },
+                   :child => { :tag => "a",
+                     :content => /#{Issue.find(5).subject}/,
+                   }
+                 }
+               }
   end
   
-  def test_global_activity_logged_user
-    @request.session[:user_id] = 2 # manager
-    get :activity
-    assert_response :success
-    assert_template 'activity'
-    assert_not_nil assigns(:events)
-    
-    assert assigns(:events).include?(Issue.find(1))
-    # Issue of a private project the user belongs to
-    assert assigns(:events).include?(Issue.find(4))
-  end
-
-  
-  def test_global_activity_with_all_types
-    get :activity, :show_issues => 1, :show_news => 1, :show_files => 1, :show_documents => 1, :show_changesets => 1, :show_wiki_pages => 1, :show_messages => 1
-    assert_response :success
-    assert_template 'activity'
-    assert_not_nil assigns(:events)
-    
-    assert assigns(:events).include?(Issue.find(1))
-    assert !assigns(:events).include?(Issue.find(4))
-    assert assigns(:events).include?(Message.find(5))
-  end
-
   def test_calendar
     get :calendar, :id => 1
     assert_response :success
diff --git a/test/unit/activity_test.rb b/test/unit/activity_test.rb
new file mode 100644
index 000000000..ccda9f119
--- /dev/null
+++ b/test/unit/activity_test.rb
@@ -0,0 +1,71 @@
+# redMine - project management software
+# Copyright (C) 2006-2008  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 File.dirname(__FILE__) + '/../test_helper'
+
+class ActivityTest < Test::Unit::TestCase
+  fixtures :projects, :versions, :users, :roles, :members, :issues, :journals, :journal_details,
+           :trackers, :projects_trackers, :issue_statuses, :enabled_modules, :enumerations, :boards, :messages
+
+  def setup
+    @project = Project.find(1)
+  end
+  
+  def test_activity_without_subprojects
+    events = find_events(User.anonymous, :project => @project)
+    assert_not_nil events
+    
+    assert events.include?(Issue.find(1))
+    assert !events.include?(Issue.find(4))
+    # subproject issue
+    assert !events.include?(Issue.find(5))
+  end
+
+  def test_activity_with_subprojects
+    events = find_events(User.anonymous, :project => @project, :with_subprojects => 1)
+    assert_not_nil events
+    
+    assert events.include?(Issue.find(1))
+    # subproject issue
+    assert events.include?(Issue.find(5))
+  end
+  
+  def test_global_activity_anonymous
+    events = find_events(User.anonymous)
+    assert_not_nil events
+    
+    assert events.include?(Issue.find(1))
+    assert events.include?(Message.find(5))
+    # Issue of a private project
+    assert !events.include?(Issue.find(4))
+  end
+  
+  def test_global_activity_logged_user
+    events = find_events(User.find(2)) # manager
+    assert_not_nil events
+    
+    assert events.include?(Issue.find(1))
+    # Issue of a private project the user belongs to
+    assert events.include?(Issue.find(4))
+  end
+  
+  private
+  
+  def find_events(user, options={})
+    Redmine::Activity::Fetcher.new(user, options).events(Date.today - 30, Date.today + 1)
+  end
+end
diff --git a/vendor/plugins/acts_as_activity_provider/init.rb b/vendor/plugins/acts_as_activity_provider/init.rb
new file mode 100644
index 000000000..5bf05da2c
--- /dev/null
+++ b/vendor/plugins/acts_as_activity_provider/init.rb
@@ -0,0 +1,2 @@
+require File.dirname(__FILE__) + '/lib/acts_as_activity_provider'
+ActiveRecord::Base.send(:include, Redmine::Acts::ActivityProvider)
diff --git a/vendor/plugins/acts_as_activity_provider/lib/acts_as_activity_provider.rb b/vendor/plugins/acts_as_activity_provider/lib/acts_as_activity_provider.rb
new file mode 100644
index 000000000..7c4fac8b1
--- /dev/null
+++ b/vendor/plugins/acts_as_activity_provider/lib/acts_as_activity_provider.rb
@@ -0,0 +1,68 @@
+# redMine - project management software
+# Copyright (C) 2006-2008  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 Redmine
+  module Acts
+    module ActivityProvider
+      def self.included(base)
+        base.extend ClassMethods
+      end
+
+      module ClassMethods
+        def acts_as_activity_provider(options = {})
+          unless self.included_modules.include?(Redmine::Acts::ActivityProvider::InstanceMethods)
+            cattr_accessor :activity_provider_options
+            send :include, Redmine::Acts::ActivityProvider::InstanceMethods
+          end
+
+          options.assert_valid_keys(:type, :permission, :timestamp, :find_options)
+          self.activity_provider_options ||= {}
+          
+          # One model can provide different event types
+          # We store these options in activity_provider_options hash
+          event_type = options.delete(:type) || self.name.underscore.pluralize
+          
+          options[:permission] = "view_#{self.name.underscore.pluralize}".to_sym unless options.has_key?(:permission)
+          options[:timestamp] ||= "#{table_name}.created_on"
+          options[:find_options] ||= {}
+          self.activity_provider_options[event_type] = options
+        end
+      end
+
+      module InstanceMethods
+        def self.included(base)
+          base.extend ClassMethods
+        end
+                
+        module ClassMethods
+          # Returns events of type event_type visible by user that occured between from and to
+          def find_events(event_type, user, from, to, options)
+            provider_options = activity_provider_options[event_type]
+            raise "#{self.name} can not provide #{event_type} events." if provider_options.nil?
+            
+            cond = ARCondition.new(["#{provider_options[:timestamp]} BETWEEN ? AND ?", from, to])
+            cond.add(Project.allowed_to_condition(user, provider_options[:permission], options)) if provider_options[:permission]
+            
+            with_scope(:find => { :conditions => cond.conditions }) do
+              find(:all, provider_options[:find_options])
+            end
+          end
+        end
+      end
+    end
+  end
+end

From d05bcda2bad6bc54b1aaaf91c93ca9c6976c4b66 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 27 Jul 2008 18:38:31 +0000
Subject: [PATCH 653/710] Adds #activity_provider shortcut method to the plugin
 API.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1702 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 lib/redmine/activity.rb |  8 --------
 lib/redmine/plugin.rb   | 26 ++++++++++++++++++++++++++
 2 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/lib/redmine/activity.rb b/lib/redmine/activity.rb
index 144ce95ed..565a53f36 100644
--- a/lib/redmine/activity.rb
+++ b/lib/redmine/activity.rb
@@ -30,14 +30,6 @@ module Redmine
       end
       
       # Registers an activity provider
-      # 
-      # Options:
-      # * :class_name - one or more model(s) that provide these events (inferred from event_type by default)
-      # * :default - setting this option to false will make the events not displayed by default
-      # 
-      # Examples:
-      #   register :issues
-      #   register :myevents, :class_name => 'Meeting'
       def register(event_type, options={})
         options.assert_valid_keys(:class_name, :default)
         
diff --git a/lib/redmine/plugin.rb b/lib/redmine/plugin.rb
index 36632c13e..cf6c194a2 100644
--- a/lib/redmine/plugin.rb
+++ b/lib/redmine/plugin.rb
@@ -116,6 +116,32 @@ module Redmine #:nodoc:
       self.instance_eval(&block)
       @project_module = nil
     end
+    
+    # Registers an activity provider.
+    #
+    # Options:
+    # * <tt>:class_name</tt> - one or more model(s) that provide these events (inferred from event_type by default)
+    # * <tt>:default</tt> - setting this option to false will make the events not displayed by default
+    # 
+    # A model can provide several activity event types.
+    # 
+    # Examples:
+    #   register :news
+    #   register :scrums, :class_name => 'Meeting'
+    #   register :issues, :class_name => ['Issue', 'Journal']
+    # 
+    # Retrieving events:
+    # Associated model(s) must implement the find_events class method.
+    # ActiveRecord models can use acts_as_activity_provider as a way to implement this class method.
+    # 
+    # The following call should return all the scrum events visible by current user that occured in the 5 last days: 
+    #   Meeting.find_events('scrums', User.current, 5.days.ago, Date.today)
+    #   Meeting.find_events('scrums', User.current, 5.days.ago, Date.today, :project => foo) # events for project foo only
+    # 
+    # Note that :view_scrums permission is required to view these events in the activity view.
+    def activity_provider(*args)
+      Redmine::Activity.register(*args)
+    end
 
     # Returns +true+ if the plugin can be configured.
     def configurable?

From 3a4855d070c6305a587afd31c9814cfdf479c66b Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 27 Jul 2008 19:10:56 +0000
Subject: [PATCH 654/710] Activity provider example in sample plugin.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1703 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 extra/sample_plugin/app/models/meeting.rb         |  6 ++++++
 .../db/migrate/001_create_meetings.rb             | 15 +++++++++++++++
 .../db/migrate/001_create_some_models.rb          | 13 -------------
 extra/sample_plugin/init.rb                       |  5 +++++
 extra/sample_plugin/lang/en.yml                   |  1 +
 extra/sample_plugin/lang/fr.yml                   |  1 +
 6 files changed, 28 insertions(+), 13 deletions(-)
 create mode 100644 extra/sample_plugin/app/models/meeting.rb
 create mode 100644 extra/sample_plugin/db/migrate/001_create_meetings.rb
 delete mode 100644 extra/sample_plugin/db/migrate/001_create_some_models.rb

diff --git a/extra/sample_plugin/app/models/meeting.rb b/extra/sample_plugin/app/models/meeting.rb
new file mode 100644
index 000000000..89ecd5253
--- /dev/null
+++ b/extra/sample_plugin/app/models/meeting.rb
@@ -0,0 +1,6 @@
+class Meeting < ActiveRecord::Base
+  belongs_to :project
+  
+  acts_as_activity_provider :timestamp => 'scheduled_on',
+                            :find_options => { :include => :project }
+end
diff --git a/extra/sample_plugin/db/migrate/001_create_meetings.rb b/extra/sample_plugin/db/migrate/001_create_meetings.rb
new file mode 100644
index 000000000..fec9c8bd1
--- /dev/null
+++ b/extra/sample_plugin/db/migrate/001_create_meetings.rb
@@ -0,0 +1,15 @@
+# Sample plugin migration
+# Use rake db:migrate_plugins to migrate installed plugins
+class CreateMeetings < ActiveRecord::Migration
+  def self.up
+    create_table :meetings do |t|
+      t.column :project_id, :integer, :null => false
+      t.column :description, :string
+      t.column :scheduled_on, :datetime
+    end
+  end
+
+  def self.down
+    drop_table :meetings
+  end
+end
diff --git a/extra/sample_plugin/db/migrate/001_create_some_models.rb b/extra/sample_plugin/db/migrate/001_create_some_models.rb
deleted file mode 100644
index 39d58a649..000000000
--- a/extra/sample_plugin/db/migrate/001_create_some_models.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-# Sample plugin migration
-# Use rake db:migrate_plugins to migrate installed plugins
-class CreateSomeModels < ActiveRecord::Migration
-  def self.up
-    create_table :example_plugin_model, :force => true do |t|
-      t.column "example_attribute", :integer
-    end
-  end
-
-  def self.down
-    drop_table :example_plugin_model
-  end
-end
diff --git a/extra/sample_plugin/init.rb b/extra/sample_plugin/init.rb
index 7389aaa6f..5c543338c 100644
--- a/extra/sample_plugin/init.rb
+++ b/extra/sample_plugin/init.rb
@@ -18,8 +18,13 @@ Redmine::Plugin.register :sample_plugin do
     # This permission has to be explicitly given
     # It will be listed on the permissions screen
     permission :example_say_goodbye, {:example => [:say_goodbye]}
+    # This permission can be given to project members only
+    permission :view_meetings, {:meetings => [:index, :show]}, :require => :member
   end
 
   # A new item is added to the project menu
   menu :project_menu, :sample_plugin, { :controller => 'example', :action => 'say_hello' }, :caption => 'Sample'
+  
+  # Meetings are added to the activity view
+  activity_provider :meetings
 end
diff --git a/extra/sample_plugin/lang/en.yml b/extra/sample_plugin/lang/en.yml
index bf62bc344..c4005a764 100644
--- a/extra/sample_plugin/lang/en.yml
+++ b/extra/sample_plugin/lang/en.yml
@@ -1,4 +1,5 @@
 # Sample plugin
 label_plugin_example: Sample Plugin
+label_meeting_plural: Meetings
 text_say_hello: Plugin say 'Hello'
 text_say_goodbye: Plugin say 'Good bye'
diff --git a/extra/sample_plugin/lang/fr.yml b/extra/sample_plugin/lang/fr.yml
index 2c0829c32..135050a5a 100644
--- a/extra/sample_plugin/lang/fr.yml
+++ b/extra/sample_plugin/lang/fr.yml
@@ -1,4 +1,5 @@
 # Sample plugin
 label_plugin_example: Plugin exemple
+label_meeting_plural: Meetings
 text_say_hello: Plugin dit 'Bonjour'
 text_say_goodbye: Plugin dit 'Au revoir'

From b20281f1515675813ade9e1284c39fd00d261365 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 27 Jul 2008 19:18:35 +0000
Subject: [PATCH 655/710] Follows r1703.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1704 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 extra/sample_plugin/app/models/meeting.rb | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/extra/sample_plugin/app/models/meeting.rb b/extra/sample_plugin/app/models/meeting.rb
index 89ecd5253..c1bb64a93 100644
--- a/extra/sample_plugin/app/models/meeting.rb
+++ b/extra/sample_plugin/app/models/meeting.rb
@@ -1,5 +1,10 @@
 class Meeting < ActiveRecord::Base
   belongs_to :project
+
+  acts_as_event :title => Proc.new {|o| "#{o.scheduled_on} Meeting"},
+                :datetime => :scheduled_on,
+                :author => nil,
+                :url => Proc.new {|o| {:controller => 'meetings', :action => 'show', :id => o.id}}                
   
   acts_as_activity_provider :timestamp => 'scheduled_on',
                             :find_options => { :include => :project }

From 2dbc3d294364b59fb0360e15185894ca657e4ddd Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Mon, 28 Jul 2008 17:08:16 +0000
Subject: [PATCH 656/710] Adds Trac-Like anchors on wiki headings (#1647).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1705 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 lib/redmine/wiki_formatting.rb               | 28 +++++++++++++-------
 public/stylesheets/application.css           |  4 +++
 test/unit/helpers/application_helper_test.rb |  8 +++---
 3 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/lib/redmine/wiki_formatting.rb b/lib/redmine/wiki_formatting.rb
index 11ec6803a..8c18d547f 100644
--- a/lib/redmine/wiki_formatting.rb
+++ b/lib/redmine/wiki_formatting.rb
@@ -65,10 +65,22 @@ module Redmine
       
       # Patch to add 'table of content' support to RedCloth
       def textile_p_withtoc(tag, atts, cite, content)
-        if tag =~ /^h(\d)$/
-          @toc << [$1.to_i, content]
+        # removes wiki links from the item
+        toc_item = content.gsub(/(\[\[|\]\])/, '')
+        # removes styles
+        # eg. %{color:red}Triggers% => Triggers
+        toc_item.gsub! %r[%\{[^\}]*\}([^%]+)%], '\\1'
+        
+        # replaces non word caracters by dashes
+        anchor = toc_item.gsub(%r{[^\w\s\-]}, '').gsub(%r{\s+(\-+\s*)?}, '-')
+
+        unless anchor.blank?
+          if tag =~ /^h(\d)$/
+            @toc << [$1.to_i, anchor, toc_item]
+          end
+          atts << " id=\"#{anchor}\""
+          content = content + "<a href=\"##{anchor}\" class=\"wiki-anchor\">&para;</a>"
         end
-        content = "<a name=\"#{@toc.length}\" class=\"wiki-page\"></a>" + content
         textile_p(tag, atts, cite, content)
       end
 
@@ -82,13 +94,9 @@ module Redmine
           div_class << ' right' if $1 == '>'
           div_class << ' left' if $1 == '<'
           out = "<ul class=\"#{div_class}\">"
-          @toc.each_with_index do |heading, index|
-            # remove wiki links from the item
-            toc_item = heading.last.gsub(/(\[\[|\]\])/, '')
-            # remove styles
-            # eg. %{color:red}Triggers% => Triggers
-            toc_item.gsub! %r[%\{[^\}]*\}([^%]+)%], '\\1'
-            out << "<li class=\"heading#{heading.first}\"><a href=\"##{index+1}\">#{toc_item}</a></li>\n"
+          @toc.each do |heading|
+            level, anchor, toc_item = heading
+            out << "<li class=\"heading#{level}\"><a href=\"##{anchor}\">#{toc_item}</a></li>\n"
           end
           out << '</ul>'
           out
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 9ae4d1595..c7e9284d2 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -487,6 +487,10 @@ div.wiki ul.toc a {
 }
 div.wiki ul.toc a:hover { color: #c61a1a; text-decoration: underline;}
 
+a.wiki-anchor { display: none; margin-left: 6px; text-decoration: none; }
+a.wiki-anchor:hover { color: #aaa !important; text-decoration: none; }
+h1:hover a.wiki-anchor, h2:hover a.wiki-anchor, h3:hover a.wiki-anchor { display: inline; color: #ddd; }
+
 /***** My page layout *****/
 .block-receiver {
 border:1px dashed #c0c0c0;
diff --git a/test/unit/helpers/application_helper_test.rb b/test/unit/helpers/application_helper_test.rb
index eea4a83f8..71ef572b0 100644
--- a/test/unit/helpers/application_helper_test.rb
+++ b/test/unit/helpers/application_helper_test.rb
@@ -215,10 +215,10 @@ h1. Another title
 RAW
 
     expected = '<ul class="toc">' +
-               '<li class="heading1"><a href="#1">Title</a></li>' +
-               '<li class="heading2"><a href="#2">Subtitle</a></li>' + 
-               '<li class="heading2"><a href="#3">Subtitle with red text</a></li>' +
-               '<li class="heading1"><a href="#4">Another title</a></li>' +
+               '<li class="heading1"><a href="#Title">Title</a></li>' +
+               '<li class="heading2"><a href="#Subtitle">Subtitle</a></li>' + 
+               '<li class="heading2"><a href="#Subtitle-with-red-text">Subtitle with red text</a></li>' +
+               '<li class="heading1"><a href="#Another-title">Another title</a></li>' +
                '</ul>'
                
     assert textilizable(raw).gsub("\n", "").include?(expected)

From 198a8c602dc164186972d0b53064c8086c8ef2ec Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Mon, 28 Jul 2008 17:20:31 +0000
Subject: [PATCH 657/710] Adds support for wiki links with anchor (#1647).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1706 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/helpers/application_helper.rb            | 13 +++++++++----
 test/unit/helpers/application_helper_test.rb |  3 +++
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 6d6eb9107..a4102c84a 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -246,12 +246,12 @@ module ApplicationHelper
     case options[:wiki_links]
     when :local
       # used for local links to html files
-      format_wiki_link = Proc.new {|project, title| "#{title}.html" }
+      format_wiki_link = Proc.new {|project, title, anchor| "#{title}.html" }
     when :anchor
       # used for single-file wiki export
-      format_wiki_link = Proc.new {|project, title| "##{title}" }
+      format_wiki_link = Proc.new {|project, title, anchor| "##{title}" }
     else
-      format_wiki_link = Proc.new {|project, title| url_for(:only_path => only_path, :controller => 'wiki', :action => 'index', :id => project, :page => title) }
+      format_wiki_link = Proc.new {|project, title, anchor| url_for(:only_path => only_path, :controller => 'wiki', :action => 'index', :id => project, :page => title, :anchor => anchor) }
     end
     
     project = options[:project] || @project || (obj && obj.respond_to?(:project) ? obj.project : nil)
@@ -277,9 +277,14 @@ module ApplicationHelper
         end
         
         if link_project && link_project.wiki
+          # extract anchor
+          anchor = nil
+          if page =~ /^(.+?)\#(.+)$/
+            page, anchor = $1, $2
+          end
           # check if page exists
           wiki_page = link_project.wiki.find_page(page)
-          link_to((title || page), format_wiki_link.call(link_project, Wiki.titleize(page)),
+          link_to((title || page), format_wiki_link.call(link_project, Wiki.titleize(page), anchor),
                                    :class => ('wiki-page' + (wiki_page ? '' : ' new')))
         else
           # project or wiki doesn't exist
diff --git a/test/unit/helpers/application_helper_test.rb b/test/unit/helpers/application_helper_test.rb
index 71ef572b0..979321bd3 100644
--- a/test/unit/helpers/application_helper_test.rb
+++ b/test/unit/helpers/application_helper_test.rb
@@ -133,6 +133,9 @@ class ApplicationHelperTest < HelperTestCase
     to_test = {
       '[[CookBook documentation]]' => '<a href="/wiki/ecookbook/CookBook_documentation" class="wiki-page">CookBook documentation</a>',
       '[[Another page|Page]]' => '<a href="/wiki/ecookbook/Another_page" class="wiki-page">Page</a>',
+      # link with anchor
+      '[[CookBook documentation#One-section]]' => '<a href="/wiki/ecookbook/CookBook_documentation#One-section" class="wiki-page">CookBook documentation</a>',
+      '[[Another page#anchor|Page]]' => '<a href="/wiki/ecookbook/Another_page#anchor" class="wiki-page">Page</a>',
       # page that doesn't exist
       '[[Unknown page]]' => '<a href="/wiki/ecookbook/Unknown_page" class="wiki-page new">Unknown page</a>',
       '[[Unknown page|404]]' => '<a href="/wiki/ecookbook/Unknown_page" class="wiki-page new">404</a>',

From c3f9575eaf05c2729161bcd7880544dd0777891c Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Mon, 28 Jul 2008 18:00:30 +0000
Subject: [PATCH 658/710] Adds category to the issue context menu (#1684).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1707 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/issues/context_menu.rhtml | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/app/views/issues/context_menu.rhtml b/app/views/issues/context_menu.rhtml
index af56782e8..0cdcd4733 100644
--- a/app/views/issues/context_menu.rhtml
+++ b/app/views/issues/context_menu.rhtml
@@ -44,6 +44,19 @@
 		                              :selected => @issue.assigned_to.nil?, :disabled => !@can[:update] %></li>
 		</ul>
 	</li>
+	<% unless @project.issue_categories.empty? -%>
+	<li class="folder">			
+		<a href="#" class="submenu"><%= l(:field_category) %></a>
+		<ul>
+		<% @project.issue_categories.each do |u| -%>
+		    <li><%= context_menu_link u.name, {:controller => 'issues', :action => 'edit', :id => @issue, 'issue[category_id]' => u, :back_to => @back}, :method => :post,
+		                              :selected => (u == @issue.category), :disabled => !@can[:update] %></li>
+		<% end -%>
+		    <li><%= context_menu_link l(:label_none), {:controller => 'issues', :action => 'edit', :id => @issue, 'issue[category_id]' => '', :back_to => @back}, :method => :post,
+		                              :selected => @issue.category.nil?, :disabled => !@can[:update] %></li>
+		</ul>
+	</li>
+	<% end -%>
 	<li class="folder">
 		<a href="#" class="submenu"><%= l(:field_done_ratio) %></a>
 		<ul>

From b26e4932a26cabd0d3adc5943a2836ac2eae2aee Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Mon, 28 Jul 2008 18:01:05 +0000
Subject: [PATCH 659/710] Smaller font in context menu.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1708 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 public/stylesheets/context_menu.css | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/public/stylesheets/context_menu.css b/public/stylesheets/context_menu.css
index a88b6c6c8..b3aa1aca0 100644
--- a/public/stylesheets/context_menu.css
+++ b/public/stylesheets/context_menu.css
@@ -1,4 +1,4 @@
-#context-menu { position: absolute; z-index: 40;}
+#context-menu { position: absolute; z-index: 40; font-size: 0.9em;}
 
 #context-menu ul, #context-menu li, #context-menu a {
 	display:block;
@@ -31,10 +31,10 @@
 
 #context-menu a {
 	border:1px solid white;
-	text-decoration:none;
+	text-decoration:none !important;
 	background-repeat: no-repeat;
 	background-position: 1px 50%;
-	padding: 2px 0px 2px 20px;
+	padding: 1px 0px 1px 20px;
 	width:100%; /* IE */
 }
 #context-menu li>a { width:auto; } /* others */

From b91bdf8798360aa913ac97167c4925f95faa3673 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Mon, 28 Jul 2008 21:11:49 +0000
Subject: [PATCH 660/710] Fixed: tokens not escaped in highlight_tokens regexp
 (#1702).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1709 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/helpers/search_helper.rb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/helpers/search_helper.rb b/app/helpers/search_helper.rb
index 92f2da8a5..cd96dbd3f 100644
--- a/app/helpers/search_helper.rb
+++ b/app/helpers/search_helper.rb
@@ -18,7 +18,8 @@
 module SearchHelper
   def highlight_tokens(text, tokens)
     return text unless text && tokens && !tokens.empty?
-    regexp = Regexp.new "(#{tokens.join('|')})", Regexp::IGNORECASE    
+    re_tokens = tokens.collect {|t| Regexp.escape(t)}
+    regexp = Regexp.new "(#{re_tokens.join('|')})", Regexp::IGNORECASE    
     result = ''
     text.split(regexp).each_with_index do |words, i|
       if result.length > 1200

From 3197814c623f3541bb8b66c11af70eeedbfbee52 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Wed, 30 Jul 2008 18:28:01 +0000
Subject: [PATCH 661/710] Fixed: RedCloth#block_markdown_rule freezes when
 parsing many hyphen marks (#1704).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1710 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 lib/redcloth.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/redcloth.rb b/lib/redcloth.rb
index 59d02fbab..df19de22d 100644
--- a/lib/redcloth.rb
+++ b/lib/redcloth.rb
@@ -744,7 +744,7 @@ class RedCloth < String
     end
 
     MARKDOWN_RULE_RE = /^(#{
-        ['*', '-', '_'].collect { |ch| '( ?' + Regexp::quote( ch ) + ' ?){3,}' }.join( '|' )
+        ['*', '-', '_'].collect { |ch| ' ?(' + Regexp::quote( ch ) + ' ?){3,}' }.join( '|' )
     })$/
 
     def block_markdown_rule( text )

From 6034067d8623e87ef1391962b882fcc93196bf4b Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Wed, 30 Jul 2008 18:33:35 +0000
Subject: [PATCH 662/710] Fixed: activity atom feed broken by r1701 (#1703).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1711 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/projects_controller.rb      | 2 +-
 test/functional/projects_controller_test.rb | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index ce4b24b8b..cfac01b9a 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -240,7 +240,7 @@ class ProjectsController < ApplicationController
         render :layout => false if request.xhr?
       }
       format.atom {
-        title = (@scope.size == 1) ? l("label_#{@scope.first.singularize}_plural") : l(:label_activity)
+        title = (@activity.scope.size == 1) ? l("label_#{@activity.scope.first.singularize}_plural") : l(:label_activity)
         render_feed(events, :title => "#{@project || Setting.app_title}: #{title}")
       }
     end
diff --git a/test/functional/projects_controller_test.rb b/test/functional/projects_controller_test.rb
index 935d5ba7c..03773ccdb 100644
--- a/test/functional/projects_controller_test.rb
+++ b/test/functional/projects_controller_test.rb
@@ -202,6 +202,12 @@ class ProjectsControllerTest < Test::Unit::TestCase
                }
   end
   
+  def test_activity_atom_feed
+    get :activity, :format => 'atom'
+    assert_response :success
+    assert_template 'common/feed.atom.rxml'
+  end
+  
   def test_calendar
     get :calendar, :id => 1
     assert_response :success

From a332e0a4febeb36aac41f8d5762d18f4cbbf115c Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 3 Aug 2008 09:14:43 +0000
Subject: [PATCH 663/710] Adds permissions for viewing the watcher list and
 adding new watchers on the issue detail view (#398).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1712 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/watchers_controller.rb        | 52 +++++++++-----
 app/helpers/watchers_helper.rb                |  7 +-
 app/models/watcher.rb                         |  7 ++
 app/views/issues/show.rhtml                   |  8 +++
 app/views/watchers/_watchers.rhtml            | 25 +++++++
 lang/bg.yml                                   |  1 +
 lang/cs.yml                                   |  1 +
 lang/da.yml                                   |  1 +
 lang/de.yml                                   |  1 +
 lang/en.yml                                   |  1 +
 lang/es.yml                                   |  1 +
 lang/fi.yml                                   |  1 +
 lang/fr.yml                                   |  1 +
 lang/he.yml                                   |  1 +
 lang/hu.yml                                   |  1 +
 lang/it.yml                                   |  1 +
 lang/ja.yml                                   |  1 +
 lang/ko.yml                                   |  1 +
 lang/lt.yml                                   |  1 +
 lang/nl.yml                                   |  1 +
 lang/no.yml                                   |  1 +
 lang/pl.yml                                   |  1 +
 lang/pt-br.yml                                |  1 +
 lang/pt.yml                                   |  1 +
 lang/ro.yml                                   |  1 +
 lang/ru.yml                                   |  1 +
 lang/sr.yml                                   |  1 +
 lang/sv.yml                                   |  1 +
 lang/th.yml                                   |  1 +
 lang/uk.yml                                   |  1 +
 lang/zh-tw.yml                                |  1 +
 lang/zh.yml                                   |  1 +
 lib/redmine.rb                                |  3 +
 test/fixtures/roles.yml                       |  4 ++
 test/fixtures/watchers.yml                    |  6 ++
 test/functional/watchers_controller_test.rb   | 70 +++++++++++++++++++
 .../lib/acts_as_watchable.rb                  | 18 ++++-
 .../plugins/gloc-1.1.0/lib/gloc-rails-text.rb |  4 +-
 38 files changed, 210 insertions(+), 21 deletions(-)
 create mode 100644 app/views/watchers/_watchers.rhtml
 create mode 100644 test/fixtures/watchers.yml
 create mode 100644 test/functional/watchers_controller_test.rb

diff --git a/app/controllers/watchers_controller.rb b/app/controllers/watchers_controller.rb
index 014779b7f..a44686d3f 100644
--- a/app/controllers/watchers_controller.rb
+++ b/app/controllers/watchers_controller.rb
@@ -17,30 +17,38 @@
 
 class WatchersController < ApplicationController
   layout 'base'
-  before_filter :require_login, :find_project, :check_project_privacy
+  before_filter :find_project
+  before_filter :require_login, :check_project_privacy, :only => [:watch, :unwatch]
+  before_filter :authorize, :only => :new
   
-  def add
-    user = User.current
-    @watched.add_watcher(user)
+  verify :method => :post,
+         :only => [ :watch, :unwatch ],
+         :render => { :nothing => true, :status => :method_not_allowed }
+  
+  def watch
+    set_watcher(User.current, true)
+  end
+  
+  def unwatch
+    set_watcher(User.current, false)
+  end
+  
+  def new
+    @watcher = Watcher.new(params[:watcher])
+    @watcher.watchable = @watched
+    @watcher.save if request.post?
     respond_to do |format|
       format.html { redirect_to :back }
-      format.js { render(:update) {|page| page.replace_html 'watcher', watcher_link(@watched, user)} }
+      format.js do
+        render :update do |page|
+          page.replace_html 'watchers', :partial => 'watchers/watchers', :locals => {:watched => @watched}
+        end
+      end
     end
-  rescue RedirectBackError
+  rescue ::ActionController::RedirectBackError
     render :text => 'Watcher added.', :layout => true
   end
   
-  def remove
-    user = User.current
-    @watched.remove_watcher(user)
-    respond_to do |format|
-      format.html { redirect_to :back }
-      format.js { render(:update) {|page| page.replace_html 'watcher', watcher_link(@watched, user)} }
-    end
-  rescue RedirectBackError
-    render :text => 'Watcher removed.', :layout => true
-  end
-
 private
   def find_project
     klass = Object.const_get(params[:object_type].camelcase)
@@ -50,4 +58,14 @@ private
   rescue
     render_404
   end
+  
+  def set_watcher(user, watching)
+    @watched.set_watcher(user, watching)
+    respond_to do |format|
+      format.html { redirect_to :back }
+      format.js { render(:update) {|page| page.replace_html 'watcher', watcher_link(@watched, user)} }
+    end
+  rescue ::ActionController::RedirectBackError
+    render :text => (watching ? 'Watcher added.' : 'Watcher removed.'), :layout => true
+  end
 end
diff --git a/app/helpers/watchers_helper.rb b/app/helpers/watchers_helper.rb
index c83c785fc..f4767ebed 100644
--- a/app/helpers/watchers_helper.rb
+++ b/app/helpers/watchers_helper.rb
@@ -24,7 +24,7 @@ module WatchersHelper
     return '' unless user && user.logged? && object.respond_to?('watched_by?')
     watched = object.watched_by?(user)
     url = {:controller => 'watchers',
-           :action => (watched ? 'remove' : 'add'),
+           :action => (watched ? 'unwatch' : 'watch'),
            :object_type => object.class.to_s.underscore,
            :object_id => object.id}           
     link_to_remote((watched ? l(:button_unwatch) : l(:button_watch)),
@@ -33,4 +33,9 @@ module WatchersHelper
                    :class => (watched ? 'icon icon-fav' : 'icon icon-fav-off'))
   
   end
+  
+  # Returns a comma separated list of users watching the given object
+  def watchers_list(object)
+    object.watcher_users.collect {|u| content_tag('span', link_to_user(u), :class => 'user') }.join(",\n")
+  end
 end
diff --git a/app/models/watcher.rb b/app/models/watcher.rb
index cb6ff52ea..38110c584 100644
--- a/app/models/watcher.rb
+++ b/app/models/watcher.rb
@@ -19,5 +19,12 @@ class Watcher < ActiveRecord::Base
   belongs_to :watchable, :polymorphic => true
   belongs_to :user
   
+  validates_presence_of :user
   validates_uniqueness_of :user_id, :scope => [:watchable_type, :watchable_id]
+  
+  protected
+  
+  def validate
+    errors.add :user_id, :activerecord_error_invalid unless user.nil? || user.active?
+  end
 end
diff --git a/app/views/issues/show.rhtml b/app/views/issues/show.rhtml
index b71a02ee7..df8fc372a 100644
--- a/app/views/issues/show.rhtml
+++ b/app/views/issues/show.rhtml
@@ -78,6 +78,14 @@ end %>
 </div>
 <% end %>
 
+<% if User.current.allowed_to?(:add_issue_watchers, @project) ||
+        (@issue.watchers.any? && User.current.allowed_to?(:view_issue_watchers, @project)) %>
+<hr />
+<div id="watchers">
+<%= render :partial => 'watchers/watchers', :locals => {:watched => @issue} %>
+</div>
+<% end %>
+
 </div>
 
 <% if @issue.changesets.any? && User.current.allowed_to?(:view_changesets, @project) %>
diff --git a/app/views/watchers/_watchers.rhtml b/app/views/watchers/_watchers.rhtml
new file mode 100644
index 000000000..14bb5fc6b
--- /dev/null
+++ b/app/views/watchers/_watchers.rhtml
@@ -0,0 +1,25 @@
+<div class="contextual">
+<%= link_to_remote l(:button_add), 
+                   :url => {:controller => 'watchers',
+                            :action => 'new',
+                            :object_type => watched.class.name.underscore,
+                            :object_id => watched} if User.current.allowed_to?(:add_issue_watchers, @project) %>
+</div>
+
+<p><strong><%= l(:label_issue_watchers) %></strong></p>
+<%= watchers_list(watched) %>
+
+<% unless @watcher.nil? %>
+<% remote_form_for(:watcher, @watcher, 
+                   :url => {:controller => 'watchers',
+                            :action => 'new',
+                            :object_type => watched.class.name.underscore,
+                            :object_id => watched},
+                   :method => :post,
+                   :html => {:id => 'new-watcher-form'}) do |f| %>
+<p><%= f.select :user_id, (watched.addable_watcher_users.collect {|m| [m.name, m.id]}), :prompt => true %>
+
+<%= submit_tag l(:button_add) %>
+<%= toggle_link l(:button_cancel), 'new-watcher-form'%></p>
+<% end %>
+<% end %>
diff --git a/lang/bg.yml b/lang/bg.yml
index e8191dc20..6a9676119 100644
--- a/lang/bg.yml
+++ b/lang/bg.yml
@@ -633,3 +633,4 @@ setting_mail_handler_api_enabled: Enable WS for incoming emails
 setting_mail_handler_api_key: API key
 text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."
 field_parent_title: Parent page
+label_issue_watchers: Watchers
diff --git a/lang/cs.yml b/lang/cs.yml
index 68273191a..cc5847ee4 100644
--- a/lang/cs.yml
+++ b/lang/cs.yml
@@ -638,3 +638,4 @@ setting_mail_handler_api_enabled: Enable WS for incoming emails
 setting_mail_handler_api_key: API key
 text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."
 field_parent_title: Parent page
+label_issue_watchers: Watchers
diff --git a/lang/da.yml b/lang/da.yml
index 1b5aba69c..1cb55cc48 100644
--- a/lang/da.yml
+++ b/lang/da.yml
@@ -635,3 +635,4 @@ setting_mail_handler_api_enabled: Enable WS for incoming emails
 setting_mail_handler_api_key: API key
 text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."
 field_parent_title: Parent page
+label_issue_watchers: Watchers
diff --git a/lang/de.yml b/lang/de.yml
index dc2960c9c..f0be84490 100644
--- a/lang/de.yml
+++ b/lang/de.yml
@@ -634,3 +634,4 @@ setting_mail_handler_api_enabled: Enable WS for incoming emails
 setting_mail_handler_api_key: API key
 text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."
 field_parent_title: Parent page
+label_issue_watchers: Watchers
diff --git a/lang/en.yml b/lang/en.yml
index 3cc788b8c..2307b1591 100644
--- a/lang/en.yml
+++ b/lang/en.yml
@@ -521,6 +521,7 @@ label_reverse_chronological_order: In reverse chronological order
 label_planning: Planning
 label_incoming_emails: Incoming emails
 label_generate_key: Generate a key
+label_issue_watchers: Watchers
 
 button_login: Login
 button_submit: Submit
diff --git a/lang/es.yml b/lang/es.yml
index c753f367f..7f27d53e5 100644
--- a/lang/es.yml
+++ b/lang/es.yml
@@ -636,3 +636,4 @@ setting_mail_handler_api_enabled: Enable WS for incoming emails
 setting_mail_handler_api_key: API key
 text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."
 field_parent_title: Parent page
+label_issue_watchers: Watchers
diff --git a/lang/fi.yml b/lang/fi.yml
index b48d8a319..031d59d63 100644
--- a/lang/fi.yml
+++ b/lang/fi.yml
@@ -633,3 +633,4 @@ setting_mail_handler_api_enabled: Enable WS for incoming emails
 setting_mail_handler_api_key: API key
 text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."
 field_parent_title: Parent page
+label_issue_watchers: Watchers
diff --git a/lang/fr.yml b/lang/fr.yml
index b9d542da6..037252067 100644
--- a/lang/fr.yml
+++ b/lang/fr.yml
@@ -521,6 +521,7 @@ label_reverse_chronological_order: Dans l'ordre chronologique inverse
 label_planning: Planning
 label_incoming_emails: Emails entrants
 label_generate_key: Générer une clé
+label_issue_watchers: Utilisateurs surveillant cette demande
 
 button_login: Connexion
 button_submit: Soumettre
diff --git a/lang/he.yml b/lang/he.yml
index 63aa2bb64..9c8fbae7e 100644
--- a/lang/he.yml
+++ b/lang/he.yml
@@ -633,3 +633,4 @@ setting_mail_handler_api_enabled: Enable WS for incoming emails
 setting_mail_handler_api_key: API key
 text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."
 field_parent_title: Parent page
+label_issue_watchers: Watchers
diff --git a/lang/hu.yml b/lang/hu.yml
index 9becbb349..a5d208cb6 100644
--- a/lang/hu.yml
+++ b/lang/hu.yml
@@ -634,3 +634,4 @@ setting_mail_handler_api_enabled: Web Service engedélyezése a beérkezett leve
 setting_mail_handler_api_key: API kulcs
 text_email_delivery_not_configured: "Az E-mail küldés nincs konfigurálva, és az értesítések ki vannak kapcsolva.\nÁllítsd be az SMTP szervert a config/email.yml fájlban és indítsd újra az alkalmazást, hogy érvénybe lépjen."
 field_parent_title: Parent page
+label_issue_watchers: Watchers
diff --git a/lang/it.yml b/lang/it.yml
index e7a8772cc..5d62e3255 100644
--- a/lang/it.yml
+++ b/lang/it.yml
@@ -633,3 +633,4 @@ setting_mail_handler_api_enabled: Abilita WS per le e-mail in arrivo
 setting_mail_handler_api_key: chiave API
 text_email_delivery_not_configured: "La consegna via e-mail non è configurata e le notifiche sono disabilitate.\nConfigura il tuo server SMTP in config/email.yml e riavvia l'applicazione per abilitarle."
 field_parent_title: Parent page
+label_issue_watchers: Watchers
diff --git a/lang/ja.yml b/lang/ja.yml
index f78fcdba4..f3ade750d 100644
--- a/lang/ja.yml
+++ b/lang/ja.yml
@@ -634,3 +634,4 @@ setting_mail_handler_api_enabled: Enable WS for incoming emails
 setting_mail_handler_api_key: API key
 text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."
 field_parent_title: Parent page
+label_issue_watchers: Watchers
diff --git a/lang/ko.yml b/lang/ko.yml
index 77672c601..961255e01 100644
--- a/lang/ko.yml
+++ b/lang/ko.yml
@@ -633,3 +633,4 @@ setting_mail_handler_api_enabled: Enable WS for incoming emails
 setting_mail_handler_api_key: API key
 text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."
 field_parent_title: Parent page
+label_issue_watchers: Watchers
diff --git a/lang/lt.yml b/lang/lt.yml
index 706133bfe..58f798506 100644
--- a/lang/lt.yml
+++ b/lang/lt.yml
@@ -636,3 +636,4 @@ setting_mail_handler_api_key: API raktas
 
 text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."
 field_parent_title: Parent page
+label_issue_watchers: Watchers
diff --git a/lang/nl.yml b/lang/nl.yml
index 3cfb0aa19..08e300143 100644
--- a/lang/nl.yml
+++ b/lang/nl.yml
@@ -634,3 +634,4 @@ setting_mail_handler_api_enabled: Enable WS for incoming emails
 setting_mail_handler_api_key: API key
 text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."
 field_parent_title: Parent page
+label_issue_watchers: Watchers
diff --git a/lang/no.yml b/lang/no.yml
index 0836bd48f..7af029db9 100644
--- a/lang/no.yml
+++ b/lang/no.yml
@@ -634,3 +634,4 @@ setting_mail_handler_api_enabled: Enable WS for incoming emails
 setting_mail_handler_api_key: API key
 text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."
 field_parent_title: Parent page
+label_issue_watchers: Watchers
diff --git a/lang/pl.yml b/lang/pl.yml
index 278d56a88..0a29b7c47 100644
--- a/lang/pl.yml
+++ b/lang/pl.yml
@@ -633,3 +633,4 @@ setting_mail_handler_api_enabled: Enable WS for incoming emails
 setting_mail_handler_api_key: API key
 text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."
 field_parent_title: Parent page
+label_issue_watchers: Watchers
diff --git a/lang/pt-br.yml b/lang/pt-br.yml
index 9276d768e..3ab24aeb0 100644
--- a/lang/pt-br.yml
+++ b/lang/pt-br.yml
@@ -633,3 +633,4 @@ setting_mail_handler_api_enabled: Enable WS for incoming emails
 setting_mail_handler_api_key: API key
 text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."
 field_parent_title: Parent page
+label_issue_watchers: Watchers
diff --git a/lang/pt.yml b/lang/pt.yml
index a7647e31f..bd32cd140 100644
--- a/lang/pt.yml
+++ b/lang/pt.yml
@@ -633,3 +633,4 @@ setting_mail_handler_api_enabled: Enable WS for incoming emails
 setting_mail_handler_api_key: API key
 text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."
 field_parent_title: Parent page
+label_issue_watchers: Watchers
diff --git a/lang/ro.yml b/lang/ro.yml
index c3640d7e1..2e562e237 100644
--- a/lang/ro.yml
+++ b/lang/ro.yml
@@ -633,3 +633,4 @@ setting_mail_handler_api_enabled: Enable WS for incoming emails
 setting_mail_handler_api_key: API key
 text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."
 field_parent_title: Parent page
+label_issue_watchers: Watchers
diff --git a/lang/ru.yml b/lang/ru.yml
index e8bda05b7..61e713694 100644
--- a/lang/ru.yml
+++ b/lang/ru.yml
@@ -637,3 +637,4 @@ setting_mail_handler_api_enabled: Включить веб-сервис для в
 setting_mail_handler_api_key: API ключ
 text_email_delivery_not_configured: "Параметры работы с почтовым сервером не настроены и функция уведомления по email не активна.\nНастроить параметры для вашего SMTP сервера вы можете в файле config/email.yml. Для применения изменений перезапустите приложение."
 field_parent_title: Parent page
+label_issue_watchers: Watchers
diff --git a/lang/sr.yml b/lang/sr.yml
index 688fa8ede..ba79d4ef2 100644
--- a/lang/sr.yml
+++ b/lang/sr.yml
@@ -634,3 +634,4 @@ setting_mail_handler_api_enabled: Enable WS for incoming emails
 setting_mail_handler_api_key: API key
 text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."
 field_parent_title: Parent page
+label_issue_watchers: Watchers
diff --git a/lang/sv.yml b/lang/sv.yml
index 58507a0b7..9505759c8 100644
--- a/lang/sv.yml
+++ b/lang/sv.yml
@@ -634,3 +634,4 @@ setting_mail_handler_api_enabled: Enable WS for incoming emails
 setting_mail_handler_api_key: API key
 text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."
 field_parent_title: Parent page
+label_issue_watchers: Watchers
diff --git a/lang/th.yml b/lang/th.yml
index a7f949c96..6c4ce30d6 100644
--- a/lang/th.yml
+++ b/lang/th.yml
@@ -636,3 +636,4 @@ setting_mail_handler_api_enabled: Enable WS for incoming emails
 setting_mail_handler_api_key: API key
 text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."
 field_parent_title: Parent page
+label_issue_watchers: Watchers
diff --git a/lang/uk.yml b/lang/uk.yml
index 766ddaaab..4fa27f7d3 100644
--- a/lang/uk.yml
+++ b/lang/uk.yml
@@ -635,3 +635,4 @@ setting_mail_handler_api_enabled: Enable WS for incoming emails
 setting_mail_handler_api_key: API key
 text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."
 field_parent_title: Parent page
+label_issue_watchers: Watchers
diff --git a/lang/zh-tw.yml b/lang/zh-tw.yml
index 82f26ab86..1e6483631 100644
--- a/lang/zh-tw.yml
+++ b/lang/zh-tw.yml
@@ -634,3 +634,4 @@ enumeration_issue_priorities: 項目優先權
 enumeration_doc_categories: 文件分類
 enumeration_activities: 活動 (時間追蹤)
 field_parent_title: Parent page
+label_issue_watchers: Watchers
diff --git a/lang/zh.yml b/lang/zh.yml
index b4ae89ba7..7158a7f83 100644
--- a/lang/zh.yml
+++ b/lang/zh.yml
@@ -634,3 +634,4 @@ enumeration_doc_categories: 文档类别
 enumeration_activities: 活动（时间跟踪）
 text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."
 field_parent_title: Parent page
+label_issue_watchers: Watchers
diff --git a/lib/redmine.rb b/lib/redmine.rb
index bd413c96c..9890ab06f 100644
--- a/lib/redmine.rb
+++ b/lib/redmine.rb
@@ -46,6 +46,9 @@ Redmine::AccessControl.map do |map|
     # Gantt & calendar
     map.permission :view_gantt, :projects => :gantt
     map.permission :view_calendar, :projects => :calendar
+    # Watchers
+    map.permission :view_issue_watchers, {}
+    map.permission :add_issue_watchers, {:watchers => :new}
   end
   
   map.project_module :time_tracking do |map|
diff --git a/test/fixtures/roles.yml b/test/fixtures/roles.yml
index e7b142268..234e971c4 100644
--- a/test/fixtures/roles.yml
+++ b/test/fixtures/roles.yml
@@ -15,6 +15,8 @@ roles_001:
     - :add_issue_notes
     - :move_issues
     - :delete_issues
+    - :view_issue_watchers
+    - :add_issue_watchers
     - :manage_public_queries
     - :save_queries
     - :view_gantt
@@ -58,6 +60,7 @@ roles_002:
     - :add_issue_notes
     - :move_issues
     - :delete_issues
+    - :view_issue_watchers
     - :save_queries
     - :view_gantt
     - :view_calendar
@@ -95,6 +98,7 @@ roles_003:
     - :manage_issue_relations
     - :add_issue_notes
     - :move_issues
+    - :view_issue_watchers
     - :save_queries
     - :view_gantt
     - :view_calendar
diff --git a/test/fixtures/watchers.yml b/test/fixtures/watchers.yml
new file mode 100644
index 000000000..a8c482955
--- /dev/null
+++ b/test/fixtures/watchers.yml
@@ -0,0 +1,6 @@
+--- 
+watchers_001: 
+  watchable_type: Issue
+  watchable_id: 2
+  user_id: 3
+  
\ No newline at end of file
diff --git a/test/functional/watchers_controller_test.rb b/test/functional/watchers_controller_test.rb
new file mode 100644
index 000000000..cd6539410
--- /dev/null
+++ b/test/functional/watchers_controller_test.rb
@@ -0,0 +1,70 @@
+# Redmine - project management software
+# Copyright (C) 2006-2008  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 File.dirname(__FILE__) + '/../test_helper'
+require 'watchers_controller'
+
+# Re-raise errors caught by the controller.
+class WatchersController; def rescue_action(e) raise e end; end
+
+class WatchersControllerTest < Test::Unit::TestCase
+  fixtures :projects, :users, :roles, :members, :enabled_modules,
+           :issues, :trackers, :projects_trackers, :issue_statuses, :enumerations, :watchers
+  
+  def setup
+    @controller = WatchersController.new
+    @request    = ActionController::TestRequest.new
+    @response   = ActionController::TestResponse.new
+    User.current = nil
+  end
+  
+  def test_get_watch_should_be_invalid
+    @request.session[:user_id] = 3
+    get :watch, :object_type => 'issue', :object_id => '1'
+    assert_response 405
+  end
+  
+  def test_watch
+    @request.session[:user_id] = 3
+    assert_difference('Watcher.count') do
+      xhr :post, :watch, :object_type => 'issue', :object_id => '1'
+      assert_response :success
+      assert_select_rjs :replace_html, 'watcher'
+    end
+    assert Issue.find(1).watched_by?(User.find(3))
+  end
+  
+  def test_unwatch
+    @request.session[:user_id] = 3
+    assert_difference('Watcher.count', -1) do
+      xhr :post, :unwatch, :object_type => 'issue', :object_id => '2'
+      assert_response :success
+      assert_select_rjs :replace_html, 'watcher'
+    end
+    assert !Issue.find(1).watched_by?(User.find(3))
+  end
+  
+  def test_new_watcher
+    @request.session[:user_id] = 2
+    assert_difference('Watcher.count') do
+      xhr :post, :new, :object_type => 'issue', :object_id => '2', :watcher => {:user_id => '4'}
+      assert_response :success
+      assert_select_rjs :replace_html, 'watchers'
+    end
+    assert Issue.find(2).watched_by?(User.find(4))
+  end
+end
diff --git a/vendor/plugins/acts_as_watchable/lib/acts_as_watchable.rb b/vendor/plugins/acts_as_watchable/lib/acts_as_watchable.rb
index 53e4455cf..2cb122795 100644
--- a/vendor/plugins/acts_as_watchable/lib/acts_as_watchable.rb
+++ b/vendor/plugins/acts_as_watchable/lib/acts_as_watchable.rb
@@ -13,6 +13,7 @@ module Redmine
           
           class_eval do
             has_many :watchers, :as => :watchable, :dependent => :delete_all
+            has_many :watcher_users, :through => :watchers, :source => :user
           end
         end
       end
@@ -22,25 +23,40 @@ module Redmine
           base.extend ClassMethods
         end
         
+        # Returns an array of users that are proposed as watchers
+        def addable_watcher_users
+          self.project.users.sort - self.watcher_users
+        end
+        
+        # Adds user as a watcher
         def add_watcher(user)
           self.watchers << Watcher.new(:user => user)
         end
         
+        # Removes user from the watchers list
         def remove_watcher(user)
           return nil unless user && user.is_a?(User)
           Watcher.delete_all "watchable_type = '#{self.class}' AND watchable_id = #{self.id} AND user_id = #{user.id}"
         end
         
+        # Adds/removes watcher
+        def set_watcher(user, watching=true)
+          watching ? add_watcher(user) : remove_watcher(user)
+        end
+        
+        # Returns if object is watched by user
         def watched_by?(user)
           !self.watchers.find(:first,
                               :conditions => ["#{Watcher.table_name}.user_id = ?", user.id]).nil?
         end
         
+        # Returns an array of watchers' email addresses
         def watcher_recipients
           self.watchers.collect { |w| w.user.mail if w.user.active? }.compact
         end
 
         module ClassMethods
+          # Returns the objects that are watched by user
           def watched_by(user)
             find(:all, 
                  :include => :watchers,
@@ -50,4 +66,4 @@ module Redmine
       end
     end
   end
-end 
\ No newline at end of file
+end
diff --git a/vendor/plugins/gloc-1.1.0/lib/gloc-rails-text.rb b/vendor/plugins/gloc-1.1.0/lib/gloc-rails-text.rb
index f437410dc..51c024838 100644
--- a/vendor/plugins/gloc-1.1.0/lib/gloc-rails-text.rb
+++ b/vendor/plugins/gloc-1.1.0/lib/gloc-rails-text.rb
@@ -138,8 +138,8 @@ module ActionView #:nodoc:
       def add_options(option_tags, options, value = nil)
         option_tags = "<option value=\"\"></option>\n" + option_tags if options[:include_blank]
         
-        if value.blank? && options[:prompt]
-          ("<option value=\"\">#{options[:prompt].kind_of?(String) ? options[:prompt] : l(:actionview_instancetag_blank_option)}</option>\n") + option_tags
+        if options[:prompt]
+          ("<option value=\"\">--- #{options[:prompt].kind_of?(String) ? options[:prompt] : l(:actionview_instancetag_blank_option)} ---</option>\n") + option_tags
          else
           option_tags
         end

From d1a504f768f1903ea1a1a0b5178b6d5ae5a6dcf2 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 3 Aug 2008 09:27:27 +0000
Subject: [PATCH 664/710] Fixed: logtime entry duplicated when edited from
 parent project (#1728).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1713 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/timelog/_list.rhtml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/timelog/_list.rhtml b/app/views/timelog/_list.rhtml
index 189f4f5e8..8aebd75de 100644
--- a/app/views/timelog/_list.rhtml
+++ b/app/views/timelog/_list.rhtml
@@ -27,9 +27,9 @@
 <td class="hours"><%= html_hours("%.2f" % entry.hours) %></td>
 <td align="center">
 <% if entry.editable_by?(User.current) -%>
-    <%= link_to image_tag('edit.png'), {:controller => 'timelog', :action => 'edit', :id => entry},
+    <%= link_to image_tag('edit.png'), {:controller => 'timelog', :action => 'edit', :id => entry, :project_id => nil},
                                        :title => l(:button_edit) %>
-    <%= link_to image_tag('delete.png'), {:controller => 'timelog', :action => 'destroy', :id => entry},
+    <%= link_to image_tag('delete.png'), {:controller => 'timelog', :action => 'destroy', :id => entry, :project_id => nil},
                                          :confirm => l(:text_are_you_sure),
                                          :method => :post,
                                          :title => l(:button_delete) %>

From 91a5fa32d7b0bd1bcebead3213091134dfc3df2b Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 3 Aug 2008 09:30:56 +0000
Subject: [PATCH 665/710] Fixes non-matching html tag (#1734).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1714 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/wiki/history.rhtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/wiki/history.rhtml b/app/views/wiki/history.rhtml
index 6462e9fdd..c78ae115a 100644
--- a/app/views/wiki/history.rhtml
+++ b/app/views/wiki/history.rhtml
@@ -18,7 +18,7 @@
 <% line_num = 1 %>
 <% @versions.each do |ver| %>
 <tr class="<%= cycle("odd", "even") %>">
-    <td class="id"><%= link_to ver.version, :action => 'index', :page => @page.title, :version => ver.version %></th>
+    <td class="id"><%= link_to ver.version, :action => 'index', :page => @page.title, :version => ver.version %></td>
     <td class="checkbox"><%= radio_button_tag('version', ver.version, (line_num==1), :id => "cb-#{line_num}", :onclick => "$('cbto-#{line_num+1}').checked=true;") if show_diff && (line_num < @versions.size) %></td>
     <td class="checkbox"><%= radio_button_tag('version_from', ver.version, (line_num==2), :id => "cbto-#{line_num}", :onclick => "if ($('cb-#{line_num}').checked==true || $('version_from').value > #{ver.version}) {$('cb-#{line_num-1}').checked=true;}") if show_diff && (line_num > 1) %></td>
     <td align="center"><%= format_time(ver.updated_on) %></td>

From 2e4e9b88d27942f6f2f60cf731656cfcc023ee39 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 3 Aug 2008 11:07:16 +0000
Subject: [PATCH 666/710] Fixes rdm-mailhandler SSL support (#1724).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1715 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 extra/mail_handler/rdm-mailhandler.rb | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/extra/mail_handler/rdm-mailhandler.rb b/extra/mail_handler/rdm-mailhandler.rb
index 87a6798fa..96e975187 100644
--- a/extra/mail_handler/rdm-mailhandler.rb
+++ b/extra/mail_handler/rdm-mailhandler.rb
@@ -9,6 +9,19 @@ require 'net/https'
 require 'uri'
 require 'getoptlong'
 
+module Net
+  class HTTPS < HTTP
+    def self.post_form(url, params)
+      request = Post.new(url.path)
+      request.form_data = params
+      request.basic_auth url.user, url.password if url.user
+      http = new(url.host, url.port)
+      http.use_ssl = (url.scheme == 'https')
+      http.start {|h| h.request(request) }
+    end
+  end
+end
+
 class RedmineMailHandler
   VERSION = '0.1'
   
@@ -59,7 +72,7 @@ class RedmineMailHandler
     issue_attributes.each { |attr, value| data["issue[#{attr}]"] = value }
              
     debug "Posting to #{uri}..."
-    response = Net::HTTP.post_form(URI.parse(uri), data)
+    response = Net::HTTPS.post_form(URI.parse(uri), data)
     debug "Response received: #{response.code}"
     response.code == 201 ? 0 : 1
   end

From 361138e16d9ee28b59990424ca5ed3a778898a3e Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Thu, 7 Aug 2008 19:59:02 +0000
Subject: [PATCH 667/710] Slight change to engines to let plugins override
 views.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1723 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 vendor/plugins/engines/lib/engines/plugin.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vendor/plugins/engines/lib/engines/plugin.rb b/vendor/plugins/engines/lib/engines/plugin.rb
index caa58f7cd..66c1903d1 100644
--- a/vendor/plugins/engines/lib/engines/plugin.rb
+++ b/vendor/plugins/engines/lib/engines/plugin.rb
@@ -88,7 +88,7 @@ module Engines
     def add_plugin_view_paths
       view_path = File.join(directory, 'app', 'views')
       if File.exist?(view_path)
-        ActionController::Base.view_paths.insert(1, view_path) # push it just underneath the app
+        ActionController::Base.prepend_view_path(view_path) # push it just underneath the app
         ActionView::TemplateFinder.process_view_paths(view_path)
       end
     end

From 2fdf4426cd8f7437f03181a4f3091f239b47f6d6 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 10 Aug 2008 15:22:54 +0000
Subject: [PATCH 668/710] Moves @layout 'base'@ to ApplicationController.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1727 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/account_controller.rb          | 1 -
 app/controllers/admin_controller.rb            | 1 -
 app/controllers/application.rb                 | 2 ++
 app/controllers/attachments_controller.rb      | 1 -
 app/controllers/auth_sources_controller.rb     | 1 -
 app/controllers/boards_controller.rb           | 1 -
 app/controllers/custom_fields_controller.rb    | 1 -
 app/controllers/documents_controller.rb        | 1 -
 app/controllers/enumerations_controller.rb     | 1 -
 app/controllers/issue_categories_controller.rb | 1 -
 app/controllers/issue_relations_controller.rb  | 1 -
 app/controllers/issue_statuses_controller.rb   | 1 -
 app/controllers/issues_controller.rb           | 1 -
 app/controllers/journals_controller.rb         | 1 -
 app/controllers/members_controller.rb          | 1 -
 app/controllers/messages_controller.rb         | 1 -
 app/controllers/my_controller.rb               | 5 ++---
 app/controllers/news_controller.rb             | 1 -
 app/controllers/projects_controller.rb         | 1 -
 app/controllers/queries_controller.rb          | 1 -
 app/controllers/reports_controller.rb          | 1 -
 app/controllers/repositories_controller.rb     | 1 -
 app/controllers/roles_controller.rb            | 1 -
 app/controllers/search_controller.rb           | 2 --
 app/controllers/settings_controller.rb         | 1 -
 app/controllers/timelog_controller.rb          | 1 -
 app/controllers/trackers_controller.rb         | 1 -
 app/controllers/users_controller.rb            | 1 -
 app/controllers/versions_controller.rb         | 1 -
 app/controllers/watchers_controller.rb         | 1 -
 app/controllers/welcome_controller.rb          | 1 -
 app/controllers/wiki_controller.rb             | 1 -
 app/controllers/wikis_controller.rb            | 1 -
 33 files changed, 4 insertions(+), 35 deletions(-)

diff --git a/app/controllers/account_controller.rb b/app/controllers/account_controller.rb
index 1fe990007..96a2fc921 100644
--- a/app/controllers/account_controller.rb
+++ b/app/controllers/account_controller.rb
@@ -16,7 +16,6 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class AccountController < ApplicationController
-  layout 'base'	
   helper :custom_fields
   include CustomFieldsHelper   
   
diff --git a/app/controllers/admin_controller.rb b/app/controllers/admin_controller.rb
index e002f3a27..a6df49dcd 100644
--- a/app/controllers/admin_controller.rb
+++ b/app/controllers/admin_controller.rb
@@ -16,7 +16,6 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class AdminController < ApplicationController
-  layout 'base'	
   before_filter :require_admin
 
   helper :sort
diff --git a/app/controllers/application.rb b/app/controllers/application.rb
index debe02162..7a56e61f0 100644
--- a/app/controllers/application.rb
+++ b/app/controllers/application.rb
@@ -18,6 +18,8 @@
 require 'uri'
 
 class ApplicationController < ActionController::Base
+  layout 'base'
+  
   before_filter :user_setup, :check_if_login_required, :set_localization
   filter_parameter_logging :password
   
diff --git a/app/controllers/attachments_controller.rb b/app/controllers/attachments_controller.rb
index 1e8f566e6..788bab94d 100644
--- a/app/controllers/attachments_controller.rb
+++ b/app/controllers/attachments_controller.rb
@@ -16,7 +16,6 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class AttachmentsController < ApplicationController
-  layout 'base'
   before_filter :find_project
 
   def show
diff --git a/app/controllers/auth_sources_controller.rb b/app/controllers/auth_sources_controller.rb
index b830f1970..981f29f03 100644
--- a/app/controllers/auth_sources_controller.rb
+++ b/app/controllers/auth_sources_controller.rb
@@ -16,7 +16,6 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class AuthSourcesController < ApplicationController
-  layout 'base'	
   before_filter :require_admin
 
   def index
diff --git a/app/controllers/boards_controller.rb b/app/controllers/boards_controller.rb
index 5bf4499bd..4532a88fe 100644
--- a/app/controllers/boards_controller.rb
+++ b/app/controllers/boards_controller.rb
@@ -16,7 +16,6 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class BoardsController < ApplicationController
-  layout 'base'
   before_filter :find_project, :authorize
 
   helper :messages
diff --git a/app/controllers/custom_fields_controller.rb b/app/controllers/custom_fields_controller.rb
index d30e89493..4589996f1 100644
--- a/app/controllers/custom_fields_controller.rb
+++ b/app/controllers/custom_fields_controller.rb
@@ -16,7 +16,6 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class CustomFieldsController < ApplicationController
-  layout 'base'		
   before_filter :require_admin
 
   def index
diff --git a/app/controllers/documents_controller.rb b/app/controllers/documents_controller.rb
index 1f0784bb2..dbf9cd8e5 100644
--- a/app/controllers/documents_controller.rb
+++ b/app/controllers/documents_controller.rb
@@ -16,7 +16,6 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class DocumentsController < ApplicationController
-  layout 'base'
   before_filter :find_project, :only => [:index, :new]
   before_filter :find_document, :except => [:index, :new]
   before_filter :authorize
diff --git a/app/controllers/enumerations_controller.rb b/app/controllers/enumerations_controller.rb
index 788fa11b2..50521bab8 100644
--- a/app/controllers/enumerations_controller.rb
+++ b/app/controllers/enumerations_controller.rb
@@ -16,7 +16,6 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class EnumerationsController < ApplicationController
-  layout 'base'
   before_filter :require_admin
   
   def index
diff --git a/app/controllers/issue_categories_controller.rb b/app/controllers/issue_categories_controller.rb
index a73935b4f..8315d6eb8 100644
--- a/app/controllers/issue_categories_controller.rb
+++ b/app/controllers/issue_categories_controller.rb
@@ -16,7 +16,6 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class IssueCategoriesController < ApplicationController
-  layout 'base'
   menu_item :settings
   before_filter :find_project, :authorize
   
diff --git a/app/controllers/issue_relations_controller.rb b/app/controllers/issue_relations_controller.rb
index cb0ad552a..2ca3f0d68 100644
--- a/app/controllers/issue_relations_controller.rb
+++ b/app/controllers/issue_relations_controller.rb
@@ -16,7 +16,6 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class IssueRelationsController < ApplicationController
-  layout 'base'
   before_filter :find_project, :authorize
   
   def new
diff --git a/app/controllers/issue_statuses_controller.rb b/app/controllers/issue_statuses_controller.rb
index d0712e7c3..69d9db965 100644
--- a/app/controllers/issue_statuses_controller.rb
+++ b/app/controllers/issue_statuses_controller.rb
@@ -16,7 +16,6 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class IssueStatusesController < ApplicationController
-  layout 'base'	
   before_filter :require_admin
 
   verify :method => :post, :only => [ :destroy, :create, :update, :move ],
diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index c8edd1726..6e2de17c9 100644
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -16,7 +16,6 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class IssuesController < ApplicationController
-  layout 'base'
   menu_item :new_issue, :only => :new
   
   before_filter :find_issue, :only => [:show, :edit, :reply, :destroy_attachment]
diff --git a/app/controllers/journals_controller.rb b/app/controllers/journals_controller.rb
index 758b8507f..6df54f098 100644
--- a/app/controllers/journals_controller.rb
+++ b/app/controllers/journals_controller.rb
@@ -16,7 +16,6 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class JournalsController < ApplicationController
-  layout 'base'
   before_filter :find_journal
   
   def edit
diff --git a/app/controllers/members_controller.rb b/app/controllers/members_controller.rb
index a1706e601..1072090bc 100644
--- a/app/controllers/members_controller.rb
+++ b/app/controllers/members_controller.rb
@@ -16,7 +16,6 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class MembersController < ApplicationController
-  layout 'base'
   before_filter :find_member, :except => :new
   before_filter :find_project, :only => :new
   before_filter :authorize
diff --git a/app/controllers/messages_controller.rb b/app/controllers/messages_controller.rb
index 97cb2c3bf..08c77d7d2 100644
--- a/app/controllers/messages_controller.rb
+++ b/app/controllers/messages_controller.rb
@@ -16,7 +16,6 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class MessagesController < ApplicationController
-  layout 'base'
   menu_item :boards
   before_filter :find_board, :only => [:new, :preview]
   before_filter :find_message, :except => [:new, :preview]
diff --git a/app/controllers/my_controller.rb b/app/controllers/my_controller.rb
index ff3393e90..1cfa3e531 100644
--- a/app/controllers/my_controller.rb
+++ b/app/controllers/my_controller.rb
@@ -16,11 +16,10 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class MyController < ApplicationController
-  helper :issues
-  
-  layout 'base'
   before_filter :require_login
 
+  helper :issues
+
   BLOCKS = { 'issuesassignedtome' => :label_assigned_to_me_issues,
              'issuesreportedbyme' => :label_reported_issues,
              'issueswatched' => :label_watched_issues,
diff --git a/app/controllers/news_controller.rb b/app/controllers/news_controller.rb
index 8c1a03a5b..b5f7ca1b2 100644
--- a/app/controllers/news_controller.rb
+++ b/app/controllers/news_controller.rb
@@ -16,7 +16,6 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class NewsController < ApplicationController
-  layout 'base'
   before_filter :find_news, :except => [:new, :index, :preview]
   before_filter :find_project, :only => [:new, :preview]
   before_filter :authorize, :except => [:index, :preview]
diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index cfac01b9a..43d35cf4f 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -16,7 +16,6 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class ProjectsController < ApplicationController
-  layout 'base'
   menu_item :overview
   menu_item :activity, :only => :activity
   menu_item :roadmap, :only => :roadmap
diff --git a/app/controllers/queries_controller.rb b/app/controllers/queries_controller.rb
index da2c4a2c8..8500e853a 100644
--- a/app/controllers/queries_controller.rb
+++ b/app/controllers/queries_controller.rb
@@ -16,7 +16,6 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class QueriesController < ApplicationController
-  layout 'base'
   menu_item :issues
   before_filter :find_query, :except => :new
   before_filter :find_optional_project, :only => :new
diff --git a/app/controllers/reports_controller.rb b/app/controllers/reports_controller.rb
index 338059a50..dd3ece930 100644
--- a/app/controllers/reports_controller.rb
+++ b/app/controllers/reports_controller.rb
@@ -16,7 +16,6 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class ReportsController < ApplicationController
-  layout 'base'
   menu_item :issues
   before_filter :find_project, :authorize
 
diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb
index 13bba6200..2f96e2d66 100644
--- a/app/controllers/repositories_controller.rb
+++ b/app/controllers/repositories_controller.rb
@@ -23,7 +23,6 @@ class ChangesetNotFound < Exception; end
 class InvalidRevisionParam < Exception; end
 
 class RepositoriesController < ApplicationController
-  layout 'base'
   menu_item :repository
   before_filter :find_repository, :except => :edit
   before_filter :find_project, :only => :edit
diff --git a/app/controllers/roles_controller.rb b/app/controllers/roles_controller.rb
index 9fdd9701b..72555e5b0 100644
--- a/app/controllers/roles_controller.rb
+++ b/app/controllers/roles_controller.rb
@@ -16,7 +16,6 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class RolesController < ApplicationController
-  layout 'base'	
   before_filter :require_admin
 
   verify :method => :post, :only => [ :destroy, :move ],
diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb
index 50e42f088..e6e66f05c 100644
--- a/app/controllers/search_controller.rb
+++ b/app/controllers/search_controller.rb
@@ -16,8 +16,6 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class SearchController < ApplicationController
-  layout 'base'
-  
   before_filter :find_optional_project
 
   helper :messages
diff --git a/app/controllers/settings_controller.rb b/app/controllers/settings_controller.rb
index e20cb64b5..6482a3576 100644
--- a/app/controllers/settings_controller.rb
+++ b/app/controllers/settings_controller.rb
@@ -16,7 +16,6 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class SettingsController < ApplicationController
-  layout 'base'	
   before_filter :require_admin
   
   def index
diff --git a/app/controllers/timelog_controller.rb b/app/controllers/timelog_controller.rb
index bf7b57d9d..f331cdbe4 100644
--- a/app/controllers/timelog_controller.rb
+++ b/app/controllers/timelog_controller.rb
@@ -16,7 +16,6 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class TimelogController < ApplicationController
-  layout 'base'
   menu_item :issues
   before_filter :find_project, :authorize
 
diff --git a/app/controllers/trackers_controller.rb b/app/controllers/trackers_controller.rb
index 3d7dbd5c5..8c02f9474 100644
--- a/app/controllers/trackers_controller.rb
+++ b/app/controllers/trackers_controller.rb
@@ -16,7 +16,6 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class TrackersController < ApplicationController
-  layout 'base'
   before_filter :require_admin
 
   def index
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index eb8aa7bac..d2564c2cb 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -16,7 +16,6 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class UsersController < ApplicationController
-  layout 'base'	
   before_filter :require_admin
 
   helper :sort
diff --git a/app/controllers/versions_controller.rb b/app/controllers/versions_controller.rb
index 5d3393ed8..ab2ccb773 100644
--- a/app/controllers/versions_controller.rb
+++ b/app/controllers/versions_controller.rb
@@ -16,7 +16,6 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class VersionsController < ApplicationController
-  layout 'base'
   menu_item :roadmap
   before_filter :find_project, :authorize
 
diff --git a/app/controllers/watchers_controller.rb b/app/controllers/watchers_controller.rb
index a44686d3f..8e6ee3a9e 100644
--- a/app/controllers/watchers_controller.rb
+++ b/app/controllers/watchers_controller.rb
@@ -16,7 +16,6 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class WatchersController < ApplicationController
-  layout 'base'
   before_filter :find_project
   before_filter :require_login, :check_project_privacy, :only => [:watch, :unwatch]
   before_filter :authorize, :only => :new
diff --git a/app/controllers/welcome_controller.rb b/app/controllers/welcome_controller.rb
index b4be7fb1c..b8108e8ac 100644
--- a/app/controllers/welcome_controller.rb
+++ b/app/controllers/welcome_controller.rb
@@ -16,7 +16,6 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class WelcomeController < ApplicationController
-  layout 'base'
 
   def index
     @news = News.latest User.current
diff --git a/app/controllers/wiki_controller.rb b/app/controllers/wiki_controller.rb
index 5a5f3949f..46df2931e 100644
--- a/app/controllers/wiki_controller.rb
+++ b/app/controllers/wiki_controller.rb
@@ -18,7 +18,6 @@
 require 'diff'
 
 class WikiController < ApplicationController
-  layout 'base'
   before_filter :find_wiki, :authorize
   
   verify :method => :post, :only => [:destroy, :destroy_attachment, :protect], :redirect_to => { :action => :index }
diff --git a/app/controllers/wikis_controller.rb b/app/controllers/wikis_controller.rb
index 6054abd9a..215d39f4b 100644
--- a/app/controllers/wikis_controller.rb
+++ b/app/controllers/wikis_controller.rb
@@ -16,7 +16,6 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class WikisController < ApplicationController
-  layout 'base'
   menu_item :settings
   before_filter :find_project, :authorize
   

From ab4873b83d6f62fa78fdf07da4de2f2f7e0d738d Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 10 Aug 2008 21:35:03 +0000
Subject: [PATCH 669/710] Quote ids for attachment association since Trac's
 attachment.id is varchar (#1759).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1728 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 lib/tasks/migrate_from_trac.rake | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/lib/tasks/migrate_from_trac.rake b/lib/tasks/migrate_from_trac.rake
index 50048634b..880964ff8 100644
--- a/lib/tasks/migrate_from_trac.rake
+++ b/lib/tasks/migrate_from_trac.rake
@@ -149,7 +149,10 @@ namespace :redmine do
         
         # ticket changes: only migrate status changes and comments
         has_many :changes, :class_name => "TracTicketChange", :foreign_key => :ticket
-        has_many :attachments, :class_name => "TracAttachment", :foreign_key => :id, :conditions => "#{TracMigrate::TracAttachment.table_name}.type = 'ticket'"
+        has_many :attachments, :class_name => "TracAttachment",
+                               :finder_sql => "SELECT DISTINCT attachment.* FROM #{TracMigrate::TracAttachment.table_name}" +
+                                              " WHERE #{TracMigrate::TracAttachment.table_name}.type = 'ticket'" +
+                                              ' AND #{TracMigrate::TracAttachment.table_name}.id = \'#{id}\''
         has_many :customs, :class_name => "TracTicketCustom", :foreign_key => :ticket
         
         def ticket_type
@@ -186,7 +189,10 @@ namespace :redmine do
         set_table_name :wiki
         set_primary_key :name
         
-        has_many :attachments, :class_name => "TracAttachment", :foreign_key => :id, :conditions => "#{TracMigrate::TracAttachment.table_name}.type = 'wiki'"
+        has_many :attachments, :class_name => "TracAttachment",
+                               :finder_sql => "SELECT DISTINCT attachment.* FROM #{TracMigrate::TracAttachment.table_name}" +
+                                      " WHERE #{TracMigrate::TracAttachment.table_name}.type = 'wiki'" +
+                                      ' AND #{TracMigrate::TracAttachment.table_name}.id = \'#{id}\''
         
         def self.columns
           # Hides readonly Trac field to prevent clash with AR readonly? method (Rails 2.0)

From 16509203398f17fafca33136375263aec64b2a0f Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 10 Aug 2008 22:18:23 +0000
Subject: [PATCH 670/710] Adds links to forum messages using message#id syntax
 (#1756).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1729 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/helpers/application_helper.rb            | 14 +++++++++++++-
 test/unit/helpers/application_helper_test.rb | 11 ++++++++++-
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index a4102c84a..ed5c6bdb7 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -319,7 +319,9 @@ module ApplicationHelper
     #     source:some/file#L120 -> Link to line 120 of the file
     #     source:some/file@52#L120 -> Link to line 120 of the file's revision 52
     #     export:some/file -> Force the download of the file
-    text = text.gsub(%r{([\s\(,\-\>]|^)(!)?(attachment|document|version|commit|source|export)?((#|r)(\d+)|(:)([^"\s<>][^\s<>]*?|"[^"]+?"))(?=(?=[[:punct:]]\W)|\s|<|$)}) do |m|
+    #  Forum messages:
+    #     message#1218 -> Link to message with id 1218
+    text = text.gsub(%r{([\s\(,\-\>]|^)(!)?(attachment|document|version|commit|source|export|message)?((#|r)(\d+)|(:)([^"\s<>][^\s<>]*?|"[^"]+?"))(?=(?=[[:punct:]]\W)|\s|<|$)}) do |m|
       leading, esc, prefix, sep, oid = $1, $2, $3, $5 || $7, $6 || $8
       link = nil
       if esc.nil?
@@ -349,6 +351,16 @@ module ApplicationHelper
               link = link_to h(version.name), {:only_path => only_path, :controller => 'versions', :action => 'show', :id => version},
                                               :class => 'version'
             end
+          when 'message'
+            if message = Message.find_by_id(oid, :include => [:parent, {:board => :project}], :conditions => Project.visible_by(User.current))
+              link = link_to h(truncate(message.subject, 60)), {:only_path => only_path,
+                                                                :controller => 'messages',
+                                                                :action => 'show',
+                                                                :board_id => message.board,
+                                                                :id => message.root,
+                                                                :anchor => (message.parent ? "message-#{message.id}" : nil)},
+                                                 :class => 'message'
+            end
           end
         elsif sep == ':'
           # removes the double quotes if any
diff --git a/test/unit/helpers/application_helper_test.rb b/test/unit/helpers/application_helper_test.rb
index 979321bd3..452c0b535 100644
--- a/test/unit/helpers/application_helper_test.rb
+++ b/test/unit/helpers/application_helper_test.rb
@@ -20,7 +20,11 @@ require File.dirname(__FILE__) + '/../../test_helper'
 class ApplicationHelperTest < HelperTestCase
   include ApplicationHelper
   include ActionView::Helpers::TextHelper
-  fixtures :projects, :repositories, :changesets, :trackers, :issue_statuses, :issues, :documents, :versions, :wikis, :wiki_pages, :wiki_contents, :roles, :enabled_modules
+  fixtures :projects, :roles, :enabled_modules,
+                      :repositories, :changesets, 
+                      :trackers, :issue_statuses, :issues, :versions, :documents,
+                      :wikis, :wiki_pages, :wiki_contents,
+                      :boards, :messages
 
   def setup
     super
@@ -83,6 +87,8 @@ class ApplicationHelperTest < HelperTestCase
     version_link = link_to('1.0', {:controller => 'versions', :action => 'show', :id => 2},
                                   :class => 'version')
 
+    message_url = {:controller => 'messages', :action => 'show', :board_id => 1, :id => 4}
+    
     source_url = {:controller => 'repositories', :action => 'entry', :id => 'ecookbook', :path => ['some', 'file']}
     source_url_with_ext = {:controller => 'repositories', :action => 'entry', :id => 'ecookbook', :path => ['some', 'file.ext']}
     
@@ -111,6 +117,9 @@ class ApplicationHelperTest < HelperTestCase
       'source:/some/file.ext#L110'  => link_to('source:/some/file.ext#L110', source_url_with_ext.merge(:anchor => 'L110'), :class => 'source'),
       'source:/some/file@52#L110'   => link_to('source:/some/file@52#L110', source_url.merge(:rev => 52, :anchor => 'L110'), :class => 'source'),
       'export:/some/file'           => link_to('export:/some/file', source_url.merge(:format => 'raw'), :class => 'source download'),
+      # message
+      'message#4'                   => link_to('Post 2', message_url, :class => 'message'),
+      'message#5'                   => link_to('RE: post 2', message_url.merge(:anchor => 'message-5'), :class => 'message'),
       # escaping
       '!#3.'                        => '#3.',
       '!r1'                         => 'r1',

From 1631019026089cb7dc49b50365274bb07ba44025 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Mon, 11 Aug 2008 18:09:54 +0000
Subject: [PATCH 671/710] Allow same name for custom fields on different object
 types.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1730 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/models/custom_field.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/custom_field.rb b/app/models/custom_field.rb
index 990adf9e2..7ad19437f 100644
--- a/app/models/custom_field.rb
+++ b/app/models/custom_field.rb
@@ -30,7 +30,7 @@ class CustomField < ActiveRecord::Base
   }.freeze
 
   validates_presence_of :name, :field_format
-  validates_uniqueness_of :name
+  validates_uniqueness_of :name, :scope => :type
   validates_length_of :name, :maximum => 30
   validates_format_of :name, :with => /^[\w\s\'\-]*$/i
   validates_inclusion_of :field_format, :in => FIELD_FORMATS.keys

From 237a3f52a2d9d269b56f5cdb022f0ff4f8197100 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Mon, 11 Aug 2008 18:24:39 +0000
Subject: [PATCH 672/710] Fixes custom fields display order at several places
 (#1768).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1731 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/account_controller.rb                        | 2 +-
 app/models/custom_field.rb                                   | 2 +-
 app/models/project.rb                                        | 2 +-
 app/views/issues/_form.rhtml                                 | 2 +-
 app/views/issues/_form_custom_fields.rhtml                   | 2 +-
 test/functional/issues_controller_test.rb                    | 2 +-
 .../plugins/acts_as_customizable/lib/acts_as_customizable.rb | 5 ++++-
 7 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/app/controllers/account_controller.rb b/app/controllers/account_controller.rb
index 96a2fc921..4b2ec8317 100644
--- a/app/controllers/account_controller.rb
+++ b/app/controllers/account_controller.rb
@@ -25,7 +25,7 @@ class AccountController < ApplicationController
   # Show user's account
   def show
     @user = User.find_active(params[:id])
-    @custom_values = @user.custom_values.find(:all, :include => :custom_field)
+    @custom_values = @user.custom_values
     
     # show only public projects and private projects that the logged in user is also a member of
     @memberships = @user.memberships.select do |membership|
diff --git a/app/models/custom_field.rb b/app/models/custom_field.rb
index 7ad19437f..704fbe010 100644
--- a/app/models/custom_field.rb
+++ b/app/models/custom_field.rb
@@ -66,7 +66,7 @@ class CustomField < ActiveRecord::Base
   
   # to move in project_custom_field
   def self.for_all
-    find(:all, :conditions => ["is_for_all=?", true])
+    find(:all, :conditions => ["is_for_all=?", true], :order => 'position')
   end
   
   def type_name
diff --git a/app/models/project.rb b/app/models/project.rb
index 5679344bc..9e4bd6971 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -198,7 +198,7 @@ class Project < ActiveRecord::Base
   # Returns an array of all custom fields enabled for project issues
   # (explictly associated custom fields and custom fields enabled for all projects)
   def all_issue_custom_fields
-    @all_issue_custom_fields ||= (IssueCustomField.for_all + issue_custom_fields).uniq
+    @all_issue_custom_fields ||= (IssueCustomField.for_all + issue_custom_fields).uniq.sort
   end
   
   def project
diff --git a/app/views/issues/_form.rhtml b/app/views/issues/_form.rhtml
index 9bb74fd34..4eca3cb4a 100644
--- a/app/views/issues/_form.rhtml
+++ b/app/views/issues/_form.rhtml
@@ -42,7 +42,7 @@
 </div>
 
 <div style="clear:both;"> </div>
-<%= render :partial => 'form_custom_fields', :locals => {:values => @custom_values} %>
+<%= render :partial => 'form_custom_fields' %>
 
 <% if @issue.new_record? %>
 <p><label><%=l(:label_attachment_plural)%></label><%= render :partial => 'attachments/form' %></p>
diff --git a/app/views/issues/_form_custom_fields.rhtml b/app/views/issues/_form_custom_fields.rhtml
index ebd4c3219..752fb4d37 100644
--- a/app/views/issues/_form_custom_fields.rhtml
+++ b/app/views/issues/_form_custom_fields.rhtml
@@ -1,5 +1,5 @@
 <div class="splitcontentleft">
-<% i = 1 %>
+<% i = 0 %>
 <% split_on = @issue.custom_field_values.size / 2 %>
 <% @issue.custom_field_values.each do |value| %>
 	<p><%= custom_field_tag_with_label :issue, value %></p>
diff --git a/test/functional/issues_controller_test.rb b/test/functional/issues_controller_test.rb
index 22f9a3baf..005542f81 100644
--- a/test/functional/issues_controller_test.rb
+++ b/test/functional/issues_controller_test.rb
@@ -212,7 +212,7 @@ class IssuesControllerTest < Test::Unit::TestCase
     assert_equal 2, issue.author_id
     assert_equal 3, issue.tracker_id
     assert_nil issue.estimated_hours
-    v = issue.custom_values.find_by_custom_field_id(2)
+    v = issue.custom_values.find(:first, :conditions => {:custom_field_id => 2})
     assert_not_nil v
     assert_equal 'Value for field 2', v.value
   end
diff --git a/vendor/plugins/acts_as_customizable/lib/acts_as_customizable.rb b/vendor/plugins/acts_as_customizable/lib/acts_as_customizable.rb
index 05857d0a0..a5598dbd2 100644
--- a/vendor/plugins/acts_as_customizable/lib/acts_as_customizable.rb
+++ b/vendor/plugins/acts_as_customizable/lib/acts_as_customizable.rb
@@ -27,7 +27,10 @@ module Redmine
           return if self.included_modules.include?(Redmine::Acts::Customizable::InstanceMethods)
           cattr_accessor :customizable_options
           self.customizable_options = options
-          has_many :custom_values, :dependent => :delete_all, :as => :customized
+          has_many :custom_values, :as => :customized,
+                                   :include => :custom_field,
+                                   :order => "#{CustomField.table_name}.position",
+                                   :dependent => :delete_all
           before_validation_on_create { |customized| customized.custom_field_values }
           # Trigger validation only if custom values were changed
           validates_associated :custom_values, :on => :update, :if => Proc.new { |customized| customized.custom_field_values_changed? }

From a3e729a263f69cb86b2066a1958d5bcb0ab5b918 Mon Sep 17 00:00:00 2001
From: Eric Davis <edavis@littlestreamsoftware.com>
Date: Mon, 11 Aug 2008 20:49:52 +0000
Subject: [PATCH 673/710] Added doc/README_FOR_APP so RDoc can be built. 
 (#1769)

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1732 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 doc/README_FOR_APP | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 doc/README_FOR_APP

diff --git a/doc/README_FOR_APP b/doc/README_FOR_APP
new file mode 100644
index 000000000..fb70acaac
--- /dev/null
+++ b/doc/README_FOR_APP
@@ -0,0 +1,5 @@
+= Redmine
+
+Redmine is a flexible project management web application written using Ruby on Rails framework.
+
+More details can be found at http://www.redmine.org

From 988f8d65fa3d7e7cb6bd17900ba21f05dfc021df Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Mon, 11 Aug 2008 20:55:17 +0000
Subject: [PATCH 674/710] Adds 'Edit' link on account/show for admin users.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1733 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/account/show.rhtml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/views/account/show.rhtml b/app/views/account/show.rhtml
index 2d0731b42..1160a5d8c 100644
--- a/app/views/account/show.rhtml
+++ b/app/views/account/show.rhtml
@@ -1,3 +1,7 @@
+<div class="contextual">
+<%= link_to(l(:button_edit), {:controller => 'users', :action => 'edit', :id => @user}, :class => 'icon icon-edit') if User.current.admin? %>
+</div>
+
 <h2><%=h @user.name %></h2>
 
 <p>

From d47400aa8d0a4a2b2f9aadb27694d7fc18fb9ac0 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Mon, 11 Aug 2008 21:02:36 +0000
Subject: [PATCH 675/710] Adds Lock/Unlock/Activate link on user edit screen.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1734 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/users/edit.rhtml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/views/users/edit.rhtml b/app/views/users/edit.rhtml
index a4d0b2e5b..4714bcecb 100644
--- a/app/views/users/edit.rhtml
+++ b/app/views/users/edit.rhtml
@@ -1,3 +1,7 @@
+<div class="contextual">
+<%= change_status_link(@user) %>
+</div>
+
 <h2><%=l(:label_user)%>: <%=h @user.login %></h2>
 
 <% selected_tab = params[:tab] ? params[:tab].to_s : user_settings_tabs.first[:name] %>

From 41d44c5285a78e3b8fe174ba88ff895ff03a1f69 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Mon, 11 Aug 2008 21:10:24 +0000
Subject: [PATCH 676/710] Adds user count in status drop down on admin user
 list.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1735 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/helpers/users_helper.rb | 9 +++++----
 app/views/users/list.rhtml  | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb
index 32b29526a..5b113e880 100644
--- a/app/helpers/users_helper.rb
+++ b/app/helpers/users_helper.rb
@@ -16,11 +16,12 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 module UsersHelper
-  def status_options_for_select(selected)
+  def users_status_options_for_select(selected)
+    user_count_by_status = User.count(:group => 'status').to_hash
     options_for_select([[l(:label_all), ''], 
-                        [l(:status_active), 1],
-                        [l(:status_registered), 2],
-                        [l(:status_locked), 3]], selected)
+                        ["#{l(:status_active)} (#{user_count_by_status[1].to_i})", 1],
+                        ["#{l(:status_registered)} (#{user_count_by_status[2].to_i})", 2],
+                        ["#{l(:status_locked)} (#{user_count_by_status[3].to_i})", 3]], selected)
   end
   
   # Options for the new membership projects combo-box
diff --git a/app/views/users/list.rhtml b/app/views/users/list.rhtml
index 0ef6b8aa4..77d45a6bb 100644
--- a/app/views/users/list.rhtml
+++ b/app/views/users/list.rhtml
@@ -7,7 +7,7 @@
 <% form_tag({}, :method => :get) do %>
 <fieldset><legend><%= l(:label_filter_plural) %></legend>
 <label><%= l(:field_status) %> :</label>
-<%= select_tag 'status', status_options_for_select(@status), :class => "small", :onchange => "this.form.submit(); return false;"  %>
+<%= select_tag 'status', users_status_options_for_select(@status), :class => "small", :onchange => "this.form.submit(); return false;"  %>
 </fieldset>
 <% end %>
 &nbsp;

From ca2449d9cfab4ce9f0712b867d82e593b31b0f4c Mon Sep 17 00:00:00 2001
From: Eric Davis <edavis@littlestreamsoftware.com>
Date: Wed, 13 Aug 2008 03:54:54 +0000
Subject: [PATCH 677/710] Added missing documentation for setting up the Darcs
 test repository.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1743 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 doc/RUNNING_TESTS | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/doc/RUNNING_TESTS b/doc/RUNNING_TESTS
index 18dfe6983..fe4f9378f 100644
--- a/doc/RUNNING_TESTS
+++ b/doc/RUNNING_TESTS
@@ -24,6 +24,10 @@ Git
 ---
 gunzip < test/fixtures/repositories/git_repository.tar.gz | tar -xv -C tmp/test
 
+Darcs
+-----
+gunzip < test/fixtures/repositories/darcs_repository.tar.gz | tar -xv -C tmp/test
+
 FileSystem
 ----------
 gunzip < test/fixtures/repositories/filesystem_repository.tar.gz | tar -xv -C tmp/test

From fab5c1fdef5dbe4a64e3975855620d6bea7024b9 Mon Sep 17 00:00:00 2001
From: Eric Davis <edavis@littlestreamsoftware.com>
Date: Wed, 13 Aug 2008 04:20:16 +0000
Subject: [PATCH 678/710] Added rake tasks to generate rcov code coverage
 reports.  rake -T test:coverage to see them all

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1744 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 lib/tasks/testing.rake | 44 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)
 create mode 100644 lib/tasks/testing.rake

diff --git a/lib/tasks/testing.rake b/lib/tasks/testing.rake
new file mode 100644
index 000000000..3821ca5df
--- /dev/null
+++ b/lib/tasks/testing.rake
@@ -0,0 +1,44 @@
+### From http://svn.geekdaily.org/public/rails/plugins/generally_useful/tasks/coverage_via_rcov.rake
+
+### Inspired by http://blog.labratz.net/articles/2006/12/2/a-rake-task-for-rcov
+begin
+  require 'rcov/rcovtask'
+
+  namespace :test do 
+    desc "Aggregate code coverage for all tests"
+    Rcov::RcovTask.new('coverage') do |t|
+      t.libs << 'test'
+      t.test_files = FileList['test/{unit,integration,functional}/*_test.rb']
+      t.verbose = true
+      t.rcov_opts << '--rails --aggregate test/coverage.data'
+    end
+
+    namespace :coverage do
+      desc "Delete coverage test data"
+      task :clean do
+        rm_f "test/coverage.data"
+        rm_rf "test/coverage"
+      end
+
+      desc "Aggregate code coverage for all tests with HTML output"
+      Rcov::RcovTask.new('html') do |t|
+        t.libs << 'test'
+        t.test_files = FileList['test/{unit,integration,functional}/*_test.rb']
+        t.output_dir = "test/coverage"
+        t.verbose = true
+        t.rcov_opts << '--rails --aggregate test/coverage.data'
+      end
+    
+      desc "Open the HTML coverage report"
+      task :show_results do
+        system "open test/coverage/index.html"
+      end
+
+      task :full => "test:coverage:clean"
+      task :full => "test:coverage:html"
+      task :full => "test:coverage:show_results"
+    end
+  end
+rescue LoadError
+  puts 'Rcov is not available. Proceeding without...'
+end

From 910988133d4a0e49f70cf3219fa8bb864099852c Mon Sep 17 00:00:00 2001
From: Eric Davis <edavis@littlestreamsoftware.com>
Date: Wed, 13 Aug 2008 04:20:23 +0000
Subject: [PATCH 679/710] Extracted rcov options and removed gems from the rcov
 report.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1745 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 lib/tasks/testing.rake | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/tasks/testing.rake b/lib/tasks/testing.rake
index 3821ca5df..0e154af4e 100644
--- a/lib/tasks/testing.rake
+++ b/lib/tasks/testing.rake
@@ -4,13 +4,15 @@
 begin
   require 'rcov/rcovtask'
 
+  rcov_options = "--rails --aggregate test/coverage.data --exclude '/gems/'"
+
   namespace :test do 
     desc "Aggregate code coverage for all tests"
     Rcov::RcovTask.new('coverage') do |t|
       t.libs << 'test'
       t.test_files = FileList['test/{unit,integration,functional}/*_test.rb']
       t.verbose = true
-      t.rcov_opts << '--rails --aggregate test/coverage.data'
+      t.rcov_opts << rcov_options
     end
 
     namespace :coverage do
@@ -26,7 +28,7 @@ begin
         t.test_files = FileList['test/{unit,integration,functional}/*_test.rb']
         t.output_dir = "test/coverage"
         t.verbose = true
-        t.rcov_opts << '--rails --aggregate test/coverage.data'
+        t.rcov_opts << rcov_options
       end
     
       desc "Open the HTML coverage report"

From 53078ca9498dc9c91efc4c7dd7a351f26c6be30e Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Fri, 15 Aug 2008 18:44:46 +0000
Subject: [PATCH 680/710] No warning about rcov each time a rake task is ran.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1747 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 lib/tasks/testing.rake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/tasks/testing.rake b/lib/tasks/testing.rake
index 0e154af4e..42f756f68 100644
--- a/lib/tasks/testing.rake
+++ b/lib/tasks/testing.rake
@@ -42,5 +42,5 @@ begin
     end
   end
 rescue LoadError
-  puts 'Rcov is not available. Proceeding without...'
+  # rcov not available
 end

From a899904f6340c337b0e3ac6309731b8bcf95fd56 Mon Sep 17 00:00:00 2001
From: Eric Davis <edavis@littlestreamsoftware.com>
Date: Wed, 20 Aug 2008 04:26:46 +0000
Subject: [PATCH 681/710] Javascripts are now cached into a single file for
 downloads in production mode.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Thanks to Philippe Lafoucrière for the patch.  (#1186)


git-svn-id: http://redmine.rubyforge.org/svn/trunk@1748 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/layouts/base.rhtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/layouts/base.rhtml b/app/views/layouts/base.rhtml
index 62d542b7b..a769fdd61 100644
--- a/app/views/layouts/base.rhtml
+++ b/app/views/layouts/base.rhtml
@@ -6,7 +6,7 @@
 <meta name="description" content="<%= Redmine::Info.app_name %>" />
 <meta name="keywords" content="issue,bug,tracker" />
 <%= stylesheet_link_tag 'application', :media => 'all' %>
-<%= javascript_include_tag :defaults %>
+<%= javascript_include_tag :defaults, :cache => true %>
 <%= stylesheet_link_tag 'jstoolbar' %>
 <!--[if IE]>
     <style type="text/css">

From af6b01f55d96ccf9560251707a2136050b0a6648 Mon Sep 17 00:00:00 2001
From: Eric Davis <edavis@littlestreamsoftware.com>
Date: Wed, 20 Aug 2008 05:09:13 +0000
Subject: [PATCH 682/710] Hiding the View Differences button when a wiki page's
 history only has one version.

Patch contributed by Chaoqun Zou (#1743)


git-svn-id: http://redmine.rubyforge.org/svn/trunk@1749 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/wiki/history.rhtml            |  2 +-
 test/functional/wiki_controller_test.rb | 12 +++++++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/app/views/wiki/history.rhtml b/app/views/wiki/history.rhtml
index c78ae115a..7ce78a0f2 100644
--- a/app/views/wiki/history.rhtml
+++ b/app/views/wiki/history.rhtml
@@ -30,6 +30,6 @@
 <% end %>
 </tbody>
 </table>
-<%= submit_tag l(:label_view_diff), :class => 'small' %>
+<%= submit_tag l(:label_view_diff), :class => 'small' if show_diff %>
 <span class="pagination"><%= pagination_links_full @version_pages, @version_count, :page_param => :p %></span>
 <% end %>
diff --git a/test/functional/wiki_controller_test.rb b/test/functional/wiki_controller_test.rb
index bbfdc8e7f..b5325357c 100644
--- a/test/functional/wiki_controller_test.rb
+++ b/test/functional/wiki_controller_test.rb
@@ -109,8 +109,18 @@ class WikiControllerTest < Test::Unit::TestCase
     assert_template 'history'
     assert_not_nil assigns(:versions)
     assert_equal 3, assigns(:versions).size
+    assert_select "input[type=submit][name=commit]"
   end
-  
+
+  def test_history_with_one_version
+    get :history, :id => 1, :page => 'Another_page'
+    assert_response :success
+    assert_template 'history'
+    assert_not_nil assigns(:versions)
+    assert_equal 1, assigns(:versions).size
+    assert_select "input[type=submit][name=commit]", false
+  end
+
   def test_diff
     get :diff, :id => 1, :page => 'CookBook_documentation', :version => 2, :version_from => 1
     assert_response :success

From 6db8fa8ef762bafb09ce1c2419a8392e119caece Mon Sep 17 00:00:00 2001
From: Eric Davis <edavis@littlestreamsoftware.com>
Date: Wed, 20 Aug 2008 06:14:44 +0000
Subject: [PATCH 683/710] Messages on a Board can now be sorted by the number
 of replies.

  #1761


git-svn-id: http://redmine.rubyforge.org/svn/trunk@1750 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/boards/show.rhtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/boards/show.rhtml b/app/views/boards/show.rhtml
index 5b0c208a3..96818df34 100644
--- a/app/views/boards/show.rhtml
+++ b/app/views/boards/show.rhtml
@@ -33,7 +33,7 @@
     <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}.replies_count", :caption => l(:label_reply_plural)) %>
     <%= sort_header_tag("#{Message.table_name}.updated_on", :caption => l(:label_message_last)) %>
   </tr></thead>  
   <tbody>

From 2f3f2d8b12483b72f78f7f4704d8641451b16832 Mon Sep 17 00:00:00 2001
From: Eric Davis <edavis@littlestreamsoftware.com>
Date: Wed, 20 Aug 2008 06:21:06 +0000
Subject: [PATCH 684/710] Added the "Status:" keyword to the MailHandler for
 setting and changing an Issue status via email.

  #1669


git-svn-id: http://redmine.rubyforge.org/svn/trunk@1751 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/models/mail_handler.rb                    | 10 ++-
 .../mail_handler/ticket_on_given_project.eml  |  1 +
 .../mail_handler/ticket_reply_with_status.eml | 75 +++++++++++++++++++
 test/unit/mail_handler_test.rb                | 23 +++++-
 4 files changed, 107 insertions(+), 2 deletions(-)
 create mode 100644 test/fixtures/mail_handler/ticket_reply_with_status.eml

diff --git a/app/models/mail_handler.rb b/app/models/mail_handler.rb
index 109db2989..2f1eba3e9 100644
--- a/app/models/mail_handler.rb
+++ b/app/models/mail_handler.rb
@@ -31,6 +31,8 @@ class MailHandler < ActionMailer::Base
     @@handler_options[:allow_override] ||= []
     # Project needs to be overridable if not specified
     @@handler_options[:allow_override] << 'project' unless @@handler_options[:issue].has_key?(:project)
+    # Status needs to be overridable if not specified
+    @@handler_options[:allow_override] << 'status' unless @@handler_options[:issue].has_key?(:status)    
     super email
   end
   
@@ -76,10 +78,11 @@ class MailHandler < ActionMailer::Base
     tracker = (get_keyword(:tracker) && project.trackers.find_by_name(get_keyword(:tracker))) || project.trackers.find(:first)
     category = (get_keyword(:category) && project.issue_categories.find_by_name(get_keyword(:category)))
     priority = (get_keyword(:priority) && Enumeration.find_by_opt_and_name('IPRI', get_keyword(:priority)))
+    status =  (get_keyword(:status) && IssueStatus.find_by_name(get_keyword(:status))) || IssueStatus.default
 
     # check permission
     raise UnauthorizedAction unless user.allowed_to?(:add_issues, project)
-    issue = Issue.new(:author => user, :project => project, :tracker => tracker, :category => category, :priority => priority)
+    issue = Issue.new(:author => user, :project => project, :tracker => tracker, :category => category, :priority => priority, :status => status)
     issue.subject = email.subject.chomp
     issue.description = email.plain_text_body.chomp
     issue.save!
@@ -100,13 +103,18 @@ class MailHandler < ActionMailer::Base
   
   # Adds a note to an existing issue
   def receive_issue_update(issue_id)
+    status =  (get_keyword(:status) && IssueStatus.find_by_name(get_keyword(:status)))
+    
     issue = Issue.find_by_id(issue_id)
     return unless issue
     # check permission
     raise UnauthorizedAction unless user.allowed_to?(:add_issue_notes, issue.project) || user.allowed_to?(:edit_issues, issue.project)
+    raise UnauthorizedAction unless status.nil? || user.allowed_to?(:edit_issues, issue.project)
+
     # add the note
     journal = issue.init_journal(user, email.plain_text_body.chomp)
     add_attachments(issue)
+    issue.status = status unless status.nil?
     issue.save!
     logger.info "MailHandler: issue ##{issue.id} updated by #{user}" if logger && logger.info
     Mailer.deliver_issue_edit(journal) if Setting.notified_events.include?('issue_updated')
diff --git a/test/fixtures/mail_handler/ticket_on_given_project.eml b/test/fixtures/mail_handler/ticket_on_given_project.eml
index 07c7f16b2..927dbc63e 100644
--- a/test/fixtures/mail_handler/ticket_on_given_project.eml
+++ b/test/fixtures/mail_handler/ticket_on_given_project.eml
@@ -38,4 +38,5 @@ massa. Sed sodales, ante fermentum ultricies sollicitudin, massa leo
 pulvinar dui, a gravida orci mi eget odio. Nunc a lacus.
 
 Project: onlinestore
+Status: Resolved
 
diff --git a/test/fixtures/mail_handler/ticket_reply_with_status.eml b/test/fixtures/mail_handler/ticket_reply_with_status.eml
new file mode 100644
index 000000000..ab799198b
--- /dev/null
+++ b/test/fixtures/mail_handler/ticket_reply_with_status.eml
@@ -0,0 +1,75 @@
+Return-Path: <jsmith@somenet.foo>
+Received: from osiris ([127.0.0.1])
+	by OSIRIS
+	with hMailServer ; Sat, 21 Jun 2008 18:41:39 +0200
+Message-ID: <006a01c8d3bd$ad9baec0$0a00a8c0@osiris>
+From: "John Smith" <jsmith@somenet.foo>
+To: <redmine@somenet.foo>
+References: <485d0ad366c88_d7014663a025f@osiris.tmail>
+Subject: Re: [Cookbook - Feature #2] (New) Add ingredients categories
+Date: Sat, 21 Jun 2008 18:41:39 +0200
+MIME-Version: 1.0
+Content-Type: multipart/alternative;
+	boundary="----=_NextPart_000_0067_01C8D3CE.711F9CC0"
+X-Priority: 3
+X-MSMail-Priority: Normal
+X-Mailer: Microsoft Outlook Express 6.00.2900.2869
+X-MimeOLE: Produced By Microsoft MimeOLE V6.00.2900.2869
+
+This is a multi-part message in MIME format.
+
+------=_NextPart_000_0067_01C8D3CE.711F9CC0
+Content-Type: text/plain;
+	charset="utf-8"
+Content-Transfer-Encoding: quoted-printable
+
+This is reply
+
+Status: Resolved
+------=_NextPart_000_0067_01C8D3CE.711F9CC0
+Content-Type: text/html;
+	charset="utf-8"
+Content-Transfer-Encoding: quoted-printable
+
+=EF=BB=BF<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<HTML><HEAD>
+<META http-equiv=3DContent-Type content=3D"text/html; charset=3Dutf-8">
+<STYLE>BODY {
+	FONT-SIZE: 0.8em; COLOR: #484848; FONT-FAMILY: Verdana, sans-serif
+}
+BODY H1 {
+	FONT-SIZE: 1.2em; MARGIN: 0px; FONT-FAMILY: "Trebuchet MS", Verdana, =
+sans-serif
+}
+A {
+	COLOR: #2a5685
+}
+A:link {
+	COLOR: #2a5685
+}
+A:visited {
+	COLOR: #2a5685
+}
+A:hover {
+	COLOR: #c61a1a
+}
+A:active {
+	COLOR: #c61a1a
+}
+HR {
+	BORDER-RIGHT: 0px; BORDER-TOP: 0px; BACKGROUND: #ccc; BORDER-LEFT: 0px; =
+WIDTH: 100%; BORDER-BOTTOM: 0px; HEIGHT: 1px
+}
+.footer {
+	FONT-SIZE: 0.8em; FONT-STYLE: italic
+}
+</STYLE>
+
+<META content=3D"MSHTML 6.00.2900.2883" name=3DGENERATOR></HEAD>
+<BODY bgColor=3D#ffffff>
+<DIV><SPAN class=3Dfooter><FONT face=3DArial color=3D#000000 =
+size=3D2>This is=20
+reply Status: Resolved</FONT></DIV></SPAN></BODY></HTML>
+
+------=_NextPart_000_0067_01C8D3CE.711F9CC0--
+
diff --git a/test/unit/mail_handler_test.rb b/test/unit/mail_handler_test.rb
index 6e8a47c35..b3628e0d5 100644
--- a/test/unit/mail_handler_test.rb
+++ b/test/unit/mail_handler_test.rb
@@ -45,6 +45,16 @@ class MailHandlerTest < Test::Unit::TestCase
     assert_equal Project.find(2), issue.project
     assert issue.description.include?('Lorem ipsum dolor sit amet, consectetuer adipiscing elit.')
   end
+
+  def test_add_issue_with_status
+    # This email contains: 'Project: onlinestore' and 'Status: Resolved'
+    issue = submit_email('ticket_on_given_project.eml')
+    assert issue.is_a?(Issue)
+    assert !issue.new_record?
+    issue.reload
+    assert_equal Project.find(2), issue.project
+    assert_equal IssueStatus.find_by_name("Resolved"), issue.status
+  end
   
   def test_add_issue_with_attributes_override
     issue = submit_email('ticket_with_attributes.eml', :allow_override => 'tracker,category,priority')
@@ -95,7 +105,18 @@ class MailHandlerTest < Test::Unit::TestCase
     assert journal.is_a?(Journal)
     assert_equal User.find_by_login('jsmith'), journal.user
     assert_equal Issue.find(2), journal.journalized
-    assert_equal 'This is reply', journal.notes
+    assert_match /This is reply/, journal.notes
+  end
+
+  def test_add_issue_note_with_status_change
+    # This email contains: 'Status: Resolved'
+    journal = submit_email('ticket_reply_with_status.eml')
+    assert journal.is_a?(Journal)
+    issue = Issue.find(journal.issue.id)
+    assert_equal User.find_by_login('jsmith'), journal.user
+    assert_equal Issue.find(2), journal.journalized
+    assert_match /This is reply/, journal.notes
+    assert_equal IssueStatus.find_by_name("Resolved"), issue.status
   end
 
   private

From 116091a1d2ea1e4fd5c4838760d11beab2d5cea3 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Mon, 25 Aug 2008 11:01:37 +0000
Subject: [PATCH 685/710] Fixes platform determination under JRuby (#1804).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1753 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 lib/redmine/platform.rb                       | 26 +++++++++++++++++++
 lib/redmine/scm/adapters/abstract_adapter.rb  |  4 +--
 .../repositories_cvs_controller_test.rb       |  2 +-
 .../repositories_git_controller_test.rb       |  2 +-
 test/unit/repository_cvs_test.rb              |  2 +-
 test/unit/repository_git_test.rb              |  2 +-
 6 files changed, 32 insertions(+), 6 deletions(-)
 create mode 100644 lib/redmine/platform.rb

diff --git a/lib/redmine/platform.rb b/lib/redmine/platform.rb
new file mode 100644
index 000000000..f41b92f2e
--- /dev/null
+++ b/lib/redmine/platform.rb
@@ -0,0 +1,26 @@
+# Redmine - project management software
+# Copyright (C) 2006-2008  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 Redmine
+  module Platform
+    class << self
+      def mswin?
+        (RUBY_PLATFORM =~ /(:?mswin|mingw)/) || (RUBY_PLATFORM == 'java' && (ENV['OS'] || ENV['os']) =~ /windows/i)
+      end
+    end
+  end
+end
diff --git a/lib/redmine/scm/adapters/abstract_adapter.rb b/lib/redmine/scm/adapters/abstract_adapter.rb
index c48ed2068..553b69963 100644
--- a/lib/redmine/scm/adapters/abstract_adapter.rb
+++ b/lib/redmine/scm/adapters/abstract_adapter.rb
@@ -138,7 +138,7 @@ module Redmine
          end
         
         def shell_quote(str)
-          if RUBY_PLATFORM =~ /mswin/
+          if Redmine::Platform.mswin?
             '"' + str.gsub(/"/, '\\"') + '"'
           else
             "'" + str.gsub(/'/, "'\"'\"'") + "'"
@@ -186,7 +186,7 @@ module Redmine
         
         # Hides username/password in a given command
         def self.hide_credential(cmd)
-          q = (RUBY_PLATFORM =~ /mswin/ ? '"' : "'")
+          q = (Redmine::Platform.mswin? ? '"' : "'")
           cmd.to_s.gsub(/(\-\-(password|username))\s+(#{q}[^#{q}]+#{q}|[^#{q}]\S+)/, '\\1 xxxx')
         end
         
diff --git a/test/functional/repositories_cvs_controller_test.rb b/test/functional/repositories_cvs_controller_test.rb
index 254fbc69c..2207d6ab6 100644
--- a/test/functional/repositories_cvs_controller_test.rb
+++ b/test/functional/repositories_cvs_controller_test.rb
@@ -25,7 +25,7 @@ class RepositoriesCvsControllerTest < Test::Unit::TestCase
 
   # No '..' in the repository path
   REPOSITORY_PATH = RAILS_ROOT.gsub(%r{config\/\.\.}, '') + '/tmp/test/cvs_repository'
-  REPOSITORY_PATH.gsub!(/\//, "\\") if RUBY_PLATFORM =~ /mswin/
+  REPOSITORY_PATH.gsub!(/\//, "\\") if Redmine::Platform.mswin?
   # CVS module
   MODULE_NAME = 'test'
   
diff --git a/test/functional/repositories_git_controller_test.rb b/test/functional/repositories_git_controller_test.rb
index 339e22897..201a50677 100644
--- a/test/functional/repositories_git_controller_test.rb
+++ b/test/functional/repositories_git_controller_test.rb
@@ -26,7 +26,7 @@ class RepositoriesGitControllerTest < Test::Unit::TestCase
 
   # No '..' in the repository path
   REPOSITORY_PATH = RAILS_ROOT.gsub(%r{config\/\.\.}, '') + '/tmp/test/git_repository'
-  REPOSITORY_PATH.gsub!(/\//, "\\") if RUBY_PLATFORM =~ /mswin/
+  REPOSITORY_PATH.gsub!(/\//, "\\") if Redmine::Platform.mswin?
 
   def setup
     @controller = RepositoriesController.new
diff --git a/test/unit/repository_cvs_test.rb b/test/unit/repository_cvs_test.rb
index b14d9d964..6615f73bf 100644
--- a/test/unit/repository_cvs_test.rb
+++ b/test/unit/repository_cvs_test.rb
@@ -22,7 +22,7 @@ class RepositoryCvsTest < Test::Unit::TestCase
   
   # No '..' in the repository path
   REPOSITORY_PATH = RAILS_ROOT.gsub(%r{config\/\.\.}, '') + '/tmp/test/cvs_repository'
-  REPOSITORY_PATH.gsub!(/\//, "\\") if RUBY_PLATFORM =~ /mswin/
+  REPOSITORY_PATH.gsub!(/\//, "\\") if Redmine::Platform.mswin?
   # CVS module
   MODULE_NAME = 'test'
   
diff --git a/test/unit/repository_git_test.rb b/test/unit/repository_git_test.rb
index c7bd84a6e..8a6f1ddd0 100644
--- a/test/unit/repository_git_test.rb
+++ b/test/unit/repository_git_test.rb
@@ -22,7 +22,7 @@ class RepositoryGitTest < Test::Unit::TestCase
   
   # No '..' in the repository path
   REPOSITORY_PATH = RAILS_ROOT.gsub(%r{config\/\.\.}, '') + '/tmp/test/git_repository'
-  REPOSITORY_PATH.gsub!(/\//, "\\") if RUBY_PLATFORM =~ /mswin/
+  REPOSITORY_PATH.gsub!(/\//, "\\") if Redmine::Platform.mswin?
   
   def setup
     @project = Project.find(1)

From 5ef0af67101e66e09119230d374eafee660a1632 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Mon, 25 Aug 2008 11:43:48 +0000
Subject: [PATCH 686/710] Fixed: Estimated time in issue's journal should be
 rounded to two decimals (#1793).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1754 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/helpers/issues_helper.rb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/helpers/issues_helper.rb b/app/helpers/issues_helper.rb
index 9e419ab43..c6de00c10 100644
--- a/app/helpers/issues_helper.rb
+++ b/app/helpers/issues_helper.rb
@@ -75,6 +75,9 @@ module IssuesHelper
       when 'fixed_version_id'
         v = Version.find_by_id(detail.value) and value = v.name if detail.value
         v = Version.find_by_id(detail.old_value) and old_value = v.name if detail.old_value
+      when 'estimated_hours'
+        value = "%0.02f" % detail.value.to_f unless detail.value.blank?
+        old_value = "%0.02f" % detail.old_value.to_f unless detail.old_value.blank?
       end
     when 'cf'
       custom_field = CustomField.find_by_id(detail.prop_key)

From 6fc62d393cc49986408aa4ef22ddb5f8eb7b34e2 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Mon, 25 Aug 2008 11:55:40 +0000
Subject: [PATCH 687/710] Fixed: invalid SQL query on User#destroy (#1781).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1755 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/models/user.rb     | 3 ++-
 test/unit/user_test.rb | 6 ++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/app/models/user.rb b/app/models/user.rb
index cabce3005..05a75e1ad 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -33,7 +33,8 @@ class User < ActiveRecord::Base
     :username => '#{login}'
   }
 
-  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 :memberships, :class_name => 'Member', :include => [ :project, :role ], :conditions => "#{Project.table_name}.status=#{Project::STATUS_ACTIVE}", :order => "#{Project.table_name}.name"
+  has_many :members, :dependent => :delete_all
   has_many :projects, :through => :memberships
   has_many :issue_categories, :foreign_key => 'assigned_to_id', :dependent => :nullify
   has_one :preference, :dependent => :destroy, :class_name => 'UserPreference'
diff --git a/test/unit/user_test.rb b/test/unit/user_test.rb
index 3209f261a..80011f4bf 100644
--- a/test/unit/user_test.rb
+++ b/test/unit/user_test.rb
@@ -57,6 +57,12 @@ class UserTest < Test::Unit::TestCase
     assert_equal "john", @admin.login
   end
   
+  def test_destroy
+    User.find(2).destroy
+    assert_nil User.find_by_id(2)
+    assert Member.find_all_by_user_id(2).empty?
+  end
+  
   def test_validate
     @admin.login = ""
     assert !@admin.save

From 0d556525520e1781729f34fa46638db43e9831ff Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Mon, 25 Aug 2008 12:27:15 +0000
Subject: [PATCH 688/710] Fixes method name in AbstractAdapter.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1756 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 lib/redmine/scm/adapters/abstract_adapter.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/redmine/scm/adapters/abstract_adapter.rb b/lib/redmine/scm/adapters/abstract_adapter.rb
index 553b69963..c096a6e43 100644
--- a/lib/redmine/scm/adapters/abstract_adapter.rb
+++ b/lib/redmine/scm/adapters/abstract_adapter.rb
@@ -185,13 +185,13 @@ module Redmine
         end  
         
         # Hides username/password in a given command
-        def self.hide_credential(cmd)
+        def self.strip_credential(cmd)
           q = (Redmine::Platform.mswin? ? '"' : "'")
           cmd.to_s.gsub(/(\-\-(password|username))\s+(#{q}[^#{q}]+#{q}|[^#{q}]\S+)/, '\\1 xxxx')
         end
         
         def strip_credential(cmd)
-          self.class.hide_credential(cmd)
+          self.class.strip_credential(cmd)
         end
       end
       

From dbf4438ddac07afae85358025fd8bb1d3c121c77 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Mon, 25 Aug 2008 12:31:53 +0000
Subject: [PATCH 689/710] More detailed error message in log when scm command
 fails (#1682).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1757 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 lib/redmine/scm/adapters/abstract_adapter.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/redmine/scm/adapters/abstract_adapter.rb b/lib/redmine/scm/adapters/abstract_adapter.rb
index c096a6e43..9f400880d 100644
--- a/lib/redmine/scm/adapters/abstract_adapter.rb
+++ b/lib/redmine/scm/adapters/abstract_adapter.rb
@@ -179,7 +179,7 @@ module Redmine
           rescue Errno::ENOENT => e
             msg = strip_credential(e.message)
             # The command failed, log it and re-raise
-            logger.error("SCM command failed: #{strip_credential(cmd)}\n  with: #{msg}")
+            logger.error("SCM command failed, make sure that your SCM binary (eg. svn) is in PATH (#{ENV['PATH']}): #{strip_credential(cmd)}\n  with: #{msg}")
             raise CommandFailed.new(msg)
           end
         end  

From e339d0bcc01ee2aed3293899b5b5446840d81978 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Mon, 25 Aug 2008 12:51:29 +0000
Subject: [PATCH 690/710] Fixed: Issue updated_on is not updated when a user
 adds a note with no edit privilege.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1758 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/models/issue.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/models/issue.rb b/app/models/issue.rb
index 7ebe9db99..4701e41f1 100644
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -184,6 +184,8 @@ class Issue < ActiveRecord::Base
     @issue_before_change.status = self.status
     @custom_values_before_change = {}
     self.custom_values.each {|c| @custom_values_before_change.store c.custom_field_id, c.value }
+    # Make sure updated_on is updated when adding a note.
+    updated_on_will_change!
     @current_journal
   end
   

From d93f96765b6fc386cb5565985d02d9f6e71895c5 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Mon, 25 Aug 2008 14:33:30 +0000
Subject: [PATCH 691/710] Adds support for file viewing with Darcs 2.0+ (patch
 #1799 by Ralph Lange slightly edited).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1759 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/models/repository/darcs.rb            | 10 ++++++
 doc/RUNNING_TESTS                         |  4 +--
 lib/redmine/scm/adapters/darcs_adapter.rb | 39 +++++++++++++++++++++--
 test/unit/repository_darcs_test.rb        |  7 ++++
 4 files changed, 55 insertions(+), 5 deletions(-)

diff --git a/app/models/repository/darcs.rb b/app/models/repository/darcs.rb
index 034c0c145..855a403fc 100644
--- a/app/models/repository/darcs.rb
+++ b/app/models/repository/darcs.rb
@@ -28,6 +28,11 @@ class Repository::Darcs < Repository
     'Darcs'
   end
   
+  def entry(path=nil, identifier=nil)
+    patch = identifier.nil? ? nil : changesets.find_by_revision(identifier)
+    scm.entry(path, patch.nil? ? nil : patch.scmid)
+  end
+  
   def entries(path=nil, identifier=nil)
     patch = identifier.nil? ? nil : changesets.find_by_revision(identifier)
     entries = scm.entries(path, patch.nil? ? nil : patch.scmid)
@@ -46,6 +51,11 @@ class Repository::Darcs < Repository
     entries
   end
   
+  def cat(path, identifier=nil)
+    patch = identifier.nil? ? nil : changesets.find_by_revision(identifier)
+    scm.cat(path, patch.nil? ? nil : patch.scmid)
+  end
+  
   def diff(path, rev, rev_to)
     patch_from = changesets.find_by_revision(rev)
     return nil if patch_from.nil?
diff --git a/doc/RUNNING_TESTS b/doc/RUNNING_TESTS
index fe4f9378f..6ee977811 100644
--- a/doc/RUNNING_TESTS
+++ b/doc/RUNNING_TESTS
@@ -24,8 +24,8 @@ Git
 ---
 gunzip < test/fixtures/repositories/git_repository.tar.gz | tar -xv -C tmp/test
 
-Darcs
------
+Darcs (2.0+ required)
+---------------------
 gunzip < test/fixtures/repositories/darcs_repository.tar.gz | tar -xv -C tmp/test
 
 FileSystem
diff --git a/lib/redmine/scm/adapters/darcs_adapter.rb b/lib/redmine/scm/adapters/darcs_adapter.rb
index b1b2a4573..4a5183f79 100644
--- a/lib/redmine/scm/adapters/darcs_adapter.rb
+++ b/lib/redmine/scm/adapters/darcs_adapter.rb
@@ -25,16 +25,36 @@ module Redmine
         # Darcs executable name
         DARCS_BIN = "darcs"
         
+        class << self
+          def client_version
+            @@client_version ||= (darcs_binary_version || [])
+          end
+  	  
+          def darcs_binary_version
+            cmd = "#{DARCS_BIN} --version"
+            version = nil
+            shellout(cmd) do |io|
+              # Read darcs version in first returned line
+              if m = io.gets.match(%r{((\d+\.)+\d+)})
+                version = m[0].scan(%r{\d+}).collect(&:to_i)
+              end
+            end
+            return nil if $? && $?.exitstatus != 0
+            version
+          end
+        end
+
         def initialize(url, root_url=nil, login=nil, password=nil)
           @url = url
           @root_url = url
         end
 
         def supports_cat?
-          false
+          # cat supported in darcs 2.0.0 and higher
+          self.class.client_version_above?([2, 0, 0])
         end
-              
-        # Get info about the svn repository
+
+        # Get info about the darcs repository
         def info
           rev = revisions(nil,nil,nil,{:limit => 1})
           rev ? Info.new({:root_url => @url, :lastrev => rev.last}) : nil
@@ -114,6 +134,19 @@ module Redmine
           diff
         end
         
+        def cat(path, identifier=nil)
+          cmd = "#{DARCS_BIN} show content --repodir #{@url}"
+          cmd << " --match \"hash #{identifier}\"" if identifier
+          cmd << " #{shell_quote path}"
+          cat = nil
+          shellout(cmd) do |io|
+            io.binmode
+            cat = io.read
+          end
+          return nil if $? && $?.exitstatus != 0
+          cat
+        end
+
         private
                 
         def entry_from_xml(element, path_prefix)
diff --git a/test/unit/repository_darcs_test.rb b/test/unit/repository_darcs_test.rb
index 1c8c1b8dd..ca8c267f2 100644
--- a/test/unit/repository_darcs_test.rb
+++ b/test/unit/repository_darcs_test.rb
@@ -48,6 +48,13 @@ class RepositoryDarcsTest < Test::Unit::TestCase
       @repository.fetch_changesets
       assert_equal 6, @repository.changesets.count
     end
+    
+    def test_cat
+      @repository.fetch_changesets
+      cat = @repository.cat("sources/welcome_controller.rb", 2)
+      assert_not_nil cat
+      assert cat.include?('class WelcomeController < ApplicationController')
+    end
   else
     puts "Darcs test repository NOT FOUND. Skipping unit tests !!!"
     def test_fake; assert true end

From 2042e3bbd9bbd2206a0abe7f00a856ca02c37b50 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Mon, 25 Aug 2008 14:37:44 +0000
Subject: [PATCH 692/710] Dots allowed in custom field name (#1723).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1760 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/models/custom_field.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/custom_field.rb b/app/models/custom_field.rb
index 704fbe010..4759b714b 100644
--- a/app/models/custom_field.rb
+++ b/app/models/custom_field.rb
@@ -32,7 +32,7 @@ class CustomField < ActiveRecord::Base
   validates_presence_of :name, :field_format
   validates_uniqueness_of :name, :scope => :type
   validates_length_of :name, :maximum => 30
-  validates_format_of :name, :with => /^[\w\s\'\-]*$/i
+  validates_format_of :name, :with => /^[\w\s\.\'\-]*$/i
   validates_inclusion_of :field_format, :in => FIELD_FORMATS.keys
 
   def initialize(attributes = nil)

From 954bddbadf9e8a220b087b28f5ef7e9cb43ded77 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Mon, 25 Aug 2008 15:09:31 +0000
Subject: [PATCH 693/710] Make the issue list context menu work under Mac OSX
 Leopard (#1485). Tested with FF3.0.1 and Safari 3.0.4 under OSX 10.5.2.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1761 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 public/javascripts/context_menu.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/public/javascripts/context_menu.js b/public/javascripts/context_menu.js
index dfd72b1fa..198c34d9a 100644
--- a/public/javascripts/context_menu.js
+++ b/public/javascripts/context_menu.js
@@ -90,6 +90,9 @@ ContextMenu.prototype = {
         }
       }
     }
+    else{
+      this.RightClick(e);
+    }
   },
   
   showMenu: function(e) {

From e395d3e46dd6caff12abd321f2aa044e05a33152 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Mon, 25 Aug 2008 15:24:23 +0000
Subject: [PATCH 694/710] Fixes context menu with Opera (#1655).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1762 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 public/javascripts/context_menu.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/javascripts/context_menu.js b/public/javascripts/context_menu.js
index 198c34d9a..20f0fc5a7 100644
--- a/public/javascripts/context_menu.js
+++ b/public/javascripts/context_menu.js
@@ -28,7 +28,7 @@ ContextMenu.prototype = {
 	RightClick: function(e) {
 		this.hideMenu();
 		// do not show the context menu on links
-		if (Event.findElement(e, 'a') != document && Event.findElement(e, 'a') != undefined) { return; }
+		if (Event.element(e).tagName == 'A') { return; }
 		// right-click simulated by Alt+Click with Opera
 		if (window.opera && !e.altKey) { return; }
 		var tr = Event.findElement(e, 'tr');
@@ -44,7 +44,7 @@ ContextMenu.prototype = {
 
   Click: function(e) {
   	this.hideMenu();
-  	if (Event.findElement(e, 'a') != document && Event.findElement(e, 'a') != undefined ) { return; }
+  	if (Event.element(e).tagName == 'A') { return; }
     if (window.opera && e.altKey) {	return; }
     if (Event.isLeftClick(e) || (navigator.appVersion.match(/\bMSIE\b/))) {      
       var tr = Event.findElement(e, 'tr');

From 66a079f4304026885923b70c7aed9fe2ee805013 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Mon, 25 Aug 2008 16:14:07 +0000
Subject: [PATCH 695/710] Changes help message about project identifiers
 (#1478).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1763 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 lang/en.yml | 2 +-
 lang/fr.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lang/en.yml b/lang/en.yml
index 2307b1591..6c4a7bd8a 100644
--- a/lang/en.yml
+++ b/lang/en.yml
@@ -578,7 +578,7 @@ text_journal_deleted: deleted
 text_tip_task_begin_day: task beginning this day
 text_tip_task_end_day: task ending this day
 text_tip_task_begin_end_day: task beginning and ending this day
-text_project_identifier_info: 'Lower case letters (a-z), numbers and dashes allowed.<br />Once saved, the identifier can not be changed.'
+text_project_identifier_info: 'Only lower case letters (a-z), numbers and dashes are allowed.<br />Once saved, the identifier can not be changed.'
 text_caracters_maximum: %d characters maximum.
 text_caracters_minimum: Must be at least %d characters long.
 text_length_between: Length between %d and %d characters.
diff --git a/lang/fr.yml b/lang/fr.yml
index 037252067..5b621ebaa 100644
--- a/lang/fr.yml
+++ b/lang/fr.yml
@@ -578,7 +578,7 @@ text_journal_deleted: supprimé
 text_tip_task_begin_day: tâche commençant ce jour
 text_tip_task_end_day: tâche finissant ce jour
 text_tip_task_begin_end_day: tâche commençant et finissant ce jour
-text_project_identifier_info: 'Lettres minuscules (a-z), chiffres et tirets autorisés.<br />Un fois sauvegardé, l''identifiant ne pourra plus être modifié.'
+text_project_identifier_info: 'Seuls les lettres minuscules (a-z), chiffres et tirets sont autorisés.<br />Un fois sauvegardé, l''identifiant ne pourra plus être modifié.'
 text_caracters_maximum: %d caractères maximum.
 text_caracters_minimum: %d caractères minimum.
 text_length_between: Longueur comprise entre %d et %d caractères.

From 999d47f98679e4b706eb8436eea30513ba098bcb Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Mon, 25 Aug 2008 16:35:20 +0000
Subject: [PATCH 696/710] Use example.net as domain in default configuration
 (#1762).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1764 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 config/email.yml.example | 10 +++++-----
 config/settings.yml      |  2 +-
 db/migrate/001_setup.rb  |  2 +-
 lib/tasks/email.rake     |  4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/config/email.yml.example b/config/email.yml.example
index a67c12279..685096da4 100644
--- a/config/email.yml.example
+++ b/config/email.yml.example
@@ -3,11 +3,11 @@
 production:
   delivery_method: :smtp
   smtp_settings:
-    address: smtp.somenet.foo
+    address: smtp.example.net
     port: 25
-    domain: somenet.foo
+    domain: example.net
     authentication: :login
-    user_name: redmine@somenet.foo
+    user_name: redmine@example.net
     password: redmine
   
 development:
@@ -15,7 +15,7 @@ development:
   smtp_settings:
     address: 127.0.0.1
     port: 25
-    domain: somenet.foo
+    domain: example.net
     authentication: :login
-    user_name: redmine@somenet.foo
+    user_name: redmine@example.net
     password: redmine
diff --git a/config/settings.yml b/config/settings.yml
index 78a366f35..9a59d5686 100644
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -43,7 +43,7 @@ activity_days_default:
 per_page_options:
   default: '25,50,100'
 mail_from:
-  default: redmine@somenet.foo
+  default: redmine@example.net
 bcc_recipients:
   default: 1
 text_formatting:
diff --git a/db/migrate/001_setup.rb b/db/migrate/001_setup.rb
index 13960ba8c..d49e0e444 100644
--- a/db/migrate/001_setup.rb
+++ b/db/migrate/001_setup.rb
@@ -290,7 +290,7 @@ class Setup < ActiveRecord::Migration
                        :admin => true,
                        :firstname => "Redmine",
                        :lastname => "Admin",
-                       :mail => "admin@somenet.foo",
+                       :mail => "admin@example.net",
                        :mail_notification => true,
                        :language => "en",
                        :status => 1
diff --git a/lib/tasks/email.rake b/lib/tasks/email.rake
index daf0aa9bb..a37b3e197 100644
--- a/lib/tasks/email.rake
+++ b/lib/tasks/email.rake
@@ -74,14 +74,14 @@ Examples:
   # No project specified. Emails MUST contain the 'Project' keyword:
   
   rake redmine:email:receive_iamp RAILS_ENV="production" \\
-    host=imap.foo.bar username=redmine@somenet.foo password=xxx
+    host=imap.foo.bar username=redmine@example.net password=xxx
 
 
   # Fixed project and default tracker specified, but emails can override
   # both tracker and priority attributes:
   
   rake redmine:email:receive_iamp RAILS_ENV="production" \\
-    host=imap.foo.bar username=redmine@somenet.foo password=xxx ssl=1 \\
+    host=imap.foo.bar username=redmine@example.net password=xxx ssl=1 \\
     project=foo \\
     tracker=bug \\
     allow_override=tracker,priority

From ea627ca98d2113fd07cc4c231398018e44fa9291 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Tue, 26 Aug 2008 10:34:26 +0000
Subject: [PATCH 697/710] One-click bulk edition using the issue list context
 menu within the same project (#1770).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1765 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/issues_controller.rb      | 12 +++--
 app/views/issues/context_menu.rhtml       | 56 +++++++++++++----------
 test/functional/issues_controller_test.rb | 10 +++-
 3 files changed, 46 insertions(+), 32 deletions(-)

diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index 6e2de17c9..3f7723226 100644
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -247,7 +247,7 @@ class IssuesController < ApplicationController
       else
         flash[:error] = l(:notice_failed_to_save_issues, unsaved_issue_ids.size, @issues.size, '#' + unsaved_issue_ids.join(', #'))
       end
-      redirect_to :controller => 'issues', :action => 'index', :project_id => @project
+      redirect_to(params[:back_to] || {:controller => 'issues', :action => 'index', :project_id => @project})
       return
     end
     # Find potential statuses the user could be allowed to switch issues to
@@ -326,20 +326,22 @@ class IssuesController < ApplicationController
     if (@issues.size == 1)
       @issue = @issues.first
       @allowed_statuses = @issue.new_statuses_allowed_to(User.current)
-      @assignables = @issue.assignable_users
-      @assignables << @issue.assigned_to if @issue.assigned_to && !@assignables.include?(@issue.assigned_to)
     end
     projects = @issues.collect(&:project).compact.uniq
     @project = projects.first if projects.size == 1
 
     @can = {:edit => (@project && User.current.allowed_to?(:edit_issues, @project)),
             :log_time => (@project && User.current.allowed_to?(:log_time, @project)),
-            :update => (@issue && (User.current.allowed_to?(:edit_issues, @project) || (User.current.allowed_to?(:change_status, @project) && !@allowed_statuses.empty?))),
+            :update => (@project && (User.current.allowed_to?(:edit_issues, @project) || (User.current.allowed_to?(:change_status, @project) && @allowed_statuses && !@allowed_statuses.empty?))),
             :move => (@project && User.current.allowed_to?(:move_issues, @project)),
             :copy => (@issue && @project.trackers.include?(@issue.tracker) && User.current.allowed_to?(:add_issues, @project)),
             :delete => (@project && User.current.allowed_to?(:delete_issues, @project))
             }
-
+    if @project
+      @assignables = @project.assignable_users
+      @assignables << @issue.assigned_to if @issue && @issue.assigned_to && !@assignables.include?(@issue.assigned_to)
+    end
+    
     @priorities = Enumeration.get_values('IPRI').reverse
     @statuses = IssueStatus.find(:all, :order => 'position')
     @back = request.env['HTTP_REFERER']
diff --git a/app/views/issues/context_menu.rhtml b/app/views/issues/context_menu.rhtml
index 0cdcd4733..671655db7 100644
--- a/app/views/issues/context_menu.rhtml
+++ b/app/views/issues/context_menu.rhtml
@@ -11,49 +11,56 @@
 		<% end -%>
 		</ul>
 	</li>
+<% else %>
+	<li><%= context_menu_link l(:button_edit), {:controller => 'issues', :action => 'bulk_edit', :ids => @issues.collect(&:id)},
+	        :class => 'icon-edit', :disabled => !@can[:edit] %></li>
+<% end %>
+
 	<li class="folder">			
 		<a href="#" class="submenu"><%= l(:field_priority) %></a>
 		<ul>
 		<% @priorities.each do |p| -%>
-		    <li><%= context_menu_link p.name, {:controller => 'issues', :action => 'edit', :id => @issue, 'issue[priority_id]' => p, :back_to => @back}, :method => :post,
-		                              :selected => (p == @issue.priority), :disabled => !@can[:edit] %></li>
+		    <li><%= context_menu_link p.name, {:controller => 'issues', :action => 'bulk_edit', :ids => @issues.collect(&:id), 'priority_id' => p, :back_to => @back}, :method => :post,
+		                              :selected => (@issue && p == @issue.priority), :disabled => !@can[:edit] %></li>
 		<% end -%>
 		</ul>
 	</li>
-	<% unless @project.versions.empty? -%>
+	<% unless @project.nil? || @project.versions.empty? -%>
 	<li class="folder">			
 		<a href="#" class="submenu"><%= l(:field_fixed_version) %></a>
 		<ul>
 		<% @project.versions.sort.each do |v| -%>
-		    <li><%= context_menu_link v.name, {:controller => 'issues', :action => 'edit', :id => @issue, 'issue[fixed_version_id]' => v, :back_to => @back}, :method => :post,
-		                              :selected => (v == @issue.fixed_version), :disabled => !@can[:update] %></li>
+		    <li><%= context_menu_link v.name, {:controller => 'issues', :action => 'bulk_edit', :ids => @issues.collect(&:id), 'fixed_version_id' => v, :back_to => @back}, :method => :post,
+		                              :selected => (@issue && v == @issue.fixed_version), :disabled => !@can[:update] %></li>
 		<% end -%>
-		    <li><%= context_menu_link l(:label_none), {:controller => 'issues', :action => 'edit', :id => @issue, 'issue[fixed_version_id]' => '', :back_to => @back}, :method => :post,
-		                              :selected => @issue.fixed_version.nil?, :disabled => !@can[:update] %></li>
+		    <li><%= context_menu_link l(:label_none), {:controller => 'issues', :action => 'bulk_edit', :ids => @issues.collect(&:id), 'fixed_version_id' => 'none', :back_to => @back}, :method => :post,
+		                              :selected => (@issue && @issue.fixed_version.nil?), :disabled => !@can[:update] %></li>
 		</ul>
 	</li>
 	<% end %>
+	<% unless @assignables.nil? || @assignables.empty? -%>
 	<li class="folder">			
 		<a href="#" class="submenu"><%= l(:field_assigned_to) %></a>
 		<ul>
 		<% @assignables.each do |u| -%>
-		    <li><%= context_menu_link u.name, {:controller => 'issues', :action => 'edit', :id => @issue, 'issue[assigned_to_id]' => u, :back_to => @back}, :method => :post,
-		                              :selected => (u == @issue.assigned_to), :disabled => !@can[:update] %></li>
+		    <li><%= context_menu_link u.name, {:controller => 'issues', :action => 'bulk_edit', :ids => @issues.collect(&:id), 'assigned_to_id' => u, :back_to => @back}, :method => :post,
+		                              :selected => (@issue && u == @issue.assigned_to), :disabled => !@can[:update] %></li>
 		<% end -%>
-		    <li><%= context_menu_link l(:label_nobody), {:controller => 'issues', :action => 'edit', :id => @issue, 'issue[assigned_to_id]' => '', :back_to => @back}, :method => :post,
-		                              :selected => @issue.assigned_to.nil?, :disabled => !@can[:update] %></li>
+		    <li><%= context_menu_link l(:label_nobody), {:controller => 'issues', :action => 'bulk_edit', :ids => @issues.collect(&:id), 'assigned_to_id' => 'none', :back_to => @back}, :method => :post,
+		                              :selected => (@issue && @issue.assigned_to.nil?), :disabled => !@can[:update] %></li>
 		</ul>
 	</li>
-	<% unless @project.issue_categories.empty? -%>
+	<% end %>
+	<% unless @project.nil? || @project.issue_categories.empty? -%>
 	<li class="folder">			
 		<a href="#" class="submenu"><%= l(:field_category) %></a>
 		<ul>
 		<% @project.issue_categories.each do |u| -%>
-		    <li><%= context_menu_link u.name, {:controller => 'issues', :action => 'edit', :id => @issue, 'issue[category_id]' => u, :back_to => @back}, :method => :post,
-		                              :selected => (u == @issue.category), :disabled => !@can[:update] %></li>
+		    <li><%= context_menu_link u.name, {:controller => 'issues', :action => 'bulk_edit', :ids => @issues.collect(&:id), 'category_id' => u, :back_to => @back}, :method => :post,
+		                              :selected => (@issue && u == @issue.category), :disabled => !@can[:update] %></li>
 		<% end -%>
-		    <li><%= context_menu_link l(:label_none), {:controller => 'issues', :action => 'edit', :id => @issue, 'issue[category_id]' => '', :back_to => @back}, :method => :post,
-		                              :selected => @issue.category.nil?, :disabled => !@can[:update] %></li>
+		    <li><%= context_menu_link l(:label_none), {:controller => 'issues', :action => 'bulk_edit', :ids => @issues.collect(&:id), 'category_id' => 'none', :back_to => @back}, :method => :post,
+		                              :selected => (@issue && @issue.category.nil?), :disabled => !@can[:update] %></li>
 		</ul>
 	</li>
 	<% end -%>
@@ -61,22 +68,21 @@
 		<a href="#" class="submenu"><%= l(:field_done_ratio) %></a>
 		<ul>
 		<% (0..10).map{|x|x*10}.each do |p| -%>
-		    <li><%= context_menu_link "#{p}%", {:controller => 'issues', :action => 'edit', :id => @issue, 'issue[done_ratio]' => p, :back_to => @back}, :method => :post,
-		                                  :selected => (p == @issue.done_ratio), :disabled => !@can[:edit] %></li>
+		    <li><%= context_menu_link "#{p}%", {:controller => 'issues', :action => 'bulk_edit', :ids => @issues.collect(&:id), 'done_ratio' => p, :back_to => @back}, :method => :post,
+		                                  :selected => (@issue && p == @issue.done_ratio), :disabled => !@can[:edit] %></li>
 		<% end -%>
 		</ul>
 	</li>
+	
+<% if !@issue.nil? %>
+	<li><%= context_menu_link l(:button_copy), {:controller => 'issues', :action => 'new', :project_id => @project, :copy_from => @issue},
+	        :class => 'icon-copy', :disabled => !@can[:copy] %></li>
 	<% if @can[:log_time] -%>
 	<li><%= context_menu_link l(:button_log_time), {:controller => 'timelog', :action => 'edit', :issue_id => @issue},
 	        :class => 'icon-time' %></li>
 	<% end %>
-	<li><%= context_menu_link l(:button_copy), {:controller => 'issues', :action => 'new', :project_id => @project, :copy_from => @issue},
-	        :class => 'icon-copy', :disabled => !@can[:copy] %></li>
-<% else -%>
-	<li><%= context_menu_link l(:button_edit), {:controller => 'issues', :action => 'bulk_edit', :ids => @issues.collect(&:id)},
-	        :class => 'icon-edit', :disabled => !@can[:edit] %></li>
-<% end -%>
-  
+<% end %>
+
   <li><%= context_menu_link l(:button_move), {:controller => 'issues', :action => 'move', :ids => @issues.collect(&:id)},
 	                        :class => 'icon-move', :disabled => !@can[:move]  %></li>
   <li><%= context_menu_link l(:button_delete), {:controller => 'issues', :action => 'destroy', :ids => @issues.collect(&:id)},
diff --git a/test/functional/issues_controller_test.rb b/test/functional/issues_controller_test.rb
index 005542f81..a248d8bde 100644
--- a/test/functional/issues_controller_test.rb
+++ b/test/functional/issues_controller_test.rb
@@ -532,10 +532,10 @@ class IssuesControllerTest < Test::Unit::TestCase
                             :attributes => { :href => '/issues/edit/1?issue%5Bstatus_id%5D=5',
                                              :class => '' }
     assert_tag :tag => 'a', :content => 'Immediate',
-                            :attributes => { :href => '/issues/edit/1?issue%5Bpriority_id%5D=8',
+                            :attributes => { :href => '/issues/bulk_edit?ids%5B%5D=1&amp;priority_id=8',
                                              :class => '' }
     assert_tag :tag => 'a', :content => 'Dave Lopper',
-                            :attributes => { :href => '/issues/edit/1?issue%5Bassigned_to_id%5D=3',
+                            :attributes => { :href => '/issues/bulk_edit?assigned_to_id=3&amp;ids%5B%5D=1',
                                              :class => '' }
     assert_tag :tag => 'a', :content => 'Copy',
                             :attributes => { :href => '/projects/ecookbook/issues/new?copy_from=1',
@@ -565,6 +565,12 @@ class IssuesControllerTest < Test::Unit::TestCase
     assert_tag :tag => 'a', :content => 'Edit',
                             :attributes => { :href => '/issues/bulk_edit?ids%5B%5D=1&amp;ids%5B%5D=2',
                                              :class => 'icon-edit' }
+    assert_tag :tag => 'a', :content => 'Immediate',
+                            :attributes => { :href => '/issues/bulk_edit?ids%5B%5D=1&amp;ids%5B%5D=2&amp;priority_id=8',
+                                             :class => '' }
+    assert_tag :tag => 'a', :content => 'Dave Lopper',
+                            :attributes => { :href => '/issues/bulk_edit?assigned_to_id=3&amp;ids%5B%5D=1&amp;ids%5B%5D=2',
+                                             :class => '' }
     assert_tag :tag => 'a', :content => 'Move',
                             :attributes => { :href => '/issues/move?ids%5B%5D=1&amp;ids%5B%5D=2',
                                              :class => 'icon-move' }

From 09eba46ec1a699f2429b4ebddaa3aedfa6c57118 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Tue, 26 Aug 2008 11:08:45 +0000
Subject: [PATCH 698/710] Fixed: document listing shows on "my page" when
 viewing documents is disabled for the role (#1772).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1766 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/my/blocks/_documents.rhtml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/views/my/blocks/_documents.rhtml b/app/views/my/blocks/_documents.rhtml
index a34be936f..d222e4203 100644
--- a/app/views/my/blocks/_documents.rhtml
+++ b/app/views/my/blocks/_documents.rhtml
@@ -1,8 +1,9 @@
 <h3><%=l(:label_document_plural)%></h3>
 
+<% project_ids = @user.projects.select {|p| @user.allowed_to?(:view_documents, p)}.collect(&:id) %>
 <%= render(:partial => 'documents/document',
            :collection => Document.find(:all,
                          :limit => 10,
                          :order => "#{Document.table_name}.created_on DESC",
-                         :conditions => "#{Document.table_name}.project_id in (#{@user.projects.collect{|m| m.id}.join(',')})",
-                         :include => [:project])) unless @user.projects.empty? %>
\ No newline at end of file
+                         :conditions => "#{Document.table_name}.project_id in (#{project_ids.join(',')})",
+                         :include => [:project])) unless project_ids.empty? %>
\ No newline at end of file

From 0cf15476a35bfada850efc07eb78bc2bb041a8e6 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Tue, 26 Aug 2008 12:13:15 +0000
Subject: [PATCH 699/710] Adds support for commit logs reencoding to UTF-8
 before insertion in the database (#834, #917, #1663). Source encoding of
 commit logs can be selected in Application settings -> Repositories.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1767 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/models/changeset.rb                | 19 ++++++++++++-
 app/models/setting.rb                  | 39 ++++++++++++++++++++++++++
 app/views/settings/_repositories.rhtml |  3 ++
 config/settings.yml                    |  3 ++
 lang/bg.yml                            |  1 +
 lang/cs.yml                            |  1 +
 lang/da.yml                            |  1 +
 lang/de.yml                            |  1 +
 lang/en.yml                            |  1 +
 lang/es.yml                            |  1 +
 lang/fi.yml                            |  1 +
 lang/fr.yml                            |  1 +
 lang/he.yml                            |  1 +
 lang/hu.yml                            |  1 +
 lang/it.yml                            |  1 +
 lang/ja.yml                            |  1 +
 lang/ko.yml                            |  1 +
 lang/lt.yml                            |  1 +
 lang/nl.yml                            |  1 +
 lang/no.yml                            |  1 +
 lang/pl.yml                            |  1 +
 lang/pt-br.yml                         |  1 +
 lang/pt.yml                            |  1 +
 lang/ro.yml                            |  1 +
 lang/ru.yml                            |  1 +
 lang/sr.yml                            |  1 +
 lang/sv.yml                            |  1 +
 lang/th.yml                            |  1 +
 lang/uk.yml                            |  1 +
 lang/zh-tw.yml                         |  1 +
 lang/zh.yml                            |  1 +
 31 files changed, 90 insertions(+), 1 deletion(-)

diff --git a/app/models/changeset.rb b/app/models/changeset.rb
index 0663af34e..656c67544 100644
--- a/app/models/changeset.rb
+++ b/app/models/changeset.rb
@@ -15,6 +15,8 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
+require 'iconv'
+
 class Changeset < ActiveRecord::Base
   belongs_to :repository
   has_many :changes, :dependent => :delete_all
@@ -43,7 +45,7 @@ class Changeset < ActiveRecord::Base
   end
   
   def comments=(comment)
-    write_attribute(:comments, comment.strip)
+    write_attribute(:comments, to_utf8(comment.to_s.strip))
   end
 
   def committed_on=(date)
@@ -131,4 +133,19 @@ class Changeset < ActiveRecord::Base
   def next
     @next ||= Changeset.find(:first, :conditions => ['id > ? AND repository_id = ?', self.id, self.repository_id], :order => 'id ASC')
   end
+  
+  private
+  
+  def to_utf8(str)
+    return str if /\A[\r\n\t\x20-\x7e]*\Z/n.match(str) # for us-ascii
+    encoding = Setting.commit_logs_encoding.to_s.strip
+    unless encoding.blank? || encoding == 'UTF-8'
+      begin
+        return Iconv.conv('UTF-8', encoding, str)
+      rescue Iconv::Failure
+        # do nothing here
+      end
+    end
+    str
+  end
 end
diff --git a/app/models/setting.rb b/app/models/setting.rb
index 185991d9b..072afa0db 100644
--- a/app/models/setting.rb
+++ b/app/models/setting.rb
@@ -33,6 +33,45 @@ class Setting < ActiveRecord::Base
     '%H:%M',
     '%I:%M %p'
     ]
+    
+  ENCODINGS = %w(US-ASCII
+                  windows-1250
+                  windows-1251
+                  windows-1252
+                  windows-1253
+                  windows-1254
+                  windows-1255
+                  windows-1256
+                  windows-1257
+                  windows-1258
+                  windows-31j
+                  ISO-2022-JP
+                  ISO-2022-KR
+                  ISO-8859-1
+                  ISO-8859-2
+                  ISO-8859-3
+                  ISO-8859-4
+                  ISO-8859-5
+                  ISO-8859-6
+                  ISO-8859-7
+                  ISO-8859-8
+                  ISO-8859-9
+                  ISO-8859-13
+                  ISO-8859-15
+                  KOI8-R
+                  UTF-8
+                  UTF-16
+                  UTF-16BE
+                  UTF-16LE
+                  EUC-JP
+                  Shift_JIS
+                  GB18030
+                  GBK
+                  ISCII91
+                  EUC-KR
+                  Big5
+                  Big5-HKSCS
+                  TIS-620)
   
   cattr_accessor :available_settings
   @@available_settings = YAML::load(File.open("#{RAILS_ROOT}/config/settings.yml"))
diff --git a/app/views/settings/_repositories.rhtml b/app/views/settings/_repositories.rhtml
index 127801be2..a8c924430 100644
--- a/app/views/settings/_repositories.rhtml
+++ b/app/views/settings/_repositories.rhtml
@@ -16,6 +16,9 @@
 
 <p><label><%= l(:setting_repositories_encodings) %></label>
 <%= text_field_tag 'settings[repositories_encodings]', Setting.repositories_encodings, :size => 60 %><br /><em><%= l(:text_comma_separated) %></em></p>
+
+<p><label><%= l(:setting_commit_logs_encoding) %></label>
+<%= select_tag 'settings[commit_logs_encoding]', options_for_select(Setting::ENCODINGS, Setting.commit_logs_encoding) %></p>
 </div>
 
 <fieldset class="box tabular settings"><legend><%= l(:text_issues_ref_in_commit_messages) %></legend>
diff --git a/config/settings.yml b/config/settings.yml
index 9a59d5686..ac79edb8d 100644
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -122,6 +122,9 @@ default_projects_public:
 # multiple values accepted, comma separated
 repositories_encodings:
   default: ''
+# encoding used to convert commit logs to UTF-8
+commit_logs_encoding:
+  default: 'UTF-8'
 ui_theme:
   default: ''
 emails_footer:
diff --git a/lang/bg.yml b/lang/bg.yml
index 6a9676119..f15ba4da7 100644
--- a/lang/bg.yml
+++ b/lang/bg.yml
@@ -634,3 +634,4 @@ setting_mail_handler_api_key: API key
 text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."
 field_parent_title: Parent page
 label_issue_watchers: Watchers
+setting_commit_logs_encoding: Commit messages encoding
diff --git a/lang/cs.yml b/lang/cs.yml
index cc5847ee4..b7b1b9eaf 100644
--- a/lang/cs.yml
+++ b/lang/cs.yml
@@ -639,3 +639,4 @@ setting_mail_handler_api_key: API key
 text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."
 field_parent_title: Parent page
 label_issue_watchers: Watchers
+setting_commit_logs_encoding: Commit messages encoding
diff --git a/lang/da.yml b/lang/da.yml
index 1cb55cc48..3227dc7bd 100644
--- a/lang/da.yml
+++ b/lang/da.yml
@@ -636,3 +636,4 @@ setting_mail_handler_api_key: API key
 text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."
 field_parent_title: Parent page
 label_issue_watchers: Watchers
+setting_commit_logs_encoding: Commit messages encoding
diff --git a/lang/de.yml b/lang/de.yml
index f0be84490..5093c31fd 100644
--- a/lang/de.yml
+++ b/lang/de.yml
@@ -635,3 +635,4 @@ setting_mail_handler_api_key: API key
 text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."
 field_parent_title: Parent page
 label_issue_watchers: Watchers
+setting_commit_logs_encoding: Commit messages encoding
diff --git a/lang/en.yml b/lang/en.yml
index 6c4a7bd8a..6cd6d4270 100644
--- a/lang/en.yml
+++ b/lang/en.yml
@@ -209,6 +209,7 @@ setting_time_format: Time format
 setting_cross_project_issue_relations: Allow cross-project issue relations
 setting_issue_list_default_columns: Default columns displayed on the issue list
 setting_repositories_encodings: Repositories encodings
+setting_commit_logs_encoding: Commit messages encoding
 setting_emails_footer: Emails footer
 setting_protocol: Protocol
 setting_per_page_options: Objects per page options
diff --git a/lang/es.yml b/lang/es.yml
index 7f27d53e5..58d27f28d 100644
--- a/lang/es.yml
+++ b/lang/es.yml
@@ -637,3 +637,4 @@ setting_mail_handler_api_key: API key
 text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."
 field_parent_title: Parent page
 label_issue_watchers: Watchers
+setting_commit_logs_encoding: Commit messages encoding
diff --git a/lang/fi.yml b/lang/fi.yml
index 031d59d63..394ff23f3 100644
--- a/lang/fi.yml
+++ b/lang/fi.yml
@@ -634,3 +634,4 @@ setting_mail_handler_api_key: API key
 text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."
 field_parent_title: Parent page
 label_issue_watchers: Watchers
+setting_commit_logs_encoding: Commit messages encoding
diff --git a/lang/fr.yml b/lang/fr.yml
index 5b621ebaa..e6c4b3340 100644
--- a/lang/fr.yml
+++ b/lang/fr.yml
@@ -210,6 +210,7 @@ setting_time_format: Format d'heure
 setting_cross_project_issue_relations: Autoriser les relations entre demandes de différents projets
 setting_issue_list_default_columns: Colonnes affichées par défaut sur la liste des demandes
 setting_repositories_encodings: Encodages des dépôts
+setting_commit_logs_encoding: Encodage des messages de commit
 setting_emails_footer: Pied-de-page des emails
 setting_protocol: Protocole
 setting_per_page_options: Options d'objets affichés par page
diff --git a/lang/he.yml b/lang/he.yml
index 9c8fbae7e..652b0ed8e 100644
--- a/lang/he.yml
+++ b/lang/he.yml
@@ -634,3 +634,4 @@ setting_mail_handler_api_key: API key
 text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."
 field_parent_title: Parent page
 label_issue_watchers: Watchers
+setting_commit_logs_encoding: Commit messages encoding
diff --git a/lang/hu.yml b/lang/hu.yml
index a5d208cb6..15c420539 100644
--- a/lang/hu.yml
+++ b/lang/hu.yml
@@ -635,3 +635,4 @@ setting_mail_handler_api_key: API kulcs
 text_email_delivery_not_configured: "Az E-mail küldés nincs konfigurálva, és az értesítések ki vannak kapcsolva.\nÁllítsd be az SMTP szervert a config/email.yml fájlban és indítsd újra az alkalmazást, hogy érvénybe lépjen."
 field_parent_title: Parent page
 label_issue_watchers: Watchers
+setting_commit_logs_encoding: Commit messages encoding
diff --git a/lang/it.yml b/lang/it.yml
index 5d62e3255..3e1c1d53b 100644
--- a/lang/it.yml
+++ b/lang/it.yml
@@ -634,3 +634,4 @@ setting_mail_handler_api_key: chiave API
 text_email_delivery_not_configured: "La consegna via e-mail non è configurata e le notifiche sono disabilitate.\nConfigura il tuo server SMTP in config/email.yml e riavvia l'applicazione per abilitarle."
 field_parent_title: Parent page
 label_issue_watchers: Watchers
+setting_commit_logs_encoding: Commit messages encoding
diff --git a/lang/ja.yml b/lang/ja.yml
index f3ade750d..e7805393a 100644
--- a/lang/ja.yml
+++ b/lang/ja.yml
@@ -635,3 +635,4 @@ setting_mail_handler_api_key: API key
 text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."
 field_parent_title: Parent page
 label_issue_watchers: Watchers
+setting_commit_logs_encoding: Commit messages encoding
diff --git a/lang/ko.yml b/lang/ko.yml
index 961255e01..c85ce72e2 100644
--- a/lang/ko.yml
+++ b/lang/ko.yml
@@ -634,3 +634,4 @@ setting_mail_handler_api_key: API key
 text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."
 field_parent_title: Parent page
 label_issue_watchers: Watchers
+setting_commit_logs_encoding: Commit messages encoding
diff --git a/lang/lt.yml b/lang/lt.yml
index 58f798506..188faf215 100644
--- a/lang/lt.yml
+++ b/lang/lt.yml
@@ -637,3 +637,4 @@ setting_mail_handler_api_key: API raktas
 text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."
 field_parent_title: Parent page
 label_issue_watchers: Watchers
+setting_commit_logs_encoding: Commit messages encoding
diff --git a/lang/nl.yml b/lang/nl.yml
index 08e300143..fd5bff1f6 100644
--- a/lang/nl.yml
+++ b/lang/nl.yml
@@ -635,3 +635,4 @@ setting_mail_handler_api_key: API key
 text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."
 field_parent_title: Parent page
 label_issue_watchers: Watchers
+setting_commit_logs_encoding: Commit messages encoding
diff --git a/lang/no.yml b/lang/no.yml
index 7af029db9..2cdc0bcd6 100644
--- a/lang/no.yml
+++ b/lang/no.yml
@@ -635,3 +635,4 @@ setting_mail_handler_api_key: API key
 text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."
 field_parent_title: Parent page
 label_issue_watchers: Watchers
+setting_commit_logs_encoding: Commit messages encoding
diff --git a/lang/pl.yml b/lang/pl.yml
index 0a29b7c47..69e04e4dd 100644
--- a/lang/pl.yml
+++ b/lang/pl.yml
@@ -634,3 +634,4 @@ setting_mail_handler_api_key: API key
 text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."
 field_parent_title: Parent page
 label_issue_watchers: Watchers
+setting_commit_logs_encoding: Commit messages encoding
diff --git a/lang/pt-br.yml b/lang/pt-br.yml
index 3ab24aeb0..2b25e023f 100644
--- a/lang/pt-br.yml
+++ b/lang/pt-br.yml
@@ -634,3 +634,4 @@ setting_mail_handler_api_key: API key
 text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."
 field_parent_title: Parent page
 label_issue_watchers: Watchers
+setting_commit_logs_encoding: Commit messages encoding
diff --git a/lang/pt.yml b/lang/pt.yml
index bd32cd140..6505b762a 100644
--- a/lang/pt.yml
+++ b/lang/pt.yml
@@ -634,3 +634,4 @@ setting_mail_handler_api_key: API key
 text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."
 field_parent_title: Parent page
 label_issue_watchers: Watchers
+setting_commit_logs_encoding: Commit messages encoding
diff --git a/lang/ro.yml b/lang/ro.yml
index 2e562e237..4887bcf92 100644
--- a/lang/ro.yml
+++ b/lang/ro.yml
@@ -634,3 +634,4 @@ setting_mail_handler_api_key: API key
 text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."
 field_parent_title: Parent page
 label_issue_watchers: Watchers
+setting_commit_logs_encoding: Commit messages encoding
diff --git a/lang/ru.yml b/lang/ru.yml
index 61e713694..095e4db34 100644
--- a/lang/ru.yml
+++ b/lang/ru.yml
@@ -638,3 +638,4 @@ setting_mail_handler_api_key: API ключ
 text_email_delivery_not_configured: "Параметры работы с почтовым сервером не настроены и функция уведомления по email не активна.\nНастроить параметры для вашего SMTP сервера вы можете в файле config/email.yml. Для применения изменений перезапустите приложение."
 field_parent_title: Parent page
 label_issue_watchers: Watchers
+setting_commit_logs_encoding: Commit messages encoding
diff --git a/lang/sr.yml b/lang/sr.yml
index ba79d4ef2..f81d0e054 100644
--- a/lang/sr.yml
+++ b/lang/sr.yml
@@ -635,3 +635,4 @@ setting_mail_handler_api_key: API key
 text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."
 field_parent_title: Parent page
 label_issue_watchers: Watchers
+setting_commit_logs_encoding: Commit messages encoding
diff --git a/lang/sv.yml b/lang/sv.yml
index 9505759c8..5e120b3f2 100644
--- a/lang/sv.yml
+++ b/lang/sv.yml
@@ -635,3 +635,4 @@ setting_mail_handler_api_key: API key
 text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."
 field_parent_title: Parent page
 label_issue_watchers: Watchers
+setting_commit_logs_encoding: Commit messages encoding
diff --git a/lang/th.yml b/lang/th.yml
index 6c4ce30d6..3ae37e551 100644
--- a/lang/th.yml
+++ b/lang/th.yml
@@ -637,3 +637,4 @@ setting_mail_handler_api_key: API key
 text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."
 field_parent_title: Parent page
 label_issue_watchers: Watchers
+setting_commit_logs_encoding: Commit messages encoding
diff --git a/lang/uk.yml b/lang/uk.yml
index 4fa27f7d3..cf5f384b9 100644
--- a/lang/uk.yml
+++ b/lang/uk.yml
@@ -636,3 +636,4 @@ setting_mail_handler_api_key: API key
 text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."
 field_parent_title: Parent page
 label_issue_watchers: Watchers
+setting_commit_logs_encoding: Commit messages encoding
diff --git a/lang/zh-tw.yml b/lang/zh-tw.yml
index 1e6483631..f13331df4 100644
--- a/lang/zh-tw.yml
+++ b/lang/zh-tw.yml
@@ -635,3 +635,4 @@ enumeration_doc_categories: 文件分類
 enumeration_activities: 活動 (時間追蹤)
 field_parent_title: Parent page
 label_issue_watchers: Watchers
+setting_commit_logs_encoding: Commit messages encoding
diff --git a/lang/zh.yml b/lang/zh.yml
index 7158a7f83..682b59eb3 100644
--- a/lang/zh.yml
+++ b/lang/zh.yml
@@ -635,3 +635,4 @@ enumeration_activities: 活动（时间跟踪）
 text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."
 field_parent_title: Parent page
 label_issue_watchers: Watchers
+setting_commit_logs_encoding: Commit messages encoding

From d611339baaf3bc147956155897dfc21aac59dcf2 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Tue, 26 Aug 2008 12:28:15 +0000
Subject: [PATCH 700/710] Fixes error with CVS+Postgresql and non-UTF8 commit
 logs (#917, #1659).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1768 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/models/changeset.rb      | 9 +++++++--
 app/models/repository/cvs.rb | 2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/app/models/changeset.rb b/app/models/changeset.rb
index 656c67544..c4258c88b 100644
--- a/app/models/changeset.rb
+++ b/app/models/changeset.rb
@@ -45,7 +45,7 @@ class Changeset < ActiveRecord::Base
   end
   
   def comments=(comment)
-    write_attribute(:comments, to_utf8(comment.to_s.strip))
+    write_attribute(:comments, Changeset.normalize_comments(comment))
   end
 
   def committed_on=(date)
@@ -134,9 +134,14 @@ class Changeset < ActiveRecord::Base
     @next ||= Changeset.find(:first, :conditions => ['id > ? AND repository_id = ?', self.id, self.repository_id], :order => 'id ASC')
   end
   
+  # Strips and reencodes a commit log before insertion into the database
+  def self.normalize_comments(str)
+    to_utf8(str.to_s.strip)
+  end
+  
   private
   
-  def to_utf8(str)
+  def self.to_utf8(str)
     return str if /\A[\r\n\t\x20-\x7e]*\Z/n.match(str) # for us-ascii
     encoding = Setting.commit_logs_encoding.to_s.strip
     unless encoding.blank? || encoding == 'UTF-8'
diff --git a/app/models/repository/cvs.rb b/app/models/repository/cvs.rb
index dd9d35c8f..82082b3d6 100644
--- a/app/models/repository/cvs.rb
+++ b/app/models/repository/cvs.rb
@@ -109,7 +109,7 @@ class Repository::Cvs < Repository
           cs = changesets.find(:first, :conditions=>{
             :committed_on=>revision.time-time_delta..revision.time+time_delta,
             :committer=>revision.author,
-            :comments=>revision.message
+            :comments=>Changeset.normalize_comments(revision.message)
           })
         
           # create a new changeset.... 

From 5c6bee7f85bfba6bd82f48db6d591bf94c386d09 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Tue, 26 Aug 2008 15:19:28 +0000
Subject: [PATCH 701/710] Simplified Chinese lang file update (#1809 by Chaoqun
 Zou).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1769 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 lang/zh.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lang/zh.yml b/lang/zh.yml
index 682b59eb3..07829a541 100644
--- a/lang/zh.yml
+++ b/lang/zh.yml
@@ -182,6 +182,7 @@ field_time_zone: 时区
 field_searchable: 可用作搜索条件
 field_default_value: 默认值
 field_comments_sorting: 显示注释
+field_parent_title: 上级页面
 
 setting_app_title: 应用程序标题
 setting_app_subtitle: 应用程序子标题
@@ -208,6 +209,7 @@ setting_time_format: 时间格式
 setting_cross_project_issue_relations: 允许不同项目之间的问题关联
 setting_issue_list_default_columns: 问题列表中显示的默认列
 setting_repositories_encodings: 版本库编码
+setting_commit_logs_encoding: 提交注释的编码
 setting_emails_footer: 邮件签名
 setting_protocol: 协议
 setting_per_page_options: 每页显示条目个数的设置
@@ -520,6 +522,7 @@ label_reverse_chronological_order: 按时间顺序（倒序）
 label_planning: 计划
 label_incoming_emails: 接收邮件
 label_generate_key: 生成一个key
+label_issue_watchers: 跟踪者
 
 button_login: 登录
 button_submit: 提交
@@ -606,6 +609,7 @@ text_reassign_time_entries: '将已上报的工作量指定到此问题：'
 text_user_wrote: '%s 写到：'
 text_enumeration_category_reassign_to: '将它们关联到新的枚举值：'
 text_enumeration_destroy_question: '%d 个对象被关联到了这个枚举值。'
+text_email_delivery_not_configured: "邮件参数尚未配置，因此邮件通知功能已被禁用。\n请在config/email.yml中配置您的SMTP服务器信息并重新启动以使其生效。"
 
 default_role_manager: 管理人员
 default_role_developper: 开发人员
@@ -632,7 +636,3 @@ default_activity_development: 开发
 enumeration_issue_priorities: 问题优先级
 enumeration_doc_categories: 文档类别
 enumeration_activities: 活动（时间跟踪）
-text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."
-field_parent_title: Parent page
-label_issue_watchers: Watchers
-setting_commit_logs_encoding: Commit messages encoding

From 6ad989f82887dcd88cf3cf70b658b4ccf82cf770 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Tue, 26 Aug 2008 16:05:02 +0000
Subject: [PATCH 702/710] Adds checkboxes toggle links on permissions report.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1770 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/roles/report.rhtml      | 18 +++++++++++++-----
 public/javascripts/application.js |  7 +++++++
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/app/views/roles/report.rhtml b/app/views/roles/report.rhtml
index 98c3b651e..8e254379e 100644
--- a/app/views/roles/report.rhtml
+++ b/app/views/roles/report.rhtml
@@ -1,13 +1,17 @@
 <h2><%=l(:label_permissions_report)%></h2>
 
 <% form_tag({:action => 'report'}, :id => 'permissions_form') do %>
-<%= hidden_field_tag 'permissions[0]', '' %>
+<%= hidden_field_tag 'permissions[0]', '', :id => nil %>
 <table class="list">
 <thead>
     <tr>
     <th><%=l(:label_permissions)%></th>
     <% @roles.each do |role| %>
-    <th><%= content_tag(role.builtin? ? 'em' : 'span', h(role.name)) %></th>
+    <th>
+        <%= content_tag(role.builtin? ? 'em' : 'span', h(role.name)) %>
+        <%= link_to_function(image_tag('toggle_check.png'), "toggleCheckboxesBySelector('input.role-#{role.id}')",
+                                                            :title => "#{l(:button_check_all)}/#{l(:button_uncheck_all)}") %>
+    </th>
     <% end %>
     </tr>
 </thead>
@@ -18,12 +22,16 @@
         <tr><%= content_tag('th', mod.humanize, :colspan => (@roles.size + 1), :align => 'left') %></tr>
     <% end %>
     <% perms_by_module[mod].each do |permission| %>
-        <tr class="<%= cycle('odd', 'even') %>">
-        <td><%= permission.name.to_s.humanize %></td>
+        <tr class="<%= cycle('odd', 'even') %> permission-<%= permission.name %>">
+        <td>
+            <%= link_to_function(image_tag('toggle_check.png'), "toggleCheckboxesBySelector('.permission-#{permission.name} input')",
+                                                                :title => "#{l(:button_check_all)}/#{l(:button_uncheck_all)}") %>
+            <%= permission.name.to_s.humanize %>
+        </td>
         <% @roles.each do |role| %>
         <td align="center">
         <% if role.setable_permissions.include? permission %>
-          <%= check_box_tag "permissions[#{role.id}][]", permission.name, (role.permissions.include? permission.name) %>
+          <%= check_box_tag "permissions[#{role.id}][]", permission.name, (role.permissions.include? permission.name), :id => nil, :class => "role-#{role.id}" %>
         <% end %>
         </td>
         <% end %>
diff --git a/public/javascripts/application.js b/public/javascripts/application.js
index 1674044f8..3becbeb21 100644
--- a/public/javascripts/application.js
+++ b/public/javascripts/application.js
@@ -10,6 +10,13 @@ function checkAll (id, checked) {
 	}
 }
 
+function toggleCheckboxesBySelector(selector) {
+	boxes = $$(selector);
+	var all_checked = true;
+	for (i = 0; i < boxes.length; i++) { if (boxes[i].checked == false) { all_checked = false; } }
+	for (i = 0; i < boxes.length; i++) { boxes[i].checked = !all_checked; }
+}
+
 function showAndScrollTo(id, focus) {
 	Element.show(id);
 	if (focus!=null) { Form.Element.focus(focus); }

From 8f3a04ce6906b7e9008bc6488a07404413c4552b Mon Sep 17 00:00:00 2001
From: Eric Davis <edavis@littlestreamsoftware.com>
Date: Thu, 28 Aug 2008 16:32:14 +0000
Subject: [PATCH 703/710] Reverting commit r1748. Some environments are not
 allowing the cached file to write to public, causing all JavaScript to fail.

Javascripts are now cached into a single file for downloads in production mode.

  #1186


git-svn-id: http://redmine.rubyforge.org/svn/trunk@1771 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/views/layouts/base.rhtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/layouts/base.rhtml b/app/views/layouts/base.rhtml
index a769fdd61..62d542b7b 100644
--- a/app/views/layouts/base.rhtml
+++ b/app/views/layouts/base.rhtml
@@ -6,7 +6,7 @@
 <meta name="description" content="<%= Redmine::Info.app_name %>" />
 <meta name="keywords" content="issue,bug,tracker" />
 <%= stylesheet_link_tag 'application', :media => 'all' %>
-<%= javascript_include_tag :defaults, :cache => true %>
+<%= javascript_include_tag :defaults %>
 <%= stylesheet_link_tag 'jstoolbar' %>
 <!--[if IE]>
     <style type="text/css">

From bfd0fb067ac35a4fa76b545a7b357fac72a63e18 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Thu, 28 Aug 2008 18:56:47 +0000
Subject: [PATCH 704/710] Adds posts quoting functionality (#1825).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1772 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/messages_controller.rb      | 16 ++++++++++++++++
 app/helpers/application_helper.rb           |  6 ++++++
 app/views/messages/show.rhtml               |  2 ++
 lang/bg.yml                                 |  1 +
 lang/cs.yml                                 |  1 +
 lang/da.yml                                 |  1 +
 lang/de.yml                                 |  1 +
 lang/en.yml                                 |  1 +
 lang/es.yml                                 |  1 +
 lang/fi.yml                                 |  1 +
 lang/fr.yml                                 |  1 +
 lang/he.yml                                 |  1 +
 lang/hu.yml                                 |  1 +
 lang/it.yml                                 |  1 +
 lang/ja.yml                                 |  1 +
 lang/ko.yml                                 |  1 +
 lang/lt.yml                                 |  1 +
 lang/nl.yml                                 |  1 +
 lang/no.yml                                 |  1 +
 lang/pl.yml                                 |  1 +
 lang/pt-br.yml                              |  1 +
 lang/pt.yml                                 |  1 +
 lang/ro.yml                                 |  1 +
 lang/ru.yml                                 |  1 +
 lang/sr.yml                                 |  1 +
 lang/sv.yml                                 |  1 +
 lang/th.yml                                 |  1 +
 lang/uk.yml                                 |  1 +
 lang/zh-tw.yml                              |  1 +
 lang/zh.yml                                 |  1 +
 lib/redmine.rb                              |  2 +-
 public/stylesheets/application.css          |  1 +
 test/functional/messages_controller_test.rb | 16 ++++++++++++++++
 33 files changed, 69 insertions(+), 1 deletion(-)

diff --git a/app/controllers/messages_controller.rb b/app/controllers/messages_controller.rb
index 08c77d7d2..554279d21 100644
--- a/app/controllers/messages_controller.rb
+++ b/app/controllers/messages_controller.rb
@@ -22,7 +22,9 @@ class MessagesController < ApplicationController
   before_filter :authorize, :except => :preview
 
   verify :method => :post, :only => [ :reply, :destroy ], :redirect_to => { :action => :show }
+  verify :xhr => true, :only => :quote
 
+  
   helper :attachments
   include AttachmentsHelper   
 
@@ -82,6 +84,20 @@ class MessagesController < ApplicationController
       { :action => 'show', :id => @message.parent }
   end
   
+  def quote
+    user = @message.author
+    text = @message.content
+    content = "#{ll(Setting.default_language, :text_user_wrote, user)}\\n> "
+    content << text.to_s.strip.gsub(%r{<pre>((.|\s)*?)</pre>}m, '[...]').gsub('"', '\"').gsub(/(\r?\n|\r\n?)/, "\\n> ") + "\\n\\n"
+    render(:update) { |page|
+      page.<< "$('message_content').value = \"#{content}\";"
+      page.show 'reply'
+      page << "Form.Element.focus('message_content');"
+      page << "Element.scrollTo('reply');"
+      page << "$('message_content').scrollTop = $('message_content').scrollHeight - $('message_content').clientHeight;"
+    }
+  end
+  
   def preview
     message = @board.messages.find_by_id(params[:id])
     @attachements = message.attachments if message
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index ed5c6bdb7..78e5bdc65 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -34,6 +34,12 @@ module ApplicationHelper
   def link_to_if_authorized(name, options = {}, html_options = nil, *parameters_for_method_reference)
     link_to(name, options, html_options, *parameters_for_method_reference) if authorize_for(options[:controller] || params[:controller], options[:action])
   end
+  
+  # Display a link to remote if user is authorized
+  def link_to_remote_if_authorized(name, options = {}, html_options = nil)
+    url = options[:url] || {}
+    link_to_remote(name, options, html_options) if authorize_for(url[:controller] || params[:controller], url[:action])
+  end
 
   # Display a link to user's account page
   def link_to_user(user)
diff --git a/app/views/messages/show.rhtml b/app/views/messages/show.rhtml
index 7e5975bfd..c24be7a21 100644
--- a/app/views/messages/show.rhtml
+++ b/app/views/messages/show.rhtml
@@ -2,6 +2,7 @@
                link_to(h(@board.name), {:controller => 'boards', :action => 'show', :project_id => @project, :id => @board}) %>
 
 <div class="contextual">
+    <%= link_to_remote_if_authorized l(:button_quote), { :url => {:action => 'quote', :id => @topic} }, :class => 'icon icon-comment' %>
     <%= link_to_if_authorized l(:button_edit), {:action => 'edit', :id => @topic}, :class => 'icon icon-edit' %>
     <%= link_to_if_authorized l(:button_delete), {:action => 'destroy', :id => @topic}, :method => :post, :confirm => l(:text_are_you_sure), :class => 'icon icon-del' %>
 </div>
@@ -22,6 +23,7 @@
 <% @replies.each do |message| %>
   <a name="<%= "message-#{message.id}" %>"></a>
   <div class="contextual">
+    <%= link_to_remote_if_authorized image_tag('comment.png'), { :url => {:action => 'quote', :id => message} }, :title => l(:button_quote) %>
     <%= link_to_if_authorized image_tag('edit.png'), {:action => 'edit', :id => message}, :title => l(:button_edit) %>
     <%= link_to_if_authorized image_tag('delete.png'), {:action => 'destroy', :id => message}, :method => :post, :confirm => l(:text_are_you_sure), :title => l(:button_delete) %>
   </div>
diff --git a/lang/bg.yml b/lang/bg.yml
index f15ba4da7..1f174e29f 100644
--- a/lang/bg.yml
+++ b/lang/bg.yml
@@ -635,3 +635,4 @@ text_email_delivery_not_configured: "Email delivery is not configured, and notif
 field_parent_title: Parent page
 label_issue_watchers: Watchers
 setting_commit_logs_encoding: Commit messages encoding
+button_quote: Quote
diff --git a/lang/cs.yml b/lang/cs.yml
index b7b1b9eaf..609e95478 100644
--- a/lang/cs.yml
+++ b/lang/cs.yml
@@ -640,3 +640,4 @@ text_email_delivery_not_configured: "Email delivery is not configured, and notif
 field_parent_title: Parent page
 label_issue_watchers: Watchers
 setting_commit_logs_encoding: Commit messages encoding
+button_quote: Quote
diff --git a/lang/da.yml b/lang/da.yml
index 3227dc7bd..a76e7ea5c 100644
--- a/lang/da.yml
+++ b/lang/da.yml
@@ -637,3 +637,4 @@ text_email_delivery_not_configured: "Email delivery is not configured, and notif
 field_parent_title: Parent page
 label_issue_watchers: Watchers
 setting_commit_logs_encoding: Commit messages encoding
+button_quote: Quote
diff --git a/lang/de.yml b/lang/de.yml
index 5093c31fd..e309dfb57 100644
--- a/lang/de.yml
+++ b/lang/de.yml
@@ -636,3 +636,4 @@ text_email_delivery_not_configured: "Email delivery is not configured, and notif
 field_parent_title: Parent page
 label_issue_watchers: Watchers
 setting_commit_logs_encoding: Commit messages encoding
+button_quote: Quote
diff --git a/lang/en.yml b/lang/en.yml
index 6cd6d4270..5f552774c 100644
--- a/lang/en.yml
+++ b/lang/en.yml
@@ -561,6 +561,7 @@ button_copy: Copy
 button_annotate: Annotate
 button_update: Update
 button_configure: Configure
+button_quote: Quote
 
 status_active: active
 status_registered: registered
diff --git a/lang/es.yml b/lang/es.yml
index 58d27f28d..fc9540a02 100644
--- a/lang/es.yml
+++ b/lang/es.yml
@@ -638,3 +638,4 @@ text_email_delivery_not_configured: "Email delivery is not configured, and notif
 field_parent_title: Parent page
 label_issue_watchers: Watchers
 setting_commit_logs_encoding: Commit messages encoding
+button_quote: Quote
diff --git a/lang/fi.yml b/lang/fi.yml
index 394ff23f3..6eb16bfac 100644
--- a/lang/fi.yml
+++ b/lang/fi.yml
@@ -635,3 +635,4 @@ text_email_delivery_not_configured: "Email delivery is not configured, and notif
 field_parent_title: Parent page
 label_issue_watchers: Watchers
 setting_commit_logs_encoding: Commit messages encoding
+button_quote: Quote
diff --git a/lang/fr.yml b/lang/fr.yml
index e6c4b3340..81e44949f 100644
--- a/lang/fr.yml
+++ b/lang/fr.yml
@@ -561,6 +561,7 @@ button_copy: Copier
 button_annotate: Annoter
 button_update: Mettre à jour
 button_configure: Configurer
+button_quote: Citer
 
 status_active: actif
 status_registered: enregistré
diff --git a/lang/he.yml b/lang/he.yml
index 652b0ed8e..77fe32e53 100644
--- a/lang/he.yml
+++ b/lang/he.yml
@@ -635,3 +635,4 @@ text_email_delivery_not_configured: "Email delivery is not configured, and notif
 field_parent_title: Parent page
 label_issue_watchers: Watchers
 setting_commit_logs_encoding: Commit messages encoding
+button_quote: Quote
diff --git a/lang/hu.yml b/lang/hu.yml
index 15c420539..208b6fe1e 100644
--- a/lang/hu.yml
+++ b/lang/hu.yml
@@ -636,3 +636,4 @@ text_email_delivery_not_configured: "Az E-mail küldés nincs konfigurálva, és
 field_parent_title: Parent page
 label_issue_watchers: Watchers
 setting_commit_logs_encoding: Commit messages encoding
+button_quote: Quote
diff --git a/lang/it.yml b/lang/it.yml
index 3e1c1d53b..d123e913a 100644
--- a/lang/it.yml
+++ b/lang/it.yml
@@ -635,3 +635,4 @@ text_email_delivery_not_configured: "La consegna via e-mail non è configurata e
 field_parent_title: Parent page
 label_issue_watchers: Watchers
 setting_commit_logs_encoding: Commit messages encoding
+button_quote: Quote
diff --git a/lang/ja.yml b/lang/ja.yml
index e7805393a..5a728fb02 100644
--- a/lang/ja.yml
+++ b/lang/ja.yml
@@ -636,3 +636,4 @@ text_email_delivery_not_configured: "Email delivery is not configured, and notif
 field_parent_title: Parent page
 label_issue_watchers: Watchers
 setting_commit_logs_encoding: Commit messages encoding
+button_quote: Quote
diff --git a/lang/ko.yml b/lang/ko.yml
index c85ce72e2..16bd65364 100644
--- a/lang/ko.yml
+++ b/lang/ko.yml
@@ -635,3 +635,4 @@ text_email_delivery_not_configured: "Email delivery is not configured, and notif
 field_parent_title: Parent page
 label_issue_watchers: Watchers
 setting_commit_logs_encoding: Commit messages encoding
+button_quote: Quote
diff --git a/lang/lt.yml b/lang/lt.yml
index 188faf215..2a75a95ea 100644
--- a/lang/lt.yml
+++ b/lang/lt.yml
@@ -638,3 +638,4 @@ text_email_delivery_not_configured: "Email delivery is not configured, and notif
 field_parent_title: Parent page
 label_issue_watchers: Watchers
 setting_commit_logs_encoding: Commit messages encoding
+button_quote: Quote
diff --git a/lang/nl.yml b/lang/nl.yml
index fd5bff1f6..f79e78994 100644
--- a/lang/nl.yml
+++ b/lang/nl.yml
@@ -636,3 +636,4 @@ text_email_delivery_not_configured: "Email delivery is not configured, and notif
 field_parent_title: Parent page
 label_issue_watchers: Watchers
 setting_commit_logs_encoding: Commit messages encoding
+button_quote: Quote
diff --git a/lang/no.yml b/lang/no.yml
index 2cdc0bcd6..6643f9c86 100644
--- a/lang/no.yml
+++ b/lang/no.yml
@@ -636,3 +636,4 @@ text_email_delivery_not_configured: "Email delivery is not configured, and notif
 field_parent_title: Parent page
 label_issue_watchers: Watchers
 setting_commit_logs_encoding: Commit messages encoding
+button_quote: Quote
diff --git a/lang/pl.yml b/lang/pl.yml
index 69e04e4dd..2df921b71 100644
--- a/lang/pl.yml
+++ b/lang/pl.yml
@@ -635,3 +635,4 @@ text_email_delivery_not_configured: "Email delivery is not configured, and notif
 field_parent_title: Parent page
 label_issue_watchers: Watchers
 setting_commit_logs_encoding: Commit messages encoding
+button_quote: Quote
diff --git a/lang/pt-br.yml b/lang/pt-br.yml
index 2b25e023f..8cd171b72 100644
--- a/lang/pt-br.yml
+++ b/lang/pt-br.yml
@@ -635,3 +635,4 @@ text_email_delivery_not_configured: "Email delivery is not configured, and notif
 field_parent_title: Parent page
 label_issue_watchers: Watchers
 setting_commit_logs_encoding: Commit messages encoding
+button_quote: Quote
diff --git a/lang/pt.yml b/lang/pt.yml
index 6505b762a..5562ca4ac 100644
--- a/lang/pt.yml
+++ b/lang/pt.yml
@@ -635,3 +635,4 @@ text_email_delivery_not_configured: "Email delivery is not configured, and notif
 field_parent_title: Parent page
 label_issue_watchers: Watchers
 setting_commit_logs_encoding: Commit messages encoding
+button_quote: Quote
diff --git a/lang/ro.yml b/lang/ro.yml
index 4887bcf92..5bb49ecec 100644
--- a/lang/ro.yml
+++ b/lang/ro.yml
@@ -635,3 +635,4 @@ text_email_delivery_not_configured: "Email delivery is not configured, and notif
 field_parent_title: Parent page
 label_issue_watchers: Watchers
 setting_commit_logs_encoding: Commit messages encoding
+button_quote: Quote
diff --git a/lang/ru.yml b/lang/ru.yml
index 095e4db34..01cdcd478 100644
--- a/lang/ru.yml
+++ b/lang/ru.yml
@@ -639,3 +639,4 @@ text_email_delivery_not_configured: "Параметры работы с почт
 field_parent_title: Parent page
 label_issue_watchers: Watchers
 setting_commit_logs_encoding: Commit messages encoding
+button_quote: Quote
diff --git a/lang/sr.yml b/lang/sr.yml
index f81d0e054..566a46d9f 100644
--- a/lang/sr.yml
+++ b/lang/sr.yml
@@ -636,3 +636,4 @@ text_email_delivery_not_configured: "Email delivery is not configured, and notif
 field_parent_title: Parent page
 label_issue_watchers: Watchers
 setting_commit_logs_encoding: Commit messages encoding
+button_quote: Quote
diff --git a/lang/sv.yml b/lang/sv.yml
index 5e120b3f2..4cb1f073b 100644
--- a/lang/sv.yml
+++ b/lang/sv.yml
@@ -636,3 +636,4 @@ text_email_delivery_not_configured: "Email delivery is not configured, and notif
 field_parent_title: Parent page
 label_issue_watchers: Watchers
 setting_commit_logs_encoding: Commit messages encoding
+button_quote: Quote
diff --git a/lang/th.yml b/lang/th.yml
index 3ae37e551..2c3977de2 100644
--- a/lang/th.yml
+++ b/lang/th.yml
@@ -638,3 +638,4 @@ text_email_delivery_not_configured: "Email delivery is not configured, and notif
 field_parent_title: Parent page
 label_issue_watchers: Watchers
 setting_commit_logs_encoding: Commit messages encoding
+button_quote: Quote
diff --git a/lang/uk.yml b/lang/uk.yml
index cf5f384b9..7ba152413 100644
--- a/lang/uk.yml
+++ b/lang/uk.yml
@@ -637,3 +637,4 @@ text_email_delivery_not_configured: "Email delivery is not configured, and notif
 field_parent_title: Parent page
 label_issue_watchers: Watchers
 setting_commit_logs_encoding: Commit messages encoding
+button_quote: Quote
diff --git a/lang/zh-tw.yml b/lang/zh-tw.yml
index f13331df4..6a1441364 100644
--- a/lang/zh-tw.yml
+++ b/lang/zh-tw.yml
@@ -636,3 +636,4 @@ enumeration_activities: 活動 (時間追蹤)
 field_parent_title: Parent page
 label_issue_watchers: Watchers
 setting_commit_logs_encoding: Commit messages encoding
+button_quote: Quote
diff --git a/lang/zh.yml b/lang/zh.yml
index 07829a541..bfe551093 100644
--- a/lang/zh.yml
+++ b/lang/zh.yml
@@ -636,3 +636,4 @@ default_activity_development: 开发
 enumeration_issue_priorities: 问题优先级
 enumeration_doc_categories: 文档类别
 enumeration_activities: 活动（时间跟踪）
+button_quote: Quote
diff --git a/lib/redmine.rb b/lib/redmine.rb
index 9890ab06f..33d33752b 100644
--- a/lib/redmine.rb
+++ b/lib/redmine.rb
@@ -92,7 +92,7 @@ Redmine::AccessControl.map do |map|
   map.project_module :boards do |map|
     map.permission :manage_boards, {:boards => [:new, :edit, :destroy]}, :require => :member
     map.permission :view_messages, {:boards => [:index, :show], :messages => [:show]}, :public => true
-    map.permission :add_messages, {:messages => [:new, :reply]}
+    map.permission :add_messages, {:messages => [:new, :reply, :quote]}
     map.permission :edit_messages, {:messages => :edit}, :require => :member
     map.permission :delete_messages, {:messages => :destroy}, :require => :member
   end
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index c7e9284d2..e5ca9e8f2 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -599,6 +599,7 @@ vertical-align: middle;
 .icon-checked  { background-image: url(../images/true.png); }
 .icon-details  { background-image: url(../images/zoom_in.png); }
 .icon-report  { background-image: url(../images/report.png); }
+.icon-comment  { background-image: url(../images/comment.png); }
 
 .icon22-projects { background-image: url(../images/22x22/projects.png); }
 .icon22-users { background-image: url(../images/22x22/users.png); }
diff --git a/test/functional/messages_controller_test.rb b/test/functional/messages_controller_test.rb
index 1fe8d086a..b1b3ea942 100644
--- a/test/functional/messages_controller_test.rb
+++ b/test/functional/messages_controller_test.rb
@@ -40,6 +40,15 @@ class MessagesControllerTest < Test::Unit::TestCase
     assert_not_nil assigns(:topic)
   end
   
+  def test_show_with_reply_permission
+    @request.session[:user_id] = 2
+    get :show, :board_id => 1, :id => 1
+    assert_response :success
+    assert_template 'show'
+    assert_tag :div, :attributes => { :id => 'reply' },
+                     :descendant => { :tag => 'textarea', :attributes => { :id => 'message_content' } }
+  end
+  
   def test_show_message_not_found
     get :show, :board_id => 1, :id => 99999
     assert_response 404
@@ -108,4 +117,11 @@ class MessagesControllerTest < Test::Unit::TestCase
     assert_redirected_to 'boards/show'
     assert_nil Message.find_by_id(1)
   end
+  
+  def test_quote
+    @request.session[:user_id] = 2
+    xhr :get, :quote, :board_id => 1, :id => 3
+    assert_response :success
+    assert_select_rjs :show, 'reply'
+  end
 end

From ed349ca9420cf3f6b794f2b7d408a6ee3386dbf8 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Thu, 28 Aug 2008 19:04:04 +0000
Subject: [PATCH 705/710] Sligth changes to issue comments quoting links.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1773 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/helpers/journals_helper.rb | 6 +++---
 app/views/issues/show.rhtml    | 4 +---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/app/helpers/journals_helper.rb b/app/helpers/journals_helper.rb
index 92d6e5593..45579f771 100644
--- a/app/helpers/journals_helper.rb
+++ b/app/helpers/journals_helper.rb
@@ -21,12 +21,12 @@ module JournalsHelper
     editable = journal.editable_by?(User.current)
     links = []
     if !journal.notes.blank?
+      links << link_to_remote(image_tag('comment.png'),
+                              { :url => {:controller => 'issues', :action => 'reply', :id => journal.journalized, :journal_id => journal} },
+                              :title => l(:button_quote)) if options[:reply_links]
       links << link_to_in_place_notes_editor(image_tag('edit.png'), "journal-#{journal.id}-notes", 
                                              { :controller => 'journals', :action => 'edit', :id => journal },
                                                 :title => l(:button_edit)) if editable
-      links << link_to_remote(image_tag('comment.png'),
-                              { :url => {:controller => 'issues', :action => 'reply', :id => journal.journalized, :journal_id => journal} },
-                              :title => l(:button_reply)) if options[:reply_links]
     end
     content << content_tag('div', links.join(' '), :class => 'contextual') unless links.empty?
     content << textilizable(journal, :notes)
diff --git a/app/views/issues/show.rhtml b/app/views/issues/show.rhtml
index df8fc372a..2dd1bacaa 100644
--- a/app/views/issues/show.rhtml
+++ b/app/views/issues/show.rhtml
@@ -57,9 +57,7 @@ end %>
 <hr />
 
 <div class="contextual">
-<%= link_to_remote(image_tag('comment.png'),
-                   { :url => {:controller => 'issues', :action => 'reply', :id => @issue} },
-                   :title => l(:button_reply)) if authorize_for('issues', 'edit') %>
+<%= link_to_remote_if_authorized l(:button_quote), { :url => {:action => 'reply', :id => @issue} }, :class => 'icon icon-comment' %>
 </div>
                               
 <p><strong><%=l(:field_description)%></strong></p>

From 25b4139028696d4f4fb057f598a771aca52b7afe Mon Sep 17 00:00:00 2001
From: Nicolas Chuche <nicolas.chuche@barna.be>
Date: Sun, 31 Aug 2008 12:11:49 +0000
Subject: [PATCH 706/710] bug in read only access handling

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1776 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 extra/svn/Redmine.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extra/svn/Redmine.pm b/extra/svn/Redmine.pm
index 09a85fb09..2619196c7 100644
--- a/extra/svn/Redmine.pm
+++ b/extra/svn/Redmine.pm
@@ -200,7 +200,7 @@ sub access_handler {
   }
 
   my $method = $r->method;
-  return OK if defined $read_only_methods{$method};
+  return OK unless defined $read_only_methods{$method};
 
   my $project_id = get_project_identifier($r);
 

From dbad26c87db8247c0d635c993981d4277e165978 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 31 Aug 2008 12:59:57 +0000
Subject: [PATCH 707/710] Adds an option to generate sequential project
 identifiers. Disabled by default, it can be enabled on the 'Projects' tab in
 application settings.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1777 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/projects_controller.rb |  1 +
 app/helpers/settings_helper.rb         |  1 +
 app/models/project.rb                  |  6 ++++++
 app/views/settings/_general.rhtml      |  3 ---
 app/views/settings/_projects.rhtml     | 12 ++++++++++++
 config/settings.yml                    |  2 ++
 lang/bg.yml                            |  1 +
 lang/cs.yml                            |  1 +
 lang/da.yml                            |  1 +
 lang/de.yml                            |  1 +
 lang/en.yml                            |  1 +
 lang/es.yml                            |  1 +
 lang/fi.yml                            |  1 +
 lang/fr.yml                            |  1 +
 lang/he.yml                            |  1 +
 lang/hu.yml                            |  1 +
 lang/it.yml                            |  1 +
 lang/ja.yml                            |  1 +
 lang/ko.yml                            |  1 +
 lang/lt.yml                            |  1 +
 lang/nl.yml                            |  1 +
 lang/no.yml                            |  1 +
 lang/pl.yml                            |  1 +
 lang/pt-br.yml                         |  1 +
 lang/pt.yml                            |  1 +
 lang/ro.yml                            |  1 +
 lang/ru.yml                            |  1 +
 lang/sr.yml                            |  1 +
 lang/sv.yml                            |  1 +
 lang/th.yml                            |  1 +
 lang/uk.yml                            |  1 +
 lang/zh-tw.yml                         |  1 +
 lang/zh.yml                            |  1 +
 test/unit/project_test.rb              | 11 +++++++++++
 34 files changed, 60 insertions(+), 3 deletions(-)
 create mode 100644 app/views/settings/_projects.rhtml

diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb
index 43d35cf4f..0d83d81b3 100644
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -69,6 +69,7 @@ class ProjectsController < ApplicationController
                                   :order => 'name')
     @project = Project.new(params[:project])
     if request.get?
+      @project.identifier = Project.next_identifier if Setting.sequential_project_identifiers?
       @project.trackers = Tracker.all
       @project.is_public = Setting.default_projects_public?
       @project.enabled_module_names = Redmine::AccessControl.available_project_modules
diff --git a/app/helpers/settings_helper.rb b/app/helpers/settings_helper.rb
index d88269f7d..47e691334 100644
--- a/app/helpers/settings_helper.rb
+++ b/app/helpers/settings_helper.rb
@@ -19,6 +19,7 @@ module SettingsHelper
   def administration_settings_tabs
     tabs = [{:name => 'general', :partial => 'settings/general', :label => :label_general},
             {:name => 'authentication', :partial => 'settings/authentication', :label => :label_authentication},
+            {:name => 'projects', :partial => 'settings/projects', :label => :label_project_plural},
             {:name => 'issues', :partial => 'settings/issues', :label => :label_issue_tracking},
             {:name => 'notifications', :partial => 'settings/notifications', :label => l(:field_mail_notification)},
             {:name => 'mail_handler', :partial => 'settings/mail_handler', :label => l(:label_incoming_emails)},
diff --git a/app/models/project.rb b/app/models/project.rb
index 9e4bd6971..adc70c644 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -238,6 +238,12 @@ class Project < ActiveRecord::Base
       enabled_modules << EnabledModule.new(:name => name.to_s)
     end
   end
+  
+  # Returns an auto-generated project identifier based on the last identifier used
+  def self.next_identifier
+    p = Project.find(:first, :order => 'created_on DESC')
+    p.nil? ? nil : p.identifier.to_s.succ
+  end
 
 protected
   def validate
diff --git a/app/views/settings/_general.rhtml b/app/views/settings/_general.rhtml
index 1d17a003e..bb56c43db 100644
--- a/app/views/settings/_general.rhtml
+++ b/app/views/settings/_general.rhtml
@@ -46,9 +46,6 @@
 
 <p><label><%= l(:setting_feeds_limit) %></label>
 <%= text_field_tag 'settings[feeds_limit]', Setting.feeds_limit, :size => 6 %></p>
-
-<p><label><%= l(:setting_default_projects_public) %></label>
-<%= check_box_tag 'settings[default_projects_public]', 1, Setting.default_projects_public? %><%= hidden_field_tag 'settings[default_projects_public]', 0 %></p>
 </div>
 
 <%= submit_tag l(:button_save) %>
diff --git a/app/views/settings/_projects.rhtml b/app/views/settings/_projects.rhtml
new file mode 100644
index 000000000..1cd4f6e9b
--- /dev/null
+++ b/app/views/settings/_projects.rhtml
@@ -0,0 +1,12 @@
+<% form_tag({:action => 'edit', :tab => 'projects'}) do %>
+
+<div class="box tabular settings">
+<p><label><%= l(:setting_default_projects_public) %></label>
+<%= check_box_tag 'settings[default_projects_public]', 1, Setting.default_projects_public? %><%= hidden_field_tag 'settings[default_projects_public]', 0 %></p>
+
+<p><label><%= l(:setting_sequential_project_identifiers) %></label>
+<%= check_box_tag 'settings[sequential_project_identifiers]', 1, Setting.sequential_project_identifiers? %><%= hidden_field_tag 'settings[sequential_project_identifiers]', 0 %></p>
+</div>
+
+<%= submit_tag l(:button_save) %>
+<% end %>
diff --git a/config/settings.yml b/config/settings.yml
index ac79edb8d..e1ad341de 100644
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -118,6 +118,8 @@ display_subprojects_issues:
   default: 1
 default_projects_public:
   default: 1
+sequential_project_identifiers:
+  default: 0
 # encodings used to convert repository files content to UTF-8
 # multiple values accepted, comma separated
 repositories_encodings:
diff --git a/lang/bg.yml b/lang/bg.yml
index 1f174e29f..ddc3368ef 100644
--- a/lang/bg.yml
+++ b/lang/bg.yml
@@ -636,3 +636,4 @@ field_parent_title: Parent page
 label_issue_watchers: Watchers
 setting_commit_logs_encoding: Commit messages encoding
 button_quote: Quote
+setting_sequential_project_identifiers: Generate sequential project identifiers
diff --git a/lang/cs.yml b/lang/cs.yml
index 609e95478..767fcdbde 100644
--- a/lang/cs.yml
+++ b/lang/cs.yml
@@ -641,3 +641,4 @@ field_parent_title: Parent page
 label_issue_watchers: Watchers
 setting_commit_logs_encoding: Commit messages encoding
 button_quote: Quote
+setting_sequential_project_identifiers: Generate sequential project identifiers
diff --git a/lang/da.yml b/lang/da.yml
index a76e7ea5c..8f8905f32 100644
--- a/lang/da.yml
+++ b/lang/da.yml
@@ -638,3 +638,4 @@ field_parent_title: Parent page
 label_issue_watchers: Watchers
 setting_commit_logs_encoding: Commit messages encoding
 button_quote: Quote
+setting_sequential_project_identifiers: Generate sequential project identifiers
diff --git a/lang/de.yml b/lang/de.yml
index e309dfb57..1f6c6291d 100644
--- a/lang/de.yml
+++ b/lang/de.yml
@@ -637,3 +637,4 @@ field_parent_title: Parent page
 label_issue_watchers: Watchers
 setting_commit_logs_encoding: Commit messages encoding
 button_quote: Quote
+setting_sequential_project_identifiers: Generate sequential project identifiers
diff --git a/lang/en.yml b/lang/en.yml
index 5f552774c..c9dddf9cc 100644
--- a/lang/en.yml
+++ b/lang/en.yml
@@ -219,6 +219,7 @@ setting_display_subprojects_issues: Display subprojects issues on main projects
 setting_enabled_scm: Enabled SCM
 setting_mail_handler_api_enabled: Enable WS for incoming emails
 setting_mail_handler_api_key: API key
+setting_sequential_project_identifiers: Generate sequential project identifiers
 
 project_module_issue_tracking: Issue tracking
 project_module_time_tracking: Time tracking
diff --git a/lang/es.yml b/lang/es.yml
index fc9540a02..e4b4f0668 100644
--- a/lang/es.yml
+++ b/lang/es.yml
@@ -639,3 +639,4 @@ field_parent_title: Parent page
 label_issue_watchers: Watchers
 setting_commit_logs_encoding: Commit messages encoding
 button_quote: Quote
+setting_sequential_project_identifiers: Generate sequential project identifiers
diff --git a/lang/fi.yml b/lang/fi.yml
index 6eb16bfac..3ec7a6b50 100644
--- a/lang/fi.yml
+++ b/lang/fi.yml
@@ -636,3 +636,4 @@ field_parent_title: Parent page
 label_issue_watchers: Watchers
 setting_commit_logs_encoding: Commit messages encoding
 button_quote: Quote
+setting_sequential_project_identifiers: Generate sequential project identifiers
diff --git a/lang/fr.yml b/lang/fr.yml
index 81e44949f..f40a3f3d1 100644
--- a/lang/fr.yml
+++ b/lang/fr.yml
@@ -220,6 +220,7 @@ setting_display_subprojects_issues: Afficher par défaut les demandes des sous-p
 setting_enabled_scm: SCM activés
 setting_mail_handler_api_enabled: "Activer le WS pour la réception d'emails"
 setting_mail_handler_api_key: Clé de protection de l'API
+setting_sequential_project_identifiers: Générer des identifiants de projet séquentiels
 
 project_module_issue_tracking: Suivi des demandes
 project_module_time_tracking: Suivi du temps passé
diff --git a/lang/he.yml b/lang/he.yml
index 77fe32e53..e89e65c61 100644
--- a/lang/he.yml
+++ b/lang/he.yml
@@ -636,3 +636,4 @@ field_parent_title: Parent page
 label_issue_watchers: Watchers
 setting_commit_logs_encoding: Commit messages encoding
 button_quote: Quote
+setting_sequential_project_identifiers: Generate sequential project identifiers
diff --git a/lang/hu.yml b/lang/hu.yml
index 208b6fe1e..f8bfb93e8 100644
--- a/lang/hu.yml
+++ b/lang/hu.yml
@@ -637,3 +637,4 @@ field_parent_title: Parent page
 label_issue_watchers: Watchers
 setting_commit_logs_encoding: Commit messages encoding
 button_quote: Quote
+setting_sequential_project_identifiers: Generate sequential project identifiers
diff --git a/lang/it.yml b/lang/it.yml
index d123e913a..e1ef6f8fe 100644
--- a/lang/it.yml
+++ b/lang/it.yml
@@ -636,3 +636,4 @@ field_parent_title: Parent page
 label_issue_watchers: Watchers
 setting_commit_logs_encoding: Commit messages encoding
 button_quote: Quote
+setting_sequential_project_identifiers: Generate sequential project identifiers
diff --git a/lang/ja.yml b/lang/ja.yml
index 5a728fb02..dda73dc26 100644
--- a/lang/ja.yml
+++ b/lang/ja.yml
@@ -637,3 +637,4 @@ field_parent_title: Parent page
 label_issue_watchers: Watchers
 setting_commit_logs_encoding: Commit messages encoding
 button_quote: Quote
+setting_sequential_project_identifiers: Generate sequential project identifiers
diff --git a/lang/ko.yml b/lang/ko.yml
index 16bd65364..be7eab1fb 100644
--- a/lang/ko.yml
+++ b/lang/ko.yml
@@ -636,3 +636,4 @@ field_parent_title: Parent page
 label_issue_watchers: Watchers
 setting_commit_logs_encoding: Commit messages encoding
 button_quote: Quote
+setting_sequential_project_identifiers: Generate sequential project identifiers
diff --git a/lang/lt.yml b/lang/lt.yml
index 2a75a95ea..da581d678 100644
--- a/lang/lt.yml
+++ b/lang/lt.yml
@@ -639,3 +639,4 @@ field_parent_title: Parent page
 label_issue_watchers: Watchers
 setting_commit_logs_encoding: Commit messages encoding
 button_quote: Quote
+setting_sequential_project_identifiers: Generate sequential project identifiers
diff --git a/lang/nl.yml b/lang/nl.yml
index f79e78994..b1c5756be 100644
--- a/lang/nl.yml
+++ b/lang/nl.yml
@@ -637,3 +637,4 @@ field_parent_title: Parent page
 label_issue_watchers: Watchers
 setting_commit_logs_encoding: Commit messages encoding
 button_quote: Quote
+setting_sequential_project_identifiers: Generate sequential project identifiers
diff --git a/lang/no.yml b/lang/no.yml
index 6643f9c86..7113b416a 100644
--- a/lang/no.yml
+++ b/lang/no.yml
@@ -637,3 +637,4 @@ field_parent_title: Parent page
 label_issue_watchers: Watchers
 setting_commit_logs_encoding: Commit messages encoding
 button_quote: Quote
+setting_sequential_project_identifiers: Generate sequential project identifiers
diff --git a/lang/pl.yml b/lang/pl.yml
index 2df921b71..e9ffcda2c 100644
--- a/lang/pl.yml
+++ b/lang/pl.yml
@@ -636,3 +636,4 @@ field_parent_title: Parent page
 label_issue_watchers: Watchers
 setting_commit_logs_encoding: Commit messages encoding
 button_quote: Quote
+setting_sequential_project_identifiers: Generate sequential project identifiers
diff --git a/lang/pt-br.yml b/lang/pt-br.yml
index 8cd171b72..b4064bf58 100644
--- a/lang/pt-br.yml
+++ b/lang/pt-br.yml
@@ -636,3 +636,4 @@ field_parent_title: Parent page
 label_issue_watchers: Watchers
 setting_commit_logs_encoding: Commit messages encoding
 button_quote: Quote
+setting_sequential_project_identifiers: Generate sequential project identifiers
diff --git a/lang/pt.yml b/lang/pt.yml
index 5562ca4ac..1d4d043f5 100644
--- a/lang/pt.yml
+++ b/lang/pt.yml
@@ -636,3 +636,4 @@ field_parent_title: Parent page
 label_issue_watchers: Watchers
 setting_commit_logs_encoding: Commit messages encoding
 button_quote: Quote
+setting_sequential_project_identifiers: Generate sequential project identifiers
diff --git a/lang/ro.yml b/lang/ro.yml
index 5bb49ecec..acb5ff8ec 100644
--- a/lang/ro.yml
+++ b/lang/ro.yml
@@ -636,3 +636,4 @@ field_parent_title: Parent page
 label_issue_watchers: Watchers
 setting_commit_logs_encoding: Commit messages encoding
 button_quote: Quote
+setting_sequential_project_identifiers: Generate sequential project identifiers
diff --git a/lang/ru.yml b/lang/ru.yml
index 01cdcd478..b0e137aa9 100644
--- a/lang/ru.yml
+++ b/lang/ru.yml
@@ -640,3 +640,4 @@ field_parent_title: Parent page
 label_issue_watchers: Watchers
 setting_commit_logs_encoding: Commit messages encoding
 button_quote: Quote
+setting_sequential_project_identifiers: Generate sequential project identifiers
diff --git a/lang/sr.yml b/lang/sr.yml
index 566a46d9f..4e262369e 100644
--- a/lang/sr.yml
+++ b/lang/sr.yml
@@ -637,3 +637,4 @@ field_parent_title: Parent page
 label_issue_watchers: Watchers
 setting_commit_logs_encoding: Commit messages encoding
 button_quote: Quote
+setting_sequential_project_identifiers: Generate sequential project identifiers
diff --git a/lang/sv.yml b/lang/sv.yml
index 4cb1f073b..3bb337e3d 100644
--- a/lang/sv.yml
+++ b/lang/sv.yml
@@ -637,3 +637,4 @@ field_parent_title: Parent page
 label_issue_watchers: Watchers
 setting_commit_logs_encoding: Commit messages encoding
 button_quote: Quote
+setting_sequential_project_identifiers: Generate sequential project identifiers
diff --git a/lang/th.yml b/lang/th.yml
index 2c3977de2..a9708716e 100644
--- a/lang/th.yml
+++ b/lang/th.yml
@@ -639,3 +639,4 @@ field_parent_title: Parent page
 label_issue_watchers: Watchers
 setting_commit_logs_encoding: Commit messages encoding
 button_quote: Quote
+setting_sequential_project_identifiers: Generate sequential project identifiers
diff --git a/lang/uk.yml b/lang/uk.yml
index 7ba152413..cb4e17383 100644
--- a/lang/uk.yml
+++ b/lang/uk.yml
@@ -638,3 +638,4 @@ field_parent_title: Parent page
 label_issue_watchers: Watchers
 setting_commit_logs_encoding: Commit messages encoding
 button_quote: Quote
+setting_sequential_project_identifiers: Generate sequential project identifiers
diff --git a/lang/zh-tw.yml b/lang/zh-tw.yml
index 6a1441364..b91bef8f9 100644
--- a/lang/zh-tw.yml
+++ b/lang/zh-tw.yml
@@ -637,3 +637,4 @@ field_parent_title: Parent page
 label_issue_watchers: Watchers
 setting_commit_logs_encoding: Commit messages encoding
 button_quote: Quote
+setting_sequential_project_identifiers: Generate sequential project identifiers
diff --git a/lang/zh.yml b/lang/zh.yml
index bfe551093..dbc531119 100644
--- a/lang/zh.yml
+++ b/lang/zh.yml
@@ -637,3 +637,4 @@ enumeration_issue_priorities: 问题优先级
 enumeration_doc_categories: 文档类别
 enumeration_activities: 活动（时间跟踪）
 button_quote: Quote
+setting_sequential_project_identifiers: Generate sequential project identifiers
diff --git a/test/unit/project_test.rb b/test/unit/project_test.rb
index 91fab8208..6e32c02e7 100644
--- a/test/unit/project_test.rb
+++ b/test/unit/project_test.rb
@@ -130,4 +130,15 @@ class ProjectTest < Test::Unit::TestCase
     assert_equal [1, 2, 3], parent.rolled_up_trackers.collect(&:id)
     assert_equal [2, 3], child.rolled_up_trackers.collect(&:id)
   end
+  
+  def test_next_identifier
+    ProjectCustomField.delete_all
+    Project.create!(:name => 'last', :identifier => 'p2008040')
+    assert_equal 'p2008041', Project.next_identifier
+  end
+  
+  def test_next_identifier_first_project
+    Project.delete_all
+    assert_nil Project.next_identifier
+  end
 end

From 696d21f8c8c88d487df46112082fcb1d9b5f6ec2 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sun, 31 Aug 2008 16:34:54 +0000
Subject: [PATCH 708/710] Adds cross-project time reports support (#994).

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1778 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/application.rb             |  6 ++-
 app/controllers/timelog_controller.rb      | 40 +++++++++++-----
 app/helpers/timelog_helper.rb              |  8 ++++
 app/models/user.rb                         |  2 +-
 app/views/timelog/details.rhtml            |  6 +--
 app/views/timelog/report.rhtml             |  2 +
 config/routes.rb                           |  2 +-
 test/functional/timelog_controller_test.rb | 54 +++++++++++++++++++++-
 8 files changed, 100 insertions(+), 20 deletions(-)

diff --git a/app/controllers/application.rb b/app/controllers/application.rb
index 7a56e61f0..d21d0bd8c 100644
--- a/app/controllers/application.rb
+++ b/app/controllers/application.rb
@@ -95,11 +95,15 @@ class ApplicationController < ActionController::Base
     end
     true
   end
+  
+  def deny_access
+    User.current.logged? ? render_403 : require_login
+  end
 
   # Authorize the user for the requested action
   def authorize(ctrl = params[:controller], action = params[:action])
     allowed = User.current.allowed_to?({:controller => ctrl, :action => action}, @project)
-    allowed ? true : (User.current.logged? ? render_403 : require_login)
+    allowed ? true : deny_access
   end
   
   # make sure that the user is a member of the project (or admin) if project is private
diff --git a/app/controllers/timelog_controller.rb b/app/controllers/timelog_controller.rb
index f331cdbe4..897a50fe5 100644
--- a/app/controllers/timelog_controller.rb
+++ b/app/controllers/timelog_controller.rb
@@ -17,7 +17,8 @@
 
 class TimelogController < ApplicationController
   menu_item :issues
-  before_filter :find_project, :authorize
+  before_filter :find_project, :authorize, :only => [:edit, :destroy]
+  before_filter :find_optional_project, :only => [:report, :details]
 
   verify :method => :post, :only => :destroy, :redirect_to => { :action => :details }
   
@@ -53,11 +54,12 @@ class TimelogController < ApplicationController
                            }
     
     # Add list and boolean custom fields as available criterias
-    @project.all_issue_custom_fields.select {|cf| %w(list bool).include? cf.field_format }.each do |cf|
+    custom_fields = (@project.nil? ? IssueCustomField.for_all : @project.all_issue_custom_fields)
+    custom_fields.select {|cf| %w(list bool).include? cf.field_format }.each do |cf|
       @available_criterias["cf_#{cf.id}"] = {:sql => "(SELECT c.value FROM #{CustomValue.table_name} c WHERE c.custom_field_id = #{cf.id} AND c.customized_type = 'Issue' AND c.customized_id = #{Issue.table_name}.id)",
                                              :format => cf.field_format,
                                              :label => cf.name}
-    end
+    end if @project
     
     # Add list and boolean time entry custom fields
     TimeEntryCustomField.find(:all).select {|cf| %w(list bool).include? cf.field_format }.each do |cf|
@@ -83,9 +85,10 @@ class TimelogController < ApplicationController
       sql << " FROM #{TimeEntry.table_name}"
       sql << " LEFT JOIN #{Issue.table_name} ON #{TimeEntry.table_name}.issue_id = #{Issue.table_name}.id"
       sql << " LEFT JOIN #{Project.table_name} ON #{TimeEntry.table_name}.project_id = #{Project.table_name}.id"
-      sql << " WHERE (%s)" % @project.project_condition(Setting.display_subprojects_issues?)
-      sql << " AND (%s)" % Project.allowed_to_condition(User.current, :view_time_entries)
-      sql << " AND spent_on BETWEEN '%s' AND '%s'" % [ActiveRecord::Base.connection.quoted_date(@from.to_time), ActiveRecord::Base.connection.quoted_date(@to.to_time)]
+      sql << " WHERE"
+      sql << " (%s) AND" % @project.project_condition(Setting.display_subprojects_issues?) if @project
+      sql << " (%s) AND" % Project.allowed_to_condition(User.current, :view_time_entries)
+      sql << " (spent_on BETWEEN '%s' AND '%s')" % [ActiveRecord::Base.connection.quoted_date(@from.to_time), ActiveRecord::Base.connection.quoted_date(@to.to_time)]
       sql << " GROUP BY #{sql_group_by}, tyear, tmonth, tweek, spent_on"
       
       @hours = ActiveRecord::Base.connection.select_all(sql)
@@ -138,8 +141,13 @@ class TimelogController < ApplicationController
     sort_update
     
     cond = ARCondition.new
-    cond << (@issue.nil? ? @project.project_condition(Setting.display_subprojects_issues?) :
-                           ["#{TimeEntry.table_name}.issue_id = ?", @issue.id])
+    if @project.nil?
+      cond << Project.allowed_to_condition(User.current, :view_time_entries)
+    elsif @issue.nil?
+      cond << @project.project_condition(Setting.display_subprojects_issues?)
+    else
+      cond << ["#{TimeEntry.table_name}.issue_id = ?", @issue.id]
+    end
     
     retrieve_date_range
     cond << ['spent_on BETWEEN ? AND ?', @from, @to]
@@ -197,7 +205,7 @@ class TimelogController < ApplicationController
     @time_entry.destroy
     flash[:notice] = l(:notice_successful_delete)
     redirect_to :back
-  rescue RedirectBackError
+  rescue ::ActionController::RedirectBackError
     redirect_to :action => 'details', :project_id => @time_entry.project
   end
 
@@ -219,6 +227,16 @@ private
     render_404
   end
   
+  def find_optional_project
+    if !params[:issue_id].blank?
+      @issue = Issue.find(params[:issue_id])
+      @project = @issue.project
+    elsif !params[:project_id].blank?
+      @project = Project.find(params[:project_id])
+    end
+    deny_access unless User.current.allowed_to?(:view_time_entries, @project, :global => true)
+  end
+  
   # Retrieves the date range based on predefined ranges or specific from/to param dates
   def retrieve_date_range
     @free_period = false
@@ -261,7 +279,7 @@ private
     end
     
     @from, @to = @to, @from if @from && @to && @from > @to
-    @from ||= (TimeEntry.minimum(:spent_on, :include => :project, :conditions => @project.project_condition(Setting.display_subprojects_issues?)) || Date.today) - 1
-    @to   ||= (TimeEntry.maximum(:spent_on, :include => :project, :conditions => @project.project_condition(Setting.display_subprojects_issues?)) || Date.today)
+    @from ||= (TimeEntry.minimum(:spent_on, :include => :project, :conditions => Project.allowed_to_condition(User.current, :view_time_entries)) || Date.today) - 1
+    @to   ||= (TimeEntry.maximum(:spent_on, :include => :project, :conditions => Project.allowed_to_condition(User.current, :view_time_entries)) || Date.today)
   end
 end
diff --git a/app/helpers/timelog_helper.rb b/app/helpers/timelog_helper.rb
index 2c1225a7c..f55a8ffe7 100644
--- a/app/helpers/timelog_helper.rb
+++ b/app/helpers/timelog_helper.rb
@@ -16,6 +16,14 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 module TimelogHelper
+  def render_timelog_breadcrumb
+    links = []
+    links << link_to(l(:label_project_all), {:project_id => nil, :issue_id => nil})
+    links << link_to(h(@project), {:project_id => @project, :issue_id => nil}) if @project
+    links << link_to_issue(@issue) if @issue
+    breadcrumb links
+  end
+  
   def activity_collection_for_select_options
     activities = Enumeration::get_values('ACTI')
     collection = []
diff --git a/app/models/user.rb b/app/models/user.rb
index 05a75e1ad..4f82f61b2 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -243,7 +243,7 @@ class User < ActiveRecord::Base
     elsif options[:global]
       # authorize if user has at least one role that has this permission
       roles = memberships.collect {|m| m.role}.uniq
-      roles.detect {|r| r.allowed_to?(action)}
+      roles.detect {|r| r.allowed_to?(action)} || (self.logged? ? Role.non_member.allowed_to?(action) : Role.anonymous.allowed_to?(action))
     else
       false
     end
diff --git a/app/views/timelog/details.rhtml b/app/views/timelog/details.rhtml
index f111cbfc0..db62fae66 100644
--- a/app/views/timelog/details.rhtml
+++ b/app/views/timelog/details.rhtml
@@ -2,11 +2,9 @@
 <%= link_to_if_authorized l(:button_log_time), {:controller => 'timelog', :action => 'edit', :project_id => @project, :issue_id => @issue}, :class => 'icon icon-time' %>
 </div>
 
-<h2><%= l(:label_spent_time) %></h2>
+<%= render_timelog_breadcrumb %>
 
-<% if @issue %>
-<h3><%= link_to(@project.name, {:action => 'details', :project_id => @project}) %> / <%= link_to_issue(@issue) %></h3>
-<% end %>
+<h2><%= l(:label_spent_time) %></h2>
 
 <% form_remote_tag( :url => {}, :method => :get, :update => 'content' ) do %>
 <%= hidden_field_tag 'project_id', params[:project_id] %>
diff --git a/app/views/timelog/report.rhtml b/app/views/timelog/report.rhtml
index 97251bc11..eea0d0fc7 100644
--- a/app/views/timelog/report.rhtml
+++ b/app/views/timelog/report.rhtml
@@ -2,6 +2,8 @@
 <%= link_to_if_authorized l(:button_log_time), {:controller => 'timelog', :action => 'edit', :project_id => @project, :issue_id => @issue}, :class => 'icon icon-time' %>
 </div>
 
+<%= render_timelog_breadcrumb %>
+
 <h2><%= l(:label_spent_time) %></h2>
 
 <% form_remote_tag(:url => {}, :update => 'content') do %>
diff --git a/config/routes.rb b/config/routes.rb
index c34052f86..913a8020f 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -20,7 +20,7 @@ ActionController::Routing::Routes.draw do |map|
   map.connect 'projects/:project_id/news/:action', :controller => 'news'
   map.connect 'projects/:project_id/documents/:action', :controller => 'documents'
   map.connect 'projects/:project_id/boards/:action/:id', :controller => 'boards'
-  map.connect 'projects/:project_id/timelog/:action/:id', :controller => 'timelog'
+  map.connect 'projects/:project_id/timelog/:action/:id', :controller => 'timelog', :project_id => /.+/
   map.connect 'boards/:board_id/topics/:action/:id', :controller => 'messages'
 
   map.with_options :controller => 'repositories' do |omap|
diff --git a/test/functional/timelog_controller_test.rb b/test/functional/timelog_controller_test.rb
index 7b4622daa..28f2a28e2 100644
--- a/test/functional/timelog_controller_test.rb
+++ b/test/functional/timelog_controller_test.rb
@@ -78,7 +78,7 @@ class TimelogControllerTest < Test::Unit::TestCase
     assert_equal 2, entry.user_id
   end
   
-  def destroy
+  def test_destroy
     @request.session[:user_id] = 2
     post :destroy, :id => 1
     assert_redirected_to 'projects/ecookbook/timelog/details'
@@ -91,6 +91,29 @@ class TimelogControllerTest < Test::Unit::TestCase
     assert_template 'report'
   end
 
+  def test_report_all_projects
+    get :report
+    assert_response :success
+    assert_template 'report'
+  end
+  
+  def test_report_all_projects_denied
+    r = Role.anonymous
+    r.permissions.delete(:view_time_entries)
+    r.permissions_will_change!
+    r.save
+    get :report
+    assert_redirected_to '/account/login'
+  end
+  
+  def test_report_all_projects_one_criteria
+    get :report, :columns => 'week', :from => "2007-04-01", :to => "2007-04-30", :criterias => ['project']
+    assert_response :success
+    assert_template 'report'
+    assert_not_nil assigns(:total_hours)
+    assert_equal "8.65", "%.2f" % assigns(:total_hours)
+  end
+
   def test_report_all_time
     get :report, :project_id => 1, :criterias => ['project', 'issue']
     assert_response :success
@@ -148,7 +171,18 @@ class TimelogControllerTest < Test::Unit::TestCase
     assert_not_nil assigns(:total_hours)
     assert_equal "0.00", "%.2f" % assigns(:total_hours)
   end
- 
+  
+  def test_report_all_projects_csv_export
+    get :report, :columns => 'month', :from => "2007-01-01", :to => "2007-06-30", :criterias => ["project", "member", "activity"], :format => "csv"
+    assert_response :success
+    assert_equal 'text/csv', @response.content_type
+    lines = @response.body.chomp.split("\n")
+    # Headers
+    assert_equal 'Project,Member,Activity,2007-1,2007-2,2007-3,2007-4,2007-5,2007-6,Total', lines.first
+    # Total row
+    assert_equal 'Total,"","","","",154.25,8.65,"","",162.90', lines.last
+  end
+  
   def test_report_csv_export
     get :report, :project_id => 1, :columns => 'month', :from => "2007-01-01", :to => "2007-06-30", :criterias => ["project", "member", "activity"], :format => "csv"
     assert_response :success
@@ -159,6 +193,14 @@ class TimelogControllerTest < Test::Unit::TestCase
     # Total row
     assert_equal 'Total,"","","","",154.25,8.65,"","",162.90', lines.last
   end
+  
+  def test_details_all_projects
+    get :details
+    assert_response :success
+    assert_template 'details'
+    assert_not_nil assigns(:total_hours)
+    assert_equal "162.90", "%.2f" % assigns(:total_hours)
+  end
 
   def test_details_at_project_level
     get :details, :project_id => 1
@@ -218,6 +260,14 @@ class TimelogControllerTest < Test::Unit::TestCase
     assert assigns(:items).first.is_a?(TimeEntry)
   end
   
+  def test_details_all_projects_csv_export
+    get :details, :format => 'csv'
+    assert_response :success
+    assert_equal 'text/csv', @response.content_type
+    assert @response.body.include?("Date,User,Activity,Project,Issue,Tracker,Subject,Hours,Comment\n")
+    assert @response.body.include?("\n04/21/2007,redMine Admin,Design,eCookbook,3,Bug,Error 281 when updating a recipe,1.0,\"\"\n")
+  end
+  
   def test_details_csv_export
     get :details, :project_id => 1, :format => 'csv'
     assert_response :success

From 4b9df2eac774aa045aa5207c8bc613ed6ca67d42 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Thu, 4 Sep 2008 19:35:08 +0000
Subject: [PATCH 709/710] Fixes Repository#clear_changesets.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1783 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/models/repository.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/models/repository.rb b/app/models/repository.rb
index 9768e3e3c..81e6647a2 100644
--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -134,6 +134,7 @@ class Repository < ActiveRecord::Base
   
   def clear_changesets
     connection.delete("DELETE FROM changes WHERE changes.changeset_id IN (SELECT changesets.id FROM changesets WHERE changesets.repository_id = #{id})")
+    connection.delete("DELETE FROM changesets_issues WHERE changesets_issues.changeset_id IN (SELECT changesets.id FROM changesets WHERE changesets.repository_id = #{id})")
     connection.delete("DELETE FROM changesets WHERE changesets.repository_id = #{id}")
   end
 end

From f7acdd1afde3018a9f7c0a7dc3b6bd97a65670a2 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Fri, 5 Sep 2008 10:31:06 +0000
Subject: [PATCH 710/710] Merged hooks branch @ r1785 into trunk.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1786 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/controllers/issues_controller.rb          |   1 +
 app/helpers/issues_helper.rb                  |   3 +-
 app/views/issues/_form.rhtml                  |   2 +
 app/views/issues/bulk_edit.rhtml              |   1 +
 app/views/issues/show.rhtml                   |   1 +
 app/views/layouts/base.rhtml                  |   7 +-
 app/views/projects/settings/_members.rhtml    |   2 +
 app/views/versions/show.rhtml                 |   2 +
 lib/generators/redmine_plugin/USAGE           |  18 +++
 .../redmine_plugin_generator.rb               |  31 +++++
 .../redmine_plugin/templates/README           |   3 +
 .../redmine_plugin/templates/en.yml           |   2 +
 .../redmine_plugin/templates/init.rb          |   8 ++
 .../redmine_plugin/templates/test_helper.rb   |   5 +
 .../redmine_plugin_controller/USAGE           |   5 +
 .../redmine_plugin_controller_generator.rb    |  18 +++
 .../templates/controller.rb                   |   7 ++
 .../templates/functional_test.rb              |   8 ++
 .../templates/helper.rb                       |   2 +
 .../templates/view.html.erb                   |   1 +
 lib/generators/redmine_plugin_model/USAGE     |   5 +
 .../redmine_plugin_model_generator.rb         |  18 +++
 .../templates/fixtures.yml                    |  11 ++
 .../templates/migration.rb                    |  13 +++
 .../redmine_plugin_model/templates/model.rb   |   2 +
 .../templates/unit_test.rb                    |  10 ++
 lib/redmine.rb                                |   1 +
 lib/redmine/hook.rb                           | 109 ++++++++++++++++++
 lib/tasks/plugins.rake                        |  38 ++++++
 test/functional/projects_controller_test.rb   |  19 +++
 test/unit/lib/redmine/hook_test.rb            |  83 +++++++++++++
 31 files changed, 432 insertions(+), 4 deletions(-)
 create mode 100644 lib/generators/redmine_plugin/USAGE
 create mode 100644 lib/generators/redmine_plugin/redmine_plugin_generator.rb
 create mode 100644 lib/generators/redmine_plugin/templates/README
 create mode 100644 lib/generators/redmine_plugin/templates/en.yml
 create mode 100644 lib/generators/redmine_plugin/templates/init.rb
 create mode 100644 lib/generators/redmine_plugin/templates/test_helper.rb
 create mode 100644 lib/generators/redmine_plugin_controller/USAGE
 create mode 100644 lib/generators/redmine_plugin_controller/redmine_plugin_controller_generator.rb
 create mode 100644 lib/generators/redmine_plugin_controller/templates/controller.rb
 create mode 100644 lib/generators/redmine_plugin_controller/templates/functional_test.rb
 create mode 100644 lib/generators/redmine_plugin_controller/templates/helper.rb
 create mode 100644 lib/generators/redmine_plugin_controller/templates/view.html.erb
 create mode 100644 lib/generators/redmine_plugin_model/USAGE
 create mode 100644 lib/generators/redmine_plugin_model/redmine_plugin_model_generator.rb
 create mode 100644 lib/generators/redmine_plugin_model/templates/fixtures.yml
 create mode 100644 lib/generators/redmine_plugin_model/templates/migration.rb
 create mode 100644 lib/generators/redmine_plugin_model/templates/model.rb
 create mode 100644 lib/generators/redmine_plugin_model/templates/unit_test.rb
 create mode 100644 lib/redmine/hook.rb
 create mode 100644 lib/tasks/plugins.rake
 create mode 100644 test/unit/lib/redmine/hook_test.rb

diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index 3f7723226..7d572924f 100644
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -233,6 +233,7 @@ class IssuesController < ApplicationController
         issue.start_date = params[:start_date] unless params[:start_date].blank?
         issue.due_date = params[:due_date] unless params[:due_date].blank?
         issue.done_ratio = params[:done_ratio] unless params[:done_ratio].blank?
+        call_hook(:controller_issues_bulk_edit_before_save, { :params => params, :issue => issue })
         # Don't save any change to the issue if the user is not authorized to apply the requested status
         if (status.nil? || (issue.status.new_status_allowed_to?(status, current_role, issue.tracker) && issue.status = status)) && issue.save
           # Send notification for each issue (if changed)
diff --git a/app/helpers/issues_helper.rb b/app/helpers/issues_helper.rb
index c6de00c10..43acabd19 100644
--- a/app/helpers/issues_helper.rb
+++ b/app/helpers/issues_helper.rb
@@ -89,7 +89,8 @@ module IssuesHelper
     when 'attachment'
       label = l(:label_attachment)
     end
-       
+    call_hook(:helper_issues_show_detail_after_setting, {:detail => detail, :label => label, :value => value, :old_value => old_value })
+
     label ||= detail.prop_key
     value ||= detail.value
     old_value ||= detail.old_value
diff --git a/app/views/issues/_form.rhtml b/app/views/issues/_form.rhtml
index 4eca3cb4a..419536fee 100644
--- a/app/views/issues/_form.rhtml
+++ b/app/views/issues/_form.rhtml
@@ -48,4 +48,6 @@
 <p><label><%=l(:label_attachment_plural)%></label><%= render :partial => 'attachments/form' %></p>
 <% end %>
 
+<%= call_hook(:view_issues_form_details_bottom, { :issue => @issue, :form => f }) %>
+
 <%= wikitoolbar_for 'issue_description' %>
diff --git a/app/views/issues/bulk_edit.rhtml b/app/views/issues/bulk_edit.rhtml
index 86bc76765..b916cf092 100644
--- a/app/views/issues/bulk_edit.rhtml
+++ b/app/views/issues/bulk_edit.rhtml
@@ -38,6 +38,7 @@
 <label><%= l(:field_done_ratio) %>: 
 <%= select_tag 'done_ratio', options_for_select([[l(:label_no_change_option), '']] + (0..10).to_a.collect {|r| ["#{r*10} %", r*10] }) %></label>
 </p>
+<%= call_hook(:view_issues_bulk_edit_details_bottom, { :issues => @issues }) %>
 </fieldset>
 
 <fieldset><legend><%= l(:field_notes) %></legend>
diff --git a/app/views/issues/show.rhtml b/app/views/issues/show.rhtml
index 2dd1bacaa..463fa6960 100644
--- a/app/views/issues/show.rhtml
+++ b/app/views/issues/show.rhtml
@@ -53,6 +53,7 @@
  <%end
 end %>
 </tr>
+<%= call_hook(:view_issues_show_details_bottom, :issue => @issue) %>
 </table>
 <hr />
 
diff --git a/app/views/layouts/base.rhtml b/app/views/layouts/base.rhtml
index 62d542b7b..8c1c01903 100644
--- a/app/views/layouts/base.rhtml
+++ b/app/views/layouts/base.rhtml
@@ -6,7 +6,7 @@
 <meta name="description" content="<%= Redmine::Info.app_name %>" />
 <meta name="keywords" content="issue,bug,tracker" />
 <%= stylesheet_link_tag 'application', :media => 'all' %>
-<%= javascript_include_tag :defaults %>
+<%= javascript_include_tag :defaults, :cache => true %>
 <%= stylesheet_link_tag 'jstoolbar' %>
 <!--[if IE]>
     <style type="text/css">
@@ -14,8 +14,9 @@
       body {behavior: url(<%= stylesheet_path "csshover.htc" %>);}
     </style>
 <![endif]-->
-
-<!-- page specific tags --><%= yield :header_tags %>
+<%= call_hook :view_layouts_base_html_head %>
+<!-- page specific tags -->
+<%= yield :header_tags -%>
 </head>
 <body>
 <div id="wrapper">
diff --git a/app/views/projects/settings/_members.rhtml b/app/views/projects/settings/_members.rhtml
index ab22ac602..9fdd3e5b4 100644
--- a/app/views/projects/settings/_members.rhtml
+++ b/app/views/projects/settings/_members.rhtml
@@ -10,6 +10,7 @@
 	  <th><%= l(:label_user) %></th>
 	  <th><%= l(:label_role) %></th>
 	  <th style="width:15%"></th>
+          <%= call_hook(:view_projects_settings_members_table_header) %>
 	</thead>
 	<tbody>
 	<% members.each do |member| %>
@@ -30,6 +31,7 @@
                                             }, :title => l(:button_delete),
                                                :class => 'icon icon-del' %>
     </td>
+    <%= call_hook(:view_projects_settings_members_table_row, :member => @member) %>
 	</tr>
 	</tbody>
 <% end; reset_cycle %>
diff --git a/app/views/versions/show.rhtml b/app/views/versions/show.rhtml
index 7f9518af8..7e5264562 100644
--- a/app/views/versions/show.rhtml
+++ b/app/views/versions/show.rhtml
@@ -45,4 +45,6 @@
 <% end %>
 </div>
 
+<%= call_hook :view_versions_show_bottom, :version => @version %>
+
 <% html_title @version.name %>
diff --git a/lib/generators/redmine_plugin/USAGE b/lib/generators/redmine_plugin/USAGE
new file mode 100644
index 000000000..65a45d163
--- /dev/null
+++ b/lib/generators/redmine_plugin/USAGE
@@ -0,0 +1,18 @@
+Description:
+    The plugin generator creates stubs for a new Redmine plugin.
+	
+Example:
+    ./script/generate redmine_plugin meetings
+      create  vendor/plugins/redmine_meetings/app/controllers
+      create  vendor/plugins/redmine_meetings/app/helpers
+      create  vendor/plugins/redmine_meetings/app/models
+      create  vendor/plugins/redmine_meetings/app/views
+      create  vendor/plugins/redmine_meetings/db/migrate
+      create  vendor/plugins/redmine_meetings/lib/tasks
+      create  vendor/plugins/redmine_meetings/assets/images
+      create  vendor/plugins/redmine_meetings/assets/javascripts
+      create  vendor/plugins/redmine_meetings/assets/stylesheets
+      create  vendor/plugins/redmine_meetings/lang
+      create  vendor/plugins/redmine_meetings/README
+      create  vendor/plugins/redmine_meetings/init.rb
+      create  vendor/plugins/redmine_meetings/lang/en.yml
diff --git a/lib/generators/redmine_plugin/redmine_plugin_generator.rb b/lib/generators/redmine_plugin/redmine_plugin_generator.rb
new file mode 100644
index 000000000..666386abd
--- /dev/null
+++ b/lib/generators/redmine_plugin/redmine_plugin_generator.rb
@@ -0,0 +1,31 @@
+class RedminePluginGenerator < Rails::Generator::NamedBase
+  attr_reader :plugin_path, :plugin_name, :plugin_pretty_name
+  
+  def initialize(runtime_args, runtime_options = {})
+    super
+    @plugin_name = "redmine_#{file_name.underscore}"
+    @plugin_pretty_name = plugin_name.titleize
+    @plugin_path = "vendor/plugins/#{plugin_name}"
+  end
+  
+  def manifest
+    record do |m|
+      m.directory "#{plugin_path}/app/controllers"
+      m.directory "#{plugin_path}/app/helpers"
+      m.directory "#{plugin_path}/app/models"
+      m.directory "#{plugin_path}/app/views"
+      m.directory "#{plugin_path}/db/migrate"
+      m.directory "#{plugin_path}/lib/tasks"
+      m.directory "#{plugin_path}/assets/images"
+      m.directory "#{plugin_path}/assets/javascripts"
+      m.directory "#{plugin_path}/assets/stylesheets"
+      m.directory "#{plugin_path}/lang"
+      m.directory "#{plugin_path}/test"
+      
+      m.template 'README',    "#{plugin_path}/README"
+      m.template 'init.rb',   "#{plugin_path}/init.rb"
+      m.template 'en.yml',    "#{plugin_path}/lang/en.yml"
+      m.template 'test_helper.rb',    "#{plugin_path}/test/test_helper.rb"
+    end
+  end
+end
diff --git a/lib/generators/redmine_plugin/templates/README b/lib/generators/redmine_plugin/templates/README
new file mode 100644
index 000000000..7a31a890e
--- /dev/null
+++ b/lib/generators/redmine_plugin/templates/README
@@ -0,0 +1,3 @@
+= <%= file_name %>
+
+Description goes here
diff --git a/lib/generators/redmine_plugin/templates/en.yml b/lib/generators/redmine_plugin/templates/en.yml
new file mode 100644
index 000000000..e338591ef
--- /dev/null
+++ b/lib/generators/redmine_plugin/templates/en.yml
@@ -0,0 +1,2 @@
+# English strings go here
+my_label: "My label"
diff --git a/lib/generators/redmine_plugin/templates/init.rb b/lib/generators/redmine_plugin/templates/init.rb
new file mode 100644
index 000000000..1ffcd7bb8
--- /dev/null
+++ b/lib/generators/redmine_plugin/templates/init.rb
@@ -0,0 +1,8 @@
+require 'redmine'
+
+Redmine::Plugin.register :<%= plugin_name %> do
+  name '<%= plugin_pretty_name %> plugin'
+  author 'Author name'
+  description 'This is a plugin for Redmine'
+  version '0.0.1'
+end
diff --git a/lib/generators/redmine_plugin/templates/test_helper.rb b/lib/generators/redmine_plugin/templates/test_helper.rb
new file mode 100644
index 000000000..bd1ed0c5d
--- /dev/null
+++ b/lib/generators/redmine_plugin/templates/test_helper.rb
@@ -0,0 +1,5 @@
+# Load the normal Rails helper
+require File.expand_path(File.dirname(__FILE__) + '/../../../../test/test_helper')
+
+# Ensure that we are using the temporary fixture path
+Engines::Testing.set_fixture_path
diff --git a/lib/generators/redmine_plugin_controller/USAGE b/lib/generators/redmine_plugin_controller/USAGE
new file mode 100644
index 000000000..8336e7117
--- /dev/null
+++ b/lib/generators/redmine_plugin_controller/USAGE
@@ -0,0 +1,5 @@
+Description:
+    Generates a plugin controller.
+
+Example:
+    ./script/generate redmine_plugin_controller MyPlugin Pools index show vote
diff --git a/lib/generators/redmine_plugin_controller/redmine_plugin_controller_generator.rb b/lib/generators/redmine_plugin_controller/redmine_plugin_controller_generator.rb
new file mode 100644
index 000000000..533d65ce8
--- /dev/null
+++ b/lib/generators/redmine_plugin_controller/redmine_plugin_controller_generator.rb
@@ -0,0 +1,18 @@
+require 'rails_generator/base'
+require 'rails_generator/generators/components/controller/controller_generator'
+
+class RedminePluginControllerGenerator < ControllerGenerator
+  attr_reader :plugin_path, :plugin_name, :plugin_pretty_name
+  
+  def initialize(runtime_args, runtime_options = {})
+    runtime_args = runtime_args.dup
+    @plugin_name = "redmine_" + runtime_args.shift.underscore
+    @plugin_pretty_name = plugin_name.titleize
+    @plugin_path = "vendor/plugins/#{plugin_name}"
+    super(runtime_args, runtime_options)
+  end
+  
+  def destination_root
+    File.join(RAILS_ROOT, plugin_path)
+  end
+end
diff --git a/lib/generators/redmine_plugin_controller/templates/controller.rb b/lib/generators/redmine_plugin_controller/templates/controller.rb
new file mode 100644
index 000000000..615986d9e
--- /dev/null
+++ b/lib/generators/redmine_plugin_controller/templates/controller.rb
@@ -0,0 +1,7 @@
+class <%= class_name %>Controller < ApplicationController
+<% actions.each do |action| -%>
+
+  def <%= action %>
+  end
+<% end -%>
+end
diff --git a/lib/generators/redmine_plugin_controller/templates/functional_test.rb b/lib/generators/redmine_plugin_controller/templates/functional_test.rb
new file mode 100644
index 000000000..876bd79e2
--- /dev/null
+++ b/lib/generators/redmine_plugin_controller/templates/functional_test.rb
@@ -0,0 +1,8 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+class <%= class_name %>ControllerTest < ActionController::TestCase
+  # Replace this with your real tests.
+  def test_truth
+    assert true
+  end
+end
diff --git a/lib/generators/redmine_plugin_controller/templates/helper.rb b/lib/generators/redmine_plugin_controller/templates/helper.rb
new file mode 100644
index 000000000..3fe2ecdc7
--- /dev/null
+++ b/lib/generators/redmine_plugin_controller/templates/helper.rb
@@ -0,0 +1,2 @@
+module <%= class_name %>Helper
+end
diff --git a/lib/generators/redmine_plugin_controller/templates/view.html.erb b/lib/generators/redmine_plugin_controller/templates/view.html.erb
new file mode 100644
index 000000000..c24afaa6e
--- /dev/null
+++ b/lib/generators/redmine_plugin_controller/templates/view.html.erb
@@ -0,0 +1 @@
+<h2><%= class_name %>#<%= action %></h2>
diff --git a/lib/generators/redmine_plugin_model/USAGE b/lib/generators/redmine_plugin_model/USAGE
new file mode 100644
index 000000000..0cb55a186
--- /dev/null
+++ b/lib/generators/redmine_plugin_model/USAGE
@@ -0,0 +1,5 @@
+Description:
+    Generates a plugin model.
+
+Examples:
+    ./script/generate redmine_plugin_model MyPlugin pool title:string question:text
diff --git a/lib/generators/redmine_plugin_model/redmine_plugin_model_generator.rb b/lib/generators/redmine_plugin_model/redmine_plugin_model_generator.rb
new file mode 100644
index 000000000..b712d9b07
--- /dev/null
+++ b/lib/generators/redmine_plugin_model/redmine_plugin_model_generator.rb
@@ -0,0 +1,18 @@
+require 'rails_generator/base'
+require 'rails_generator/generators/components/model/model_generator'
+
+class RedminePluginModelGenerator < ModelGenerator
+  attr_accessor :plugin_path, :plugin_name, :plugin_pretty_name
+  
+  def initialize(runtime_args, runtime_options = {})
+    runtime_args = runtime_args.dup
+    @plugin_name = "redmine_" + runtime_args.shift.underscore
+    @plugin_pretty_name = plugin_name.titleize
+    @plugin_path = "vendor/plugins/#{plugin_name}"
+    super(runtime_args, runtime_options)
+  end
+  
+  def destination_root
+    File.join(RAILS_ROOT, plugin_path)
+  end
+end
diff --git a/lib/generators/redmine_plugin_model/templates/fixtures.yml b/lib/generators/redmine_plugin_model/templates/fixtures.yml
new file mode 100644
index 000000000..6be3c81be
--- /dev/null
+++ b/lib/generators/redmine_plugin_model/templates/fixtures.yml
@@ -0,0 +1,11 @@
+# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
+one:
+  id: 1
+<% for attribute in attributes -%>
+  <%= attribute.name %>: <%= attribute.default %>
+<% end -%>
+two:
+  id: 2
+<% for attribute in attributes -%>
+  <%= attribute.name %>: <%= attribute.default %>
+<% end -%>
diff --git a/lib/generators/redmine_plugin_model/templates/migration.rb b/lib/generators/redmine_plugin_model/templates/migration.rb
new file mode 100644
index 000000000..2a305a6a9
--- /dev/null
+++ b/lib/generators/redmine_plugin_model/templates/migration.rb
@@ -0,0 +1,13 @@
+class <%= migration_name %> < ActiveRecord::Migration
+  def self.up
+    create_table :<%= table_name %> do |t|
+<% for attribute in attributes -%>
+      t.column :<%= attribute.name %>, :<%= attribute.type %>
+<% end -%>
+    end
+  end
+
+  def self.down
+    drop_table :<%= table_name %>
+  end
+end
diff --git a/lib/generators/redmine_plugin_model/templates/model.rb b/lib/generators/redmine_plugin_model/templates/model.rb
new file mode 100644
index 000000000..8d4c89e91
--- /dev/null
+++ b/lib/generators/redmine_plugin_model/templates/model.rb
@@ -0,0 +1,2 @@
+class <%= class_name %> < ActiveRecord::Base
+end
diff --git a/lib/generators/redmine_plugin_model/templates/unit_test.rb b/lib/generators/redmine_plugin_model/templates/unit_test.rb
new file mode 100644
index 000000000..cc8b2e591
--- /dev/null
+++ b/lib/generators/redmine_plugin_model/templates/unit_test.rb
@@ -0,0 +1,10 @@
+require File.dirname(__FILE__) + '/../test_helper'
+
+class <%= class_name %>Test < Test::Unit::TestCase
+  fixtures :<%= table_name %>
+
+  # Replace this with your real tests.
+  def test_truth
+    assert true
+  end
+end
diff --git a/lib/redmine.rb b/lib/redmine.rb
index 33d33752b..3ba2f2cc3 100644
--- a/lib/redmine.rb
+++ b/lib/redmine.rb
@@ -4,6 +4,7 @@ require 'redmine/activity'
 require 'redmine/mime_type'
 require 'redmine/core_ext'
 require 'redmine/themes'
+require 'redmine/hook'
 require 'redmine/plugin'
 
 begin
diff --git a/lib/redmine/hook.rb b/lib/redmine/hook.rb
new file mode 100644
index 000000000..9bf92b3e7
--- /dev/null
+++ b/lib/redmine/hook.rb
@@ -0,0 +1,109 @@
+# Redmine - project management software
+# Copyright (C) 2006-2008  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 Redmine
+  module Hook
+    @@listener_classes = []
+    @@listeners = nil
+    @@hook_listeners = {}
+    
+    class << self
+      # Adds a listener class.
+      # Automatically called when a class inherits from Redmine::Hook::Listener.
+      def add_listener(klass)
+        raise "Hooks must include Singleton module." unless klass.included_modules.include?(Singleton)
+        @@listener_classes << klass
+        clear_listeners_instances
+      end
+      
+      # Returns all the listerners instances.
+      def listeners
+        @@listeners ||= @@listener_classes.collect {|listener| listener.instance}
+      end
+ 
+      # Returns the listeners instances for the given hook.
+      def hook_listeners(hook)
+        @@hook_listeners[hook] ||= listeners.select {|listener| listener.respond_to?(hook)}
+      end
+      
+      # Clears all the listeners.
+      def clear_listeners
+        @@listener_classes = []
+        clear_listeners_instances
+      end
+      
+      # Clears all the listeners instances.
+      def clear_listeners_instances
+        @@listeners = nil
+        @@hook_listeners = {}
+      end
+      
+      # Calls a hook.
+      # Returns the listeners response.
+      def call_hook(hook, context={})
+        response = ''
+        hook_listeners(hook).each do |listener|
+          response << listener.send(hook, context).to_s
+        end
+        response
+      end
+    end
+
+    # Base class for hook listeners.
+    class Listener
+      include Singleton
+
+      # Registers the listener
+      def self.inherited(child)
+        Redmine::Hook.add_listener(child)
+        super
+      end
+    end
+    
+    # Listener class used for views hooks.
+    # Listeners that inherit this class will include various helpers by default.
+    class ViewListener < Listener
+      include ERB::Util
+      include ActionView::Helpers::TagHelper
+      include ActionView::Helpers::FormHelper
+      include ActionView::Helpers::FormTagHelper
+      include ActionView::Helpers::FormOptionsHelper
+      include ActionView::Helpers::JavaScriptHelper
+      include ActionView::Helpers::PrototypeHelper
+      include ActionView::Helpers::NumberHelper
+      include ActionView::Helpers::UrlHelper
+      include ActionView::Helpers::AssetTagHelper
+      include ActionView::Helpers::TextHelper
+      include ActionController::UrlWriter
+      include ApplicationHelper
+    end
+
+    # Helper module included in ApplicationHelper so that hooks can be called
+    # in views like this:
+    #   <%= call_hook(:some_hook) %>
+    #   <%= call_hook(:another_hook, :foo => 'bar' %>
+    # 
+    # Current project is automatically added to the call context.
+    module Helper
+      def call_hook(hook, context={})
+        Redmine::Hook.call_hook(hook, {:project => @project}.merge(context))
+      end
+    end
+  end
+end
+
+ApplicationHelper.send(:include, Redmine::Hook::Helper)
diff --git a/lib/tasks/plugins.rake b/lib/tasks/plugins.rake
new file mode 100644
index 000000000..136877164
--- /dev/null
+++ b/lib/tasks/plugins.rake
@@ -0,0 +1,38 @@
+require 'source_annotation_extractor'
+
+# Modified version of the SourceAnnotationExtractor in railties
+# Will search for runable code that uses <tt>call_hook</tt>
+class PluginSourceAnnotationExtractor < SourceAnnotationExtractor
+  # Returns a hash that maps filenames under +dir+ (recursively) to arrays
+  # with their annotations. Only files with annotations are included, and only
+  # those with extension +.builder+, +.rb+, +.rxml+, +.rjs+, +.rhtml+, and +.erb+
+  # are taken into account.
+  def find_in(dir)
+    results = {}
+
+    Dir.glob("#{dir}/*") do |item|
+      next if File.basename(item)[0] == ?.
+
+      if File.directory?(item)
+        results.update(find_in(item))
+      elsif item =~ /(hook|test)\.rb/
+        # skip
+      elsif item =~ /\.(builder|(r(?:b|xml|js)))$/
+        results.update(extract_annotations_from(item, /\s*(#{tag})\(?\s*(.*)$/))
+      elsif item =~ /\.(rhtml|erb)$/
+        results.update(extract_annotations_from(item, /<%=\s*\s*(#{tag})\(?\s*(.*?)\s*%>/))
+      end
+    end
+
+    results
+  end
+end
+
+namespace :redmine do
+  namespace :plugins do
+    desc "Enumerate all Redmine plugin hooks and their context parameters"
+    task :hook_list do
+      PluginSourceAnnotationExtractor.enumerate 'call_hook'
+    end
+  end
+end
diff --git a/test/functional/projects_controller_test.rb b/test/functional/projects_controller_test.rb
index 03773ccdb..8e57dc5fd 100644
--- a/test/functional/projects_controller_test.rb
+++ b/test/functional/projects_controller_test.rb
@@ -316,4 +316,23 @@ class ProjectsControllerTest < Test::Unit::TestCase
       end
     end
   end
+  
+  # A hook that is manually registered later
+  class ProjectBasedTemplate < Redmine::Hook::ViewListener
+    def view_layouts_base_html_head(context)
+      # Adds a project stylesheet
+      stylesheet_link_tag(context[:project].identifier) if context[:project]
+    end
+  end
+  # Don't use this hook now
+  Redmine::Hook.clear_listeners
+  
+  def test_hook_response
+    Redmine::Hook.add_listener(ProjectBasedTemplate)
+    get :show, :id => 1
+    assert_tag :tag => 'link', :attributes => {:href => '/stylesheets/ecookbook.css'},
+                               :parent => {:tag => 'head'}
+    
+    Redmine::Hook.clear_listeners
+  end
 end
diff --git a/test/unit/lib/redmine/hook_test.rb b/test/unit/lib/redmine/hook_test.rb
new file mode 100644
index 000000000..0d76374b6
--- /dev/null
+++ b/test/unit/lib/redmine/hook_test.rb
@@ -0,0 +1,83 @@
+# redMine - project management software
+# Copyright (C) 2006-2008  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 File.dirname(__FILE__) + '/../../../test_helper'
+
+class Redmine::Hook::ManagerTest < Test::Unit::TestCase
+
+  # Some hooks that are manually registered in these tests
+  class TestHook < Redmine::Hook::Listener; end
+  
+  class TestHook1 < TestHook
+    def view_layouts_base_html_head(context)
+      'Test hook 1 listener.'
+    end
+  end
+
+  class TestHook2 < TestHook
+    def view_layouts_base_html_head(context)
+      'Test hook 2 listener.'
+    end
+  end
+  
+  class TestHook3 < TestHook
+    def view_layouts_base_html_head(context)
+      "Context keys: #{context.keys.collect(&:to_s).sort.join(', ')}."
+    end
+  end
+  Redmine::Hook.clear_listeners
+  
+  def setup
+    @hook_module = Redmine::Hook
+  end
+  
+  def teardown
+    @hook_module.clear_listeners
+  end
+  
+  def test_clear_listeners
+    assert_equal 0, @hook_module.hook_listeners(:view_layouts_base_html_head).size
+    @hook_module.add_listener(TestHook1)
+    @hook_module.add_listener(TestHook2)
+    assert_equal 2, @hook_module.hook_listeners(:view_layouts_base_html_head).size
+    
+    @hook_module.clear_listeners
+    assert_equal 0, @hook_module.hook_listeners(:view_layouts_base_html_head).size
+  end
+  
+  def test_add_listener
+    assert_equal 0, @hook_module.hook_listeners(:view_layouts_base_html_head).size
+    @hook_module.add_listener(TestHook1)
+    assert_equal 1, @hook_module.hook_listeners(:view_layouts_base_html_head).size
+  end
+  
+  def test_call_hook
+    @hook_module.add_listener(TestHook1)
+    assert_equal 'Test hook 1 listener.', @hook_module.call_hook(:view_layouts_base_html_head)
+  end
+  
+  def test_call_hook_with_context
+    @hook_module.add_listener(TestHook3)
+    assert_equal 'Context keys: bar, foo.', @hook_module.call_hook(:view_layouts_base_html_head, :foo => 1, :bar => 'a')
+  end
+  
+  def test_call_hook_with_multiple_listeners
+    @hook_module.add_listener(TestHook1)
+    @hook_module.add_listener(TestHook2)
+    assert_equal 'Test hook 1 listener.Test hook 2 listener.', @hook_module.call_hook(:view_layouts_base_html_head)
+  end
+end