Commit Graph

6 Commits

Author SHA1 Message Date
marko
1f422394eb - Upload teilweise entfernt (ist aber sowieso das falsche Makefile)
modified:   homepage/redesign2018/markdownExperiment/src/Makefiles/Makefile.vidstab
- Variable für getVideoDuration
	modified:   homepage/redesign2018/markdownExperiment/src/Makefiles/Makefile.vidstabTest
- veralteten Link korrigiert
	modified:   homepage/redesign2018/markdownExperiment/src/md/hilfsmittel.md
	modified:   homepage/redesign2018/markdownExperiment/src/yaml/index.subNav.yaml
2019-03-27 17:22:55 +01:00
marko
b57ce57fe1 Kleinere Korrekturen
Auf Branch redesign2018
zum Commit vorgemerkte Änderungen:
- nach dem Hochladen wird jetzt 2s gewartet
	geändert:       homepage/redesign2018/markdownExperiment/Makefile
- Titelkorrektur
	geändert:       homepage/redesign2018/markdownExperiment/src/md/links.md
- falschen Link entfernt
	geändert:       homepage/redesign2018/markdownExperiment/src/yaml/navTargets.yaml
2018-08-06 04:46:08 +02:00
marko
fbbaddc24e Merge /media/sdb1/gitRepositories/judo into redesign2018
Conflicts:
	homepage/redesign2018/markdownExperiment/src/yaml/navTargets.yaml
2018-08-05 14:49:46 +02:00
marko
f1ba938327 Merge /media/sdb1/gitRepositories/judo into redesign2018
Conflicts:
	homepage/redesign2018/markdownExperiment/src/yaml/images.yaml
	homepage/redesign2018/markdownExperiment/src/yaml/navTargets.yaml
2018-08-05 12:40:28 +02:00
marko
238390a5c2 Merge /media/sdb1/gitRepositories/judo into redesign2018
Conflicts:
	homepage/redesign2018/markdownExperiment/src/md/galerien.md
	homepage/redesign2018/markdownExperiment/src/yaml/images.yaml
2018-08-04 19:30:32 +02:00
marko
293df72388 - Verschieben der yamlMetadaten in den srcOrdner
On branch redesign2018
Changes to be committed:

- buildProzess angepasst
	modified:   Makefile
- überflüssige Datei entfernt
	deleted:    cleancss
- eigentliches Verschieben
	renamed:    yaml/datenschutz.subNav.yaml -> src/yaml/datenschutz.subNav.yaml
	renamed:    yaml/download.subNav.yaml -> src/yaml/download.subNav.yaml
	renamed:    yaml/extras.subNav.yaml -> src/yaml/extras.subNav.yaml
	renamed:    yaml/galerie.subNav.yaml -> src/yaml/galerie.subNav.yaml
	renamed:    yaml/galerien.subNav.yaml -> src/yaml/galerien.subNav.yaml
	renamed:    yaml/hilfsmittel.subNav.yaml -> src/yaml/hilfsmittel.subNav.yaml
	renamed:    yaml/images.yaml -> src/yaml/images.yaml
	renamed:    yaml/impressum.subNav.yaml -> src/yaml/impressum.subNav.yaml
	renamed:    yaml/index.subNav.yaml -> src/yaml/index.subNav.yaml
	renamed:    yaml/kontakt.subNav.yaml -> src/yaml/kontakt.subNav.yaml
	renamed:    yaml/links.subNav.yaml -> src/yaml/links.subNav.yaml
	renamed:    yaml/mainNav.yaml -> src/yaml/mainNav.yaml
	renamed:    yaml/navTargets.yaml -> src/yaml/navTargets.yaml
	renamed:    yaml/news.subNav.yaml -> src/yaml/news.subNav.yaml
	renamed:    yaml/quiz.subNav.yaml -> src/yaml/quiz.subNav.yaml
	renamed:    yaml/trainingszeiten.subNav.yaml -> src/yaml/trainingszeiten.subNav.yaml
	renamed:    yaml/verein.subNav.yaml -> src/yaml/verein.subNav.yaml
	renamed:    yaml/wkKalender.subNav.yaml -> src/yaml/wkKalender.subNav.yaml
2018-08-03 14:26:01 +02:00