Pull in changes from latest develop #5

ckane · 2016-03-06T19:17:49Z

No description provided.

- unified some methods in the networkUtil - Fixed initial zoom issues #1252

Conflicts: dist/vis.js

…ble area.

…dit edge mode would throw an error.

…elta height and delta width.

It was implemented in commit 4e6c5a5 and accidentally deleted in commit f39c246.

Added possibility to change (or hide) the title of a CustomTime element.

…n when no options are provided via the constructor

…Label`, and `zLabel` instead of `'x'`, `'y'`, and `'z'`

… no longer occur. - Added parentCentralization option for hierarchical layout.

Internet Explorer does not support the ES6 Number.parseFloat (see http://caniuse.com/#feat=es6-number). Instead, substitute the regular parseFloat method.

Use parseFloat instead of Number.parseFloat

…uld.

…images. - Added interpolation option for interpolation of images, default true.

…width when using left or right align

# Conflicts: # dist/vis.js

Pull in changes from latest develop

Alex de Mulder and others added 30 commits September 6, 2015 15:38

- Fixed critical camera zoom bug #1273. #1266, #1255

3f5c71e

- unified some methods in the networkUtil - Fixed initial zoom issues #1252

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

2874bea

Conflicts: dist/vis.js

Fixed unselectAll method

21fc483

- Fixed bug that broke the network if drawn in a hidden div #1254

6581f56

Fixed onMoving not normalizing the dates again after callback

637fc3f

Released version 4.8.1

06811f3

Bumped version number to 4.8.2-SNAPSHOT

6605059

Fixed phantom edges during clustering #1281

68c1172

Fixed an error in the configurator option throttleRedraw

05a6021

Added possibility to change (or hide) the title of a CustomTime element.

3f03ceb

- Fixed scaling not doing anything to edges.

ab88ca5

- Fixed setting font to null so the network won't crash anymore.

1d0db57

- Fixed stabilized event not firing if layout algorithm does very well.

985693e

- Fixed arrows with some shapes when they are selected. #1292

fd48470

- Fixed arrows to icon, text and circularImage shapes

db05c2b

- Fixed deletion of options by settings them to null.

3733976

Release 4.8.2

db25fa6

updated publish guide

111c998

updated to SNAPSHOT 4.8.3

91025a1

updated to SNAPSHOT 4.8.3

0ec249f

rebuilt

1b9f166

fixed self referencing edges during clustering

bb0104b

- Fixed bug where a box shape could not be drawn outside of the viewa…

7a6246e

…ble area.

- Fixed bug where dragging a node that is not a control node during e…

59a5fe8

…dit edge mode would throw an error.

- Made autoscaling on container size change pick the lowest between d…

db598bc

…elta height and delta width.

updated docs

9781185

add styles option back for data points

4ac55e9

It was implemented in commit 4e6c5a5 and accidentally deleted in commit f39c246.

Merge pull request #1307 from Abrazan/custom-timeline-title

73d3a2d

Added possibility to change (or hide) the title of a CustomTime element.

added images with borders and updated the manipulation css

1131864

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

5f1986d

josdejong and others added 28 commits February 1, 2016 14:23

Fixed a regression: Timeline/Graph2d constructor throwing an exceptio…

1d49599

…n when no options are provided via the constructor

Released version 4.14.0

4f831b1

Fixed #1630: fixed docs of getItemRange and getDataRange in docs

014645d

Fixed #1634: several minor HTML/CSS bugs

8e180da

Fixed #1637: the built-in tooltip now shows the provided xLabel, `y…

1e1f59a

…Label`, and `zLabel` instead of `'x'`, `'y'`, and `'z'`

Fixed #1635: edges are now referring to the correct points

53d37f1

- Fixed #1644, #1631: overlapping nodes in hierarchical layout should…

2bff294

… no longer occur. - Added parentCentralization option for hierarchical layout.

Fixed #1575: fixed selection events

1cb16f6

Use parseFloat instead of Number.parseFloat

bc90ffe

Internet Explorer does not support the ES6 Number.parseFloat (see http://caniuse.com/#feat=es6-number). Instead, substitute the regular parseFloat method.

Merge pull request #1655 from ttjoseph/ttjoseph-patch-1

130b79c

Use parseFloat instead of Number.parseFloat

Updated history

b11ab77

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

d1c081f

Updated history

d7382cd

Fixed #1661: main files for bower should not be minified

02de079

Fixed #1677: updating groups through manipulation now works as it sho…

386082e

…uld.

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

b9c62af

- Fixed #1672: Implemented stepped scaling for nice interpolation of …

4347286

…images. - Added interpolation option for interpolation of images, default true.

Fixed #1683: implemented currentTimeTick event

448734c

fixed another bug in hierarchical layout

822243e

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

42b7462

rebuilt

eeab20d

Released v4.15.0

3874ad5

Bumped version number to 4.15.1-SNAPSHOT

d29d7cb

Fixed #1692: Error when y-axis values are equal

c1dd635

Fixed #1695: Item line and dot not correctly reckoning with the line …

23814fc

…width when using left or right align

not set scale to 3.3 when initializing empty

40aac52

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

d79553b

# Conflicts: # dist/vis.js

Fixed #1455: allow vertical panning of the web page on touch devices

311ea1e

ckane added a commit that referenced this pull request Mar 6, 2016

Merge pull request #5 from almende/develop

6b398f5

Pull in changes from latest develop

ckane merged commit 6b398f5 into ckane:box-leftalign Mar 6, 2016

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Pull in changes from latest develop #5

Pull in changes from latest develop #5

ckane commented Mar 6, 2016

Pull in changes from latest develop #5

Pull in changes from latest develop #5

Conversation

ckane commented Mar 6, 2016