github.com/visjs/vis-timeline commits | Ecosyste.ms: OpenCollective

Merge branch 'develop' into alex_dev

Conflicts:
dist/vis.js
examples/graph/02_random_nodes.html
examples/graph/18_fully_random_nod...

ed1708257a8df33f8c52e3330b6d7b962ee9df2b authored almost 11 years ago by Alex de Mulder <[email protected]>

WIP manipulate dataset for graph

11da9f35349b1529e019697357104d09d7ca7c0f authored almost 11 years ago by Alex de Mulder <[email protected]>

change css classes 'panel' and 'label' to not match those of twitter bootstrap

9d5f039eaa3932f131cc264b4744bf6faa0536fd authored almost 11 years ago by AlexVangelov <[email protected]>

Merge branch 'alex_new' into alex_dev

515568415affd0a4d7686cd88cc12919b3365851 authored almost 11 years ago by Alex de Mulder <[email protected]>

Updated version number to 0.5.0-SNAPSHOT

e8c8f0689298e2749ab3a84ab8302374918c4a83 authored almost 11 years ago by josdejong <[email protected]>

Released version 0.4.0

ebe070ba5c71ddc1d3bce737c49ee05274d4ac9b authored almost 11 years ago by josdejong <[email protected]>

Released version 0.4.0

b61fe2ffe16102991e6bf0b247f392d5d53ca4a4 authored almost 11 years ago by josdejong <[email protected]>

Fixed non working `start` and `end` options.

aaab289b915154886b28ac9fd3fcfcc8ea8a7408 authored almost 11 years ago by josdejong <[email protected]>

Implemented functions `on` and `off` to create event listeners for event `select`.

35fdb5b0238f7bbbe9542c0a60d10ca2d217cfa2 authored almost 11 years ago by josdejong <[email protected]>

Added images to dist

2d270f7b43e752f12eb682a70a4a654187f23018 authored almost 11 years ago by josdejong <[email protected]>

Zoom via navigation now zooms around the window center

4f5579bc34a8faf64131390a1ca180725e281404 authored almost 11 years ago by josdejong <[email protected]>

Tweaked the script to get icon path

c4f5290b6d26b5565e36fff3398df34d32646a39 authored almost 11 years ago by josdejong <[email protected]>

Moved images to src/graph/img, adjusted build script to copy them to dist, and some more variable renaming in the code

f0fa3791830e54890f077fb28fd6966ed621fd94 authored almost 11 years ago by josdejong <[email protected]>

Renamed keyboardNavigation to keyboard

8171a995f6fecfb77d67d9daf2a2bd2ed8ad71a3 authored almost 11 years ago by josdejong <[email protected]>

Renamed UI* stuff to Navigation

a231d8f544bb9307e2c2ed09e3a2a117b8603c58 authored almost 11 years ago by josdejong <[email protected]>

Merge branch 'alex_dev' into develop

e57947baa63b6bab4fabafd5a93faa5834cb20cb authored almost 11 years ago by josdejong <[email protected]>

refactoring, constants names, fixed trello notes

47ccec62c897181e89a408faaef1182b88fcd512 authored almost 11 years ago by Alex de Mulder <[email protected]>

added edge selection and removed this.selection from the graph

3c0149bdd2d393d54dcfb2b100749d1c490f57bc authored almost 11 years ago by Alex de Mulder <[email protected]>

Splitted function `select` into `getSelection` and `setSelection`

178fb477558dbe7d661496be81e53ac9daf59ccd authored almost 11 years ago by josdejong <[email protected]>

`select` event now returns the original type of the id, not the stringfied ids

b7cc533119c39903c52240e08943894ac7c7bd9b authored almost 11 years ago by josdejong <[email protected]>

removed this.selection in favor or this.selectionObj. This allows keeping track of selection of nodes and edges.

0a018349f9f11ad5dcd5bf51bfa29dcafd5ffebb authored almost 11 years ago by Alex de Mulder <[email protected]>

Merge branch 'develop' into alex_dev

b85e7c84d763d8cefc726e817cc585f85a8cf5f4 authored almost 11 years ago by Alex de Mulder <[email protected]>

added code example for clustering

1a6ac7ec917362bfef1cfcb800d45d9d2ae374ce authored almost 11 years ago by Alex de Mulder <[email protected]>

Implemented item selection and a function select to get/set the selected items

fb266da26fe17b18a8640ce8edeabb29e35bc3d8 authored almost 11 years ago by josdejong <[email protected]>

Implemented functions `on` and `off` for Timeline events

5b82dfad4c427b857bb847af06ad39f398c2d718 authored almost 11 years ago by josdejong <[email protected]>

Merge branch 'alex_dev' into develop

b1d5ba398396103c52c422864003fa7a65f84d89 authored almost 11 years ago by josdejong <[email protected]>

added function to return selected objects (as per Git comment #28)

aa7926b34a56a6d8e28cbb2c7a159f81699c10e6 authored almost 11 years ago by Alex de Mulder <[email protected]>

Merge branch 'alex_dev' into develop

cd06d3c9c541fb4a4893609eb0b1388b25e63634 authored almost 11 years ago by josdejong <[email protected]>

fixed trello bugs: rewrote setSelection, tweaked forces and damping, grav point is fixed in space now

66263f89a6f9242aa23b074fd4ae6cacb82791d2 authored almost 11 years ago by Alex de Mulder <[email protected]>

Some more updates in the docs

a0f39b2b01c98b72650c83f6a48ee633283c29d1 authored almost 11 years ago by josdejong <[email protected]>

Restructured Graph docs

c00139618273232f815b1ac4106c704dc94f189b authored almost 11 years ago by josdejong <[email protected]>

Merge pull request #29 from almende/alex_dev

merge alex_dev with develop

bb0ed75279ecf05a6d6ed4a2a2a5c3acf50e3cc1 authored almost 11 years ago by Jos de Jong <[email protected]>

finalized UI and keyboard navigation. Finished docs, updated history.MD

56d494990b26911d6a19ab8ae6e96e38788034e9 authored almost 11 years ago by Alex de Mulder <[email protected]>

added UI config options, made keyboard nav standalone

0e863beb5f97bee822f6a7017ca4cc957ce61f0d authored almost 11 years ago by Alex de Mulder <[email protected]>

added Dynamic UI icon URL

e7541b3025d1c9a8f124d4c022a63f598c1b30a4 authored almost 11 years ago by Alex de Mulder <[email protected]>

fixed ZoomToFit, tweaked force calculation

284a633afa3ec155a251c4bb7ea489f0de2b3d35 authored almost 11 years ago by Alex de Mulder <[email protected]>

corrected discreet step and scaled forces

b9441cad51db4c30a10f236f0d43b1cb8315dc9b authored almost 11 years ago by Alex de Mulder <[email protected]>

Merge pull request #1 from almende/develop

Sync with upstream

140ba623672f4b1f3677e3855ff855308624a379 authored almost 11 years ago by Eric Gillingham <[email protected]>

added zoomExtends, added function documentation

a357d1cc2639827b221ed03e4ee2b66f829e1f0b authored almost 11 years ago by Alex de Mulder <[email protected]>

rewrote selection element of graph, very tidy. Still needs comments. Added keyboard navigation and Node based UI functionality.

167035c1aedc2265bc73cf34a03088f92ada2533 authored almost 11 years ago by AlexDM0 <[email protected]>

created UI sector, starting to rework selection (generalize it over nodes and edges), edge implementation later.

8a6d95a2093255d21638d0ca59e778579f117b3a authored almost 11 years ago by AlexDM0 <[email protected]>

small refactoring of force calculation

ddbcca96c793cffad3e4ed44aa2348c470b26701 authored almost 11 years ago by AlexDM0 <[email protected]>

Updated history

1541c34319fed5947801954d2405bc98eba935cf authored almost 11 years ago by Alex de Mulder <[email protected]>

Clustering FINAL

a3f65d6374c52c5b4db46b3cefb2510a6df60683 authored almost 11 years ago by Alex de Mulder <[email protected]>

Bug fixes, changed clustering to mixin, added examples and documentation.

e6793feeaa8c6434b9654ee69d60b5bb0a945953 authored almost 11 years ago by Alex de Mulder <[email protected]>

Tested all examples, they work. Added documentation, renamed variables, refactoring, complete movement from universe to sectors

9d4b07d69459079d4c77b87ba690287741f80917 authored almost 11 years ago by Alex de Mulder <[email protected]>

Renamed universes to sectors, added documentation comments

c93f64ca6947d36500645853641e92ecc1a2a49b authored almost 11 years ago by Alex de Mulder <[email protected]>

Succesfully mixed universes into graph. Universes work. Graphics needed

f2a241cb365732bdbb7558c9f2a8877ea22404e8 authored almost 11 years ago by Alex de Mulder <[email protected]>

added support for seperate universes. struggling with mixins.

b0d4fbbaccad1d9c9d889cdfa4cc79132a280401 authored almost 11 years ago by Alex de Mulder <[email protected]>

improved decluster around zoom center. Added only render when visible check, speeding up drawing.

1154b77c16d4cfc581ddd5f495078f9c6cb1a1bb authored almost 11 years ago by Alex de Mulder <[email protected]>

Merge remote-tracking branch 'origin/develop' into alex_dev

Conflicts:
dist/vis.js
dist/vis.min.js

f93970e225d07491ebb8703769310d1706a7610c authored almost 11 years ago by Alex de Mulder <[email protected]>

added snake removal, bugfixes, refactoring

b2f3ec4b7a12a24851227c9239dbb6f4cf323353 authored almost 11 years ago by Alex de Mulder <[email protected]>

Documentation, doubleTap, imporved hubs

06fd50d1eb91dc663a3decf512034fafcab97e86 authored almost 11 years ago by Alex de Mulder <[email protected]>

cluster rendering. Cluster hubs, refactoring

9b3963a628a20bb04799eeb5c4ea33dba25c25e0 authored almost 11 years ago by Alex de Mulder <[email protected]>

Implemented function `select` for the Timeline

67da4d1796acfb1b1bed1da6238d06730663268c authored almost 11 years ago by josdejong <[email protected]>

Functions `select` and `unselect` on Items working

d37cca2660c3891f5f57468d2cc24952bef89dc8 authored almost 11 years ago by josdejong <[email protected]>

Fixed some typos

886d8ec975abbccf33996f53f11435c0be7e964d authored almost 11 years ago by josdejong <[email protected]>

Fixed a typo

1c56929bceb8a1633591772c28c1f591e13b01b2 authored almost 11 years ago by josdejong <[email protected]>

Updated version number to 0.4.0-SNAPSHOT

177116ba1ec3d634a64f9ebabc1bf5e30415e772 authored almost 11 years ago by josdejong <[email protected]>

Improved overview image

7c91b68f78c0130563f43270b4288e53b257bf0e authored almost 11 years ago by josdejong <[email protected]>

Added a description on how to publish

59cb790056286ed53d87067c3cec514fb699db68 authored almost 11 years ago by josdejong <[email protected]>

Released version 0.3.0

1a22d5f56164a03312246837d9a7f4031c87091a authored almost 11 years ago by josdejong <[email protected]>

Released version 0.3.0

06f765f2586122fa1ad25acf7acaf7310eb5d230 authored almost 11 years ago by josdejong <[email protected]>

Released version 0.3.0

19286f88b9aadb8e08c036a843fa0a5f4b4f8997 authored almost 11 years ago by josdejong <[email protected]>

Some fixes in the build script and tests

64b8535b351b951db85f7dedc01e5daf7ad836da authored almost 11 years ago by josdejong <[email protected]>

Merge remote-tracking branch 'origin/develop' into alex_dev

Conflicts:
package.json
vis.js
vis.min.js

6703aee0e8255de5db2c3874d222eb9116af4c8d authored almost 11 years ago by Alex de Mulder <[email protected]>

tweaked clustering

76f761b76a18de2742f37a5b856d332e1972a5a5 authored almost 11 years ago by Alex de Mulder <[email protected]>

Added dataset get flag to return internal IDs and added tests

95eac293847a4fca1745159b9fc336b0ead4b154 authored almost 11 years ago by Alex de Mulder <[email protected]>

Css file must be loaded explicitly now. Library files moved to `dist`

743112c20b2c3347104af3ebaf987f365c146141 authored almost 11 years ago by josdejong <[email protected]>

Switched back to hammer.js 1.0.5 due to issues with 1.0.6

492ed81554373691eabb23ae6f244d996cdfcdde authored almost 11 years ago by josdejong <[email protected]>

tweaked clustering

b7a64019c8f6cd10bb719f83c91c62db5d41f226 authored almost 11 years ago by Alex de Mulder <[email protected]>

Included hubaggregation clustering, changed the launch sequence to speed up the loading of big data.

d3057aa08b2aaa679e2cc2d5b660aa9d32117c09 authored almost 11 years ago by Alex de Mulder <[email protected]>

DATASET: Added options flag for including internal ids, added test coverage for it

45407663b419b0325c9c49c848fb7e130e01c1cd authored almost 11 years ago by Alex de Mulder <[email protected]>

started on clustering over area

ceb0e3f50d3b567058377689561db84356302bd1 authored almost 11 years ago by AlexDM0 <[email protected]>

Seperated clustering functions in cluster object

98c22639c9b665df2ef9247c4afb4bfaccd31ce0 authored almost 11 years ago by Alex de Mulder <[email protected]>

clustering levels introduced

d793f2a79c0f13969e9d5186519682b0c69ddebe authored almost 11 years ago by Alex de Mulder <[email protected]>

Extended timeline example 04

3abeffb87a3e66da76ab4e6ced01a13d9eecaa74 authored almost 11 years ago by josdejong <[email protected]>

added MouseTrap for keybinding handling

96fee51d971faa1fa247bfc8672fc5f9546e4aef authored almost 11 years ago by AlexDM0 <[email protected]>

clustering, looking for keypressevent

5794f1c2bd7a235bc6244a1340f2bf3c2bc2b30d authored almost 11 years ago by Alex de Mulder <[email protected]>

tweaks

9c2649bdb9ea2363df320ddbd2abedbb4fe8fb21 authored almost 11 years ago by Alex de Mulder <[email protected]>

added force calculation features for clustering

4348dd791815c101a611cd71ea5ba0663f35110d authored almost 11 years ago by Alex de Mulder <[email protected]>

refined clustering

ccef94ad7af3fe061fa0b815db10546e13bb2a7e authored almost 11 years ago by Alex de Mulder <[email protected]>

finalized clustering

7f53b5f855941f45d84df9cdf0dc7614b104d229 authored almost 11 years ago by Alex de Mulder <[email protected]>

clustering added comments, fixed bugs

727cddc310fb6591c57bc45ca953cded458e6442 authored almost 11 years ago by Alex de Mulder <[email protected]>

Implemented Clustering, still open TODOs

339ec62235bd444552a09d8531a01d4b00f1bc91 authored almost 11 years ago by Alex de Mulder <[email protected]>

node index patch 1

036054456a95b5577082197e5ba4182da29190ba authored almost 11 years ago by Alex de Mulder <[email protected]>

removed debug settings from _updateNodeIndexList()

e1a53be64928b569de1ab463028cefa72173b64c authored almost 11 years ago by Alex de Mulder <[email protected]>

removed _updateNodeIndexList from _setNodes. This is handled by _addNode

2a035b061b7320fc36cfc71e72281d45fd8169a7 authored almost 11 years ago by Alex de Mulder <[email protected]>

Added _updateNodeIndexList() function to speed up force calculation by removing duplicate calculations.

675bf523a9dfd3c04de064e0b2d2d566b4212b45 authored almost 11 years ago by Alex de Mulder <[email protected]>

updated package.json to circumvent hammer bug and added node-watch.

4637d6244f2a4a1fb64c8b2275a41c6e58ee7198 authored almost 11 years ago by Alex de Mulder <[email protected]>

Switched to 2-space indentation

6cef60febd2c3b85abfdc04041aba19b8d0cbb84 authored about 11 years ago by josdejong <[email protected]>

Switched to 2-space indentation

83fe2d5a2af5967393f2034222c7ddb997d6cb3e authored about 11 years ago by josdejong <[email protected]>

Implemented pinching (not yet stable on chrome mobile)

e238183fca11c5eb8f87809d3aec468cb1ad543f authored about 11 years ago by josdejong <[email protected]>

Integrated hammer.js in Timeline

531cee21672350bb4dd828e12c3da5a46256e963 authored about 11 years ago by josdejong <[email protected]>

Added a test example for groups. Added ContentPanel (not yet in use)

05d835cae826318dcaf37f8319d285e0ddb1f803 authored about 11 years ago by josdejong <[email protected]>

Some fixes in positioning of groups

54cce43aa1848eefdf318bf105df8c97a843dd1d authored about 11 years ago by josdejong <[email protected]>

Updated docs

9009b59873249239d6c422cd303f98080f0ba712 authored about 11 years ago by josdejong <[email protected]>

Merge pull request #20 from Gillingham/develop

Create ItemRangeOverflow item type

7460eb8e2f9e6ab266fc8bafc3028fc40b56aaa7 authored about 11 years ago by Jos de Jong <[email protected]>

Undo local CSS changes for an easier upstream merge

05ccfd216d03a82657bbfe0780681ca2cbb3905b authored about 11 years ago by Eric Gillingham <[email protected]>

Recompile vis.js and vis.min.js

01db156387c2d6acc8be504a6af069b3c1076c61 authored about 11 years ago by Eric Gillingham <[email protected]>