diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,419 Commits 24 Branches 563 Tags 228 MiB
daa138ffc8
Commit Graph

3144 Commits

Author SHA1 Message Date
Kris Wallsmith
a8ffa909ad [HttpKernel] updated component to work with shorter bundle names 2011-03-27 06:25:13 -07:00
Kris Wallsmith
dd9ad97a0c [HttpKernel] updated Bundle::getName() to validate bundle class name and rtrim "Bundle" 2011-03-27 05:31:57 -07:00
Ryan Weaver
80c102761c [HttpKernel] Making the "no response returned from controller" more explanatory when it's possible that the user forgot a return statement in his/her controller 
Also made "null" show up as null in the exception message, instead of as a blank string (slightly more expressive).
 2011-03-26 14:35:55 -05:00
Fabien Potencier
6fe8884ad8 [WebProfilerBundle] fixed WDT (please test before sending a PR -- I'm wasting my time) 2011-03-26 17:14:02 +01:00
Fabien Potencier
7a3185c856 [WebProfilerBundle] fixed tests 2011-03-26 17:04:10 +01:00
Fabien Potencier
9ce85bed6c Merge remote branch 'Herzult/updateWDT' 
* Herzult/updateWDT:
  [WebProfilerBundle] Use a template for the redirection interceptions
  [WebProfilerBundle] Add some tests for the listener
 2011-03-26 17:00:30 +01:00
Antoine Hérault
7049810729 [WebProfilerBundle] Use a template for the redirection interceptions 2011-03-26 16:43:53 +01:00
Antoine Hérault
237d7fd327 [WebProfilerBundle] Add some tests for the listener 2011-03-26 16:43:16 +01:00
Ryan Weaver
6799090a4f [SwiftmailerBundle] Allow for the Swift_NullTransport to be chosen in the Configuration class 2011-03-26 10:20:36 -05:00
Johannes M. Schmitt
7887f04dc2 removed Assert prefix from all constraints, renamed annotation namespace to assert 2011-03-26 15:26:05 +01:00
Ryan Weaver
1910e23df8 [FrameworkBundle] Adding a title tag to make the default error page just a little bit longer so that chrome displays it 
The background is that Chrome only displays the content returned on an error page if payload is at least 512 bytes.
Prior to this change, the 404 page was just a few bytes short, resulting in the Chrome error message instead of the
real one returned by Symfony (confusing for the user).
 2011-03-26 07:36:03 -05:00
Fabien Potencier
bfd57c5cf0 [HttpKernel] fixed typo 2011-03-26 12:54:13 +01:00
Fabien Potencier
7bda949e41 Merge remote branch 'schmittjoh/security' 
* schmittjoh/security:
  changed condition nesting
  [Security] ACL: AclVoter::vote only gets an ObjectIdentity if $object is not an instance of ObjectIdentityInterface
  [SecurityBundle] fixed missing argument EventDisplatcher in RememberMe service
 2011-03-26 10:44:37 +01:00
Fabien Potencier
4de468e181 [Routing] makes the parameters argument of generate() optional 2011-03-26 09:54:44 +01:00
Johannes Schmitt
031bf35bb1 changed condition nesting 2011-03-26 09:06:03 +01:00
Fabien Potencier
cc46e8d46a moved the Filesystem class form FrameworBundle to HttpKernel (refactored it slightly) 2011-03-26 08:37:25 +01:00
Fabien Potencier
124f1d8e44 moved the Filesystem class form FrameworBundle to HttpKernel (refactored it slightly) 2011-03-26 08:37:10 +01:00
Fabien Potencier
1a6f138fe8 [FrameworkBundle] simplified code 2011-03-26 08:22:29 +01:00
Fabien Potencier
3553ed89d4 Merge remote branch 'stealth35/use_filesystemiterator' 
* stealth35/use_filesystemiterator:
  simplify folders deletion
  work with Traversable
  added FilesystemIterator namespace
  tab to spaces
  use FilesytemIterator insteed opendir
 2011-03-26 08:20:44 +01:00
Fabien Potencier
d9af9890a3 Merge remote branch 'umpirsky/master' 
* umpirsky/master:
  Fixed Russian translation according to suggestions on be63154655 (commitcomment-312900).
 2011-03-26 08:17:23 +01:00
Johannes Schmitt
1282a595f2 Merge branch 'remember_me_dispatcher' of https://github.com/patashnik/symfony into security 2011-03-26 01:26:20 +01:00
Johannes Schmitt
db2089de0d Merge branch 'acl-fix' of https://github.com/comfortablynumb/symfony into security 2011-03-26 01:11:11 +01:00
umpirsky
37d7c400ce Fixed Russian translation according to suggestions on be63154655 (commitcomment-312900). 2011-03-25 10:56:41 -07:00
stealth35
41bdfe25c0 simplify folders deletion 2011-03-25 17:51:47 +01:00
stealth35
566320d1a9 work with Traversable 2011-03-25 15:58:27 +01:00
Fabien Potencier
8d84fdfedc [Finder] added Finder::append() method to be able to combine several Finder instances into one 2011-03-25 15:50:47 +01:00
stealth35
280eca4af4 added FilesystemIterator namespace 2011-03-25 15:28:14 +01:00
Fabien Potencier
2d27b13338 Merge remote branch 'bschussek/validator' 
* bschussek/validator:
  [Form] Fixed validation.xml (now really)
 2011-03-25 14:57:16 +01:00
Fabien Potencier
a2fcd0cf6b Merge remote branch 'stealth35/removed_alias' 
* stealth35/removed_alias:
  sanitize die (exit)
 2011-03-25 14:54:18 +01:00
Fabien Potencier
3a46ed58b3 Merge remote branch 'stealth35/use_splfileinfo' 
* stealth35/use_splfileinfo:
  tab to spaces
  use SplFileInfo insteed fgetcsv
 2011-03-25 14:50:19 +01:00
Kris Wallsmith
2e1924ec1c [AsseticBundle] updated for Assetic changes 2011-03-25 06:14:20 -07:00
stealth35
dedf9b4fc0 tab to spaces 2011-03-25 13:38:09 +01:00
stealth35
4d62fd5e6c tab to spaces 2011-03-25 13:35:59 +01:00
stealth35
58cd03cedf use SplFileInfo insteed fgetcsv 2011-03-25 11:51:32 +01:00
stealth35
bdaee9dd09 use FilesytemIterator insteed opendir 2011-03-25 11:38:24 +01:00
stealth35
cee94be277 sanitize die (exit) 2011-03-25 11:26:43 +01:00
Bernhard Schussek
4f360109ed [Form] Fixed validation.xml (now really) 2011-03-25 10:41:18 +01:00
Fabien Potencier
0e57943531 [HttpKernel] fixed typo 2011-03-25 07:19:02 +01:00
Fabien Potencier
043988f670 Merge remote branch 'aurelijus/wrong_arguments_for_exception' 
* aurelijus/wrong_arguments_for_exception:
  removed 0
  Updated arguments for MethodNotAllowedHttpException
 2011-03-25 06:59:44 +01:00
Fabien Potencier
6051577b7e Merge remote branch 'kriswallsmith/framework/asset-packages-fix' 
* kriswallsmith/framework/asset-packages-fix:
  [FrameworkBundle] fixed build of config for asset packages
 2011-03-25 06:57:53 +01:00
Fabien Potencier
e5a5c63050 Merge remote branch 'bschussek/rename-execute' 
* bschussek/rename-execute:
  [Form] Fixed validation.xml
  [Validator] Added support for static callbacks to Callback constraint
  [Validator] Renamed Execute constraint to Callback
 2011-03-25 06:57:17 +01:00
Gustavo Adrian
bedbe51081 [Security] ACL: AclVoter::vote only gets an ObjectIdentity if $object is not an instance of ObjectIdentityInterface 2011-03-24 21:54:21 -03:00
Bernhard Schussek
71230a094b [Form] Fixed validation.xml 2011-03-25 01:46:05 +01:00
Bernhard Schussek
3e29348d21 [Validator] Added support for static callbacks to Callback constraint 2011-03-25 01:36:58 +01:00
Bernhard Schussek
9c6a6e13bf [Validator] Renamed Execute constraint to Callback 2011-03-25 01:34:35 +01:00
Antoine Hérault
614cf4c7b0 Remove kernel from the web debug toolbar 2011-03-25 00:15:19 +01:00
Kris Wallsmith
2f8d5cd1c0 [FrameworkBundle] fixed build of config for asset packages 2011-03-24 15:18:50 -07:00
Aurelijus
e2492a4879 removed 0 2011-03-24 16:21:55 +02:00
Aurelijus
8f3b3a760d Updated arguments for MethodNotAllowedHttpException 2011-03-24 16:17:34 +02:00
Fabien Potencier
e232218eed [Console] fixed PHP notice 2011-03-24 13:30:27 +01:00
Alexey Popkov
7423f0bf50 [SecurityBundle] fixed missing argument EventDisplatcher in RememberMe service 2011-03-24 14:00:16 +03:00
Fabien Potencier
0f231c33e5 [EventDispatcher] tagged the guaranteed BC API 2011-03-24 10:06:26 +01:00
Fabien Potencier
c60ee9fef1 [Finder] tagged the guaranteed BC API 2011-03-24 10:05:16 +01:00
Fabien Potencier
faf72269dd Merge remote branch 'aurelijus/filefield_original_name' 
* aurelijus/filefield_original_name:
  get originalName before move call
 2011-03-24 10:01:03 +01:00
Fabien Potencier
f5ab021386 Merge remote branch 'aurelijus/clear_name_for_goto' 
* aurelijus/clear_name_for_goto:
  removes unwanted characters from goto name
 2011-03-24 10:00:31 +01:00
Fabien Potencier
e515913747 [DomCrawler] tagged the guaranteed BC API 2011-03-24 10:00:10 +01:00
Fabien Potencier
9206af1773 [Console] tagged the guaranteed BC API 2011-03-24 09:39:53 +01:00
Aurelijus
2ee47f3c69 get originalName before move call 2011-03-24 10:39:42 +02:00
Fabien Potencier
ff3c66753f [BrowserKit] tagged the guaranteed BC API 2011-03-24 09:25:46 +01:00
Fabien Potencier
7280da8af2 [Process] fixed previous commit 2011-03-24 09:15:33 +01:00
Fabien Potencier
b2a8e35900 [Process] tagged the guaranteed BC API 2011-03-24 09:13:58 +01:00
Fabien Potencier
639d93cbbf [Process] moved protected to private 2011-03-24 09:10:42 +01:00
Fabien Potencier
34cf511a1d [Translation] tagged the guaranteed BC API 2011-03-24 09:07:52 +01:00
Aurelijus
38318f8f80 removes unwanted characters from goto name 2011-03-24 10:03:59 +02:00
Fabien Potencier
e0469d398d [Yaml] tagged the guaranteed BC API 2011-03-24 09:02:09 +01:00
Fabien Potencier
8ab59f82db [CssSelector] tagged thlassLoader]d BC API 2011-03-24 08:44:53 +01:00
Fabien Potencier
f58654c6fd [CssSelector] tagged the guaranteed BC API 2011-03-24 08:40:47 +01:00
Fabien Potencier
eeca46dea0 [CssSelector] moved protected to private 2011-03-24 08:34:52 +01:00
Fabien Potencier
06d00f36ba Merge remote branch 'kriswallsmith/framework/protocol-relative-base-urls' 
* kriswallsmith/framework/protocol-relative-base-urls:
  [Templating] updated assets helper to leave protocol-relative URLs untouched
  [FrameworkBundle] cleaned up test class
 2011-03-23 22:03:48 +01:00
Fabien Potencier
1fb08b6445 [Routing] fixed private method 2011-03-23 21:40:54 +01:00
Fabien Potencier
a6e6cbbb27 [HttpFoundation] removed the hardcoded ^ and $ from the RequestMatcher 2011-03-23 21:27:04 +01:00
Kris Wallsmith
55671be888 [Templating] updated assets helper to leave protocol-relative URLs untouched 2011-03-23 13:02:49 -07:00
Kris Wallsmith
d3792e2ec8 [FrameworkBundle] cleaned up test class 2011-03-23 13:02:49 -07:00
Fabien Potencier
1b8dc80215 [HttpKernel] moved from protected to private 2011-03-23 19:47:16 +01:00
Fabien Potencier
e4a3e0c2c7 [Config] moved from protected to private (WIP) 2011-03-23 19:34:00 +01:00
Fabien Potencier
b5857528e0 [Routing] moved protected to private 2011-03-23 19:25:56 +01:00
Fabien Potencier
9595963c2b [Routing] changed interface of the router twig extension as we don't need a full router 2011-03-23 16:27:08 +01:00
Fabien Potencier
662a4b3740 removed the status message from HttpException, changed the signature so that most useful arguments are first, fixed many small problems introduced with previous HTTP exception refactoring 
Quote from HTTP (bis) spec (Part 2 - 5.1.1):

The Reason Phrase exists for the
sole purpose of providing a textual description associated with the
numeric status code, out of deference to earlier Internet application
protocols that were more frequently used with interactive text
clients.  A client SHOULD ignore the content of the Reason Phrase.
 2011-03-23 16:11:54 +01:00
Fabien Potencier
82dec51b30 moved integration between the Yaml component and Twig to a Symfony Bridge 2011-03-23 15:50:55 +01:00
Fabien Potencier
e912b347f0 moved integration between the Translation component and Twig to a Symfony Bridge 2011-03-23 15:23:52 +01:00
Fabien Potencier
3e5bd67dac moved integration between Routing and Twig to a Symfony Bridge 2011-03-23 15:16:57 +01:00
Fabien Potencier
abb99e9469 [HttpKernel] changed the abstract BaseHttpException to HttpException to allow the creation of any HTTP exception 2011-03-23 11:12:31 +01:00
Fabien Potencier
a2294106fb fixed finding resources under the main app/ directory 
* Now, all resources can be stored globally (templates, assets, ...)
* The new directory is app/Resources/...
 2011-03-23 09:04:21 +01:00
Fabien Potencier
72854cfbcf [AsseticBundle] replace usage of the Unix specific 'rm -rf' by usage of the Filesystem class 2011-03-23 08:24:58 +01:00
Fabien Potencier
3ca23c92ff Merge remote branch 'weaverryan/controller-cannot-find-exception' 
* weaverryan/controller-cannot-find-exception:
  [FrameworkBundle] Giving a more specific message when a Bundle:Controller:Action controller class cannot be found
 2011-03-23 07:13:45 +01:00
Fabien Potencier
1479c25a8a Merge remote branch 'stof/security_events' 
* stof/security_events:
  [Security] Removed useless method call
  [Security] Fixed some listeners not updated after the event refactoring
 2011-03-23 07:08:13 +01:00
Fabien Potencier
cbe1f6f763 [FrameworkBundle] fixed cache:clear command for non-namespaced AppKernel classes 2011-03-23 07:06:36 +01:00
Ryan Weaver
98d03d1aec [FrameworkBundle] Giving a more specific message when a Bundle:Controller:Action controller class cannot be found 
It's a detail, but it hits usability. For normal bundles (those without children), we're able to actually print the namespace where we're looking for the Controller. For bundles with children, this would be a very verbose message, but we can at least print all of the bundles that we looked inside of.
 2011-03-22 22:10:45 -05:00
Christophe Coevoet
cc036b4f2b [Security] Removed useless method call 2011-03-23 00:02:57 +01:00
Christophe Coevoet
8b8bb66afe [Security] Fixed some listeners not updated after the event refactoring 2011-03-22 23:56:46 +01:00
Fabien Potencier
20245da86d [FrameworkBundle] fixed cache_warmer configuration 2011-03-22 22:56:46 +01:00
Fabien Potencier
e159c47cc9 [Routing] fixed UrlMatcher when no method requirement is defined 2011-03-22 20:56:55 +01:00
Fabien Potencier
af9c292001 Merge remote branch 'subsven/master' 
* subsven/master:
  re-add filename based directory filter to the AnnotationDirectoryLoader, now restricting to *.php files and therefore disregarding e.g. SVN metadata files
  revert adding filename based filter to the directory resource
  Eleminate the need to manually clear the cache if a new controller file containing routing annotations is added - part II * add unit tests * introduce filename filter to DirectoryResource (to restrict change monitoring to a subset of files) * modify AnnotationDirectoryLoader.php to use filename filter set on Controller\.php$
 2011-03-22 19:52:55 +01:00
Fabien Potencier
68011c0dd6 [DependenInjection] fixed CS 2011-03-22 19:47:46 +01:00
Fabien Potencier
3c0ecf277e Merge remote branch 'jaypea/PhpDumperFix' 
* jaypea/PhpDumperFix:
  Fixed PhpDumper isSimpleService and changed test fixtures
 2011-03-22 19:46:58 +01:00
Fabien Potencier
0ca1d1a8cd [FrameworkBundle] fixed CS 2011-03-22 19:46:08 +01:00
lenar
6ec84bad76 namespaced Kernel support for cache:clear 2011-03-22 19:45:17 +01:00
Kris Wallsmith
517ce9c923 [AsseticBundle] added basic support for globs to bundle notation 2011-03-22 11:32:21 -07:00
Sven Paulus
eb8491f754 re-add filename based directory filter to the AnnotationDirectoryLoader, 
now restricting to *.php files and therefore disregarding e.g. SVN metadata
files
 2011-03-22 18:23:54 +01:00
Jan Prieser
67aaf5ce91 Fixed PhpDumper isSimpleService and changed test fixtures 2011-03-22 17:01:03 +01:00
Fabien Potencier
bb206a7b7b [FrameworkBundle] fixed profiler on requests for which no route matches 2011-03-22 16:57:37 +01:00
Fabien Potencier
1991437766 Merge remote branch 'kriswallsmith/router/method-not-allowed' 2011-03-22 16:40:41 +01:00
Fabien Potencier
ecceea57f7 Merge remote branch 'kriswallsmith/assetic/mkdir-fix' 2011-03-22 16:27:12 +01:00
Kris Wallsmith
c565a33a4d [AsseticBundle] fixed directory creation when writing assets 2011-03-22 08:16:17 -07:00
Fabien Potencier
46fc044d32 Merge remote branch 'thesalla/generate_repos_fix' 2011-03-22 16:12:29 +01:00
Fabien Potencier
2b9b409a74 Merge remote branch 'snc/clear_cache_meta' 2011-03-22 16:11:50 +01:00
Fabien Potencier
b0cee4527a Merge remote branch 'weaverryan/controller_redirect' 2011-03-22 16:10:56 +01:00
Ryan Weaver
9ee9f5552b [FrameworkBundle] Adding the redirect method back to the base controller 
Some question whether or not the base Controller should be included at all. I think it absolutely must be included because it's important for beginners and for rapid development of smaller features/applications (and rapid development is good for beginners).

So, assuming that we *do* like the base Controller, we should really use it to its fullest potential - making the lives of developers as easy as possible.
 2011-03-22 08:21:07 -05:00
Sven Paulus
61974adb4f revert adding filename based filter to the directory resource 2011-03-22 12:14:12 +01:00
Fabien Potencier
8f44c530f9 Merge remote branch 'FabienD/fix-doctrine-entities-filter' 2011-03-22 11:12:14 +01:00
Fabien Potencier
393f863e19 Merge remote branch 'ornicar/fixCacheClearCommandHelp' 2011-03-22 11:06:45 +01:00
Sven Paulus
f93e4b2d73 Eleminate the need to manually clear the cache if a new controller file containing routing annotations is added - part II 
* add unit tests
* introduce filename filter to DirectoryResource (to restrict change monitoring to a subset of files)
* modify AnnotationDirectoryLoader.php to use filename filter set on Controller\.php$
 2011-03-22 09:03:45 +01:00
FabD
01ac10fb6e Fix DoctineBundle "doctrine:generate:entities" filter 2011-03-22 08:05:42 +01:00
Kris Wallsmith
0f9f82d1ec [AsseticBundle] added missing compiler pass 2011-03-21 21:51:40 -07:00
ornicar
1061194abf [FrameworkBundle] Fix CacheClearCommand help message 2011-03-21 09:21:47 -07:00
Fabien Potencier
6ace6af537 Merge remote branch 'mvrhov/variousFixes' 2011-03-21 16:57:34 +01:00
Fabien Potencier
2c99ffe145 Merge remote branch 'everzet/mongodb-commands-help-fix' 2011-03-21 16:54:25 +01:00
Fabien Potencier
c8ebb3f0c3 Merge remote branch 'dator/change_twig_if_datacollector' 2011-03-21 16:53:47 +01:00
Fabien Potencier
0ee68156b5 Merge remote branch 'schmittjoh/security' 2011-03-21 16:53:33 +01:00
everzet
da80c2867a [DoctrineMongoDBBundle] fixed wrong command names in commands help messages 2011-03-21 17:41:28 +02:00
Kris Wallsmith
2217a0d7e4 [FrameworkBundle] updated to support 405 Method Not Found responses 2011-03-21 05:58:02 -07:00
Kris Wallsmith
10dc18b28b [HttpKernel] refactored HTTP exceptions to be more flexible 2011-03-21 05:57:35 -07:00
Kris Wallsmith
b2f5ac8beb [Routing] refactored URL matching to support 405 Method Not Allowed responses 2011-03-21 05:56:53 -07:00
Miha Vrhovnik
9c0ae0ceaf $emName is supposed to be $dmName 2011-03-21 11:50:56 +01:00
Miha Vrhovnik
a144a83405 refactored if elseif to switch and throw an exception on unknown option 2011-03-21 11:48:53 +01:00
Johannes M. Schmitt
eb0d772743 [Security/Acl] removed remaining LIMIT clauses 2011-03-21 11:39:05 +01:00
Miha Vrhovnik
25e4193294 removed unused variable 2011-03-21 11:34:06 +01:00
Fabien Potencier
85778caba1 [FrameworkBundle] added --without-debug option to cache:clear as the debug flag value can be different from the one used for the command execution (think generating the prod cache but still with debug information when running the command) 2011-03-21 11:29:20 +01:00
Miha Vrhovnik
496280329b changing phpdoc parameter to array as all variables are used in foreach 2011-03-21 11:28:38 +01:00
Miha Vrhovnik
33dd0da420 removed unused variables 2011-03-21 11:22:29 +01:00
Miha Vrhovnik
909a6bfc30 $user* was refactored to $accout* 2011-03-21 11:20:21 +01:00
Miha Vrhovnik
5a620c0573 unless I'm missing something the first instance of loader is not used and thus not needed 2011-03-21 11:11:49 +01:00
Miha Vrhovnik
e9e0f9f102 fixing undefined variable name, and removing unexisting namespace. I backtraced code to the actal mongodb maping clas and it doesn't seem to throw any exceptions, but just in case I'm catching the general \Exception 2011-03-21 11:04:52 +01:00
Fabien Potencier
e4a636a885 [FrameworkBundle] refactored the cache:clear command 
* removed the hack on the Kernel
* removed inheritance from the warmup command
* major cleanup
 2011-03-21 11:03:55 +01:00
Miha Vrhovnik
e57075ea60 removed unused and undefined namespace and use statement 2011-03-21 10:50:13 +01:00
Miha Vrhovnik
fb814c666b removed unused and undefined namespace and use statement 2011-03-21 10:45:34 +01:00
Miha Vrhovnik
a491af873b removed unecessary use statements (ExceptionEvent was also undefined namespace) 2011-03-21 10:41:39 +01:00
Miha Vrhovnik
d1a2681531 fixing undefined class RuntimeException 2011-03-21 10:37:49 +01:00
Miha Vrhovnik
031ffaee6b fixing undefined class UnsetKeyException 2011-03-21 10:33:27 +01:00
Miha Vrhovnik
fb9944ee6b Fixing Undefined variable: writeEvent 2011-03-21 10:29:11 +01:00
Fabien Potencier
9cf9f674e8 [FrameworkBundle] simplified cache:clear and cache:warmup implementations 2011-03-21 10:03:58 +01:00
Fabien Potencier
e520956624 [FrameworkBundle] fixed help for cache:warmup 2011-03-21 10:03:32 +01:00
Fabien Potencier
82a5ae669e [FrameworkBundle] fixed merge problem 2011-03-21 09:43:41 +01:00
Fabien Potencier
5a528bcb55 [FrameworkBundle] change cache:clear warmup option to no-warmup as most of the time people will want to use the warmup version (especially in production env) 2011-03-21 09:39:28 +01:00
Fabien Potencier
00d47889a2 [FrameworkBundle] removed hardcoded AppKernel class name 2011-03-21 09:33:58 +01:00
Fabien Potencier
b00a903858 [FrameworkBundle] removed clearDir() method in some commands (use Filesystem::remove() instead) 2011-03-21 09:31:04 +01:00
Fabien Potencier
45f9c2fbf4 merged francisbesset:cache_clear_command 2011-03-21 09:24:16 +01:00
Johannes M. Schmitt
ede59926a4 Merge branch 'interactive-login-event' of git://github.com/yethee/symfony into security 2011-03-21 09:18:55 +01:00
Clément Jobeili
34e3574e2b [SwiftmailerBundle] Change Twig if syntax in panel info 2011-03-21 09:16:28 +01:00
Fabien Potencier
3f7564b00c Merge remote branch 'shieldo/toolbar_alignment' 2011-03-21 09:07:23 +01:00