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
|
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 |
|
Gregor Kleen
|
101822fd21
|
MessageClass → MessageStatus
|
2019-03-10 15:47:33 +01:00 |
|
Gregor Kleen
|
6939b73802
|
old-style json-answers in admin email test
|
2019-03-10 14:40:44 +01:00 |
|
SJost
|
e5d693e707
|
Generic columns filters and sorting
|
2019-03-10 11:43:59 +01:00 |
|
SJost
|
c4d77d665a
|
Generic contains SQL filter for generic user column
|
2019-03-09 14:35:47 +01:00 |
|
SJost
|
2ddda4578e
|
Generic Columns module allowing generic sorting and filtering.
Done for an initial part of course participant table.
|
2019-03-08 18:11:26 +01:00 |
|
SJost
|
4253390e93
|
Study-Features-Subquery extracted
|
2019-03-08 10:46:47 +01:00 |
|
SJost
|
729831b0bf
|
Probably fixes the course participant list?
|
2019-03-06 17:50:22 +01:00 |
|
SJost
|
484d99305d
|
Showing field and degrees compiles, join-on needs testing
|
2019-03-05 19:06:12 +01:00 |
|
SJost
|
56c25c133a
|
Alternative Query Attempt
|
2019-03-05 17:20:34 +01:00 |
|
SJost
|
8aeeb1ddaa
|
Fixes #310
|
2019-03-04 15:43:49 +01:00 |
|
SJost
|
158cd180c5
|
Fixbuild linter
|
2019-03-04 10:21:30 +01:00 |
|
Gregor Kleen
|
c967399ab9
|
Override boolField
|
2019-03-03 17:22:21 +01:00 |
|
SJost
|
382a34f970
|
commented to compile
|
2019-03-01 12:46:28 +01:00 |
|
SJost
|
fa0ce033ee
|
Cannot Return a ValueList from a select. :(
|
2019-03-01 11:36:13 +01:00 |
|
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
|
0fbed68915
|
wrapForm created, not used everywhere yet
|
2019-02-27 14:23:56 +01:00 |
|
Gregor Kleen
|
c0edc87926
|
Start on implementation
|
2019-02-27 13:07:22 +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
|
66750f4c7d
|
CourseParticipantsList in Hamlet ausgelagert
|
2019-02-26 08:56:16 +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 |
|
SJost
|
09844a6a78
|
Search user by partial matriclenumbers
|
2019-02-19 08:49:43 +01:00 |
|
SJost
|
cbd2a23a2c
|
Fix built with workaround
|
2019-02-18 22:49:08 +01:00 |
|
SJost
|
1dd2b92374
|
attempt to fix build
|
2019-02-18 22:38:52 +01:00 |
|
SJost
|
f31a63422b
|
Minor refactor schoolOption selection
|
2019-02-18 20:48:57 +01:00 |
|
SJost
|
90d3135f15
|
Fixes #291
|
2019-02-18 20:27:15 +01:00 |
|
SJost
|
ed8beb9e81
|
Minor refactor
|
2019-02-18 18:38:23 +01:00 |
|
SJost
|
bc0354da57
|
Towards #291
|
2019-02-18 18:08:01 +01:00 |
|
SJost
|
184ebaf064
|
Form error demonstration added to 'AdminTestR'
|
2019-02-18 09:36:25 +01:00 |
|
SJost
|
76ac563627
|
merged from master
|
2019-02-17 15:08:56 +01:00 |
|
SJost
|
8247cb6a50
|
Code cleaning done.
|
2019-02-17 15:03:56 +01:00 |
|
SJost
|
a5659aa737
|
Form section titles via fvId; working, but code cleanup needed.
|
2019-02-17 07:42:30 +01:00 |
|
Felix Hamann
|
3db08a841c
|
refactoring: move each widget into its own subfolder
|
2019-02-16 23:35:57 +01:00 |
|
Felix Hamann
|
2b61d8f180
|
add behavior section headline to profile form
|
2019-02-16 18:30:56 +01:00 |
|
Felix Hamann
|
228aa8320d
|
moved more js utils to static
|
2019-02-16 17:23:52 +01:00 |
|
SJost
|
e4f37a1bcc
|
templates/widgets/form-section-title.shamlet created for @hamannf
|
2019-02-16 17:04:13 +01:00 |
|
SJost
|
9287d89e33
|
FormGroup example on profile data page implemented
|
2019-02-16 16:17:33 +01:00 |
|
SJost
|
1cc9ca119f
|
Fix build linter
|
2019-02-16 14:35:14 +01:00 |
|
SJost
|
7ad95e7328
|
MFormGroups okay, AFormGroups just a silly workaround
|
2019-02-16 14:32:33 +01:00 |
|
SJost
|
d3f9425448
|
FIxbuild
|
2019-02-15 15:06:57 +01:00 |
|
SJost
|
99d958dade
|
UX/UI polish in various places
|
2019-02-15 13:28:39 +01:00 |
|
SJost
|
4c4a0f538f
|
LecturerInfoPage first draft
|
2019-02-14 21:03:55 +01:00 |
|
SJost
|
23706c36ce
|
siteLayout instead of pageHeadings
|
2019-02-14 19:25:15 +01:00 |
|
SJost
|
ba45bc5883
|
Admins can change user access rights now
|
2019-02-14 18:34:26 +01:00 |
|
SJost
|
115e71365d
|
First steps towards editable User Rights
|
2019-02-14 16:01:47 +01:00 |
|
SJost
|
5639ea0380
|
bugfix: adding weeks ignores timezone differences
|
2019-02-14 12:11:58 +01:00 |
|
SJost
|
d0ed667cf3
|
LecturerInfoPage Stub
|
2019-02-14 11:24:56 +01:00 |
|
SJost
|
67d6fad1d4
|
Fixbuild linter warnings
|
2019-02-11 10:55:04 +01:00 |
|
Felix Hamann
|
b98a751748
|
revert change to course description modal wording
|
2019-02-09 21:07:43 +01:00 |
|
Felix Hamann
|
6af0ebe400
|
remove modal trigger icon
|
2019-02-09 21:03:33 +01:00 |
|
Felix Hamann
|
ce5301e590
|
Merge branch 'master' into feat/modalicons
|
2019-02-09 20:07:50 +01:00 |
|
SJost
|
98994496a7
|
Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX
|
2019-02-06 16:30:55 +01:00 |
|
SJost
|
26cc12127b
|
Convenience for AuthPreds
|
2019-02-06 16:30:51 +01:00 |
|
SJost
|
fbfa4bdff2
|
Convenience New Term implemented
|
2019-02-06 16:12:30 +01:00 |
|
SJost
|
924831f3e4
|
Fixes #262
|
2019-02-05 23:25:18 +01:00 |
|
SJost
|
7a684f6cb6
|
FIxes #262
|
2019-02-05 23:11:31 +01:00 |
|
Felix Hamann
|
557b0e1e97
|
Merge branch 'pagination' into 'master'
Table and Pagesize Frontend Refinement
Closes #116
See merge request !132
|
2019-02-04 21:54:55 +01:00 |
|