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 'master' into export-dashboard

Browse Source 
Conflicts:
	public/app/features/dashboard/submenu/submenu.ts
This commit is contained in:
Torkel Ödegaard
2016-05-25 12:32:56 +02:00
parent 6a813aa33d f923edc424
commit ba6573af61
48 changed files with 423 additions and 185 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -73,14 +73,5 @@
</div>
</div>
<div class="row" style="margin-top: 50px">
<div class="version-footer text-center small">
Grafana version: {{buildInfo.version}}, commit: {{buildInfo.commit}},
build date: {{buildInfo.buildstamp | date: 'yyyy-MM-dd HH:mm:ss' }}
</div>
<div class="version-footer text-center small" ng-show="buildInfo.hasUpdate">
<a class="external-link" target="_blank" href="http://grafana.org/download">New Grafana Version Available ({{buildInfo.latestVersion}})</a>
</div>
</div>
</div>
</div>

1
public/app/partials/signup_step2.html
View File

@@ -67,7 +67,6 @@
</form>
</div>
</div>
</div>