From 6206881d6c8893bab64cffc11fab394d259b41d8 Mon Sep 17 00:00:00 2001 From: jos Date: Fri, 2 May 2014 13:53:54 +0200 Subject: [PATCH 01/13] Updated version number to 1.0.1-SNAPSHOT --- HISTORY.md | 3 +++ bower.json | 2 +- dist/vis.js | 2 +- dist/vis.min.js | 2 +- package.json | 2 +- 5 files changed, 7 insertions(+), 4 deletions(-) diff --git a/HISTORY.md b/HISTORY.md index 151a09c6..2b7cf756 100644 --- a/HISTORY.md +++ b/HISTORY.md @@ -2,6 +2,9 @@ http://visjs.org +## not yet released, version 1.0.1 + + ## 2014-05-02, version 1.0.0 ### Timeline diff --git a/bower.json b/bower.json index c9cad914..3d0950c0 100644 --- a/bower.json +++ b/bower.json @@ -1,6 +1,6 @@ { "name": "vis", - "version": "1.0.0", + "version": "1.0.1-SNAPSHOT", "description": "A dynamic, browser-based visualization library.", "homepage": "http://visjs.org/", "repository": { diff --git a/dist/vis.js b/dist/vis.js index 21df11ec..f0fa27cd 100644 --- a/dist/vis.js +++ b/dist/vis.js @@ -4,7 +4,7 @@ * * A dynamic, browser-based visualization library. * - * @version 1.0.0 + * @version 1.0.1-SNAPSHOT * @date 2014-05-02 * * @license diff --git a/dist/vis.min.js b/dist/vis.min.js index 02c20511..d956752e 100644 --- a/dist/vis.min.js +++ b/dist/vis.min.js @@ -4,7 +4,7 @@ * * A dynamic, browser-based visualization library. * - * @version 1.0.0 + * @version 1.0.1-SNAPSHOT * @date 2014-05-02 * * @license diff --git a/package.json b/package.json index 12a82808..792013a0 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "vis", - "version": "1.0.0", + "version": "1.0.1-SNAPSHOT", "description": "A dynamic, browser-based visualization library.", "homepage": "http://visjs.org/", "repository": { From 5bc5d51f0864e355e9402531270d1fbc21738303 Mon Sep 17 00:00:00 2001 From: jos Date: Fri, 2 May 2014 15:16:20 +0200 Subject: [PATCH 02/13] Some minor fixes in two examples --- examples/timeline/11_points.html | 3 ++- examples/timeline/12_custom_styling.html | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/examples/timeline/11_points.html b/examples/timeline/11_points.html index 2e64e09c..901459f2 100755 --- a/examples/timeline/11_points.html +++ b/examples/timeline/11_points.html @@ -48,7 +48,8 @@ var options = { // Set global item type. Type can also be specified for items individually // Available types: 'box' (default), 'point', 'range', 'rangeoverflow' - type: 'point' + type: 'point', + showMajorLabels: false }; var timeline = new vis.Timeline(container, items, options); diff --git a/examples/timeline/12_custom_styling.html b/examples/timeline/12_custom_styling.html index 0b184e5e..410bef45 100644 --- a/examples/timeline/12_custom_styling.html +++ b/examples/timeline/12_custom_styling.html @@ -66,7 +66,7 @@ diff --git a/examples/timeline/15_item_class_names.html b/examples/timeline/15_item_class_names.html index 43dd348f..903f9d96 100755 --- a/examples/timeline/15_item_class_names.html +++ b/examples/timeline/15_item_class_names.html @@ -73,6 +73,7 @@