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

Merge to master to release version 4.1.1 #1614

Merged
merged 29 commits into from
Apr 8, 2020
Merged

Merge to master to release version 4.1.1 #1614

merged 29 commits into from
Apr 8, 2020

Commits on Feb 25, 2020

  1. bump jinja2 to version 2.11.1

    @briehl
    briehl committed Feb 25, 2020
    Configuration menu
    Copy the full SHA
    84fdb6d View commit details
    Browse the repository at this point in the history

Commits on Mar 6, 2020

  1. scoll to the top works

    @FlyingUnicornSF
    FlyingUnicornSF committed Mar 6, 2020
    Configuration menu
    Copy the full SHA
    fa9a60a View commit details
    Browse the repository at this point in the history

  2. scroll to the bottom smooth working - sort of

    @FlyingUnicornSF
    FlyingUnicornSF committed Mar 6, 2020
    Configuration menu
    Copy the full SHA
    738030c View commit details
    Browse the repository at this point in the history

  3. removed two console.log

    @FlyingUnicornSF
    FlyingUnicornSF committed Mar 6, 2020
    Configuration menu
    Copy the full SHA
    e796126 View commit details
    Browse the repository at this point in the history

Commits on Mar 18, 2020

  1. fix narrative panel sorting

    @briehl
    briehl committed Mar 18, 2020
    Configuration menu
    Copy the full SHA
    8ce69cb View commit details
    Browse the repository at this point in the history

Commits on Mar 24, 2020

  1. add better error handling when a directory doesn't exist.

    @briehl
    briehl committed Mar 24, 2020
    Configuration menu
    Copy the full SHA
    b6186a0 View commit details
    Browse the repository at this point in the history

Commits on Mar 25, 2020

  1. Merge pull request #1597 from briehl/develop 

    bump jinja2 to version 2.11.1
    @briehl
    briehl authored Mar 25, 2020
    Configuration menu
    Copy the full SHA
    e07acc7 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1602 from briehl/fix-narr-sort-order 

    Fix narrative sort order
    @briehl
    briehl authored Mar 25, 2020
    Configuration menu
    Copy the full SHA
    a616169 View commit details
    Browse the repository at this point in the history

Commits on Mar 26, 2020

  1. show error separate from file table

    @briehl
    briehl committed Mar 26, 2020
    Configuration menu
    Copy the full SHA
    d739d13 View commit details
    Browse the repository at this point in the history

Commits on Mar 30, 2020

  1. Make more legible errors in import area

    @briehl
    briehl committed Mar 30, 2020
    Configuration menu
    Copy the full SHA
    4272e6c View commit details
    Browse the repository at this point in the history

Commits on Mar 31, 2020

  1. improve staging area tests

    @briehl
    briehl committed Mar 31, 2020
    Configuration menu
    Copy the full SHA
    7bd42f9 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1604 from briehl/PUBLIC-1009-staging-subdir 

    PUBLIC-1009 add better error handling when a staging area directory...
    @briehl
    briehl authored Mar 31, 2020
    Configuration menu
    Copy the full SHA
    1e81788 View commit details
    Browse the repository at this point in the history

  3. add more staging area viewer tests

    @briehl
    briehl committed Mar 31, 2020
    Configuration menu
    Copy the full SHA
    7b09852 View commit details
    Browse the repository at this point in the history

Commits on Apr 1, 2020

  1. Merge pull request #1607 from briehl/PUBLIC-1009-staging-subdir 

    add more staging area viewer tests
    @briehl
    briehl authored Apr 1, 2020
    Configuration menu
    Copy the full SHA
    ac2240b View commit details
    Browse the repository at this point in the history

  2. add release notes, bump version to 4.1.1

    @briehl
    briehl committed Apr 1, 2020
    Configuration menu
    Copy the full SHA
    9000459 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #1610 from briehl/develop 

    add release notes, bump version to 4.1.1
    @briehl
    briehl authored Apr 1, 2020
    Configuration menu
    Copy the full SHA
    35c6848 View commit details
    Browse the repository at this point in the history

Commits on Apr 6, 2020

  1. Merge pull request #4 from FlyingUnicornSF/scrollFixing 

    Scroll fixing
    @briehl
    briehl authored Apr 6, 2020
    Configuration menu
    Copy the full SHA
    0949d59 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1600 from FlyingUnicornSF/scrollFixing 

    Scroll fixing
    @briehl
    briehl authored Apr 6, 2020
    Configuration menu
    Copy the full SHA
    4b511fc View commit details
    Browse the repository at this point in the history

  3. Merge branch 'develop' of https://github.com/kbase/narrative into log… 

    …-viewer
    @briehl
    briehl committed Apr 6, 2020
    Configuration menu
    Copy the full SHA
    97eac88 View commit details
    Browse the repository at this point in the history

  4. update package-lock version, revert default config env

    @briehl
    briehl committed Apr 6, 2020
    Configuration menu
    Copy the full SHA
    49d9500 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #1622 from briehl/log-viewer 

    Revert config.json change, bump package-lock version
    @briehl
    briehl authored Apr 6, 2020
    Configuration menu
    Copy the full SHA
    eb563fa View commit details
    Browse the repository at this point in the history

Commits on Apr 7, 2020

  1. remove jquery from job log viewer, other minor fixes

    @briehl
    briehl committed Apr 7, 2020
    Configuration menu
    Copy the full SHA
    e1c7149 View commit details
    Browse the repository at this point in the history

  2. add initial test spec for job log viewer unit testing

    @briehl
    briehl committed Apr 7, 2020
    Configuration menu
    Copy the full SHA
    fdc1e7d View commit details
    Browse the repository at this point in the history

  3. issue 1620 - format log lines more cleanly

    @briehl
    briehl committed Apr 7, 2020
    Configuration menu
    Copy the full SHA
    e1ee3e7 View commit details
    Browse the repository at this point in the history

  4. add testing, test for startup fails

    @briehl
    briehl committed Apr 7, 2020
    Configuration menu
    Copy the full SHA
    0506272 View commit details
    Browse the repository at this point in the history

Commits on Apr 8, 2020

  1. Merge pull request #1623 from briehl/log-viewer 

    remove jquery from job log viewer, other minor fixes
    @briehl
    briehl authored Apr 8, 2020
    Configuration menu
    Copy the full SHA
    eb7f02e View commit details
    Browse the repository at this point in the history

  2. add tests, fix state enabling expand button

    @briehl
    briehl committed Apr 8, 2020
    Configuration menu
    Copy the full SHA
    4cf1f9e View commit details
    Browse the repository at this point in the history

  3. add state testing for base state

    @briehl
    briehl committed Apr 8, 2020
    Configuration menu
    Copy the full SHA
    84ebcb3 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #1624 from briehl/log-viewer 

    Issue #1619 - disable button at start
    @briehl
    briehl authored Apr 8, 2020
    Configuration menu
    Copy the full SHA
    30cdd18 View commit details
    Browse the repository at this point in the history