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

Jest jasmine/ts migration #7970

Merged
merged 36 commits into from Mar 5, 2019
Merged

Jest jasmine/ts migration #7970

merged 36 commits into from Mar 5, 2019

Commits on Feb 23, 2019

  1. Migration to ts (part 1)

    @doniyor2109
    doniyor2109 committed Feb 23, 2019
    Copy the full SHA
    a9fb41b View commit details
    Browse the repository at this point in the history

Commits on Feb 24, 2019

  1. Migration to ts (part 2)

    @doniyor2109
    doniyor2109 committed Feb 24, 2019
    Copy the full SHA
    239e2c7 View commit details
    Browse the repository at this point in the history

  2. Configure ts config

    @doniyor2109
    doniyor2109 committed Feb 24, 2019
    Copy the full SHA
    09867ae View commit details
    Browse the repository at this point in the history

  3. Migrating TS (part 3)

    @doniyor2109
    doniyor2109 committed Feb 24, 2019
    Copy the full SHA
    0d4c004 View commit details
    Browse the repository at this point in the history

  4. fix typo

    @SimenB
    SimenB committed Feb 24, 2019
    Copy the full SHA
    f57370a View commit details
    Browse the repository at this point in the history

  5. include types in package.json

    @SimenB
    SimenB committed Feb 24, 2019
    Copy the full SHA
    f9d1025 View commit details
    Browse the repository at this point in the history

  6. Migrating TS (part 4)

    @doniyor2109
    doniyor2109 committed Feb 24, 2019
    Copy the full SHA
    e2877b0 View commit details
    Browse the repository at this point in the history

Commits on Feb 27, 2019

  1. Some tweaks

    @doniyor2109
    doniyor2109 committed Feb 27, 2019
    Copy the full SHA
    d00496a View commit details
    Browse the repository at this point in the history

Commits on Mar 1, 2019

  1. Small tweaks

    @doniyor2109
    doniyor2109 committed Mar 1, 2019
    Copy the full SHA
    eee8339 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'jest/master' into jest-jasmine/ts_migra… 

    …tion

# Conflicts:
#	packages/jest-jasmine2/src/jasmine/Env.js
    @doniyor2109
    doniyor2109 committed Mar 1, 2019
    Copy the full SHA
    5ef9829 View commit details
    Browse the repository at this point in the history

Commits on Mar 2, 2019

  1. Merge remote-tracking branch 'jest/master' into jest-jasmine/ts_migra… 

    …tion
    @doniyor2109
    doniyor2109 committed Mar 2, 2019
    Copy the full SHA
    2d14cf1 View commit details
    Browse the repository at this point in the history

  2. Small tweaks

    @doniyor2109
    doniyor2109 committed Mar 2, 2019
    Copy the full SHA
    bc6d48f View commit details
    Browse the repository at this point in the history

  3. Small tweaks

    @doniyor2109
    doniyor2109 committed Mar 2, 2019
    Copy the full SHA
    d2b3eba View commit details
    Browse the repository at this point in the history

  4. TS migration part (6)

    @doniyor2109
    doniyor2109 committed Mar 2, 2019
    Copy the full SHA
    b52c8f2 View commit details
    Browse the repository at this point in the history

Commits on Mar 3, 2019

  1. TS migration part (final)

    @doniyor2109
    doniyor2109 committed Mar 3, 2019
    Copy the full SHA
    a3263b5 View commit details
    Browse the repository at this point in the history

  2. Linter fixes

    @doniyor2109
    doniyor2109 committed Mar 3, 2019
    Copy the full SHA
    d5a4c17 View commit details
    Browse the repository at this point in the history

  3. Fix tests

    @doniyor2109
    doniyor2109 committed Mar 3, 2019
    Copy the full SHA
    b73f4b7 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' into jest-jasmine/ts_migration

    @SimenB
    SimenB committed Mar 3, 2019
    Copy the full SHA
    67a046a View commit details
    Browse the repository at this point in the history

  5. Small tweaks

    @doniyor2109
    doniyor2109 committed Mar 3, 2019
    Copy the full SHA
    69a427e View commit details
    Browse the repository at this point in the history

  6. Merge remote-tracking branch 'jest/master' into jest-jasmine/ts_migra… 

    …tion
    @doniyor2109
    doniyor2109 committed Mar 3, 2019
    Copy the full SHA
    645bc92 View commit details
    Browse the repository at this point in the history

  7. Merge remote-tracking branch 'origin/jest-jasmine/ts_migration' into … 

    …jest-jasmine/ts_migration
    @doniyor2109
    doniyor2109 committed Mar 3, 2019
    Copy the full SHA
    03ec289 View commit details
    Browse the repository at this point in the history

  8. Update changelog

    @doniyor2109
    doniyor2109 committed Mar 3, 2019
    Copy the full SHA
    7aeeb6f View commit details
    Browse the repository at this point in the history

  9. Tweaks for property fields

    @doniyor2109
    doniyor2109 committed Mar 3, 2019
    Copy the full SHA
    26c59b5 View commit details
    Browse the repository at this point in the history

  10. Merge remote-tracking branch 'jest/master' into jest-jasmine/ts_migra… 

    …tion

# Conflicts:
#	packages/jest-diff/src/index.ts
    @doniyor2109
    doniyor2109 committed Mar 3, 2019
    Copy the full SHA
    7f76abb View commit details
    Browse the repository at this point in the history

  11. Resolve import/no-extraneous-dependencies

    @doniyor2109
    doniyor2109 committed Mar 3, 2019
    Copy the full SHA
    0625619 View commit details
    Browse the repository at this point in the history

  12. fix jest-diff import

    @SimenB
    SimenB committed Mar 3, 2019
    Copy the full SHA
    14a1564 View commit details
    Browse the repository at this point in the history

  13. tweaks

    @SimenB
    SimenB committed Mar 3, 2019
    Copy the full SHA
    9a9c65f View commit details
    Browse the repository at this point in the history

  14. Remove extra types

    @doniyor2109
    doniyor2109 committed Mar 3, 2019
    Copy the full SHA
    f9106ef View commit details
    Browse the repository at this point in the history

  15. Merge remote-tracking branch 'origin/jest-jasmine/ts_migration' into … 

    …jest-jasmine/ts_migration

# Conflicts:
#	packages/jest-jasmine2/src/index.ts
    @doniyor2109
    doniyor2109 committed Mar 3, 2019
    Copy the full SHA
    b9b422a View commit details
    Browse the repository at this point in the history

  16. Merge branch 'master' into jest-jasmine/ts_migration

    @SimenB
    SimenB committed Mar 3, 2019
    Copy the full SHA
    ee9d572 View commit details
    Browse the repository at this point in the history

  17. fix error after merging master

    @SimenB
    SimenB committed Mar 3, 2019
    Copy the full SHA
    93f7414 View commit details
    Browse the repository at this point in the history

Commits on Mar 4, 2019

  1. Merge remote-tracking branch 'origin/jest-jasmine/ts_migration' into … 

    …jest-jasmine/ts_migration
    @doniyor2109
    doniyor2109 committed Mar 4, 2019
    Copy the full SHA
    8e3ecd8 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'jest/master' into jest-jasmine/ts_migra… 

    …tion
    @doniyor2109
    doniyor2109 committed Mar 4, 2019
    Copy the full SHA
    cf01cf9 View commit details
    Browse the repository at this point in the history

Commits on Mar 5, 2019

  1. Merge branch 'master' into jest-jasmine/ts_migration

    @SimenB
    SimenB committed Mar 5, 2019
    Copy the full SHA
    b89e537 View commit details
    Browse the repository at this point in the history

  2. lint

    @SimenB
    SimenB committed Mar 5, 2019
    Copy the full SHA
    548f05f View commit details
    Browse the repository at this point in the history

  3. fix type error

    @SimenB
    SimenB committed Mar 5, 2019
    Copy the full SHA
    8e264a3 View commit details
    Browse the repository at this point in the history