From: skyblue <ssx205@gmail.com>
Date: Sun, 23 Mar 2014 14:40:35 +0000 (+0800)
Subject: merge with branch master
X-Git-Tag: v0.9.99~2367^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=4bac3616055110da6f060e98174bc2381ef91286;p=gitea.git

merge with branch master
---

4bac3616055110da6f060e98174bc2381ef91286
diff --cc web.go
index 637ee7ce95,9d90851c96..d055c3940e
--- a/web.go
+++ b/web.go
@@@ -96,18 -91,28 +92,31 @@@ func runWeb(*cli.Context) 
  	m.Get("/issues", reqSignIn, user.Issues)
  	m.Get("/pulls", reqSignIn, user.Pulls)
  	m.Get("/stars", reqSignIn, user.Stars)
- 	m.Any("/user/login", reqSignOut, binding.BindIgnErr(auth.LogInForm{}), user.SignIn)
- 	m.Any("/user/logout", reqSignIn, user.SignOut)
- 	m.Any("/user/sign_up", reqSignOut, binding.BindIgnErr(auth.RegisterForm{}), user.SignUp)
- 	m.Any("/user/delete", reqSignIn, user.Delete)
- 	m.Get("/user/feeds", binding.Bind(auth.FeedsForm{}), user.Feeds)
- 	m.Get("/user/activate", user.Activate)
- 
- 	m.Any("/user/setting", reqSignIn, binding.BindIgnErr(auth.UpdateProfileForm{}), user.Setting)
- 	m.Any("/user/setting/password", reqSignIn, binding.BindIgnErr(auth.UpdatePasswdForm{}), user.SettingPassword)
- 	m.Any("/user/setting/ssh", reqSignIn, binding.BindIgnErr(auth.AddSSHKeyForm{}), user.SettingSSHKeys)
- 	m.Any("/user/setting/notification", reqSignIn, user.SettingNotification)
- 	m.Any("/user/setting/security", reqSignIn, user.SettingSecurity)
+ 	m.Get("/help", routers.Help)
+ 
++	avatarCache := avatar.HttpHandler("public/img/avatar/", "public/img/avatar/default.jpg")
++	m.Get("/avatar/:hash", avatarCache.ServeHTTP)
++
+ 	m.Group("/user", func(r martini.Router) {
+ 		r.Any("/login", binding.BindIgnErr(auth.LogInForm{}), user.SignIn)
+ 		r.Any("/sign_up", binding.BindIgnErr(auth.RegisterForm{}), user.SignUp)
+ 	}, reqSignOut)
+ 	m.Group("/user", func(r martini.Router) {
+ 		r.Any("/logout", user.SignOut)
+ 		r.Any("/delete", user.Delete)
+ 		r.Any("/setting", binding.BindIgnErr(auth.UpdateProfileForm{}), user.Setting)
+ 	}, reqSignIn)
+ 	m.Group("/user", func(r martini.Router) {
+ 		r.Get("/feeds", binding.Bind(auth.FeedsForm{}), user.Feeds)
+ 		r.Get("/activate", user.Activate)
+ 	})
+ 
+ 	m.Group("/user/setting", func(r martini.Router) {
+ 		r.Any("/password", binding.BindIgnErr(auth.UpdatePasswdForm{}), user.SettingPassword)
+ 		r.Any("/ssh", binding.BindIgnErr(auth.AddSSHKeyForm{}), user.SettingSSHKeys)
+ 		r.Any("/notification", user.SettingNotification)
+ 		r.Any("/security", user.SettingSecurity)
+ 	}, reqSignIn)
  
  	m.Get("/user/:username", ignSignIn, user.Profile)