Merge branch 'MDL-54987-master' of git://github.com/danpoltawski/moodle

moodle · Jul 25, 2016 · c41ec1f · c41ec1f
2 parents a3ee51f + 7eb7101
commit c41ec1f
Show file tree

Hide file tree

Showing 67 changed files with 13,984 additions and 1,079 deletions.
diff --git a/.eslintignore b/.eslintignore
@@ -49,6 +49,7 @@ lib/mustache/
 lib/amd/src/mustache.js
 lib/graphlib.php
 lib/spout/
+lib/amd/src/chartjs-lazy.js
 mod/assign/feedback/editpdf/fpdi/
 repository/s3/S3.php
 theme/bootstrapbase/less/bootstrap/

diff --git a/lang/en/moodle.php b/lang/en/moodle.php
@@ -1680,6 +1680,7 @@
 $string['showallusers'] = 'Show all users';
 $string['showblockcourse'] = 'Show list of courses containing block';
 $string['showcategory'] = 'Show {$a}';
+$string['showchartdata'] = 'Show chart data';
 $string['showcomments'] = 'Show/hide comments';
 $string['showcommentsnonjs'] = 'Show comments';
 $string['showdescription'] = 'Display description on course page';

diff --git a/lib/amd/build/chart_axis.min.js b/lib/amd/build/chart_axis.min.js
diff --git a/lib/amd/build/chart_bar.min.js b/lib/amd/build/chart_bar.min.js
diff --git a/lib/amd/build/chart_base.min.js b/lib/amd/build/chart_base.min.js
diff --git a/lib/amd/build/chart_builder.min.js b/lib/amd/build/chart_builder.min.js
diff --git a/lib/amd/build/chart_line.min.js b/lib/amd/build/chart_line.min.js
diff --git a/lib/amd/build/chart_output.min.js b/lib/amd/build/chart_output.min.js
@@ -0,0 +1 @@
+define(["core/chart_output_chartjs"],function(a){var b=a;return b});
diff --git a/lib/amd/build/chart_output_base.min.js b/lib/amd/build/chart_output_base.min.js
diff --git a/lib/amd/build/chart_output_chartjs.min.js b/lib/amd/build/chart_output_chartjs.min.js
diff --git a/lib/amd/build/chart_output_htmltable.min.js b/lib/amd/build/chart_output_htmltable.min.js
diff --git a/lib/amd/build/chart_pie.min.js b/lib/amd/build/chart_pie.min.js
diff --git a/lib/amd/build/chart_series.min.js b/lib/amd/build/chart_series.min.js
diff --git a/lib/amd/build/chartjs-lazy.min.js b/lib/amd/build/chartjs-lazy.min.js
diff --git a/lib/amd/build/chartjs.min.js b/lib/amd/build/chartjs.min.js
@@ -0,0 +1 @@
+define(["core/chartjs-lazy"],function(a){return a});