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

New version for Typescript 1.5 with ES6 modules and Webpack #708

Merged
merged 6 commits into from
Aug 24, 2015
Merged

New version for Typescript 1.5 with ES6 modules and Webpack #708

merged 6 commits into from
Aug 24, 2015

Commits on Aug 5, 2015

  1. wip working version of typescript with modules and webpack

    @Swiip
    Swiip committed Aug 5, 2015
    Configuration menu
    Copy the full SHA
    1bc444a View commit details
    Browse the repository at this point in the history

Commits on Aug 6, 2015

  1. fix tests for typescript with webpack

    @Swiip
    Swiip committed Aug 6, 2015
    Configuration menu
    Copy the full SHA
    145e82c View commit details
    Browse the repository at this point in the history

  2. update npm shrinkwrap for typescript webpack

    @Swiip
    Swiip committed Aug 6, 2015
    Configuration menu
    Copy the full SHA
    6dbc6e4 View commit details
    Browse the repository at this point in the history

  3. forgot a if about tsd and webpack

    @Swiip
    Swiip committed Aug 6, 2015
    Configuration menu
    Copy the full SHA
    cb841a4 View commit details
    Browse the repository at this point in the history

  4. should include ts files in karma to run tests

    @Swiip
    Swiip committed Aug 6, 2015
    Configuration menu
    Copy the full SHA
    fd78bc3 View commit details
    Browse the repository at this point in the history

Commits on Aug 24, 2015

  1. Merge branch 'master' into typescript-modules 

    Conflicts:
	app/templates/src/app/_index.config.ts
	app/templates/src/app/_index.module.ts
	app/templates/src/app/main/_main.controller.ts
	test/npm-shrinkwrap.json
    @Swiip
    Swiip committed Aug 24, 2015
    Configuration menu
    Copy the full SHA
    e7597a6 View commit details
    Browse the repository at this point in the history