Merge remote-tracking branch 'origin/gh-pages' into gh-pages

docs/graph2d.html

@@ -852,6 +852,13 @@ Graph2d.clear({options: true}); // clear options only
     </td>
   </tr>
 
+  <tr>
+    <td>fit()</td>
+    <td>none</td>
+    <td>Adjust the visible window such that it fits all items.
+    </td>
+  </tr>
+
   <tr>
     <td>getCurrentTime()</td>
     <td>Date</td>
@@ -904,9 +911,13 @@ Graph2d.clear({options: true}); // clear options only
   </tr>
 
   <tr>
-    <td>fit()</td>
+    <td>hiddenDates</td>
+    <td>Object</td>
     <td>none</td>
-    <td>Adjust the visible window such that it fits all items.
+    <td>This option allows you to hide specific timespans from the time axis. The dates can be supplied as an object:
+      <code>{start: '2014-03-21 00:00:00', end: '2014-03-28 00:00:00', [repeat:'daily']}</code> or as an Array of these objects. The repeat argument is optional.
+      The possible values are (case-sensitive): <code>daily, weekly, monthly, yearly</code>. To hide a weekend, pick any Saturday as start and the following Monday as end
+      and set repeat to weekly.
     </td>
   </tr>
 

docs/timeline.html

@@ -554,6 +554,13 @@ var options = {
     <td>A map with i18n locales. See section <a href="#Localization">Localization</a> for more information.</td>
 </tr>
 
+<tr>
+    <td>margin</td>
+    <td>Number | Object</td>
+    <td>Object</td>
+    <td>When a number, applies the margin to <code>margin.axis</code>, <code>margin.item.horizontal</code>, and <code>margin.item.vertical</code>.</td>
+</tr>
+
 <tr>
     <td>margin.axis</td>
     <td>Number</td>
@@ -680,9 +687,23 @@ var options = {
 
 <tr>
     <td>orientation</td>
+    <td>String | Object</td>
+    <td>'bottom'</td>
+    <td>Orientation of the timelines axis and items. When orientation is a string, the value is applied to both items and axis. Can be 'top', 'bottom' (default), or 'both'.</td>
+</tr>
+
+<tr>
+    <td>orientation.axis</td>
+    <td>String</td>
+    <td>'bottom'</td>
+    <td>Orientation of the timeline axis: 'top', 'bottom' (default), or 'both'. If orientation is 'bottom', the time axis is drawn at the bottom. When 'top', the axis is drawn on top. When 'both', two axes are drawn, both on top and at the bottom.</td>
+</tr>
+
+<tr>
+    <td>orientation.item</td>
     <td>String</td>
     <td>'bottom'</td>
-    <td>Orientation of the timeline: 'top', 'bottom' (default), or 'both'. If orientation is 'bottom', the time axis is drawn at the bottom. When 'top', the axis is drawn on top. When 'both', two axes are drawn, both on top and at the bottom.</td>
+    <td>Orientation of the timeline items: 'top' or 'bottom' (default). Determines whether items are aligned to the top or bottom of the Timeline.</td>
 </tr>
 
 <tr>

examples/graph2d/01_basic.html

@@ -44,7 +44,7 @@
   var dataset = new vis.DataSet(items);
   var options = {
     start: '2014-06-10',
-    end: '2014-06-18',
+    end: '2014-06-18'
   };
   var graph2d = new vis.Graph2d(container, dataset, options);
 </script>

examples/graph2d/13_localization.html

@@ -13,7 +13,7 @@
     }
   </style>
 
-  <script src="http://cdnjs.cloudflare.com/ajax/libs/moment.js/2.8.4/moment-with-langs.min.js"></script>
+  <script src="http://cdnjs.cloudflare.com/ajax/libs/moment.js/2.8.1/moment-with-locales.min.js"></script>
   <script src="../../dist/vis.js"></script>
   <link href="../../dist/vis.css" rel="stylesheet" type="text/css" />
 </head>

examples/graph2d/index.html

@@ -25,6 +25,7 @@
   <p><a href="16_bothAxis_titles.html">16_bothAxis_titles.html</a></p>
   <p><a href="17_dynamicStyling.html">17_dynamicStyling.html</a></p>
   <p><a href="18_scatterplot.html">18_scatterplot.html</a></p>
+  <p><a href="19_labels.html">19_labels.html</a></p>
 
 </div>
 </body>

index.html

@@ -221,7 +221,7 @@
                     </p>
                     <h3>download</h3>
                     <p>
-                        <a href="download/vis.zip">vis.zip (version <span class="version">3.11.0</span>)</a>
+                        <a href="download/vis.zip">vis.zip (version <span class="version">3.12.0</span>)</a>
                     </p>
                 </div>
             </div>