first
oua
what
test2
last what delete
'1.0'
test du lundi
commitmessage
Merge branch 'master' of github.com:guillaumeduval64/test

Conflicts:
	app/AppKernel.php
	app/Resources/views/forms.html.twig
	app/SymfonyRequirements.php
	app/bootstrap.php.cache
	app/config/config.yml
	app/config/parameters.ini
	composer.lock
	nbproject/private/retriever/catalog.xml
	src/MyApp/ApBundle/Controller/ClientContratController.php
	src/MyApp/ApBundle/Controller/ClientController.php
	src/MyApp/ApBundle/Controller/ComptabiliteController.php
	src/MyApp/ApBundle/Controller/ContratController.php
	src/MyApp/ApBundle/Controller/DashboardController.php
	src/MyApp/ApBundle/Controller/EstimationController.php
	src/MyApp/ApBundle/Controller/ProductionController.php
	src/MyApp/ApBundle/Entity/City.php~
	src/MyApp/ApBundle/Entity/Client.php
	src/MyApp/ApBundle/Entity/Client.php~
	src/MyApp/ApBundle/Entity/ClientService.php
	src/MyApp/ApBundle/Entity/ClientService.php~
	src/MyApp/ApBundle/Entity/Comptabilite.php~
	src/MyApp/ApBundle/Entity/Contrat.php
	src/MyApp/ApBundle/Entity/Contrat.php~
	src/MyApp/ApBundle/Entity/DateTable.php~
	src/MyApp/ApBundle/Entity/Etat.php~
	src/MyApp/ApBundle/Entity/Message.php~
	src/MyApp/ApBundle/Entity/Note.php~
	src/MyApp/ApBundle/Entity/Particularite.php~
	src/MyApp/ApBundle/Entity/Production.php
	src/MyApp/ApBundle/Entity/Production.php~
	src/MyApp/ApBundle/Entity/Satisfaction.php~
	src/MyApp/ApBundle/Entity/SatisfactionEquipe.php
	src/MyApp/ApBundle/Entity/SatisfactionEquipe.php~
	src/MyApp/ApBundle/Entity/Service.php
	src/MyApp/ApBundle/Entity/Service.php~
	src/MyApp/ApBundle/Entity/StartStop.php
	src/MyApp/ApBundle/Entity/StartStop.php~
	src/MyApp/ApBundle/Entity/Titles.php~
	src/MyApp/ApBundle/Entity/Travailleur.php
	src/MyApp/ApBundle/Entity/Travailleur.php~
	src/MyApp/ApBundle/Entity/Type.php~
	src/MyApp/ApBundle/Form/ClientForm.php
	src/MyApp/ApBundle/Form/ClientServiceForm.php
	src/MyApp/ApBundle/Form/ComptabiliteForm.php
	src/MyApp/ApBundle/Form/ContratForm.php
	src/MyApp/ApBundle/Form/ContratRechercheForm.php
	src/MyApp/ApBundle/Form/ProductionForm.php
	src/MyApp/ApBundle/Resources/config/routing.yml
	src/MyApp/ApBundle/Resources/public/css/main.css
	src/MyApp/ApBundle/Resources/public/js/jquery.ui.timepicker.js
	src/MyApp/ApBundle/Resources/views/Client/ajouter.html.twig
	src/MyApp/ApBundle/Resources/views/Client/liste.html.twig
	src/MyApp/ApBundle/Resources/views/Client/lister.html.twig
	src/MyApp/ApBundle/Resources/views/Client/modifier.html.twig
	src/MyApp/ApBundle/Resources/views/Comptabilite/ajouter.html.twig
	src/MyApp/ApBundle/Resources/views/Comptabilite/liste.html.twig
	src/MyApp/ApBundle/Resources/views/Comptabilite/voir_menu_total.html.twig
	src/MyApp/ApBundle/Resources/views/Contrat/ajouter.html.twig
	src/MyApp/ApBundle/Resources/views/Contrat/liste.html.twig
	src/MyApp/ApBundle/Resources/views/Contrat/listeAnnule.html.twig
	src/MyApp/ApBundle/Resources/views/Contrat/listeEstimation.html.twig
	src/MyApp/ApBundle/Resources/views/Contrat/lister.html.twig
	src/MyApp/ApBundle/Resources/views/Contrat/voir.html.twig
	src/MyApp/ApBundle/Resources/views/Dashboard/nbEstimation.html.twig
	src/MyApp/ApBundle/Resources/views/Dashboard/produitUtilisateur.html.twig
	src/MyApp/ApBundle/Resources/views/Estimation/ajouter.html.twig
	src/MyApp/ApBundle/Resources/views/Estimation/voir.html.twig
	src/MyApp/ApBundle/Resources/views/Map/voirClient.html.twig
	src/MyApp/ApBundle/Resources/views/Production/liste.html.twig
	src/MyApp/ApBundle/Resources/views/Production/listedefinir.html.twig
	src/MyApp/ApBundle/Resources/views/Production/listetermine.html.twig
	src/MyApp/ApBundle/Resources/views/Production/modifier.html.twig
	src/MyApp/ApBundle/Resources/views/Satisfaction/ajouter.html.twig
	src/MyApp/ApBundle/Resources/views/layout.html.twig
	src/MyApp/UtilisateurBundle/Entity/Group.php
	src/MyApp/UtilisateurBundle/Entity/Group.php~
	src/MyApp/UtilisateurBundle/Entity/Utilisateur.php
	src/MyApp/UtilisateurBundle/Entity/Utilisateur.php~
	src/MyApp/UtilisateurBundle/Form/Type/RegistrationFormType.php
	src/MyApp/UtilisateurBundle/Resources/config/services.xml
	src/MyApp/UtilisateurBundle/Resources/views/security/login.html.twig
	vendor/autoload.php
	vendor/composer/ClassLoader.php
	vendor/composer/autoload_classmap.php
	vendor/composer/autoload_namespaces.php
	vendor/composer/autoload_real.php
	vendor/composer/installed.json
	vendor/doctrine-dbal/run-all.sh
	vendor/doctrine/run-all.sh
	vendor/egeloen/google-map-bundle/Ivory/GoogleMapBundle/.gitignore
	vendor/egeloen/google-map-bundle/Ivory/GoogleMapBundle/.travis.yml
	vendor/egeloen/google-map-bundle/Ivory/GoogleMapBundle/DependencyInjection/Configuration.php
	vendor/egeloen/google-map-bundle/Ivory/GoogleMapBundle/DependencyInjection/IvoryGoogleMapExtension.php
	vendor/egeloen/google-map-bundle/Ivory/GoogleMapBundle/Entity/Bound.php
	vendor/egeloen/google-map-bundle/Ivory/GoogleMapBundle/Entity/Circle.php
	vendor/egeloen/google-map-bundle/Ivory/GoogleMapBundle/Entity/Coordinate.php
	vendor/egeloen/google-map-bundle/Ivory/GoogleMapBundle/Entity/EncodedPolyline.php
	vendor/egeloen/google-map-bundle/Ivory/GoogleMapBundle/Entity/Event.php
	vendor/egeloen/google-map-bundle/Ivory/GoogleMapBundle/Entity/EventManager.php
	vendor/egeloen/google-map-bundle/Ivory/GoogleMapBundle/Entity/InfoWindow.php
	vendor/egeloen/google-map-bundle/Ivory/GoogleMapBundle/Entity/Map.php
	vendor/egeloen/google-map-bundle/Ivory/GoogleMapBundle/Entity/MapTypeControl.php
	vendor/egeloen/google-map-bundle/Ivory/GoogleMapBundle/Entity/Marker.php
	vendor/egeloen/google-map-bundle/Ivory/GoogleMapBundle/Entity/MarkerImage.php
	vendor/egeloen/google-map-bundle/Ivory/GoogleMapBundle/Entity/MarkerShape.php
	vendor/egeloen/google-map-bundle/Ivory/GoogleMapBundle/Entity/OverviewMapControl.php
	vendor/egeloen/google-map-bundle/Ivory/GoogleMapBundle/Entity/PanControl.php
	vendor/egeloen/google-map-bundle/Ivory/GoogleMapBundle/Entity/Point.php
	vendor/egeloen/google-map-bundle/Ivory/GoogleMapBundle/Entity/Polygon.php
	vendor/egeloen/google-map-bundle/Ivory/GoogleMapBundle/Entity/Polyline.php
	vendor/egeloen/google-map-bundle/Ivory/GoogleMapBundle/Entity/Rectangle.php
	vendor/egeloen/google-map-bundle/Ivory/GoogleMapBundle/Entity/RotateControl.php
	vendor/egeloen/google-map-bundle/Ivory/GoogleMapBundle/Entity/ScaleControl.php
	vendor/egeloen/google-map-bundle/Ivory/GoogleMapBundle/Entity/Size.php
	vendor/egeloen/google-map-bundle/Ivory/GoogleMapBundle/Entity/StreetViewControl.php
	vendor/egeloen/google-map-bundle/Ivory/GoogleMapBundle/Entity/ZoomControl.php
	vendor/egeloen/google-map-bundle/Ivory/GoogleMapBundle/EventListener/FakeRequestListener.php
	vendor/egeloen/google-map-bundle/Ivory/GoogleMapBundle/IvoryGoogleMapBundle.php
	vendor/egeloen/google-map-bundle/Ivory/GoogleMapBundle/Resources/config/doctrine/Marker.orm.xml
	vendor/egeloen/google-map-bundle/Ivory/GoogleMapBundle/Resources/doc/installation.md
	vendor/egeloen/google-map-bundle/Ivory/GoogleMapBundle/Resources/doc/usage.md
	vendor/egeloen/google-map-bundle/Ivory/GoogleMapBundle/Resources/doc/usage/controls/index.md
	vendor/egeloen/google-map-bundle/Ivory/GoogleMapBundle/Resources/doc/usage/controls/map_type.md
	vendor/egeloen/google-map-bundle/Ivory/GoogleMapBundle/Resources/doc/usage/controls/overview.md
	vendor/egeloen/google-map-bundle/Ivory/GoogleMapBundle/Resources/doc/usage/controls/pan.md
	vendor/egeloen/google-map-bundle/Ivory/GoogleMapBundle/Resources/doc/usage/controls/rotate.md
	vendor/egeloen/google-map-bundle/Ivory/GoogleMapBundle/Resources/doc/usage/controls/scale.md
	vendor/egeloen/google-map-bundle/Ivory/GoogleMapBundle/Resources/doc/usage/controls/street_view.md
	vendor/egeloen/google-map-bundle/Ivory/GoogleMapBundle/Resources/doc/usage/controls/zoom.md
	vendor/egeloen/google-map-bundle/Ivory/GoogleMapBundle/Resources/doc/usage/events.md
	vendor/egeloen/google-map-bundle/Ivory/GoogleMapBundle/Resources/doc/usage/layers/index.md
	vendor/egeloen/google-map-bundle/Ivory/GoogleMapBundle/Resources/doc/usage/layers/kml_layer.md
	vendor/egeloen/google-map-bundle/Ivory/GoogleMapBundle/Resources/doc/usage/map.md
	vendor/egeloen/google-map-bundle/Ivory/GoogleMapBundle/Resources/doc/usage/overlays/circle.md
	vendor/egeloen/google-map-bundle/Ivory/GoogleMapBundle/Resources/doc/usage/overlays/encoded_polyline.md
	vendor/egeloen/google-map-bundle/Ivory/GoogleMapBundle/Resources/doc/usage/overlays/ground_overlay.md
	vendor/egeloen/google-map-bundle/Ivory/GoogleMapBundle/Resources/doc/usage/overlays/index.md
	vendor/egeloen/google-map-bundle/Ivory/GoogleMapBundle/Resources/doc/usage/overlays/info_window.md
	vendor/egeloen/google-map-bundle/Ivory/GoogleMapBundle/Resources/doc/usage/overlays/marker.md
	vendor/egeloen/google-map-bundle/Ivory/GoogleMapBundle/Resources/doc/usage/overlays/marker_image.md
	vendor/egeloen/google-map-bundle/Ivory/GoogleMapBundle/Resources/doc/usage/overlays/marker_shape.md
	vendor/egeloen/google-map-bundle/Ivory/GoogleMapBundle/Resources/doc/usage/overlays/polygon.md
	vendor/egeloen/google-map-bundle/Ivory/GoogleMapBundle/Resources/doc/usage/overlays/polyline.md
	vendor/egeloen/google-map-bundle/Ivory/GoogleMapBundle/Resources/doc/usage/overlays/rectangle.md
	vendor/egeloen/google-map-bundle/Ivory/GoogleMapBundle/Resources/doc/usage/services/geocoding/geocoder.md
	vendor/egeloen/google-map-bundle/Ivory/GoogleMapBundle/Resources/doc/usage/services/geocoding/geocoder_request.md
	vendor/egeloen/google-map-bundle/Ivory/GoogleMapBundle/Resources/doc/usage/services/geocoding/ivory_geocoder.md
	vendor/egeloen/google-map-bundle/Ivory/GoogleMapBundle/Resources/doc/usage/services/index.md
	vendor/egeloen/google-map-bundle/Ivory/GoogleMapBundle/Tests/Entity/BoundTest.php
	vendor/egeloen/google-map-bundle/Ivory/GoogleMapBundle/Tests/Entity/CircleTest.php
	vendor/egeloen/google-map-bundle/Ivory/GoogleMapBundle/Tests/Entity/CoordinateTest.php
	vendor/egeloen/google-map-bundle/Ivory/GoogleMapBundle/Tests/Entity/EncodedPolylineTest.php
	vendor/egeloen/google-map-bundle/Ivory/GoogleMapBundle/Tests/Entity/EventManagerTest.php
	vendor/egeloen/google-map-bundle/Ivory/GoogleMapBundle/Tests/Entity/EventTest.php
	vendor/egeloen/google-map-bundle/Ivory/GoogleMapBundle/Tests/Entity/InfoWindowTest.php
	vendor/egeloen/google-map-bundle/Ivory/GoogleMapBundle/Tests/Entity/MapTest.php
	vendor/egeloen/google-map-bundle/Ivory/GoogleMapBundle/Tests/Entity/MapTypeControlTest.php
	vendor/egeloen/google-map-bundle/Ivory/GoogleMapBundle/Tests/Entity/MarkerImageTest.php
	vendor/egeloen/google-map-bundle/Ivory/GoogleMapBundle/Tests/Entity/MarkerShapeTest.php
	vendor/egeloen/google-map-bundle/Ivory/GoogleMapBundle/Tests/Entity/MarkerTest.php
	vendor/egeloen/google-map-bundle/Ivory/GoogleMapBundle/Tests/Entity/OverviewMapControlTest.php
	vendor/egeloen/google-map-bundle/Ivory/GoogleMapBundle/Tests/Entity/PanControlTest.php
	vendor/egeloen/google-map-bundle/Ivory/GoogleMapBundle/Tests/Entity/PointTest.php
	vendor/egeloen/google-map-bundle/Ivory/GoogleMapBundle/Tests/Entity/PolygonTest.php
	vendor/egeloen/google-map-bundle/Ivory/GoogleMapBundle/Tests/Entity/PolylineTest.php
	vendor/egeloen/google-map-bundle/Ivory/GoogleMapBundle/Tests/Entity/RectangleTest.php
	vendor/egeloen/google-map-bundle/Ivory/GoogleMapBundle/Tests/Entity/RotateControlTest.php
	vendor/egeloen/google-map-bundle/Ivory/GoogleMapBundle/Tests/Entity/ScaleControlTest.php
	vendor/egeloen/google-map-bundle/Ivory/GoogleMapBundle/Tests/Entity/SizeTest.php
	vendor/egeloen/google-map-bundle/Ivory/GoogleMapBundle/Tests/Entity/StreetViewControlTest.php
	vendor/egeloen/google-map-bundle/Ivory/GoogleMapBundle/Tests/Entity/ZoomControlTest.php
	vendor/egeloen/google-map-bundle/Ivory/GoogleMapBundle/Tests/EventListener/FakeRequestListenerTest.php
	vendor/egeloen/google-map-bundle/Ivory/GoogleMapBundle/Tests/bootstrap.php
	vendor/egeloen/google-map-bundle/Ivory/GoogleMapBundle/Twig/GoogleMapExtension.php
	vendor/egeloen/google-map-bundle/Ivory/GoogleMapBundle/composer.json
	vendor/egeloen/google-map-bundle/Ivory/GoogleMapBundle/phpunit.xml.dist
	vendor/knplabs/knp-components/composer.json
	vendor/knplabs/knp-components/src/Knp/Component/Pager/Event/Subscriber/Paginate/Doctrine/ORM/QuerySubscriber.php
	vendor/knplabs/knp-components/src/Knp/Component/Pager/Event/Subscriber/Paginate/PaginationSubscriber.php
	vendor/knplabs/knp-components/src/Knp/Component/Pager/Event/Subscriber/Sortable/SortableSubscriber.php
	vendor/knplabs/knp-components/src/Knp/Component/Pager/Paginator.php
	vendor/kriswallsmith/assetic
	vendor/sensio/distribution-bundle/Sensio/Bundle/DistributionBundle/Configurator/Step/DoctrineStep.php
	vendor/sensio/distribution-bundle/Sensio/Bundle/DistributionBundle/Configurator/Step/SecretStep.php
	vendor/sensio/distribution-bundle/Sensio/Bundle/DistributionBundle/Configurator/Step/StepInterface.php
	vendor/sensio/distribution-bundle/Sensio/Bundle/DistributionBundle/Resources/config/webconfigurator.xml
	vendor/sensio/distribution-bundle/Sensio/Bundle/DistributionBundle/Resources/skeleton/app/SymfonyRequirements.php
	vendor/sensio/framework-extra-bundle/Sensio/Bundle/FrameworkExtraBundle/Request/ParamConverter/DoctrineParamConverter.php
	vendor/sensio/framework-extra-bundle/Sensio/Bundle/FrameworkExtraBundle/Tests/Request/ParamConverter/DoctrineParamConverterTest.php
	vendor/sensio/framework-extra-bundle/Sensio/Bundle/FrameworkExtraBundle/composer.json
	vendor/twig-extensions/composer.json
	vendor/twig-extensions/lib/Twig/Extensions/Extension/Debug.php
	vendor/twig-extensions/lib/Twig/Extensions/Extension/Intl.php
	vendor/twig-extensions/lib/Twig/Extensions/Extension/Text.php
	web/bundles/myappap/css/main.css
	web/bundles/myappap/js/jquery.ui.timepicker.js