Merge branch 'gh-pages' of github.com:almende/vis into gh-pages

featureRequests.html

@@ -135,6 +135,7 @@ Legend:
 </ul>
 <h3 id="network">Network</h3>
 <ul>
+    <li class="normal">(<a href="https://github.com/almende/vis/issues/528" target="_blank">548</a>) Allow labels to be images too.</li>
     <li class="normal">(<a href="https://github.com/almende/vis/issues/530" target="_blank">530</a>, <a href="https://github.com/almende/vis/issues/475" target="_blank">475</a>, <a href="https://github.com/almende/vis/issues/300" target="_blank">300</a>) Improve option structure for the behaviour of the network. This will solve multiple issues if done correctly.</li>
     <li class="normal">(<a href="https://github.com/almende/vis/issues/528" target="_blank">528</a>) Allow the inserting of a custom sorting function for the hierarchical layout.</li>
     <li class="normal">(<a href="https://github.com/almende/vis/issues/507" target="_blank">507</a>) Add animations to the edges, like circles travelling over them or icons.</li>
@@ -197,6 +198,7 @@ Legend:
 </ul>
 <h3 id="dataset-dataview">DataSet &amp; DataView</h3>
 <ul>
+    <li class="normal">(<a href="https://github.com/almende/vis/issues/568" target="_blank">568</a>) Add a merge() function to the dataset as described in this issue.</li>
     <li class="normal">(<a href="https://github.com/almende/vis/issues/339" target="_blank">339</a>) Dynamically update the filter of a DataView.</li>
 </ul>
 </div>