Commit Graph

172 Commits

Author SHA1 Message Date
Gregor Kleen
2fa247826f Add support for internationalization 2018-02-21 13:19:27 +01:00
Gregor Kleen
31ad9932c1 Cleanup build 2018-02-21 13:02:27 +01:00
Gregor Kleen
937db06db2 Remove backup 2018-02-20 15:54:25 +01:00
SJost
c8c968a7e4 minor merge conflict resolved 2018-02-19 18:10:41 +01:00
SJost
a3f71a474b Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX into feat/exercises 2018-02-19 18:06:54 +01:00
SJost
8d221600d3 TermIdentifier -> TermId in routes 2018-02-19 17:58:55 +01:00
SJost
499315432a SheetFile Up/Download added 2018-02-19 16:57:12 +01:00
SJost
6070c9231b sheet display extended, not yet complete 2018-02-19 16:57:12 +01:00
SJost
3575e69123 Bug with SheetInfo Form fixed 2018-02-19 16:57:12 +01:00
SJost
06a29205cd Fileinfo in AForm type troubles :( 2018-02-19 16:57:12 +01:00
SJost
bc094dc813 Sheets still incomplete, show sheet list and working. sheetAdmin template is not yet working 2018-02-19 16:57:12 +01:00
SJost
2f47f12832 User Overview page added, no user-editing yet 2018-02-19 16:55:20 +01:00
SJost
9bad1b42ec Forgotten minor bugfixes that belong to master, but slipped into this branch. 2018-02-19 16:55:20 +01:00
SJost
272bc7f6c5 schoolField & termField in Utils 2018-02-19 16:54:10 +01:00
Gregor Kleen
a10ece2f81 Merge branch 'feat/implicit-cryptoids' into 'master'
implicit cryptoids & uuid dispatch

See merge request !9
2018-02-09 14:24:31 +01:00
Gregor Kleen
fddd8bef4c Make CryptoIDKey implicit using new cryptoids-class 2018-02-09 14:22:01 +01:00
Gregor Kleen
b6dbd27eb0 Cleanup 2018-02-09 12:35:10 +01:00
Gregor Kleen
d37ee331f6 Use correct status header 2018-02-09 12:35:10 +01:00
Gregor Kleen
7c5c12dc6b Fix type error 2018-02-09 12:35:10 +01:00
Gregor Kleen
6bf0f321cf Check decryption before redirecting (as was intended) 2018-02-09 12:35:10 +01:00
Gregor Kleen
db92528884 Framework & dispatch submissions 2018-02-09 12:35:10 +01:00
Gregor Kleen
4a2076171f Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2018-01-30 15:10:05 +01:00
Gregor Kleen
3c12f0bb31 Fix build on Nix 2018-01-30 15:09:44 +01:00
Gregor Kleen
3829bc6220 Merge branch 'feat/fill-db-button' into 'master'
fill-db.hs

See merge request !8
2018-01-30 15:09:04 +01:00
Gregor Kleen
324c78c7fb Add sheet 2018-01-30 14:51:50 +01:00
Gregor Kleen
7d9dc39da4 Start work on fill-db.hs 2018-01-25 10:30:06 +01:00
Gregor Kleen
7536af9bdc Ignore more temporary files 2018-01-23 09:43:50 +00:00
Gregor Kleen
6fd85c6e11 Merge branch 'feat/better-start' into 'master'
Cleanup

See merge request !7
2018-01-13 23:03:35 +01:00
Gregor Kleen
b8d3855dad Cleanup 2018-01-13 23:02:08 +01:00
Gregor Kleen
7033a19fdb Merge branch 'feat/better-start' into 'master'
Improve start.sh

See merge request !6
2018-01-13 23:00:10 +01:00
Gregor Kleen
4946a7df63 Improve start.sh 2018-01-13 22:56:32 +01:00
Steffen Jost
4b091787fb Merge branch 'readme_suggestion' into 'master'
README Draft

See merge request !5
2017-12-12 10:04:22 +01:00
Felix Hamann
6bcb818aba added start script 2017-12-09 00:10:14 +01:00
Felix Hamann
066732341a started working on a readme for later contributors 2017-12-08 23:45:47 +01:00
Gregor Kleen
cc7ec519bc Revert: fix development default values 2017-12-08 14:20:09 +01:00
Gregor Kleen
9fca36b07f Cleanup build & fix development default values 2017-12-08 14:05:05 +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
SJost
05dcad6fa6 Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2017-11-27 15:59:40 +01:00
SJost
e3906672aa BUGFIXES: 1) Message status codes 2) Course editing could have cause uniqueness constraint violation, resulting in db exception. 2017-11-27 15:59:28 +01:00
Gregor Kleen
c004a65b32 Authorization checks 2017-11-27 14:52:54 +01:00
SJost
70ad55f565 Course participant count working now, albeit inefficient through runDB per Collonade-Row 2017-11-27 13:21:11 +01:00
Gregor Kleen
c09b0d8619 Cleanup 2017-11-27 12:37:56 +01:00
SJost
0c9533ccd1 Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2017-11-27 10:35:46 +01:00
SJost
2ac9966d5f Admin Rechte 2017-11-27 10:35:41 +01:00
Gregor Kleen
aa1e10e3e9 Remove redundant import 2017-11-27 09:24:28 +01:00
Gregor Kleen
5d23b3a36f No docker by default 2017-11-27 09:21:57 +01:00
Gregor Kleen
e6f6e8c621 Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2017-11-26 22:00:38 +01:00