Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Syncing 4.0.0 with master #3160

Merged
merged 13 commits into from
Jan 7, 2018
Merged

Syncing 4.0.0 with master #3160

merged 13 commits into from
Jan 7, 2018

Commits on Dec 18, 2017

  1. Configuration menu
    Copy the full SHA
    88f1811 View commit details
    Browse the repository at this point in the history

Commits on Dec 25, 2017

  1. fix #1830. credit from #2049 (#2874)

    * fix #1830. credit from #2049
    
    * add combined chart unit tests for iOS, tvOS (macOS only have build process)
    
    * use iterater rather than index
    liuxuan30 committed Dec 25, 2017
    Configuration menu
    Copy the full SHA
    7238ba9 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #3114 from defranke/HorizontalBarChart-Axis

    Fixed using wrong axis (Issue #2257)
    liuxuan30 committed Dec 25, 2017
    Configuration menu
    Copy the full SHA
    64bc2d1 View commit details
    Browse the repository at this point in the history
  3. Removed redundant ivars in BarLineChartViewBase (#3043)

    * Removed redundant ivars in favour of proper access control
    
    * Moved initialization of axes to their declaration to keep the same optionality exposed.
    jjatie committed Dec 25, 2017
    Configuration menu
    Copy the full SHA
    c8ae3ea View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    bbeb88d View commit details
    Browse the repository at this point in the history

Commits on Dec 28, 2017

  1. Replaced relevant ChartUtils methods with Double extensions (#2994)

    * Replaced relevant `ChartUtils` methods with `Double` extensions
    
    Improves readability.
    `nextUp` is built in and provides the same functionality.
    
    * Updated `ChartUtilsTests` to match changes
    jjatie committed Dec 28, 2017
    Configuration menu
    Copy the full SHA
    1658a63 View commit details
    Browse the repository at this point in the history
  2. add option to build demo projects unit tests on iOS (#3121)

    * add option to build demo projects unit tests on iOS
    
    * add ChartsDemo-OSX build test.
    liuxuan30 committed Dec 28, 2017
    Configuration menu
    Copy the full SHA
    48ac6a6 View commit details
    Browse the repository at this point in the history

Commits on Jan 1, 2018

  1. Update ViewPortHandler.swift (#3143)

    fix a small bug
    ParkinWu authored and jjatie committed Jan 1, 2018
    Configuration menu
    Copy the full SHA
    9706fa1 View commit details
    Browse the repository at this point in the history

Commits on Jan 3, 2018

  1. Refactored ChartUtils method into CGPoint extension (#3087)

    * Refactored ChartUtils method into CGPoint extension
    
    * Replaced ChartUtils.defaultValueFormatter()
    
    * Codestyle fixes
    jjatie authored and liuxuan30 committed Jan 3, 2018
    Configuration menu
    Copy the full SHA
    0ced631 View commit details
    Browse the repository at this point in the history

Commits on Jan 6, 2018

  1. Minor cleanup to Highlighter types (#3003)

    * Minor cleanup to Highlighter types
    
    * Fixes for PR
    
    * Pulled master and updated code style
    jjatie committed Jan 6, 2018
    Configuration menu
    Copy the full SHA
    76ba78a View commit details
    Browse the repository at this point in the history
  2. added DataApproximator+N extension (#2848)

    * added DataApproximator+N extension
    
    * fixed PR notes
    666tos authored and jjatie committed Jan 6, 2018
    Configuration menu
    Copy the full SHA
    f05ed02 View commit details
    Browse the repository at this point in the history

Commits on Jan 7, 2018

  1. pulled master

    jjatie committed Jan 7, 2018
    Configuration menu
    Copy the full SHA
    1856495 View commit details
    Browse the repository at this point in the history
  2. Readded in missing files

    jjatie committed Jan 7, 2018
    Configuration menu
    Copy the full SHA
    a37e450 View commit details
    Browse the repository at this point in the history