Matěj Kocián
|
f2862597ba
|
admin: fix get_readonly_fields
|
2017-01-20 23:19:43 +01:00 |
|
Bc. Petr Pecha
|
fb0a2b5a7c
|
Merge branch 'master' of 195.113.26.193:/akce/MaM/MaMweb/mamweb
Conflicts:
seminar/admin.py
|
2017-01-20 23:00:11 +01:00 |
|
Bc. Petr Pecha
|
daa046d287
|
Merge branch 'xlfd'
Conflicts:
seminar/admin.py
seminar/views.py
|
2017-01-20 22:58:13 +01:00 |
|
Matěj Kocián
|
47005053f9
|
admin: fix get_readonly_fields
|
2017-01-20 22:49:45 +01:00 |
|
Bc. Petr Pecha
|
9954f8359d
|
opravy podle flake8
|
2017-01-20 22:44:20 +01:00 |
|
Bc. Petr Pecha
|
4fda307664
|
seminar | admin | kdyz cislo nema prirazene cislo reseni
Kdyz cislo nema prirazene cislo reseni,
tak nelze zjistovat fazy
|
2017-01-20 22:07:05 +01:00 |
|
Bc. Petr Pecha
|
5adc4eecb9
|
seminar | Cislo | pridan datum pro ucast na soustredeni
|
2017-01-20 21:57:43 +01:00 |
|
Bc. Petr Pecha
|
d6c1147030
|
Merge branch 'xlfd'
|
2017-01-20 21:21:10 +01:00 |
|
Bc. Petr Pecha
|
57c8241ac7
|
zapomenuta migrace
|
2017-01-20 21:20:45 +01:00 |
|
Bc. Petr Pecha
|
410d89bb83
|
Merge branch 'stable' of 195.113.26.193:/akce/MaM/MaMweb/mamweb into stable
|
2017-01-20 21:11:36 +01:00 |
|
Matěj Kocián
|
95053912b7
|
Merge branch 'master' into stable
|
2017-01-20 12:20:47 +01:00 |
|
Matěj Kocián
|
206ddf4abe
|
Opravy stylu při merge do stable
|
2017-01-20 12:20:25 +01:00 |
|
Bc. Petr Pecha
|
fe38888581
|
Merge branch 'master' into stable
|
2017-01-20 11:46:14 +01:00 |
|
Matěj Kocián
|
e100625d61
|
Merge branch 'tex-upload'
|
2016-11-15 22:02:10 +01:00 |
|
Matěj Kocián
|
c6d1bc8bf8
|
tex-upload: změň fázi čísla na Nahráno
|
2016-11-15 22:01:43 +01:00 |
|
Matěj Kocián
|
43601257cf
|
Merge branch 'tex-upload'
|
2016-11-15 16:51:45 +01:00 |
|
Matěj Kocián
|
f53d1ce00d
|
Číslo: fix fáze
|
2016-11-15 16:46:14 +01:00 |
|
Matěj Kocián
|
8aed5d5ada
|
Merge branch 'faze-tvorby-cisla'
Merge migrations
|
2016-11-15 16:33:16 +01:00 |
|
|
|
d5cd61922c
|
Merge branch 'jethro'
|
2016-11-14 20:05:51 +01:00 |
|
|
|
f26a409b96
|
Oprava starych orgu.
|
2016-11-14 20:05:15 +01:00 |
|
|
|
d18457e282
|
Merge branch 'jethro'
|
2016-11-14 12:02:40 +01:00 |
|
|
|
23ae79f61a
|
Nelze komentovat uzavrene korektury.
|
2016-11-14 12:02:20 +01:00 |
|
|
|
d788396c94
|
Merge branch 'jethro'
|
2016-11-14 11:40:33 +01:00 |
|
|
|
c9754b98e3
|
Barvy a preskrtnuti v seznamu korektur.
|
2016-11-14 11:37:27 +01:00 |
|
|
|
4ea24e673a
|
Pridana funkce na aktivni organizatory.
Priprava na autocomplete organizatoru, ale potreba prejit na
novou verzi django-autocomplete-light.
|
2016-11-14 09:06:48 +01:00 |
|
Matěj Kocián
|
2068516909
|
Číslo: nová fáze "Nahráno"
|
2016-11-12 21:55:55 +01:00 |
|
Matěj Kocián
|
e0882def44
|
TeX API: povoleno jen v určitých fázích čísla
|
2016-11-12 21:27:25 +01:00 |
|
|
|
65fa01f196
|
Merge branch 'jethro'
|
2016-11-12 15:42:14 +01:00 |
|
|
|
67d61cabb7
|
U sbalenych korektur nezobrazovat ikony.
|
2016-11-12 15:41:30 +01:00 |
|
|
|
8671822ca0
|
Razeni lidi podle poctu korektur.
|
2016-11-12 14:00:49 +01:00 |
|
Matěj Kocián
|
02a7076397
|
TeX upload: nevytvářej Problémy
|
2016-11-08 12:30:24 +01:00 |
|
Matěj Kocián
|
bb18c6ed31
|
Flake8: oprava nekontrolování migrací v pre-commit
|
2016-11-08 10:54:00 +01:00 |
|
Matěj Kocián
|
d725e3d8e4
|
Merge branch 'faze-tvorby-cisla'
|
2016-11-08 10:53:10 +01:00 |
|
Matěj Kocián
|
9c37f43527
|
Fáze tvorby čísla
|
2016-11-08 10:52:30 +01:00 |
|
Bc. Petr Pecha
|
f582f54977
|
Merge remote-tracking branch 'origin/master' into stable
|
2016-11-08 10:16:40 +01:00 |
|
Matěj Kocián
|
f53764827d
|
Ročník: výsledkovka ročníku v LaTeXu
|
2016-11-08 10:09:58 +01:00 |
|
Bc. Petr Pecha
|
fdae413a35
|
Merge branch 'master' into stable
|
2016-11-08 09:46:35 +01:00 |
|
Bc. Petr Pecha
|
880aa68d63
|
Merge branch 'master' into xlfd
|
2016-11-08 09:45:18 +01:00 |
|
|
|
3d564f555d
|
Merge branch 'jethro'
|
2016-11-08 08:47:25 +01:00 |
|
|
|
7a4ea302a4
|
Oprava bugu pri generovani stvrzenek
|
2016-11-08 08:46:53 +01:00 |
|
|
|
c5b0670872
|
Merge branch 'jethro'
|
2016-11-08 08:34:45 +01:00 |
|
|
|
865ec0700c
|
Merge branch 'master' of atrey.karlin.mff.cuni.cz:/akce/MaM/MaMweb/mamweb
|
2016-11-08 08:33:57 +01:00 |
|
|
|
a5a4767efe
|
Merge remote-tracking branch 'origin/master' into jethro
|
2016-11-08 08:28:46 +01:00 |
|
Matěj Kocián
|
d04b10015c
|
Merge branch 'posli-mail-autorovi-korektury'
|
2016-11-06 18:22:40 +01:00 |
|
Matěj Kocián
|
d34f75e455
|
Korektury: pošli mail i autorovi okom. korektury
|
2016-11-06 18:21:01 +01:00 |
|
Matěj Kocián
|
22c1247316
|
Korektury: pošli mail i autorovi okom. korektury
|
2016-11-06 17:17:23 +01:00 |
|
Bc. Petr Pecha
|
3590e7479d
|
korektury | zodpovedny org do seznam
Pridan do vypisu v adminu
zodpovedny org.
|
2016-11-06 14:10:50 +01:00 |
|
Matěj Kocián
|
1c43c3b9f4
|
Korektury: oprava překryvů
|
2016-10-28 18:26:31 +02:00 |
|
|
|
6a34a398f0
|
Zapomenuty template.
|
2016-10-15 19:02:36 +02:00 |
|
|
|
c6b6850557
|
Odkaz na stvrzenky ze seznamu.
|
2016-10-11 18:36:55 +02:00 |
|
