Merge branch 'master' of github.com:protalk/protalk

Conflicts:
	app/config/parameters.ini

.gitignore

@@ -1,6 +1,6 @@
 /app/cache/*
 /app/logs/*
-/app/config/parameters.ini
+/app/config/parameters.yml
 .idea
 .vagrant
 /vendor/

C:\base6-console.log

@@ -0,0 +1,4 @@
+e1000: eth1 NIC Link is Down
+e1000: eth0 NIC Link is Down
+e1000: eth1 NIC Link is Up 1000 Mbps Full Duplex, Flow Control: RX
+e1000: eth0 NIC Link is Up 1000 Mbps Full Duplex, Flow Control: RX

README.md

@@ -99,13 +99,13 @@ The following command is a housekeeping action which you shouldn't need to worry
 
 If you would like to know more about how this was set up, [read Joshua's informative blog post](http://www.adayinthelifeof.nl/2012/06/29/using-vagrant-and-puppet-to-setup-your-symfony2-environment/).
 
-###<a id="manual"></a>Manual Installation
+###Manual Installation
 
 1. Fork the protalk repository
 2. Use git clone to get your fork on your local machine
-3. Run the "bin/vendors install" command in the root directory of your installation
+3. Run `php composer.phar install` in the root directory of your installation
 4. Make sure the app/cache and app/logs directories are writable by the webserver
-5. Create the database and change the parameters.ini in app/config to set the database connection details
+5. Create the database and change the parameters.yml in app/config to set the database connection details
 6. Run the command "app/console doctrine:schema:create" to create the database tables
 7. Import the doc/db/seed_data.sql in your database for initial data
 8. Creating a admin user for the backend can be done by running this command: "app/console fos:user:create admin admin@example.com password --super-admin

app/AppKernel.php

@@ -13,26 +13,32 @@ public function registerBundles()
             new Symfony\Bundle\TwigBundle\TwigBundle(),
             new Symfony\Bundle\MonologBundle\MonologBundle(),
             new Symfony\Bundle\SwiftmailerBundle\SwiftmailerBundle(),
-            new Symfony\Bundle\DoctrineBundle\DoctrineBundle(),
             new Symfony\Bundle\AsseticBundle\AsseticBundle(),
+            new Doctrine\Bundle\DoctrineBundle\DoctrineBundle(),
             new Sensio\Bundle\FrameworkExtraBundle\SensioFrameworkExtraBundle(),
+            new JMS\AopBundle\JMSAopBundle(),
+            new JMS\DiExtraBundle\JMSDiExtraBundle($this),
             new JMS\SecurityExtraBundle\JMSSecurityExtraBundle(),
-            new Protalk\PageBundle\ProtalkPageBundle(),
-            new Protalk\MediaBundle\ProtalkMediaBundle(),
+
             new Sonata\AdminBundle\SonataAdminBundle(),
             new Sonata\BlockBundle\SonataBlockBundle(),
             new Sonata\CacheBundle\SonataCacheBundle(),
             new Sonata\jQueryBundle\SonatajQueryBundle(),
-            new Knp\Bundle\MenuBundle\KnpMenuBundle(),
             new Sonata\DoctrineORMAdminBundle\SonataDoctrineORMAdminBundle(),
-            new Protalk\AdminBundle\ProtalkAdminBundle(),
             new Sonata\EasyExtendsBundle\SonataEasyExtendsBundle(),
-            new FOS\UserBundle\FOSUserBundle(),
             new Sonata\UserBundle\SonataUserBundle('FOSUserBundle'),
+            new Sonata\NotificationBundle\SonataNotificationBundle(),
             new Application\Sonata\UserBundle\ApplicationSonataUserBundle(),
+
+            new Knp\Bundle\MenuBundle\KnpMenuBundle(),
+            new FOS\UserBundle\FOSUserBundle(),
             new EWZ\Bundle\RecaptchaBundle\EWZRecaptchaBundle(),
             new SamJ\DoctrineSluggableBundle\SamJDoctrineSluggableBundle(),
-            new Sonata\NotificationBundle\SonataNotificationBundle(),
+
+            new Protalk\PageBundle\ProtalkPageBundle(),
+            new Protalk\MediaBundle\ProtalkMediaBundle(),
+            new Protalk\AdminBundle\ProtalkAdminBundle(),
+
         );
 
         if (in_array($this->getEnvironment(), array('dev', 'test'))) {