kolan
/
obsolete.ChilliProject
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'ticket/master/129-rename-redmine' into upstream-master

This commit is contained in:
Eric Davis 2011-02-21 15:44:03 -08:00
parent 887a10ac60 fb89e7a842
commit 2cfb603642
63 changed files with 90 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/controllers/application_controller.rb
View File

@ -29,8 +29,8 @@ class ApplicationController < ActionController::Base
# TODO: remove it when Rails is fixed # TODO: remove it when Rails is fixed
before_filter :delete_broken_cookies before_filter :delete_broken_cookies
def delete_broken_cookies def delete_broken_cookies
if cookies['_redmine_session'] && cookies['_redmine_session'] !~ /--/ if cookies['_chiliproject_session'] && cookies['_chiliproject_session'] !~ /--/
cookies.delete '_redmine_session' cookies.delete '_chiliproject_session'
redirect_to home_path redirect_to home_path
return false return false
end end
@ -129,9 +129,9 @@ class ApplicationController < ActionController::Base
respond_to do |format| respond_to do |format|
format.html { redirect_to :controller => "account", :action => "login", :back_url => url } format.html { redirect_to :controller => "account", :action => "login", :back_url => url }
format.atom { redirect_to :controller => "account", :action => "login", :back_url => url } format.atom { redirect_to :controller => "account", :action => "login", :back_url => url }
format.xml { head :unauthorized, 'WWW-Authenticate' => 'Basic realm="Redmine API"' } format.xml { head :unauthorized, 'WWW-Authenticate' => 'Basic realm="ChiliProject API"' }
format.js { head :unauthorized, 'WWW-Authenticate' => 'Basic realm="Redmine API"' } format.js { head :unauthorized, 'WWW-Authenticate' => 'Basic realm="ChiliProject API"' }
format.json { head :unauthorized, 'WWW-Authenticate' => 'Basic realm="Redmine API"' } format.json { head :unauthorized, 'WWW-Authenticate' => 'Basic realm="ChiliProject API"' }
end end
return false return false
end end
@ -407,8 +407,8 @@ class ApplicationController < ActionController::Base
def api_key_from_request def api_key_from_request
if params[:key].present? if params[:key].present?
params[:key] params[:key]
elsif request.headers["X-Redmine-API-Key"].present? elsif request.headers["X-ChiliProject-API-Key"].present?
request.headers["X-Redmine-API-Key"] request.headers["X-ChiliProject-API-Key"]
end end
end end
@ -437,7 +437,7 @@ class ApplicationController < ActionController::Base
logger.error "Query::StatementInvalid: #{exception.message}" if logger logger.error "Query::StatementInvalid: #{exception.message}" if logger
session.delete(:query) session.delete(:query)
sort_clear if respond_to?(:sort_clear) sort_clear if respond_to?(:sort_clear)
render_error "An error occurred while executing the query and has been logged. Please report this error to your Redmine administrator." render_error "An error occurred while executing the query and has been logged. Please report this error to your administrator."
end end
# Converts the errors on an ActiveRecord object into a common JSON format # Converts the errors on an ActiveRecord object into a common JSON format

4
app/helpers/application_helper.rb
View File

@ -917,10 +917,10 @@ module ApplicationHelper
@included_in_api_response.include?(arg.to_s) @included_in_api_response.include?(arg.to_s)
end end
# Returns options or nil if nometa param or X-Redmine-Nometa header # Returns options or nil if nometa param or X-ChiliProject-Nometa header
# was set in the request # was set in the request
def api_meta(options) def api_meta(options)
if params[:nometa].present? || request.headers['X-Redmine-Nometa'] if params[:nometa].present? || request.headers['X-ChiliProject-Nometa']
# compatibility mode for activeresource clients that raise # compatibility mode for activeresource clients that raise
# an error when unserializing an array with attributes # an error when unserializing an array with attributes
nil nil

4
app/models/mail_handler.rb
View File

@ -47,7 +47,7 @@ class MailHandler < ActionMailer::Base
sender_email = email.from.to_a.first.to_s.strip sender_email = email.from.to_a.first.to_s.strip
# Ignore emails received from the application emission address to avoid hell cycles # Ignore emails received from the application emission address to avoid hell cycles
if sender_email.downcase == Setting.mail_from.to_s.strip.downcase if sender_email.downcase == Setting.mail_from.to_s.strip.downcase
logger.info "MailHandler: ignoring email from Redmine emission address [#{sender_email}]" if logger && logger.info logger.info "MailHandler: ignoring email from emission address [#{sender_email}]" if logger && logger.info
return false return false
end end
@user = User.find_by_mail(sender_email) if sender_email.present? @user = User.find_by_mail(sender_email) if sender_email.present?
@ -81,7 +81,7 @@ class MailHandler < ActionMailer::Base
private private
MESSAGE_ID_RE = %r{^<redmine\.([a-z0-9_]+)\-(\d+)\.\d+@} MESSAGE_ID_RE = %r{^<chiliproject\.([a-z0-9_]+)\-(\d+)\.\d+@}
ISSUE_REPLY_SUBJECT_RE = %r{\[[^\]]*#(\d+)\]} ISSUE_REPLY_SUBJECT_RE = %r{\[[^\]]*#(\d+)\]}
MESSAGE_REPLY_SUBJECT_RE = %r{\[[^\]]*msg(\d+)\]} MESSAGE_REPLY_SUBJECT_RE = %r{\[[^\]]*msg(\d+)\]}

16
app/models/mailer.rb
View File

@ -281,7 +281,7 @@ class Mailer < ActionMailer::Base
redmine_headers 'Type' => "Test" redmine_headers 'Type' => "Test"
set_language_if_valid(user.language) set_language_if_valid(user.language)
recipients user.mail recipients user.mail
subject 'Redmine test' subject 'ChiliProject test'
body :url => url_for(:controller => 'welcome') body :url => url_for(:controller => 'welcome')
render_multipart('test', body) render_multipart('test', body)
end end
@ -362,16 +362,16 @@ class Mailer < ActionMailer::Base
from Setting.mail_from from Setting.mail_from
# Common headers # Common headers
headers 'X-Mailer' => 'Redmine', headers 'X-Mailer' => 'ChiliProject',
'X-Redmine-Host' => Setting.host_name, 'X-ChiliProject-Host' => Setting.host_name,
'X-Redmine-Site' => Setting.app_title, 'X-ChiliProject-Site' => Setting.app_title,
'Precedence' => 'bulk', 'Precedence' => 'bulk',
'Auto-Submitted' => 'auto-generated' 'Auto-Submitted' => 'auto-generated'
end end
# Appends a Redmine header field (name is prepended with 'X-Redmine-') # Appends a Redmine header field (name is prepended with 'X-ChiliProject-')
def redmine_headers(h) def redmine_headers(h)
h.each { |k,v| headers["X-Redmine-#{k}"] = v } h.each { |k,v| headers["X-ChiliProject-#{k}"] = v }
end end
# Overrides the create_mail method # Overrides the create_mail method
@ -425,9 +425,9 @@ class Mailer < ActionMailer::Base
# id + timestamp should reduce the odds of a collision # id + timestamp should reduce the odds of a collision
# as far as we don't send multiple emails for the same object # as far as we don't send multiple emails for the same object
timestamp = object.send(object.respond_to?(:created_on) ? :created_on : :updated_on) timestamp = object.send(object.respond_to?(:created_on) ? :created_on : :updated_on)
hash = "redmine.#{object.class.name.demodulize.underscore}-#{object.id}.#{timestamp.strftime("%Y%m%d%H%M%S")}" hash = "chiliproject.#{object.class.name.demodulize.underscore}-#{object.id}.#{timestamp.strftime("%Y%m%d%H%M%S")}"
host = Setting.mail_from.to_s.gsub(%r{^.*@}, '') host = Setting.mail_from.to_s.gsub(%r{^.*@}, '')
host = "#{::Socket.gethostname}.redmine" if host.empty? host = "#{::Socket.gethostname}.chiliproject" if host.empty?
"<#{hash}@#{host}>" "<#{hash}@#{host}>"
end end

2
app/views/layouts/base.rhtml
View File

@ -69,7 +69,7 @@
<div id="footer"> <div id="footer">
<div class="bgl"><div class="bgr"> <div class="bgl"><div class="bgr">
Powered by <%= link_to Redmine::Info.app_name, Redmine::Info.url %> &copy; 2006-2011 Jean-Philippe Lang <%= l(:text_powered_by, :link => link_to(Redmine::Info.app_name, Redmine::Info.url)) %>
</div></div> </div></div>
</div> </div>
</div> </div>

4
app/views/mailer/test.text.html.rhtml
View File

@ -1,2 +1,2 @@
<p>This is a test email sent by Redmine.<br /> <p>This is a test email sent by ChiliProject.<br />
Redmine URL: <%= auto_link(@url) %></p> ChiliProject URL: <%= auto_link(@url) %></p>

4
app/views/mailer/test.text.plain.rhtml
View File

@ -1,2 +1,2 @@
This is a test email sent by Redmine. This is a test email sent by ChiliProject.
Redmine URL: <%= @url %> ChiliProject URL: <%= @url %>

1
config/locales/bg.yml
View File

@ -938,3 +938,4 @@ bg:
enumeration_activities: Дейности (time tracking) enumeration_activities: Дейности (time tracking)
enumeration_system_activity: Системна активност enumeration_system_activity: Системна активност
text_powered_by: Powered by %{link}

1
config/locales/bs.yml
View File

@ -952,3 +952,4 @@ bs:
setting_commit_logtime_enabled: Enable time logging setting_commit_logtime_enabled: Enable time logging
notice_gantt_chart_truncated: The chart was truncated because it exceeds the maximum number of items that can be displayed (%{max}) notice_gantt_chart_truncated: The chart was truncated because it exceeds the maximum number of items that can be displayed (%{max})
setting_gantt_items_limit: Maximum number of items displayed on the gantt chart setting_gantt_items_limit: Maximum number of items displayed on the gantt chart
text_powered_by: Powered by %{link}

1
config/locales/ca.yml
View File

@ -941,3 +941,4 @@ ca:
setting_commit_logtime_enabled: Enable time logging setting_commit_logtime_enabled: Enable time logging
notice_gantt_chart_truncated: The chart was truncated because it exceeds the maximum number of items that can be displayed (%{max}) notice_gantt_chart_truncated: The chart was truncated because it exceeds the maximum number of items that can be displayed (%{max})
setting_gantt_items_limit: Maximum number of items displayed on the gantt chart setting_gantt_items_limit: Maximum number of items displayed on the gantt chart
text_powered_by: Powered by %{link}

1
config/locales/cs.yml
View File

@ -938,3 +938,4 @@ cs:
setting_commit_logtime_enabled: Enable time logging setting_commit_logtime_enabled: Enable time logging
notice_gantt_chart_truncated: The chart was truncated because it exceeds the maximum number of items that can be displayed (%{max}) notice_gantt_chart_truncated: The chart was truncated because it exceeds the maximum number of items that can be displayed (%{max})
setting_gantt_items_limit: Maximum number of items displayed on the gantt chart setting_gantt_items_limit: Maximum number of items displayed on the gantt chart
text_powered_by: Powered by %{link}

1
config/locales/da.yml
View File

@ -954,3 +954,4 @@ da:
setting_commit_logtime_enabled: Enable time logging setting_commit_logtime_enabled: Enable time logging
notice_gantt_chart_truncated: The chart was truncated because it exceeds the maximum number of items that can be displayed (%{max}) notice_gantt_chart_truncated: The chart was truncated because it exceeds the maximum number of items that can be displayed (%{max})
setting_gantt_items_limit: Maximum number of items displayed on the gantt chart setting_gantt_items_limit: Maximum number of items displayed on the gantt chart
text_powered_by: Powered by %{link}

1
config/locales/de.yml
View File

@ -955,3 +955,4 @@ de:
setting_commit_logtime_enabled: Aktiviere Zeitlogging setting_commit_logtime_enabled: Aktiviere Zeitlogging
notice_gantt_chart_truncated: Die Grafik ist unvollständig, da das Maximum der anzeigbaren Aufgaben überschritten wurde (%{max}) notice_gantt_chart_truncated: Die Grafik ist unvollständig, da das Maximum der anzeigbaren Aufgaben überschritten wurde (%{max})
setting_gantt_items_limit: Maximale Anzahl von Aufgaben die im Gantt-Chart angezeigt werden. setting_gantt_items_limit: Maximale Anzahl von Aufgaben die im Gantt-Chart angezeigt werden.
text_powered_by: Powered by %{link}

1
config/locales/el.yml
View File

@ -938,3 +938,4 @@ el:
setting_commit_logtime_enabled: Enable time logging setting_commit_logtime_enabled: Enable time logging
notice_gantt_chart_truncated: The chart was truncated because it exceeds the maximum number of items that can be displayed (%{max}) notice_gantt_chart_truncated: The chart was truncated because it exceeds the maximum number of items that can be displayed (%{max})
setting_gantt_items_limit: Maximum number of items displayed on the gantt chart setting_gantt_items_limit: Maximum number of items displayed on the gantt chart
text_powered_by: Powered by %{link}

1
config/locales/en-GB.yml
View File

@ -942,3 +942,4 @@ en-GB:
setting_commit_logtime_enabled: Enable time logging setting_commit_logtime_enabled: Enable time logging
notice_gantt_chart_truncated: The chart was truncated because it exceeds the maximum number of items that can be displayed (%{max}) notice_gantt_chart_truncated: The chart was truncated because it exceeds the maximum number of items that can be displayed (%{max})
setting_gantt_items_limit: Maximum number of items displayed on the gantt chart setting_gantt_items_limit: Maximum number of items displayed on the gantt chart
text_powered_by: "Powered by %{link}"

1
config/locales/en.yml
View File

@ -908,6 +908,7 @@ en:
text_own_membership_delete_confirmation: "You are about to remove some or all of your permissions and may no longer be able to edit this project after that.\nAre you sure you want to continue?" text_own_membership_delete_confirmation: "You are about to remove some or all of your permissions and may no longer be able to edit this project after that.\nAre you sure you want to continue?"
text_zoom_in: Zoom in text_zoom_in: Zoom in
text_zoom_out: Zoom out text_zoom_out: Zoom out
text_powered_by: "Powered by %{link}"
default_role_manager: Manager default_role_manager: Manager
default_role_developer: Developer default_role_developer: Developer

1
config/locales/es.yml
View File

@ -975,3 +975,4 @@ es:
setting_commit_logtime_enabled: Enable time logging setting_commit_logtime_enabled: Enable time logging
notice_gantt_chart_truncated: The chart was truncated because it exceeds the maximum number of items that can be displayed (%{max}) notice_gantt_chart_truncated: The chart was truncated because it exceeds the maximum number of items that can be displayed (%{max})
setting_gantt_items_limit: Maximum number of items displayed on the gantt chart setting_gantt_items_limit: Maximum number of items displayed on the gantt chart
text_powered_by: Powered by %{link}

1
config/locales/eu.yml
View File

@ -942,3 +942,4 @@ eu:
setting_commit_logtime_enabled: Enable time logging setting_commit_logtime_enabled: Enable time logging
notice_gantt_chart_truncated: The chart was truncated because it exceeds the maximum number of items that can be displayed (%{max}) notice_gantt_chart_truncated: The chart was truncated because it exceeds the maximum number of items that can be displayed (%{max})
setting_gantt_items_limit: Maximum number of items displayed on the gantt chart setting_gantt_items_limit: Maximum number of items displayed on the gantt chart
text_powered_by: Powered by %{link}

1
config/locales/fi.yml
View File

@ -959,3 +959,4 @@ fi:
setting_commit_logtime_enabled: Enable time logging setting_commit_logtime_enabled: Enable time logging
notice_gantt_chart_truncated: The chart was truncated because it exceeds the maximum number of items that can be displayed (%{max}) notice_gantt_chart_truncated: The chart was truncated because it exceeds the maximum number of items that can be displayed (%{max})
setting_gantt_items_limit: Maximum number of items displayed on the gantt chart setting_gantt_items_limit: Maximum number of items displayed on the gantt chart
text_powered_by: Powered by %{link}

1
config/locales/fr.yml
View File

@ -956,3 +956,4 @@ fr:
field_member_of_group: Groupe de l'assigné field_member_of_group: Groupe de l'assigné
field_assigned_to_role: Rôle de l'assigné field_assigned_to_role: Rôle de l'assigné
setting_emails_header: Emails header setting_emails_header: Emails header
text_powered_by: Powered by %{link}

1
config/locales/gl.yml
View File

@ -950,3 +950,4 @@ gl:
setting_commit_logtime_enabled: Enable time logging setting_commit_logtime_enabled: Enable time logging
notice_gantt_chart_truncated: The chart was truncated because it exceeds the maximum number of items that can be displayed (%{max}) notice_gantt_chart_truncated: The chart was truncated because it exceeds the maximum number of items that can be displayed (%{max})
setting_gantt_items_limit: Maximum number of items displayed on the gantt chart setting_gantt_items_limit: Maximum number of items displayed on the gantt chart
text_powered_by: Powered by %{link}

1
config/locales/he.yml
View File

@ -943,3 +943,4 @@ he:
setting_commit_logtime_enabled: Enable time logging setting_commit_logtime_enabled: Enable time logging
notice_gantt_chart_truncated: The chart was truncated because it exceeds the maximum number of items that can be displayed (%{max}) notice_gantt_chart_truncated: The chart was truncated because it exceeds the maximum number of items that can be displayed (%{max})
setting_gantt_items_limit: Maximum number of items displayed on the gantt chart setting_gantt_items_limit: Maximum number of items displayed on the gantt chart
text_powered_by: Powered by %{link}

1
config/locales/hr.yml
View File

@ -945,3 +945,4 @@ hr:
setting_commit_logtime_enabled: Enable time logging setting_commit_logtime_enabled: Enable time logging
notice_gantt_chart_truncated: The chart was truncated because it exceeds the maximum number of items that can be displayed (%{max}) notice_gantt_chart_truncated: The chart was truncated because it exceeds the maximum number of items that can be displayed (%{max})
setting_gantt_items_limit: Maximum number of items displayed on the gantt chart setting_gantt_items_limit: Maximum number of items displayed on the gantt chart
text_powered_by: Powered by %{link}

1
config/locales/hu.yml
View File

@ -957,3 +957,4 @@
setting_commit_logtime_enabled: Enable time logging setting_commit_logtime_enabled: Enable time logging
notice_gantt_chart_truncated: The chart was truncated because it exceeds the maximum number of items that can be displayed (%{max}) notice_gantt_chart_truncated: The chart was truncated because it exceeds the maximum number of items that can be displayed (%{max})
setting_gantt_items_limit: Maximum number of items displayed on the gantt chart setting_gantt_items_limit: Maximum number of items displayed on the gantt chart
text_powered_by: Powered by %{link}

1
config/locales/id.yml
View File

@ -946,3 +946,4 @@ id:
setting_commit_logtime_enabled: Enable time logging setting_commit_logtime_enabled: Enable time logging
notice_gantt_chart_truncated: The chart was truncated because it exceeds the maximum number of items that can be displayed (%{max}) notice_gantt_chart_truncated: The chart was truncated because it exceeds the maximum number of items that can be displayed (%{max})
setting_gantt_items_limit: Maximum number of items displayed on the gantt chart setting_gantt_items_limit: Maximum number of items displayed on the gantt chart
text_powered_by: Powered by %{link}

1
config/locales/it.yml
View File

@ -939,3 +939,4 @@ it:
setting_commit_logtime_enabled: Abilita registrazione del tempo di collegamento setting_commit_logtime_enabled: Abilita registrazione del tempo di collegamento
notice_gantt_chart_truncated: Il grafico è stato troncato perchè eccede il numero di oggetti (%{max}) da visualizzare notice_gantt_chart_truncated: Il grafico è stato troncato perchè eccede il numero di oggetti (%{max}) da visualizzare
setting_gantt_items_limit: Massimo numero di oggetti da visualizzare sul diagramma di gantt setting_gantt_items_limit: Massimo numero di oggetti da visualizzare sul diagramma di gantt
text_powered_by: Powered by %{link}

1
config/locales/ja.yml
View File

@ -959,3 +959,4 @@ ja:
enumeration_doc_categories: 文書カテゴリ enumeration_doc_categories: 文書カテゴリ
enumeration_activities: 作業分類 (時間トラッキング) enumeration_activities: 作業分類 (時間トラッキング)
enumeration_system_activity: システム作業分類 enumeration_system_activity: システム作業分類
text_powered_by: Powered by %{link}

1
config/locales/ko.yml
View File

@ -990,3 +990,4 @@ ko:
setting_commit_logtime_enabled: 커밋 시점에 작업 시간 기록 활성화 setting_commit_logtime_enabled: 커밋 시점에 작업 시간 기록 활성화
notice_gantt_chart_truncated: The chart was truncated because it exceeds the maximum number of items that can be displayed (%{max}) notice_gantt_chart_truncated: The chart was truncated because it exceeds the maximum number of items that can be displayed (%{max})
setting_gantt_items_limit: Maximum number of items displayed on the gantt chart setting_gantt_items_limit: Maximum number of items displayed on the gantt chart
text_powered_by: Powered by %{link}

1
config/locales/lt.yml
View File

@ -998,3 +998,4 @@ lt:
setting_commit_logtime_enabled: Enable time logging setting_commit_logtime_enabled: Enable time logging
notice_gantt_chart_truncated: The chart was truncated because it exceeds the maximum number of items that can be displayed (%{max}) notice_gantt_chart_truncated: The chart was truncated because it exceeds the maximum number of items that can be displayed (%{max})
setting_gantt_items_limit: Maximum number of items displayed on the gantt chart setting_gantt_items_limit: Maximum number of items displayed on the gantt chart
text_powered_by: Powered by %{link}

1
config/locales/lv.yml
View File

@ -933,3 +933,4 @@ lv:
setting_commit_logtime_enabled: Enable time logging setting_commit_logtime_enabled: Enable time logging
notice_gantt_chart_truncated: The chart was truncated because it exceeds the maximum number of items that can be displayed (%{max}) notice_gantt_chart_truncated: The chart was truncated because it exceeds the maximum number of items that can be displayed (%{max})
setting_gantt_items_limit: Maximum number of items displayed on the gantt chart setting_gantt_items_limit: Maximum number of items displayed on the gantt chart
text_powered_by: Powered by %{link}

1
config/locales/mk.yml
View File

@ -938,3 +938,4 @@ mk:
setting_commit_logtime_enabled: Enable time logging setting_commit_logtime_enabled: Enable time logging
notice_gantt_chart_truncated: The chart was truncated because it exceeds the maximum number of items that can be displayed (%{max}) notice_gantt_chart_truncated: The chart was truncated because it exceeds the maximum number of items that can be displayed (%{max})
setting_gantt_items_limit: Maximum number of items displayed on the gantt chart setting_gantt_items_limit: Maximum number of items displayed on the gantt chart
text_powered_by: Powered by %{link}

1
config/locales/mn.yml
View File

@ -939,3 +939,4 @@ mn:
setting_commit_logtime_enabled: Enable time logging setting_commit_logtime_enabled: Enable time logging
notice_gantt_chart_truncated: The chart was truncated because it exceeds the maximum number of items that can be displayed (%{max}) notice_gantt_chart_truncated: The chart was truncated because it exceeds the maximum number of items that can be displayed (%{max})
setting_gantt_items_limit: Maximum number of items displayed on the gantt chart setting_gantt_items_limit: Maximum number of items displayed on the gantt chart
text_powered_by: Powered by %{link}

1
config/locales/nl.yml
View File

@ -920,3 +920,4 @@ nl:
setting_commit_logtime_enabled: Enable time logging setting_commit_logtime_enabled: Enable time logging
notice_gantt_chart_truncated: The chart was truncated because it exceeds the maximum number of items that can be displayed (%{max}) notice_gantt_chart_truncated: The chart was truncated because it exceeds the maximum number of items that can be displayed (%{max})
setting_gantt_items_limit: Maximum number of items displayed on the gantt chart setting_gantt_items_limit: Maximum number of items displayed on the gantt chart
text_powered_by: Powered by %{link}

1
config/locales/no.yml
View File

@ -925,3 +925,4 @@
setting_commit_logtime_enabled: Enable time logging setting_commit_logtime_enabled: Enable time logging
notice_gantt_chart_truncated: The chart was truncated because it exceeds the maximum number of items that can be displayed (%{max}) notice_gantt_chart_truncated: The chart was truncated because it exceeds the maximum number of items that can be displayed (%{max})
setting_gantt_items_limit: Maximum number of items displayed on the gantt chart setting_gantt_items_limit: Maximum number of items displayed on the gantt chart
text_powered_by: Powered by %{link}

1
config/locales/pl.yml
View File

@ -955,3 +955,4 @@ pl:
setting_commit_logtime_enabled: Enable time logging setting_commit_logtime_enabled: Enable time logging
notice_gantt_chart_truncated: The chart was truncated because it exceeds the maximum number of items that can be displayed (%{max}) notice_gantt_chart_truncated: The chart was truncated because it exceeds the maximum number of items that can be displayed (%{max})
setting_gantt_items_limit: Maximum number of items displayed on the gantt chart setting_gantt_items_limit: Maximum number of items displayed on the gantt chart
text_powered_by: Powered by %{link}

1
config/locales/pt-BR.yml
View File

@ -958,3 +958,4 @@ pt-BR:
setting_commit_logtime_enabled: Enable time logging setting_commit_logtime_enabled: Enable time logging
notice_gantt_chart_truncated: The chart was truncated because it exceeds the maximum number of items that can be displayed (%{max}) notice_gantt_chart_truncated: The chart was truncated because it exceeds the maximum number of items that can be displayed (%{max})
setting_gantt_items_limit: Maximum number of items displayed on the gantt chart setting_gantt_items_limit: Maximum number of items displayed on the gantt chart
text_powered_by: Powered by %{link}

1
config/locales/pt.yml
View File

@ -942,3 +942,4 @@ pt:
setting_commit_logtime_enabled: Enable time logging setting_commit_logtime_enabled: Enable time logging
notice_gantt_chart_truncated: The chart was truncated because it exceeds the maximum number of items that can be displayed (%{max}) notice_gantt_chart_truncated: The chart was truncated because it exceeds the maximum number of items that can be displayed (%{max})
setting_gantt_items_limit: Maximum number of items displayed on the gantt chart setting_gantt_items_limit: Maximum number of items displayed on the gantt chart
text_powered_by: Powered by %{link}

1
config/locales/ro.yml
View File

@ -931,3 +931,4 @@ ro:
setting_commit_logtime_enabled: Enable time logging setting_commit_logtime_enabled: Enable time logging
notice_gantt_chart_truncated: The chart was truncated because it exceeds the maximum number of items that can be displayed (%{max}) notice_gantt_chart_truncated: The chart was truncated because it exceeds the maximum number of items that can be displayed (%{max})
setting_gantt_items_limit: Maximum number of items displayed on the gantt chart setting_gantt_items_limit: Maximum number of items displayed on the gantt chart
text_powered_by: Powered by %{link}

1
config/locales/ru.yml
View File

@ -1051,3 +1051,4 @@ ru:
setting_commit_logtime_enabled: Enable time logging setting_commit_logtime_enabled: Enable time logging
notice_gantt_chart_truncated: The chart was truncated because it exceeds the maximum number of items that can be displayed (%{max}) notice_gantt_chart_truncated: The chart was truncated because it exceeds the maximum number of items that can be displayed (%{max})
setting_gantt_items_limit: Maximum number of items displayed on the gantt chart setting_gantt_items_limit: Maximum number of items displayed on the gantt chart
text_powered_by: Powered by %{link}

1
config/locales/sk.yml
View File

@ -933,3 +933,4 @@ sk:
setting_commit_logtime_enabled: Enable time logging setting_commit_logtime_enabled: Enable time logging
notice_gantt_chart_truncated: The chart was truncated because it exceeds the maximum number of items that can be displayed (%{max}) notice_gantt_chart_truncated: The chart was truncated because it exceeds the maximum number of items that can be displayed (%{max})
setting_gantt_items_limit: Maximum number of items displayed on the gantt chart setting_gantt_items_limit: Maximum number of items displayed on the gantt chart
text_powered_by: Powered by %{link}

1
config/locales/sl.yml
View File

@ -934,3 +934,4 @@ sl:
setting_commit_logtime_enabled: Enable time logging setting_commit_logtime_enabled: Enable time logging
notice_gantt_chart_truncated: The chart was truncated because it exceeds the maximum number of items that can be displayed (%{max}) notice_gantt_chart_truncated: The chart was truncated because it exceeds the maximum number of items that can be displayed (%{max})
setting_gantt_items_limit: Maximum number of items displayed on the gantt chart setting_gantt_items_limit: Maximum number of items displayed on the gantt chart
text_powered_by: Powered by %{link}

1
config/locales/sr-YU.yml
View File

@ -938,3 +938,4 @@ sr-YU:
setting_commit_logtime_enabled: Enable time logging setting_commit_logtime_enabled: Enable time logging
notice_gantt_chart_truncated: The chart was truncated because it exceeds the maximum number of items that can be displayed (%{max}) notice_gantt_chart_truncated: The chart was truncated because it exceeds the maximum number of items that can be displayed (%{max})
setting_gantt_items_limit: Maximum number of items displayed on the gantt chart setting_gantt_items_limit: Maximum number of items displayed on the gantt chart
text_powered_by: Powered by %{link}

1
config/locales/sr.yml
View File

@ -939,3 +939,4 @@ sr:
setting_commit_logtime_enabled: Enable time logging setting_commit_logtime_enabled: Enable time logging
notice_gantt_chart_truncated: The chart was truncated because it exceeds the maximum number of items that can be displayed (%{max}) notice_gantt_chart_truncated: The chart was truncated because it exceeds the maximum number of items that can be displayed (%{max})
setting_gantt_items_limit: Maximum number of items displayed on the gantt chart setting_gantt_items_limit: Maximum number of items displayed on the gantt chart
text_powered_by: Powered by %{link}

1
config/locales/sv.yml
View File

@ -979,3 +979,4 @@ sv:
enumeration_doc_categories: Dokumentkategorier enumeration_doc_categories: Dokumentkategorier
enumeration_activities: Aktiviteter (tidsuppföljning) enumeration_activities: Aktiviteter (tidsuppföljning)
enumeration_system_activity: Systemaktivitet enumeration_system_activity: Systemaktivitet
text_powered_by: Powered by %{link}

1
config/locales/th.yml
View File

@ -935,3 +935,4 @@ th:
setting_commit_logtime_enabled: Enable time logging setting_commit_logtime_enabled: Enable time logging
notice_gantt_chart_truncated: The chart was truncated because it exceeds the maximum number of items that can be displayed (%{max}) notice_gantt_chart_truncated: The chart was truncated because it exceeds the maximum number of items that can be displayed (%{max})
setting_gantt_items_limit: Maximum number of items displayed on the gantt chart setting_gantt_items_limit: Maximum number of items displayed on the gantt chart
text_powered_by: Powered by %{link}

1
config/locales/tr.yml
View File

@ -957,3 +957,4 @@ tr:
setting_commit_logtime_enabled: Enable time logging setting_commit_logtime_enabled: Enable time logging
notice_gantt_chart_truncated: The chart was truncated because it exceeds the maximum number of items that can be displayed (%{max}) notice_gantt_chart_truncated: The chart was truncated because it exceeds the maximum number of items that can be displayed (%{max})
setting_gantt_items_limit: Maximum number of items displayed on the gantt chart setting_gantt_items_limit: Maximum number of items displayed on the gantt chart
text_powered_by: Powered by %{link}

1
config/locales/uk.yml
View File

@ -934,3 +934,4 @@ uk:
setting_commit_logtime_enabled: Enable time logging setting_commit_logtime_enabled: Enable time logging
notice_gantt_chart_truncated: The chart was truncated because it exceeds the maximum number of items that can be displayed (%{max}) notice_gantt_chart_truncated: The chart was truncated because it exceeds the maximum number of items that can be displayed (%{max})
setting_gantt_items_limit: Maximum number of items displayed on the gantt chart setting_gantt_items_limit: Maximum number of items displayed on the gantt chart
text_powered_by: Powered by %{link}

1
config/locales/vi.yml
View File

@ -989,3 +989,4 @@ vi:
setting_commit_logtime_enabled: Enable time logging setting_commit_logtime_enabled: Enable time logging
notice_gantt_chart_truncated: The chart was truncated because it exceeds the maximum number of items that can be displayed (%{max}) notice_gantt_chart_truncated: The chart was truncated because it exceeds the maximum number of items that can be displayed (%{max})
setting_gantt_items_limit: Maximum number of items displayed on the gantt chart setting_gantt_items_limit: Maximum number of items displayed on the gantt chart
text_powered_by: Powered by %{link}

1
config/locales/zh-TW.yml
View File

@ -1019,3 +1019,4 @@
enumeration_doc_categories: 文件分類 enumeration_doc_categories: 文件分類
enumeration_activities: 活動 (時間追蹤) enumeration_activities: 活動 (時間追蹤)
enumeration_system_activity: 系統活動 enumeration_system_activity: 系統活動
text_powered_by: Powered by %{link}

1
config/locales/zh.yml
View File

@ -952,3 +952,4 @@ zh:
setting_commit_logtime_enabled: Enable time logging setting_commit_logtime_enabled: Enable time logging
notice_gantt_chart_truncated: The chart was truncated because it exceeds the maximum number of items that can be displayed (%{max}) notice_gantt_chart_truncated: The chart was truncated because it exceeds the maximum number of items that can be displayed (%{max})
setting_gantt_items_limit: Maximum number of items displayed on the gantt chart setting_gantt_items_limit: Maximum number of items displayed on the gantt chart
text_powered_by: Powered by %{link}

4
config/settings.yml
View File

@ -20,7 +20,7 @@
# Settings can be defined through the application in Admin -> Settings # Settings can be defined through the application in Admin -> Settings
app_title: app_title:
default: Redmine default: ChiliProject
app_subtitle: app_subtitle:
default: Project management default: Project management
welcome_text: welcome_text:
@ -46,7 +46,7 @@ activity_days_default:
per_page_options: per_page_options:
default: '25,50,100' default: '25,50,100'
mail_from: mail_from:
default: redmine@example.net default: chiliproject@example.net
bcc_recipients: bcc_recipients:
default: 1 default: 1
plain_text_mail: plain_text_mail:

2
db/migrate/001_setup.rb
View File

@ -288,7 +288,7 @@ class Setup < ActiveRecord::Migration
user = User.create :login => "admin", user = User.create :login => "admin",
:hashed_password => "d033e22ae348aeb5660fc2140aec35850c4da997", :hashed_password => "d033e22ae348aeb5660fc2140aec35850c4da997",
:admin => true, :admin => true,
:firstname => "Redmine", :firstname => "ChiliProject",
:lastname => "Admin", :lastname => "Admin",
:mail => "admin@example.net", :mail => "admin@example.net",
:mail_notification => true, :mail_notification => true,

6
lib/redmine/info.rb
View File

@ -1,9 +1,9 @@
module Redmine module Redmine
module Info module Info
class << self class << self
def app_name; 'Redmine' end def app_name; 'ChiliProject' end
def url; 'http://www.redmine.org/' end def url; 'https://www.chiliproject.org/' end
def help_url; 'http://www.redmine.org/guide' end def help_url; 'https://www.chiliproject.org/guide' end
def versioned_name; "#{app_name} #{Redmine::VERSION}" end def versioned_name; "#{app_name} #{Redmine::VERSION}" end
# Creates the url string to a specific Redmine issue # Creates the url string to a specific Redmine issue

2
lib/tasks/initializers.rake
View File

@ -16,7 +16,7 @@ file 'config/initializers/session_store.rb' do
# secret is at least 30 characters and all random, no regular words or # secret is at least 30 characters and all random, no regular words or
# you'll be exposed to dictionary attacks. # you'll be exposed to dictionary attacks.
ActionController::Base.session = { ActionController::Base.session = {
:key => '_redmine_session', :key => '_chiliproject_session',
# #
# Uncomment and edit the :session_path below if are hosting your Redmine # Uncomment and edit the :session_path below if are hosting your Redmine
# at a suburi and don't want the top level path to access the cookies # at a suburi and don't want the top level path to access the cookies

2
test/fixtures/mail_handler/issue_update_with_multiple_quoted_reply_above.eml vendored
View File

@ -3,7 +3,7 @@ Received: from osiris ([127.0.0.1])
by OSIRIS by OSIRIS
with hMailServer ; Sun, 22 Jun 2008 12:28:07 +0200 with hMailServer ; Sun, 22 Jun 2008 12:28:07 +0200
Message-ID: <000501c8d452$a95cd7e0$0a00a8c0@osiris> Message-ID: <000501c8d452$a95cd7e0$0a00a8c0@osiris>
In-Reply-To: <redmine.issue-2.20060719210421@osiris> In-Reply-To: <chiliproject.issue-2.20060719210421@osiris>
From: "John Smith" <JSmith@somenet.foo> From: "John Smith" <JSmith@somenet.foo>
To: <redmine@somenet.foo> To: <redmine@somenet.foo>
Subject: Re: update to issue 2 Subject: Re: update to issue 2

2
test/fixtures/mail_handler/issue_update_with_quoted_reply_above.eml vendored
View File

@ -3,7 +3,7 @@ Received: from osiris ([127.0.0.1])
by OSIRIS by OSIRIS
with hMailServer ; Sun, 22 Jun 2008 12:28:07 +0200 with hMailServer ; Sun, 22 Jun 2008 12:28:07 +0200
Message-ID: <000501c8d452$a95cd7e0$0a00a8c0@osiris> Message-ID: <000501c8d452$a95cd7e0$0a00a8c0@osiris>
In-Reply-To: <redmine.issue-2.20060719210421@osiris> In-Reply-To: <chiliproject.issue-2.20060719210421@osiris>
From: "John Smith" <JSmith@somenet.foo> From: "John Smith" <JSmith@somenet.foo>
To: <redmine@somenet.foo> To: <redmine@somenet.foo>
Subject: Re: update to issue 2 Subject: Re: update to issue 2

4
test/fixtures/mail_handler/message_reply.eml vendored
View File

@ -5,8 +5,8 @@ User-Agent: Thunderbird 2.0.0.19 (Windows/20081209)
MIME-Version: 1.0 MIME-Version: 1.0
To: redmine@somenet.foo To: redmine@somenet.foo
Subject: Reply via email Subject: Reply via email
References: <redmine.message-2.20070512171800@somenet.foo> References: <chiliproject.message-2.20070512171800@somenet.foo>
In-Reply-To: <redmine.message-2.20070512171800@somenet.foo> In-Reply-To: <chiliproject.message-2.20070512171800@somenet.foo>
Content-Type: text/plain; charset=UTF-8; format=flowed Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit Content-Transfer-Encoding: 7bit

10
test/fixtures/mail_handler/ticket_from_emission_address.eml vendored
View File

@ -1,11 +1,11 @@
Return-Path: <redmine@somenet.foo> Return-Path: <chiliproject@somenet.foo>
Received: from osiris ([127.0.0.1]) Received: from osiris ([127.0.0.1])
by OSIRIS by OSIRIS
with hMailServer ; Sun, 22 Jun 2008 12:28:07 +0200 with hMailServer ; Sun, 22 Jun 2008 12:28:07 +0200
Message-ID: <000501c8d452$a95cd7e0$0a00a8c0@osiris> Message-ID: <000501c8d452$a95cd7e0$0a00a8c0@osiris>
From: "John Doe" <Redmine@example.net> From: "John Doe" <chiliproject@example.net>
To: <redmine@somenet.foo> To: <chiliproject@somenet.foo>
Subject: Ticket with the Redmine emission address Subject: Ticket with the ChiliProject emission address
Date: Sun, 22 Jun 2008 12:28:07 +0200 Date: Sun, 22 Jun 2008 12:28:07 +0200
MIME-Version: 1.0 MIME-Version: 1.0
Content-Type: text/plain; Content-Type: text/plain;
@ -14,6 +14,6 @@ Content-Type: text/plain;
reply-type=original reply-type=original
Content-Transfer-Encoding: 7bit Content-Transfer-Encoding: 7bit
This is a ticket submitted with the Redmine emission address. This is a ticket submitted with the ChiliProject emission address.
It should be ignored. It should be ignored.

2
test/fixtures/mail_handler/ticket_reply.eml vendored
View File

@ -3,7 +3,7 @@ Received: from osiris ([127.0.0.1])
by OSIRIS by OSIRIS
with hMailServer ; Sat, 21 Jun 2008 18:41:39 +0200 with hMailServer ; Sat, 21 Jun 2008 18:41:39 +0200
Message-ID: <006a01c8d3bd$ad9baec0$0a00a8c0@osiris> Message-ID: <006a01c8d3bd$ad9baec0$0a00a8c0@osiris>
In-Reply-To: <redmine.issue-2.20060719210421@osiris> In-Reply-To: <chiliproject.issue-2.20060719210421@osiris>
From: "John Smith" <jsmith@somenet.foo> From: "John Smith" <jsmith@somenet.foo>
To: <redmine@somenet.foo> To: <redmine@somenet.foo>
References: <485d0ad366c88_d7014663a025f@osiris.tmail> References: <485d0ad366c88_d7014663a025f@osiris.tmail>

2
test/functional/projects_controller_test.rb
View File

@ -56,7 +56,7 @@ class ProjectsControllerTest < ActionController::TestCase
get :index, :format => 'atom' get :index, :format => 'atom'
assert_response :success assert_response :success
assert_template 'common/feed.atom.rxml' assert_template 'common/feed.atom.rxml'
assert_select 'feed>title', :text => 'Redmine: Latest projects' assert_select 'feed>title', :text => 'ChiliProject: Latest projects'
assert_select 'feed>entry', :count => Project.count(:conditions => Project.visible_by(User.current)) assert_select 'feed>entry', :count => Project.count(:conditions => Project.visible_by(User.current))
end end

2
test/integration/api_test/issues_test.rb
View File

@ -89,7 +89,7 @@ class ApiTest::IssuesTest < ActionController::IntegrationTest
context "with nometa header" do context "with nometa header" do
should "not contain metadata" do should "not contain metadata" do
get '/issues.xml', {}, {'X-Redmine-Nometa' => '1'} get '/issues.xml', {}, {'X-ChiliProject-Nometa' => '1'}
assert_tag :tag => 'issues', assert_tag :tag => 'issues',
:attributes => { :attributes => {

4
test/test_helper.rb
View File

@ -361,11 +361,11 @@ class ActiveSupport::TestCase
end end
end end
context "should allow key based auth using X-Redmine-API-Key header for #{http_method} #{url}" do context "should allow key based auth using X-ChiliProject-API-Key header for #{http_method} #{url}" do
setup do setup do
@user = User.generate_with_protected!(:admin => true) @user = User.generate_with_protected!(:admin => true)
@token = Token.generate!(:user => @user, :action => 'api') @token = Token.generate!(:user => @user, :action => 'api')
send(http_method, url, parameters, {'X-Redmine-API-Key' => @token.value.to_s}) send(http_method, url, parameters, {'X-ChiliProject-API-Key' => @token.value.to_s})
end end
should_respond_with success_code should_respond_with success_code

2
test/unit/setting_test.rb
View File

@ -20,7 +20,7 @@ require File.expand_path('../../test_helper', __FILE__)
class SettingTest < ActiveSupport::TestCase class SettingTest < ActiveSupport::TestCase
def test_read_default def test_read_default
assert_equal "Redmine", Setting.app_title assert_equal "ChiliProject", Setting.app_title
assert Setting.self_registration? assert Setting.self_registration?
assert !Setting.login_required? assert !Setting.login_required?
end end