Commit Graph

1566 Commits

Author SHA1 Message Date
Gregor Kleen
6f04978b1a Merge branch 'master' into 'live'
environmental instance id

See merge request !97
2018-11-15 12:24:45 +01:00
Gregor Kleen
a3d22baa5b environmental instance id 2018-11-15 12:16:35 +01:00
Gregor Kleen
d2398fb962 Merge branch 'master' into live 2018-11-14 17:18:28 +01:00
Gregor Kleen
a634aca98a Fix tags 2018-11-14 17:08:52 +01:00
Gregor Kleen
4bf70fbea4 Merge branch 'master' into 'live'
Master

See merge request !94
2018-11-14 16:18:29 +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
225bd9b01d Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2018-11-12 08:34:01 +01:00
Felix Hamann
56d5da648a dont text-align:right number inputs 2018-11-11 23:34:47 +01:00
Felix Hamann
22ebc3d96a more beautifully signalled shell commands in README 2018-11-11 23:24:18 +01:00
Felix Hamann
05c4a5da2f updates to README 2018-11-11 23:13:57 +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
195219023e Merge branch 'master' into 'live'
Fix Support message referers

See merge request !93
2018-11-09 22:56:42 +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
Gregor Kleen
b9afc667fe Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2018-11-09 16:12:39 +01:00
Gregor Kleen
8fde402efe Refactor db.hs 2018-11-09 16:12:30 +01:00
SJost
7df82a10d7 Translation for ErrorRatings 2018-11-09 15:52:55 +01:00
Gregor Kleen
ef836852c2 Merge branch 'master' into 'live'
Master

See merge request !92
2018-11-09 15:51:29 +01:00
Gregor Kleen
7d132bf779 Minor cleanup 2018-11-09 14:58:37 +01:00
Gregor Kleen
c3fc8a218a Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2018-11-09 14:53:15 +01:00
Gregor Kleen
aa2d33922a Fix tests 2018-11-09 14:53:07 +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
Gregor Kleen
f4df3b110e Merge branch 'master' into 'live'
iframe-based dynamic modals

Closes #226, #217, and #223

See merge request !91
2018-11-09 13:20:31 +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
d654310120 Merge branch 'master' into 'live'
#225

Closes #225

See merge request !90
2018-11-03 22:59:17 +01:00
Gregor Kleen
b81b7bf58c Fixes #225 2018-11-03 21:53:45 +01:00
Gregor Kleen
f6040c7eb2 reset flags 2018-11-02 22:09:39 +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
d9813b5313 Merge branch 'master' into 'live'
Fix form actions & sheetType refactoring

Closes #223, #222, #213, and #85

See merge request !89
2018-11-02 14:29:53 +01:00
Gregor Kleen
455a239c8c Merge branch 'master' into tests 2018-11-02 14:24:20 +01:00
Gregor Kleen
a29b0eac03 Add some missing form actions 2018-11-02 14:11:13 +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
Gregor Kleen
73a00e5731 Get yesod test working 2018-11-01 17:44:12 +01:00
SJost
e4e5b543a5 Workaround for unfixed issue #223 2018-11-01 17:01:40 +01:00
SJost
fee11f99cb Merge branch 'master' of gitlab.cip.ifi.lmu.de:jost/UniWorX 2018-11-01 16:04:51 +01:00