Commit Graph

1870 Commits

Author SHA1 Message Date
Felix Hamann
7b8d1d3eec Merge branch 'master' into course-teaser 2019-03-24 20:59:05 +01:00
Steffen Jost
179cb735a2 weird fix build 2019-03-24 13:07:23 +01:00
Steffen Jost
291064c03b MINOR linter problems and curried rowWdgt -> uncurried rowWgt (obfuscates my Anwer to Felix' question, hence different commit) 2019-03-24 12:04:36 +01:00
Steffen Jost
939db750d2 Merge branch 'course-teaser' of gitlab.cip.ifi.lmu.de:jost/UniWorX into course-teaser 2019-03-24 11:46:51 +01:00
Steffen Jost
e0bc7a5615 Beispiel für Felix' Frage zu !163 2019-03-24 11:46:46 +01:00
Gregor Kleen
4da1be96ee Merge branch 'feat/wrapform' into 'master'
Feat/wrapform

See merge request !165
2019-03-23 23:13:52 +01:00
Felix Hamann
b25e6ea74f open course teasers via click anywhere on collapsed teaser 2019-03-23 23:13:16 +01:00
Gregor Kleen
57ba1c9e12 Use wrapForm everywhere 2019-03-23 23:00:32 +01:00
Felix Hamann
567bd29fd0 make course teasers keyboard-accessible 2019-03-23 22:56:55 +01:00
Felix Hamann
16e5e8ea6f remove register button from course teaser 2019-03-23 22:39:56 +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
Felix Hamann
6e01d20e0e Merge branch '321-table-filter-broken' into 'master'
update name of form identifier for table filters

Closes #321

See merge request !164
2019-03-20 23:10:39 +01:00
Gregor Kleen
40bb0ddaf6 Quiet Hlint 2019-03-20 22:58:46 +01:00
Felix Hamann
6a1e49bd49 update name of form identifier for table filters 2019-03-20 22:58:16 +01:00
Gregor Kleen
6dbf8916a5 Remove log comment, which breaks haddock 2019-03-20 22:29:08 +01:00
Felix Hamann
c430649d0c add widget for course teaser 2019-03-20 21:45:36 +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
5b8a79590d Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2019-03-20 18:45:52 +01:00
Gregor Kleen
1929c5cace Fix build 2019-03-20 18:44:58 +01:00
Steffen Jost
f8bba4ac83 Minor 2019-03-20 18:42:40 +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
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
Gregor Kleen
2d1f74b4a4 Further comments on database-model
Fixes #319
2019-03-15 13:05:46 +01:00
Steffen Jost
8d13d9278f Model descriptions mostly done 2019-03-15 10:56:25 +01:00
SJost
7e66b72618 fixbuild typo 2019-03-15 07:38:36 +01:00
SJost
7ca5b87409 fixbuild 2019-03-14 20:19:42 +01:00
SJost
100c055d7c Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2019-03-14 20:15:25 +01:00