Commit Graph

588 Commits

Author SHA1 Message Date
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
SJost
43f52fb9eb Merge branch 'master' into feat/exercises 2018-07-09 12:38:27 +02:00
SJost
f62fcdded6 minor changes 2018-07-08 22:49:22 +02:00
Gregor Kleen
4993c7994c Fix preference-order on parents 2018-07-08 22:31:11 +02:00
Gregor Kleen
71e57b767d Use comma-separated in AdminUsersR 2018-07-08 22:10:46 +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
a02e2cdc98 Prevent admins elevating rights to more schools by session-hijacking 2018-07-08 20:12:07 +02:00
Gregor Kleen
dc03afa84d Functionality to hijack users 2018-07-08 15:38:52 +02:00
Gregor Kleen
ed4df0ef4d Use dbTable in /users 2018-07-08 15:15:41 +02:00
Gregor Kleen
96eea52344 Introduce DBCell-Constructor and dbColonnade 2018-07-08 14:51:05 +02:00
Gregor Kleen
d0fcf2e9e3 Allow customizing behaviour of dbTable when empty
Resolves #104
2018-07-08 13:52:25 +02:00
Gregor Kleen
7da8d89a5c Course capacity now verified by route tag
Resolves #98
2018-07-08 10:44:09 +02:00
Gregor Kleen
d60ef89bca Revert "Course Capacity is verified now, in CRegister Handler that also checks secret"
This reverts commit 9fc50e8736.
2018-07-08 10:31:41 +02:00
Gregor Kleen
353245c65f Generate headings for favourite-bar from content
Fixes #105
2018-07-07 22:16:22 +02:00
Gregor Kleen
7a74b86f6d Add "clear" argument to fill-db.hs 2018-07-06 21:34:57 +02:00
Gregor Kleen
143b4d6116 Fix deployment build 2018-07-06 18:43:58 +02:00
Gregor Kleen
4911cdb29b Fix dbTable
- Row numbering now works as expected
  - Default sorting & filtering now actually gets applied
2018-07-06 18:33:33 +02:00
Gregor Kleen
1787dc1dcb Convert CourseListR to dbTable 2018-07-06 18:08:47 +02:00
Gregor Kleen
25112a5f67 Cleanup AdHoc-Group logic
- Submitting user is no longer checked during validity checks for participants
  - Better error message if too many participants are submitted
  - Having submitted the focused submission is no longer counted as already
    having a submission during updates
2018-07-06 17:24:23 +02:00
SJost
2919162986 BUGFIX: Blattliste 2018-07-06 13:38:59 +02:00
SJost
f49001993c Minor refactor 2018-07-06 11:13:40 +02:00
SJost
eb4239b728 Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2018-07-05 16:00:53 +02:00
SJost
0341f8347e Bugfix: Homepage show multiple sheets 2018-07-05 16:00:41 +02:00
Gregor Kleen
cf76466517 Further refine links in dbTable 2018-07-05 11:55:26 +02:00
Gregor Kleen
68bf10f72f Cleanup links in dbTable 2018-07-05 11:43:01 +02:00
SJost
9fc50e8736 Course Capacity is verified now, in CRegister Handler that also checks secret 2018-07-04 22:03:21 +02:00
Gregor Kleen
5f9dc4a8b1 Move ChangeLog to standard location 2018-07-04 19:13:04 +02:00
Gregor Kleen
efe7546a24 Force User fields to be correct 2018-07-04 12:27:08 +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
828ad4f86f Course Deregister and Material Visible now added to CourseEdit 2018-07-03 17:52:37 +02:00
SJost
e905c7b5d6 Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2018-07-03 17:24:15 +02:00
SJost
8c9e150483 Headings and Breadcrumbs added. 2018-07-03 17:24:08 +02:00
Gregor Kleen
3f5fab8d2f Permit downloading original archives 2018-07-03 17:18:28 +02:00
Gregor Kleen
50c733cc9c Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2018-07-03 16:55:39 +02:00
Gregor Kleen
429869b58a Show files that were deleted during correction properly 2018-07-03 16:54:58 +02:00
SJost
7fa1eaf8d6 Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2018-07-03 16:51:34 +02:00
SJost
aeeacb3bfb Bugfix: Sheet Edit Button and some Page Headings 2018-07-03 16:50:03 +02:00
Gregor Kleen
115eaa70f2 Work on single correction upload 2018-07-03 16:47:55 +02:00
Gregor Kleen
f64bdba774 Prettify single submission view 2018-07-03 15:55:45 +02:00
SJost
dddd262b6b Korrektur Button is hidden if there is no such correction 2018-07-03 14:05:21 +02:00
SJost
1b88f41112 Commit to testwork 2018-07-03 13:42:31 +02:00
SJost
0944b5984e Homepage shows all Deadlines correctly now. 2018-07-03 13:39:02 +02:00
SJost
aa6f35d9c8 OuterJoin for homeUser startet 2018-07-03 12:09:52 +02:00
SJost
c7e02a1c0d keter.yml updated 2018-07-03 12:08:52 +02:00
SJost
21e0c5b4dc Bugfix: Weekdays correct now; Homepage edited. 2018-07-03 11:24:31 +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
SJost
575eff90f0 Minor: DSGV disclaimer sort-of-removed 2018-07-02 17:59:48 +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
c8f0ef52cf Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2018-07-02 09:05:06 +02:00
Gregor Kleen
d1aca43b2a Use submission.hamlet, again
Fixes #87
2018-07-02 09:04:31 +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
957f0fe9da More aggressively normalise fileTitles 2018-07-01 15:02:15 +02:00
Gregor Kleen
0d01ac95ab Corrections upload 2018-07-01 14:49:15 +02:00
SJost
12e52becbd Minor fixes. 2018-07-01 14:14:15 +02:00
SJost
e5d62abbaf Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2018-07-01 13:53:36 +02:00
SJost
ba813dd5ac Minor message cleaning. 2018-07-01 13:53:33 +02:00
Gregor Kleen
8ab51c1f5d Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2018-07-01 12:33:12 +02:00
Gregor Kleen
4ca7ebd6f1 Logik für Abgabe ansehen/anlegen
Fixes #78
2018-07-01 12:32:26 +02:00
Felix Hamann
583025135c mint-green is now moss-green and resonsive-fixes 2018-07-01 12:31:37 +02:00
Felix Hamann
f1806ffed2 live-preview of selected theme on profile-page 2018-07-01 09:43:44 +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
a3234e1ea5 formnorequired 2018-06-30 21:37:56 +02:00
Gregor Kleen
807c0fb28d Fix build 2018-06-30 21:37:50 +02:00
Gregor Kleen
d69f81aeae We don't use CryptoUUIDSubmission any more 2018-06-30 21:34:41 +02:00
Gregor Kleen
9a1644f68e minor submission cleanup (correct charset) 2018-06-30 21:30:21 +02:00
Gregor Kleen
9e1111f654 Don't display empty multiAction-Widgets 2018-06-30 21:24:13 +02:00
Gregor Kleen
99832c1286 Cleanup submission download 2018-06-30 21:16:11 +02:00
Gregor Kleen
fee96e448f Use existing withFragment 2018-06-30 19:13:21 +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
89f83925ba Automatisierte Korrektur-Zuteilung 2018-06-29 20:55:06 +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
Gregor Kleen
f367c7347b additional doc 2018-06-29 19:18:55 +02:00
Gregor Kleen
f93c3d6e47 Helpers for PSValidator 2018-06-29 19:18:10 +02:00
SJost
14d37203f8 Breadcrumbs and Headings fixed 2018-06-29 18:28:41 +02:00
Gregor Kleen
d33956dfaa Fix database representation of term for correct sorting 2018-06-29 16:13:36 +02:00
Gregor Kleen
b334df4939 Further work on correction tables 2018-06-29 15:41:05 +02:00
Gregor Kleen
0241e046ca Minor cleanup & restrict assignSubmissions 2018-06-29 12:37:26 +02:00
Gregor Kleen
0ab7bbd7eb Merge branch 'feat/assign-correctors' into feat/pagination 2018-06-29 11:53:16 +02:00
Gregor Kleen
9793141090 Fix behaviour of correctors-form 2018-06-29 11:49:03 +02:00
Gregor Kleen
6e0558d094 Merge branch 'master' into feat/assign-correctors 2018-06-29 10:51:56 +02:00
Gregor Kleen
1758a1d1ce cleanup multiAction 2018-06-29 09:58:17 +02:00
Gregor Kleen
9290052fe7 Use fieldests for what they're meant to do 2018-06-29 09:32:37 +02:00
Gregor Kleen
7aaaa1691c Correction download 2018-06-28 15:47:25 +02:00
SJost
8d69904d47 Tooltip problem? 2018-06-28 09:35:22 +02:00
SJost
30eced3708 Tooltip problem? cd /home/jost/programming/Haskell/Yesod/uniworx 2018-06-28 09:34:28 +02:00
SJost
afe8a92111 Minor; comments added. 2018-06-28 09:29:05 +02:00
Gregor Kleen
b6772a175b Make submission ids lower case 2018-06-28 09:09:11 +02:00
SJost
2a33895d69 BUGFIX: Register Button requires passphrase now (if lecture has one). 2018-06-27 15:42:03 +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
Gregor Kleen
1d116814cb formCell 2018-06-27 14:22:54 +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
0ab81d3fc1 Show note if table is empty 2018-06-27 11:41:53 +02:00
SJost
ac5e1b6f4b Keter Deploy 27.07.18 2018-06-27 10:00:23 +02:00
SJost
1379fffcd1 minor 2018-06-27 09:03:59 +02:00
Gregor Kleen
936b808aaf Merge branch 'master' into feat/pagination 2018-06-27 08:58:29 +02:00
Gregor Kleen
146abce346 runDbTable & slight cleanup 2018-06-27 08:45:15 +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
SJost
2525ad553f Themes and Favorites work now, but need reload or page change. 2018-06-26 14:00:41 +02:00
SJost
097e0c45e7 Profile: theme select form available, but still buggy somehow 2018-06-26 12:05:19 +02:00
SJost
5ff0a3524d Profile prepared for Theme selection (incomplete, but compiles) 2018-06-26 11:04:59 +02:00
SJost
3ea175d315 Homepage unlogged fixed. 2018-06-26 10:25:18 +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
4d3ad78b53 correctionsTable features links everywhere now 2018-06-22 23:08:09 +02:00
SJost
b2a97d926d correctionsTable generalized for various purposes, but needs bigger query 2018-06-22 22:59:59 +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
20c50b1a45 Minor adjustments to Fieldsettings 2018-06-21 17:08:28 +02:00
SJost
1c9b121edb Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2018-06-21 16:47:47 +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
Gregor Kleen
90adb8cab6 Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2018-06-21 14:35:10 +02:00
Gregor Kleen
4a5508c66f Cleanup cryptoids 2018-06-21 14:34:58 +02:00
SJost
f232e4d149 Corrections: Link for UUIDs 2018-06-21 14:07:21 +02:00
SJost
2ea2968e43 Missing files for Corrections Page added 2018-06-21 14:02:03 +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
Gregor Kleen
82eab97775 Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2018-06-21 11:18:20 +02:00
Gregor Kleen
0a433f06a5 examplary course-shorthand-filter in terms-list 2018-06-21 11:18:01 +02:00
SJost
67927742bb leading zero date format fixed 2018-06-21 10:27:09 +02:00
SJost
5cc3920059 DisplayAble vs Show for Theme completed. 2018-06-20 22:58:12 +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
a12d3457c0 class DisplayAble added to display anything 2018-06-20 14:29:11 +02:00
SJost
11ec8f4f03 Profile page extendend, yet incomplete 2018-06-19 19:14:50 +02:00