From 17f176c304c9cb87a98a2d47a487022b13defb00 Mon Sep 17 00:00:00 2001 From: MaM Web user Date: Tue, 25 May 2021 21:00:53 +0200 Subject: [PATCH 1/2] Htaccess pro AESOPa --- .gitignore | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 05e728bd..2e79367e 100644 --- a/.gitignore +++ b/.gitignore @@ -25,8 +25,11 @@ TODO # .htpasswd kvůli přihlášení .htpasswd +# .htpasswd pro AESOPa +/.htpasswd-aesop + # reversion kvůli historii objektů v reversion **/reversion # pro lidi, co programují v nástrojích od JetBrains -.idea \ No newline at end of file +.idea From 279583a8a2ccf3bd7b452737bfad03441f94b190 Mon Sep 17 00:00:00 2001 From: "Pavel \"LEdoian\" Turinsky" Date: Tue, 25 May 2021 22:17:46 +0200 Subject: [PATCH 2/2] =?UTF-8?q?vysledkovka.tex:=20v=20hlavi=C4=8Dce=20"T?= =?UTF-8?q?=C3=A9mata"=20m=C3=ADsto=20=C3=BAloh.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Kopie commitu 5aa329daee23e7c32351c91e72b471f5359bf256 na test větvi, nešel jednoduše cherry-picknout, protože ve výsledkovce jsou nějaké další změny, které jsem nechtěl měnit. --- seminar/templates/seminar/archiv/cislo_vysledkovka.tex | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/seminar/templates/seminar/archiv/cislo_vysledkovka.tex b/seminar/templates/seminar/archiv/cislo_vysledkovka.tex index b374864c..38eeea01 100644 --- a/seminar/templates/seminar/archiv/cislo_vysledkovka.tex +++ b/seminar/templates/seminar/archiv/cislo_vysledkovka.tex @@ -1,6 +1,6 @@ \setlength{\tabcolsep}{3pt} \begin{longtable}{|r|l|c|r|{% for p in problemy %}c@{\hskip.5em}{% endfor %}|r|r|}\hline -& & & & \multicolumn{ {{ problemy|length}} }{c|}{\textbf{Úlohy}} & & \\\textbf{Poř.}& \textbf{Jméno}& \textbf{R.}& \raisebox{0.7mm}{$\sum_{-1}$}& {% for p in problemy %}\textbf{ {{ p.kod_v_rocniku }} }&{% endfor %}\raisebox{0.7mm}{$\sum_0$}&\raisebox{0.7mm}{$\sum_1$}\\\hline +& & & & \multicolumn{ {{ problemy|length}} }{c|}{\textbf{Témata}} & & \\\textbf{Poř.}& \textbf{Jméno}& \textbf{R.}& \raisebox{0.7mm}{$\sum_{-1}$}& {% for p in problemy %}\textbf{ {{ p.kod_v_rocniku }} }&{% endfor %}\raisebox{0.7mm}{$\sum_0$}&\raisebox{0.7mm}{$\sum_1$}\\\hline \endhead \hline \endfoot