Commit Graph

841 Commits

Author SHA1 Message Date
Gregor Kleen
9040ff4d3d Cleanup 2018-10-04 20:11:21 +02:00
Gregor Kleen
1beeea5aa6 Working mail test 2018-10-04 19:48:07 +02:00
Gregor Kleen
74222dbcc8 Framework for email-test 2018-10-04 14:53:36 +02:00
Gregor Kleen
7553182cf9 Dates in emails 2018-10-03 18:40:06 +02:00
Gregor Kleen
e650d5c2c0 fix exports 2018-10-03 17:28:57 +02:00
Gregor Kleen
b7771137a5 Monadic construction of mime emails 2018-10-03 17:27:31 +02:00
Felix Hamann
b9ba2167aa add modalDynamic to modalStatic 2018-10-03 13:09:25 +02:00
Felix Hamann
7ea45e3a17 reintroducing dynmic modals 2018-10-03 13:09:25 +02:00
Felix Hamann
41167afb04 alerts from bottom and uniformely dark with color hints
closes #189
2018-10-03 13:09:25 +02:00
Felix Hamann
267abc939c fix non-exhaustive pattern for modals and remove remaining jquery integration
closes #188
2018-10-03 13:09:25 +02:00
Felix Hamann
4579fe56be modal adjustments 2018-10-03 13:09:25 +02:00
Gregor Kleen
0df588c267 Merge branch 'master' into feat/jobs 2018-10-02 19:38:18 +02:00
Gregor Kleen
ead35c4518 Fix splitCamel 2018-10-02 19:37:16 +02:00
Gregor Kleen
35c653160a better error message on invalid portnumber 2018-10-02 18:17:48 +02:00
Gregor Kleen
68ddceb5f1 Introduce smtpPool 2018-10-02 16:00:04 +02:00
Gregor Kleen
5869cb226b more serializition 2018-10-01 20:39:13 +02:00
Gregor Kleen
1f833ca7fb Merge branch 'master' into feat/jobs 2018-10-01 19:21:50 +02:00
Gregor Kleen
fb52db33a1 Cleanup 2018-10-01 19:21:45 +02:00
Gregor Kleen
bf060c4654 minor cleanup 2018-10-01 13:34:03 +02:00
Gregor Kleen
a63e59d5a3 Merge branch 'master' into feat/jobs 2018-10-01 13:17:37 +02:00
SJost
45a71cc038 Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2018-10-01 09:11:39 +02:00
SJost
a4862b692a Minor; fixes a warning 2018-10-01 09:10:37 +02:00
Gregor Kleen
7bafd767dd Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2018-09-28 21:34:07 +02:00
Gregor Kleen
857dc92ca2 Overhaul authentication
Fixes #186
2018-09-28 21:27:19 +02:00
SJost
2140c21560 Delete Data via Modal; stub. 2018-09-28 19:14:27 +02:00
SJost
e63a08e160 Warning: self-corrector added. 2018-09-28 17:59:36 +02:00
SJost
66ab0f9be6 Major contributions towards #189 and #194 2018-09-28 17:22:22 +02:00
Gregor Kleen
a6be152981 minor cleanup 2018-09-28 14:12:13 +02:00
Gregor Kleen
a803905570 Better dummy login 2018-09-28 13:35:47 +02:00
SJost
0a3b09f5ee Stubs, needs work, does not compile 2018-09-27 14:37:46 +02:00
SJost
9bb7f3a904 AlertMessageLabels-ProposalOnly 2018-09-24 19:00:40 +02:00
SJost
4d96504fe7 Stubs for Lecture-User-Data 2018-09-24 14:14:34 +02:00
SJost
43598d05c4 Fixes #190, except for manipualted post-data (ok) 2018-09-21 16:29:26 +02:00
SJost
d696c7375e Code cleaning and bug fixes towards #187 2018-09-21 08:31:18 +02:00
SJost
a20ff1468e First part of issue #187 implemented. 2018-09-20 16:49:19 +02:00
SJost
7caad588f8 Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2018-09-20 09:42:04 +02:00
SJost
f914963eb5 Fixes #183 2018-09-19 19:40:05 +02:00
SJost
0e6596889a Breadcrumbs shortened; Term warning added to sheet edit page. 2018-09-19 16:17:08 +02:00
Gregor Kleen
fe727e51cf i18n StudyFieldType 2018-09-19 12:22:38 +02:00
Gregor Kleen
899741bb41 Add UploadMode to Sheet
Fixes #181
2018-09-18 20:43:32 +02:00
Gregor Kleen
47c97652f2 Show degree & field number, if no name is available 2018-09-18 17:16:17 +02:00
SJost
1095bc8a6f Fix nameWidget 2018-09-18 16:54:33 +02:00
SJost
a467307998 Fix for Surname in Foundation 2018-09-18 16:33:25 +02:00
SJost
1b79509b06 Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2018-09-18 16:04:29 +02:00
SJost
7c0c70f241 users have surnames now! 2018-09-18 16:04:21 +02:00
Gregor Kleen
327b42902b Revamp i18nCell & textCell 2018-09-18 15:57:13 +02:00
SJost
ffb69e7358 Minor code cleaning 2018-09-18 15:09:20 +02:00
SJost
4234824f20 Minor code cleaning cd /home/jost/programming/Haskell/Yesod/uniworx/templates 2018-09-18 15:08:21 +02:00
SJost
eed3cf51ae Convenience for new exercise sheets implemented. 2018-09-18 10:45:44 +02:00
SJost
c684692cc2 Fixes unformatted UTCTime displays; DisplayAble no longer available for all Show Types 2018-09-17 15:35:14 +02:00
SJost
27cbff2aaa Matrikelnummern bei Abgaben anzeigen, RenderMessage Instanz für Load überarbeitet. 2018-09-15 11:23:55 +02:00
SJost
fe926b116f Corrector duties shown in ProfileDataR page now. 2018-09-14 19:51:13 +02:00
SJost
cc4c8a897e Fixes #179 2018-09-14 17:54:13 +02:00
SJost
918141da4c Code cleaning; Table for SubmissionGroups. 2018-09-13 16:51:20 +02:00
SJost
9fff50983d Handler.Utils.Table.Cells cleaned 2018-09-12 11:54:25 +02:00
SJost
b98a5c2aa7 minor 2018-09-11 17:02:55 +02:00
SJost
b230ba870d Handler.Utils.Table.Convenience -> Cells; ProfileData clean refactored 2018-09-11 16:40:41 +02:00
SJost
f7f8514f5e minor 2018-09-11 14:18:07 +02:00
SJost
a575deda78 makeClassy_ changed to makeLenses_ in order to avoid nuerours warnings due to the entirely unused HasSomething class definitions. 2018-09-11 14:09:21 +02:00
SJost
b3bfffe1c6 minor 2018-09-11 11:23:14 +02:00
SJost
ee8990f244 Discuss: Convenience.submissionCell 2018-09-11 10:51:51 +02:00
SJost
3523549d0e Sort submissions by time, show lecturers in course 2018-09-11 09:00:25 +02:00
SJost
c4c5a6b05c Profile-Data: Submissions shown 2018-09-10 17:24:43 +02:00
SJost
f426739868 Minor: missing headings added for school pages 2018-09-10 15:12:48 +02:00
SJost
45563750ac School Handler Stub; Profile shows own courses with lean dbTable 2018-09-10 14:38:19 +02:00
SJost
bf3a12d09d Sorting/Filter refactro Profile Data 2018-09-09 11:31:59 +02:00
SJost
93a29d0ec9 SJ uses Lenses for great good or for havoc? Discuss! 2018-09-07 17:39:36 +02:00
SJost
39270bd788 First try for #174, needs more thinking though, see issue. 2018-09-06 17:06:36 +02:00
Gregor Kleen
66dbad9b72 Experimental: don't try to marshal if we don't care
Also explicitly test migration during deployment
2018-09-06 15:31:28 +02:00
Gregor Kleen
3bfae5d3c6 Experimental: fewer quotes 2018-09-06 15:20:57 +02:00
Gregor Kleen
fadd7c4d88 Experimental: better quoting 2018-09-06 14:58:58 +02:00
Gregor Kleen
e32ad38fb9 Experimental: try more quoting 2018-09-06 14:57:42 +02:00
SJost
e971432cd7 Migration fix attempt 2018-09-06 14:13:42 +02:00
SJost
a29255f87c Minor cleaning: Handler/Utils/Term removed 2018-09-06 13:37:02 +02:00
Gregor Kleen
dce59dbae9 Document existing utilities and modules 2018-09-06 13:31:30 +02:00
SJost
5feb6ff0f6 BUGFIX: schoolField working after SchoolId refactoring 2018-09-06 13:29:25 +02:00
SJost
0c10e7e0d9 More type annotations, still not enough 2018-09-03 17:30:11 +02:00
SJost
eda8289ce7 Initial attempt; does not type 2018-09-03 13:58:08 +02:00
SJost
262a5dca2b PageAction 'last breadcrumb' not needed as shown in PageActions for SCorrR linking to SEditR 2018-08-29 16:49:57 +02:00
Gregor Kleen
f22a95d3be cleanup 2018-08-29 15:25:25 +02:00
Gregor Kleen
5b9bb68011 Handle parametrized types in derivePersistFieldJSON 2018-08-29 13:57:53 +02:00
Gregor Kleen
7dedd8d501 Double quotes in migration 2018-08-29 12:52:17 +02:00
Gregor Kleen
b0cabdac15 Quotes in tableExists for Migration 2018-08-29 10:57:08 +02:00
Gregor Kleen
c27f8b390b Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2018-08-29 10:08:47 +02:00
Gregor Kleen
0a32a609b7 Fixes #164 2018-08-29 10:08:16 +02:00
Steffen Jost
d4de1da4e5 Merge branch 'feat/nonCourseShorts' into 'master'
Feat/non course shorts

See merge request !70
2018-08-29 10:04:45 +02:00
Gregor Kleen
0d36bed457 Fixes #163 2018-08-29 10:04:16 +02:00
SJost
f1f80bf814 SchoolId change to Shorthand completed 2018-08-29 09:47:10 +02:00
SJost
41e52609c5 minor 2018-08-28 15:19:16 +02:00
SJost
479601a8cf Remove/recreate constrainsts, BUT sql type conversion has a syntax error that I don't understand 2018-08-24 10:22:41 +02:00
SJost
d53c877802 Migration for schoolId works manually, but not automatically :( 2018-08-23 20:01:51 +02:00
SJost
1755edbfcf Compiles, fixes #162, but DB Migration is still missing. 2018-08-22 14:58:11 +02:00
SJost
5810dc5182 Work-in-progress, fixes #158 2018-08-22 13:38:13 +02:00
SJost
a4dacc8d01 Halfway through with #162, still todo 2018-08-21 13:34:32 +02:00
SJost
d153024e64 Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2018-08-20 09:44:59 +02:00
SJost
3515500685 minor comments 2018-08-20 09:44:49 +02:00
Gregor Kleen
32da6b5585 Traverse submissions in random order 2018-08-17 17:03:29 +02:00
Gregor Kleen
508ed2ecd9 More sophisticated submission distribution
Fixes #77
2018-08-17 16:57:57 +02:00
Gregor Kleen
7686996214 Cleanup 2018-08-16 13:00:03 +02:00
Gregor Kleen
ceb1191a28 Fix #117 2018-08-14 20:35:45 +02:00
Gregor Kleen
13cc4195c8 Fix database migrations for empty db
Fixes #159
2018-08-14 20:35:18 +02:00
SJost
1361f4e0b8 Minor merge 2018-08-14 10:34:54 +02:00
SJost
f66935659c Minor 2018-08-14 10:34:11 +02:00
Gregor Kleen
7671d68592 Better database encoding of JSON values 2018-08-13 14:46:08 +02:00
Gregor Kleen
adf98bf35a Simplify format of UserTheme 2018-08-13 14:21:27 +02:00
Gregor Kleen
264ad01d8f Introduce database versioning
Fixes #120
2018-08-13 14:13:38 +02:00
Gregor Kleen
67ad9c1176 Fix Course- & School-ids
Fixes #151
2018-08-13 11:49:05 +02:00
Gregor Kleen
f1e2c6d3af Remove dead code 2018-08-07 10:01:27 +02:00
Gregor Kleen
28c7afe69c Cleanup Theme declaration 2018-08-06 22:16:33 +02:00
Gregor Kleen
d2242f21ff Always form a monoidal sum during a run of dbTable
Fixes #142
2018-08-06 17:39:31 +02:00
Gregor Kleen
8d70518fbb Better detect if dbTable-sorting is set by user
Fixes #113
2018-08-06 16:46:01 +02:00
Gregor Kleen
15bb52d6e5 Minor settings cleanup 2018-08-06 16:07:41 +02:00
Gregor Kleen
430ca30c7f Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2018-08-06 11:47:06 +02:00
Gregor Kleen
747362c261 Cleanup Settings & add option for content-disposition 2018-08-06 11:46:46 +02:00
SJost
cb62d48f0e Minor renaming 2018-08-03 16:57:18 +02:00
SJost
460144df6a Fix #146 2018-08-03 16:10:05 +02:00
SJost
c8d6e72194 fixes #144 #146 2018-08-03 15:40:34 +02:00
SJost
2820588913 Minor beauty fix, removes a leftover from debugging. 2018-08-03 12:03:47 +02:00
SJost
13b575b952 Course List features Course Descriptions now. fixes issue #80 now. fix #80 2018-08-03 11:46:13 +02:00
SJost
04ac80a8ba CourseDescription not working properly in CourseList 2018-08-02 16:55:49 +02:00
SJost
34f94bb886 Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2018-08-02 15:08:47 +02:00
SJost
f6ade63d1e Fix #81 2018-08-02 15:08:28 +02:00
Gregor Kleen
48a36ca619 Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2018-08-02 14:38:47 +02:00
Gregor Kleen
b4f08c28df Make maintenance logins resilient to LDAP failures 2018-08-02 14:38:32 +02:00
SJost
a67a94468c Minor cleaning of redundant alerts 2018-08-02 09:58:43 +02:00
SJost
99354919ba Courselist must show school as well! 2018-08-01 19:24:18 +02:00
SJost
47d74577bc Merge conflicts resolved 2018-08-01 18:54:29 +02:00
SJost
f311ce36aa Statistik für Übungsblätter 2018-08-01 18:43:50 +02:00
SJost
85b57654a5 Statistik für Übungsblätter 2018-08-01 18:37:29 +02:00
Gregor Kleen
7d0c3d4659 reenable csrf 2018-08-01 16:08:26 +02:00
Gregor Kleen
5d53be7af9 Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2018-08-01 15:44:34 +02:00
Gregor Kleen
7e4da171a1 fix build 2018-08-01 15:43:08 +02:00
Gregor Kleen
3de34cd5ae Plugin whitelist 2018-08-01 15:42:10 +02:00
Gregor Kleen
ba3fd9d458 Debug LDAP lookups 2018-08-01 15:18:43 +02:00
Gregor Kleen
64ac12802a Fallbacks for lack of LDAP in environment 2018-08-01 15:04:41 +02:00
Gregor Kleen
2a5c84e002 Get new LDAP to run 2018-08-01 14:29:09 +02:00
SJost
bd2b9333e8 Minor fixes toward percentage column, unfinished but compiles. 2018-08-01 12:26:47 +02:00
SJost
f92001510b Minor fixes toward percentage column, unfinished but compiles. 2018-08-01 12:26:26 +02:00
Gregor Kleen
69ca22fdde Form cleanup 2018-08-01 11:27:23 +02:00
SJost
d05ccc9c6d Fixes #132 2018-08-01 10:45:34 +02:00
Gregor Kleen
3d920d1435 Framework for custom LDAP 2018-07-31 17:07:29 +02:00
SJost
fdeec42d36 Bugfix overloaded Lists in Course 2018-07-31 16:48:39 +02:00
SJost
118192c168 Kursliste zeigen Anmeldestatus 2018-07-31 16:42:34 +02:00
SJost
e9b504473c Courselist for all courses 2018-07-31 15:35:35 +02:00
SJost
aec528d94c Übersicht Übunbgsblätter enthält links für Korrektur und Rating 2018-07-31 14:08:59 +02:00
Gregor Kleen
534c7183ff Two-digit years 2018-07-30 23:29:58 +02:00
Gregor Kleen
c1cff156a1 Normalize paths & CryptoFileNameSubmission-prefix 2018-07-30 22:35:31 +02:00
Gregor Kleen
99d7b5813d Clean up auth-predicate evaluation 2018-07-30 18:48:11 +02:00
Gregor Kleen
44251428c8 Tighten up CSRF
TODO #17
2018-07-30 17:02:53 +02:00
Gregor Kleen
6a53fb1401 Display submission users 2018-07-30 16:30:38 +02:00
Gregor Kleen
2ddc0a03cb Merge branch 'live' into 'master'
# Conflicts:
#   src/Handler/Utils/Submission.hs
2018-07-23 16:05:19 +02:00
Gregor Kleen
e0c8e6edf0 Don't hide CorrectionR-PageAction
Fixes #128
2018-07-23 13:10:34 +02:00
Gregor Kleen
b80f9e79e4 Stop emitting SubmissionFilesIgnored when nothing was ignored 2018-07-23 13:10:04 +02:00
Gregor Kleen
e7e3404de0 Better error messages for submission uploads 2018-07-23 13:09:44 +02:00
Gregor Kleen
d1b806ade2 Fix alert historical alert class 2018-07-23 13:08:49 +02:00
Gregor Kleen
5beb46708f Implement submission blacklist
Fixes #130
2018-07-23 13:08:42 +02:00
Gregor Kleen
51c04aec20 Make a bunch of things case insensitive in database
Fixes #96

Might require manual database migration
2018-07-22 18:49:39 +02:00
Gregor Kleen
969ada63d8 Stop emitting SubmissionFilesIgnored when nothing was ignored 2018-07-22 17:44:52 +02:00
Gregor Kleen
8da542fb90 Don't hide CorrectionR-PageAction
Fixes #128
2018-07-22 17:28:53 +02:00
Gregor Kleen
cc285e953d Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2018-07-22 17:20:07 +02:00
Gregor Kleen
49ae1a3865 Propagate restriction on 'rated' to file downloads 2018-07-22 17:18:04 +02:00
Gregor Kleen
cc28e6f786 Introduce 'submissionRatingDone'
Resolves #129
2018-07-22 17:16:10 +02:00
SJost
d5064151ee Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX
Refactoring for FileTypes complete
2018-07-21 13:09:15 +02:00
SJost
ea118d3713 Refactor fileIdTables done 2018-07-21 13:05:45 +02:00
Gregor Kleen
460c62dfe5 Better error messages for submission uploads 2018-07-20 12:57:27 +02:00
Gregor Kleen
29fe30b90e Fix alert historical alert class 2018-07-20 11:49:22 +02:00
Gregor Kleen
69125f5704 Implement submission blacklist
Fixes #130
2018-07-20 11:48:33 +02:00
Gregor Kleen
648d4b8c33 Make rating parse expect more rigid structure
Fixes #127
2018-07-18 19:54:57 +02:00
Gregor Kleen
65b12d31d3 Include git hash in deployed site 2018-07-18 18:39:10 +02:00
Gregor Kleen
d2411b564a Work around format producing multiple rating lines 2018-07-18 17:01:32 +02:00
Gregor Kleen
e98d7849f6 Additional info in sinkSubmission-Exceptions 2018-07-18 16:52:10 +02:00
Gregor Kleen
9a6ae9dc49 Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2018-07-18 15:06:03 +02:00
Gregor Kleen
984b325dcd dbTable now handles form csrf & identification
Fixes #124
2018-07-18 15:05:28 +02:00
Gregor Kleen
cb0ac4b7e9 Fix PSLimitNonPositive 2018-07-18 14:52:41 +02:00
SJost
0bd86730d3 Minor comment 2018-07-18 13:58:33 +02:00
SJost
82add31a86 Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2018-07-18 13:15:20 +02:00
SJost
2184699b12 Minor typos fixed. 2018-07-18 13:15:13 +02:00
Gregor Kleen
b86d4de7ab Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2018-07-18 13:13:24 +02:00
Gregor Kleen
6d9b1dfa21 Fix calls to dbTable 2018-07-18 13:13:19 +02:00
Gregor Kleen
fcb50859fc Fix sheet table 2018-07-18 13:13:09 +02:00
SJost
ab80b9207d Multifile fields for Hints,Solutions,Markings 2018-07-18 13:10:24 +02:00
SJost
9feb4b7d5d Minor message cleaning 2018-07-18 12:30:32 +02:00
SJost
e9c8da1b85 Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2018-07-18 12:27:07 +02:00
SJost
e42e59242f Sheet Form validation and tooltips augmented 2018-07-18 12:21:16 +02:00
Gregor Kleen
c3b4a6aa95 Revamp sheet table
Also introduce `dbtProj`

Fixes #76
2018-07-18 12:19:00 +02:00
Gregor Kleen
bf18268e27 Merge branch 'master' into feat/exercises 2018-07-18 11:15:00 +02:00
Gregor Kleen
80e6ed9a10 Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2018-07-18 11:14:51 +02:00
Gregor Kleen
e0e731b698 Fix time logic on sheets 2018-07-18 11:14:39 +02:00
SJost
c2b94708c8 Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2018-07-18 10:14:29 +02:00
SJost
816215cf7c pageActions sorted and augmented 2018-07-18 10:14:23 +02:00
Gregor Kleen
2be22a1ba8 Merge branch 'master' into feat/exercises 2018-07-18 10:06:39 +02:00
Gregor Kleen
e28a0aa851 Set .logged-in 2018-07-18 10:05:06 +02:00
Gregor Kleen
1c78032f1e Additional information in rating files 2018-07-18 10:01:29 +02:00
Gregor Kleen
584d711cbc Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX into feat/exercises 2018-07-18 08:51:30 +02:00
Felix Hamann
16315e55fb breadcrumb for imprint and pagination-julius cleanup 2018-07-15 23:59:05 +02:00
SJost
9ab469311c MatrikelNr display in UserList 2018-07-11 12:38:16 +02:00
SJost
e1c2e7efe0 Rating file: UniWorx -> Uni2work 2018-07-10 18:33:31 +02:00
Gregor Kleen
a7fb5a7d9e Only show submission form if authorized 2018-07-10 13:47:26 +02:00
Gregor Kleen
03a785abc2 Fix PathPiece for ZIPArchiveName & submission original archive link 2018-07-10 13:47:02 +02:00
Gregor Kleen
86e28f6f52 Add dateTime-Format customization to Profile 2018-07-10 11:57:03 +02:00