Code

Resyncing with head fork#2

Code

Merged

RonnyFenrich merged 96 commits intoAppDirect:masterAppDirect/appinsights-ios-charts:masterfrom ChartsOrg:masterChartsOrg/Charts:masterCopy head branch name to clipboardDec 12, 2017

+9,937-3,539

Commits

Commits on Apr 6, 2017

• Compatibility with swift playgrounds

  Show description for 5d4f8ac
  macteo

  committed
  5d4f8ac

  Copy full SHA for 5d4f8ac

Commits on Apr 7, 2017

• Added one last missing import CoreGraphics

  macteo

  committed
  409cebf

  Copy full SHA for 409cebf

Commits on Apr 15, 2017

• add example playground

  thierryH91200

  committed
  8cbdf6d

  Copy full SHA for 8cbdf6d

Commits on May 5, 2017

• Allow turning off drag in X and Y axis separately.

  maciejtrybilo

  committed
  629c548

  Copy full SHA for 629c548

Commits on May 29, 2017

• tutorial link added to readme

  

  annalizhaz

  committed
  1286da0

  Copy full SHA for 1286da0

Commits on Jul 21, 2017

• Added Swift iOS demos

  

  jacobchristie

  committed
  b0ef524

  Copy full SHA for b0ef524

• .xcodeproj won't add to git

  Show description for 469b636
  jjatie

  authored
  469b636

  Copy full SHA for 469b636

• Replaced unnecessary NSObjectProtocol

  Show description for 26965e1
  

  jacobchristie

  committed
  26965e1

  Copy full SHA for 26965e1

Commits on Aug 11, 2017

• Fix CombinedChartView not draw markers

  

  xzysun

  committed
  9b1ab68

  Copy full SHA for 9b1ab68

Commits on Aug 14, 2017

• conform to macOS api changes in swift 3.2

  ohbargain

  committed
  7635f5f

  Copy full SHA for 7635f5f

Commits on Aug 23, 2017

• Reduce build time with minor reference change

  Show description for 80a45c0
  

  Xinran Wang

  authored and

  Xinran Wang

  committed
  80a45c0

  Copy full SHA for 80a45c0

Commits on Aug 28, 2017

• Fixed value setter on PieChartDataEntry

  martnst

  authored
  e23d186

  Copy full SHA for e23d186

Commits on Aug 29, 2017

• Merge pull request #2754 from martnst/patch-1

  Show description for 91aa10f
  liuxuan30

  authored
  91aa10f

  Copy full SHA for 91aa10f

• Merge pull request #2679 from xinranw/reduce-build-time

  Show description for 69cdd84
  liuxuan30

  authored
  69cdd84

  Copy full SHA for 69cdd84

Commits on Sep 2, 2017

• Merge branch 'master' into master

  pmairoldi

  authored
  cf0aa2d

  Copy full SHA for cf0aa2d

• Merge pull request #2484 from annalizhaz/master

  Show description for 79b6049
  pmairoldi

  authored
  79b6049

  Copy full SHA for 79b6049

• update xcode project for xcode 9

  pmairoldi

  committed
  f6525a0

  Copy full SHA for f6525a0

Commits on Sep 3, 2017

• remove unused Carthage.xcconfig

  pmairoldi

  committed
  252a7bc

  Copy full SHA for 252a7bc

• remove rvm version to fix travis

  pmairoldi

  committed
  225ec3d

  Copy full SHA for 225ec3d

• remove watchOS platform

  pmairoldi

  committed
  0a01d34

  Copy full SHA for 0a01d34

• update travis config to add xcode9

  pmairoldi

  committed
  705d9ad

  Copy full SHA for 705d9ad

• fix tests by adding tolerance and device ids

  pmairoldi

  committed
  d300d6d

  Copy full SHA for d300d6d

• Merge pull request #2767 from danielgindi/xcode-9

  Show description for 573cd17
  pmairoldi

  authored
  573cd17

  Copy full SHA for 573cd17

• Delete FrameworkSpec

  pmairoldi

  authored
  765b88e

  Copy full SHA for 765b88e

• Merge pull request #2717 from ohbargain/apply_macOS_change

  Show description for d7dc8f0
  pmairoldi

  authored
  d7dc8f0

  Copy full SHA for d7dc8f0

Commits on Sep 5, 2017

• refactor getDataSetByHighlight and entryForHighlight

  liuxuan30

  authored
  079dff4

  Copy full SHA for 079dff4

• refactor CombinedChartView drawMarkers

  liuxuan30

  authored
  59218f0

  Copy full SHA for 59218f0

• Merge pull request #2702 from xzysun/master

  Show description for f9eea57
  liuxuan30

  authored
  f9eea57

  Copy full SHA for f9eea57

Commits on Sep 7, 2017

• refactor code style

  liuxuan30

  authored
  f43bc57

  Copy full SHA for f43bc57

• migrate code to swift 4

  pmairoldi

  committed
  37cac1a

  Copy full SHA for 37cac1a

• fix build errors after migration

  pmairoldi

  committed
  a9e1e70

  Copy full SHA for a9e1e70

• update demos for swift 4

  pmairoldi

  committed
  131602f

  Copy full SHA for 131602f

• Part I modify All NSAttributedStringKey related methods for Swift 4

  Show description for 0cf4ef4
  

  liuxuan30

  authored and

  pmairoldi

  committed
  0cf4ef4

  Copy full SHA for 0cf4ef4

• fix charts project file

  pmairoldi

  committed
  9dcc5ef

  Copy full SHA for 9dcc5ef

• Merge pull request #2413 from maciejtrybilo/dragXYEnabled

  Show description for 19750f7
  liuxuan30

  authored
  19750f7

  Copy full SHA for 19750f7

Commits on Sep 8, 2017

• update travis config

  pmairoldi

  committed
  5e3ac75

  Copy full SHA for 5e3ac75

• release 3.0.3

  pmairoldi

  committed
  e968e21

  Copy full SHA for e968e21

• bump version

  pmairoldi

  committed
  983d556

  Copy full SHA for 983d556

• Minor refactoring

  danielgindi

  committed
  4b10e47

  Copy full SHA for 4b10e47

• Fixed axis drag locking (Completes #2413)

  danielgindi

  committed
  3c083f3

  Copy full SHA for 3c083f3

Commits on Sep 17, 2017

• Reorganized in preparation of merging Swift Demos

  

  jacobchristie

  committed
  70f85f7

  Copy full SHA for 70f85f7

• Merged all iOS demos to one project with 2 targets

  

  jacobchristie

  committed
  7fdad5e

  Copy full SHA for 7fdad5e

• Clean up

  

  jacobchristie

  committed
  bb6983e

  Copy full SHA for bb6983e

Commits on Sep 21, 2017

• Merge pull request #2507 from danielgindi/swift4

  Show description for e47f8c4
  liuxuan30

  authored
  e47f8c4

  Copy full SHA for e47f8c4

• Update README.md

  liuxuan30

  authored
  d953129

  Copy full SHA for d953129

• Bumped pod spec version

  mohpor

  authored
  4053e7c

  Copy full SHA for 4053e7c

• Merge pull request #1 from mohpor/swift4Pod

  Show description for a891d97
  mohpor

  authored
  a891d97

  Copy full SHA for a891d97

• Merge pull request #2806 from mohpor/master

  Show description for 5417160
  liuxuan30

  authored
  5417160

  Copy full SHA for 5417160

Commits on Sep 22, 2017

• add swift 4 version file for cocoapods

  pmairoldi

  committed
  0593be7

  Copy full SHA for 0593be7

Commits on Sep 25, 2017

• Merge pull request #2335 from macteo/master

  Show description for 2ccd171
  pmairoldi

  authored
  2ccd171

  Copy full SHA for 2ccd171

• Merge pull request #2364 from thierryH91200/master

  Show description for 8245f32
  pmairoldi

  authored
  8245f32

  Copy full SHA for 8245f32

Commits on Oct 13, 2017

• duplicated code for set1

  liuxuan30

  committed
  ad4d942

  Copy full SHA for ad4d942

Commits on Oct 16, 2017

• Update LICENSE

  Show description for d7cd7b9
  sDaniel

  authored
  d7cd7b9

  Copy full SHA for d7cd7b9

Commits on Oct 17, 2017

• fix #2890. Turned out it's multiple bar chart but not grouped

  liuxuan30

  committed
  655d0be

  Copy full SHA for 655d0be

• Merge pull request #2891 from liuxuan30/2890

  Show description for 130d026
  liuxuan30

  authored
  130d026

  Copy full SHA for 130d026

• Merge pull request #2872 from danielgindi/bubble

  Show description for 0a63b74
  liuxuan30

  authored
  0a63b74

  Copy full SHA for 0a63b74

Commits on Oct 20, 2017

• Merge pull request #2629 from jjatie/NSObjectProtocol

  Show description for 2f887bd
  pmairoldi

  authored
  2f887bd

  Copy full SHA for 2f887bd

Commits on Oct 21, 2017

• Merge pull request #2887 from sDaniel/patch-1

  Show description for bdbdaa6
  pmairoldi

  authored
  bdbdaa6

  Copy full SHA for bdbdaa6

Commits on Nov 2, 2017

• [modify]

  Show description for 021d5fb
  

  hir-suzuki

  committed
  021d5fb

  Copy full SHA for 021d5fb

• Fix turning off drag in X and Y axes separately.

  maciejtrybilo

  committed
  37c8a77

  Copy full SHA for 37c8a77

• Add Swift Package Manager support.

  

  Brian Doig

  committed
  9b9dd68

  Copy full SHA for 9b9dd68

Commits on Nov 3, 2017

• Merge pull request #2942 from suzuhiroruri/fix_character_deprecated

  Show description for 98552bb
  liuxuan30

  authored
  98552bb

  Copy full SHA for 98552bb

Commits on Nov 6, 2017

• added highlightColor parameter for pie charts

  

  Herrmann, Pascal (415)

  committed
  57c2e11

  Copy full SHA for 57c2e11

• Merged latest master

  jjatie

  committed
  0f0bffd

  Copy full SHA for 0f0bffd

Commits on Nov 7, 2017

• 1. use Launch Screen storyboard and remove launch images for easy adoption for new device screen (iPhone X)

  Show description for 91ca0f9
  liuxuan30

  committed
  91ca0f9

  Copy full SHA for 91ca0f9

Commits on Nov 8, 2017

• update xib to adopt safe area

  liuxuan30

  committed
  f00f9de

  Copy full SHA for f00f9de

• Merge pull request #2967 from danielgindi/iPhoneX

  Show description for ecba1da
  liuxuan30

  authored
  ecba1da

  Copy full SHA for ecba1da

• Merge pull request #2950 from BrianDoig/master

  Show description for a1811c7
  liuxuan30

  authored
  a1811c7

  Copy full SHA for a1811c7

Commits on Nov 13, 2017

• Replaced ChartUtils methods with CGSize extensions

  jjatie

  committed
  01160fd

  Copy full SHA for 01160fd

Commits on Nov 14, 2017

• Merge remote-tracking branch 'upstream/master' into demos

  jjatie

  committed
  3ec4bc1

  Copy full SHA for 3ec4bc1

• Pulled latest master

  jjatie

  committed
  b4f84b6

  Copy full SHA for b4f84b6

• Minor changes to Animator

  jjatie

  committed
  ee337d7

  Copy full SHA for ee337d7

Commits on Nov 15, 2017

• unwrap optionals (#2698)

  Show description for fc22a27
  

  russellbstephens

  authored and

  liuxuan30

  committed
  fc22a27

  Copy full SHA for fc22a27

• Merge pull request #2628 from jjatie/demos

  Show description for 3672219
  pmairoldi

  authored
  3672219

  Copy full SHA for 3672219

• clean up demo project

  pmairoldi

  committed
  e8fa7ad

  Copy full SHA for e8fa7ad

• Merge pull request #2961 from pascalherrmann/master

  Show description for b27e366
  pmairoldi

  authored
  b27e366

  Copy full SHA for b27e366

• Merge pull request #2995 from jjatie/cgsize-extensions

  Show description for c37e553
  pmairoldi

  authored
  c37e553

  Copy full SHA for c37e553

• Merge remote-tracking branch 'upstream/master' into animator-cleanup

  jjatie

  committed
  50fdd2d

  Copy full SHA for 50fdd2d

• Minor changes to BubbleChartRenderer logic

  jjatie

  committed
  9ebcae0

  Copy full SHA for 9ebcae0

Commits on Nov 17, 2017

• Merge pull request #3005 from jjatie/animator-cleanup

  Show description for 19e8b00
  pmairoldi

  authored
  19e8b00

  Copy full SHA for 19e8b00

Commits on Nov 20, 2017

• Merge pull request #3010 from jjatie/bubble-chart-renderer-cleanup

  Show description for 3b6eda1
  pmairoldi

  authored
  3b6eda1

  Copy full SHA for 3b6eda1

Commits on Nov 23, 2017

• Minor changes to logic in ViewPortJob subclasses. (#2992)

  Show description for bc40b16
  

  jjatie

  authored and

  liuxuan30

  committed
  bc40b16

  Copy full SHA for bc40b16

• Removed @objc from internal properties

  Show description for 6869d85
  jjatie

  committed
  6869d85

  Copy full SHA for 6869d85

• Removed isKind(of:)

  Show description for c7a1c04
  jjatie

  committed
  c7a1c04

  Copy full SHA for c7a1c04

Commits on Nov 24, 2017

• Animator non nil (#2981)

  Show description for 122013e
  

  jjatie

  authored and

  liuxuan30

  committed
  122013e

  Copy full SHA for 122013e

Commits on Nov 27, 2017

• View port handler nonnil (#2980)

  Show description for fb02977
  

  jjatie

  authored and

  liuxuan30

  committed
  fb02977

  Copy full SHA for fb02977

• ChartRenderer's must be initialized with a chart (#2982)

  Show description for 0f74a25
  

  jjatie

  authored and

  liuxuan30

  committed
  0f74a25

  Copy full SHA for 0f74a25

Commits on Dec 5, 2017

• Merge pull request #3044 from jjatie/iskind-of

  Show description for 19da2c0
  liuxuan30

  authored
  19da2c0

  Copy full SHA for 19da2c0

• Merge pull request #3038 from jjatie/internal-drop-objc

  Show description for b87d04e
  liuxuan30

  authored
  b87d04e

  Copy full SHA for b87d04e

• Merge pull request #2949 from maciejtrybilo/master

  Show description for 60829b3
  liuxuan30

  authored
  60829b3

  Copy full SHA for 60829b3

Commits on Dec 8, 2017

• fileprivate -> private (#3042)

  Show description for 8c9d5f3
  

  jjatie

  authored and

  liuxuan30

  committed
  8c9d5f3

  Copy full SHA for 8c9d5f3

• for #2745. chart should be weak.

  liuxuan30

  committed
  c6faf53

  Copy full SHA for c6faf53

• Merge pull request #3078 from liuxuan30/2772

  Show description for 2ff5cb5
  liuxuan30

  authored
  2ff5cb5

  Copy full SHA for 2ff5cb5

Commits on Dec 9, 2017

• Fix a bug may cause infinite loop. (#3073)

  Show description for 6fee51c
  

  JyHu

  authored and

  liuxuan30

  committed
  6fee51c

  Copy full SHA for 6fee51c

• Minor logic cleanup (#3041)

  

  jjatie

  authored and

  liuxuan30

  committed
  d321093

  Copy full SHA for d321093

Commits on Dec 11, 2017

• Replaced ChartUtils.Math in favour of an extension on FloatingPoint (#2993)

  Show description for 159e0f7
  

  jjatie

  authored and

  liuxuan30

  committed
  159e0f7

  Copy full SHA for 159e0f7