Yotam Berkowitz
2f2f5c4cc8
Commit before pull
8 years ago
Yotam Berkowitz
249272ccc1
Merge branch 'develop' of https://github.com/almende/vis into template-fix
8 years ago
wimrijnders
70f76a25b7
Added point draw method for style 'line' ( #2227 )
8 years ago
yotamberk
6bb743214e
Merge pull request #2224 from bradh/timelinedocs-2016-10-24
Minor documentation cleanup.
8 years ago
Brad Hards
a70edfb1b9
Minor documentation cleanup.
8 years ago
yotamberk
1e55ee8640
Bugfix in timeline ( #2219 )
* Add initial scroller without options
* Add initial scroll without an option
* Add verticalScroll option
* Fix scrollbar positions
* Add docs
* fix example
* remove jquery dependency
* Fix example
* Fix review comments
* Fix verticalScroll and horizontalScroll docs
* Fix bug in timeline option.rtl if otion is undefined
* Remove hack
* Fix breaking of timeline
8 years ago
yotamberk
c1a3f66233
Merge pull request #2223 from bradh/rangeoverflowexamplecleanup
Remove stray reference to rangeoverflow in example comment.
8 years ago
yotamberk
95cd631ab7
Merge pull request #2222 from bradh/readmefixes-2016-10-24
Trivial README fixes.
8 years ago
Brad Hards
7e342bd4f0
Remove stray reference to rangeoverflow in example comment.
8 years ago
Brad Hards
3633bd9d56
Trivial README fixes.
8 years ago
yotamberk
5489a19027
Merge pull request #2218 from mojoaxel/featureRequests
renamed some labels
8 years ago
Alexander Wunschik
cad071e136
renamed some labels
8 years ago
yotamberk
ecf1c6a7d3
small improvements ( #2217 )
* Add initial scroller without options
* Add initial scroll without an option
* Add verticalScroll option
* Fix scrollbar positions
* Add docs
* fix example
* remove jquery dependency
* Fix example
* Fix review comments
* Fix verticalScroll and horizontalScroll docs
* Fix bug in timeline option.rtl if otion is undefined
* Remove hack
8 years ago
yotamberk
ac1d6a6a96
Fix small timeline bug when defining timeline with no options and fix docs explanations ( #2216 )
* Add initial scroller without options
* Add initial scroll without an option
* Add verticalScroll option
* Fix scrollbar positions
* Add docs
* fix example
* remove jquery dependency
* Fix example
* Fix review comments
* Fix verticalScroll and horizontalScroll docs
* Fix bug in timeline option.rtl if otion is undefined
8 years ago
wimrijnders
6adac314fd
Added point draw methods for styles 'surface' and 'grid' ( #2215 )
8 years ago
yotamberk
a9be8e796b
Merge pull request #2214 from wimrijnders/PR23
Add point draw methods for styles 'dot-color' and 'dot-size'
8 years ago
Wim Rijnders
9e1fd6671e
Add point draw methods for styles 'dot-color' and 'dot-size'
8 years ago
wimrijnders
1c4e1a41ee
Add point draw methods for styles 'dot' and 'dot-line' ( #2212 )
8 years ago
yotamberk
171ee39687
Merge pull request #2213 from mojoaxel/develop
add two eyes review process
8 years ago
Alexander Wunschik
66ab105d84
add two eyes review process
8 years ago
yotamberk
ab9d5f3422
Merge pull request #2210 from wimrijnders/PR21
Added point draw methods for graph styles 'bar-color' and 'bar-size'
8 years ago
yotamberk
cf75437692
Fix dragging items that have a React template ( #2211 )
* Hide vertically hidden ranged items in groups that are not visible
* Add element to templates options
* Fix comment typo
* Add documentation for react mounting
* add react example
* Fix typo
* fix title
* Fix review comments
* Add vis-drag-center to fix dragging bug when template is react component
8 years ago
Yotam Berkowitz
5af1b893fe
Merge branch 'develop' of https://github.com/almende/vis into template-fix
8 years ago
Yotam Berkowitz
3addd51046
Add vis-drag-center to fix dragging bug when template is react component
8 years ago
Wim Rijnders
fcc817b4f0
Added point draw methods for graph styles 'bar-color' and 'bar-size'
8 years ago
yotamberk
8d13434a9d
Merge pull request #2209 from wimrijnders/PR20
Added explanatory text for graph3d tooltip demo
8 years ago
yotamberk
105356ba27
Merge pull request #2208 from wimrijnders/PR19
Added generic graph drawing loop; isolated point drawing of graph style 'Bar'
8 years ago
yotamberk
d9598432d3
Fix React support for group and item templates and add example ( #2206 )
* Hide vertically hidden ranged items in groups that are not visible
* Add element to templates options
* Fix comment typo
* Add documentation for react mounting
* add react example
* Fix typo
* fix title
* Fix review comments
8 years ago
Yotam Berkowitz
c548b14468
Merge branch 'template-fix' of https://github.com/yotamberk/vis into template-fix
8 years ago
Yotam Berkowitz
342091d180
Fix review comments
8 years ago
Wim Rijnders
44d6d86721
Added explanatory text for graph3d tooltip demo
8 years ago
yotamberk
42c054ff54
fix title
8 years ago
Wim Rijnders
124b70ffeb
Undid last commit in a very roundabout way.
8 years ago
yotamberk
17c48c7967
Fix typo
8 years ago
Yotam Berkowitz
06c264e5b6
add react example
8 years ago
Wim Rijnders
5d0a70e1f1
Added generic graph drawing loop; isolated point drawing of graph style 'Bar'
8 years ago
Wim Rijnders
7689e21218
Merge branch 'develop' into PR18
8 years ago
yotamberk
25a04fcdb2
Merge pull request #2204 from wimrijnders/PR17
Some code cleanup and consolidation.
8 years ago
Wim Rijnders
cd1b18fbe9
Fixed another silly indent
8 years ago
Wim Rijnders
d3b174da09
Interim save
8 years ago
Wim Rijnders
13752ed435
Fixes after testing
8 years ago
yotamberk
b889a5057d
Add a vertical scroll option for timeline [solves #273 , #1060 , #466 ] ( #2196 )
* Add initial scroller without options
* Add initial scroll without an option
* Add verticalScroll option
* Fix scrollbar positions
* Add docs
* fix example
* remove jquery dependency
* Fix example
* Fix review comments
8 years ago
wimrijnders
7424bfbfc2
Graph3d: make setting dotSizeRatio public ( #2202 )
* Graph3d: make setting dotSizeRatio public
* Added method for dotSize
* Fixed silly indent
8 years ago
Wim Rijnders
3d0acba994
Small code cleanup and consolidation.
8 years ago
yotamberk
178e9dc915
Horizontal scroll ( #2201 )
* Hide vertically hidden ranged items in groups that are not visible
* Add vertical scroll when zoom is inactive
* Fix review comments
* Add horizontalScroll option
8 years ago
yotamberk
ea4d56c68b
vertical scroll when zoomKey isn't triggered ( #2197 )
* Hide vertically hidden ranged items in groups that are not visible
* Add vertical scroll when zoom is inactive
* Fix review comments
8 years ago
yotamberk
503099328f
Merge pull request #2199 from wimrijnders/PR14
Final cleanup for settings handling
8 years ago
Yotam Berkowitz
8cb0e74580
Fix template to accept react elements
8 years ago
Wim Rijnders
baed96ee7c
Fixes and hardening for Settings.js
8 years ago
Wim Rijnders
3e84c3557e
Moved code for settings to separate module
8 years ago