Jonas Franz a8dc699e74 Merge branch 'master' into feat/approval-new ... # Conflicts: # models/error.go # models/migrations/migrations.go # models/models.go # public/js/index.js		2018-05-19 18:17:01 +02:00
..
admin	Add option to use paged LDAP search when synchronizing users (#3895)	2018-05-05 17:30:47 +03:00
api/v1	Add more webhooks support and refactor webhook templates directory (#3929)	2018-05-16 22:01:55 +08: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-new	2018-05-17 14:00:21 +02:00
routes	Merge branch 'master' into feat/approval-new	2018-05-19 18:17:01 +02:00
user	Add support for FIDO U2F (#3971)	2018-05-19 17:12:37 +03:00
utils	Allow adding collaborators with (fullname) (#3103)	2017-12-07 15:00:09 +08:00
home.go	Global code search support (#3664)	2018-03-16 22:04:33 +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