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 for 3.5.2 release. #1225

Merged
merged 144 commits into from
Jan 4, 2018
Merged

Merge to master for 3.5.2 release. #1225

merged 144 commits into from
Jan 4, 2018

Conversation

briehl
Copy link
Member

@briehl briehl commented Jan 2, 2018

No description provided.

briehl and others added 30 commits October 17, 2017 17:20
@briehl
First pass at a dynamic dropdown input widget
88e1171
@briehl
some cleanup of dead code
2b0319e
@JamesJeffryes
add dynamic images to compound detail pages
eeb6b4a
@briehl
Adjustments to make file staging dropdown a bit more legible
9cd37f4
@briehl
Stubs for dynamic services as source of dropdown data.
5fe59e5
@briehl
Merge branch 'develop' into task-1128-import-dropdown
4591a74
@briehl
some fixes, update config file
b583887
@briehl
fix view-only side of dynamic dropdown element.
0fd566b
@briehl
put an exact date stamp on files for the dynamic dropdown
ee1917c
@briehl
Merge branch 'test-refactor' into task-1128-import-dropdown
40699ad
@briehl
more tests!
f7057bf
@briehl
and here's the test specs
c2a6588
@briehl
Merge branch 'develop' into task-1128-import-dropdown
cd557fc
@briehl
some test data and info
001f1c6
@briehl
more tests, tweak to testutil
7bab74c
@briehl
Add dropdown input widget test. Finally.
b939a43
@briehl
turn off single-test mode
bf8d5e7
@briehl
fixing some stale old issues with narrativeconfig
2f53f95
@briehl
some cleanup for the dynamic dropdown
c148e8b
@briehl
fix tests so they run (well, get skipped) without a token
c67da11
@briehl
Merge pull request #1191 from briehl/task-1128-import-dropdown
464f78c 
TASK-1128 Introduces a dropdown that populates itself from the staging area
@briehl
some preliminary code cleanup to get my linter to calm down
3961721
@briehl
some tweaks and updates to use filestaging client
bc43abc
@JamesJeffryes
Get service wizard url from environment, update image size and add in…
44c28ec 
…chikey and smiles to compound page
@briehl
revert change to config
f836b6b
@nlharris
narrative -> Narrative
a58b982
@nlharris
narrative -> Narrative
85c4f86
@briehl
Merge pull request #1197 from nlharris/patch-22
e5dcf02 
narrative -> Narrative
@briehl
Merge pull request #1196 from nlharris/patch-21
daf4acd 
narrative -> Narrative
@thomasoniii
initial checkpoint of myself before I merge in Bills work in this are…
aed2351 
…a. UI is mostly right; lacks service wiring
tiramisu24 and others added 27 commits November 28, 2017 14:49
@tiramisu24
change error styling
7d16716
@briehl
Fix minor problem with dropdown display
93060ec
@briehl
Merge pull request #1212 from briehl/develop
b488b18 
Migrate hotfixes from master into develop
@briehl
Merge pull request #1216 from briehl/import-refactor
ad74fc5 
Fix minor display problem in staging area dropdown input
@thomasoniii
updated UPA field to be pretty
37db7be
@thomasoniii
Merge branch 'develop' into staging-panel
4822440
@briehl
Merge pull request #1217 from kbase/staging-panel
e10b78f 
pretties up the UPA field
@tiramisu24
cleanup
6b463a1
@briehl
Merge pull request #1215 from tiramisu24/develop
383e5f7 
Revamp log viewer for apps ran [KBASE-5405]
@briehl
add more clear sorting control
0f835d0
@briehl
Fix problem with genome icons, some cleanup of various pieces of JS code
e0ddff6
@briehl
fix tests
36670c9
@thomasoniii
Merge pull request #1218 from briehl/PTV-225-data-panel-sort
732e249 
PTV-225 Clarify sorting control
@briehl
fix some code legibility
22441e8
@briehl
Merge branch 'develop' into PTV-833-genome-icons
8f3b416
@thomasoniii
fixes 5410
8bebbd8
@thomasoniii
removed debugging line
3b47663
@briehl
Merge pull request #1220 from kbase/staging-panel
fa921da 
resolves [KBASE-5410]
@briehl
Merge pull request #1219 from briehl/PTV-833-genome-icons
2935f95 
PTV-833 Fix genome icons in data panel
@briehl
Fix pangenome viewer to handle a case where an UPA is passed instead …
9f670e3 
…of a name.
@briehl
Merge pull request #1221 from briehl/PTV-682-pangenome-widget
16a0cf4 
PTV-682 - temp fix to Pangenome viewer
@briehl
bump version, release notes
38fd34f
@briehl
Merge pull request #1222 from briehl/develop
3451e51 
bump version, release notes
@briehl
update google analytics id
d75de38
@thomasoniii
adds contents of metadata file to metadata tab
119c585
@briehl
Merge pull request #1224 from kbase/staging-panel
4555fbc 
adds contents of metadata file to metadata tab [STC-284]
@briehl
Merge pull request #1223 from briehl/develop
d15c17a 
update google analytics id
@coveralls
Copy link

coveralls commented Jan 2, 2018 •
edited
Loading

Coverage Status

Changes Unknown when pulling d15c17a on develop into ** on master**.

@briehl
Copy link
Member Author

briehl commented Jan 4, 2018

Test pass. Gonna go ahead and merge to test out on next.

@briehl briehl merged commit 21aba48 into master Jan 4, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
8 participants
@briehl @coveralls @JamesJeffryes @nlharris @thomasoniii @sychan @scanon @tiramisu24