|
|
f0fbd8021f
|
Merge pull request 'Přidání CKEditoru do Soustředění a Novinek (#1294)' (!75) from ckeditor-dalsi-veci into master
Reviewed-on: #75
|
2024-11-19 20:31:18 +01:00 |
|
|
|
3d035b994a
|
Přidání CKEditoru do Soustředění a Novinek
|
2024-11-19 20:22:12 +01:00 |
|
|
|
db3dd39696
|
Merge pull request 'Možnost mít deadline celého čísla a sousu zároveň' (!74) from deadline-cisla-a-sousu into master
Reviewed-on: #74
|
2024-11-13 12:16:21 +01:00 |
|
|
|
e0e1dfda41
|
Merge remote-tracking branch 'origin/master' into deadline-cisla-a-sousu
# Conflicts:
# tvorba/models.py
|
2024-11-13 12:14:33 +01:00 |
|
MaM Web user
|
44766efe2a
|
Ještě migrace
— LEdo
|
2024-11-12 21:47:10 +01:00 |
|
|
|
d129f8a764
|
Merge remote-tracking branch 'refs/remotes/origin/master'
|
2024-11-12 21:45:59 +01:00 |
|
|
|
5b330567f8
|
generating file names with three functions
|
2024-11-12 21:44:17 +01:00 |
|
|
|
e6a21a5f1b
|
Komentář, abychom kdyžtak uměli duplikovat přidání deadlinu
|
2024-11-12 21:41:32 +01:00 |
|
|
|
042246e948
|
dalsí do masteru zobrazovani kontaktnicku
|
2024-11-12 21:39:17 +01:00 |
|
|
|
e224ee66a7
|
push to master quick fix zobratzeni pro orrrgy
|
2024-11-12 21:23:13 +01:00 |
|
|
|
5ccb94d155
|
Merge pull request 'verejny kontaktnicek' (!71) from kontaktnicek_pro_vsecny into master
Reviewed-on: #71
|
2024-11-12 21:15:24 +01:00 |
|
|
|
fa00652a69
|
Merge branch 'master' into kontaktnicek_pro_vsecny
|
2024-11-12 21:14:10 +01:00 |
|
|
|
036c68bc2a
|
another lambad function
|
2024-11-12 21:07:13 +01:00 |
|
|
|
fcc2c7c374
|
lol komentar
|
2024-11-12 20:37:50 +01:00 |
|
|
|
1b755ad1f7
|
deduplikace listu
|
2024-11-12 20:37:14 +01:00 |
|
|
|
ad5a242f8d
|
upravy generate filename
|
2024-11-12 20:31:08 +01:00 |
|
|
|
6186914a7c
|
aaaaa another bug
|
2024-11-12 20:27:51 +01:00 |
|
|
|
7a781e463f
|
lol docker tu nemel byt
|
2024-11-12 20:20:43 +01:00 |
|
|
|
2dbbb588d0
|
opravy pro pull
|
2024-11-12 20:15:09 +01:00 |
|
|
|
eada7920f0
|
Možnost mít deadline celého čísla a sousu zároveň
|
2024-11-12 20:10:19 +01:00 |
|
|
|
6a7e4b1a39
|
Možnost mít deadline celého čísla a sousu zároveň
|
2024-11-12 19:58:14 +01:00 |
|
|
|
5883a5cd28
|
Merge pull request 'Předělání sousových views' (!57) from predelani_sousovych_view into master
Reviewed-on: #57
|
2024-11-12 19:33:10 +01:00 |
|
|
|
7e8092c30c
|
tex -> tex_prikaz
|
2024-11-12 19:32:19 +01:00 |
|
|
|
f01a808ac2
|
Komentář
|
2024-11-12 19:29:17 +01:00 |
|
|
|
c8dd54e8ba
|
opravy bad designu
|
2024-11-12 18:37:21 +01:00 |
|
|
|
0f6f6a85b6
|
verejny kontaktnicek
|
2024-11-05 22:47:18 +01:00 |
|
|
|
502588fd3a
|
Merge pull request 'soucet_bodu' (!70) from soucet_bodu into master
Reviewed-on: #70
|
2024-11-05 22:27:54 +01:00 |
|
|
|
b4b6c7c0ce
|
seminar.models se načítá automaticky, budiž to mamweb.vsechno
|
2024-11-05 22:25:40 +01:00 |
|
|
|
0e83f96318
|
<p> se souctem bodu pod odevzdana reseni
|
2024-11-05 22:20:48 +01:00 |
|
|
|
e660a96df2
|
<p> se souctem bodu pod odevzdana reseni
|
2024-11-05 22:10:45 +01:00 |
|
|
|
854c902322
|
Merge branch 'master' into predelani_sousovych_view
|
2024-11-05 20:36:43 +01:00 |
|
|
|
024f8e0a80
|
Merge pull request 'Podezřelé semináře (#1465)' (!65) from podezrele-seminare into master
Reviewed-on: #65
|
2024-11-05 20:31:54 +01:00 |
|
|
|
bf726df117
|
Přepsání loggeru, protože to vypadá lépe (i kdyby to nefungovalo)
|
2024-11-05 20:30:55 +01:00 |
|
|
|
227d438ebd
|
Poslední obrana proti importování seminar.models
|
2024-11-05 20:22:04 +01:00 |
|
|
|
71948383d2
|
Upraven popis aplikace seminar
|
2024-11-05 20:19:34 +01:00 |
|
|
|
6df9665af3
|
Migrace utišující Django (stejně se default nikdy nepoužívá).
|
2024-11-05 20:15:41 +01:00 |
|
|
|
c1938c8ff7
|
Odstřel funkcí pro migrace
|
2024-11-05 19:56:07 +01:00 |
|
|
|
4536c56a83
|
Merge pull request '+5 let limit maturity' (!69) from vek_maturity into master
Reviewed-on: #69
|
2024-11-05 19:53:43 +01:00 |
|
|
|
8156f7828e
|
+5 let limit maturity
|
2024-11-05 19:25:36 +01:00 |
|
|
|
f5c2e22121
|
Zapomenutý seminar.models
|
2024-11-05 18:54:01 +01:00 |
|
|
|
62a42675f8
|
mv SeminarModelBase a OverwriteStorage
|
2024-11-05 18:53:38 +01:00 |
|
|
|
a372aa1bc2
|
Seminar v dokumentaci
|
2024-11-05 17:46:27 +01:00 |
|
|
|
d0cb46b658
|
Název url seznamu všech soustředění
|
2024-11-05 17:40:36 +01:00 |
|
|
|
ac6c41cc88
|
Název url seznamu všech soustředění
|
2024-11-05 15:10:36 +01:00 |
|
|
|
1c146ac5c3
|
Admin ReseniNode
|
2024-11-05 15:07:51 +01:00 |
|
|
|
527a7b3ea6
|
Pojmenované URL místo čistého URL
|
2024-11-05 14:58:25 +01:00 |
|
|
|
e4a72940e8
|
Merge remote-tracking branch 'origin/master' into podezrele-seminare
|
2024-11-05 14:46:50 +01:00 |
|
|
|
7b3708d7ab
|
Merge pull request 'Oprava Testu Delani Orgem' (!68) from oprava_testu_delani_orgem into master
Reviewed-on: #68
|
2024-11-05 14:40:37 +01:00 |
|
|
|
c0825691a6
|
Merge branch 'master' into podezrele-seminare
|
2024-11-05 14:29:02 +01:00 |
|
|
|
b606f03191
|
Merge pull request 'Odstřel modelu TreeNode' (!67) from odstrel_modelu_treenode into master
Reviewed-on: #67
|
2024-11-05 14:19:50 +01:00 |
|
