update from master #1

Merged
merged 152 commits into from Mar 6, 2014
Commits on Apr 16, 2013
  1. Initial web page

    josdejong committed Apr 16, 2013
  2. CNAME file added

    josdejong committed Apr 16, 2013
  3. Keywords and title updated

    josdejong committed Apr 16, 2013
  4. Logo created

    josdejong committed Apr 16, 2013
  5. Logo updated

    josdejong committed Apr 16, 2013
Commits on May 3, 2013
  1. Updated home page

    josdejong committed May 3, 2013
Commits on Jun 7, 2013
  1. Added docs and examples

    josdejong committed Jun 7, 2013
  2. Created gallery

    josdejong committed Jun 7, 2013
  3. Index page updated

    josdejong committed Jun 7, 2013
  4. Replaced logo

    josdejong committed Jun 7, 2013
Commits on Jun 10, 2013
  1. Minor style improvements

    josdejong committed Jun 10, 2013
Commits on Jun 11, 2013
Commits on Jun 18, 2013
Commits on Jun 20, 2013
  1. Released version 0.1.0

    josdejong committed Jun 20, 2013
  2. Examples upated

    josdejong committed Jun 20, 2013
Commits on Aug 13, 2013
  1. Examples updated

    josdejong committed Aug 13, 2013
Commits on Sep 16, 2013
Commits on Sep 20, 2013
  1. Updated to v0.2.0

    josdejong committed Sep 20, 2013
  2. Fixed css style of subtitle

    josdejong committed Sep 20, 2013
Commits on Oct 21, 2013
Commits on Jan 3, 2014
Commits on Jan 14, 2014
  1. Released version 0.3.0

    josdejong committed Jan 14, 2014
Commits on Jan 30, 2014
  1. removed this.selection in favor or this.selectionObj. This allows kee…

    AlexDM0 committed Jan 30, 2014
    …ping track of selection of nodes and edges.
Commits on Jan 31, 2014
  1. Released version 0.4.0

    josdejong committed Jan 31, 2014
Commits on Feb 4, 2014
  1. Merge branch 'develop' into alex_dev

    AlexDM0 committed Feb 4, 2014
    Conflicts:
    	dist/vis.js
    	examples/graph/02_random_nodes.html
    	examples/graph/18_fully_random_nodes_clustering.html
    	examples/graph/19_scale_free_graph_clustering.html
    	examples/graph/20_UI_example.html
    	src/graph/Graph.js
    	src/graph/SelectionMixin.js
  2. fixed merge

    AlexDM0 committed Feb 4, 2014
  3. Merge remote-tracking branch 'origin/gh-pages' into alex_dev

    AlexDM0 committed Feb 4, 2014
    Conflicts:
    	.gitignore
    	dist/vis.js
    	dist/vis.min.js
    	examples/graph/02_random_nodes.html
    	examples/graph/18_fully_random_nodes_clustering.html
    	examples/graph/19_scale_free_graph_clustering.html
Commits on Feb 5, 2014
  1. Merge pull request #32 from AlexVangelov/master

    josdejong committed Feb 5, 2014
    change css classes 'panel' and 'label' to not match those of twitter bootstrap
Commits on Feb 6, 2014
  1. Start with implementing an event bus to propagate events between the …

    josdejong committed Feb 6, 2014
    …components of the Timeline
Commits on Feb 7, 2014
  1. Implemented dragging items

    josdejong committed Feb 7, 2014
  2. Implemented dragging items

    josdejong committed Feb 7, 2014
  3. Replaced Item.getWidth with a normal property, and ItemRangeOverflow …

    josdejong committed Feb 7, 2014
    …makes a special property with getter/setter
Commits on Feb 8, 2014
  1. Modified code structure, fixed barnes Hut bugs

    Alex de Mulder
    Alex de Mulder committed Feb 8, 2014
  2. hunting bug...

    Alex de Mulder
    Alex de Mulder committed Feb 8, 2014
  3. alter git

    Alex de Mulder
    Alex de Mulder committed Feb 8, 2014
  4. bughunt 4, going back commits

    Alex de Mulder
    Alex de Mulder committed Feb 8, 2014
  5. fixed BUG! barnes hut functional but slower than almende linear appro…

    Alex de Mulder
    Alex de Mulder committed Feb 8, 2014
    …x algorithm. Now to fix the naming of functions and explain code...
Commits on Feb 10, 2014
  1. mixin refactoring, added cluster normalization, tweaked forces, separ…

    AlexDM0 committed Feb 10, 2014
    …ated forces for repulsion and barnes hut
Commits on Feb 11, 2014
  1. Implemented adding items

    josdejong committed Feb 11, 2014
  2. Finalized Barnes Hut force calculation, set it to default. Completed …

    AlexDM0 committed Feb 11, 2014
    …smooth curves. Added comments.
  3. minor tweaks

    AlexDM0 committed Feb 11, 2014
Commits on Feb 12, 2014
Commits on Feb 13, 2014
  1. refactoring, altered data manipulation, added callbacks and triggers,…

    AlexDM0 committed Feb 13, 2014
    … inserted temporary function overloading
Commits on Feb 17, 2014
  1. Tweaked physics system, added documentation for all new features (phy…

    Alex de Mulder
    Alex de Mulder committed Feb 17, 2014
    …sics, manipulation, smooth) made all GUI elements CSS and HTML.
Commits on Feb 18, 2014
  1. Added missing delete icon

    josdejong committed Feb 18, 2014
  2. finalized docs and zoom

    AlexDM0 committed Feb 18, 2014
  3. Updated history

    josdejong committed Feb 18, 2014
  4. Merge remote-tracking branch 'origin/alex_dev' into alex_dev

    josdejong committed Feb 18, 2014
    Conflicts:
    	dist/vis.js
  5. Fixed filename case errors

    josdejong committed Feb 18, 2014
  6. Fixed filename case errors

    josdejong committed Feb 18, 2014
  7. Merge branch 'alex_dev' into develop

    josdejong committed Feb 18, 2014
    Conflicts:
    	Jakefile.js
    	examples/graph/index.html
    	src/graph/Edge.js
    	src/graph/Graph.js
    	src/graph/graphMixins/ClusterMixin.js
    	src/graph/graphMixins/SelectionMixin.js
    	src/timeline/Controller.js
    	src/timeline/Range.js
    	src/timeline/Timeline.js
    	src/timeline/component/ItemSet.js
    	src/timeline/component/RootPanel.js
    	src/timeline/component/item/Item.js
    	src/util.js
  8. tweaks and minor bugfix

    AlexDM0 committed Feb 18, 2014
Commits on Feb 19, 2014
  1. Updated history

    josdejong committed Feb 19, 2014
Commits on Feb 20, 2014
  1. added hierarchical layout

    AlexDM0 committed Feb 20, 2014
  2. Merge remote-tracking branch 'origin/alex_dev' into develop

    josdejong committed Feb 20, 2014
    Conflicts:
    	docs/graph.html
  3. Updated intro

    josdejong committed Feb 20, 2014
  4. small doc change.

    AlexDM0 committed Feb 20, 2014
  5. Updated history

    josdejong committed Feb 20, 2014
  6. Merge branch 'alex_dev' into develop

    josdejong committed Feb 20, 2014
    Conflicts:
    	src/graph/Graph.js
  7. Updated history

    josdejong committed Feb 20, 2014
  8. Cleanup some unused code

    josdejong committed Feb 20, 2014
  9. typos

    AlexDM0 committed Feb 20, 2014
  10. Removed iconPath

    josdejong committed Feb 20, 2014
  11. Released version 0.5.0

    josdejong committed Feb 20, 2014
  12. Released version 0.5.1

    josdejong committed Feb 20, 2014
Commits on Feb 21, 2014
  1. Added minified css file

    josdejong committed Feb 21, 2014
Commits on Feb 24, 2014
Commits on Feb 25, 2014
  1. Updated zoomExtent and added to methods as per #39, removed width pro…

    AlexDM0 committed Feb 25, 2014
    …perty from zoom extent -> getrange. typos.
  2. Merge remote-tracking branch 'origin/develop' into develop

    josdejong committed Feb 25, 2014
    Conflicts:
    	dist/vis.js
    	dist/vis.min.js
Commits on Feb 26, 2014
  1. removed superfluous events

    AlexDM0 committed Feb 26, 2014
Commits on Feb 27, 2014
  1. svg timeline experiment

    AlexDM0 committed Feb 27, 2014
Commits on Feb 28, 2014
  1. svgTimeline v0.1

    AlexDM0 committed Feb 28, 2014
  2. initial working version

    AlexDM0 committed Feb 28, 2014
Commits on Mar 3, 2014
Commits on Mar 4, 2014
  1. finalized for release

    AlexDM0 committed Mar 4, 2014
Commits on Mar 5, 2014
  1. Released version 0.6.0

    josdejong committed Mar 5, 2014
  2. bugfix graphviz examples

    AlexDM0 committed Mar 5, 2014
  3. Merge branch 'develop' of https://github.com/almende/vis into develop

    AlexDM0 committed Mar 5, 2014
    Conflicts solved:
    	HISTORY.md
    	dist/vis.js
  4. Updated physics for graphviz examples to make it more appealing. Very…

    AlexDM0 committed Mar 5, 2014
    … easy with the configurePhysics option.
  5. added requestanimationframe

    AlexDM0 committed Mar 5, 2014
  6. Updated documentation

    AlexDM0 committed Mar 5, 2014
Commits on Mar 6, 2014
  1. Fixed a bug with margin.item=0 and margin.axis=0. Clarified some opti…

    josdejong committed Mar 6, 2014
    …ons in the documentation
  2. Released version 0.6.1

    josdejong committed Mar 6, 2014