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

Fixes the development branch with master #82

Merged
merged 25 commits into from
Jan 4, 2016
Merged

Fixes the development branch with master #82

merged 25 commits into from
Jan 4, 2016

Commits on Dec 11, 2015

  1. Adds the first code for the status bar

    @RamonGilabert
    RamonGilabert committed Dec 11, 2015
    Configuration menu
    Copy the full SHA
    058cde7 View commit details
    Browse the repository at this point in the history

  2. Adds the icons

    @RamonGilabert
    RamonGilabert committed Dec 11, 2015
    Configuration menu
    Copy the full SHA
    cec8ed4 View commit details
    Browse the repository at this point in the history

  3. Fixes a typo

    @RamonGilabert
    RamonGilabert committed Dec 11, 2015
    Configuration menu
    Copy the full SHA
    ede8bac View commit details
    Browse the repository at this point in the history

  4. Merge pull request #71 from hyperoslo/feature/status-bar 

    Status bar initial state
    @zenangst
    zenangst committed Dec 11, 2015
    Configuration menu
    Copy the full SHA
    8e4e0fa View commit details
    Browse the repository at this point in the history

  5. Refactored the demo

    @RamonGilabert
    RamonGilabert committed Dec 11, 2015
    Configuration menu
    Copy the full SHA
    10f6405 View commit details
    Browse the repository at this point in the history

  6. Removes the self to be consisten

    @RamonGilabert
    RamonGilabert committed Dec 11, 2015
    Configuration menu
    Copy the full SHA
    18e5c9b View commit details
    Browse the repository at this point in the history

  7. Merge branch 'master' of https://github.com/hyperoslo/ImagePicker int… 

    …o improvement/refactor
    @RamonGilabert
    RamonGilabert committed Dec 11, 2015
    Configuration menu
    Copy the full SHA
    7521713 View commit details
    Browse the repository at this point in the history

  8. Removes unused images

    @RamonGilabert
    RamonGilabert committed Dec 11, 2015
    Configuration menu
    Copy the full SHA
    b616a51 View commit details
    Browse the repository at this point in the history

  9. Removes one variable

    @RamonGilabert
    RamonGilabert committed Dec 11, 2015
    Configuration menu
    Copy the full SHA
    5b3be17 View commit details
    Browse the repository at this point in the history

  10. Deletes the ! in the try

    @RamonGilabert
    RamonGilabert committed Dec 11, 2015
    Configuration menu
    Copy the full SHA
    811f622 View commit details
    Browse the repository at this point in the history

  11. Improves the error message

    @RamonGilabert
    RamonGilabert committed Dec 11, 2015
    Configuration menu
    Copy the full SHA
    970488e View commit details
    Browse the repository at this point in the history

  12. Last touches

    @RamonGilabert
    RamonGilabert committed Dec 11, 2015
    Configuration menu
    Copy the full SHA
    73f167d View commit details
    Browse the repository at this point in the history

  13. Conventions

    @RamonGilabert
    RamonGilabert committed Dec 11, 2015
    Configuration menu
    Copy the full SHA
    8089003 View commit details
    Browse the repository at this point in the history

  14. Removes space

    @RamonGilabert
    RamonGilabert committed Dec 11, 2015
    Configuration menu
    Copy the full SHA
    9e71615 View commit details
    Browse the repository at this point in the history

  15. Merge pull request #72 from hyperoslo/improvement/refactor 

    Refactoring the ImagePicker.
    @zenangst
    zenangst committed Dec 11, 2015
    Configuration menu
    Copy the full SHA
    ca4ea47 View commit details
    Browse the repository at this point in the history

Commits on Dec 15, 2015

  1. Add framework project

    @vadymmarkov
    vadymmarkov committed Dec 15, 2015
    Configuration menu
    Copy the full SHA
    acc2d99 View commit details
    Browse the repository at this point in the history

  2. Add targets

    @vadymmarkov
    vadymmarkov committed Dec 15, 2015
    Configuration menu
    Copy the full SHA
    7fad40c View commit details
    Browse the repository at this point in the history

  3. Add tests target

    @vadymmarkov
    vadymmarkov committed Dec 15, 2015
    Configuration menu
    Copy the full SHA
    d091a93 View commit details
    Browse the repository at this point in the history

  4. Update readme

    @vadymmarkov
    vadymmarkov committed Dec 15, 2015
    Configuration menu
    Copy the full SHA
    9e56f6d View commit details
    Browse the repository at this point in the history

  5. Merge pull request #74 from hyperoslo/feature/carthage-support 

    Feature: carthage support
    @RamonGilabert
    RamonGilabert committed Dec 15, 2015
    Configuration menu
    Copy the full SHA
    7b4ab4a View commit details
    Browse the repository at this point in the history

  6. Add Carthage in Readme

    @vadymmarkov
    vadymmarkov committed Dec 15, 2015
    Configuration menu
    Copy the full SHA
    f89aaae View commit details
    Browse the repository at this point in the history

  7. Merge pull request #75 from hyperoslo/improve/readme-with-carthage 

    Add Carthage in Readme
    @RamonGilabert
    RamonGilabert committed Dec 15, 2015
    Configuration menu
    Copy the full SHA
    37e3ebd View commit details
    Browse the repository at this point in the history

Commits on Jan 4, 2016

  1. Fixes first conflict

    @RamonGilabert
    RamonGilabert committed Jan 4, 2016
    Configuration menu
    Copy the full SHA
    8f8e7e9 View commit details
    Browse the repository at this point in the history

  2. Fixes second conflict

    @RamonGilabert
    RamonGilabert committed Jan 4, 2016
    Configuration menu
    Copy the full SHA
    d681c79 View commit details
    Browse the repository at this point in the history

  3. Adds the new assets

    @RamonGilabert
    RamonGilabert committed Jan 4, 2016
    Configuration menu
    Copy the full SHA
    d2cd784 View commit details
    Browse the repository at this point in the history