From 387d4820590cb4a97e93cfdaaed302663baa0b7f Mon Sep 17 00:00:00 2001
From: linhk <304431313@.com>
Date: Thu, 7 Aug 2014 15:58:00 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E6=B3=A8=E5=86=8C=E6=97=A0=E5=9C=B0=E5=8C=BA=E3=80=81=E8=BA=AB?=
 =?UTF-8?q?=E4=BB=BD=E5=8F=AF=E6=B3=A8=E5=86=8C=E6=88=90=E5=8A=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/account_controller.rb | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/app/controllers/account_controller.rb b/app/controllers/account_controller.rb
index c05d1172c..c1b38fa39 100644
--- a/app/controllers/account_controller.rb
+++ b/app/controllers/account_controller.rb
@@ -140,6 +140,15 @@ class AccountController < ApplicationController
           @user.password, @user.password_confirmation = user_params[:password], user_params[:password_confirmation]
         end
 
+        if(@cache_identityy == "")
+          flash.now[:error]= l(:label_identity)+l(:'activerecord.errors.messages.empty')
+          return
+        end
+        if(@cache_city == "")
+          flash.now[:error]= l(:label_location)+l(:'activerecord.errors.messages.empty')
+          return
+        end
+
         case Setting.self_registration
         when '1'
           register_by_email_activation(@user)

From af683f917dd11b87fe5ba5c43d2d78bf40ca150a Mon Sep 17 00:00:00 2001
From: linhk <304431313@.com>
Date: Thu, 7 Aug 2014 16:09:50 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=96=B0=E5=BB=BA?=
 =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=BA=93=E5=90=8D=E9=9D=9E=E6=B3=95=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E6=88=90=E5=8A=9F=E6=96=B0=E5=BB=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/repository.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/repository.rb b/app/models/repository.rb
index 57a818270..c2736dd30 100644
--- a/app/models/repository.rb
+++ b/app/models/repository.rb
@@ -42,7 +42,7 @@ class Repository < ActiveRecord::Base
   validates_uniqueness_of :identifier, :scope => :project_id, :allow_blank => true
   validates_exclusion_of :identifier, :in => %w(show entry raw changes annotate diff show stats graph)
   # donwcase letters, digits, dashes, underscores but not digits only
-  validates_format_of :identifier, :with => /^[a-zA-Z0-9_\-]+$/, :allow_blank => true
+  validates_format_of :identifier, :with => /^[a-z0-9_\-]+$/, :allow_blank => true
   # Checks if the SCM is enabled when creating a repository
   validate :repo_create_validation, :on => :create
 

From d087c5231462359ddc12828f83a060db6a627e5f Mon Sep 17 00:00:00 2001
From: chenmin <19763783@qq.com>
Date: Thu, 7 Aug 2014 16:20:46 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E5=8A=A8=E6=80=81?=
 =?UTF-8?q?=E4=B8=BA=E7=A9=BA=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/courses/show.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/courses/show.html.erb b/app/views/courses/show.html.erb
index deb590d1f..d7d579dd1 100644
--- a/app/views/courses/show.html.erb
+++ b/app/views/courses/show.html.erb
@@ -1,4 +1,4 @@
-<% if @events_by_day.size >0 %>
+<% if @events_by_day != nil && @events_by_day.size >0 %>
     <div class="content-title-top-avtive">
       <!-- <h3><%= @author.nil? ? l(:label_activity) : l(:label_user_activity, link_to_user(@author)).html_safe %></h3> -->
       <p class="subtitle">