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

Flekschas/satori v1.5 #1776

Merged
merged 215 commits into from Jul 11, 2017

Conversation

@flekschas
Contributor

flekschas commented Jun 7, 2017

Note this is a stripped down pull request of flekschas/satori-tutorials, which does not include 2 helper management commands and optimize-js. I'll keep the flekschas/satori-tutorial branch for now until the SATORI paper is out and for that I might need the commands and optimize-js

Update SATORI from v1 to v1.5.

Big pieces:

Add Intro.js tutorial for SATORI
Add query-term interface
Include settings for Metabolights
Dozens of bug fixes
Minor adjustments:

Update to latest version of the listgraph
Include D3js v4
Add better OntID normalization
Add OptimizeJS
Add SiteProfile model
Make visualizations resizable
Add support for optional settings
Remove unused LaunchPadCtrl

flekschas added some commits Aug 31, 2016

Since D3 does not create a new object but overwrites the existing `wi…
…ndow.d3` we have to load D3 v4 first. I added a special vendor block that can be removed once all scripts run on D3 v4.
Outsource Intro.js code as it is used across multiple controllers / d…
…irectives. Add a second intro guide for the data set view.
Unfortunately intro.js guides have to be defined in the directive the…
…y describe. Making overview guides over multiple directives a but harder.
Merge branch 'release-1.4.1' into flekschas/satori-tutorials
# Conflicts:
#	refinery/config/settings/base.py
#	refinery/ui/source/js/dashboard/views/launch-pad.html
Limit blinking effect of the help button to 3 times. Otherwise it is …
…too distracting. Also removed vendor code which is added by Grunt automatically.
Merge branch 'flekschas/fix-preview-ff' into flekschas/satori-tutorials
# Conflicts:
#	refinery/ui/source/js/data-set-import/partials/isa-tab-import.html
@codecov-io

This comment has been minimized.

codecov-io commented Jun 7, 2017

Codecov Report

Merging #1776 into develop will decrease coverage by 0.18%.
The diff coverage is 31.26%.

Impacted file tree graph

@@             Coverage Diff             @@
##           develop    #1776      +/-   ##
===========================================
- Coverage    41.75%   41.56%   -0.19%     
===========================================
  Files          400      412      +12     
  Lines        26067    26691     +624     
  Branches      1284     1320      +36     
===========================================
+ Hits         10884    11094     +210     
- Misses       15183    15597     +414
Impacted Files Coverage Δ
..._set_manager/management/commands/process_isatab.py 0% <ø> (ø) ⬆️
...source/js/dashboard/directives/data-set-preview.js 100% <ø> (ø) ⬆️
refinery/ui/source/js/commons/treemap/directive.js 100% <ø> (ø) ⬆️
refinery/ui/source/js/refinery-libraries.js 100% <ø> (ø) ⬆️
refinery/core/urls.py 100% <ø> (ø) ⬆️
refinery/ui/source/js/refinery.js 77.77% <ø> (ø) ⬆️
...inery/ui/source/js/commons/list-graph/directive.js 100% <ø> (ø) ⬆️
...ery/ui/source/js/dashboard/services/width-fixer.js 52.38% <ø> (ø) ⬆️
...ui/source/js/commons/data-sets/data-details-api.js 33.33% <0%> (ø) ⬆️
refinery/ui/source/js/refinery-controller.js 7.5% <0%> (+0.18%) ⬆️
... and 49 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update d53ee01...9fee999. Read the comment docs.

@ngehlenborg ngehlenborg added this to the Release 1.5.8 milestone Jul 7, 2017

Merge branch 'origin/develop' into flekschas/satori-v1.5
# Resolved Conflicts
refinery/core/views.py
refinery/data_set_manager/tasks.py
refinery/templates/base.html

@scottx611x scottx611x merged commit 129b784 into develop Jul 11, 2017

3 checks passed

code-quality/landscape Code quality increased by 0.19%
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
continuous-integration/travis-ci/push The Travis CI build passed
Details

@scottx611x scottx611x deleted the flekschas/satori-v1.5 branch Jul 11, 2017

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment