diff --git a/.project b/.project
new file mode 100644
index 0000000..442a306
--- /dev/null
+++ b/.project
@@ -0,0 +1,11 @@
+
+
+ nmn
+
+
+
+
+
+
+
+
diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..99f26c0
--- /dev/null
+++ b/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/=UTF-8
diff --git a/app/autoload.php b/app/autoload.php
index 63e90fb..2589dd8 100644
--- a/app/autoload.php
+++ b/app/autoload.php
@@ -17,6 +17,7 @@
'FOS' => __DIR__.'/../vendor/bundles',
'Doctrine\\Common\\DataFixtures' => __DIR__.'/../vendor/doctrine-fixtures/lib',
'Nmn' => __DIR__.'/../vendor/bundles',
+
));
$loader->registerPrefixes(array(
'Twig_Extensions_' => __DIR__.'/../vendor/twig-extensions/lib',
diff --git a/app/config/config.yml b/app/config/config.yml
index fc38ef0..5da159e 100644
--- a/app/config/config.yml
+++ b/app/config/config.yml
@@ -52,10 +52,12 @@ doctrine:
# Swiftmailer Configuration
swiftmailer:
transport: %mailer_transport%
- host: %mailer_host%
+ #host: %mailer_host%
+ host: mail.codag.net
username: %mailer_user%
password: %mailer_password%
jms_security_extra:
secure_controllers: true
secure_all_services: false
+
diff --git a/app/config/routing.yml b/app/config/routing.yml
index 41234bf..597ecb1 100644
--- a/app/config/routing.yml
+++ b/app/config/routing.yml
@@ -1,3 +1,4 @@
AcmeUserBundle:
resource: "@AcmeUserBundle/Resources/config/routing.yml"
- prefix: /
\ No newline at end of file
+ prefix: /
+
\ No newline at end of file
diff --git a/deps b/deps
index ae4d9bb..f7d5f56 100644
--- a/deps
+++ b/deps
@@ -75,5 +75,8 @@
git=http://github.com/doctrine/data-fixtures.git
[DoctrineFixturesBundle]
- git=http://github.com/symfony/DoctrineFixturesBundle.git
- target=/bundles/Symfony/Bundle/DoctrineFixturesBundle
\ No newline at end of file
+ git=http://github.com/doctrine/DoctrineFixturesBundle.git
+ target=/bundles/Symfony/Bundle/DoctrineFixturesBundle
+ version=origin/2.0
+
+
\ No newline at end of file
diff --git a/web/app_dev.php b/web/app_dev.php
index 48b9afd..a363efd 100644
--- a/web/app_dev.php
+++ b/web/app_dev.php
@@ -6,7 +6,7 @@
// this check prevents access to debug front controllers that are deployed by accident to production servers.
// feel free to remove this, extend it, or make something more sophisticated.
-if (isset($_SERVER['HTTP_CLIENT_IP'])
+/*if (isset($_SERVER['HTTP_CLIENT_IP'])
|| isset($_SERVER['HTTP_X_FORWARDED_FOR'])
|| !in_array(@$_SERVER['REMOTE_ADDR'], array(
'127.0.0.1',
@@ -15,7 +15,7 @@
) {
header('HTTP/1.0 403 Forbidden');
exit('You are not allowed to access this file. Check '.basename(__FILE__).' for more information.');
-}
+}*/
require_once __DIR__.'/../app/bootstrap.php.cache';
require_once __DIR__.'/../app/AppKernel.php';