Jonas Franz 7592f5bbbd Merge branch 'master' into feat/approval-new ...

# Conflicts:
#	models/migrations/migrations.go

2018-05-24 15:44:11 +02:00

..

admin

LDAP Public SSH Keys synchronization (#1844)

2018-05-24 07:59:02 +03:00

api/v1

LDAP Public SSH Keys synchronization (#1844)

2018-05-24 07:59:02 +03:00

dev

Make time diff translatable (#2057)

2017-06-28 13:43:28 +08:00

org

Splitted the user settings code into several files to be more maintainable (#3968)

2018-05-17 12:05:00 +08:00

private

improve protected branch to add whitelist support (#2451)

2017-09-14 16:16:22 +08:00

repo

Merge branch 'master' into feat/approval

2018-05-23 20:33:04 +02:00

routes

Merge branch 'master' into feat/approval

2018-05-22 17:53:02 +02:00

user

LDAP Public SSH Keys synchronization (#1844)

2018-05-24 07:59:02 +03:00

utils

Allow adding collaborators with (fullname) (#3103)

2017-12-07 15:00:09 +08:00

home.go

Added repository search ordered by stars or forks. Forks column in admin repo list. (#3969)

2018-05-24 09:03:42 +08:00

init.go

Improved comment rendering in "Files" view by adding Comments to DiffLine

2018-05-12 19:09:42 +02:00

install.go

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

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