Commit Graph

324 Commits

Author SHA1 Message Date
SJost
fa6b04663e Merge remote-tracking branch 'origin/master' into feat/exercises 2018-04-03 18:50:51 +02:00
Gregor Kleen
8e43a314d3 Allow overriding unpackZips-Checkbox 2018-04-03 18:48:10 +02:00
Felix Hamann
0b0444ede4 Merge branch 'feat/file_inputs' into 'master'
Fixes for multi-file-input and -checkbox

See merge request !22
2018-04-03 18:32:48 +02:00
Felix Hamann
64b74b3904 fixes for multi-file-input und -checkbox 2018-04-03 18:32:17 +02:00
SJost
ea5e04bd78 Merge remote-tracking branch 'origin/master' into feat/exercises 2018-04-03 18:04:13 +02:00
Gregor Kleen
3d98fe4736 Refactor utils 2018-04-03 17:56:55 +02:00
Felix Hamann
81b6f57047 fix for multi-file-input JS 2018-04-03 17:02:13 +02:00
SJost
2714485dbd Merge remote-tracking branch 'origin/master' into feat/exercises 2018-04-03 16:58:25 +02:00
SJost
7e9e066e55 Quickfix sheet grading edit 2018-04-03 16:58:05 +02:00
SJost
f35579e20d Merge remote-tracking branch 'origin/master' into feat/exercises 2018-04-03 16:50:59 +02:00
SJost
74dc1d52de Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2018-04-03 16:50:18 +02:00
SJost
5af34861be fill-db corrected 2018-04-03 16:50:08 +02:00
SJost
d279a1a2c6 Minor messages 2018-04-03 16:49:41 +02:00
Gregor Kleen
8eb1b4580e Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX into feat/pagination 2018-04-03 16:25:57 +02:00
Gregor Kleen
54cd2bd266 Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX into feat/pagination 2018-04-03 16:20:44 +02:00
SJost
e578139a21 Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2018-04-03 16:20:43 +02:00
SJost
ebf4c841eb Datanbank: Model cleanup 2018-04-03 16:20:29 +02:00
Felix Hamann
29727a498d no more show-hides in asidenav 2018-04-03 16:07:45 +02:00
Gregor Kleen
9a26d17c5e Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX into feat/multi-file-field 2018-04-03 14:53:18 +02:00
Gregor Kleen
1b86abb46d MultiFileField Sheet 2018-04-03 14:51:25 +02:00
Felix Hamann
7f549c3667 Merge branch 'feat/modals' into 'master'
refactoring of modals and ajax-support

See merge request !21
2018-03-31 02:13:32 +02:00
Felix Hamann
e0f570083e fixed typo and added documentation 2018-03-31 02:11:29 +02:00
Felix Hamann
9f82373754 fix for custom checkboxes... no idea why broken 2018-03-31 01:59:59 +02:00
Felix Hamann
62296e9a5f refactor of modals 2018-03-31 01:55:00 +02:00
Felix Hamann
8bb71a5c3e Moved modals to standalones 2018-03-31 01:55:00 +02:00
Felix Hamann
bf1c7373ff fix for z-index of modals 2018-03-31 01:55:00 +02:00
Felix Hamann
bb8cc2ab17 Merge branch 'feat/sortables' into 'master'
refactor of sortable tables

See merge request !20
2018-03-31 00:54:04 +02:00
Felix Hamann
9a82b9c385 refactor of sortable tables 2018-03-31 00:53:03 +02:00
Felix Hamann
b07ff5db6c Merge branch 'feat/file_inputs' into 'master'
Small refinements and Multi-File-Checkboxes for previously uploaded files

See merge request !19
2018-03-30 03:02:56 +02:00
Felix Hamann
de31a4e253 added frontend multi-file support for previously uploaded files 2018-03-30 03:00:03 +02:00
Felix Hamann
c07a219485 fix for custom checkboxes. see test-modal 2018-03-30 02:51:46 +02:00
Felix Hamann
49d5008f0e Merge branch 'master' into feat/file_inputs 2018-03-30 01:12:28 +02:00
Felix Hamann
c04f01ad87 started requiring feature-detection for javascript 2018-03-30 00:54:29 +02:00
Felix Hamann
fc3cb2de3b input and button fix 2018-03-30 00:33:03 +02:00
Felix Hamann
95f59c9a45 beauty fix for forms 2018-03-30 00:18:49 +02:00
Felix Hamann
3c1ff0da67 Merge branch 'feat/asidenav' into 'master'
Hover-Menus in Asidenav

See merge request !18
2018-03-29 23:50:06 +02:00
Felix Hamann
b0ebc620ae added hover-menus for asidenav 2018-03-29 23:46:29 +02:00
Felix Hamann
4466bfc965 navigation cleanup 2018-03-29 23:19:15 +02:00
Felix Hamann
a5edb92182 more reasonable example-modalContent 2018-03-29 22:12:47 +02:00
Felix Hamann
b6f4743bb3 Merge branch 'forms_style_rework' 2018-03-29 01:06:55 +02:00
Felix Hamann
594f1db7b6 moved form-group css back to inputs standalone 2018-03-29 01:06:44 +02:00
Felix Hamann
a6c65cfefe Merge branch 'forms_style_rework' into 'master'
Forms style rework

See merge request !17
2018-03-29 01:01:42 +02:00
Felix Hamann
a5ca9d8cbe more robust form layout 2018-03-29 00:59:40 +02:00
Felix Hamann
ad0c34a84d added flex-fallback for forms in browsers that dont support display:grid 2018-03-29 00:52:47 +02:00
Felix Hamann
33a99b0f62 changed menuItemType of Uebungsblaetter 2018-03-29 00:23:24 +02:00
Felix Hamann
9858224bdd smoother fade-ins for modals 2018-03-29 00:19:56 +02:00
Felix Hamann
05dd196b43 added more visible modal-test 2018-03-29 00:16:24 +02:00
Felix Hamann
f4d95e23c9 Merge branch 'feat/file_inputs' into 'master'
single-, multi- and no-js-file-inputs

Closes #33

See merge request !14
2018-03-29 00:09:24 +02:00
Felix Hamann
be5d88b24b Merge branch 'feat/pageactions' 2018-03-29 00:08:34 +02:00
Felix Hamann
6652b4d563 Merge branch 'feat/modals' into 'master'
added modal widget

See merge request !16
2018-03-29 00:06:03 +02:00