| 
							
						 | 
						
							
							
							
							
								
							
							
								f92eeb8450
								
							
						 | 
						
							
							
								
								ForeignKey -> OneToOne tam, kde dava smysl
							
							
							
							
							
							
							
							V migraci navic TreeNody 
							
						 | 
						
							2019-05-10 22:30:51 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								23287d1cd0
								
							
						 | 
						
							
							
								
								Opravene migrace py2 -> py3
							
							
							
							
							
						 | 
						
							2019-05-10 21:57:50 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									LEdoian
								
							 
						 | 
						
							
							
							
							
								
							
							
								39e06f70b8
								
							
						 | 
						
							
							
								
								Oprava kolizních jmen fieldů
							
							
							
							
							
						 | 
						
							2019-05-10 21:38:27 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								5a3dddc0e7
								
							
						 | 
						
							
							
								
								Merge branch 'python3' of gimli.ms.mff.cuni.cz:/akce/mam/git/mamweb into python3
							
							
							
							
							
						 | 
						
							2019-05-10 20:50:35 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								0cd928f0a2
								
							
						 | 
						
							
							
								
								První migrace modelu
							
							
							
							
							
							
							
							Plán útoku: zmigrovat model na sjednocení starého a nového, zmigrovat data, zmigrovat model na jen-nový. 
							
						 | 
						
							2019-05-10 20:48:00 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Anet
								
							 
						 | 
						
							
							
							
							
								
							
							
								4d42324f63
								
							
						 | 
						
							
							
								
								Merge branch 'python3' of gimli.ms.mff.cuni.cz:/akce/mam/git/mamweb into python3
							
							
							
							
							
						 | 
						
							2019-05-10 20:41:31 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									LEdoian
								
							 
						 | 
						
							
							
							
							
								
							
							
								b678337955
								
							
						 | 
						
							
							
								
								Fix clashes v *Node věcech
							
							
							
							
							
						 | 
						
							2019-05-01 00:46:59 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									LEdoian
								
							 
						 | 
						
							
							
							
							
								
							
							
								2321a529bc
								
							
						 | 
						
							
							
								
								Merge branch 'new-model' into python3
							
							
							
							
							
						 | 
						
							2019-05-01 00:38:34 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Anet
								
							 
						 | 
						
							
							
							
							
								
							
							
								425a4a2d44
								
							
						 | 
						
							
							
								
								inicial_krestni: uprava, abychom umeli resitele s vice jmeny
							
							
							
							
							
						 | 
						
							2019-04-30 23:37:11 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								288dcc747b
								
							
						 | 
						
							
							
								
								Opraveny Python2 printy.
							
							
							
							
							
						 | 
						
							2019-04-30 22:17:05 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								f4763a3040
								
							
						 | 
						
							
							
								
								Merge branch 'python3' of gimli.ms.mff.cuni.cz:/akce/mam/git/mamweb into python3
							
							
							
							
							
						 | 
						
							2019-04-30 22:14:54 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								a17477762a
								
							
						 | 
						
							
							
								
								Obejiti chyb v adminu.
							
							
							
							
							
						 | 
						
							2019-04-30 22:13:43 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									LEdoian
								
							 
						 | 
						
							
							
							
							
								
							
							
								340101693b
								
							
						 | 
						
							
							
								
								Merge branch 'python3' of gimli.ms.mff.cuni.cz:/akce/mam/git/mamweb into python3
							
							
							
							
							
						 | 
						
							2019-04-30 22:10:40 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									LEdoian
								
							 
						 | 
						
							
							
							
							
								
							
							
								32807c9f88
								
							
						 | 
						
							
							
								
								Fix ResitelInline a ReseniAdmin
							
							
							
							
							
						 | 
						
							2019-04-30 22:09:46 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Anet
								
							 
						 | 
						
							
							
							
							
								
							
							
								86193f1fb9
								
							
						 | 
						
							
							
								
								Merge branch 'python3' of gimli.ms.mff.cuni.cz:/akce/mam/git/mamweb into python3
							
							
							
							
							
						 | 
						
							2019-04-30 22:09:24 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Anet
								
							 
						 | 
						
							
							
							
							
								
							
							
								9cd30ec662
								
							
						 | 
						
							
							
								
								admin: oprava Resitele (provizorni)
							
							
							
							
							
						 | 
						
							2019-04-30 22:08:54 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									LEdoian
								
							 
						 | 
						
							
							
							
							
								
							
							
								9945d6232a
								
							
						 | 
						
							
							
								
								Merge branch 'python3' of gimli.ms.mff.cuni.cz:/akce/mam/git/mamweb into python3
							
							
							
							
							
						 | 
						
							2019-04-30 21:48:59 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									LEdoian
								
							 
						 | 
						
							
							
							
							
								
							
							
								6142f4a979
								
							
						 | 
						
							
							
								
								Admin: Fix ResitelInline
							
							
							
							
							
						 | 
						
							2019-04-30 21:48:46 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								2b6d0cbd10
								
							
						 | 
						
							
							
								
								Merge branch 'python3' of gimli.ms.mff.cuni.cz:/akce/mam/git/mamweb into python3
							
							
							
							
							
						 | 
						
							2019-04-30 21:47:09 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								687b6d37b2
								
							
						 | 
						
							
							
								
								Fix ReseniAdmin
							
							
							
							
							
						 | 
						
							2019-04-30 21:46:57 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Anet
								
							 
						 | 
						
							
							
							
							
								
							
							
								db5f5d9607
								
							
						 | 
						
							
							
								
								admin: ReseniKResiteliInline oprava timstampu.
							
							
							
							
							
						 | 
						
							2019-04-30 21:39:22 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								95525099fd
								
							
						 | 
						
							
							
								
								Oprava nadbytecneho null.
							
							
							
							
							
						 | 
						
							2019-04-30 21:26:25 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								6b41719e60
								
							
						 | 
						
							
							
								
								Merge branch 'python3' of gimli.ms.mff.cuni.cz:/akce/mam/git/mamweb into python3
							
							
							
							
							
						 | 
						
							2019-04-30 21:24:35 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								f13b94ff7d
								
							
						 | 
						
							
							
								
								Bufgix related_name
							
							
							
							
							
						 | 
						
							2019-04-30 21:24:24 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Anet
								
							 
						 | 
						
							
							
							
							
								
							
							
								3007ac3433
								
							
						 | 
						
							
							
								
								Merge branch 'python3' of gimli.ms.mff.cuni.cz:/akce/mam/git/mamweb into python3
							
							
							
							
							
						 | 
						
							2019-04-30 21:20:45 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									LEdoian
								
							 
						 | 
						
							
							
							
							
								
							
							
								aced765847
								
							
						 | 
						
							
							
								
								Merge branch 'python3' of gimli.ms.mff.cuni.cz:/akce/mam/git/mamweb into python3
							
							
							
							
							
						 | 
						
							2019-04-30 21:20:23 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									LEdoian
								
							 
						 | 
						
							
							
							
							
								
							
							
								72f3099366
								
							
						 | 
						
							
							
								
								Fixy problémů s abstraktností modelu a špatných identifikátorů
							
							
							
							
							
						 | 
						
							2019-04-30 21:19:52 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								1d46517581
								
							
						 | 
						
							
							
								
								Opravy clashu related_name
							
							
							
							
							
						 | 
						
							2019-04-30 21:19:02 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Anet
								
							 
						 | 
						
							
							
							
							
								
							
							
								91e88a31fb
								
							
						 | 
						
							
							
								
								admin: pohadka nema timestamp, priloha reseni ma misto timestampu
							
							
							
							
							
							
							
							vytvoreno 
							
						 | 
						
							2019-04-30 21:12:32 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									LEdoian
								
							 
						 | 
						
							
							
							
							
								
							
							
								e33d602635
								
							
						 | 
						
							
							
								
								Requirements umožňují libovolnou dostatečně novou verzi Djanga 1
							
							
							
							
							
						 | 
						
							2019-04-24 10:25:00 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Anet
								
							 
						 | 
						
							
							
							
							
								
							
							
								f974007cb2
								
							
						 | 
						
							
							
								
								jeste zapomenuta uprava na rozbehnuti modelu a pythonu3
							
							
							
							
							
						 | 
						
							2019-04-23 23:36:11 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Anet
								
							 
						 | 
						
							
							
							
							
								
							
							
								c72405771e
								
							
						 | 
						
							
							
								
								Merge branch 'python3' of gimli.ms.mff.cuni.cz:/akce/mam/git/mamweb into python3
							
							
							
							
							
						 | 
						
							2019-04-23 23:32:20 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mee
								
							 
						 | 
						
							
							
							
							
								
							
							
								be5e723b02
								
							
						 | 
						
							
							
								
								Update uWSGi configu, **Možná nebude fungovat**
							
							
							
							
							
						 | 
						
							2019-04-23 23:31:35 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Anet
								
							 
						 | 
						
							
							
							
							
								
							
							
								9c10149226
								
							
						 | 
						
							
							
								
								Merge branch 'python3' of gimli.ms.mff.cuni.cz:/akce/mam/git/mamweb into python3
							
							
							
							
							
						 | 
						
							2019-04-23 23:29:24 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Anet
								
							 
						 | 
						
							
							
							
							
								
							
							
								c240cd3d3a
								
							
						 | 
						
							
							
								
								python -> python3.5
							
							
							
							
							
						 | 
						
							2019-04-23 23:27:30 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Anet
								
							 
						 | 
						
							
							
							
							
								
							
							
								b6a3012d1e
								
							
						 | 
						
							
							
								
								uprava na python3 (obcas) a novy model (hlavne)
							
							
							
							
							
						 | 
						
							2019-04-23 23:26:37 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mee
								
							 
						 | 
						
							
							
							
							
								
							
							
								a9fb8c972b
								
							
						 | 
						
							
							
								
								Makefile: fix rozbitých deploy_* cílů, více nápovědy, méně debugovacích výpisů.
							
							
							
							
							
						 | 
						
							2019-04-23 22:53:50 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mee
								
							 
						 | 
						
							
							
							
							
								
							
							
								9b48922612
								
							
						 | 
						
							
							
								
								Odstraněny staré složky z gitignore
							
							
							
							
							
						 | 
						
							2019-04-23 22:34:29 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Mee
								
							 
						 | 
						
							
							
							
							
								
							
							
								48655b4d5a
								
							
						 | 
						
							
							
								
								Nový Makefile. Bude vyžadovat změny uWSGi configu.
							
							
							
							
							
						 | 
						
							2019-04-23 22:34:05 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Anet
								
							 
						 | 
						
							
							
							
							
								
							
							
								9ffcd604db
								
							
						 | 
						
							
							
								
								models -> .models, views -> .views pro zprovozneni importu
							
							
							
							
							
						 | 
						
							2019-04-23 22:27:20 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								90dc3a04f5
								
							
						 | 
						
							
							
								
								Opravy poli podle noveho modelu.
							
							
							
							
							
						 | 
						
							2019-04-23 22:25:18 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Anet
								
							 
						 | 
						
							
							
							
							
								
							
							
								ca89637c26
								
							
						 | 
						
							
							
								
								drobnosti do pythonu 3
							
							
							
							
							
						 | 
						
							2019-04-23 21:46:29 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								1b8d98af5b
								
							
						 | 
						
							
							
								
								Schema noveho modelu.
							
							
							
							
							
						 | 
						
							2019-04-23 21:33:27 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						| 
							
						 | 
						
							
							
							
							
								
							
							
								14d834209c
								
							
						 | 
						
							
							
								
								Novy model kompletni.
							
							
							
							
							
						 | 
						
							2019-04-23 21:32:39 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Anet
								
							 
						 | 
						
							
							
							
							
								
							
							
								dd99c34a83
								
							
						 | 
						
							
							
								
								zmeny pro kompatibilitu s python3
							
							
							
							
							
						 | 
						
							2019-04-16 22:18:49 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Anet
								
							 
						 | 
						
							
							
							
							
								
							
							
								8972dbb34d
								
							
						 | 
						
							
							
								
								models.py: prehozeni trid, odkomentovani funkci. Sebehne na tom make run.
							
							
							
							
							
						 | 
						
							2019-04-16 21:45:43 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Anet
								
							 
						 | 
						
							
							
							
							
								
							
							
								8d48e8ee83
								
							
						 | 
						
							
							
								
								models.py: prehozeni Osoba a Skola, zmena nazvu knihovny, carky a pod.
							
							
							
							
							
						 | 
						
							2019-04-16 21:30:56 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Anet
								
							 
						 | 
						
							
							
							
							
								
							
							
								7a984aea18
								
							
						 | 
						
							
							
								
								models.py: zrusena u pred stringem
							
							
							
							
							
						 | 
						
							2019-04-16 21:13:36 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Anet
								
							 
						 | 
						
							
							
							
							
								
							
							
								327d0e5835
								
							
						 | 
						
							
							
								
								Merge branch 'new-model' of gimli.ms.mff.cuni.cz:/akce/mam/git/mamweb into new-model
							
							
							
							
							
						 | 
						
							2019-04-16 20:51:08 +02:00 | 
						
						
							
							
							
								
							
							
						 | 
					
				
					
						
							
								
								
									 
									Anet
								
							 
						 | 
						
							
							
							
							
								
							
							
								72ee2a15ad
								
							
						 | 
						
							
							
								
								models.py: prijmeni -> osoba__prijmeni
							
							
							
							
							
						 | 
						
							2019-04-16 20:48:50 +02:00 | 
						
						
							
							
							
								
							
							
						 |