Resolve conflict for 4.0 branch and master#4456
Merged
jjatie merged 102 commits intomasterfrom ResolveConflictOct 30, 2020
+4,166-4,688
Commits
Commits on Dec 24, 2017
Commits on Dec 26, 2017
Commits on Jan 6, 2018
- authored
Commits on Jan 7, 2018
Commits on Jan 8, 2018
Commits on Jan 9, 2018
Commits on Jan 16, 2018
Commits on Jan 21, 2018
Commits on Jan 23, 2018
Commits on Jan 26, 2018
Commits on Feb 21, 2018
- committed
ctran - committedChinh Tran
- committedChinh Tran
Commits on Mar 10, 2018
Commits on Mar 12, 2018
- committed
Commits on Mar 13, 2018
- committed
- committed
Commits on Mar 14, 2018
- committed
- committed
Commits on Mar 15, 2018
- committedChinh Tran
- committedChinh Tran
Commits on Mar 30, 2018
- committed
Commits on Apr 8, 2018
Commits on Apr 29, 2018
Commits on May 2, 2018
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
Commits on May 7, 2018
Commits on Jun 10, 2018
- authored
- authored
- committed
- committed
- committed
Commits on Jun 11, 2018
Commits on Jul 14, 2018
Commits on Jul 20, 2018
Commits on Jul 29, 2018
Commits on Aug 21, 2018
Commits on Sep 6, 2018
Commits on Oct 8, 2018
Commits on Dec 25, 2018
- authored
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
Commits on Jan 3, 2019
- committedJacob Christie
Commits on Jan 4, 2019
Commits on Apr 16, 2020
- authored
Commits on Jul 27, 2020
Commits on Aug 27, 2020
Commits on Aug 28, 2020
- committed
- committed
fix -0.0 issue in 4.0 merge. fix func calculateLegendOffsets in BarLineChartViewBase due to mistaking added back offsetBottom += xAxis.labelRotatedHeight. see #4277 for details
committed- committed
- committed
Commits on Aug 30, 2020
- committed
Commits on Sep 23, 2020
- committed
