Commit Graph

871 Commits

Author SHA1 Message Date
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
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
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
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
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
Steffen Jost
0917b2c580 testdata added for studytermcandidates 2019-03-13 18:18:31 +01:00
Steffen Jost
6cce5c05cc Forms for terms added, but buggy 2019-03-13 16:41:22 +01:00
Steffen Jost
b2bb30a429 Form for Degrees changes implemented 2019-03-13 14:50:58 +01:00
Steffen Jost
a02cf61c82 filter email name ui combined 2019-03-13 13:30:11 +01:00
Steffen Jost
579225b4d0 table for candidates added to admin-features 2019-03-13 11:20:08 +01:00
Gregor Kleen
332493f550 View-Prototype of MassInput 2019-03-13 09:25:00 +01:00
SJost
a76090a31f Stub for Studyfeature overview created 2019-03-12 22:52:28 +01:00
SJost
25019eec58 mend 2019-03-12 10:58:14 +01:00
SJost
78ada75704 Filters for Participant List added 2019-03-12 10:54:32 +01:00
SJost
913f4dea7c mend
merge from master
2019-03-12 09:20:53 +01:00
SJost
889c3ebb35 Merge and bugfix sorting by participants registration date 2019-03-12 09:20:07 +01:00
SJost
32e9bb63ca Minor title fix 2019-03-12 08:39:19 +01:00
Felix Hamann
84237c4484 Merge branch 'async-form-responses' into 'master'
Async form responses

See merge request !161
2019-03-11 20:50:36 +01:00
Gregor Kleen
a4c8bcd10c Merge branch 'master' into 284-massinput 2019-03-11 13:00:09 +01:00
SJost
c205fe1b74 mend 2019-03-10 18:13:39 +01:00
SJost
f6ace93795 participant list sorting completed 2019-03-10 18:08:36 +01:00
SJost
529c226ad6 Generic Join projections implemented 2019-03-10 18:01:17 +01:00