# HG changeset patch # User ymh # Date 1317852210 -7200 # Node ID 7ee9260b8c0e6581fa0a12f010e7950f032ce6b0 # Parent d8cb31543a3fcf92249befcc4f38814f81b92670 addd subrepository + new bundle diff -r d8cb31543a3f -r 7ee9260b8c0e .hgsub --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/.hgsub Thu Oct 06 00:03:30 2011 +0200 @@ -0,0 +1,1 @@ +vendor/bundles/IRI/Bundle/WikiTagBundle=https://www.iri.centrepompidou.fr/dev/hg/wikitag \ No newline at end of file diff -r d8cb31543a3f -r 7ee9260b8c0e app/AppKernel.php --- a/app/AppKernel.php Tue Oct 04 10:12:08 2011 +0200 +++ b/app/AppKernel.php Thu Oct 06 00:03:30 2011 +0200 @@ -20,6 +20,7 @@ new Company\BaseBundle\CompanyBaseBundle(), new FOS\UserBundle\FOSUserBundle(), new Company\UserBundle\CompanyUserBundle(), + new IRI\Bundle\WikiTagBundle\WikiTagBundle(), ); if (in_array($this->getEnvironment(), array('dev', 'test'))) { diff -r d8cb31543a3f -r 7ee9260b8c0e app/config/routing.yml --- a/app/config/routing.yml Tue Oct 04 10:12:08 2011 +0200 +++ b/app/config/routing.yml Thu Oct 06 00:03:30 2011 +0200 @@ -1,3 +1,7 @@ +WikiTagBundle: + resource: "@WikiTagBundle/Resources/config/routing.yml" + prefix: / + CompanyUserBundle: resource: "@CompanyUserBundle/Resources/config/routing.yml"