Merge remote-tracking branch 'origin/studydocs-autocomplete' (b3d3f157) · Commits · amiv / amiv-website-mithril · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

A

amiv-website-mithril
- Activity
- Members
- Labels
- 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

This is an archived project. Repository and other project resources are read-only.

b3d3f157

Commit b3d3f157 authored 7 years ago by Sandro Lutz

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/studydocs-autocomplete'

# Conflicts:
#	src/views/eventDetails.js

parents 2ae2cb82 63a1b033

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

src/models/studydocs.js 19 additions, 0 deletions

src/models/studydocs.js
src/views/eventDetails.js 9 additions, 6 deletions

src/views/eventDetails.js
src/views/form/button.js 17 additions, 0 deletions

src/views/form/button.js
src/views/form/inputGroup.js 59 additions, 0 deletions

src/views/form/inputGroup.js
src/views/form/jsonSchemaForm.js 37 additions, 14 deletions

src/views/form/jsonSchemaForm.js
src/views/form/selectGroup.js 24 additions, 63 deletions

src/views/form/selectGroup.js
src/views/studydocNew.js 131 additions, 97 deletions

src/views/studydocNew.js

with 296 additions and 180 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