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

CP-1062 : Eslint conflict free #1

Merged
merged 24 commits into from
May 17, 2016
Merged

CP-1062 : Eslint conflict free #1

merged 24 commits into from
May 17, 2016

Commits on Oct 13, 2015

  1. Fixes: Module interpreted as global module format, but called System.… 

    …register
    @alexcastillo
    alexcastillo committed Oct 13, 2015
    Configuration menu
    Copy the full SHA
    0b8e403 View commit details
    Browse the repository at this point in the history

Commits on Oct 15, 2015

  1. Merge pull request computmaxer#105 from alexandercastillo/master 

    CP-1068 Fixes computmaxer#104: Module interpreted as global module format
    @jayudey-wf
    jayudey-wf committed Oct 15, 2015
    Configuration menu
    Copy the full SHA
    4a3dd4b View commit details
    Browse the repository at this point in the history

Commits on Oct 21, 2015

  1. Import modules in the order they were specified in config

    Andreas Helmberger committed Oct 21, 2015
    Configuration menu
    Copy the full SHA
    0c6e3ba View commit details
    Browse the repository at this point in the history

Commits on Oct 23, 2015

  1. Merge pull request computmaxer#102 from CHECK24/sequential-module-loa… 

    …ding

CP-1061 Import modules in the order they were specified in config
    @jayudey-wf
    jayudey-wf committed Oct 23, 2015
    Configuration menu
    Copy the full SHA
    7abacf6 View commit details
    Browse the repository at this point in the history

Commits on Oct 26, 2015

  1. Update package.json to 2.0.2

    @jayudey-wf
    jayudey-wf committed Oct 26, 2015
    Configuration menu
    Copy the full SHA
    3e02efb View commit details
    Browse the repository at this point in the history

  2. Merge pull request computmaxer#109 from Workiva/Release_2.0.2 

    CP-840 Release karma-jspm 2.0.2
    @jayudey-wf
    jayudey-wf committed Oct 26, 2015
    Configuration menu
    Copy the full SHA
    0a653c3 View commit details
    Browse the repository at this point in the history

Commits on Dec 1, 2015

  1. feat(config): nocache support for jspm.loadFiles 

    Forces file reread in watch cycle
(required for tests in current edit)
Additionally common problem with testing on windows fixed

Closes computmaxer#114 computmaxer#113
    @comdiv
    comdiv committed Dec 1, 2015
    Configuration menu
    Copy the full SHA
    188935a View commit details
    Browse the repository at this point in the history

Commits on Feb 8, 2016

  1. Merge pull request computmaxer#115 from comdiv/114 

    CP-1340 feat(config): nocache support for jspm.loadFiles Closes computmaxer#114  (additionally computmaxer#113)
    @jayudey-wf
    jayudey-wf committed Feb 8, 2016
    Configuration menu
    Copy the full SHA
    3999ab7 View commit details
    Browse the repository at this point in the history

  2. Update package.json to 2.0.3

    @jayudey-wf
    jayudey-wf committed Feb 8, 2016
    Configuration menu
    Copy the full SHA
    9d43810 View commit details
    Browse the repository at this point in the history

  3. Merge pull request computmaxer#125 from Workiva/Release_2.0.3 

    CP-1076 Release karma-jspm 2.0.3
    @jayudey-wf
    jayudey-wf committed Feb 8, 2016
    Configuration menu
    Copy the full SHA
    6c9ab43 View commit details
    Browse the repository at this point in the history

Commits on Feb 18, 2016

  1. Added JSPM browser option for JSPM 0.17.

    @rafi-cengage
    rafi-cengage committed Feb 18, 2016
    Configuration menu
    Copy the full SHA
    6b1492b View commit details
    Browse the repository at this point in the history

  2. Added a test for the browser property

    @rafi-cengage
    rafi-cengage committed Feb 18, 2016
    Configuration menu
    Copy the full SHA
    b3df85d View commit details
    Browse the repository at this point in the history

  3. Removed console.log

    @rafi-cengage
    rafi-cengage committed Feb 18, 2016
    Configuration menu
    Copy the full SHA
    06fa8fa View commit details
    Browse the repository at this point in the history

Commits on Feb 22, 2016

  1. Redirected errors during System.import() to karma.error(). 

    This is primarily useful for SyntaxErrors, as browsers no longer
shutdown when encountering a SyntaxError.

Signed-off-by: Frederik Nordahl Jul Sabroe <frederikns@gmail.com>
    @FrederikNJS
    FrederikNJS committed Feb 22, 2016
    Configuration menu
    Copy the full SHA
    5325e65 View commit details
    Browse the repository at this point in the history

Commits on Feb 24, 2016

  1. Merge pull request computmaxer#130 from FrederikNS/master 

    CP-1392 Redirected errors during System().import to karma().error.
    @jayudey-wf
    jayudey-wf committed Feb 24, 2016
    Configuration menu
    Copy the full SHA
    e02e9b9 View commit details
    Browse the repository at this point in the history

Commits on Mar 9, 2016

  1. Update gulp-jasmine dependency - fixes computmaxer#133

    @dotnetCarpenter
    dotnetCarpenter committed Mar 9, 2016
    Configuration menu
    Copy the full SHA
    f83302f View commit details
    Browse the repository at this point in the history

  2. Merge pull request computmaxer#134 from dotnetCarpenter/patch-1 

    CP-1446 Update gulp-jasmine dependency - fixes computmaxer#133
    @jayudey-wf
    jayudey-wf committed Mar 9, 2016
    Configuration menu
    Copy the full SHA
    62f5ad3 View commit details
    Browse the repository at this point in the history

Commits on Mar 11, 2016

  1. Update README.md 

    Add --save-dev to install instructions
    @caseyhoward
    caseyhoward committed Mar 11, 2016
    Configuration menu
    Copy the full SHA
    70a4a64 View commit details
    Browse the repository at this point in the history

  2. Merge pull request computmaxer#137 from caseyhoward/patch-1 

    CP-1454 Update README.md, karma-jspm 3.11.2016
    @jayudey-wf
    jayudey-wf committed Mar 11, 2016
    Configuration menu
    Copy the full SHA
    27b0dc6 View commit details
    Browse the repository at this point in the history

Commits on Mar 16, 2016

  1. Merge pull request computmaxer#129 from rafiwardak2003/master 

    CP-1447 Support for JSPM 0.17 Beta
    @jayudey-wf
    jayudey-wf committed Mar 16, 2016
    Configuration menu
    Copy the full SHA
    4697980 View commit details
    Browse the repository at this point in the history

  2. Update package.json to 2.1.0

    @jayudey-wf
    jayudey-wf committed Mar 16, 2016
    Configuration menu
    Copy the full SHA
    f576eeb View commit details
    Browse the repository at this point in the history

  3. Merge pull request computmaxer#139 from Workiva/Release_2.1.0 

    CP-1341 Release karma-jspm 2.1.0
    @jayudey-wf
    jayudey-wf committed Mar 16, 2016
    Configuration menu
    Copy the full SHA
    729227c View commit details
    Browse the repository at this point in the history

Commits on Apr 29, 2016

  1. Merge branch 'master' of github.com:Workiva/karma-jspm into eslint 

    Conflicts:
	src/adapter.js
	src/init.js
    Dustin Lessard committed Apr 29, 2016
    Configuration menu
    Copy the full SHA
    c04137a View commit details
    Browse the repository at this point in the history

  2. cp-1062 : adjusted spacing

    Dustin Lessard committed Apr 29, 2016
    Configuration menu
    Copy the full SHA
    718402f View commit details
    Browse the repository at this point in the history