Commit ee543489 authored by Holger Just's avatar Holger Just

Merge branch 'release-v2.4.0' into stable

parents 9bcf5758 9e9b6e78

Too many changes to show.

To preserve performance only 1000 of 1000+ files are displayed.

......@@ -23,7 +23,21 @@ group :openid do
end
group :rmagick do
gem "rmagick", "~> 1.15.17"
gem "rmagick", ">= 1.15.17"
# Older distributions might not have a sufficiently new ImageMagick version
# for the current rmagick release (current rmagick is rmagick 2, which
# requires ImageMagick 6.4.9 or later). If this is the case for you, comment
# the line above this comment block and uncomment the one underneath it to
# get an rmagick version known to work on older distributions.
#
# The following distributíons are known to *not* ship with a usable
# ImageMagick version. There might be additional ones.
# * Ubuntu 9.10 and older
# * Debian Lenny 5.0 and older
# * CentOS 5 and older
# * RedHat 5 and older
#
#gem "rmagick", "< 2.0.0"
end
# Use the commented pure ruby gems, if you have not the needed prerequisites on
......@@ -33,11 +47,6 @@ end
# warned.
platforms :mri, :mingw do
group :mysql do
gem "mysql"
# gem "ruby-mysql"
end
group :mysql2 do
gem "mysql2", "~> 0.2.7"
end
......@@ -49,6 +58,11 @@ platforms :mri, :mingw do
end
platforms :mri_18, :mingw_18 do
group :mysql do
gem "mysql"
# gem "ruby-mysql"
end
group :sqlite do
gem "sqlite3-ruby", "< 1.3", :require => "sqlite3"
end
......
#-- encoding: UTF-8
#-- copyright
# ChiliProject is a project management system.
#
......
#-- encoding: UTF-8
#-- copyright
# ChiliProject is a project management system.
#
......
#-- encoding: UTF-8
#-- copyright
# ChiliProject is a project management system.
#
......
#-- encoding: UTF-8
#-- copyright
# ChiliProject is a project management system.
#
......@@ -42,6 +43,24 @@ class ApplicationController < ActionController::Base
end
end
# FIXME: Remove this when all of Rack and Rails have learned how to
# properly use encodings
before_filter :params_filter
def params_filter
self.utf8nize!(params) if RUBY_VERSION >= '1.9'
end
def utf8nize!(obj)
if obj.is_a? String
obj.respond_to?(:force_encoding) ? obj.force_encoding("UTF-8") : obj
elsif obj.is_a? Hash
obj.each {|k, v| obj[k] = self.utf8nize!(v)}
elsif obj.is_a? Array
obj.each {|v| self.utf8nize!(v)}
else
obj
end
end
before_filter :user_setup, :check_if_login_required, :set_localization
filter_parameter_logging :password
......@@ -262,7 +281,7 @@ class ApplicationController < ActionController::Base
end
def redirect_back_or_default(default)
back_url = CGI.unescape(params[:back_url].to_s)
back_url = URI.escape(CGI.unescape(params[:back_url].to_s))
if !back_url.blank?
begin
uri = URI.parse(back_url)
......
#-- encoding: UTF-8
#-- copyright
# ChiliProject is a project management system.
#
......
#-- encoding: UTF-8
#-- copyright
# ChiliProject is a project management system.
#
......
#-- encoding: UTF-8
#-- copyright
# ChiliProject is a project management system.
#
......
#-- encoding: UTF-8
#-- copyright
# ChiliProject is a project management system.
#
......
#-- encoding: UTF-8
#-- copyright
# ChiliProject is a project management system.
#
......@@ -36,9 +37,9 @@ class CalendarsController < ApplicationController
if @query.valid?
events = []
events += @query.issues(:include => [:tracker, :assigned_to, :priority],
:conditions => ["((start_date BETWEEN ? AND ?) OR (due_date BETWEEN ? AND ?))", @calendar.startdt, @calendar.enddt, @calendar.startdt, @calendar.enddt]
:conditions => ["((#{Issue.table_name}.start_date BETWEEN ? AND ?) OR (#{Issue.table_name}.due_date BETWEEN ? AND ?))", @calendar.startdt, @calendar.enddt, @calendar.startdt, @calendar.enddt]
)
events += @query.versions(:conditions => ["effective_date BETWEEN ? AND ?", @calendar.startdt, @calendar.enddt])
events += @query.versions(:conditions => ["#{Version.table_name}.effective_date BETWEEN ? AND ?", @calendar.startdt, @calendar.enddt])
@calendar.events = events
end
......
#-- encoding: UTF-8
#-- copyright
# ChiliProject is a project management system.
#
......
#-- encoding: UTF-8
#-- copyright
# ChiliProject is a project management system.
#
......
#-- encoding: UTF-8
#-- copyright
# ChiliProject is a project management system.
#
......
#-- encoding: UTF-8
#-- copyright
# ChiliProject is a project management system.
#
......
#-- encoding: UTF-8
#-- copyright
# ChiliProject is a project management system.
#
......
#-- encoding: UTF-8
#-- copyright
# ChiliProject is a project management system.
#
......
#-- encoding: UTF-8
#-- copyright
# ChiliProject is a project management system.
#
......
#-- encoding: UTF-8
#-- copyright
# ChiliProject is a project management system.
#
......
#-- encoding: UTF-8
#-- copyright
# ChiliProject is a project management system.
#
......
#-- encoding: UTF-8
#-- copyright
# ChiliProject is a project management system.
#
......
#-- encoding: UTF-8
#-- copyright
# ChiliProject is a project management system.
#
......
#-- encoding: UTF-8
#-- copyright
# ChiliProject is a project management system.
#
......
#-- encoding: UTF-8
#-- copyright
# ChiliProject is a project management system.
#
......
#-- encoding: UTF-8
#-- copyright
# ChiliProject is a project management system.
#
......
#-- encoding: UTF-8
#-- copyright
# ChiliProject is a project management system.
#
......
#-- encoding: UTF-8
#-- copyright
# ChiliProject is a project management system.
#
......
#-- encoding: UTF-8
#-- copyright
# ChiliProject is a project management system.
#
......
#-- encoding: UTF-8
#-- copyright
# ChiliProject is a project management system.
#
......
#-- encoding: UTF-8
#-- copyright
# ChiliProject is a project management system.
#
......
#-- encoding: UTF-8
#-- copyright
# ChiliProject is a project management system.
#
......
#-- encoding: UTF-8
#-- copyright
# ChiliProject is a project management system.
#
......