mamweb

Commit Graph

Select branches

Hide Pull Requests

ckeditor5

doc_intro

doc_zkratky

dockerizace

doku_predstava

export_seznamu_prednasek

kontrola-prav-orgu

korektury-link-z-admina

ledoian

maillink_dev_ledoian

master

middleware_test

notifikace_zpetne_vazby

odstrel_modelu_odevzdavatko

okenkove_obalky

opravitko-checkbox

pojmenovane_aplikace_broken

prehlednejsi_hodnotitko

upgrade_dokumentace

v3

vycisteni

vyroci-fix

zadavatko_problemu

#1

#10

#11

#12

#13

#14

#15

#16

#17

#18

#19

#2

#20

#21

#22

#23

#24

#25

#26

#27

#28

#29

#3

#30

#31

#32

#33

#34

#35

#36

#37

#38

#39

#4

#40

#41

#42

#43

#44

#45

#46

#47

#48

#49

#5

#50

#51

#52

#53

#54

#55

#56

#57

#58

#59

#6

#60

#61

#62

#63

#64

#65

#66

#67

#68

#69

#7

#70

#71

#72

#73

#74

#75

#76

#77

#78

#8

#9

origin/Float_novinky

origin/Galerie

origin/Petr

origin/autocomplete

origin/bez-exif

origin/bug

origin/cislopdf

origin/dev

origin/faze-tvorby-cisla

origin/feincms

origin/fix-prekryvani-korektur

origin/imagekit

origin/jethro

origin/korekturovatko_emaily

origin/korektury-ajax

origin/master

origin/noc

origin/opraf

origin/posli-mail-autorovi-korektury

origin/prednasky

origin/temata

origin/test

origin/upgrade1.9

origin/vysl

origin/vyslbez12

origin/xlfd

deploy-prod-2015-05-26-13-53-gavento

deploy-prod-2015-05-26-14-15-gavento

deploy-prod-2015-05-27-01-11-gavento

deploy-prod-2015-05-27-09-20-gavento

deploy-prod-2015-06-02-01-28-gavento

deploy-prod-2015-06-02-01-30-gavento

deploy-prod-2015-06-02-01-45-gavento

deploy-prod-2015-06-02-01-47-gavento

deploy-prod-2015-06-09-10-02-gavento

deploy-prod-2015-06-29-08-57-xlfd

deploy-prod-2015-07-03-09-06-xlfd

deploy-prod-2015-07-03-11-21-xlfd

deploy-prod-2015-07-05-10-14-xlfd

deploy-prod-2015-07-05-10-22-xlfd

deploy-prod-2015-07-05-10-32-xlfd

deploy-prod-2015-07-05-10-35-xlfd

deploy-prod-2015-09-01-20-42-xlfd

deploy-prod-2015-09-01-21-07-xlfd

deploy-prod-2015-09-02-22-27-xlfd

deploy-prod-2015-09-03-19-46-xlfd

deploy-prod-2015-09-04-20-47-xlfd

deploy-prod-2015-09-04-20-51-xlfd

deploy-prod-2015-09-05-21-26-xlfd

deploy-prod-2015-09-08-20-13-xlfd

deploy-prod-2015-09-09-09-48-xlfd

deploy-prod-2015-09-10-10-55-xlfd

deploy-prod-2015-09-10-10-57-xlfd

deploy-prod-2015-09-10-10-58-xlfd

deploy-prod-2015-09-10-11-01-xlfd

deploy-prod-2015-09-10-11-11-xlfd

deploy-prod-2015-09-10-11-32-xlfd

deploy-prod-2015-09-10-11-43-xlfd

deploy-prod-2015-09-10-18-16-xlfd

deploy-prod-2015-09-10-19-47-xlfd

deploy-prod-2015-09-11-11-02-xlfd

deploy-prod-2015-09-11-18-56-xlfd

deploy-prod-2015-09-12-08-26-xlfd

deploy-prod-2015-09-12-12-35-xlfd

deploy-prod-2015-09-12-12-57-xlfd

deploy-prod-2015-09-12-13-32-xlfd

deploy-prod-2015-09-12-14-49-xlfd

deploy-prod-2015-09-12-15-08-xlfd

deploy-prod-2015-09-12-15-22-xlfd

deploy-prod-2015-09-12-15-37-xlfd

deploy-prod-2015-09-12-15-45-xlfd

deploy-prod-2015-09-12-15-49-xlfd

deploy-prod-2015-09-12-15-53-xlfd

deploy-prod-2015-09-12-16-20-xlfd

deploy-prod-2015-09-12-17-55-xlfd

deploy-prod-2015-09-12-17-58-xlfd

deploy-prod-2015-09-13-13-00-xlfd

deploy-prod-2015-09-13-15-58-xlfd

deploy-prod-2015-09-13-17-09-xlfd

deploy-prod-2015-09-13-17-36-xlfd

deploy-prod-2015-09-13-18-08-xlfd

deploy-prod-2015-09-13-18-23-xlfd

deploy-prod-2015-09-13-21-09-xlfd

deploy-prod-2015-09-13-21-11-xlfd

deploy-prod-2015-09-13-21-17-xlfd

deploy-prod-2015-09-13-21-28-xlfd

deploy-prod-2015-09-13-21-30-xlfd

deploy-prod-2015-09-13-21-40-xlfd

deploy-prod-2015-09-13-21-44-xlfd

deploy-prod-2015-09-13-21-51-xlfd

deploy-prod-2015-09-13-21-59-xlfd

deploy-prod-2015-09-13-22-08-xlfd

deploy-test-2015-05-26-13-24-gavento

deploy-test-2015-05-26-13-36-gavento

deploy-test-2015-06-04-10-28-xlfd

deploy-test-2015-06-04-10-31-xlfd

deploy-test-2015-06-04-10-59-xlfd

deploy-test-2015-06-04-11-02-xlfd

deploy-test-2015-06-05-08-59-xlfd

deploy-test-2015-06-08-19-34-gavento

deploy-test-2015-06-28-12-00-xlfd

deploy-test-2015-06-29-08-55-xlfd

deploy-test-2015-07-03-09-03-xlfd

deploy-test-2015-07-03-10-54-xlfd

deploy-test-2015-07-03-11-19-xlfd

deploy-test-2015-07-05-10-14-xlfd

deploy-test-2015-07-05-10-22-xlfd

deploy-test-2015-07-05-10-32-xlfd

deploy-test-2015-07-05-10-35-xlfd

deploy-test-2015-07-05-21-52-xlfd

deploy-test-2015-08-23-15-12-xlfd

deploy-test-2015-09-02-21-39-xlfd

v1.0

v1.0run

v1.1

v1.10

v1.1run

v1.2

v1.3

v1.4

v1.5

v1.6

v1.7

v1.8

v1.9

v2.0

48b4b42ad3 Změna Organizator.studuje: obsahuje i činnost Matěj Kocián 2015-09-22 23:30:11 +0200
40ebe07a83 400 a 403 se stejnym obrazkem jako 500 Bc. Petr Pecha 2015-09-22 21:26:23 +0200
b70a54d831 test | allow hosts Bc. Petr Pecha 2015-09-22 21:21:37 +0200
6d37b5e8ec Fix: APPEND_SLASH = True funguje Matěj Kocián 2015-09-22 18:35:44 +0200
3400c7a347 oprava allow hosts na testu Bc. Petr Pecha 2015-09-19 16:11:19 +0200
0668790e48 Allow hosts na testu Bc. Petr Pecha 2015-09-19 16:08:57 +0200
30d3cc8f15 Admin | Problem nezadany | pridano zamereni i do vypisu Bc. Petr Pecha 2015-09-17 22:04:50 +0200
f743d70e6b Do adminu pridano zamereni ulohy do nezadanych problemu Bc. Petr Pecha 2015-09-17 22:01:53 +0200
84134f3c8f Posilani chybovych hlasek i z testu Bc. Petr Pecha 2015-09-17 21:26:16 +0200
0de2999377 Testovani je uz ostre Bc. Petr Pecha 2015-09-17 21:11:46 +0200
c0607297c7 Fix for permissions, fix exception handling (WSGI) Tomas Gavenciak 2015-09-17 18:27:44 +0200
0d80c837ab Update django-taggit Tomas Gavenciak 2015-09-17 18:11:29 +0200
31b37ad870 Update autocomplete_light Tomas Gavenciak 2015-09-17 18:07:52 +0200
901b8db409 Fix WSGI Tomas Gavenciak 2015-09-17 16:50:05 +0200
4407340a7e Update requirements (pravdepodone bezpecne a security updaty) Tomas Gavenciak 2015-09-17 16:46:45 +0200
6149c32b09 Merge branch 'master' of atrey:/akce/MaM/MaMweb/mamweb Tomas Gavenciak 2015-09-17 16:29:12 +0200
eda0b2ac87 Pokus o lepsi detekci Django WSGI chyby Tomas Gavenciak 2015-09-17 16:27:23 +0200
8a9304c72c Potlaceny vypis cisla a cisla nezadane ulohy Bc. Petr Pecha 2015-09-15 23:06:17 +0200
d175db8ca8 Migrace: nepovinné pdf u čísla, překlepy Matěj Kocián 2015-09-15 13:46:42 +0200
bd62cd2826 Prodan zapomenuty graph.png v1.0run Tomas Gavenciak 2015-09-14 23:17:12 +0200
9d7cf1b64b Fix settings detection Tomas Gavenciak 2015-09-14 23:07:08 +0200
1551224f08 Fix deploy script Tomas Gavenciak 2015-09-14 23:02:43 +0200
af3451ba9a Merge branch 'master' into stable Tomas Gavenciak 2015-09-14 23:01:33 +0200
ecbf18e975 Zmena zpusobu deploy a backupu Tomas Gavenciak 2015-09-14 22:59:25 +0200
29a5362bff Merge branch 'master' into stable Tomas Gavenciak 2015-09-14 22:28:35 +0200
bb975e0eb2 Zmena rozlisovani nastaveni Tomas Gavenciak 2015-09-14 16:55:41 +0200
aebea85ea2 Merge branch 'master' into stable v1.0 Bc. Petr Pecha 2015-09-14 01:40:58 +0200
f8b52d4a88 Orgové: nezobrazuj ani <li>, vycentrovány nadpisy Matěj Kocián 2015-09-13 22:29:24 +0200
0a0fa11efc Změny organizátorů Matěj Kocián 2015-09-13 22:18:04 +0200
d16747e1ef Preklepy deploy-prod-2015-09-13-22-08-xlfd Bc. Petr Pecha 2015-09-13 22:08:37 +0200
558c1d36df Odsazeni textu v soustredeni deploy-prod-2015-09-13-21-59-xlfd Bc. Petr Pecha 2015-09-13 21:59:46 +0200
146f50af9f Zalomeni deploy-prod-2015-09-13-21-51-xlfd Bc. Petr Pecha 2015-09-13 21:50:43 +0200
eec40fd962 Centrovani Zjisti vic deploy-prod-2015-09-13-21-44-xlfd Bc. Petr Pecha 2015-09-13 21:43:47 +0200
8a27ac7eff Novinky vpravo !!! deploy-prod-2015-09-13-21-40-xlfd Bc. Petr Pecha 2015-09-13 21:40:19 +0200
4a96244632 Merge branch 'master' of 195.113.26.193:/akce/MaM/MaMweb/mamweb deploy-prod-2015-09-13-21-30-xlfd Jethro 2015-09-13 21:30:30 +0200
0c7690af38 Uprava titulky. Jethro 2015-09-13 21:30:12 +0200
3266194a3a září místo 9 deploy-prod-2015-09-13-21-28-xlfd Aneta 2015-09-13 21:18:42 +0200
4595a09c28 Přidání nového řádku mezi termíny odevzdání. Aneta 2015-09-13 21:17:20 +0200
ea0641ad75 Merge branch 'master' of atrey.karlin.mff.cuni.cz:/akce/MaM/MaMweb/mamweb deploy-prod-2015-09-13-21-17-xlfd Aneta 2015-09-13 21:15:25 +0200
12c1bc6da5 Úprava grafiky pro termín k odeslání pro sous. Aneta 2015-09-13 21:14:33 +0200
8623c27e13 Chyby v grafu Jethro 2015-09-13 21:14:27 +0200
6459295125 Merge branch 'master' of 195.113.26.193:/akce/MaM/MaMweb/mamweb deploy-prod-2015-09-13-21-11-xlfd Jethro 2015-09-13 21:11:24 +0200
dd0b655075 Typo Jethro 2015-09-13 21:11:07 +0200
06205e3f58 Merge branch 'master' of atrey.karlin.mff.cuni.cz:/akce/MaM/MaMweb/mamweb Aneta 2015-09-13 21:10:32 +0200
ee82041f42 Přidání termínu pro účast na soustředění do AktualniZadani. Na pevno. A. Aneta 2015-09-13 21:09:54 +0200
c6da37205e Merge branch 'master' of 195.113.26.193:/akce/MaM/MaMweb/mamweb deploy-prod-2015-09-13-21-09-xlfd Jethro 2015-09-13 21:09:40 +0200
de63f78c1c Graf an titulce. Jethro 2015-09-13 21:09:20 +0200
2c50f676e3 Skryt odkaz na archiv výsledkových listin Matěj Kocián 2015-09-13 21:04:56 +0200
2b1564c435 Galerie jeste nejsou, sk->cz Jethro 2015-09-13 20:54:43 +0200
56a03f7706 Merge branch 'master' of atrey.karlin.mff.cuni.cz:/akce/MaM/MaMweb/mamweb Matej Lieskovsky 2015-09-13 20:48:42 +0200
0705ea07bc Merge branch 'master' of atrey.karlin.mff.cuni.cz:/akce/MaM/MaMweb/mamweb Matej Lieskovsky 2015-09-13 20:44:48 +0200
3fe137619b Opětovné skrytí odkazů na řeš. a org. články Matěj Kocián 2015-09-13 20:43:40 +0200
4c39b69e29 Kotvy na zamereni Matej Lieskovsky 2015-09-13 20:37:36 +0200
3b028cf495 Merge branch 'master' of atrey.karlin.mff.cuni.cz:/akce/MaM/MaMweb/mamweb Aneta 2015-09-13 20:30:07 +0200
f1c686774c Fix: zobraz témata v ročníku, i když nemá výsledky Matěj Kocián 2015-09-13 20:28:38 +0200
2427bb7a09 Nezobrazuj tagy a odkaz na pdf, pokud není nahrané Matěj Kocián 2015-09-13 20:19:42 +0200
451cafc4a1 Dalsi pokus o tag Matej Lieskovsky 2015-09-13 20:14:01 +0200
c103407266 Typo Matej Lieskovsky 2015-09-13 20:04:46 +0200
880516a42f typo Matej Lieskovsky 2015-09-13 20:01:18 +0200
64ff866d96 Merge branch 'master' of atrey.karlin.mff.cuni.cz:/akce/MaM/MaMweb/mamweb Matej Lieskovsky 2015-09-13 19:57:06 +0200
762329b79d Přidán forcyklus iterující přes tagy Matej Lieskovsky 2015-09-13 19:56:45 +0200
35ccc75f46 Normalni pismo Bc. Petr Pecha 2015-09-13 19:48:53 +0200
bd8c671b00 Fix Matej Lieskovsky 2015-09-13 19:48:59 +0200
41bad3b09d kotvy na ulohu dle oboru Matej Lieskovsky 2015-09-13 19:43:45 +0200
6200f574ac Oprava přeteku mobilní patičky. Honza "Stínovlas" Musílek 2015-09-13 18:45:10 +0200
8a5226279e Mobilní patička. Honza "Stínovlas" Musílek 2015-09-13 18:43:02 +0200
de33627ecf Merge branch 'master' of atrey.karlin.mff.cuni.cz:/akce/MaM/MaMweb/mamweb Aneta 2015-09-13 18:33:25 +0200
b313183ffb Merge branch 'Petr' deploy-prod-2015-09-13-18-23-xlfd Bc. Petr Pecha 2015-09-13 18:22:13 +0200
00b819c918 Oprava odpoctu do reseni Bc. Petr Pecha 2015-09-13 18:18:05 +0200
ac9dc92656 Merge branch 'master' of atrey.karlin.mff.cuni.cz:/akce/MaM/MaMweb/mamweb Honza "Stínovlas" Musílek 2015-09-13 18:10:37 +0200
3e2e865b48 Nástřel mobilní verze. Honza "Stínovlas" Musílek 2015-09-13 18:10:26 +0200
f19a80806d Merge branch 'master' of atrey.karlin.mff.cuni.cz:/akce/MaM/MaMweb/mamweb Aneta 2015-09-13 18:08:18 +0200
9f3bd3f9fd Merge branch 'master' of atrey.karlin.mff.cuni.cz:/akce/MaM/MaMweb/mamweb Aneta 2015-09-13 18:07:45 +0200
0f8028db84 Zviraznene menu a submenu clanky deploy-prod-2015-09-13-18-08-xlfd Bc. Petr Pecha 2015-09-13 18:07:27 +0200
cac7e2515e Úprava titulky, smazání MKS, změna titulního nadpisu. A. Aneta 2015-09-13 18:01:12 +0200
f1484662ec humanize odpocet deploy-prod-2015-09-13-17-36-xlfd Bc. Petr Pecha 2015-09-13 17:36:01 +0200
41cf2c945e Merge branch 'Petr' deploy-prod-2015-09-13-17-09-xlfd Bc. Petr Pecha 2015-09-13 17:08:42 +0200
543e0de243 Zobrazovani casu do konce Bc. Petr Pecha 2015-09-13 17:06:22 +0200
179da5dc87 Merge branch 'master' into Petr Bc. Petr Pecha 2015-09-13 16:53:23 +0200
71933d750b Merge remote-tracking branch 'origin/master' into Petr Bc. Petr Pecha 2015-09-13 16:53:16 +0200
a98bc7994c Merge branch 'Petr' Bc. Petr Pecha 2015-09-13 16:53:00 +0200
ea26c48650 Staticky odpocet Bc. Petr Pecha 2015-09-13 16:52:30 +0200
59d15d148e Hlavička soustředění. Honza "Stínovlas" Musílek 2015-09-13 16:52:29 +0200
421f4c9c82 Oprava patičky. Honza "Stínovlas" Musílek 2015-09-13 16:28:35 +0200
cb2ae7ed5e Merge branch 'master' of atrey.karlin.mff.cuni.cz:/akce/MaM/MaMweb/mamweb Honza "Stínovlas" Musílek 2015-09-13 16:25:02 +0200
1b8dbcb512 Tabletová verze! Honza "Stínovlas" Musílek 2015-09-13 16:24:49 +0200
b8aaac226d Merge branch 'master' of atrey.karlin.mff.cuni.cz:/akce/MaM/MaMweb/mamweb deploy-prod-2015-09-13-15-58-xlfd Matěj Kocián 2015-09-13 15:32:11 +0200
1ae9bb5e04 Struktura pro články Matěj Kocián 2015-09-13 15:31:34 +0200
af89687996 Nezobrazovat text k sous. Jethro 2015-09-13 14:03:01 +0200
6b72deb9ea Merge branch 'master' of 195.113.26.193:/akce/MaM/MaMweb/mamweb Jethro 2015-09-13 14:01:10 +0200
2f956ae2e7 Zobrazovat probehla soustredeni. Jethro 2015-09-13 14:00:55 +0200
99644255a4 Merge branch 'master' of atrey.karlin.mff.cuni.cz:/akce/MaM/MaMweb/mamweb Honza "Stínovlas" Musílek 2015-09-13 13:42:21 +0200
8ab3421be1 Úvod má stejnou fotku v hlavičce jako Co je M&M. Honza "Stínovlas" Musílek 2015-09-13 13:42:03 +0200
5e177ce1b0 Různé fotky v hlavičce (zatím nejsou všechny vybrané). Honza "Stínovlas" Musílek 2015-09-13 13:41:12 +0200
cf94e10a66 Tridit soustredeni retrospektivne. Jethro 2015-09-13 13:32:54 +0200
5b0d31e489 Web += patička. Honza "Stínovlas" Musílek 2015-09-13 13:09:01 +0200
ede6e48116 Odstranění zobrazování submenu u položek bez submenu. deploy-prod-2015-09-13-13-00-xlfd Honza "Stínovlas" Musílek 2015-09-13 12:24:11 +0200
9ce86a1a2c Merge branch 'master' of atrey.karlin.mff.cuni.cz:/akce/MaM/MaMweb/mamweb Honza "Stínovlas" Musílek 2015-09-13 12:09:09 +0200
320a3a7d20 Redesign menu. Honza "Stínovlas" Musílek 2015-09-13 12:08:30 +0200
d2719e0e0b Řazení úloh a témat podle čísla a pak podle kódu Matěj Kocián 2015-09-13 11:57:52 +0200