From 86b03542c8139ca5d11be2a2f97053e5ea06e5c6 Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Wed, 28 Sep 2016 10:04:20 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E9=87=8C=E7=A8=8B=E7=A2=91=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC=E7=82=B9=E5=87=BB=E7=A9=BA=E7=99=BD=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/versions/index.html.erb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/versions/index.html.erb b/app/views/versions/index.html.erb
index 6b42dc3d8..3a3740a23 100644
--- a/app/views/versions/index.html.erb
+++ b/app/views/versions/index.html.erb
@@ -25,8 +25,8 @@
       <% @versions.each do |version| %>
 
           <div class="roadmap_box" style="width:710px;">
-            <p><a href="javascript:void(0)" class=" f16 fb c_dblue " target="_blank">
-              <a href="javascript:void(0)" class=" f16 fb c_dblue " target="_blank"><%= version_anchor(version)%></a>
+            <p><a class=" f16 fb c_dblue ">
+              <a class=" f16 fb c_dblue " ><%= version_anchor(version)%></a>
               <%#= link_to_version_show version, :name => version_anchor(version) %>
               <% if version.completed? %>
                   <span style="color: #E8770D;float:right;"><%= format_date(version.effective_date) %></span>

From b22b444a7ba8b61e8b2a43bad2053767e07a5e38 Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Wed, 28 Sep 2016 10:58:31 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9issue=E5=BC=80=E5=A7=8B?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E4=B8=8E=E7=BB=93=E6=9D=9F=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E5=88=A4=E6=96=AD=EF=BC=8C=E5=B9=B6=E5=B0=86=E5=AF=BC=E5=87=BA?=
 =?UTF-8?q?excel=E7=9A=84=E4=BD=9C=E8=80=85=E6=94=B9=E4=B8=BA=E5=8F=91?=
 =?UTF-8?q?=E5=B8=83=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/issues/index.html.erb | 5 ++++-
 config/locales/projects/zh.yml  | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/app/views/issues/index.html.erb b/app/views/issues/index.html.erb
index d1bde712e..ac42dfff8 100644
--- a/app/views/issues/index.html.erb
+++ b/app/views/issues/index.html.erb
@@ -27,7 +27,10 @@
 
     });
     function remote_function() {
-        $("#issue_query_form").submit();
+        if($.trim($("#issue_create_date_end_show").val()) !="" && Date.parse($.trim($("#issue_create_date_end_show").val())) < Date.parse($.trim($("#issue_create_date_start_show").val()))){
+            alert("开始日期不能大于结束日期！");
+        }
+            $("#issue_query_form").submit();
 //        $.ajax({
 //            url:'<%#= project_issues_path(@project)%>',
 //            data:{
diff --git a/config/locales/projects/zh.yml b/config/locales/projects/zh.yml
index 98e13a865..8944fad0c 100644
--- a/config/locales/projects/zh.yml
+++ b/config/locales/projects/zh.yml
@@ -209,7 +209,7 @@ zh:
   issue_xls_description: 描述
   issue_xls_created_at: 创建时间
   issue_xls_tracker_id: 类型
-  issue_xls_author: 作者
+  issue_xls_author: 发布人
   issue_xls_assign: 指派给
   issue_xls_status: 状态
   issue_xls_priority: 优先级