IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'custom-github-style-oauth' of https://github.com/kfitzpatrick/grafana into kfitzpatrick-custom-github-style-oauth

Browse Source
This commit is contained in:
bergquist
2016-09-07 08:15:44 +02:00
parent 2e8d5ca519 f2baa5b210
commit 4646723cbb
5 changed files with 29 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
public/app/partials/login.html
View File

@@ -59,6 +59,10 @@
<i class="fa fa-github"></i>
with Github
</a>
<a class="btn btn-large btn-generic-oauth" href="login/generic_oauth" target="_self" ng-if="genericOAuthEnabled">
<i class="fa fa-gear"></i>
with {{oauthProviderName || "OAuth 2"}}
</a>
</div>
</div>