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 external-plugins

Browse Source 
Conflicts:
	public/app/plugins/panels/table/editor.ts
	public/views/index.html
This commit is contained in:
Torkel Ödegaard
2015-12-02 18:30:48 +01:00
parent bd8f5e9bfd 8eb3e48bc7
commit ee0e4d2b69
63 changed files with 1876 additions and 641 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
public/vendor/showdown.js vendored
View File

@@ -855,7 +855,7 @@ var _DoLists = function(text) {
// Turn double returns into triple returns, so that we can make a
// paragraph for the last item in a list, if necessary:
list = list.replace(/\n{2,}/g,"\n\n\n");;
list = list.replace(/\n{2,}/g,"\n\n\n");
var result = _ProcessListItems(list);
// Trim any trailing whitespace, to put the closing `</$list_type>`
@@ -875,7 +875,7 @@ var _DoLists = function(text) {
var list_type = (m3.search(/[*+-]/g)>-1) ? "ul" : "ol";
// Turn double returns into triple returns, so that we can make a
// paragraph for the last item in a list, if necessary:
var list = list.replace(/\n{2,}/g,"\n\n\n");;
list = list.replace(/\n{2,}/g,"\n\n\n");
var result = _ProcessListItems(list);
result = runup + "<"+list_type+">\n" + result + "</"+list_type+">\n";
return result;
@@ -1451,4 +1451,4 @@ if (typeof define === 'function' && define.amd) {
define(function() {
return Showdown;
});
}
}