Skip to content

Commit 9757be4

Browse files
author
Jan Wolfert
committed
Merge branch 'feat/touchOptimizationv1.2' into feat/imageWithChangingSizes
# Conflicts: # dist/plotly-basic.js # dist/plotly-basic.min.js # dist/plotly-cartesian.js # dist/plotly-cartesian.min.js # dist/plotly-finance.js # dist/plotly-finance.min.js # dist/plotly-geo-assets.js # dist/plotly-geo.js # dist/plotly-geo.min.js # dist/plotly-gl2d.js # dist/plotly-gl2d.min.js # dist/plotly-gl3d.js # dist/plotly-gl3d.min.js # dist/plotly-mapbox.js # dist/plotly-mapbox.min.js # dist/plotly-with-meta.js # dist/plotly.js # dist/plotly.min.js # package.json # src/components/dragelement/index.js # src/plots/cartesian/axes.js # src/plots/cartesian/dragbox.js # src/plots/cartesian/graph_interact.js
2 parents cea4fd4 + 5934695 commit 9757be4

26 files changed

+800152
-889592
lines changed

‎dist/plotly-basic.js

+54,966-64,984
Large diffs are not rendered by default.

‎dist/plotly-basic.min.js

+21-7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/plotly-cartesian.js

+61,626-74,771
Large diffs are not rendered by default.

‎dist/plotly-cartesian.min.js

+23-7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/plotly-finance.js

+57,555-68,669
Large diffs are not rendered by default.

‎dist/plotly-finance.min.js

+22-7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/plotly-geo-assets.js

+3-9
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/plotly-geo.js

+56,072-66,163
Large diffs are not rendered by default.

‎dist/plotly-geo.min.js

+22-7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/plotly-gl2d.js

+87,743-93,267
Large diffs are not rendered by default.

‎dist/plotly-gl2d.min.js

+36-7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)