Merge branch 'release-v2.4.0'
This commit is contained in:
commit
8eb72a3c74
10
Gemfile
10
Gemfile
|
@ -47,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
|
||||
|
@ -63,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
|
||||
|
|
|
@ -30,7 +30,7 @@
|
|||
|
||||
<fieldset><legend><%= l(:label_sort) %></legend>
|
||||
<% 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" %>
|
||||
<%= 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" %>
|
||||
|
|
|
@ -982,3 +982,4 @@ bg:
|
|||
description_filter: Filter
|
||||
description_choose_project: Projects
|
||||
description_date_from: Enter start date
|
||||
label_deleted_custom_field: (deleted custom field)
|
||||
|
|
|
@ -996,3 +996,4 @@ bs:
|
|||
description_filter: Filter
|
||||
description_choose_project: Projects
|
||||
description_date_from: Enter start date
|
||||
label_deleted_custom_field: (deleted custom field)
|
||||
|
|
|
@ -985,3 +985,4 @@ ca:
|
|||
description_filter: Filter
|
||||
description_choose_project: Projects
|
||||
description_date_from: Enter start date
|
||||
label_deleted_custom_field: (deleted custom field)
|
||||
|
|
|
@ -1206,3 +1206,4 @@ cs:
|
|||
description_filter: Filter
|
||||
description_choose_project: Projects
|
||||
description_date_from: Enter start date
|
||||
label_deleted_custom_field: (deleted custom field)
|
||||
|
|
|
@ -998,3 +998,4 @@ da:
|
|||
description_filter: Filter
|
||||
description_choose_project: Projects
|
||||
description_date_from: Enter start date
|
||||
label_deleted_custom_field: (deleted custom field)
|
||||
|
|
|
@ -982,3 +982,4 @@ el:
|
|||
description_filter: Filter
|
||||
description_choose_project: Projects
|
||||
description_date_from: Enter start date
|
||||
label_deleted_custom_field: (deleted custom field)
|
||||
|
|
|
@ -986,3 +986,4 @@ en-GB:
|
|||
description_filter: Filter
|
||||
description_choose_project: Projects
|
||||
description_date_from: Enter start date
|
||||
label_deleted_custom_field: (deleted custom field)
|
||||
|
|
|
@ -1019,3 +1019,4 @@ es:
|
|||
description_filter: Filter
|
||||
description_choose_project: Projects
|
||||
description_date_from: Enter start date
|
||||
label_deleted_custom_field: (deleted custom field)
|
||||
|
|
|
@ -986,3 +986,4 @@ eu:
|
|||
description_filter: Filter
|
||||
description_choose_project: Projects
|
||||
description_date_from: Enter start date
|
||||
label_deleted_custom_field: (deleted custom field)
|
||||
|
|
|
@ -985,3 +985,4 @@ fa:
|
|||
description_filter: Filter
|
||||
description_choose_project: Projects
|
||||
description_date_from: Enter start date
|
||||
label_deleted_custom_field: (deleted custom field)
|
||||
|
|
|
@ -1003,3 +1003,4 @@ fi:
|
|||
description_filter: Filter
|
||||
description_choose_project: Projects
|
||||
description_date_from: Enter start date
|
||||
label_deleted_custom_field: (deleted custom field)
|
||||
|
|
|
@ -994,3 +994,4 @@ gl:
|
|||
description_filter: Filter
|
||||
description_choose_project: Projects
|
||||
description_date_from: Enter start date
|
||||
label_deleted_custom_field: (deleted custom field)
|
||||
|
|
|
@ -987,3 +987,4 @@ he:
|
|||
description_filter: Filter
|
||||
description_choose_project: Projects
|
||||
description_date_from: Enter start date
|
||||
label_deleted_custom_field: (deleted custom field)
|
||||
|
|
|
@ -989,3 +989,4 @@ hr:
|
|||
description_filter: Filter
|
||||
description_choose_project: Projects
|
||||
description_date_from: Enter start date
|
||||
label_deleted_custom_field: (deleted custom field)
|
||||
|
|
|
@ -1001,3 +1001,4 @@
|
|||
description_filter: Filter
|
||||
description_choose_project: Projects
|
||||
description_date_from: Enter start date
|
||||
label_deleted_custom_field: (deleted custom field)
|
||||
|
|
|
@ -990,3 +990,4 @@ id:
|
|||
description_filter: Filter
|
||||
description_choose_project: Projects
|
||||
description_date_from: Enter start date
|
||||
label_deleted_custom_field: (deleted custom field)
|
||||
|
|
|
@ -983,3 +983,4 @@ it:
|
|||
description_filter: Filter
|
||||
description_choose_project: Projects
|
||||
description_date_from: Enter start date
|
||||
label_deleted_custom_field: (deleted custom field)
|
||||
|
|
|
@ -1004,3 +1004,4 @@ ja:
|
|||
description_filter: Filter
|
||||
description_choose_project: Projects
|
||||
description_date_from: Enter start date
|
||||
label_deleted_custom_field: (deleted custom field)
|
||||
|
|
|
@ -1034,3 +1034,4 @@ ko:
|
|||
description_filter: Filter
|
||||
description_choose_project: Projects
|
||||
description_date_from: Enter start date
|
||||
label_deleted_custom_field: (deleted custom field)
|
||||
|
|
|
@ -1042,3 +1042,4 @@ lt:
|
|||
description_filter: Filter
|
||||
description_choose_project: Projects
|
||||
description_date_from: Enter start date
|
||||
label_deleted_custom_field: (deleted custom field)
|
||||
|
|
|
@ -977,3 +977,4 @@ lv:
|
|||
description_filter: Filter
|
||||
description_choose_project: Projects
|
||||
description_date_from: Enter start date
|
||||
label_deleted_custom_field: (deleted custom field)
|
||||
|
|
|
@ -982,3 +982,4 @@ mk:
|
|||
description_filter: Filter
|
||||
description_choose_project: Projects
|
||||
description_date_from: Enter start date
|
||||
label_deleted_custom_field: (deleted custom field)
|
||||
|
|
|
@ -983,3 +983,4 @@ mn:
|
|||
description_filter: Filter
|
||||
description_choose_project: Projects
|
||||
description_date_from: Enter start date
|
||||
label_deleted_custom_field: (deleted custom field)
|
||||
|
|
|
@ -964,3 +964,4 @@ nl:
|
|||
description_filter: Filter
|
||||
description_choose_project: Projects
|
||||
description_date_from: Enter start date
|
||||
label_deleted_custom_field: (deleted custom field)
|
||||
|
|
|
@ -969,3 +969,4 @@
|
|||
description_filter: Filter
|
||||
description_choose_project: Projects
|
||||
description_date_from: Enter start date
|
||||
label_deleted_custom_field: (deleted custom field)
|
||||
|
|
|
@ -999,3 +999,4 @@ pl:
|
|||
description_filter: Filter
|
||||
description_choose_project: Projects
|
||||
description_date_from: Enter start date
|
||||
label_deleted_custom_field: (deleted custom field)
|
||||
|
|
|
@ -1006,3 +1006,4 @@ pt-BR:
|
|||
description_filter: Filter
|
||||
description_choose_project: Projects
|
||||
description_date_from: Enter start date
|
||||
label_deleted_custom_field: (deleted custom field)
|
||||
|
|
|
@ -986,3 +986,4 @@ pt:
|
|||
description_filter: Filter
|
||||
description_choose_project: Projects
|
||||
description_date_from: Enter start date
|
||||
label_deleted_custom_field: (deleted custom field)
|
||||
|
|
|
@ -975,3 +975,4 @@ ro:
|
|||
description_filter: Filter
|
||||
description_choose_project: Projects
|
||||
description_date_from: Enter start date
|
||||
label_deleted_custom_field: (deleted custom field)
|
||||
|
|
|
@ -1095,3 +1095,4 @@ ru:
|
|||
description_filter: Filter
|
||||
description_choose_project: Projects
|
||||
description_date_from: Enter start date
|
||||
label_deleted_custom_field: (deleted custom field)
|
||||
|
|
|
@ -977,3 +977,4 @@ sk:
|
|||
description_filter: Filter
|
||||
description_choose_project: Projects
|
||||
description_date_from: Enter start date
|
||||
label_deleted_custom_field: (deleted custom field)
|
||||
|
|
|
@ -978,3 +978,4 @@ sl:
|
|||
description_filter: Filter
|
||||
description_choose_project: Projects
|
||||
description_date_from: Enter start date
|
||||
label_deleted_custom_field: (deleted custom field)
|
||||
|
|
|
@ -982,3 +982,4 @@ sr-YU:
|
|||
description_filter: Filter
|
||||
description_choose_project: Projects
|
||||
description_date_from: Enter start date
|
||||
label_deleted_custom_field: (deleted custom field)
|
||||
|
|
|
@ -983,3 +983,4 @@ sr:
|
|||
description_filter: Filter
|
||||
description_choose_project: Projects
|
||||
description_date_from: Enter start date
|
||||
label_deleted_custom_field: (deleted custom field)
|
||||
|
|
|
@ -1024,3 +1024,4 @@ sv:
|
|||
description_filter: Filter
|
||||
description_choose_project: Projects
|
||||
description_date_from: Enter start date
|
||||
label_deleted_custom_field: (deleted custom field)
|
||||
|
|
|
@ -979,3 +979,4 @@ th:
|
|||
description_filter: Filter
|
||||
description_choose_project: Projects
|
||||
description_date_from: Enter start date
|
||||
label_deleted_custom_field: (deleted custom field)
|
||||
|
|
|
@ -1001,3 +1001,4 @@ tr:
|
|||
description_filter: Filter
|
||||
description_choose_project: Projects
|
||||
description_date_from: Enter start date
|
||||
label_deleted_custom_field: (deleted custom field)
|
||||
|
|
|
@ -978,3 +978,4 @@ uk:
|
|||
description_filter: Filter
|
||||
description_choose_project: Projects
|
||||
description_date_from: Enter start date
|
||||
label_deleted_custom_field: (deleted custom field)
|
||||
|
|
|
@ -1033,3 +1033,4 @@ vi:
|
|||
description_filter: Filter
|
||||
description_choose_project: Projects
|
||||
description_date_from: Enter start date
|
||||
label_deleted_custom_field: (deleted custom field)
|
||||
|
|
|
@ -1064,3 +1064,4 @@
|
|||
description_filter: Filter
|
||||
description_choose_project: Projects
|
||||
description_date_from: Enter start date
|
||||
label_deleted_custom_field: (deleted custom field)
|
||||
|
|
|
@ -996,3 +996,4 @@ zh:
|
|||
description_filter: Filter
|
||||
description_choose_project: Projects
|
||||
description_date_from: Enter start date
|
||||
label_deleted_custom_field: (deleted custom field)
|
||||
|
|
211214
doc/CHANGELOG.rdoc
211214
doc/CHANGELOG.rdoc
File diff suppressed because it is too large
Load Diff
|
@ -18,7 +18,7 @@ module ChiliProject
|
|||
module VERSION #:nodoc:
|
||||
|
||||
MAJOR = 2
|
||||
MINOR = 3
|
||||
MINOR = 4
|
||||
PATCH = 0
|
||||
TINY = PATCH # Redmine compat
|
||||
|
||||
|
|
Loading…
Reference in New Issue