Merge branch 'master' of https://people.ee.ethz.ch/~tikgit/amivwebsitefrontend (8779f895) · 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

8779f895

Commit 8779f895 authored 8 years ago by Lukas Gygi

Downloads
- Plain Diff

Merge branch 'master' of https://people.ee.ethz.ch/~tikgit/amivwebsitefrontend

parents df8edc55 b3ec47a1

No related branches found

No related tags found

No related merge requests found

Changes 10

Expand all Hide whitespace changes

Inline Side-by-side

Showing

admin/index.html 3 additions, 13 deletions

admin/index.html
admin/lib/amiv/amivcore.js 289 additions, 281 deletions

admin/lib/amiv/amivcore.js
admin/lib/amiv/spec.json 1 addition, 2405 deletions

admin/lib/amiv/spec.json
admin/lib/cust/main.css 1 addition, 1 deletion

admin/lib/cust/main.css
admin/lib/cust/main.js 17 additions, 8 deletions

admin/lib/cust/main.js
admin/tools/users.tool 71 additions, 13 deletions

admin/tools/users.tool
public/css/cards.css 4 additions, 2 deletions

public/css/cards.css
public/css/logo-nav.css 1 addition, 1 deletion

public/css/logo-nav.css
public/index.html 40 additions, 63 deletions

public/index.html
public/js/main.js 0 additions, 536 deletions

public/js/main.js

with 427 additions and 3323 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