Fabien Potencier
a98436fd6a
updated UPDATE file
2011-06-06 18:07:33 +02:00
Fabien Potencier
cb3390e9ae
Merge remote branch 'gordonslondon/http-foundation/response'
...
* gordonslondon/http-foundation/response:
[HttpFoundation] merge Response::isRedirected() with Response::isRedirect() - Response::isRedirected() has been removed
2011-06-06 18:06:51 +02:00
Fabien Potencier
62ac58127a
tweaked previous commit
2011-06-06 18:04:44 +02:00
Fabien Potencier
63f37c0e93
Merge remote branch 'weaverryan/beta3_swiftmailer_update'
...
* weaverryan/beta3_swiftmailer_update:
[UPDATE] Adding more details - the `Swift_` prefix must also be removed
[UPDATE] Adding details on the swiftmailer config change
2011-06-06 18:03:40 +02:00
Derek ROTH
9013e3639b
Changed load_resource_bundle() to use ResourceBundle::create() method instead of constructor
2011-06-06 08:45:12 -07:00
Lukas Kahwe Smith
34ac2fe200
fixed a typo
2011-06-06 17:29:50 +02:00
Fabien Potencier
c3bf2037df
Merge remote branch 'vicb/form-collection-rendering'
...
* vicb/form-collection-rendering:
[Form] Fix collection rendering
2011-06-06 14:56:16 +02:00
Fabien Potencier
78b91a017e
Merge remote branch 'DerekRoth/patch-1'
...
* DerekRoth/patch-1:
A constructor returning null is counter-intuitive. BTW, isn't this a intl bug ?
2011-06-06 14:52:24 +02:00
Fabien Potencier
48733b927d
[Swiftmailer] added the swiftmailer.plugin tag to automatically register Swiftmailer plugins
2011-06-06 14:48:42 +02:00
Fabien Potencier
a5daf4706a
[SwiftmailerBundle] updated XSD
2011-06-06 14:43:36 +02:00
Victor Berchet
ef8cb967f5
Merge branch 'master' into form-collection-rendering
2011-06-06 14:39:18 +02:00
Fabien Potencier
b83aa9d006
[SwiftmailerBundle] fixed previous merge
2011-06-06 14:25:17 +02:00
Victor Berchet
bca17fe6a3
[Form] Fix collection rendering
2011-06-06 14:21:49 +02:00
Fabien Potencier
ce4a49d648
merged arjenjb/swift-antiflood-plugin
2011-06-06 14:21:20 +02:00
Victor Berchet
6711a184fd
[TwigBundle][Form] Simplify templates
...
The Repeated and Collection types extend the Form type so there is no need to explicitely render the parent section.
2011-06-06 12:53:19 +02:00
Derek ROTH
7837d328bf
A constructor returning null is counter-intuitive. BTW, isn't this a intl bug ?
2011-06-06 03:32:25 -07:00
Victor Berchet
181fb56925
[Form][Twig] Reorganized the form template
2011-06-06 12:32:08 +02:00
Victor Berchet
eed54c137e
[Form] Fix the FormView::isRendered() method
2011-06-06 12:31:30 +02:00
Joseph Bielawski
c2b9061559
[Form] Added Tests
2011-06-06 12:30:28 +02:00
Fabien Potencier
a1d866e709
[DoctrineBundle] fixed typo
2011-06-06 09:11:02 +02:00
Fabien Potencier
a98046dd44
[Config] added a guard against circular references
2011-06-05 10:52:57 +02:00
Fabien Potencier
87fefcae62
[Form] removed obsolete comment
2011-06-05 08:49:06 +02:00
Fabien Potencier
dd5f088abb
Merge remote branch 'jwage/master'
...
* jwage/master:
Revert back to using gmmktime and use day 15 instead of 1 to avoid edge case
Use mktime instead of gmmaketime. On the 1st of every month the following options are generated:
2011-06-05 08:47:49 +02:00
Fabien Potencier
433e403981
Merge branch 'doctrine-mapping-convert'
...
* doctrine-mapping-convert:
[DoctrineBundle] fixed extensions of generated files
2011-06-05 08:31:06 +02:00
Fabien Potencier
9d18b38fc0
[DoctrineBundle] fixed non-working safe-guards ( closes #1129 )
2011-06-05 08:30:00 +02:00
Fabien Potencier
8c0e5029a0
[DoctrineBundle] fixed extensions of generated files
2011-06-05 08:12:53 +02:00
Fabien Potencier
8457bfa365
[FrameworkBundle] fixed _locale management in core.request
2011-06-04 22:59:06 +02:00
Fabien Potencier
c72537da6b
[Routing] fixed route matching when the prefix contains variables
2011-06-04 19:45:54 +02:00
Fabien Potencier
544b6ca6aa
Revert "fixed tests"
...
This reverts commit 7dc3af6036
.
2011-06-04 19:24:45 +02:00
Fabien Potencier
0298f323e3
fixed typo
2011-06-04 19:23:48 +02:00
Fabien Potencier
7dc3af6036
fixed tests
2011-06-04 19:23:43 +02:00
Fabien Potencier
c561f4f0c0
[Routing] changed HTTP method to always be uppercased (to be consistent with HttpFoundation/Request)
2011-06-04 19:06:39 +02:00
Fabien Potencier
736c27e0c9
Merge remote branch 'arjenjb/swift-impersonate-plugin'
...
* arjenjb/swift-impersonate-plugin:
Removed plugin from SF
[SwiftmailerBundle] Added ImpersonateSenderPlugin
2011-06-04 18:34:18 +02:00
Fabien Potencier
cb1f2c7e69
Merge remote branch 'kriswallsmith/templating/packages-rework'
...
* kriswallsmith/templating/packages-rework:
[FrameworkBundle] updated for templating changes, added http/ssl logic
[Templating] reworked asset helper and packages
2011-06-04 18:25:52 +02:00
Fabien Potencier
06804d3f1d
[Console] added mb_detect_encoding when needed
2011-06-04 18:20:20 +02:00
Fabien Potencier
18c3049fad
Merge remote branch 'brikou/console_formatter_helper'
...
* brikou/console_formatter_helper:
added mb_detect_encoding when formatting block (usefull when mb_internal_encoding is not properly set)
2011-06-04 18:19:11 +02:00
Pascal Borreli
404c452c0b
[Various] Phpdoc & typos
2011-06-04 15:30:56 +00:00
Fabien Potencier
d62932f70b
Merge remote branch 'stloyd/patch-1'
...
* stloyd/patch-1:
Make UPDATE file more "githubish" ;-) Added info about setting attributes on form field labels
2011-06-04 13:57:37 +02:00
Fabien Potencier
604b043d6e
Merge remote branch 'weaverryan/doctrine_controller_methods'
...
* weaverryan/doctrine_controller_methods:
[FrameworkBundle] Adding a check for the existence of the Doctrine service
[DoctrineBundle] Fixing error per @stloyd
[FrameworkBundle][DoctrineBundle] Adding a few shortcut methods
2011-06-04 13:55:25 +02:00
Fabien Potencier
8e6166fd32
Merge remote branch 'stloyd/is_null'
...
* stloyd/is_null:
Remove all `is_null` alias calls.
2011-06-04 13:54:33 +02:00
Fabien Potencier
0bf10c4ce1
Merge remote branch 'schmittjoh/events'
...
* schmittjoh/events:
[FrameworkBundle] add the old method naming convention
2011-06-04 13:52:59 +02:00
Fabien Potencier
33b47b22db
Merge remote branch 'schmittjoh/security'
...
* schmittjoh/security:
[SecurityBundle] exposed setting in the configuration
[Security/Http] removed irrelevant code
2011-06-04 13:52:18 +02:00
Fabien Potencier
f9ffdf5b33
[Routing] added proper support for the HEAD method
2011-06-04 12:47:38 +02:00
Fabien Potencier
9eae7e54ca
[Routing] removed unneeded code in the dumper Apache rules
2011-06-04 12:46:19 +02:00
Fabien Potencier
9f3e996c43
[FrameworkBundle] fixed tests
2011-06-04 11:57:49 +02:00
Fabien Potencier
7780c4deda
[HttpKernel] removed Response content when Request method is HEAD as per RFC2616
2011-06-04 11:56:12 +02:00
Fabien Potencier
c62b2309cf
[FrameworkBundle] fixed WDT for redirects emitted by the Security component
2011-06-04 10:25:44 +02:00
Fabien Potencier
611a4a212c
[FrameworkBundle] allowed a service to register a kernel listener more than once for a given event
2011-06-04 10:23:42 +02:00
Fabien Potencier
df81296443
[Routing] fixed generation when a default value is null
2011-06-03 22:57:26 +02:00
Fabien Potencier
79a611f9ff
Merge remote branch 'weaverryan/router_generator_failing_test'
...
* weaverryan/router_generator_failing_test:
[Routing] Adding a failing test related to URL generation with optional parameters
2011-06-03 22:50:03 +02:00