Merge branch 'NRRPLT-8136' of bitbucket.org:hbpneurorobotics/nrp-frontend into NRRPLT-8136 (c2409666) · Commits · Neurorobotics Platform / nrp-frontend · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

N

nrp-frontend
- Activity
- Members
- Labels
- Issues
  0
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

c2409666

Commit c2409666 authored 3 years ago by

Sandro Weber

Downloads
- Plain Diff

Merge branch 'NRRPLT-8136' of bitbucket.org:hbpneurorobotics/nrp-frontend into NRRPLT-8136

parents e42e2c86 f64c55cf

No related branches found

No related tags found

No related merge requests found

Changes 13

Hide whitespace changes

Inline Side-by-side

Showing

.gitignore 1 addition, 1 deletion

.gitignore
package-lock.json 30 additions, 21 deletions

package-lock.json
public/index.html 1 addition, 0 deletions

public/index.html
src/components/dialog/error-dialog.js 11 additions, 11 deletions

src/components/dialog/error-dialog.js
src/components/experiment-list/import-experiment-buttons.css 3 additions, 3 deletions

src/components/experiment-list/import-experiment-buttons.css
src/components/experiment-list/import-experiment-buttons.js 18 additions, 17 deletions

src/components/experiment-list/import-experiment-buttons.js
src/components/user-menu/user-menu.js 2 additions, 1 deletion

src/components/user-menu/user-menu.js
src/index.js 0 additions, 1 deletion

src/index.js
src/mocks/handlers.js 10 additions, 1 deletion

src/mocks/handlers.js
src/mocks/mock_gdpr.json 3 additions, 0 deletions

src/mocks/mock_gdpr.json
src/services/proxy/__tests__/nrp-user-service.test.js 8 additions, 0 deletions

src/services/proxy/__tests__/nrp-user-service.test.js
src/services/proxy/data/endpoints.json 6 additions, 3 deletions

src/services/proxy/data/endpoints.json
src/services/proxy/nrp-user-service.js 17 additions, 1 deletion

src/services/proxy/nrp-user-service.js

with 110 additions and 60 deletions

0% 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