Merge branch 'master' into feature/filters (d3d6ebf7) · Commits · maspect / amiv-admintool · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

A

amiv-admintool
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Incidents

Snippets Groups Projects

Admin message

To receive notifications about scheduled maintenance, please subscribe to the mailing-list gitlab-operations@sympa.ethz.ch. You can subscribe to the mailing-list at https://sympa.ethz.ch

d3d6ebf7

Commit d3d6ebf7 authored 6 years ago by Hermann

Downloads
- Plain Diff

Merge branch 'master' into feature/filters

parents 84bfe1b8 de627555

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

Dockerfile 5 additions, 20 deletions

Dockerfile
nginx.conf 9 additions, 0 deletions

nginx.conf
src/auth.js 27 additions, 7 deletions

src/auth.js
src/events/editEvent.js 2 additions, 4 deletions

src/events/editEvent.js
src/index.js 0 additions, 2 deletions

src/index.js
src/layout.js 7 additions, 2 deletions

src/layout.js
src/users/editUser.js 7 additions, 2 deletions

src/users/editUser.js

with 57 additions and 37 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