Merge branch 'release-v2.4.0'

13 years ago · 8eb72a3c74
parent cb2086f652 9e9b6e786e
commit 8eb72a3c74
45 changed files with 211262 additions and 7 deletions
--- a/10
+++ b/10
@ -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
--- a/app/views/queries/_form.rhtml
+++ b/app/views/queries/_form.rhtml
@ -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" %>
--- a/config/locales/bg.yml
+++ b/config/locales/bg.yml
@ -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)
--- a/config/locales/bs.yml
+++ b/config/locales/bs.yml
@ -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)
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@ -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)
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@ -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)
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@ -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)
--- a/config/locales/el.yml
+++ b/config/locales/el.yml
@ -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)
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@ -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)
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@ -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)
--- a/config/locales/eu.yml
+++ b/config/locales/eu.yml
@ -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)
--- a/config/locales/fa.yml
+++ b/config/locales/fa.yml
@ -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)
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@ -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)
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@ -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)
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@ -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)
--- a/config/locales/hr.yml
+++ b/config/locales/hr.yml
@ -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)
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@ -1001,3 +1001,4 @@
  description_filter: Filter
  description_choose_project: Projects
  description_date_from: Enter start date
+  label_deleted_custom_field: (deleted custom field)
--- a/config/locales/id.yml
+++ b/config/locales/id.yml
@ -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)
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@ -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)
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@ -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)
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@ -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)
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@ -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)
--- a/config/locales/lv.yml
+++ b/config/locales/lv.yml
@ -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)
--- a/config/locales/mk.yml
+++ b/config/locales/mk.yml
@ -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)
--- a/config/locales/mn.yml
+++ b/config/locales/mn.yml
@ -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)
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@ -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)
--- a/config/locales/no.yml
+++ b/config/locales/no.yml
@ -969,3 +969,4 @@
  description_filter: Filter
  description_choose_project: Projects
  description_date_from: Enter start date
+  label_deleted_custom_field: (deleted custom field)
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@ -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)
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@ -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)
--- a/config/locales/pt.yml
+++ b/config/locales/pt.yml
@ -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)
--- a/config/locales/ro.yml
+++ b/config/locales/ro.yml
@ -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)
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@ -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)
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@ -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)
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@ -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)
--- a/config/locales/sr-YU.yml
+++ b/config/locales/sr-YU.yml
@ -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)
--- a/config/locales/sr.yml
+++ b/config/locales/sr.yml
@ -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)
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@ -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)
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@ -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)
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@ -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)
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@ -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)
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@ -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)
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@ -1064,3 +1064,4 @@
  description_filter: Filter
  description_choose_project: Projects
  description_date_from: Enter start date
+  label_deleted_custom_field: (deleted custom field)
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@ -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)
--- a/doc/CHANGELOG.rdoc
+++ b/doc/CHANGELOG.rdoc
--- a/lib/chili_project/version.rb
+++ b/lib/chili_project/version.rb
@ -18,7 +18,7 @@ module ChiliProject
  module VERSION #:nodoc:

    MAJOR = 2
-    MINOR = 3
+    MINOR = 4
    PATCH = 0
    TINY  = PATCH # Redmine compat