Commit Graph

996 Commits

Author SHA1 Message Date
SJost
b05f1ccc75 Rating type shown along rating in all corrections. 2018-11-30 21:51:16 +01:00
Gregor Kleen
5e911d22bc Handle AuthPredsR more elegantly 2018-11-30 18:24:56 +01:00
Gregor Kleen
2cecac6955 Fix AuthTag-Subsumption to not be order-dependent
Fixes #241
2018-11-30 17:55:52 +01:00
SJost
2ef4bbc014 Neue Statistik nun auch für Blattübersicht 2018-11-30 17:45:27 +01:00
SJost
16771ae8c5 Fix build. 2018-11-30 16:34:36 +01:00
SJost
24b1e18e90 merge from master 2018-11-30 16:23:12 +01:00
SJost
9fc052d9bb AuthTag Empty implemented. 2018-11-30 15:57:57 +01:00
SJost
42915b3920 Proper statistics implemented for submission lists 2018-11-30 15:33:27 +01:00
SJost
81d8d8c017 NO COMPILE. Templates for summaries done, but nestes does not (still) work. Duh. 2018-11-30 14:44:23 +01:00
SJost
2308771350 NO COMPILE. Templates for summaries done, but nestes does not (still) work. Duh. 2018-11-30 14:31:05 +01:00
Gregor Kleen
8e4afc554b Fix #239 2018-11-30 13:28:20 +01:00
Gregor Kleen
bb4140fa3d avoid weird override by sending db-table-shortcircuit as header 2018-11-29 14:07:47 +01:00
Gregor Kleen
f126246a23 Fix build 2018-11-29 12:52:02 +01:00
Gregor Kleen
997403d6be Send pagination data in dbTable-Forms 2018-11-29 12:30:42 +01:00
Gregor Kleen
6c0f031c4e Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2018-11-29 11:02:58 +01:00
Gregor Kleen
3ad8505489 Generalize encrypted error messages to encoded SecretBoxes 2018-11-29 11:01:49 +01:00
SJost
fed70610f0 Summary shown for all submission, but mislabelled 2018-11-28 12:01:14 +01:00
SJost
7ea7b6f0fc Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2018-11-28 09:27:37 +01:00
Gregor Kleen
431eb45a94 Log to file during tests 2018-11-27 19:11:28 +01:00
Gregor Kleen
77d03348e8 Fix tests 2018-11-27 16:03:48 +01:00
Gregor Kleen
03fa874e05 Account for jitter in determining whether CronLastExec is acceptable 2018-11-27 15:38:07 +01:00
SJost
160ec5a8dc Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2018-11-27 14:11:37 +01:00
Gregor Kleen
0c3cf631a5 Fix check for existingSubUsers; no longer produces false positives 2018-11-27 10:12:44 +01:00
Gregor Kleen
52467723b8 Cleanup fuzzy pseudonym handling 2018-11-26 17:24:19 +01:00
Gregor Kleen
52e99bae53 Fix #232 2018-11-24 21:50:04 +01:00
Gregor Kleen
92da5a3123 minor cleanup 2018-11-24 15:30:18 +01:00
Gregor Kleen
179f003c32 Ajax'ed authpreds 2018-11-22 22:18:39 +01:00
Gregor Kleen
58ed6b87a3 Address hlint 2018-11-22 21:40:03 +01:00
Gregor Kleen
67f6103f87 Debug javascript setup 2018-11-22 20:56:49 +01:00
Gregor Kleen
213f3a39cc Fully ajaxified modals 2018-11-22 17:25:56 +01:00
Gregor Kleen
a627b7be72 Globally defined get parameters & headers 2018-11-22 14:55:27 +01:00
SJost
5a4ef4e13c Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2018-11-20 15:49:10 +03:00
SJost
b0732ae6c6 Mino 2018-11-20 15:48:29 +03:00
Gregor Kleen
417285f20d Fix #235 2018-11-19 14:26:31 +01:00
Gregor Kleen
c26897847c Show SheetSubmissionMode & cleanup 2018-11-19 13:53:05 +01:00
Gregor Kleen
a634aca98a Fix tags 2018-11-14 17:08:52 +01:00
Gregor Kleen
bc12fcda2f Fix build 2018-11-14 14:38:03 +01:00
Gregor Kleen
27f2e077fe Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2018-11-14 14:23:09 +01:00
Gregor Kleen
4697efab5f Overhaul auth-predicates 2018-11-14 14:20:32 +01:00
SJost
94ee06d3c7 All routes with CryptoIds are verified now, see #233 2018-11-13 16:03:13 +01:00
SJost
dc4f37c921 Subtask for #233. Rights checked for Corrector assignment 2018-11-13 15:36:59 +01:00
SJost
b27fb8f391 Bugfix: SAssignR time attribute 2018-11-13 14:23:43 +01:00
SJost
673d98ff91 Single submission assign corrector 2018-11-12 17:12:24 +01:00
SJost
3aca9c115a Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2018-11-11 09:51:01 +01:00
Gregor Kleen
7bf3a52599 i18n MenuItems & Semantic support-referer
Addresses #228
2018-11-09 22:43:45 +01:00
SJost
af40d86de9 Bugfix: assignAction no longer delivers duplicate actions 2018-11-09 17:45:06 +01:00
SJost
626fcba2db Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2018-11-09 13:59:29 +01:00
SJost
7bc72505a4 Ratings are now validated, some refactoring 2018-11-09 13:59:14 +01:00
Gregor Kleen
a056690151 Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2018-11-09 13:57:32 +01:00
Gregor Kleen
1d69bd8d07 Allow setting name when sending help request without account 2018-11-09 13:57:11 +01:00
SJost
d2194d5605 Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2018-11-09 12:24:36 +01:00
Gregor Kleen
77dcc02b9c iframe-based dynamic modals
Fixes #226, fixes #217
2018-11-09 11:53:22 +01:00
SJost
b235541500 Submission form shows submitter now 2018-11-09 10:28:53 +01:00
SJost
ec06be2dfd Fixes #223, number of submission buddies, no longer ignore .vscode 2018-11-09 10:01:39 +01:00
Gregor Kleen
b81b7bf58c Fixes #225 2018-11-03 21:53:45 +01:00
Gregor Kleen
12c1a4ca71 Address hlint 2018-11-02 19:57:42 +01:00
Gregor Kleen
6cdfe0891b Address warnings 2018-11-02 14:32:47 +01:00
Gregor Kleen
455a239c8c Merge branch 'master' into tests 2018-11-02 14:24:20 +01:00
SJost
9aaee52ce1 BUGFIX: sort corrections by assigned time (undefined sortColumn) 2018-11-02 12:20:43 +01:00
Gregor Kleen
e5d3213efb Fix some hlint 2018-11-02 00:25:44 +01:00
Gregor Kleen
9ccc2e3149 Fix warnings 2018-11-01 22:06:00 +01:00
SJost
e4e5b543a5 Workaround for unfixed issue #223 2018-11-01 17:01:40 +01:00
SJost
af77f1cab3 Fixes #222. Fixes #213. Bug with Summary-Display (not summing up properly). 2018-11-01 16:04:46 +01:00
Gregor Kleen
3d91e0fabd Setup hlint & yesod 2018-10-31 23:55:29 +01:00
SJost
d6ef0c1b65 Tooltips clarifying sheetTypes and sheetGrading at sheet creation 2018-10-31 17:07:19 +01:00
SJost
73bd8bf9f0 Fixes #222 2018-10-31 15:48:34 +01:00
Gregor Kleen
75dcb120ed Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2018-10-31 13:21:00 +01:00
Gregor Kleen
8bce5b102a Merge branch 'master' into 85-entfernen-von-vorigen-aufgabenstellungen-eines-ubungsblattes-funktioniert-nicht 2018-10-31 13:20:42 +01:00
Gregor Kleen
3adac1f25b Fixes #85 2018-10-31 13:20:35 +01:00
SJost
9d71dd7d9a Fixes #213 2018-10-31 12:26:47 +01:00
SJost
db18b4bdba Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX into sheet-type 2018-10-31 09:45:32 +01:00
SJost
1b021259cc SheetType refactoring (Halfway only) 2018-10-31 09:44:40 +01:00
Gregor Kleen
eff7875c1c Cleanup language extensions 2018-10-28 19:11:40 +01:00
Gregor Kleen
849e3eb347 Interface for decrypting error messages 2018-10-28 14:14:27 +01:00
Gregor Kleen
90e942f5b4 Better error messages, Store config in db
Fixes #197
Fixes #93
2018-10-27 22:24:43 +02:00
Gregor Kleen
712589192f Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2018-10-24 21:43:22 +02:00
Gregor Kleen
4c1c172ac5 Minor cleanup 2018-10-24 21:42:45 +02:00
SJost
ea5484885d Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2018-10-24 18:19:34 +02:00
SJost
028cc3586d Profile cleaned 2018-10-24 18:19:16 +02:00
Gregor Kleen
c24370b7cc Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2018-10-24 18:01:23 +02:00
Gregor Kleen
4a032f3ede Never repeat NotificationSubmissionActive 2018-10-24 18:01:06 +02:00
SJost
600d06f75b Merge Notification ExpiryDate 2018-10-24 16:58:31 +02:00
SJost
a8262a4162 Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2018-10-24 16:44:59 +02:00
SJost
584fc4558e Notification Corrections assigned added 2018-10-24 16:44:39 +02:00
Gregor Kleen
3342daa0e8 Fix SubmissionRatingDone 2018-10-24 16:39:45 +02:00
Gregor Kleen
c50b24b962 CronNotAfter 2018-10-24 16:13:13 +02:00
SJost
3b96d96838 NotificationSheetInactive 2018-10-24 14:59:46 +02:00
SJost
445ddb8ca6 minor 2018-10-22 21:41:39 +02:00
SJost
af5f4f190d Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2018-10-22 21:23:56 +02:00
SJost
aa34d66367 minor 2018-10-22 21:23:53 +02:00
Gregor Kleen
b288b56e1d SystemMessage CRUD 2018-10-22 18:27:08 +02:00
Gregor Kleen
d663586516 CorrectionsGradeR 2018-10-22 10:34:38 +02:00
Gregor Kleen
353e958755 Display pseudonyms & anonymise submission page
Fixes #118
2018-10-21 12:08:01 +02:00
Gregor Kleen
bd260d1a38 Cleanup 2018-10-19 21:26:17 +02:00
Gregor Kleen
1aa08cdb82 Cleanup 2018-10-19 20:51:33 +02:00
Gregor Kleen
d6ddf2d24b Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2018-10-19 14:59:49 +02:00
Gregor Kleen
3e784534a0 Framework for dynamic log settings & major jobs cleanup 2018-10-19 14:59:28 +02:00
SJost
60db7a7b44 Heading for Help added 2018-10-18 21:37:12 +02:00
SJost
38e37b8583 Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2018-10-18 16:40:02 +02:00
SJost
4a394d2050 Labels adjusted, HelpForm not working before Login due to Modal-Login not being hidden properly, see #212 2018-10-18 16:38:54 +02:00
Gregor Kleen
1deefdc4a6 Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2018-10-17 22:31:05 +02:00
Gregor Kleen
a23841e4f8 Start work on SystemMessages 2018-10-17 22:30:47 +02:00
SJost
033e3a8ad8 Bugfix: delete user; Help Widget (MsgMissing) 2018-10-17 18:10:18 +02:00
SJost
adde4ccdf6 Bugfix: delete user cd /home/jost/programming/Haskell/Yesod/uniworx/templates 2018-10-17 18:07:04 +02:00
SJost
5a349f9b85 Bugfix: deletion deletes files now. 2018-10-17 14:49:53 +02:00
SJost
83c4210f8b Minor: delete as message 2018-10-17 14:05:45 +02:00
SJost
70f77f8dee Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2018-10-17 13:12:49 +02:00
SJost
f556d158cc Stub for Help-Button via Modal added 2018-10-17 12:11:31 +02:00
SJost
2634774eef Löschen von festen Abgabegruppen implementiert. 2018-10-17 10:53:53 +02:00
SJost
832c007027 User deletion implemented, but not tested 2018-10-17 10:38:56 +02:00
Gregor Kleen
52d6c2d347 minor cleanup 2018-10-17 10:30:28 +02:00
Gregor Kleen
b89dd09a94 NTSheetInactive should default to False 2018-10-17 09:47:54 +02:00
Gregor Kleen
f07ad82c1d Pseudonym submission creation 2018-10-15 15:02:44 +02:00
Gregor Kleen
2d90eef867 Fix build & cleanup 2018-10-15 09:19:08 +02:00
Gregor Kleen
1f32f638f0 Fix pseudonym coding & new wordlist 2018-10-15 09:06:41 +02:00
Gregor Kleen
8e28c397fd Return existing in SPseudonymR 2018-10-15 08:44:12 +02:00
Gregor Kleen
4266683b15 Fix pseudonym generation 2018-10-15 02:15:46 +02:00
Gregor Kleen
788b53946a SheetSubmissionMode & generate pseudonyms 2018-10-15 01:04:49 +02:00
Gregor Kleen
9a94e48d40 Merge remote-tracking branch 'origin/master' into feat/jobs 2018-10-14 17:55:45 +02:00
Gregor Kleen
5332e22c13 img_modal_svg 2018-10-14 17:24:19 +02:00
Gregor Kleen
967d1bec09 More i18n 2018-10-14 17:04:23 +02:00
Gregor Kleen
ffc20e6a4c Profile notification settings 2018-10-14 16:51:05 +02:00
Gregor Kleen
72f57e6595 YesodJobDB, cleanup
Fixes #204
2018-10-14 16:08:03 +02:00
Gregor Kleen
d08166420d Fix notification rate limiting 2018-10-14 15:00:01 +02:00
Gregor Kleen
c1e6f699e0 email charsets 2018-10-14 14:57:45 +02:00
Gregor Kleen
540bb8fe2e nicer logging 2018-10-13 22:36:17 +02:00
Gregor Kleen
c3332b57ef CronNotScheduled 2018-10-13 22:01:11 +02:00
Gregor Kleen
d6e0e9f7ca Fix busy waiting 2018-10-13 22:01:03 +02:00
Gregor Kleen
ff68ef7c9f pseudo-required fields
Fixes #207
2018-10-13 19:09:17 +02:00
Gregor Kleen
b25bf48821 purneLastExecs 2018-10-13 17:38:22 +02:00
Gregor Kleen
27dfae1345 Handle serialization failures 2018-10-13 17:27:31 +02:00
Gregor Kleen
8db4347ac3 Reduce noise 2018-10-13 16:55:52 +02:00
Gregor Kleen
d00c6abd6b Fix build 2018-10-13 16:48:11 +02:00
Gregor Kleen
3297b56ebf cleanup 2018-10-13 16:23:39 +02:00
Gregor Kleen
a7cfb86419 Ignoring stale locks 2018-10-13 15:53:38 +02:00
Gregor Kleen
99c53fee73 Cronjobs & notifications for sheet active/inactive 2018-10-13 15:41:02 +02:00
Felix Hamann
18b3fe0e5d introduced icon for modals 2018-10-13 00:10:56 +02:00
Gregor Kleen
7bdf015560 Implement Cron 2018-10-12 23:37:16 +02:00
Gregor Kleen
9183ff9aa4 cleanup 2018-10-12 20:20:13 +02:00
Gregor Kleen
d743fd6536 Time formatting in emails 2018-10-12 19:40:52 +02:00
Gregor Kleen
f98939885b Wire in NotificationSubmissionRated 2018-10-11 21:44:58 +02:00
SJost
67ba5509b1 3rd tick for issue #187 2018-10-11 19:24:44 +02:00
SJost
b87c3c4ca7 Fixes #202. Not a bug actually. 2018-10-11 12:04:40 +02:00
SJost
39e96e6ccd Fixes #190 2018-10-11 11:14:56 +02:00
SJost
bef662d162 Fix build. 2018-10-11 10:39:28 +02:00
SJost
d937e3d894 Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2018-10-11 10:35:26 +02:00
SJost
a6afd02a15 cannot remember 2018-10-11 10:19:25 +02:00
Gregor Kleen
ee08b641bb Fix modular behaviour of cron 2018-10-10 13:18:33 +02:00
Gregor Kleen
20db862f53 Cleanup & worker pool 2018-10-10 12:18:22 +02:00
Gregor Kleen
4598b38242 Cron 2018-10-09 20:07:50 +02:00
Gregor Kleen
0ca12cecdb Merge remote-tracking branch 'origin/master' into feat/jobs 2018-10-08 09:39:27 +02:00
Gregor Kleen
542ee8bb30 Minor cleanup 2018-10-08 08:24:13 +02:00
Gregor Kleen
39d493dfb7 Emit Settings on startup for debugging 2018-10-05 21:41:56 +02:00
Gregor Kleen
7068b3462e Grand unification of modals 2018-10-05 13:11:00 +02:00
Gregor Kleen
8dcdcae086 More aggressive transaction commits & Cleanup
Fixes #198
2018-10-05 12:30:39 +02:00
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