From: Marius Gavrilescu Date: Sat, 14 Feb 2015 16:29:46 +0000 (+0200) Subject: Merge branch 'master' into newmc X-Git-Url: http://git.ieval.ro/?a=commitdiff_plain;ds=inline;h=d4ca2412db2c1c6e021809e9b72d3410abc476c2;hp=-c;p=plack-app-gruntmaster.git Merge branch 'master' into newmc Conflicts: tmpl/pb_entry.en --- d4ca2412db2c1c6e021809e9b72d3410abc476c2 diff --combined lib/Plack/App/Gruntmaster.pm index 425dc31,66b5b6e..c590bc9 --- a/lib/Plack/App/Gruntmaster.pm +++ b/lib/Plack/App/Gruntmaster.pm @@@ -47,6 -47,7 +47,7 @@@ use constant FORMAT_EXTENSION => PASCAL => 'pas', PERL => 'pl', PYTHON => 'py', + SBCL => 'l', }; use constant NOT_FOUND => [404, ['Content-Type' => 'text/plain'], ['Not found']]; @@@ -159,8 -160,7 +160,8 @@@ sub dispatch_request sub (/ed/:contest) { forbid contest->is_running; - response ed => 'Editorial of ' . contest->name, db->problem_list(contest => $_{contest}, solution => 1); + my $pblist = db->problem_list(contest => $_{contest}, solution => 1); + response ed => 'Editorial of ' . contest->name, {%$pblist, editorial => contest->editorial}; }, sub (/login) { diff --combined tmpl/pb_entry.en index 0837cb7,1518841..ab2333f --- a/tmpl/pb_entry.en +++ b/tmpl/pb_entry.en @@@ -31,15 -31,16 +31,16 @@@ To submit solutions to this problem, pl