Tudor
tudor
Merge branch 'development' of https://github.com/UAB2014/pabd2014 into development
Confirmarea ca am citit README.md
Am creat site-ul cu meniu si pagina implicita (in caz ca este gresit parametru).
Accesarea se face astfel (vezi app/config/routing.yml):
Ciolacu - pagina implicita, cu meniu (parametrul myaction = Home)
Ciolacu/ - pagina implicita, cu meniu (parametrul myaction = Home)
Ciolacu/Home - pagina implicita, cu meniu (parametrul myaction = Home)
Ciolacu/About - pagina About, cu meniu (parametrul myaction = About)
Ciolacu/Contact - pagina Contact, cu meniu (parametrul myaction = Contact)
Ciolacu/OriceAltceva - pagina implicita, cu meniu (parametrul myaction = Home)

Toate paginile se genereaza dinamic si se afla intr-un singur fisier,
vezi src/website/CiolacuBundle/Resources/views/Default/index.html.twig
si folosim parametrul myaction, vezi src/website/CiolacuBundle/Controller/DefaultController.php
Adaugate fisierele css si imaginile
Merge branch 'development' of https://github.com/UAB2014/pabd2014 into development
update
Radu Oprea - Suteu Iacob

aplicatie securitate soft http://tagdiv.com/scoala/SecuritateSoftware/
Merge pull request #46 from opradu/development

Radu Oprea - Suteu Iacob
Merge branch 'development' of https://github.com/UAB2014/pabd2014 into development

Conflicts:
	README.md
Merge branch 'siteciolacu' into development

Conflicts:
	README.md
	app/AppKernel.php
	app/config/routing.yml