Commit Graph

802 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
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
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
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
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
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
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
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
1999b494c3 Merge branch 'master' into modal-migration 2019-02-22 22:58:14 +01:00
SJost
d9b11bc9a4 I h8 hlint 2019-02-22 18:50:46 +01:00
SJost
8dae9eb1d4 Course member list stub working, after daylong painful birth throes 2019-02-22 18:24:21 +01:00
SJost
d1c0b67627 Default sorting for TermListR added 2019-02-22 13:00:13 +01:00
SJost
d90093bed4 Hotfixes: default sorting of course lists was wrong 2019-02-22 12:45:35 +01:00
SJost
0938d93039 Code clean; abandoned utf8 tickmark in favour of font-awesome checkmark 2019-02-22 10:50:29 +01:00
SJost
8d29354818 Fix build for hlint once again 2019-02-22 08:15:45 +01:00
SJost
f0ee524e9e Merge branch 'master' into formgroups 2019-02-22 07:48:16 +01:00
SJost
68d36b2fe0 Course description as icon complete 2019-02-22 07:47:20 +01:00
SJost
f869876e12 Towards #303 2019-02-21 22:08:49 +01:00
SJost
7d72086fd9 minor refactor 2019-02-21 19:55:38 +01:00
SJost
89e6b17107 Build problem determined: crashes Haddock. Added similar Class manually. 2019-02-21 16:47:42 +01:00
SJost
bb552c472f TEST: Does ist build with everything except for makeClassy ''Entity? Probably the functional dependency is to blame?! 2019-02-21 16:12:11 +01:00
SJost
2550f74056 TEST: removing makeCLassyFor maybe build works then? 2019-02-21 14:53:45 +01:00
SJost
10237c4031 Merge and by accident info page 2019-02-21 11:35:04 +01:00
SJost
972bc11d46 new admin notfifications are sent to fellow school admins as well now 2019-02-21 11:15:02 +01:00
SJost
75e2210ae5 Fix build hlint 2019-02-20 23:57:51 +01:00
SJost
4f26973206 Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2019-02-20 23:42:36 +01:00
SJost
91068bb558 NotficationUserRightsUpdate added 2019-02-20 23:42:12 +01:00
Felix Hamann
b8eb78d11a add data-ajax-submit to email-test-modal 2019-02-20 22:09:53 +01:00
Felix Hamann
55c1385e3e Merge branch 'js-utils-cleanup' 2019-02-20 22:07:02 +01:00
SJost
8024a9d9f0 Impressum and DSGV-Stub updated 2019-02-20 18:53:21 +01:00
SJost
33c81a64c0 Minor 2019-02-20 07:07:39 +01:00
SJost
a1896f3d1c Steps towards #126, compiling but incomplete 2019-02-19 20:30:18 +01:00
SJost
d3f1a49fde Courses are Classy now "HasCourse" with "hasCourse" 2019-02-19 15:41:09 +01:00
SJost
cc2eb6d475 Refactor for Database.Esqueleto.Utils 2019-02-19 09:37:44 +01:00