From e0073c11739cc791e0b34bf8a3e759ffd422d491 Mon Sep 17 00:00:00 2001 From: Marc Juchli Date: Sun, 8 Jul 2012 22:29:29 +0200 Subject: [PATCH 1/3] Use DoctrineFixturesBundle version 2.0 --- deps | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/deps b/deps index ae4d9bb..74fea02 100644 --- a/deps +++ b/deps @@ -75,5 +75,6 @@ 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 From 0321d64aa4fbfcf2126030546010e849ccc232a1 Mon Sep 17 00:00:00 2001 From: Marc Juchli Date: Sun, 8 Jul 2012 23:57:17 +0200 Subject: [PATCH 2/3] added newline --- deps | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/deps b/deps index 74fea02..8da62a4 100644 --- a/deps +++ b/deps @@ -77,4 +77,5 @@ [DoctrineFixturesBundle] git=http://github.com/doctrine/DoctrineFixturesBundle.git target=/bundles/Symfony/Bundle/DoctrineFixturesBundle - version=origin/2.0 \ No newline at end of file + version=origin/2.0 + \ No newline at end of file From 82d811e9a83a2562d21eb6bdca3ec7d6eed7aad4 Mon Sep 17 00:00:00 2001 From: Marc Juchli Date: Fri, 27 Jul 2012 22:15:48 +0200 Subject: [PATCH 3/3] configs --- .project | 11 +++++++++++ .settings/org.eclipse.core.resources.prefs | 2 ++ app/autoload.php | 1 + app/config/config.yml | 4 +++- app/config/routing.yml | 3 ++- deps | 1 + web/app_dev.php | 4 ++-- 7 files changed, 22 insertions(+), 4 deletions(-) create mode 100644 .project create mode 100644 .settings/org.eclipse.core.resources.prefs 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 8da62a4..f7d5f56 100644 --- a/deps +++ b/deps @@ -78,4 +78,5 @@ 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';