Merge remote-tracking branch 'origin/main' into 131-min-194-display-user-grouped-overlays (9de97e5c) · Commits · minerva / frontend · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

F

frontend
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Iterations
- Wiki
- Requirements
- Jira
- External wiki
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

Admin message

Gitlab will go in to maintenance on Friday 5:30pm since SIU is doing Isilon maintenance and we use isilon shares on the Gitlab

9de97e5c

Commit 9de97e5c authored 1 month ago by Piotr Gawron

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/main' into 131-min-194-display-user-grouped-overlays

parents 2465d9a6 9a8a69b2

No related branches found

No related tags found

1 merge request!380Resolve "[MIN-194] Display user grouped overlays"

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

CHANGELOG 7 additions, 1 deletion

CHANGELOG
src/components/Map/Drawer/BioEntityDrawer/BioEntityDrawer.component.test.tsx 13 additions, 0 deletions

...Drawer/BioEntityDrawer/BioEntityDrawer.component.test.tsx
src/components/Map/Drawer/BioEntityDrawer/BioEntityDrawer.component.tsx 14 additions, 2 deletions

.../Map/Drawer/BioEntityDrawer/BioEntityDrawer.component.tsx
src/components/Map/Drawer/OverlaysDrawer/UserOverlays/UserOverlaysGroup/UserOverlaysGroup.component.tsx 1 addition, 1 deletion

...verlays/UserOverlaysGroup/UserOverlaysGroup.component.tsx
src/models/disease.ts 0 additions, 9 deletions

src/models/disease.ts
src/models/generators/diseaseGenerator.ts 2 additions, 2 deletions

src/models/generators/diseaseGenerator.ts
src/models/projectSchema.ts 2 additions, 2 deletions

src/models/projectSchema.ts
src/redux/overlays/overlays.thunks.ts 3 additions, 1 deletion

src/redux/overlays/overlays.thunks.ts
src/shared/Toast/Toast.component.tsx 15 additions, 6 deletions

src/shared/Toast/Toast.component.tsx
src/utils/showToast.tsx 1 addition, 1 deletion

src/utils/showToast.tsx

with 58 additions and 25 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