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

resolve merge conflict for PR #151 #187

Merged
merged 13 commits into from
May 7, 2017
Merged

resolve merge conflict for PR #151 #187

merged 13 commits into from
May 7, 2017

Commits on Nov 26, 2016

  1. added support for multi-compiler configuration 

    see: webpack/webpack-dev-server#641
    @iMoses
    iMoses committed Nov 26, 2016
    Configuration menu
    Copy the full SHA
    77b0a7b View commit details
    Browse the repository at this point in the history

  2. fixed compiler reference in the multi-compiler patch

    @iMoses
    iMoses committed Nov 26, 2016
    Configuration menu
    Copy the full SHA
    ca56aa4 View commit details
    Browse the repository at this point in the history

  3. moved new method to the getFilenamefromUrl file, adjusted tests accor… 

    …dingly
    @iMoses
    iMoses committed Nov 26, 2016
    Configuration menu
    Copy the full SHA
    91ce6e7 View commit details
    Browse the repository at this point in the history

  4. adjusted test to verify multi-compiler mode is functioning correctly … 

    …when more than one outputPath is present
    @iMoses
    iMoses committed Nov 26, 2016
    Configuration menu
    Copy the full SHA
    9f8c1cd View commit details
    Browse the repository at this point in the history

  5. added a few more tests to verify multi-compiler handling

    @iMoses
    iMoses committed Nov 26, 2016
    Configuration menu
    Copy the full SHA
    23e3ac0 View commit details
    Browse the repository at this point in the history

  6. added a few more tests to verify multi-compiler handling

    @iMoses
    iMoses committed Nov 26, 2016
    Configuration menu
    Copy the full SHA
    aeb4175 View commit details
    Browse the repository at this point in the history

  7. added a few more tests to verify multi-compiler handling

    @iMoses
    iMoses committed Nov 26, 2016
    Configuration menu
    Copy the full SHA
    b1d0fe4 View commit details
    Browse the repository at this point in the history

Commits on Apr 20, 2017

  1. resolve merge conflict for PR webpack#151

    @faceyspacey
    faceyspacey committed Apr 20, 2017
    Configuration menu
    Copy the full SHA
    b666756 View commit details
    Browse the repository at this point in the history

  2. merge

    @faceyspacey
    faceyspacey committed Apr 20, 2017
    Configuration menu
    Copy the full SHA
    1dd801b View commit details
    Browse the repository at this point in the history

  3. format

    @faceyspacey
    faceyspacey committed Apr 20, 2017
    Configuration menu
    Copy the full SHA
    e1656b9 View commit details
    Browse the repository at this point in the history

Commits on Apr 27, 2017

  1. readme

    @faceyspacey
    faceyspacey committed Apr 27, 2017
    Configuration menu
    Copy the full SHA
    a06f6a8 View commit details
    Browse the repository at this point in the history

Commits on May 7, 2017

  1. chore($deleteFile) remove yarn.lock

    @faceyspacey
    faceyspacey committed May 7, 2017
    Configuration menu
    Copy the full SHA
    450b9d6 View commit details
    Browse the repository at this point in the history

  2. chore($revert) revert readme and package.json to pre-fork state

    @faceyspacey
    faceyspacey committed May 7, 2017
    Configuration menu
    Copy the full SHA
    e6a3bec View commit details
    Browse the repository at this point in the history