Merge branch 'add-features-to-ldapauth' of https://github.com/yjkony/gitbucket into yjkony-add-features-to-ldapauth

Fork: 0

johnpearcey / gitbucket_jkp

Browse code Merge branch 'add-features-to-ldapauth' of https://github.com/yjkony/gitbucket into yjkony-add-features-to-ldapauth Conflicts: src/main/scala/app/IndexController.scala src/main/scala/service/SystemSettingsService.scala src/main/scala/util/LDAPUtil.scala src/main/scala/util/Notifier.scala master
commit b287c1f60d8a3064b1ca9296804a411144184d2e 2 parents 258d53b + e2c99a4 Naoki Takezoe authored on 13 Jul 2014

Patch

Unified Split

Showing 9 changed files

Ignore Space Show notes View src/main/scala/app/IndexController.scala

Ignore Space Show notes View src/main/scala/app/SystemSettingsController.scala

Ignore Space Show notes View src/main/scala/service/AccountService.scala

Ignore Space Show notes View src/main/scala/service/SystemSettingsService.scala

Ignore Space Show notes View src/main/scala/util/AccountUtil.scala 0 → 100644

Ignore Space Show notes View src/main/scala/util/LDAPUtil.scala

Ignore Space Show notes View src/main/scala/util/Notifier.scala

Ignore Space Show notes View src/main/twirl/account/edit.scala.html

Ignore Space Show notes View src/main/twirl/admin/system.scala.html

Show line notes below