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.

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

Merge to master to release version 4.1.1 #1614

Merged
merged 29 commits into from
Apr 8, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
84fdb6d
bump jinja2 to version 2.11.1
briehl Feb 25, 2020
fa9a60a
scoll to the top works
FlyingUnicornSF Mar 6, 2020
738030c
scroll to the bottom smooth working - sort of
FlyingUnicornSF Mar 6, 2020
e796126
removed two console.log
FlyingUnicornSF Mar 6, 2020
8ce69cb
fix narrative panel sorting
briehl Mar 18, 2020
b6186a0
add better error handling when a directory doesn't exist.
briehl Mar 24, 2020
e07acc7
Merge pull request #1597 from briehl/develop
briehl Mar 25, 2020
a616169
Merge pull request #1602 from briehl/fix-narr-sort-order
briehl Mar 25, 2020
d739d13
show error separate from file table
briehl Mar 26, 2020
4272e6c
Make more legible errors in import area
briehl Mar 30, 2020
7bd42f9
improve staging area tests
briehl Mar 31, 2020
1e81788
Merge pull request #1604 from briehl/PUBLIC-1009-staging-subdir
briehl Mar 31, 2020
7b09852
add more staging area viewer tests
briehl Mar 31, 2020
ac2240b
Merge pull request #1607 from briehl/PUBLIC-1009-staging-subdir
briehl Apr 1, 2020
9000459
add release notes, bump version to 4.1.1
briehl Apr 1, 2020
35c6848
Merge pull request #1610 from briehl/develop
briehl Apr 1, 2020
0949d59
Merge pull request #4 from FlyingUnicornSF/scrollFixing
briehl Apr 6, 2020
4b511fc
Merge pull request #1600 from FlyingUnicornSF/scrollFixing
briehl Apr 6, 2020
97eac88
Merge branch 'develop' of https://github.com/kbase/narrative into log…
briehl Apr 6, 2020
49d9500
update package-lock version, revert default config env
briehl Apr 6, 2020
eb563fa
Merge pull request #1622 from briehl/log-viewer
briehl Apr 6, 2020
e1c7149
remove jquery from job log viewer, other minor fixes
briehl Apr 7, 2020
fdc1e7d
add initial test spec for job log viewer unit testing
briehl Apr 7, 2020
e1ee3e7
issue 1620 - format log lines more cleanly
briehl Apr 7, 2020
0506272
add testing, test for startup fails
briehl Apr 7, 2020
eb7f02e
Merge pull request #1623 from briehl/log-viewer
briehl Apr 8, 2020
4cf1f9e
add tests, fix state enabling expand button
briehl Apr 8, 2020
84ebcb3
add state testing for base state
briehl Apr 8, 2020
30cdd18
Merge pull request #1624 from briehl/log-viewer
briehl Apr 8, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions RELEASE_NOTES.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@ The Narrative Interface allows users to craft KBase Narratives using a combinati

This is built on the Jupyter Notebook v6.0.2 (more notes will follow).

### Version 4.1.1
- Fix sort order in Narratives panel - should be by most recently saved.
- Add better error support in data staging uploader - if an upload directory is not available, you should be able to return to the root directory without trouble.

### Version 4.1.0
- Introduce Static Narratives, available under the Share menu. First release!

Expand Down
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "kbase-narrative",
"version": "4.1.0",
"version": "4.1.1",
"homepage": "https://kbase.us",
"dependencies": {
"bluebird": "3.4.7",
Expand Down
10 changes: 5 additions & 5 deletions kbase-extension/static/kbase/css/kbaseJobLog.css
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,11 @@
.kblog-header {
display: flex;
font-family: monospace;
font-size: 85%;
font-size: 85%;
}

.kblog-line {
display: flex;
font-family: monospace;
font-size: 85%;
}

.kblog-line:hover {
Expand All @@ -31,11 +29,13 @@

.kblog-num-wrapper {
font-size: 85%;
display: flex;
flex-direction: row;
}

.kblog-line-num {
flex-shrink: 0;
width: 9ex;
width: 3rem;
text-align: right;
color: #999;
white-space: nowrap;
Expand Down Expand Up @@ -72,4 +72,4 @@
#kblog-err {
margin-top: 5px;
/* color: #660000; */
}
}
Loading