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.

Sign up for GitHub

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

Jump to bottom

Dataset logic cleanup #3001

Merged
merged 62 commits into from
May 2, 2018
Merged

Dataset logic cleanup #3001

merged 62 commits into from
May 2, 2018

Commits on Nov 14, 2017

  1. Cleaned up ChartDataSet logic 

    Added TODOs for areas where simple changes can help improve Swift consistency.
    @jjatie
    jjatie committed Nov 14, 2017
    Configuration menu
    Copy the full SHA
    5fbf9b4 View commit details
    Browse the repository at this point in the history

  2. Tidied up logic for ChartDataSet subclasses 

    Minor changes to take advantage of Swift features and help improve readability.
    @jjatie
    jjatie committed Nov 14, 2017
    Configuration menu
    Copy the full SHA
    1feda88 View commit details
    Browse the repository at this point in the history

Commits on Nov 18, 2017

  1. Added Collection conformances 

    MutableCollection
RandomAccessCollection
RangeReplaceableCollection
    @jjatie
    jjatie committed Nov 18, 2017
    Configuration menu
    Copy the full SHA
    6e80eb0 View commit details
    Browse the repository at this point in the history

Commits on Nov 19, 2017

  1. [#3018] 

    Refactored use of `ChartData` to use new `Collection` conformances
    @jjatie
    jjatie committed Nov 19, 2017
    Configuration menu
    Copy the full SHA
    d36d11b View commit details
    Browse the repository at this point in the history

Commits on Nov 20, 2017

  1. Fixed required initializers

    @jjatie
    jjatie committed Nov 20, 2017
    Configuration menu
    Copy the full SHA
    36ca566 View commit details
    Browse the repository at this point in the history

Commits on Dec 1, 2017

  1. ChartData adopts ExressibleByArrayLiteral

    @jjatie
    jjatie committed Dec 1, 2017
    Configuration menu
    Copy the full SHA
    cb32b08 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/chartdata-collection-conformance… 

    …' into chartdata-collection-refactor
    @jjatie
    jjatie committed Dec 1, 2017
    Configuration menu
    Copy the full SHA
    ad0d148 View commit details
    Browse the repository at this point in the history

  3. Modified demos 

    to take advantage of collection conformance.
    @jjatie
    jjatie committed Dec 1, 2017
    Configuration menu
    Copy the full SHA
    fcd9fa2 View commit details
    Browse the repository at this point in the history

Commits on Dec 11, 2017

  1. Merge remote-tracking branch 'upstream/master' into dataset-logic-cle… 

    …anup
    @jjatie
    jjatie committed Dec 11, 2017
    Configuration menu
    Copy the full SHA
    5d7a1a1 View commit details
    Browse the repository at this point in the history

  2. Pulled latest master

    @jjatie
    jjatie committed Dec 11, 2017
    Configuration menu
    Copy the full SHA
    01d0753 View commit details
    Browse the repository at this point in the history

Commits on Dec 14, 2017

  1. Merge remote-tracking branch 'upstream/master' into dataset-logic-cle… 

    …anup
    @jjatie
    jjatie committed Dec 14, 2017
    Configuration menu
    Copy the full SHA
    ea240a1 View commit details
    Browse the repository at this point in the history

  2. Pulled latest master

    @jjatie
    jjatie committed Dec 14, 2017
    Configuration menu
    Copy the full SHA
    1d819d7 View commit details
    Browse the repository at this point in the history

Commits on Jan 6, 2018

  1. Pulled latest 4.0.0 and code style fixes

    @jjatie
    jjatie committed Jan 6, 2018
    Configuration menu
    Copy the full SHA
    716f182 View commit details
    Browse the repository at this point in the history

Commits on Jan 11, 2018

  1. Updates for PR 

    Also added remove subrange.
    @jjatie
    jjatie committed Jan 11, 2018
    Configuration menu
    Copy the full SHA
    ca5afad View commit details
    Browse the repository at this point in the history

  2. Pulled latest base

    @jjatie
    jjatie committed Jan 11, 2018
    Configuration menu
    Copy the full SHA
    0d41175 View commit details
    Browse the repository at this point in the history

  3. Refactored ChartData 

    Removed redundancy from min/max logic.
Lots of naming changes.
Cleaner implementations.
    @jjatie
    jjatie committed Jan 11, 2018
    Configuration menu
    Copy the full SHA
    fdae403 View commit details
    Browse the repository at this point in the history

Commits on Jan 12, 2018

  1. PR review fixes

    @jjatie
    jjatie committed Jan 12, 2018
    Configuration menu
    Copy the full SHA
    8976b95 View commit details
    Browse the repository at this point in the history

  2. Removed unnecessary get from subscripts.

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

Commits on Jan 15, 2018

  1. Merge remote-tracking branch 'origin/chartdata-collection-conformance… 

    …' into chartdata-collection-refactor
    @jjatie
    jjatie committed Jan 15, 2018
    Configuration menu
    Copy the full SHA
    793e437 View commit details
    Browse the repository at this point in the history

  2. Disabled remove(at:) for CombinedChartView

    @jjatie
    jjatie committed Jan 15, 2018
    Configuration menu
    Copy the full SHA
    583dab6 View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'origin/chartdata-collection-conformance… 

    …' into chartdata-collection-refactor
    @jjatie
    jjatie committed Jan 15, 2018
    Configuration menu
    Copy the full SHA
    0cce64d View commit details
    Browse the repository at this point in the history

  4. Removed redundant methods

    @jjatie
    jjatie committed Jan 15, 2018
    Configuration menu
    Copy the full SHA
    47b6a1c View commit details
    Browse the repository at this point in the history

  5. Relocated appendEntry(_:todataSet:)

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

  6. Merge remote-tracking branch 'origin/chartdata-collection-conformance… 

    …' into chartdata-collection-refactor
    @jjatie
    jjatie committed Jan 15, 2018
    Configuration menu
    Copy the full SHA
    1d1e380 View commit details
    Browse the repository at this point in the history

  7. Merge remote-tracking branch 'origin/chartdata-collection-refactor' i… 

    …nto chartdata-cleanup
    @jjatie
    jjatie committed Jan 15, 2018
    Configuration menu
    Copy the full SHA
    79cae83 View commit details
    Browse the repository at this point in the history

  8. pulled latest 4.0.0

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

  9. Disabled Collection support for CombinedChartData

    @jjatie
    jjatie committed Jan 15, 2018
    Configuration menu
    Copy the full SHA
    09d27a7 View commit details
    Browse the repository at this point in the history

  10. Removed methods from CombinedChartData

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

  11. Merge remote-tracking branch 'origin/chartdata-collection-conformance… 

    …' into chartdata-collection-refactor
    @jjatie
    jjatie committed Jan 15, 2018
    Configuration menu
    Copy the full SHA
    efc5a72 View commit details
    Browse the repository at this point in the history

  12. Merge branch '4.0.0' into chartdata-collection-refactor

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

  13. Merge branch '4.0.0' into chartdata-collection-refactor

    @jjatie
    jjatie committed Jan 15, 2018
    Configuration menu
    Copy the full SHA
    6adde98 View commit details
    Browse the repository at this point in the history

Commits on Jan 16, 2018

  1. Merge remote-tracking branch 'origin/chartdata-collection-refactor' i… 

    …nto chartdata-cleanup
    @jjatie
    jjatie committed Jan 16, 2018
    Configuration menu
    Copy the full SHA
    023ff19 View commit details
    Browse the repository at this point in the history

  2. Pulled latest 4.0

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

  3. Fixes after merge

    @jjatie
    jjatie committed Jan 16, 2018
    Configuration menu
    Copy the full SHA
    29d3e91 View commit details
    Browse the repository at this point in the history

  4. Removed used of dataSet(forIndex:)

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

  5. Merge branch '4.0.0' into chartdata-collection-refactor

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

  6. Merge branch '4.0.0' into chartdata-collection-refactor

    @jjatie
    jjatie committed Jan 16, 2018
    Configuration menu
    Copy the full SHA
    6de1114 View commit details
    Browse the repository at this point in the history

Commits on Jan 21, 2018

  1. Merge branch '4.0.0' of https://github.com/danielgindi/Charts into ch… 

    …artdata-collection-refactor
    @jjatie
    jjatie committed Jan 21, 2018
    Configuration menu
    Copy the full SHA
    37b29ad View commit details
    Browse the repository at this point in the history

  2. Fixed merge conflicts

    @jjatie
    jjatie committed Jan 21, 2018
    Configuration menu
    Copy the full SHA
    329e00c View commit details
    Browse the repository at this point in the history

Commits on Jan 23, 2018

  1. Merge remote-tracking branch 'upstream/4.0.0' into chartdata-collecti… 

    …on-refactor
    @jjatie
    jjatie committed Jan 23, 2018
    Configuration menu
    Copy the full SHA
    2572f04 View commit details
    Browse the repository at this point in the history

  2. Fixed merge conflicts

    @jjatie
    jjatie committed Jan 23, 2018
    Configuration menu
    Copy the full SHA
    31a76eb View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'origin/chartdata-collection-refactor' i… 

    …nto chartdata-cleanup
    @jjatie
    jjatie committed Jan 23, 2018
    Configuration menu
    Copy the full SHA
    5cbafb4 View commit details
    Browse the repository at this point in the history

Commits on Jan 26, 2018

  1. updated demos

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

  2. Merge remote-tracking branch 'origin/chartdata-collection-refactor' i… 

    …nto chartdata-cleanup
    @jjatie
    jjatie committed Jan 26, 2018
    Configuration menu
    Copy the full SHA
    5f3b528 View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'upstream/4.0.0' into chartdata-cleanup

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

  4. Pulled latest 4.0.0

    @jjatie
    jjatie committed Jan 26, 2018
    Configuration menu
    Copy the full SHA
    9f5a7f9 View commit details
    Browse the repository at this point in the history

  5. Fixed demos

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

  6. Fixed objective c demos

    @jjatie
    jjatie committed Jan 26, 2018
    Configuration menu
    Copy the full SHA
    33ed6b5 View commit details
    Browse the repository at this point in the history

  7. Merged latest 4.0.0

    @jjatie
    jjatie committed Jan 26, 2018
    Configuration menu
    Copy the full SHA
    8bcccd3 View commit details
    Browse the repository at this point in the history

Commits on Mar 13, 2018

  1. Merge remote-tracking branch 'origin/4.0.0' into chartdata-cleanup

    @jjatie
    jjatie committed Mar 13, 2018
    Configuration menu
    Copy the full SHA
    585e605 View commit details
    Browse the repository at this point in the history

  2. Moved travis to Xcode 9.3 beta temporarily

    @jjatie
    jjatie committed Mar 13, 2018
    Configuration menu
    Copy the full SHA
    b1ca0c5 View commit details
    Browse the repository at this point in the history

Commits on Mar 14, 2018

  1. Pulled latest 4.0.0

    @jjatie
    jjatie committed Mar 14, 2018
    Configuration menu
    Copy the full SHA
    08a8ac0 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/4.0.0' into chartdata-cleanup

    @jjatie
    jjatie committed Mar 14, 2018
    Configuration menu
    Copy the full SHA
    5faad7b View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'origin/4.0.0' into chartdata-cleanup

    @jjatie
    jjatie committed Mar 14, 2018
    Configuration menu
    Copy the full SHA
    a049cd3 View commit details
    Browse the repository at this point in the history

  4. Fixed macOS demo info.plist and tv demo device name

    @jjatie
    jjatie committed Mar 14, 2018
    Configuration menu
    Copy the full SHA
    251f501 View commit details
    Browse the repository at this point in the history

Commits on Mar 27, 2018

  1. PR Fixes

    @jjatie
    jjatie committed Mar 27, 2018
    Configuration menu
    Copy the full SHA
    8031da7 View commit details
    Browse the repository at this point in the history

  2. Fixed objective-c naming

    @jjatie
    jjatie committed Mar 27, 2018
    Configuration menu
    Copy the full SHA
    d371fa8 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'chartdata-cleanup' of https://github.com/jjatie/Charts … 

    …into dataset-logic-cleanup
    @jjatie
    jjatie committed Mar 27, 2018
    Configuration menu
    Copy the full SHA
    728fa0e View commit details
    Browse the repository at this point in the history

Commits on Mar 29, 2018

  1. PR Fixes

    @jjatie
    jjatie committed Mar 29, 2018
    Configuration menu
    Copy the full SHA
    7d64273 View commit details
    Browse the repository at this point in the history

Commits on Apr 15, 2018

  1. Pulled latest 4.0.0

    @jjatie
    jjatie committed Apr 15, 2018
    Configuration menu
    Copy the full SHA
    bf7c325 View commit details
    Browse the repository at this point in the history

Commits on Apr 30, 2018

  1. Merge remote-tracking branch 'origin/4.0.0' into dataset-logic-cleanup

    @jjatie
    jjatie committed Apr 30, 2018
    Configuration menu
    Copy the full SHA
    0d4ab69 View commit details
    Browse the repository at this point in the history

  2. PR Fixes

    @jjatie
    jjatie committed Apr 30, 2018
    Configuration menu
    Copy the full SHA
    8f74fe0 View commit details
    Browse the repository at this point in the history