DorraHamdouni/AnalaticaProject — pull request #18 by DorraHamdouni (2014-05-19 19:07:03+00:00)
Title: version beta 1.0.1

# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
# On branch portalsway
# Changes to be committed:
# (use "git reset HEAD ..." to unstage)
#
#	new file: .idea/inspectionProfiles/Project_Default.xml
#	new file: .idea/inspectionProfiles/profiles_settings.xml
#	modified: .idea/vcs.xml
#	modified: .idea/workspace.xml
#	modified: app/AppKernel.php
#	modified: app/Resources/views/base.html.twig
#	modified: app/config/config.yml
#	modified: app/config/routing.yml
#	modified: app/config/security.yml
#	modified: src/Acme/BlogBundle/Entity/Page.php~
#	new file: src/Time/TrackerBundle/Controller/AfficheController.php
#	modified: src/Time/TrackerBundle/Controller/AgentController.php
#	new file: src/Time/TrackerBundle/Controller/DashboardController.php
#	deleted: src/Time/TrackerBundle/Controller/DefaultController.php
#	new file: src/Time/TrackerBundle/Controller/ErreurController.php
#	new file: src/Time/TrackerBundle/Controller/ForfaitContoller.php
#	new file: src/Time/TrackerBundle/Controller/PageController.php
#	modified: src/Time/TrackerBundle/Controller/RecupererController.php
#	new file: src/Time/TrackerBundle/Controller/RegisterController.php
#	deleted: src/Time/TrackerBundle/Controller/UsersController.php
#	modified: src/Time/TrackerBundle/DataFixtures/ORM/LoadUserData.php
#	new file: src/Time/TrackerBundle/Entity/Device.php
#	new file: src/Time/TrackerBundle/Entity/Forfait.php
#	new file: src/Time/TrackerBundle/Entity/ListDevice.php
#	modified: src/Time/TrackerBundle/Entity/ListNavigateur.php
#	modified: src/Time/TrackerBundle/Entity/ListNavigateur.php~
#	modified: src/Time/TrackerBundle/Entity/ListOS.php
#	modified: src/Time/TrackerBundle/Entity/ListOS.php~
#	new file: src/Time/TrackerBundle/Entity/Logo.php
#	modified: src/Time/TrackerBundle/Entity/Navigateur.php
#	modified: src/Time/TrackerBundle/Entity/Navigateur.php~
#	modified: src/Time/TrackerBundle/Entity/OS.php
#	modified: src/Time/TrackerBundle/Entity/OS.php~
#	deleted: src/Time/TrackerBundle/Entity/Photo.php
#	modified: src/Time/TrackerBundle/Entity/Photo.php~
#	modified: src/Time/TrackerBundle/Entity/Regex.php
#	modified: src/Time/TrackerBundle/Entity/Regex.php~
#	modified: src/Time/TrackerBundle/Entity/RegexBrowsers.php~
#	new file: src/Time/TrackerBundle/Entity/RegexMobile.php
#	deleted: src/Time/TrackerBundle/Entity/Session.php
#	modified: src/Time/TrackerBundle/Entity/Session.php~
#	deleted: src/Time/TrackerBundle/Entity/Task.php
#	deleted: src/Time/TrackerBundle/Entity/Token.php
#	deleted: src/Time/TrackerBundle/Entity/Tracker.php
#	modified: src/Time/TrackerBundle/Entity/Tracker.php~
#	modified: src/Time/TrackerBundle/Entity/User.php
#	modified: src/Time/TrackerBundle/Entity/User.php~
#	modified: src/Time/TrackerBundle/Entity/UserAgent.php
#	modified: src/Time/TrackerBundle/Entity/UserAgent.php~
#	new file: src/Time/TrackerBundle/Form/EditFormType.php
#	new file: src/Time/TrackerBundle/Form/RegistrationFormType.php
#	modified: src/Time/TrackerBundle/Form/UserType.php
#	modified: src/Time/TrackerBundle/Resources/config/routes.yml
#	modified: src/Time/TrackerBundle/Resources/config/services.xml
#	new file: src/Time/TrackerBundle/Resources/config/services.yml
#	new file: src/Time/TrackerBundle/Resources/public/Highcharts/adapters/mootools-adapter.js
#	new file: src/Time/TrackerBundle/Resources/public/Highcharts/adapters/mootools-adapter.src.js
#	new file: src/Time/TrackerBundle/Resources/public/Highcharts/adapters/prototype-adapter.js
#	new file: src/Time/TrackerBundle/Resources/public/Highcharts/adapters/prototype-adapter.src.js
#	new file: src/Time/TrackerBundle/Resources/public/Highcharts/adapters/standalone-framework.js
#	new file: src/Time/TrackerBundle/Resources/public/Highcharts/adapters/standalone-framework.src.js
#	new file: src/Time/TrackerBundle/Resources/public/Highcharts/highcharts-all.js
#	new file: src/Time/TrackerBundle/Resources/public/Highcharts/highcharts-more.js
#	new file: src/Time/TrackerBundle/Resources/public/Highcharts/highcharts-more.src.js
#	new file: src/Time/TrackerBundle/Resources/public/Highcharts/highcharts.js
#	new file: src/Time/TrackerBundle/Resources/public/Highcharts/highcharts.src.js
#	new file: src/Time/TrackerBundle/Resources/public/Highcharts/modules/canvas-tools.js
#	new file: src/Time/TrackerBundle/Resources/public/Highcharts/modules/canvas-tools.src.js
#	new file: src/Time/TrackerBundle/Resources/public/Highcharts/modules/data.js
#	new file: src/Time/TrackerBundle/Resources/public/Highcharts/modules/data.src.js
#	new file: src/Time/TrackerBundle/Resources/public/Highcharts/modules/drilldown.js
#	new file: src/Time/TrackerBundle/Resources/public/Highcharts/modules/drilldown.src.js
#	new file: src/Time/TrackerBundle/Resources/public/Highcharts/modules/exporting.js
#	new file: src/Time/TrackerBundle/Resources/public/Highcharts/modules/exporting.src.js
#	new file: src/Time/TrackerBundle/Resources/public/Highcharts/modules/funnel.js
#	new file: src/Time/TrackerBundle/Resources/public/Highcharts/modules/funnel.src.js
#	new file: src/Time/TrackerBundle/Resources/public/Highcharts/modules/no-data-to-display.js
#	new file: src/Time/TrackerBundle/Resources/public/Highcharts/modules/no-data-to-display.src.js
#	new file: src/Time/TrackerBundle/Resources/public/Highcharts/themes/dark-blue.js
#	new file: src/Time/TrackerBundle/Resources/public/Highcharts/themes/dark-green.js
#	new file: src/Time/TrackerBundle/Resources/public/Highcharts/themes/gray.js
#	new file: src/Time/TrackerBundle/Resources/public/Highcharts/themes/grid.js
#	new file: src/Time/TrackerBundle/Resources/public/Highcharts/themes/skies.js
#	new file: src/Time/TrackerBundle/Resources/public/image/COUVMETIERSECTEURSTERRITOIRESBD.jpg
#	new file: src/Time/TrackerBundle/Resources/public/image/OneWebsiteForAllDevices1.jpg
#	new file: src/Time/TrackerBundle/Resources/public/image/calendar-template.jpg
#	new file: src/Time/TrackerBundle/Resources/public/image/content-bg.jpg
#	new file: src/Time/TrackerBundle/Resources/public/image/devices.png
#	new file: src/Time/TrackerBundle/Resources/public/image/download (1).jpg
#	new file: src/Time/TrackerBundle/Resources/public/image/header-bg.jpg
#	new file: src/Time/TrackerBundle/Resources/public/image/images (1).jpg
#	new file: src/Time/TrackerBundle/Resources/public/image/images (2).jpg
#	new file: src/Time/TrackerBundle/Resources/public/image/images (3).jpg
#	new file: src/Time/TrackerBundle/Resources/public/image/images (4).jpg
#	new file: src/Time/TrackerBundle/Resources/public/image/images (5).jpg
#	new file: src/Time/TrackerBundle/Resources/public/image/images (6).jpg
#	new file: src/Time/TrackerBundle/Resources/public/image/images (7).jpg
#	new file: src/Time/TrackerBundle/Resources/public/image/images.jpg
#	new file: src/Time/TrackerBundle/Resources/public/image/main.jpg
#	new file: src/Time/TrackerBundle/Resources/public/image/nav-bg.jpg
#	new file: src/Time/TrackerBundle/Resources/public/image/nav-ul.png
#	new file: src/Time/TrackerBundle/Resources/public/image/page4-img4.jpg
#	new file: src/Time/TrackerBundle/Resources/public/image/serenovia_statistique2.jpg
#	new file: src/Time/TrackerBundle/Resources/public/image/slider-4.jpg
#	new file: src/Time/TrackerBundle/Resources/public/image/statistique-immobilier.png
#	new file: src/Time/TrackerBundle/Resources/public/image/statistique.jpg
#	new file: src/Time/TrackerBundle/Resources/public/image/world-map.jpg
#	new file: src/Time/TrackerBundle/Resources/views/Agent/device.html.twig
#	new file: src/Time/TrackerBundle/Resources/views/Agent/forfait.html.twig
#	deleted: src/Time/TrackerBundle/Resources/views/Agent/home.html.twig
#	new file: src/Time/TrackerBundle/Resources/views/Agent/ip.html.twig
#	new file: src/Time/TrackerBundle/Resources/views/Agent/navigateur.html.twig
#	new file: src/Time/TrackerBundle/Resources/views/Agent/os.html.twig
#	new file: src/Time/TrackerBundle/Resources/views/Agent/useragent.html.twig
#	modified: src/Time/TrackerBundle/Resources/views/ChangePassword/changePassword.html.twig
#	modified: src/Time/TrackerBundle/Resources/views/ChangePassword/changePassword_content.html.twig
#	new file: src/Time/TrackerBundle/Resources/views/Dashboard/dashboard.html.twig
#	deleted: src/Time/TrackerBundle/Resources/views/Default/index.html.twig
#	new file: src/Time/TrackerBundle/Resources/views/Erreur/erreur.html.twig
#	new file: src/Time/TrackerBundle/Resources/views/FirstPage/home.html.twig
#	modified: src/Time/TrackerBundle/Resources/views/Profile/edit_content.html.twig
#	modified: src/Time/TrackerBundle/Resources/views/Profile/show_content.html.twig
#	modified: src/Time/TrackerBundle/Resources/views/Registration/register.html.twig
#	modified: src/Time/TrackerBundle/Resources/views/Registration/register_content.html.twig
#	modified: src/Time/TrackerBundle/Resources/views/Security/login.html.twig
#	modified: src/Time/TrackerBundle/Resources/views/User/edit.html.twig
#	new file: src/Time/TrackerBundle/Twig/Extension/AssetExtension.php
#	new file: src/Time/TrackerBundle/index.php
#