Anet
|
9c10149226
|
Merge branch 'python3' of gimli.ms.mff.cuni.cz:/akce/mam/git/mamweb into python3
|
6 years ago |
|
Anet
|
c240cd3d3a
|
python -> python3.5
|
6 years ago |
|
Anet
|
b6a3012d1e
|
uprava na python3 (obcas) a novy model (hlavne)
|
6 years ago |
|
Mee
|
a9fb8c972b
|
Makefile: fix rozbitých deploy_* cílů, více nápovědy, méně debugovacích výpisů.
|
6 years ago |
|
Mee
|
9b48922612
|
Odstraněny staré složky z gitignore
|
6 years ago |
|
Mee
|
48655b4d5a
|
Nový Makefile. Bude vyžadovat změny uWSGi configu.
|
6 years ago |
|
Anet
|
9ffcd604db
|
models -> .models, views -> .views pro zprovozneni importu
|
6 years ago |
 Tomas "Jethro" Pokorny
|
90dc3a04f5
|
Opravy poli podle noveho modelu.
|
6 years ago |
|
Anet
|
ca89637c26
|
drobnosti do pythonu 3
|
6 years ago |
|
Tomas "Jethro" Pokorny
|
1b8d98af5b
|
Schema noveho modelu.
|
6 years ago |
|
Tomas "Jethro" Pokorny
|
14d834209c
|
Novy model kompletni.
|
6 years ago |
|
Anet
|
dd99c34a83
|
zmeny pro kompatibilitu s python3
|
6 years ago |
|
Anet
|
8972dbb34d
|
models.py: prehozeni trid, odkomentovani funkci. Sebehne na tom make run.
|
6 years ago |
|
Anet
|
8d48e8ee83
|
models.py: prehozeni Osoba a Skola, zmena nazvu knihovny, carky a pod.
|
6 years ago |
|
Anet
|
7a984aea18
|
models.py: zrusena u pred stringem
|
6 years ago |
|
Anet
|
327d0e5835
|
Merge branch 'new-model' of gimli.ms.mff.cuni.cz:/akce/mam/git/mamweb into new-model
|
6 years ago |
|
Anet
|
72ee2a15ad
|
models.py: prijmeni -> osoba__prijmeni
|
6 years ago |
|
Tomas "Jethro" Pokorny
|
de151243ef
|
Merge branch 'new-model' of gimli.ms.mff.cuni.cz:/akce/mam/git/mamweb into new-model
|
6 years ago |
|
Tomas "Jethro" Pokorny
|
14c39e2598
|
models.py: novy model bez Node veci
|
6 years ago |
|
Anet
|
71eb5cfd57
|
Schema: oprava Enumu u tématu
|
6 years ago |
|
Tomas "Jethro" Pokorny
|
7c30e91b3b
|
4 spaces -> tab.
|
6 years ago |
|
Tomas "Jethro" Pokorny
|
d69f38ea81
|
Finalni verze.
|
6 years ago |
|
Anet
|
5cb0d256d1
|
Schema_new.dia: upravy z minuleho tydne, drobne
|
6 years ago |
|
Tomas "Jethro" Pokorny
|
3c2962b5cb
|
Schema_new.dia: zmena u novinky, autor je osoba, ne user, takze se meni
|
6 years ago |
|
Tomas "Jethro" Pokorny
|
359ea0526f
|
Schema_new.dia: pridane atributy ke tridam
|
6 years ago |
|
Tomas "Jethro" Pokorny
|
9766773ab5
|
Nove schema pro seminar.
|
6 years ago |
|
Tomas "Jethro" Pokorny
|
5b0f23c2b1
|
Pridany zapomenute soubory.
|
6 years ago |
|
Tomas "Jethro" Pokorny
|
8ce9475800
|
Prototyp formulare.
|
6 years ago |
|
Tomas "Jethro" Pokorny
|
30ff8b9f20
|
Merge branch 'master' of gimli.ms.mff.cuni.cz:/akce/mam/git/mamweb
|
6 years ago |
|
Tomas "Jethro" Pokorny
|
1ff75e8801
|
Galerie | nezobrazovat nedulezite sloupce
|
6 years ago |
|
Matěj Kocián
|
9e914bbed3
|
Neposílej Gaventovi maily o chybách
|
6 years ago |
|
MaM Web user
|
154d629ef8
|
Opravení obálek
|
6 years ago |
|
LEdoian
|
743d8056da
|
Merge branch 'test'
|
6 years ago |
|
LEdoian
|
938974bb19
|
Přidán ckeditor_uploader do settings
Opravuje nefunkční výběr obrázku, nevím jak.
|
6 years ago |
|
MaM Web user
|
a710847863
|
Gitignore: ignorovat .htpasswd
|
6 years ago |
|
LEdoian
|
eb265b6fb8
|
CKEditory umožňují upload obrázků
|
6 years ago |
|
Tomas "Jethro" Pokorny
|
98aacc3b43
|
Merge branch 'test' of gimli.ms.mff.cuni.cz:/akce/mam/git/mamweb into test
|
6 years ago |
|
Tomas "Jethro" Pokorny
|
cfa9bd9056
|
select_related musi odkazovat na klic, nikoli atribut.
|
6 years ago |
|
LEdoian
|
5b9f8416d4
|
Změna e-mailové konference na chyby
|
6 years ago |
|
MaM Web user
|
faed08ae84
|
Obálky: Zvětšení mezer
|
6 years ago |
|
Tomas "Jethro" Pokorny
|
b1cc6df91e
|
Merge branch 'test' of gimli.ms.mff.cuni.cz:/akce/mam/git/mamweb into test
|
6 years ago |
|
Tomas "Jethro" Pokorny
|
5700b46858
|
Opraveno porovnavani v templatech pomoci '='
|
6 years ago |
|
LEdoian
|
16a070a79a
|
Obálky: LaTeXový template
|
6 years ago |
|
Tomas "Jethro" Pokorny
|
36dbab7b38
|
Na gimlim je UTF-8 TeX
|
6 years ago |
|
Tomas "Jethro" Pokorny
|
8ab43b9ae1
|
Fixed query.
|
6 years ago |
|
Tomas "Jethro" Pokorny
|
f495240701
|
Fixed sync_local_db and sync_local_media.
|
6 years ago |
|
Tomas "Jethro" Pokorny
|
7c1838bb20
|
Opraveny debugovaci veci pro local a test.
|
6 years ago |
|
Tomas 'Jethro' Pokorny
|
c43ba12be7
|
Merge branch 'master' of atrey.karlin.mff.cuni.cz:/akce/MaM/MaMweb/mamweb
|
6 years ago |
|
Tomas 'Jethro' Pokorny
|
2352714689
|
Upgrade na Django 1.11
|
6 years ago |
|
Pavel Turinsky
|
b770a77c81
|
Úprava Makefile a nastavení pro Gimliho, hlavně testovací verze
|
6 years ago |
