Commit Graph

1204 Commits

Author SHA1 Message Date
Steffen Jost
ea1558edd5 Minor comment 2019-03-25 13:01:49 +01:00
Steffen Jost
10351854cd Merge branch 'master' into 126-ubungsbetrieb-statistik-seiten-pro-kurs 2019-03-25 10:44:44 +01:00
Steffen Jost
89d21580aa 42 removed (but current state is dangerous: works only for admins 2019-03-25 09:25:42 +01:00
Gregor Kleen
973eeb18c0 Documentation for Handler.Utils.Delete 2019-03-25 08:59:06 +01:00
Steffen Jost
68cc79e5f3 minor 2019-03-24 13:40:51 +01:00
Steffen Jost
ac3272e2b8 WIP: Deregister button for CUserPage 2019-03-24 11:27:49 +01:00
Gregor Kleen
57ba1c9e12 Use wrapForm everywhere 2019-03-23 23:00:32 +01:00
Gregor Kleen
6aeb134369 Merge branch 'master' into feat/wrapform 2019-03-23 14:37:59 +01:00
Gregor Kleen
ae303a055d minor cleanups 2019-03-23 14:35:29 +01:00
Steffen Jost
ca520b08f7 ButtonSave added 2019-03-23 12:25:02 +01:00
Steffen Jost
0751f23c8e i18n cleanups course user page 2019-03-22 19:13:42 +01:00
Steffen Jost
c2dc23c116 course user info shows study terms and matriclenr 2019-03-22 18:40:59 +01:00
Steffen Jost
c9ab64e518 Course user notes working, but needs model refactor 2019-03-22 18:01:26 +01:00
Steffen Jost
21ba1f2afa users cannot delete themselves anymore 2019-03-22 11:39:59 +01:00
Steffen Jost
2ddb637b6e Merge branch 'master' into 126-ubungsbetrieb-statistik-seiten-pro-kurs 2019-03-21 16:21:30 +01:00
Gregor Kleen
40bb0ddaf6 Quiet Hlint 2019-03-20 22:58:46 +01:00
Gregor Kleen
6dbf8916a5 Remove log comment, which breaks haddock 2019-03-20 22:29:08 +01:00
Gregor Kleen
bd6df62599 Merge branch '284-massinput' 2019-03-20 21:23:02 +01:00
Gregor Kleen
7f403a5d98 Merge branch '284-massinput' of jost/UniWorX into 284-massinput 2019-03-20 21:22:32 +01:00
Gregor Kleen
4aaf9933aa Fixup 2019-03-20 21:20:51 +01:00
Gregor Kleen
aca5d180bc Feature complete MassInput 2019-03-20 20:53:10 +01:00
Steffen Jost
0cc2f28089 Show fully info on StudyTerms in UserProfileDataR 2019-03-20 19:55:44 +01:00
Gregor Kleen
1929c5cace Fix build 2019-03-20 18:44:58 +01:00
Steffen Jost
4d0a1e8020 minor 2019-03-20 18:35:47 +01:00
Steffen Jost
93fd8788bc rigid type problem with rendermessage 2019-03-20 18:30:08 +01:00
Steffen Jost
5f67c3ac00 Merge branch 'master' into 284-massinput 2019-03-20 15:57:43 +01:00
Gregor Kleen
4b2d6d3aa2 (Semi-)Working Prototype 2019-03-20 15:13:41 +01:00
Steffen Jost
90417441b3 Minor Typo 2019-03-20 14:52:06 +01:00
Steffen Jost
9350c93ea5 Merge from Master 2019-03-20 14:40:50 +01:00
Steffen Jost
1c1dc70066 Various minor fixes 2019-03-20 14:09:46 +01:00
Gregor Kleen
350dfa6c4a Merge branch '307-studiengange-behandeln' 2019-03-20 13:38:07 +01:00
Steffen Jost
d310e5a8c3 Inference tested and linted 2019-03-20 13:36:26 +01:00
Steffen Jost
7177631236 Merge branch '307-studiengange-behandeln' of gitlab.cip.ifi.lmu.de:jost/UniWorX into 307-studiengange-behandeln 2019-03-20 13:15:29 +01:00
Steffen Jost
c4aab6248a inference for studyterms works now 2019-03-20 13:15:23 +01:00
Gregor Kleen
a81da6b7bf Ensure termNames read from LDAP are unique 2019-03-20 13:12:58 +01:00
Gregor Kleen
6344017db3 Ensure better, that study_{degree,terms}.{shorthand,name} isn't "" 2019-03-20 12:15:04 +01:00
Gregor Kleen
6317ae92f0 Bessere Fehlermeldungen bei SortKey/FilterKey-Mismatch 2019-03-20 11:59:14 +01:00
Steffen Jost
d65b5918f0 Inferenz Studiengänge verdrahte, hat noch Fehler 2019-03-20 11:59:08 +01:00
Steffen Jost
8c221ad5e8 Term candidate inference handler added, not connected 2019-03-20 09:49:06 +01:00
Gregor Kleen
705fdec695 Merge branch 'master' into 284-massinput 2019-03-20 09:05:10 +01:00
Steffen Jost
23a1b883ac Merge branch 'master' into 307-studiengange-behandeln 2019-03-20 08:32:51 +01:00
Gregor Kleen
bbeb0e70be Identifiers for DBTable-Forms 2019-03-19 13:46:11 +01:00
Gregor Kleen
96303b156a Enforce structured identifyForm 2019-03-19 13:19:54 +01:00
Gregor Kleen
b815abf19e Add migration which randomly assigns "course_participant"."field" 2019-03-19 10:40:28 +01:00
Steffen Jost
9b944d70b8 StudyTermCandidate inference implemented needs tests 2019-03-18 18:57:36 +01:00
Steffen Jost
8d13d9278f Model descriptions mostly done 2019-03-15 10:56:25 +01:00
SJost
26375b1140 mend 2019-03-13 21:36:21 +01:00
SJost
40204d2424 mend 2019-03-13 21:18:38 +01:00
SJost
86086633ab Conflict detection for studyTermCandidates implemented 2019-03-13 21:17:30 +01:00
SJost
5a8fa8648f Created AdminR page to remove clutter from homepage 2019-03-13 20:35:46 +01:00