Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: karma-runner/karma
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v1.1.1
Choose a base ref
...
head repository: karma-runner/karma
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v1.1.2
Choose a head ref
  • 13 commits
  • 9 files changed
  • 5 contributors

Commits on Jul 10, 2016

  1. fix: Merge config child nodes on config.set()

    The old behaviour will override child option nodes like options.client, causing properties to be lost if the new
    option node is only partially specified. This partially causes karma-runner/grunt-karma#165 and
    karma-runner/grunt-karma#166.
    gnail committed Jul 10, 2016
    Configuration menu
    Copy the full SHA
    65b688a View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    123a576 View commit details
    Browse the repository at this point in the history
  3. fix(docs): fix stopper.stop wrong variable name. closes #2244

    Was:
    
    ```js
    var stopper = require('karma').stopper
    runner.stop({port: 9876}, function(exitCode) {
    ```
    
    Changed to :
    
    ```js
    var stopper = require('karma').stopper
    stopper.stop({port: 9876}, function(exitCode) {
    ```
    yanivefraim committed Jul 10, 2016
    Configuration menu
    Copy the full SHA
    0745a00 View commit details
    Browse the repository at this point in the history

Commits on Jul 11, 2016

  1. Merge pull request #2245 from yanivefraim/master

    fix(docs): fix stopper.stop wrong variable name. closes #2244
    dignifiedquire committed Jul 11, 2016
    Configuration menu
    Copy the full SHA
    f6cdab5 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #2214 from gnail/patch-1

    fix: Merge config files on Config.set()
    dignifiedquire committed Jul 11, 2016
    Configuration menu
    Copy the full SHA
    1e526e3 View commit details
    Browse the repository at this point in the history

Commits on Jul 13, 2016

  1. Configuration menu
    Copy the full SHA
    306e565 View commit details
    Browse the repository at this point in the history

Commits on Jul 15, 2016

  1. Configuration menu
    Copy the full SHA
    20b87de View commit details
    Browse the repository at this point in the history
  2. Merge pull request #2256 from shaharmor/fix-warn-logs

    fix WARN logs for undefined error handler
    dignifiedquire committed Jul 15, 2016
    Configuration menu
    Copy the full SHA
    9622f87 View commit details
    Browse the repository at this point in the history

Commits on Jul 25, 2016

  1. fix(file-list): ensure patterns are comparable

    Thanks to @m-a-r-c-e-l-i-n-o for pointing me in the right direction
    Fixes #2194
    dignifiedquire committed Jul 25, 2016
    Configuration menu
    Copy the full SHA
    4d1bf3e View commit details
    Browse the repository at this point in the history
  2. Merge pull request #2252 from twolfson/bug/postmessage.overreach.sqwi…

    …shed
    
    fix(context): Updated postMessage listener to stop validating non-Karma messages
    dignifiedquire committed Jul 25, 2016
    Configuration menu
    Copy the full SHA
    3b39c31 View commit details
    Browse the repository at this point in the history

Commits on Jul 26, 2016

  1. Merge pull request #2277 from karma-runner/fix-pattern-file-list

    fix(file-list): ensure patterns are comparable
    dignifiedquire committed Jul 26, 2016
    Configuration menu
    Copy the full SHA
    de16802 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    39b2fb7 View commit details
    Browse the repository at this point in the history
  3. chore: release v1.1.2

    dignifiedquire committed Jul 26, 2016
    Configuration menu
    Copy the full SHA
    ca4e2c7 View commit details
    Browse the repository at this point in the history
Loading