Commit Graph

745 Commits

Author SHA1 Message Date
Felix Hamann
ebb9307629 move js for asyncTable to static 2019-02-16 19:59:01 +01:00
Felix Hamann
228aa8320d moved more js utils to static 2019-02-16 17:23:52 +01:00
Felix Hamann
1277982449 move js utils for inputs to static 2019-02-16 13:38:19 +01:00
Felix Hamann
9d6eb5ae4e move asidenav styles to static 2019-02-16 12:30:50 +01:00
Felix Hamann
65fffbbf28 add setup utility for js utils 2019-02-16 12:24:01 +01:00
SJost
cf8207f1c6 Swap icon Term<->Courses due to future Calendar replacement for Term 2019-02-16 10:44:14 +01:00
SJost
38a4cf594d Profile url reorganisation 2019-02-16 07:58:37 +01:00
SJost
d3e0f462f4 Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2019-02-16 07:36:54 +01:00
SJost
c07374539f Fix Breadcumbs 2019-02-16 07:36:40 +01:00
Felix Hamann
4035f1e9de make asidenav scrollable 2019-02-16 00:10:35 +01:00
Felix Hamann
a88bf36f0e move asidenav julius and lucius to static 2019-02-16 00:10:35 +01:00
Felix Hamann
12d37044b7 Merge branch 'refactor-alerts' into 'master'
Rework Alerts Widget

See merge request !146
2019-02-16 00:09:32 +01:00
SJost
d3f9425448 FIxbuild 2019-02-15 15:06:57 +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
24eec86bd6 Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2019-02-14 18:37:06 +01:00
SJost
ba45bc5883 Admins can change user access rights now 2019-02-14 18:34:26 +01:00
SJost
d0ed667cf3 LecturerInfoPage Stub 2019-02-14 11:24:56 +01:00
Gregor Kleen
418264c679 Make maximumContentLength configurable 2019-02-14 11:15:45 +01:00
Gregor Kleen
ec3ec2a882 Move alerts to separate widget 2019-02-13 19:45:39 +01:00
Gregor Kleen
800d063fa7 Use haskell-based sass-compilation for alerts.scss 2019-02-13 17:07:03 +01:00
Felix Hamann
18c5de4b86 move standalone alerts to static and prepare alerts widget 2019-02-12 22:32:43 +01:00
Felix Hamann
a55d03c016 cleanup of static files 2019-02-12 21:53:34 +01:00
Felix Hamann
c15f5da8e2 Merge branch 'master' into pageactions 2019-02-08 22:08:40 +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
7a684f6cb6 FIxes #262 2019-02-05 23:11:31 +01:00
Gregor Kleen
dbb9b600fd locally served fonts 2019-02-05 11:45:34 +01:00
Felix Hamann
8110405534 Merge branch 'master' into pageactions 2019-02-04 22:06:22 +01:00
Gregor Kleen
0a6ff1a966 Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2019-02-04 18:43:58 +01:00
SJost
1eb751b5f0 Access CRegisterR refactored again 2019-01-31 18:27:54 +01:00
SJost
36813d3717 Refactored Access check to CRegisterR without NTop for clarity 2019-01-31 18:25:41 +01:00
Gregor Kleen
8684ca016f Button cleanup 2019-01-31 11:12:20 +01:00
SJost
0bde8d5888 Fast Bugfix: course Register from 2019-01-30 19:27:10 +01:00
SJost
e4324a1c9b Fixes #262 2019-01-30 17:50:44 +01:00
SJost
13b5671480 Fixes #267 and related bugs 2019-01-30 16:00:18 +01:00
SJost
b2dd9f4214 Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2019-01-30 11:20:57 +01:00
SJost
0c9f9aa419 Bugfix access rights current & lastinactive 2019-01-30 11:13:25 +01:00
Gregor Kleen
06d44a4292 Minor cleanup 2019-01-30 11:12:35 +01:00
SJost
02a0dc1435 Minor Refactor 2019-01-30 10:58:57 +01:00
SJost
3ef6c08ac1 Fixes #272 2019-01-30 10:48:32 +01:00
SJost
5faf4d1208 Menu translation fix 2019-01-30 10:08:56 +01:00
Gregor Kleen
8ee3d723c7 Add check to only show secondary pageactions when needed
Rename pageactionprime.* -> pageaction.*
2019-01-28 13:26:46 +01:00
Gregor Kleen
bad828aa07 Introduce MenuType Footer; plumb footer.hamlet into defaultLinks
footer.hamlet now works much like navbar.hamlet
2019-01-26 12:44:22 +01:00
Felix Hamann
ba95caa980 add footer widget 2019-01-26 12:07:28 +01:00
SJost
30614511a5 Fixes #277 2019-01-25 10:40:18 +01:00
SJost
371a9e4673 refactored course navigation 2019-01-24 22:21:10 +01:00
SJost
4d3f4d56b5 Convenience Current Sheet 2019-01-24 17:09:55 +01:00
SJost
f5f9dea342 Fix #215 and other minor improvements 2019-01-24 14:44:48 +01:00
SJost
e19540556f Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2019-01-23 18:37:35 +01:00
SJost
3003b07742 PageActionPrime for #270 implemented 2019-01-23 18:35:53 +01:00
Gregor Kleen
795dd29aa3 Refine MenuSheetCurrent 2019-01-23 13:15:03 +01:00
SJost
b6b6cf75bb Towards #272 2019-01-16 15:58:52 +01:00
SJost
1a8cafdfe8 PageActionPrime for Course Corrections 2019-01-16 14:09:23 +01:00
SJost
ec3b4ec4dd Authorisation CUserR for !participant 2019-01-09 13:47:19 +01:00
Gregor Kleen
1621ee1fe8 Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2018-12-21 12:56:15 +01:00
SJost
dd3e321b7b Merge completed 2018-12-20 19:27:09 +01:00
Gregor Kleen
282e0615cb Split deleteR for use with correctionsR 2018-12-20 12:12:38 +01:00
Gregor Kleen
38dbc0905c Single-submission deletion 2018-12-19 22:31:09 +01:00
Gregor Kleen
c6b7ad0580 Generic and "safe" deletion widget 2018-12-19 21:55:42 +01:00
Gregor Kleen
45182e5074 Tighten check for empty course 2018-12-19 18:28:53 +01:00
Gregor Kleen
aa325f7fa9 Due to HasRoute-refactor CourseNewTemplateR is no longer needed 2018-12-19 17:51:00 +01:00
Gregor Kleen
db175ad907 Cleanup AdminHijackUserR 2018-12-16 18:17:32 +01:00
SJost
306fb351ad Error Handling für SinkSubmission 2018-12-12 12:05:22 +01:00
Gregor Kleen
30a5aff70e Implement connection pooling for LDAP 2018-12-11 21:21:02 +01:00
Gregor Kleen
5c8f837b88 Minor cleanup 2018-12-05 19:47:18 +01:00
Gregor Kleen
7fc705730d Minor cleanup 2018-12-05 17:57:13 +01:00
Gregor Kleen
3f60f6391c Revert "Include preload hints about static content"
This reverts commit c757bf9a00.
2018-12-05 15:30:51 +01:00
Gregor Kleen
dafb2389ba Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2018-12-05 15:07:39 +01:00
Gregor Kleen
c757bf9a00 Include preload hints about static content 2018-12-05 15:07:24 +01:00
SJost
3c90625d6f Merge remote-tracking branch 'origin/master' into 126-ubungsbetrieb-statistik-seiten-pro-kurs 2018-12-05 14:56:49 +01:00
Gregor Kleen
48080639b1 Memcached integration for widgets 2018-12-05 13:50:46 +01:00
SJost
63de63f16c UniworxMessages allows combining messages 2018-12-05 11:57:28 +01:00
SJost
17ea26430f Sorting Corrections and UniWorXMessages Monoid 2018-12-05 11:41:25 +01:00
SJost
aa455d2bdd Statistik Abgaben/Blätter done 2018-12-02 16:47:56 +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
9fc052d9bb AuthTag Empty implemented. 2018-11-30 15:57:57 +01:00
Gregor Kleen
3ad8505489 Generalize encrypted error messages to encoded SecretBoxes 2018-11-29 11:01:49 +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
52467723b8 Cleanup fuzzy pseudonym handling 2018-11-26 17:24:19 +01:00
Gregor Kleen
92da5a3123 minor cleanup 2018-11-24 15:30:18 +01:00
Gregor Kleen
67f6103f87 Debug javascript setup 2018-11-22 20:56:49 +01:00
Gregor Kleen
a627b7be72 Globally defined get parameters & headers 2018-11-22 14:55:27 +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
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
Gregor Kleen
7bf3a52599 i18n MenuItems & Semantic support-referer
Addresses #228
2018-11-09 22:43:45 +01:00
SJost
7bc72505a4 Ratings are now validated, some refactoring 2018-11-09 13:59:14 +01:00
Gregor Kleen
77dcc02b9c iframe-based dynamic modals
Fixes #226, fixes #217
2018-11-09 11:53:22 +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
Gregor Kleen
9ccc2e3149 Fix warnings 2018-11-01 22:06:00 +01:00
Gregor Kleen
3d91e0fabd Setup hlint & yesod 2018-10-31 23:55:29 +01:00
SJost
73bd8bf9f0 Fixes #222 2018-10-31 15:48:34 +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
SJost
028cc3586d Profile cleaned 2018-10-24 18:19:16 +02:00
SJost
584fc4558e Notification Corrections assigned added 2018-10-24 16:44:39 +02:00
SJost
3b96d96838 NotificationSheetInactive 2018-10-24 14:59:46 +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
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
f556d158cc Stub for Help-Button via Modal added 2018-10-17 12:11:31 +02:00
Gregor Kleen
f07ad82c1d Pseudonym submission creation 2018-10-15 15:02:44 +02:00
Gregor Kleen
788b53946a SheetSubmissionMode & generate pseudonyms 2018-10-15 01:04:49 +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
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
Gregor Kleen
20db862f53 Cleanup & worker pool 2018-10-10 12:18:22 +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
b7771137a5 Monadic construction of mime emails 2018-10-03 17:27:31 +02:00
Gregor Kleen
68ddceb5f1 Introduce smtpPool 2018-10-02 16:00:04 +02:00
Gregor Kleen
fb52db33a1 Cleanup 2018-10-01 19:21:45 +02:00
Gregor Kleen
a63e59d5a3 Merge branch 'master' into feat/jobs 2018-10-01 13:17: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
66ab0f9be6 Major contributions towards #189 and #194 2018-09-28 17:22:22 +02:00
Gregor Kleen
a803905570 Better dummy login 2018-09-28 13:35:47 +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
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
SJost
a467307998 Fix for Surname in Foundation 2018-09-18 16:33:25 +02:00
SJost
7c0c70f241 users have surnames now! 2018-09-18 16:04:21 +02:00
SJost
eed3cf51ae Convenience for new exercise sheets implemented. 2018-09-18 10:45:44 +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
f426739868 Minor: missing headings added for school pages 2018-09-10 15:12:48 +02:00
SJost
5feb6ff0f6 BUGFIX: schoolField working after SchoolId refactoring 2018-09-06 13:29:25 +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
SJost
1755edbfcf Compiles, fixes #162, but DB Migration is still missing. 2018-08-22 14:58:11 +02:00
SJost
a4dacc8d01 Halfway through with #162, still todo 2018-08-21 13:34:32 +02:00
Gregor Kleen
508ed2ecd9 More sophisticated submission distribution
Fixes #77
2018-08-17 16:57:57 +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
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
04ac80a8ba CourseDescription not working properly in CourseList 2018-08-02 16:55:49 +02:00
Gregor Kleen
b4f08c28df Make maintenance logins resilient to LDAP failures 2018-08-02 14:38:32 +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
Gregor Kleen
69ca22fdde Form cleanup 2018-08-01 11:27:23 +02:00
Gregor Kleen
3d920d1435 Framework for custom LDAP 2018-07-31 17:07:29 +02:00
SJost
e9b504473c Courselist for all courses 2018-07-31 15:35:35 +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
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
8da542fb90 Don't hide CorrectionR-PageAction
Fixes #128
2018-07-22 17:28:53 +02:00
Gregor Kleen
cc28e6f786 Introduce 'submissionRatingDone'
Resolves #129
2018-07-22 17:16:10 +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
e28a0aa851 Set .logged-in 2018-07-18 10:05:06 +02:00
Felix Hamann
16315e55fb breadcrumb for imprint and pagination-julius cleanup 2018-07-15 23:59:05 +02:00
Gregor Kleen
2882b02214 Split DateTimeFormat up into three fields 2018-07-10 10:51:31 +02:00
Gregor Kleen
239c96d907 Timezones, date formatting & minor cleanup 2018-07-09 23:07:26 +02:00
Gregor Kleen
4993c7994c Fix preference-order on parents 2018-07-08 22:31:11 +02:00
Gregor Kleen
4c86306bfd Fix NavBar-Highlighting 2018-07-08 22:10:33 +02:00
Felix Hamann
4b4847d551 get rid of now unneeded messageRenderer in defaultLayout 2018-07-08 21:28:40 +02:00
Felix Hamann
4fe479f9f3 move HOME to the left in navbar 2018-07-08 20:51:39 +02:00
Gregor Kleen
7da8d89a5c Course capacity now verified by route tag
Resolves #98
2018-07-08 10:44:09 +02:00
Gregor Kleen
353245c65f Generate headings for favourite-bar from content
Fixes #105
2018-07-07 22:16:22 +02:00
Gregor Kleen
b205db5529 Merge branch 'feat/pwfile-auth' 2018-07-04 12:03:07 +02:00
Gregor Kleen
523282e694 Use canned password management instead of implementing our own 2018-07-04 12:01:57 +02:00
Gregor Kleen
acd100bca7 PWFile auth-plugin 2018-07-04 11:35:30 +02:00
SJost
4ab3fc2b9f Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2018-07-03 19:16:38 +02:00
SJost
00a5f44d8b Freigabedaten für Sheet-Files 2018-07-03 19:16:34 +02:00
Gregor Kleen
d756277f93 Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2018-07-03 19:11:04 +02:00
Gregor Kleen
5611ae7ca2 Increase maximum file upload size 2018-07-03 19:10:54 +02:00
SJost
58010fec3b mino fixes 2018-07-03 18:52:37 +02:00
SJost
8c9e150483 Headings and Breadcrumbs added. 2018-07-03 17:24:08 +02:00
SJost
aeeacb3bfb Bugfix: Sheet Edit Button and some Page Headings 2018-07-03 16:50:03 +02:00
SJost
dddd262b6b Korrektur Button is hidden if there is no such correction 2018-07-03 14:05:21 +02:00
SJost
85cc86e37f Minor refactoring 2018-07-03 10:24:04 +02:00
SJost
a628519922 Corrector removed 2018-07-03 09:20:43 +02:00
SJost
47bc1ff604 Stub vor Version History and Impressum added 2018-07-03 08:56:26 +02:00
Gregor Kleen
e3fc2ee5a8 Fix broken template & cleanup routes 2018-07-02 09:26:39 +02:00
Gregor Kleen
0da0c46b2e Merge branch 'master' into feat/corrections-upload 2018-07-02 09:11:00 +02:00
Gregor Kleen
1ec5802a1c Single correction view 2018-07-02 08:44:15 +02:00
Felix Hamann
7e7e08837c get rid of glyphicons 2018-07-01 23:02:03 +02:00
Gregor Kleen
1d49244d63 Merge branch 'master' into feat/corrections-upload 2018-07-01 18:49:36 +02:00
Gregor Kleen
0d01ac95ab Corrections upload 2018-07-01 14:49:15 +02:00
Gregor Kleen
4ca7ebd6f1 Logik für Abgabe ansehen/anlegen
Fixes #78
2018-07-01 12:32:26 +02:00
Felix Hamann
db0076a628 navbar now with lmu-boxes 2018-07-01 01:32:36 +02:00
Gregor Kleen
c72b9ef385 Hierarchical submission routes 2018-07-01 00:23:38 +02:00
Gregor Kleen
99832c1286 Cleanup submission download 2018-06-30 21:16:11 +02:00
Gregor Kleen
60b250f5b3 Merge branch 'master' into feat/pagination 2018-06-30 18:54:19 +02:00
SJost
d240c0f680 Renamed to: Uni2work 2018-06-30 13:16:38 +02:00
Gregor Kleen
1dce109ac1 corrections list for sheet 2018-06-29 20:29:05 +02:00
SJost
80fad27692 Breadcrumbs and Headings all fixed 2018-06-29 20:24:15 +02:00
SJost
14d37203f8 Breadcrumbs and Headings fixed 2018-06-29 18:28:41 +02:00
Gregor Kleen
b334df4939 Further work on correction tables 2018-06-29 15:41:05 +02:00
Gregor Kleen
0ab7bbd7eb Merge branch 'feat/assign-correctors' into feat/pagination 2018-06-29 11:53:16 +02:00
Gregor Kleen
6e0558d094 Merge branch 'master' into feat/assign-correctors 2018-06-29 10:51:56 +02:00
SJost
bed7fb91b7 BUGFIX: Register Button for Lectures works as intended now! 2018-06-27 15:34:48 +02:00
Gregor Kleen
3c8f13b4dc Merge branch 'feat/exercises' into feat/pagination 2018-06-27 15:05:00 +02:00
SJost
ceaf92996b Favourites updated immediately now; Links for Lecturers are shown 2018-06-27 13:15:17 +02:00
SJost
882b30951b Übungsblätter not shown if none exists 2018-06-27 12:17:38 +02:00
Gregor Kleen
936b808aaf Merge branch 'master' into feat/pagination 2018-06-27 08:58:29 +02:00
Gregor Kleen
7b336dd5a6 Framework for forms in dbTable 2018-06-26 23:31:18 +02:00
SJost
5103974980 Changing Favourite Setting immediately deletes superfluous favorites. 2018-06-26 18:22:16 +02:00
Felix Hamann
61ba8bf052 added tooltips 2018-06-25 22:28:17 +02:00
SJost
808d27d321 Merge branch 'master' into feat/exercises 2018-06-25 19:29:42 +02:00
SJost
ded0f19c80 Profile page cleaned; explicit table now for Felix to refactor. 2018-06-25 19:29:14 +02:00
SJost
15291cda7c Merge branch 'master' into feat/exercises 2018-06-25 16:01:33 +02:00
SJost
adcaef4642 Homepage made almost presentable 2018-06-25 15:59:42 +02:00
Felix Hamann
879e1717ee added font-awesome for icons 2018-06-23 13:22:56 +02:00
Felix Hamann
2c9c076213 started moving first lvl navi to top 2018-06-22 23:40:34 +02:00
SJost
c6784a0b13 Minor. Puny attempts to resuse corrections table in several ways. 2018-06-22 18:31:47 +02:00
SJost
a3afbbc26d Merge branch 'master' into feat/exercises 2018-06-22 07:55:36 +02:00
SJost
07c44c966b BUGFIX: Exercise had no VisibleFrom Date defaultet to always False, now True if ActiveFrom time has been reached. 2018-06-21 16:46:43 +02:00
SJost
e90f2fc49e Corrections Route added that shows assigned corrections 2018-06-21 14:00:22 +02:00
SJost
61161b0a29 RenderMessage & Display instanzen für SheetFileType 2018-06-21 11:22:14 +02:00
SJost
8b46a690a8 Show Participant association on profile page 2018-06-20 15:31:45 +02:00
SJost
b5e849af64 Show Lecture/Corrector associations on profile page 2018-06-20 15:09:44 +02:00
SJost
11ec8f4f03 Profile page extendend, yet incomplete 2018-06-19 19:14:50 +02:00
SJost
f4dcd00669 Theme is now read from Database 2018-06-19 11:40:25 +02:00
SJost
f936453204 Minor refactor among utility modules 2018-06-19 11:05:02 +02:00
SJost
cc9d0a7b9a ThemeDatatype plus TemplateHaskell Show implemented 2018-06-19 09:30:37 +02:00
Gregor Kleen
16681d594e Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2018-06-12 19:42:39 +02:00
Gregor Kleen
9e017f8e84 Add some headings 2018-06-12 19:42:22 +02:00
SJost
5d57f5d58c Sidenavigation highlighting works now as intended. 2018-06-12 18:47:42 +02:00
SJost
af6d97454d Highlighting in Navigation of current favorite (Halfway-done without breadcrumbs) 2018-06-12 11:17:55 +02:00
SJost
66f066fc95 Theme now used in wrapper, but not set from DB in Haskell yet. 2018-06-12 10:30:04 +02:00
SJost
21a96ce44d AlertMessage close working with i18n now. 2018-06-12 10:05:58 +02:00
Felix Hamann
0188673e1f added datepicker globally 2018-06-10 20:52:29 +02:00
Felix Hamann
c54495fe58 renamed a few pageactions 2018-06-10 19:36:39 +02:00
Felix Hamann
08be5ef699 added styling and behaviour for alerts 2018-06-10 01:21:08 +02:00
Felix Hamann
482ac4547a moved page actions to the top right 2018-06-09 22:11:30 +02:00
Felix Hamann
d16ed578bf request for more PageHeadings 2018-06-09 21:29:42 +02:00
Felix Hamann
6c03063029 added font "Roboto" and indented breadcrumbs slightly 2018-06-09 20:20:18 +02:00
Felix Hamann
07e5ca8b79 Merge branch 'master' into feat/datepicker 2018-06-09 19:20:47 +02:00
Felix Hamann
694ce90551 added themes and experimental theme-switcher 2018-06-09 11:59:15 +02:00
SJost
ae64b10d5c Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2018-06-07 17:04:33 +02:00
SJost
b558d8d314 Access tags isWrite isRead added 2018-06-07 17:04:17 +02:00
Felix Hamann
38b879eab8 Merge branch 'ui_optis_0606' 2018-06-07 11:48:30 +02:00
Felix Hamann
8c4b2d62d3 got rid of comments and added header for termsList 2018-06-07 11:48:14 +02:00
SJost
c5beac0eb1 Minor commenting 2018-06-07 11:46:01 +02:00
Gregor Kleen
18c3840276 Fix build 2018-06-07 11:39:08 +02:00
Gregor Kleen
f4b6d1e3f5 Introduce pageHeading function 2018-06-07 11:39:08 +02:00
Felix Hamann
0d2c5696c5 slight refinments for inputs and 2018-06-07 11:39:08 +02:00
Felix Hamann
2883dedff7 input field styles and less navigation items 2018-06-07 11:39:08 +02:00
Felix Hamann
99643ff089 page title above page actions -wip 2018-06-07 11:39:08 +02:00
SJost
f00d2765c0 SheetMarking prohibited now for students. 2018-06-07 10:45:30 +02:00
SJost
ea6c7b7761 Fix for SheetMarking visible to students 2018-06-07 10:39:43 +02:00
Gregor Kleen
168e8bacb3 Merge branch 'feat/routes' of gitlab.cip.ifi.lmu.de:jost/UniWorX into feat/routes 2018-06-07 10:29:44 +02:00
Gregor Kleen
44776e1506 refactor SubmissionR 2018-06-07 10:29:27 +02:00
SJost
5e5c980459 minor refactors 2018-06-05 08:34:14 +02:00
SJost
e418ad2c91 Merge branch 'feat/routes' of gitlab.cip.ifi.lmu.de:jost/UniWorX into feat/routes 2018-05-30 23:46:51 +02:00
Gregor Kleen
cbc145a56c minor fixes 2018-05-29 17:48:40 +02:00
Gregor Kleen
4c47289c00 Merge branch 'feat/routes' into feat/assign-correctors 2018-05-29 17:43:24 +02:00
Gregor Kleen
aea5ef41d1 (Preliminarily) Finish knownTags 2018-05-29 17:42:02 +02:00
Gregor Kleen
3fb7ff9f13 Merge branch 'feat/routes' into feat/assign-correctors 2018-05-29 15:19:00 +02:00
SJost
87ab470072 Minor refactor andAP and adminAP 2018-05-29 10:49:46 +02:00
Gregor Kleen
69ee7b1a81 Work on knownTags 2018-05-29 10:27:35 +02:00
SJost
e3566d9832 asidenav.hamlet restored to previous version, bug in Foundation fixed. 2018-05-28 18:36:56 +02:00
SJost
c45fea6df3 New Rights Managament compiles and seems to work (apart from TODOs); Problem with ASIDENAV 2018-05-28 18:27:30 +02:00
Gregor Kleen
9260024676 Replace SheetCorrectors 2018-05-28 16:41:47 +02:00
SJost
ad998b53d8 knownTags increased 2018-05-25 13:12:09 +02:00
SJost
59423832e6 evalAccess is complete now 2018-05-25 11:54:27 +02:00
SJost
d5edf5ee7b liftAR refactored to avoid unnecessary DB access 2018-05-25 10:11:06 +02:00
SJost
f4964dcb55 after Discussion today 2018-05-23 20:01:52 +02:00
SJost
f14bea4015 AccessScaffold 2018-05-23 15:43:12 +02:00
Gregor Kleen
30b941eeec Mockup of SheetCorrectorsR 2018-05-17 15:39:50 +02:00
SJost
03f9bc4f89 Merge branch 'master' into feat/exercises 2018-05-17 09:32:04 +02:00
Felix Hamann
8634ad6ada readded removed JavaScript libraries 2018-05-08 22:59:46 +02:00
SJost
38e438b774 correctorForm just a stub 2018-05-04 12:55:23 +02:00
SJost
fcc2f68cea Merged new pageActions from master 2018-05-04 10:01:05 +02:00
SJost
afc022eee7 Merge branch 'master' into feat/exercises 2018-05-04 09:52:17 +02:00
Gregor Kleen
93c96ae620 Framework for Notifications 2018-04-29 13:55:09 +02:00
Gregor Kleen
6644af809e Migrate everything to new system of pageActions 2018-04-29 13:49:31 +02:00
Gregor Kleen
ad6f1ab199 Introduce pageActions and use in favourites 2018-04-29 13:48:40 +02:00
SJost
e98cf70400 MODEL REFACTOR: dropped ID suffixes throughout 2018-04-26 11:29:42 +02:00
SJost
56476ccb3e Uniwory und PageAction ExerciseSheet 2018-04-26 09:41:57 +02:00
Gregor Kleen
917d767d30 Cleanup SubmissionDownloadArchive 2018-04-19 13:31:47 +02:00
SJost
8725f935d0 Merge remote-tracking branch 'origin/master' into feat/exercises 2018-04-19 09:29:41 +02:00
Felix Hamann
e27a88c237 Merge branch 'feat/pagination' into 'master'
Feat/pagination

See merge request !23
2018-04-14 22:36:44 +02:00
Gregor Kleen
c78184a946 Automatically check isAuthorized for MenuItems 2018-04-13 15:49:26 +02:00
Felix Hamann
a0d5589777 added static flatpickr js and css 2018-04-13 14:37:23 +02:00
Felix Hamann
2a1c805d85 Merge branch 'master' into feat/pagination
merged master into this to avoid databas conflicts when switching between master and feat/pagination
2018-04-12 21:38:25 +02:00
SJost
a544c61be2 Submission upload (Sitzung mit Gregor) 2018-04-10 12:50:20 +02:00
SJost
4a7d35144a Merge remote-tracking branch 'origin/feat/pagination' into feat/exercises 2018-04-10 10:40:10 +02:00
SJost
380c57c578 Favourites working now (without PageActions). 2018-04-10 10:38:21 +02:00
Felix Hamann
4896330737 removed pure-JS sorting for sortable tables 2018-04-09 22:23:12 +02:00
Felix Hamann
dc45702f32 added JS and CSS for sortable tables 2018-04-09 22:22:38 +02:00
SJost
272c61b512 Favourites are pruned now 2018-04-04 09:17:26 +02:00
SJost
2dde6c67bc Favourites are tracked, but not yet used 2018-04-04 08:45:14 +02:00
Gregor Kleen
3d98fe4736 Refactor utils 2018-04-03 17:56:55 +02:00
Felix Hamann
8bb71a5c3e Moved modals to standalones 2018-03-31 01:55:00 +02:00
Felix Hamann
be5d88b24b Merge branch 'feat/pageactions' 2018-03-29 00:08:34 +02:00
Felix Hamann
383eb3c620 added modal widget 2018-03-28 23:23:32 +02:00
Felix Hamann
6edc4d4a99 added page action bar for prime actions
closes #34
2018-03-25 23:47:02 +02:00
SJost
9f96e6dd35 PageActions added 2018-03-22 19:27:57 +01:00
SJost
5f6640148c Hierarchical Routes 2018-03-22 16:04:38 +01:00
SJost
217ae28d9e Merge branch 'master' into feat/exercises 2018-03-22 14:07:10 +01:00
SJost
ad2b7ae866 DeleteRedirct, fetchSheet caching, etc. 2018-03-22 12:19:40 +01:00
SJost
710b8334e5 convenience functions for authorisation, not yet used 2018-03-21 18:15:16 +01:00
SJost
023da918bb convenience functions for authorisation 2018-03-21 17:39:17 +01:00
SJost
85d128a244 Sheet Editing/Delete working now 2018-03-19 23:33:59 +01:00
Felix Hamann
e58851cd3c scollable tables for smaller screens 2018-03-18 17:55:02 +01:00
Felix Hamann
4f660f04c0 navbar rework, smooth breadcrumbs 2018-03-18 15:47:37 +01:00
Felix Hamann
910eb40c86 got rid of iconToText 2018-03-18 02:43:54 +01:00
Felix Hamann
d8f2ce6e90 added menu-icons and asidenavbar-styling 2018-03-17 19:23:45 +01:00
Felix Hamann
8fc53d879f split inputs-logic and form-logic in frontend 2018-03-16 20:54:35 +01:00
SJost
daed94ae33 Several Cleanups 2018-03-16 17:54:28 +01:00
SJost
c35f718054 Sheet Download works 2018-03-16 10:26:54 +01:00
SJost
40cf5ec858 CourseForm works without redirect only 2018-03-15 14:51:30 +01:00
SJost
8247c6c6d4 Fixes to Course New/Edit handling. Update not yet working! 2018-03-14 18:34:42 +01:00
Felix Hamann
475411bb4a localstorage for show-hides, sortable tables, more navigation 2018-03-11 23:53:06 +01:00
Felix Hamann
ca582f8e8a widget-restructuring and new colors 2018-03-07 21:55:01 +01:00
Felix Hamann
56d949d57f Merge branch 'master' into initial_thoughts_on_frontend 2018-03-07 13:47:34 +01:00
Felix Hamann
cd8b6d985b introduced BEM for CSS and aside-navigation 2018-03-06 22:29:17 +01:00
Felix Hamann
50cebd92bf Merge branch 'master' into initial_thoughts_on_frontend 2018-03-02 18:33:22 +01:00
Felix Hamann
349938b0e7 added navbar widget and did some cleanup to eventually get rid of bootstrap 2018-02-22 22:44:54 +01:00
Gregor Kleen
2fa247826f Add support for internationalization 2018-02-21 13:19:27 +01:00
SJost
8d221600d3 TermIdentifier -> TermId in routes 2018-02-19 17:58:55 +01:00
Felix Hamann
7cb64b765a introduced menu-widget 2018-02-19 17:28:28 +01:00
Gregor Kleen
a94a8e3f81 Support for partial templates 2018-02-19 16:08:50 +01:00
Gregor Kleen
fddd8bef4c Make CryptoIDKey implicit using new cryptoids-class 2018-02-09 14:22:01 +01:00
Gregor Kleen
db92528884 Framework & dispatch submissions 2018-02-09 12:35:10 +01:00
SJost
14ccdb1e35 Bugfix: Infinite Loop in Authorization Code; Stubs for Exercise Sheet; Fixed several compiler warnings 2017-11-29 17:26:32 +01:00
SJost
b363c05c95 AdminSchool no longer nullable; Profile page displays granted rights 2017-11-29 15:17:31 +01:00
SJost
4686c63fd9 BUGFIX, Attempt 2: Authorization for Admins without schools fixed. 2017-11-27 16:54:12 +01:00
SJost
5886b99bfc BUGFIX: Authorization for Admins without schools fixed. cd /home/jost/programming/Haskell/Yesod/uniworx/src 2017-11-27 16:17:51 +01:00
Gregor Kleen
c004a65b32 Authorization checks 2017-11-27 14:52:54 +01:00
Gregor Kleen
c09b0d8619 Cleanup 2017-11-27 12:37:56 +01:00
Gregor Kleen
e6f6e8c621 Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2017-11-26 22:00:38 +01:00
Gregor Kleen
0293363e13 Copy more information from LDAP on login 2017-11-26 21:59:47 +01:00
SJost
10608b6256 Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2017-11-24 15:20:31 +01:00
SJost
39b3cd0bec defaultHandler gained argument for page navigation 2017-11-24 15:20:26 +01:00
Gregor Kleen
57cac79d69 Synchronise matrikelnummer from LDAP 2017-11-22 18:33:24 +01:00
Gregor Kleen
2c188926a6 I haz a login \o/ 2017-11-22 16:47:50 +01:00
Gregor Kleen
94f419394f Nonfunctional LDAP auth 2017-11-22 15:58:49 +01:00
SJost
4121b49c25 Minor changes to buttons 2017-11-16 13:23:50 +01:00
SJost
4bcbf963f1 Button CSS style added. 2017-11-15 18:04:32 +01:00
SJost
e138e42ae0 Button Stubs 2017-11-15 09:41:19 +01:00
Gregor Kleen
b0e5f54b4d Download of multiple Submissions & Additional colonnade wrapper 2017-10-14 00:20:47 +02:00
Gregor Kleen
02c034b14a Support multiple messages and statuses 2017-10-12 02:13:42 +02:00
Gregor Kleen
b552e2a0e3 Download of submission files (single & as archive) 2017-10-11 18:02:04 +02:00
Gregor Kleen
f7f7c7c592 Dump submissions 2017-10-11 00:18:09 +02:00
SJost
2b78bce646 Temporary Homepage and Breadcrumbs working. 2017-10-10 18:35:43 +02:00
Gregor Kleen
9de9032916 Bind to cryptoids 2017-10-10 14:30:48 +02:00
SJost
3fbeed2682 Warning: some routes renamed; otherwise minor commit. 2017-10-10 07:42:24 +02:00
SJost
26efab4506 Course Edit compiles, but deletion/edit does not work yet. I think I need to separate Post/Get Handlers again. 2017-10-09 23:28:21 +02:00
SJost
b980bab1b1 Course Form works; display not yet. 2017-10-09 22:17:49 +02:00
SJost
d10a629fa2 Term Handler cleaned again; small changes to Model (Maybe added for some Text Types, courseOwner dropped). 2017-10-09 16:16:00 +02:00
Gregor Kleen
2eae90d1f8 Fix dummy auth 2017-10-09 13:53:04 +02:00
SJost
1bca71b720 Ord TermIdentifier changed 2017-10-06 23:43:12 +02:00
SJost
d9c6380807 Term editing required third route :( 2017-10-06 18:38:18 +02:00
SJost
6d3df4f30b Term creation half-ways, problems with Custom Primary key for Terms 2017-10-06 16:49:43 +02:00
SJost
fcec208936 termField stub created, needs to be moved to common utils 2017-10-06 11:22:43 +02:00
SJost
7209b69859 new course handler stub 2017-10-04 23:20:26 +02:00
Gregor Kleen
514829dc25 Store user plugin in db & allow bypassing when using dummy-auth 2017-10-04 15:07:22 +02:00
Gregor Kleen
b86e60843f Minor cleanup 2017-10-04 14:38:09 +02:00
Gregor Kleen
76aa7da3ab Fix generation of temporary files´ names 2017-10-04 14:33:59 +02:00
Gregor Kleen
ef3be262aa Rename foundation type 2017-10-04 14:17:10 +02:00
Gregor Kleen
2d2b1a2ed3 Fix file structure for yesod devel 2017-10-04 14:12:19 +02:00
Gregor Kleen
b058fd84ba Drop Handler.Comment 2017-10-04 13:59:58 +02:00
Gregor Kleen
bb2dbc3b79 Move files around 2017-10-04 13:59:49 +02:00
SJost
bb946e1b11 Initial PostgreSQL Template 2017-09-11 09:53:42 +02:00