Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

W

waterdataui
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

3cc9180e

Commit 3cc9180e authored 4 years ago by Briggs, Aaron Shane

Downloads
- Plain Diff

Merge branch 'master' of https://github.com/usgs/waterdataui into...

Merge branch 'master' of https://github.com/usgs/waterdataui into WDFN-445_add_lik_to_waterservices_for_rdb_download

parents 5f66063b 50e9694c

No related branches found

No related tags found

No related merge requests found

Changes 12

Hide whitespace changes

Inline Side-by-side

Showing

CHANGELOG.md 3 additions, 2 deletions

CHANGELOG.md
assets/README.md 2 additions, 2 deletions

assets/README.md
assets/src/scripts/monitoring-location/components/hydrograph/index.js 0 additions, 1 deletion

...cripts/monitoring-location/components/hydrograph/index.js
assets/src/scripts/monitoring-location/components/hydrograph/index.spec.js 1 addition, 2 deletions

...s/monitoring-location/components/hydrograph/index.spec.js
assets/src/scripts/monitoring-location/components/hydrograph/legend.spec.js 0 additions, 1 deletion

.../monitoring-location/components/hydrograph/legend.spec.js
assets/src/scripts/monitoring-location/components/hydrograph/parameters.js 9 additions, 2 deletions

...s/monitoring-location/components/hydrograph/parameters.js
assets/src/scripts/monitoring-location/components/hydrograph/parameters.spec.js 5 additions, 0 deletions

...itoring-location/components/hydrograph/parameters.spec.js
assets/src/styles/components/hydrograph/_app.scss 6 additions, 10 deletions

assets/src/styles/components/hydrograph/_app.scss
wdfn-server/config.py 3 additions, 0 deletions

wdfn-server/config.py
wdfn-server/waterdata/templates/base.html 1 addition, 1 deletion

wdfn-server/waterdata/templates/base.html
wdfn-server/waterdata/templates/base_plain.html 2 additions, 1 deletion

wdfn-server/waterdata/templates/base_plain.html
wdfn-server/waterdata/templates/macros/components.html 1 addition, 1 deletion

wdfn-server/waterdata/templates/macros/components.html

with 33 additions and 23 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment