Skip to content

O
OHR Support
Commit 8eb72a3c authored by Holger Just's avatar Holger Just
Browse files
Options

Merge branch 'release-v2.4.0'

parents cb2086f6 9e9b6e78
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 211262 additions and 7 deletions
Gemfile
View file @ 8eb72a3c
...@@ -47,11 +47,6 @@ end ...@@ -47,11 +47,6 @@ end
# warned. # warned.
platforms :mri, :mingw do platforms :mri, :mingw do
group :mysql do
gem "mysql"
# gem "ruby-mysql"
end
group :mysql2 do group :mysql2 do
gem "mysql2", "~> 0.2.7" gem "mysql2", "~> 0.2.7"
end end
...@@ -63,6 +58,11 @@ platforms :mri, :mingw do ...@@ -63,6 +58,11 @@ platforms :mri, :mingw do
end end
platforms :mri_18, :mingw_18 do platforms :mri_18, :mingw_18 do
group :mysql do
gem "mysql"
# gem "ruby-mysql"
end
group :sqlite do group :sqlite do
gem "sqlite3-ruby", "< 1.3", :require => "sqlite3" gem "sqlite3-ruby", "< 1.3", :require => "sqlite3"
end end
......
app/views/queries/_form.rhtml
View file @ 8eb72a3c
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
<fieldset><legend><%= l(:label_sort) %></legend> <fieldset><legend><%= l(:label_sort) %></legend>
<% 3.times do |i| %> <% 3.times do |i| %>
<%= i+1 %>: <%= i+1 %>:
<%= label_tag "query_sort_criteria_attribute_" + i.to_s, l(:description_query_sort_criteria_attribute), :class => "hidden-for-sighted" %> <%= label_tag "query_sort_criteria_attribute_" + i.to_s, l(:description_query_sort_criteria_attribute), :class => "hidden-for-sighted" %>
<%= select_tag("query[sort_criteria][#{i}][]", options_for_select([[]] + query.available_columns.select(&:sortable?).collect {|column| [column.caption, column.name.to_s]}, @query.sort_criteria_key(i)), :id => "query_sort_criteria_attribute_" + i.to_s)%> <%= select_tag("query[sort_criteria][#{i}][]", options_for_select([[]] + query.available_columns.select(&:sortable?).collect {|column| [column.caption, column.name.to_s]}, @query.sort_criteria_key(i)), :id => "query_sort_criteria_attribute_" + i.to_s)%>
<%= label_tag "query_sort_criteria_direction_" + i.to_s, l(:description_query_sort_criteria_direction), :class => "hidden-for-sighted" %> <%= label_tag "query_sort_criteria_direction_" + i.to_s, l(:description_query_sort_criteria_direction), :class => "hidden-for-sighted" %>
......
config/locales/bg.yml
View file @ 8eb72a3c
...@@ -982,3 +982,4 @@ bg: ...@@ -982,3 +982,4 @@ bg:
description_filter: Filter description_filter: Filter
description_choose_project: Projects description_choose_project: Projects
description_date_from: Enter start date description_date_from: Enter start date
label_deleted_custom_field: (deleted custom field)
config/locales/bs.yml
View file @ 8eb72a3c
...@@ -996,3 +996,4 @@ bs: ...@@ -996,3 +996,4 @@ bs:
description_filter: Filter description_filter: Filter
description_choose_project: Projects description_choose_project: Projects
description_date_from: Enter start date description_date_from: Enter start date
label_deleted_custom_field: (deleted custom field)
config/locales/ca.yml
View file @ 8eb72a3c
...@@ -985,3 +985,4 @@ ca: ...@@ -985,3 +985,4 @@ ca:
description_filter: Filter description_filter: Filter
description_choose_project: Projects description_choose_project: Projects
description_date_from: Enter start date description_date_from: Enter start date
label_deleted_custom_field: (deleted custom field)
config/locales/cs.yml
View file @ 8eb72a3c
...@@ -1206,3 +1206,4 @@ cs: ...@@ -1206,3 +1206,4 @@ cs:
description_filter: Filter description_filter: Filter
description_choose_project: Projects description_choose_project: Projects
description_date_from: Enter start date description_date_from: Enter start date
label_deleted_custom_field: (deleted custom field)
config/locales/da.yml
View file @ 8eb72a3c
...@@ -998,3 +998,4 @@ da: ...@@ -998,3 +998,4 @@ da:
description_filter: Filter description_filter: Filter
description_choose_project: Projects description_choose_project: Projects
description_date_from: Enter start date description_date_from: Enter start date
label_deleted_custom_field: (deleted custom field)
config/locales/el.yml
View file @ 8eb72a3c
...@@ -982,3 +982,4 @@ el: ...@@ -982,3 +982,4 @@ el:
description_filter: Filter description_filter: Filter
description_choose_project: Projects description_choose_project: Projects
description_date_from: Enter start date description_date_from: Enter start date
label_deleted_custom_field: (deleted custom field)
config/locales/en-GB.yml
View file @ 8eb72a3c
...@@ -986,3 +986,4 @@ en-GB: ...@@ -986,3 +986,4 @@ en-GB:
description_filter: Filter description_filter: Filter
description_choose_project: Projects description_choose_project: Projects
description_date_from: Enter start date description_date_from: Enter start date
label_deleted_custom_field: (deleted custom field)
config/locales/es.yml
View file @ 8eb72a3c
...@@ -1019,3 +1019,4 @@ es: ...@@ -1019,3 +1019,4 @@ es:
description_filter: Filter description_filter: Filter
description_choose_project: Projects description_choose_project: Projects
description_date_from: Enter start date description_date_from: Enter start date
label_deleted_custom_field: (deleted custom field)
config/locales/eu.yml
View file @ 8eb72a3c
...@@ -986,3 +986,4 @@ eu: ...@@ -986,3 +986,4 @@ eu:
description_filter: Filter description_filter: Filter
description_choose_project: Projects description_choose_project: Projects
description_date_from: Enter start date description_date_from: Enter start date
label_deleted_custom_field: (deleted custom field)
config/locales/fa.yml
View file @ 8eb72a3c
...@@ -985,3 +985,4 @@ fa: ...@@ -985,3 +985,4 @@ fa:
description_filter: Filter description_filter: Filter
description_choose_project: Projects description_choose_project: Projects
description_date_from: Enter start date description_date_from: Enter start date
label_deleted_custom_field: (deleted custom field)
config/locales/fi.yml
View file @ 8eb72a3c
...@@ -1003,3 +1003,4 @@ fi: ...@@ -1003,3 +1003,4 @@ fi:
description_filter: Filter description_filter: Filter
description_choose_project: Projects description_choose_project: Projects
description_date_from: Enter start date description_date_from: Enter start date
label_deleted_custom_field: (deleted custom field)
config/locales/gl.yml
View file @ 8eb72a3c
...@@ -994,3 +994,4 @@ gl: ...@@ -994,3 +994,4 @@ gl:
description_filter: Filter description_filter: Filter
description_choose_project: Projects description_choose_project: Projects
description_date_from: Enter start date description_date_from: Enter start date
label_deleted_custom_field: (deleted custom field)
config/locales/he.yml
View file @ 8eb72a3c
...@@ -987,3 +987,4 @@ he: ...@@ -987,3 +987,4 @@ he:
description_filter: Filter description_filter: Filter
description_choose_project: Projects description_choose_project: Projects
description_date_from: Enter start date description_date_from: Enter start date
label_deleted_custom_field: (deleted custom field)
config/locales/hr.yml
View file @ 8eb72a3c
...@@ -989,3 +989,4 @@ hr: ...@@ -989,3 +989,4 @@ hr:
description_filter: Filter description_filter: Filter
description_choose_project: Projects description_choose_project: Projects
description_date_from: Enter start date description_date_from: Enter start date
label_deleted_custom_field: (deleted custom field)
config/locales/hu.yml
View file @ 8eb72a3c
...@@ -1001,3 +1001,4 @@ ...@@ -1001,3 +1001,4 @@
description_filter: Filter description_filter: Filter
description_choose_project: Projects description_choose_project: Projects
description_date_from: Enter start date description_date_from: Enter start date
label_deleted_custom_field: (deleted custom field)
config/locales/id.yml
View file @ 8eb72a3c
...@@ -990,3 +990,4 @@ id: ...@@ -990,3 +990,4 @@ id:
description_filter: Filter description_filter: Filter
description_choose_project: Projects description_choose_project: Projects
description_date_from: Enter start date description_date_from: Enter start date
label_deleted_custom_field: (deleted custom field)
config/locales/it.yml
View file @ 8eb72a3c
...@@ -983,3 +983,4 @@ it: ...@@ -983,3 +983,4 @@ it:
description_filter: Filter description_filter: Filter
description_choose_project: Projects description_choose_project: Projects
description_date_from: Enter start date description_date_from: Enter start date
label_deleted_custom_field: (deleted custom field)
config/locales/ja.yml
View file @ 8eb72a3c
...@@ -1004,3 +1004,4 @@ ja: ...@@ -1004,3 +1004,4 @@ ja:
description_filter: Filter description_filter: Filter
description_choose_project: Projects description_choose_project: Projects
description_date_from: Enter start date description_date_from: Enter start date
label_deleted_custom_field: (deleted custom field)
config/locales/ko.yml
View file @ 8eb72a3c
...@@ -1034,3 +1034,4 @@ ko: ...@@ -1034,3 +1034,4 @@ ko:
description_filter: Filter description_filter: Filter
description_choose_project: Projects description_choose_project: Projects
description_date_from: Enter start date description_date_from: Enter start date
label_deleted_custom_field: (deleted custom field)
config/locales/lt.yml
View file @ 8eb72a3c
...@@ -1042,3 +1042,4 @@ lt: ...@@ -1042,3 +1042,4 @@ lt:
description_filter: Filter description_filter: Filter
description_choose_project: Projects description_choose_project: Projects
description_date_from: Enter start date description_date_from: Enter start date
label_deleted_custom_field: (deleted custom field)
config/locales/lv.yml
View file @ 8eb72a3c
...@@ -977,3 +977,4 @@ lv: ...@@ -977,3 +977,4 @@ lv:
description_filter: Filter description_filter: Filter
description_choose_project: Projects description_choose_project: Projects
description_date_from: Enter start date description_date_from: Enter start date
label_deleted_custom_field: (deleted custom field)
config/locales/mk.yml
View file @ 8eb72a3c
...@@ -982,3 +982,4 @@ mk: ...@@ -982,3 +982,4 @@ mk:
description_filter: Filter description_filter: Filter
description_choose_project: Projects description_choose_project: Projects
description_date_from: Enter start date description_date_from: Enter start date
label_deleted_custom_field: (deleted custom field)
config/locales/mn.yml
View file @ 8eb72a3c
...@@ -983,3 +983,4 @@ mn: ...@@ -983,3 +983,4 @@ mn:
description_filter: Filter description_filter: Filter
description_choose_project: Projects description_choose_project: Projects
description_date_from: Enter start date description_date_from: Enter start date
label_deleted_custom_field: (deleted custom field)
config/locales/nl.yml
View file @ 8eb72a3c
...@@ -964,3 +964,4 @@ nl: ...@@ -964,3 +964,4 @@ nl:
description_filter: Filter description_filter: Filter
description_choose_project: Projects description_choose_project: Projects
description_date_from: Enter start date description_date_from: Enter start date
label_deleted_custom_field: (deleted custom field)
config/locales/no.yml
View file @ 8eb72a3c
...@@ -969,3 +969,4 @@ ...@@ -969,3 +969,4 @@
description_filter: Filter description_filter: Filter
description_choose_project: Projects description_choose_project: Projects
description_date_from: Enter start date description_date_from: Enter start date
label_deleted_custom_field: (deleted custom field)
config/locales/pl.yml
View file @ 8eb72a3c
...@@ -999,3 +999,4 @@ pl: ...@@ -999,3 +999,4 @@ pl:
description_filter: Filter description_filter: Filter
description_choose_project: Projects description_choose_project: Projects
description_date_from: Enter start date description_date_from: Enter start date
label_deleted_custom_field: (deleted custom field)
config/locales/pt-BR.yml
View file @ 8eb72a3c
...@@ -1006,3 +1006,4 @@ pt-BR: ...@@ -1006,3 +1006,4 @@ pt-BR:
description_filter: Filter description_filter: Filter
description_choose_project: Projects description_choose_project: Projects
description_date_from: Enter start date description_date_from: Enter start date
label_deleted_custom_field: (deleted custom field)
config/locales/pt.yml
View file @ 8eb72a3c
...@@ -986,3 +986,4 @@ pt: ...@@ -986,3 +986,4 @@ pt:
description_filter: Filter description_filter: Filter
description_choose_project: Projects description_choose_project: Projects
description_date_from: Enter start date description_date_from: Enter start date
label_deleted_custom_field: (deleted custom field)
config/locales/ro.yml
View file @ 8eb72a3c
...@@ -975,3 +975,4 @@ ro: ...@@ -975,3 +975,4 @@ ro:
description_filter: Filter description_filter: Filter
description_choose_project: Projects description_choose_project: Projects
description_date_from: Enter start date description_date_from: Enter start date
label_deleted_custom_field: (deleted custom field)
config/locales/ru.yml
View file @ 8eb72a3c
...@@ -1095,3 +1095,4 @@ ru: ...@@ -1095,3 +1095,4 @@ ru:
description_filter: Filter description_filter: Filter
description_choose_project: Projects description_choose_project: Projects
description_date_from: Enter start date description_date_from: Enter start date
label_deleted_custom_field: (deleted custom field)
config/locales/sk.yml
View file @ 8eb72a3c
...@@ -977,3 +977,4 @@ sk: ...@@ -977,3 +977,4 @@ sk:
description_filter: Filter description_filter: Filter
description_choose_project: Projects description_choose_project: Projects
description_date_from: Enter start date description_date_from: Enter start date
label_deleted_custom_field: (deleted custom field)
config/locales/sl.yml
View file @ 8eb72a3c
...@@ -978,3 +978,4 @@ sl: ...@@ -978,3 +978,4 @@ sl:
description_filter: Filter description_filter: Filter
description_choose_project: Projects description_choose_project: Projects
description_date_from: Enter start date description_date_from: Enter start date
label_deleted_custom_field: (deleted custom field)
config/locales/sr-YU.yml
View file @ 8eb72a3c
...@@ -982,3 +982,4 @@ sr-YU: ...@@ -982,3 +982,4 @@ sr-YU:
description_filter: Filter description_filter: Filter
description_choose_project: Projects description_choose_project: Projects
description_date_from: Enter start date description_date_from: Enter start date
label_deleted_custom_field: (deleted custom field)
config/locales/sr.yml
View file @ 8eb72a3c
...@@ -983,3 +983,4 @@ sr: ...@@ -983,3 +983,4 @@ sr:
description_filter: Filter description_filter: Filter
description_choose_project: Projects description_choose_project: Projects
description_date_from: Enter start date description_date_from: Enter start date
label_deleted_custom_field: (deleted custom field)
config/locales/sv.yml
View file @ 8eb72a3c
...@@ -1024,3 +1024,4 @@ sv: ...@@ -1024,3 +1024,4 @@ sv:
description_filter: Filter description_filter: Filter
description_choose_project: Projects description_choose_project: Projects
description_date_from: Enter start date description_date_from: Enter start date
label_deleted_custom_field: (deleted custom field)
config/locales/th.yml
View file @ 8eb72a3c
...@@ -979,3 +979,4 @@ th: ...@@ -979,3 +979,4 @@ th:
description_filter: Filter description_filter: Filter
description_choose_project: Projects description_choose_project: Projects
description_date_from: Enter start date description_date_from: Enter start date
label_deleted_custom_field: (deleted custom field)
config/locales/tr.yml
View file @ 8eb72a3c
...@@ -1001,3 +1001,4 @@ tr: ...@@ -1001,3 +1001,4 @@ tr:
description_filter: Filter description_filter: Filter
description_choose_project: Projects description_choose_project: Projects
description_date_from: Enter start date description_date_from: Enter start date
label_deleted_custom_field: (deleted custom field)
config/locales/uk.yml
View file @ 8eb72a3c
...@@ -978,3 +978,4 @@ uk: ...@@ -978,3 +978,4 @@ uk:
description_filter: Filter description_filter: Filter
description_choose_project: Projects description_choose_project: Projects
description_date_from: Enter start date description_date_from: Enter start date
label_deleted_custom_field: (deleted custom field)
config/locales/vi.yml
View file @ 8eb72a3c
...@@ -1033,3 +1033,4 @@ vi: ...@@ -1033,3 +1033,4 @@ vi:
description_filter: Filter description_filter: Filter
description_choose_project: Projects description_choose_project: Projects
description_date_from: Enter start date description_date_from: Enter start date
label_deleted_custom_field: (deleted custom field)
config/locales/zh-TW.yml
View file @ 8eb72a3c
...@@ -1064,3 +1064,4 @@ ...@@ -1064,3 +1064,4 @@
description_filter: Filter description_filter: Filter
description_choose_project: Projects description_choose_project: Projects
description_date_from: Enter start date description_date_from: Enter start date
label_deleted_custom_field: (deleted custom field)
config/locales/zh.yml
View file @ 8eb72a3c
...@@ -996,3 +996,4 @@ zh: ...@@ -996,3 +996,4 @@ zh:
description_filter: Filter description_filter: Filter
description_choose_project: Projects description_choose_project: Projects
description_date_from: Enter start date description_date_from: Enter start date
label_deleted_custom_field: (deleted custom field)
doc/CHANGELOG.rdoc
View file @ 8eb72a3c
This diff is collapsed.
lib/chili_project/version.rb
View file @ 8eb72a3c
...@@ -18,7 +18,7 @@ module ChiliProject ...@@ -18,7 +18,7 @@ module ChiliProject
module VERSION #:nodoc: module VERSION #:nodoc:
MAJOR = 2 MAJOR = 2
MINOR = 3 MINOR = 4
PATCH = 0 PATCH = 0
TINY = PATCH # Redmine compat TINY = PATCH # Redmine compat
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment