Commit Graph

4430 Commits

Author SHA1 Message Date
Fabien Potencier
dd150fc478 Merge remote branch 'vicb/twig_warmer'
* vicb/twig_warmer:
  [TwigBundle] Update the cache warmer
2011-04-04 18:52:56 +02:00
Fabien Potencier
fe43e1b759 Merge remote branch 'lsmith77/default_namespace2'
* lsmith77/default_namespace2:
  added default implementation for getNamespace()
2011-04-04 18:46:30 +02:00
Fabien Potencier
dbfe73bef4 Merge remote branch 'vicb/gitkeep'
* vicb/gitkeep:
  [FrameworkBundle] Delete .gitkeep files
2011-04-04 18:45:25 +02:00
Fabien Potencier
ae2629ce30 merged vicb/profiler_verbose 2011-04-04 18:43:33 +02:00
Fabien Potencier
60dd810e3f [DoctrineBundle] fixed unit tests 2011-04-04 18:35:29 +02:00
Fabien Potencier
b1e0403c96 Merge remote branch 'francisbesset/doctrine_orm_custom_hydrator'
* francisbesset/doctrine_orm_custom_hydrator:
  [DoctrineBundle] Added tests for add custom hydration mode
  Updated XSD schema
  Moved hydrators configuration in entity manager
  [DoctrineBundle] Added custom hydrator for the EntityManager from configuration
2011-04-04 18:31:55 +02:00
Victor Berchet
852d5c37df [FrameworkBundle] Delete .gitkeep files 2011-04-04 17:40:18 +02:00
hidenorigoto
30e7eae4a9 updated UPDATE.ja file 2011-04-05 00:32:09 +09:00
Bernhard Schussek
bfa3c71140 [Form] Added Bundle suffixes again 2011-04-04 15:33:21 +02:00
Bernhard Schussek
0cf8cc762a Merge remote branch 'symfony/master' into experimental
Conflicts:
	src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/money_field.html.php
	src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/percent_field.html.php
2011-04-04 15:16:08 +02:00
Fabien Potencier
9fe9d80371 [MonologBundle] fixed typo 2011-04-04 14:56:42 +02:00
Fabien Potencier
7be61bd72a updated UPDATE file 2011-04-04 12:45:31 +02:00
Fabien Potencier
117b6997b4 [WebProfilerBundle] removed redundant info 2011-04-04 12:45:25 +02:00
Fabien Potencier
5bd2b53cb8 [ZendBundle] removed the bundle 2011-04-04 12:41:27 +02:00
Fabien Potencier
01ee1bfed1 merged stof/monolog 2011-04-04 12:29:15 +02:00
Fabien Potencier
f4276a88f6 Merge remote branch 'schmittjoh/parameterCleanup'
* schmittjoh/parameterCleanup:
  [SecurityBundle] inline parameters which are only used in one place
  [SecurityBundle] moved all non-class parameters to the Configuration file
2011-04-04 11:57:31 +02:00
Fabien Potencier
1cb03b1448 [FrameworkBundle] removed templating.loader.cache.path parameter 2011-04-04 11:56:41 +02:00
Fabien Potencier
1fd44ea736 Merge remote branch 'vicb/cache_template'
* vicb/cache_template:
  [FrameworkBundle] Fix the cache template loader
2011-04-04 11:49:13 +02:00
Fabien Potencier
7ff4e54748 updated UPDATE 2011-04-04 11:44:58 +02:00
Fabien Potencier
49a7f525b9 Revert "[FrameworkBundle] Updated the files generated by init:bundle to use the new bundle logical names"
This reverts commit d0e2b5b611.
2011-04-04 11:42:52 +02:00
Victor Berchet
5317c96fef Update for Bundle names long again (= include the 'Bundle' suffix) 2011-04-04 11:39:41 +02:00
Fabien Potencier
a60a9af53f updated UPDATE 2011-04-04 11:36:28 +02:00
Victor Berchet
7ed18bf829 [Kernel] Make locateResource() throws an exception when a resource from a Bundle hides a custom resource 2011-04-04 11:24:51 +02:00
Victor Berchet
3cd3dd39ba [Kernel] Make resources overriding consistent across bundle directories and resource directories 2011-04-04 11:24:51 +02:00
Victor Berchet
d0b6ed2bb6 [Kernel] Improve test semantic 2011-04-04 11:24:51 +02:00
Victor Berchet
3e64106aae [Kernel] Update tests with shorter bundle names 2011-04-04 11:24:51 +02:00
Victor Berchet
dcd727c092 [Kernel] Restore the tests for the locateResource method 2011-04-04 11:24:51 +02:00
Victor Berchet
8b7c857ef3 Resource paths should use the full bundle name (with the 'Bundle' postfix) 2011-04-04 11:24:51 +02:00
Fabien Potencier
f232b3cdda reverted Merge remote branch 'kriswallsmith/kernel/shorter-bundle-names' 2011-04-04 11:10:56 +02:00
Fabien Potencier
743592d81e Revert "fixed remaining Bundle suffixes"
This reverts commit 315147c6c8.
2011-04-04 11:08:56 +02:00
Fabien Potencier
c80ade9dc7 Revert "[DoctrineBundle] updated tests with shorter bundle names"
This reverts commit 082fd73b3c.
2011-04-04 11:08:50 +02:00
Fabien Potencier
c1715ef376 Revert "[DoctrineMongoDBBundle] updated tests with shorter bundle names"
This reverts commit 751ba4db5e.
2011-04-04 11:08:43 +02:00
Fabien Potencier
6a5356290a Revert "[HttpKernel] updated tests for shorter bundle names"
This reverts commit fb7e87da7d.
2011-04-04 11:08:37 +02:00
Fabien Potencier
6c2954a2d5 Revert "[FrameworkBundle] fixed shorter bundle name in test"
This reverts commit d1f3852868.
2011-04-04 11:08:30 +02:00
Fabien Potencier
b442f58f02 Merge remote branch 'FabienPennequin/assetic_update.md'
* FabienPennequin/assetic_update.md:
  Updated file UPDATE.md for assetic filters
2011-04-04 11:02:07 +02:00
Fabien Potencier
06c1e02bed Merge remote branch 'Seldaek/serializer'
* Seldaek/serializer:
  [Serializer] Some more privates
  [Serializer] Move private methods below protected ones
  [Serializer] Added @api annotations
  [Serializer] Added docblocks for NormalizableInterface
  [Serializer] add methods to the SerializerInterface
  [Serializer] Added docblock
  [Serializer] Switched most protected to private or final
2011-04-04 11:01:41 +02:00
Fabien Potencier
9b16287bcd Merge remote branch 'Seldaek/ajax_redir'
* Seldaek/ajax_redir:
  [WebProfilerBundle] Prevent redirects to be intercepted in XHRs
2011-04-04 11:01:12 +02:00
Eriksen Costa
bc52107d07 [Locale] fixed method signature, removed default value for the $locale arg 2011-04-03 22:57:50 -03:00
Francis Besset
d9b3643d47 [DoctrineBundle] Added tests for add custom hydration mode 2011-04-04 00:07:23 +02:00
Fabien Potencier
514133a6bb [Console] made ApplicationTester::getDisplay() work even in case of an error during execution and changed returned value of ApplicationTester to the command exit code 2011-04-03 23:46:08 +02:00
Fabien Potencier
dd158a2c99 [Console] made CommandTester::getDispaly() work even in case of an error during execution 2011-04-03 23:25:59 +02:00
Francis Besset
97729e6c61 Updated XSD schema 2011-04-03 23:08:56 +02:00
Francis Besset
9b093d53ae Moved hydrators configuration in entity manager 2011-04-03 23:08:18 +02:00
Francis Besset
daa138ffc8 [DoctrineBundle] Added custom hydrator for the EntityManager from configuration 2011-04-03 22:39:35 +02:00
Fabien Potencier
ad4a0bda1c [Console] changed returned value of CommandTester to the command exit code 2011-04-03 22:30:40 +02:00
Fabien Potencier
91a2f36850 [DomCrawler] fixed typo in phpdoc 2011-04-03 22:23:52 +02:00
Jordi Boggiano
21b3ee6783 [WebProfilerBundle] Prevent redirects to be intercepted in XHRs 2011-04-03 21:21:23 +02:00
Jordi Boggiano
a16f1865b5 [WebProfilerBundle] Display errors logged by monolog properly in logger panel 2011-04-03 16:36:04 +02:00
Jordi Boggiano
7132f81d14 [Serializer] Some more privates 2011-04-03 16:24:25 +02:00
Jordi Boggiano
47733d08a1 [Serializer] Move private methods below protected ones 2011-04-03 16:21:53 +02:00