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

Merge upstream. #1

Merged
merged 10 commits into from
Apr 17, 2016
Merged

Merge upstream. #1

merged 10 commits into from
Apr 17, 2016

Commits on Apr 13, 2016

  1. Remove unused import

    @sylvainbaronnet
    sylvainbaronnet committed Apr 13, 2016
    Configuration menu
    Copy the full SHA
    97e1b99 View commit details
    Browse the repository at this point in the history

  2. typo

    @sylvainbaronnet
    sylvainbaronnet committed Apr 13, 2016
    Configuration menu
    Copy the full SHA
    8805aa1 View commit details
    Browse the repository at this point in the history

Commits on Apr 14, 2016

  1. Fix animation bug 

    Changes the `NavigationCard`'s `style` prop to an optional prop. `NavigationCard` does a strict comparison (`this.props.style === undefined`) to fallback to the default style. Because `style` was defaulting to `null`, the comparison failed.
    @angeloashmore
    angeloashmore committed Apr 14, 2016
    Configuration menu
    Copy the full SHA
    c1c414e View commit details
    Browse the repository at this point in the history

  2. Merge pull request #526 from angeloashmore/master 

    Fix animation bug
    @aksonov
    aksonov committed Apr 14, 2016
    Configuration menu
    Copy the full SHA
    e3ca8c2 View commit details
    Browse the repository at this point in the history

Commits on Apr 16, 2016

  1. 1. remove the useless default='...' 

    2. add more details about tabbar.
this cost me lots of time to figure out why the navigation bar do not act as I expected. Hope to help others :)
    @timzaak
    timzaak committed Apr 16, 2016
    Configuration menu
    Copy the full SHA
    9178039 View commit details
    Browse the repository at this point in the history

Commits on Apr 17, 2016

  1. Set the example to use the supported version of React Native

    James Pearson committed Apr 17, 2016
    Configuration menu
    Copy the full SHA
    f7d3190 View commit details
    Browse the repository at this point in the history

  2. Added .babelrc to the Example project to make it a turn key example

    James Pearson committed Apr 17, 2016
    Configuration menu
    Copy the full SHA
    9348d8a View commit details
    Browse the repository at this point in the history

  3. Merge pull request #534 from FearMediocrity/master 

    Set the example to use the supported version of React Native
    @aksonov
    aksonov committed Apr 17, 2016
    Configuration menu
    Copy the full SHA
    1463030 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #522 from sylvainbaronnet/master 

    Remove unused import
    @aksonov
    aksonov committed Apr 17, 2016
    Configuration menu
    Copy the full SHA
    db5fad6 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #533 from timzaak/add-ps-with-tabbar 

    add more details about tabbar
    @aksonov
    aksonov committed Apr 17, 2016
    Configuration menu
    Copy the full SHA
    1deab3e View commit details
    Browse the repository at this point in the history