Permalink
Commits on Mar 29, 2013
  1. Merge pull request #167 from cloke/master

    Remove App.initialize
    wagenet committed Mar 29, 2013
Commits on Mar 27, 2013
  1. Remove App.initialize from coffeescript template

    Cory Loken committed Mar 27, 2013
Commits on Mar 26, 2013
  1. Merge pull request #158 from jmflannery/master

    Fix to use bootstrap generator with a custom path with --ember_path option.
    tchak committed Mar 26, 2013
  2. Merge pull request #156 from AdRulz/master

    Fix undefined application after bootstrap
    tchak committed Mar 26, 2013
  3. Merge pull request #162 from knewter/patch-1

    Add note about updating ember from master
    stefanpenner committed Mar 26, 2013
Commits on Mar 25, 2013
  1. Merge remote-tracking branch 'origin/master' into patch-1

    Conflicts:
    	[resolved] README.md
    knewter committed Mar 25, 2013
  2. Merge pull request #161 from clekstro/patch-3

    Update README.md
    stefanpenner committed Mar 25, 2013
  3. Update README.md

    re-apply fix from @juliehache
    clekstro committed Mar 25, 2013
  4. Merge pull request #160 from clekstro/patch-2

    Update README.md
    stefanpenner committed Mar 25, 2013
  5. Update README.md

    clekstro committed Mar 25, 2013
Commits on Mar 24, 2013
  1. In the bootstrap generator, use ember_path instead of hard coded 'app…

    …/assets/javascripts' in case the user passes a custom path with --ember_path or -d. Also added a test/dummy/app/assets/javascripts/custom/application.js, so that the tests will pass, becasuse that file needs to exist so the generator can add to it. This is useful when using ember-rails in a rail 3.x engine that uses namespacing.
    jmflannery committed Mar 24, 2013
Commits on Mar 17, 2013
  1. Merge pull request #3 from rromanchuk/fix-undefined-application

    Fix undefined application
    ayarulin committed Mar 17, 2013
  2. Small fix that won't throw exceptions in development because of coffe…

    …e wrapping this in an anonymous function
    rromanchuk committed Mar 17, 2013
  3. Merge pull request #154 from AdRulz/master

    Add note about coffeescript support to README
    stefanpenner committed Mar 17, 2013
Commits on Mar 15, 2013
  1. Merge pull request #93 from AdRulz/master

    Add CoffeeScript generators
    tchak committed Mar 15, 2013
Commits on Mar 9, 2013
  1. Merge pull request #152 from chadhietala/patch-1

    Should clear up confusion in #151
    stefanpenner committed Mar 9, 2013
Commits on Mar 2, 2013
  1. Merge pull request #145 from tricknotes/support-belongs_to

    Support belongs to
    stefanpenner committed Mar 2, 2013
  2. Merge pull request #148 from ahmacleod/readme-templates-root

    Amended README with note to clear local sprockets cache after modifying ...
    stefanpenner committed Mar 2, 2013
  3. Merge pull request #149 from heycarsten/fix-install-generator-clean-b…

    …efore-build
    
    Ensure rake clean is called before rake dist for install head generator.
    stefanpenner committed Mar 2, 2013
Commits on Mar 1, 2013
Commits on Feb 28, 2013
  1. Amended README with note to clear local sprockets cache after modifyi…

    …ng templates_root
    Alex MacLeod committed Feb 28, 2013
  2. version bump

    tchak committed Feb 28, 2013
  3. Merge pull request #147 from machty/precompile-tests

    Fixed bug with assets:precompile not finding (ember/handlebars)-source. ...
    tchak committed Feb 28, 2013
  4. Merge pull request #144 from mtylty/adds_missing_path_scope_for_boots…

    …trap_generator
    
    Adds missing path scope for bootstrap generator
    stefanpenner committed Feb 28, 2013
  5. Merge pull request #146 from achambers/patch-1

    Fixed typo - by -> be
    stefanpenner committed Feb 28, 2013
  6. Fixed bug with assets:precompile not finding (ember/handlebars)-sourc…

    …e. Added precompile test cases.
    machty committed Feb 28, 2013
  7. version bump

    tchak committed Feb 28, 2013
  8. Fixed typo - by -> be

    achambers committed Feb 28, 2013
  9. ember-rails 0.10.0 ready

    ayarulin committed Feb 28, 2013
Commits on Feb 27, 2013