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

Feature/merge options #5 #6

Merged
merged 6 commits into from
Aug 21, 2016
Merged

Feature/merge options #5 #6

merged 6 commits into from
Aug 21, 2016

Commits on Aug 20, 2016

  1. 🚧 WIP Add mergeObject helper 

    Signed-off-by: Jakub Juszczak <netghost03@gmail.com>
    @apertureless
    apertureless committed Aug 20, 2016
    Configuration menu
    Copy the full SHA
    7544a35 View commit details
    Browse the repository at this point in the history

Commits on Aug 21, 2016

  1. Merge branch 'master' into feature/merge_options 

    * master:
  🐛 Fix npm badge
  📝 Update CHANGELOG.md
  💎 Release new version 1.0.3
    @apertureless
    apertureless committed Aug 21, 2016
    Configuration menu
    Copy the full SHA
    056544d View commit details
    Browse the repository at this point in the history

  2. ➕ Add dependency lodash

    @apertureless
    apertureless committed Aug 21, 2016
    Configuration menu
    Copy the full SHA
    7c545c9 View commit details
    Browse the repository at this point in the history

  3. ✨ Add helper function to merge chartOptions

    @apertureless
    apertureless committed Aug 21, 2016
    Configuration menu
    Copy the full SHA
    43c1995 View commit details
    Browse the repository at this point in the history

  4. Change Charts to merge options 

    And renamed options data to defaultOptions
    @apertureless
    apertureless committed Aug 21, 2016
    Configuration menu
    Copy the full SHA
    fedbbf8 View commit details
    Browse the repository at this point in the history

  5. 🔥 Remove testing code

    @apertureless
    apertureless committed Aug 21, 2016
    Configuration menu
    Copy the full SHA
    99f1d97 View commit details
    Browse the repository at this point in the history