Commit Graph

3392 Commits

Author SHA1 Message Date
Bernhard Schussek
73464f411e Merge remote branch 'Infranology/intl-stub' into intl-stub 2011-03-17 11:20:52 +01:00
Bernhard Schussek
f966c30c8b Merge remote branch 'symfony/master' into intl-stub 2011-03-17 11:20:25 +01:00
Bernhard Schussek
cb283d3783 [Form] Renamed 'key' to 'name'. Removed setKey() totally. 2011-03-17 11:03:10 +01:00
Bernhard Schussek
caa49aa841 [Form] Moved trimming logic to listener 2011-03-17 10:52:23 +01:00
Fabien Potencier
e8b0b488cb [HttpKernel] moved exception management logic to its own method 2011-03-17 09:16:53 +01:00
Fabien Potencier
b0948063b2 [SwiftmailerBundle] tweaked profiler template 2011-03-17 08:14:44 +01:00
Fabien Potencier
8c6f135534 [SwiftmailerBundle] made data collector configurable via the logging option 2011-03-17 08:12:18 +01:00
Fabien Potencier
95532cc1de [WebProfilerBundle] tweaked profiler CSS 2011-03-17 08:12:15 +01:00
Fabien Potencier
ee70656030 [WebProfileBundle] removed the logger info in the WDT if no error has been recorded (to save space on smaller screens) 2011-03-17 07:47:05 +01:00
Fabien Potencier
3071dd0519 [DoctrineBundle] renamed data_collector to be coherent with all others 2011-03-17 07:42:25 +01:00
Fabien Potencier
610ddf0e74 [SwiftmailerBundle] fixed typo 2011-03-17 07:38:02 +01:00
Fabien Potencier
c2bc35d0e6 [SwiftmailerBundle] renamed data collector 2011-03-17 07:38:02 +01:00
Fabien Potencier
3346e291f2 [SwiftmailerBundle] added the mailer as a dependency to the data collector to ensure that Swiftmailer is always initialized 2011-03-17 07:37:59 +01:00
Fabien Potencier
bde928be86 [SwiftmailerBundle] re-added phpdoc from symfony 1.4 and simplified code copy and pasted from symfony 1.4 2011-03-17 07:36:18 +01:00
Fabien Potencier
b479116e50 Merge remote branch 'dator/swiftmailer_profiler' 2011-03-17 07:14:09 +01:00
Fabien Potencier
14903ce915 [HttpKernel] removed the need to call getRootDir() more than once 2011-03-16 21:50:24 +01:00
Fabien Potencier
a6411cb712 [HttpKernel] fixed phpdoc 2011-03-16 21:39:30 +01:00
Fabien Potencier
7edb1a5f13 fixed previous commit 2011-03-16 21:39:30 +01:00
Fabien Potencier
4da43df963 merged vicb/kernel 2011-03-16 21:30:23 +01:00
Fabien Potencier
f48512cd54 [HttpKernel] renamed default profiler table to sf_profiler_data 2011-03-16 20:47:50 +01:00
Fabien Potencier
adf3d02695 Merge remote branch 'kriswallsmith/assetic/rm-event' 2011-03-16 19:38:15 +01:00
Fabien Potencier
0610385615 Merge remote branch 'vicb/profiler_liquid' 2011-03-16 19:37:02 +01:00
Fabien Potencier
e6ebf4da4c fixed small bug in sub-request profiling 2011-03-16 19:33:55 +01:00
Clément Jobeili
463591afbe Add Licence and Documentation 2011-03-16 18:22:38 +01:00
Clément Jobeili
1342752e7e Add the message body et charset 2011-03-16 18:21:43 +01:00
Bernhard Schussek
e85aab2dc1 [Form] Changed form to use the new EventDispatcher implementation 2011-03-16 18:20:13 +01:00
Victor Berchet
d56fadfbb9 [WebProfilerBundle] Use a liquid layout rather than a fixed width layout. 2011-03-16 18:02:55 +01:00
Clément Jobeili
df08655e97 Add a DataCollector for the SwiftmailerBundle 2011-03-16 17:57:04 +01:00
Fabien Potencier
ad3b7e912d merged noelg/profiler 2011-03-16 16:44:44 +01:00
Kris Wallsmith
caaff216df [AsseticBundle] removed assetic.write event 2011-03-16 08:36:36 -07:00
Fabien Potencier
005287ac88 Merge remote branch 'kriswallsmith/templating/asset-packages' 2011-03-16 16:18:45 +01:00
Bernhard Schussek
fb8efaba67 [Form] Fixed a couple of failing tests 2011-03-16 16:13:06 +01:00
Fabien Potencier
13cac29a31 Merge remote branch 'stof/php_globals' 2011-03-16 16:04:05 +01:00
Fabien Potencier
bf938cc885 Merge remote branch 'rrehbeindoi/master' 2011-03-16 16:03:14 +01:00
Bernhard Schussek
f64f55002b Merge remote branch 'symfony/master' into experimental
Conflicts:
	src/Symfony/Component/Security/Http/Firewall/AbstractAuthenticationListener.php
	src/Symfony/Component/Security/Http/Firewall/AbstractPreAuthenticatedListener.php
2011-03-16 16:00:54 +01:00
Fabien Potencier
28d9b331bd [FrameworkBundle] made the profiler easily configurable 2011-03-16 15:58:56 +01:00
Fabien Potencier
8cc37eaa23 [HttpKernel] fixed CS 2011-03-16 15:16:21 +01:00
Fabien Potencier
f9d2f69ca8 Merge remote branch 'janschumann/mysql_profiler_storage' 2011-03-16 15:09:07 +01:00
Christophe Coevoet
8dc6464aa4 [FrameworkBundle] Fixed previous commit and added some tests for PHP globals 2011-03-16 15:04:19 +01:00
Ray
668a12fd54 Merge remote branch 'symfony/master' 2011-03-16 09:01:05 -05:00
Ray
73f70ae53c Merge remote branch 'symfony/master' 2011-03-16 09:00:13 -05:00
Ray
e83629139c Added matching test to mirror the xml file loader test 2011-03-16 08:56:26 -05:00
Fabien Potencier
ae7a2df104 fixed CS 2011-03-16 14:45:34 +01:00
Fabien Potencier
ac49289451 Merge remote branch 'rrehbeindoi/master' 2011-03-16 14:44:44 +01:00
Fabien Potencier
2a6e299d52 Merge remote branch 'kriswallsmith/http/apache-request' 2011-03-16 14:31:16 +01:00
Kris Wallsmith
a5d8770a54 [HttpFoundation] fixed ApacheRequest, added tests 2011-03-16 06:13:01 -07:00
Fabien Potencier
429d927e8c Merge remote branch 'hason/extensions' 2011-03-16 13:37:06 +01:00
Christophe Coevoet
61abc3d01f Added the global variable in PHP templates too 2011-03-16 13:11:29 +01:00
Fabien Potencier
05ab74e7b9 [SecurityBundle] simplified things 2011-03-16 12:58:52 +01:00
Martin Hason
e441fc95a8 [AbstractDoctrineBundle] fixed typo 2011-03-16 11:33:21 +01:00