← Back to branch summary

~theo-voisin/+junk/cnrs

~theo-voisin/+junk/cnrs

Viewing all changes in revision 19.

Committer: jeremy.lherbe at univ-orleans
Date: 2013-03-04 13:04:35 UTC
mfrom: (16.1.5 cnrs)
Revision ID: jeremy.lherbe@etu.univ-orleans.fr-20130304130435-eubg572opparqd3o

merge avec pascal

files added:
src/Tofsims/AdminBundle/Resources/public/images/ajouter-icone-1.png

src/Tofsims/AdminBundle/Resources/public/images/arreter-icone-1.png

src/Tofsims/AdminBundle/Resources/public/images/modifier-icone-1.png

src/Tofsims/AdminBundle/Resources/public/images/modifier-icone-2.png

src/Tofsims/AdminBundle/Resources/public/images/modifier-icone-3.png

src/Tofsims/AdminBundle/Resources/public/images/modifier-icone-4.png

src/Tofsims/AdminBundle/Resources/views/Admin/accueil.html.twig

src/Tofsims/AdminBundle/Resources/views/Admin/accueil_modif_new.html.twig

src/Tofsims/AdminBundle/Resources/views/Admin/alerte_modif_new.html.twig

src/Tofsims/AdminBundle/Resources/views/Admin/presentation_modif_new.html.twig

src/Tofsims/TofsimsBundle/Resources/views/Tofsims/presentation_cluster.html.twig

src/Tofsims/TofsimsBundle/Resources/views/Tofsims/presentation_comp.html.twig

src/Tofsims/TofsimsBundle/Resources/views/Tofsims/presentation_cout.html.twig

src/Tofsims/TofsimsBundle/Resources/views/Tofsims/presentation_principe.html.twig

src/Tofsims/TofsimsBundle/Resources/views/Tofsims/presentation_video.html.twig

files removed:
src/Tofsims/AdminBundle/Resources/views/Admin/add_alerte.html.twig

files modified:
app/Resources/views/base.html.twig

app/config/parameters.yml

src/Tofsims/AdminBundle/Controller/AdminController.php

src/Tofsims/AdminBundle/Resources/config/routing.yml

src/Tofsims/AdminBundle/Resources/views/Admin/alerte.html.twig

src/Tofsims/AdminBundle/Resources/views/Admin/menu.html.twig

src/Tofsims/AdminBundle/Resources/views/Admin/presentation.html.twig

src/Tofsims/TofsimsBundle/Controller/TofsimsController.php

src/Tofsims/TofsimsBundle/Resources/config/routing.yml

src/Tofsims/TofsimsBundle/Resources/public/css/style1.css

web/bundles/tofsimstofsims/css/style1.css

Show diffs side-by-side

added added

removed removed

app/Resources/views/base.html.twig

app/config/parameters.yml

src/Tofsims/AdminBundle/Controller/AdminController.php

src/Tofsims/AdminBundle/Resources/config/routing.yml

src/Tofsims/AdminBundle/Resources/public/images/ajouter-icone-1.png

src/Tofsims/AdminBundle/Resources/public/images/arreter-icone-1.png

src/Tofsims/AdminBundle/Resources/public/images/modifier-icone-1.png

src/Tofsims/AdminBundle/Resources/public/images/modifier-icone-2.png

src/Tofsims/AdminBundle/Resources/public/images/modifier-icone-3.png

src/Tofsims/AdminBundle/Resources/public/images/modifier-icone-4.png

src/Tofsims/AdminBundle/Resources/views/Admin/accueil.html.twig

src/Tofsims/AdminBundle/Resources/views/Admin/accueil_modif_new.html.twig

src/Tofsims/AdminBundle/Resources/views/Admin/add_alerte.html.twig

src/Tofsims/AdminBundle/Resources/views/Admin/alerte.html.twig

src/Tofsims/AdminBundle/Resources/views/Admin/alerte_modif_new.html.twig

src/Tofsims/AdminBundle/Resources/views/Admin/presentation.html.twig

src/Tofsims/AdminBundle/Resources/views/Admin/presentation_modif_new.html.twig

src/Tofsims/TofsimsBundle/Controller/TofsimsController.php

src/Tofsims/TofsimsBundle/Resources/config/routing.yml

src/Tofsims/TofsimsBundle/Resources/public/css/style1.css

src/Tofsims/TofsimsBundle/Resources/views/Tofsims/presentation_cluster.html.twig

src/Tofsims/TofsimsBundle/Resources/views/Tofsims/presentation_comp.html.twig

src/Tofsims/TofsimsBundle/Resources/views/Tofsims/presentation_cout.html.twig

src/Tofsims/TofsimsBundle/Resources/views/Tofsims/presentation_principe.html.twig

src/Tofsims/TofsimsBundle/Resources/views/Tofsims/presentation_video.html.twig

web/bundles/tofsimstofsims/css/style1.css

Older »