Jonas Franz 6d00c1a7ce Merge branch 'master' into feat/approval-new ...

# Conflicts:
#	models/issue_comment.go
#	models/migrations/migrations.go
#	models/migrations/v64.go
#	models/models.go
#	public/css/index.css

2018-05-13 22:14:34 +02:00

..

admin

issue-2768: added new option allow_only_external_registration (#3910)

2018-05-13 15:51:16 +08:00

base

Rework special link parsing in the post-processing of markup (#3354)

2018-02-27 09:09:18 +02:00

custom

Templates for extra links in top navbar and repo tool tabs. (#3308)

2018-01-10 08:19:50 +02:00

explore

Fix blank topic on explore repo list (#3956)

2018-05-13 09:50:39 +08:00

mail

Mention the possibility of resetting the password for new accounts (#3812)

2018-04-19 09:08:51 +08:00

org

Don't warn users about *every* dirty form (#3707)

2018-03-23 22:10:42 +08:00

repo

Merge branch 'master' into feat/approval-new

2018-05-13 22:14:34 +02:00

status

Change import reference to match gitea instead of gogs (#37)

2016-11-03 10:29:56 -02:00

user

Added user language setting (#3875)

2018-05-05 08:28:30 +08:00

home.tmpl

Spaces to tabs in templates (#2953)

2017-11-21 13:43:00 +08:00

install.tmpl

issue-2768: added new option allow_only_external_registration (#3910)

2018-05-13 15:51:16 +08:00

swagger.tmpl

Spaces to tabs in templates (#2953)

2017-11-21 13:43:00 +08:00