Commit Graph

1743 Commits

Author SHA1 Message Date
SJost
cf3a0b3d35 ToMarkup instances for StudyDegree and StudyTerms 2019-02-28 18:28:42 +01:00
SJost
e446641666 Default offered; unnecessarily complicated due using field studyFeature 2019-02-28 18:04:22 +01:00
SJost
933eaa7362 Registration takes Field of Studies now 2019-02-28 17:17:34 +01:00
SJost
3966ad9b24 Don't know why there are still changes after commit and push 2019-02-28 12:07:50 +01:00
SJost
7dcd3339a2 Name sorting fixed 2019-02-28 12:06:41 +01:00
SJost
27dffe7d08 Fixbuild tests and linter 2019-02-28 11:55:28 +01:00
SJost
0a49fb00e2 Merge branch '307-studiengange-behandeln' of gitlab.cip.ifi.lmu.de:jost/UniWorX into 307-studiengange-behandeln 2019-02-28 11:23:45 +01:00
SJost
407e40ce3d merge minor 2019-02-28 11:23:38 +01:00
SJost
61058b1f98 Fixbuild hlint. I hate those. 2019-02-28 11:14:17 +01:00
SJost
d51608a1bf merge master 2019-02-28 11:12:39 +01:00
SJost
0745542867 All mailto-links use single hamlet file now; added mailto for lecturers 2019-02-28 11:03:02 +01:00
Gregor Kleen
86c6f62d49 Merge branch '307-studiengange-behandeln' of gitlab.cip.ifi.lmu.de:jost/UniWorX into 307-studiengange-behandeln 2019-02-28 11:03:01 +01:00
Gregor Kleen
ad02db27db Keep track of userLastAuthentication 2019-02-28 11:01:44 +01:00
SJost
4db9e5c18a fillDB adjusted for StudyFeatues 2019-02-28 10:02:23 +01:00
Gregor Kleen
57cb80ecf8 Merge branch '307-studiengange-behandeln' of gitlab.cip.ifi.lmu.de:jost/UniWorX into 307-studiengange-behandeln 2019-02-27 17:43:22 +01:00
Gregor Kleen
49c8ca56f5 Touch StudyFeaturesUpdated on each login 2019-02-27 17:42:57 +01:00
SJost
9ca91b5ec8 removed stubs for merge 2019-02-27 17:42:46 +01:00
SJost
801f1f1597 merge attempt 2019-02-27 17:37:42 +01:00
SJost
6a53a89faa does not compile, course register from broken 2019-02-27 17:36:39 +01:00
Gregor Kleen
5f7b134292 Write StudyTermCandidates during login 2019-02-27 17:29:17 +01:00
SJost
4f16efcb24 Minor 2019-02-27 14:27:58 +01:00
SJost
c48e1e1981 StudyFields start 2019-02-27 13:11:40 +01:00
SJost
f20f2cb005 Minor clean up 2019-02-27 12:14:06 +01:00
SJost
2ce657fe5e stub for i18nWidgetFile created and used 2019-02-27 11:28:40 +01:00
SJost
3fde43e6ba AuthPred Formulierungen 2019-02-27 10:55:55 +01:00
Felix Hamann
835ca73c2f fix hamlet description for FFP in Database.hs 2019-02-26 22:22:01 +01:00
Felix Hamann
3c6f0f8dcf Merge branch 'permutation-list' into 'master'
make list in permutation widget iconless

Closes #305

See merge request !154
2019-02-26 20:27:10 +01:00
Felix Hamann
551e7148ef make list in permutation widget iconless 2019-02-26 20:18:14 +01:00
Felix Hamann
7e457c50fa Merge branch 'modal-migration' into 'master'
Move modal JS to static

Closes #304

See merge request !148
2019-02-25 20:50:32 +01:00
Felix Hamann
8dd4fd98cb close modals with Escape key 2019-02-25 20:41:38 +01:00
Felix Hamann
f798142a29 add submitHandler helper function to asyncform util 2019-02-25 20:41:10 +01:00
Felix Hamann
e9f7cdf682 move async form initialization to form util 2019-02-25 20:24:44 +01:00
SJost
1553570d87 Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2019-02-25 13:07:55 +01:00
SJost
42a8708bf5 minor update disclaimer and messages 2019-02-25 12:46:03 +01:00
Felix Hamann
2f3a735ae2 make async forms process json response 2019-02-24 23:23:23 +01:00
Felix Hamann
b343066a88 move help page introduction into form 2019-02-24 23:21:57 +01:00
Felix Hamann
3a30aea5df added new utils »httpClient« and »asyncForm« 2019-02-24 23:00:21 +01:00
Felix Hamann
99949cc4db reimplement dynamic modals 2019-02-24 22:27:45 +01:00
Felix Hamann
77ecd5c59f move alerts out of main-content element 2019-02-24 22:27:11 +01:00
Felix Hamann
f5ee39eafa more documentation for js util »setup« 2019-02-24 14:05:59 +01:00
SJost
ba7b49e2d3 dateTimeCell cleanup 2019-02-23 08:25:34 +01:00
SJost
787cf0d7cc Datumsformate hinzugefügt 2019-02-23 08:15:05 +01:00
SJost
84a5833c22 emailColumn added 2019-02-23 07:50:28 +01:00
Felix Hamann
695d0a9978 fix modals not being initialized after table interaction
closes #304
2019-02-22 23:04:15 +01:00
Felix Hamann
1999b494c3 Merge branch 'master' into modal-migration 2019-02-22 22:58:14 +01:00
Felix Hamann
9d4cb51adb Merge branch 'check-all-checkbox' into 'master'
check-all-checkbox for checkbox columns

See merge request !149
2019-02-22 22:41:30 +01:00
Felix Hamann
05733ec85b check-all-checkbox: remove caching idea 2019-02-22 21:58:21 +01:00
Felix Hamann
4fd23e9497 fix check-all-checkbox column id 2019-02-22 20:41:31 +01:00
SJost
2ccff81cc8 Touching this branch to fix build 2019-02-22 20:41:31 +01:00
Felix Hamann
d83fe11f42 replace th of checkbox column with check-all-checkbox 2019-02-22 20:41:31 +01:00