From 81e6173356f94360217822b8104e6d3afac628b0 Mon Sep 17 00:00:00 2001
From: Don Bowman <don.waterloo@gmail.com>
Date: Wed, 8 Apr 2015 22:25:47 +0000
Subject: remove blackfriday.EXTENSION_HARD_LINE_BREAK from options.

---
 modules/base/markdown.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'modules')

diff --git a/modules/base/markdown.go b/modules/base/markdown.go
index d06e1338..e860f970 100644
--- a/modules/base/markdown.go
+++ b/modules/base/markdown.go
@@ -198,7 +198,7 @@ func RenderRawMarkdown(body []byte, urlPrefix string) []byte {
 	extensions |= blackfriday.EXTENSION_FENCED_CODE
 	extensions |= blackfriday.EXTENSION_AUTOLINK
 	extensions |= blackfriday.EXTENSION_STRIKETHROUGH
-	extensions |= blackfriday.EXTENSION_HARD_LINE_BREAK
+	//extensions |= blackfriday.EXTENSION_HARD_LINE_BREAK
 	extensions |= blackfriday.EXTENSION_SPACE_HEADERS
 	extensions |= blackfriday.EXTENSION_NO_EMPTY_LINE_BEFORE_BLOCK
 
-- 
cgit v1.2.3


From f3aab5dbe30f8e6a1032b524315f7fd37c3e0b24 Mon Sep 17 00:00:00 2001
From: James <james@jamesanderson.me>
Date: Tue, 28 Apr 2015 11:59:05 -0400
Subject: Add full name field to admin's user edit page (fixes #1130)

---
 modules/auth/admin.go          | 1 +
 routers/admin/users.go         | 1 +
 templates/admin/user/edit.tmpl | 4 ++++
 3 files changed, 6 insertions(+)

(limited to 'modules')

diff --git a/modules/auth/admin.go b/modules/auth/admin.go
index e6cc82cd..a95b83de 100644
--- a/modules/auth/admin.go
+++ b/modules/auth/admin.go
@@ -11,6 +11,7 @@ import (
 )
 
 type AdminEditUserForm struct {
+	FullName     string `form:"fullname" binding:"MaxSize(100)"`
 	Email        string `binding:"Required;Email;MaxSize(50)"`
 	Password     string `binding:"OmitEmpty;MinSize(6);MaxSize(255)"`
 	Website      string `binding:"MaxSize(50)"`
diff --git a/routers/admin/users.go b/routers/admin/users.go
index ddcca639..12c52236 100644
--- a/routers/admin/users.go
+++ b/routers/admin/users.go
@@ -185,6 +185,7 @@ func EditUserPost(ctx *middleware.Context, form auth.AdminEditUserForm) {
 		u.EncodePasswd()
 	}
 
+	u.FullName = form.FullName
 	u.Email = form.Email
 	u.Website = form.Website
 	u.Location = form.Location
diff --git a/templates/admin/user/edit.tmpl b/templates/admin/user/edit.tmpl
index bdc0e334..4f4cc727 100644
--- a/templates/admin/user/edit.tmpl
+++ b/templates/admin/user/edit.tmpl
@@ -32,6 +32,10 @@
                                     <label>{{.i18n.Tr "username"}}</label>
                                     <label class="text-left">{{.User.Name}}</label>
                                 </div>
+                                <div class="field">
+                                    <label for="full-name">{{.i18n.Tr "settings.full_name"}}</label>
+                                    <input class="ipt ipt-large ipt-radius {{if .Err_FullName}}ipt-error{{end}}" id="full-name" name="fullname" type="text" value="{{.User.FullName}}" />
+                                </div>
                                 <div class="field">
                                     <label class="req" for="email">{{.i18n.Tr "email"}}</label>
                                     <input class="ipt ipt-large ipt-radius {{if .Err_Email}}ipt-error{{end}}" id="email" name="email" type="email" value="{{.User.Email}}" required/>
-- 
cgit v1.2.3


From b36134194cf8304ba553c2623447ea60586cd5e2 Mon Sep 17 00:00:00 2001
From: Christian Dietrich <christian.dietrich@informatik.uni-erlangen.de>
Date: Wed, 3 Jun 2015 15:46:37 +0200
Subject: settings/password: no minimal required characters for OldPassword

If users are added to gogs due a reverse proxy automatically, their password is
set to their initial username. If their username is shorter than 6 characters,
they can never set a password. But since this password is required for some
operations (e.g. repository deletion), they could not use all features of gogs
until now.
---
 modules/auth/user_form.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'modules')

diff --git a/modules/auth/user_form.go b/modules/auth/user_form.go
index b616a460..d3d73067 100644
--- a/modules/auth/user_form.go
+++ b/modules/auth/user_form.go
@@ -107,7 +107,7 @@ func (f *AddEmailForm) Validate(ctx *macaron.Context, errs binding.Errors) bindi
 }
 
 type ChangePasswordForm struct {
-	OldPassword string `form:"old_password" binding:"Required;MinSize(6);MaxSize(255)"`
+	OldPassword string `form:"old_password" binding:"Required;MinSize(1);MaxSize(255)"`
 	Password    string `form:"password" binding:"Required;MinSize(6);MaxSize(255)"`
 	Retype      string `form:"retype"`
 }
-- 
cgit v1.2.3