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

Sync master with develop #58

Merged
merged 10 commits into from
Feb 17, 2016
Merged

Sync master with develop #58

merged 10 commits into from
Feb 17, 2016

Commits on Dec 4, 2015

  1. Merge branch 'release/2.0.4' into develop

    @poteto
    poteto committed Dec 4, 2015
    Configuration menu
    Copy the full SHA
    7fb7b0b View commit details
    Browse the repository at this point in the history

Commits on Feb 5, 2016

  1. Pinned jQuery to 1.11.3

    @XiphiasUvella
    XiphiasUvella committed Feb 5, 2016
    Configuration menu
    Copy the full SHA
    a0802ce View commit details
    Browse the repository at this point in the history

  2. Merge pull request #54 from martndemus/pin-jquery 

    Pinned jQuery to 1.11.3
    @XiphiasUvella
    XiphiasUvella committed Feb 5, 2016
    Configuration menu
    Copy the full SHA
    507367c View commit details
    Browse the repository at this point in the history

  3. Update Ember CLI and deps

    @XiphiasUvella
    XiphiasUvella committed Feb 5, 2016
    Configuration menu
    Copy the full SHA
    c34cdd5 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #55 from martndemus/update-ember-cli 

    Update Ember CLI and deps
    @XiphiasUvella
    XiphiasUvella committed Feb 5, 2016
    Configuration menu
    Copy the full SHA
    09311cd View commit details
    Browse the repository at this point in the history

  5. Use Google Chrome to run tests

    @XiphiasUvella
    XiphiasUvella committed Feb 5, 2016
    Configuration menu
    Copy the full SHA
    87b565f View commit details
    Browse the repository at this point in the history

  6. Merge pull request #53 from martndemus/test-with-chrome 

    Use Google Chrome to run tests
    @XiphiasUvella
    XiphiasUvella committed Feb 5, 2016
    Configuration menu
    Copy the full SHA
    6c4aad7 View commit details
    Browse the repository at this point in the history

Commits on Feb 9, 2016

  1. Install ember-getowner-polyfill and replace this.container with getOw… 

    …ner(this)
    Alinaki committed Feb 9, 2016
    Configuration menu
    Copy the full SHA
    d19dc21 View commit details
    Browse the repository at this point in the history

Commits on Feb 10, 2016

  1. Remove extra line break

    Alinaki committed Feb 10, 2016
    Configuration menu
    Copy the full SHA
    82fa175 View commit details
    Browse the repository at this point in the history

  2. Auto merge of #56 - Alinaki:develop, r=poteto 

    Install ember-getowner-polyfill and replace this.container with getOwner(this)

Just in case of new Ember 2.3.0 Owner API.
    @homu
    homu committed Feb 10, 2016
    Configuration menu
    Copy the full SHA
    b378311 View commit details
    Browse the repository at this point in the history