Fabien Potencier
ec226cd4bc
[DoctrineBundle] fixed doctrine:generate:entities
2011-05-04 19:38:36 +02:00
Fabien Potencier
c200b42e89
Merge remote branch 'kriswallsmith/http/forwarded-secure'
...
* kriswallsmith/http/forwarded-secure:
[HttpFoundation] added support for X-Forwarded-Port request header
2011-05-04 19:12:32 +02:00
Kris Wallsmith
ae46150bc8
[HttpFoundation] added support for X-Forwarded-Port request header
2011-05-04 09:56:34 -07:00
Fabien Potencier
e150ffd699
Merge remote branch 'Bart00/patch-1'
...
* Bart00/patch-1:
Change "zou moeten" to "moet", ("zou moeten" implies that the problem is not so severe and was translated from english too literally) Also fixes some typo's
2011-05-04 18:51:26 +02:00
Bernhard Schussek
74cca63938
[Form] CSRF fields are not included in the children of a FormView anymore if the view is not the root
2011-05-04 18:27:20 +02:00
Bernhard Schussek
173beeba74
[Form] FormView::offsetUnset() is now supported. It was possible anyway using getChildren() and setChildren().
2011-05-04 18:21:49 +02:00
Bernhard Schussek
3cc5d9f4cd
[Form] Split the option "modifiable" of the "collection" type into "allow_add" and "allow_delete"
2011-05-04 17:29:59 +02:00
Bernhard Schussek
bf1dfbbe99
[Form] Added test for last commit by kriswallsmith and improved dealing with original names
...
The form component should now guarantee to always pass an UploadedFile object to your model. There you can call getOriginalName() to retrieve the original name of the uploaded file. For security reasons, the real file name is a generated hash value.
2011-05-04 17:04:44 +02:00
Fabien Potencier
86d0ddb4e3
[DoctrineBundle] split Registry::getEntityManager() in two methods
...
Resetting an entity manager has a lot of consequences and the developer should
be aware of that. So, instead of implicitly reset an entity manager when it is
closed, the developer should reset it by hand if he thinks that this is
possible:
$em = $this->get('registry')->getEntityManager();
$em->getConnection()->beginTransaction(); // suspend auto-commit
try {
//... do some work
} catch (Exception $e) {
$em->getConnection()->rollback();
$em->close();
$this->get('registry')->resetEntityManager();
}
// you will get a new one
$em = $this->get('registry')->getEntityManager();
2011-05-04 16:23:47 +02:00
Bernhard Schussek
4c6f26f008
Merge remote branch 'kriswallsmith/form/fix-upload-fix' into kris_merge
2011-05-04 15:51:20 +02:00
Bernhard Schussek
eb50d766da
[Form] Fixed variable scope when entering nested form helpers
...
The consequence of this commit is that variables are accessible that have been passed to a surrounding form helper.
Example template:
{% block my_widget_label %}
<label>{{ label }}
{% endblock %}
{% block my_widget_row %}
{# It is not necessary to explicitely pass through the label variable #}
{{ form_label(form) }}
{{ form_widget(form) }}
{% endblock %}
Example usage:
{{ form_row(form.mywidget, { 'label': 'My Widget' }) }}
2011-05-04 15:40:15 +02:00
Bernhard Schussek
38098604af
[Form] Added tests for blocks/templates in the format _<ID>_(widget|row|label|...)
2011-05-04 15:33:51 +02:00
Daniel Holmes
dd692c0203
[Form] fixed transformation failed exception
2011-05-04 05:51:03 -07:00
Bart00
f9940b4175
Change "zou moeten" to "moet", ("zou moeten" implies that the problem is not so severe and was translated from english too literally)
...
Also fixes some typo's
2011-05-04 05:11:50 -07:00
Fabien Potencier
2e5bd42be3
Merge remote branch 'hollodk/master'
...
* hollodk/master:
Made some better translation.
First sample of translation.
2011-05-04 13:00:33 +02:00
Michael Holm
dc58b79e58
Made some better translation.
2011-05-04 12:47:06 +02:00
Fabien Potencier
ba3785896f
Merge remote branch 'schmittjoh/di'
...
* schmittjoh/di:
[DependencyInjection] fixes a bug when requesting a definition that uses property injection
2011-05-04 12:05:06 +02:00
Fabien Potencier
b752e31b66
Merge remote branch 'lenar/translation'
...
* lenar/translation:
added translation for Estonian
2011-05-04 11:46:05 +02:00
Fabien Potencier
0331501580
[DoctrineBundle] fixed some configuration options
2011-05-04 11:35:14 +02:00
lenar
1cfed9e24e
added translation for Estonian
2011-05-04 12:20:22 +03:00
Fabien Potencier
736948887d
Merge remote branch 'lenar/doctrinebundle'
...
* lenar/doctrinebundle:
fix variable names
2011-05-04 10:55:25 +02:00
Fabien Potencier
f7808de3a8
[DoctrineBundle] moved more DIC definition into orm.xml
2011-05-04 10:53:05 +02:00
lenar
1301995cdc
fix variable names
2011-05-04 11:11:38 +03:00
Fabien Potencier
6d334289ee
[BrowserKit] fixed a weird behavior where a PHP process returns a successful exit code, but the PHP scripts actually died
2011-05-04 09:08:05 +02:00
Fabien Potencier
9230e712c3
fixed unit tests
2011-05-04 08:46:01 +02:00
Fabien Potencier
17aa0ed0ed
changed the default httpOnly value for cookie for better security out of the box
2011-05-04 08:44:59 +02:00
Fabien Potencier
8b83b9847b
Merge remote branch 'wtfzdotnet/patch-1'
...
* wtfzdotnet/patch-1:
Some changes to the translation of "should" -> "zou moeten", "must" -> "moeten".
2011-05-04 08:05:01 +02:00
Michael Holm
8be22f19d7
First sample of translation.
2011-05-04 01:59:48 +02:00
Johannes Schmitt
2c287676fb
[DependencyInjection] fixes a bug when requesting a definition that uses property injection
2011-05-03 23:46:02 +02:00
Fabien Potencier
807c1d8f2f
fixed test
2011-05-03 23:09:15 +02:00
Fabien Potencier
c7fddca891
replaced some url..code by rawurl..code
2011-05-03 23:06:55 +02:00
wtfzdotnet
898019559a
Some changes to the translation of "should" -> "zou moeten", "must" -> "moeten".
2011-05-03 14:06:33 -07:00
Fabien Potencier
2b95506c23
Merge remote branch 'hidenorigoto/translate-UPDATE-file-beta1tobeta2'
...
* hidenorigoto/translate-UPDATE-file-beta1tobeta2:
updated translation of UPDATE file (beta1 to beta2)
2011-05-03 17:15:54 +02:00
Fabien Potencier
e8838e51a6
[DoctrineBundle] fixed previous merge
2011-05-03 16:52:19 +02:00
Fabien Potencier
a02805714f
[DoctrineBundle] merged fabpot:doctrine-registry
2011-05-03 16:38:59 +02:00
hidenorigoto
fe893af8ad
updated translation of UPDATE file (beta1 to beta2)
2011-05-03 23:30:50 +09:00
Daniel Gomes
8870d3f31e
Merge remote-tracking branch 'upstream/master'
2011-05-03 14:28:33 +01:00
Daniel Gomes
0147df6b22
added translation for European Portugues (Portugal)
2011-05-03 14:27:37 +01:00
Fabien Potencier
28fec7e4d8
[HttpKernel] fixed previous commit
2011-05-03 14:57:02 +02:00
Fabien Potencier
731993869c
Merge remote branch 'Seldaek/exception_handling'
...
* Seldaek/exception_handling:
[HttpKernel] Log non-http exceptions as critical as well
2011-05-03 14:53:38 +02:00
Fabien Potencier
13bc7c7c53
Merge remote branch 'Seldaek/exception_template'
...
* Seldaek/exception_template:
[FrameworkBundle] Adjust styling and display of logs
2011-05-03 14:53:28 +02:00
Fabien Potencier
27d02a7d4a
[Routing] fixed regression (/ should not be matched by /{foo} when foo has no default value)
2011-05-03 14:48:08 +02:00
Jordi Boggiano
04f9b23b34
[FrameworkBundle] Adjust styling and display of logs
2011-05-03 14:44:27 +02:00
Jordi Boggiano
0ca4ed33fe
[HttpKernel] Log non-http exceptions as critical as well
2011-05-03 14:43:22 +02:00
Johannes Schmitt
12a77440b8
[FrameworkBundle] fixed default
2011-05-03 14:41:50 +02:00
Johannes Schmitt
672c4ef122
Merge remote branch 'origin/master' into annotations
...
Conflicts:
UPDATE.md
2011-05-03 14:38:51 +02:00
Johannes Schmitt
d29c7811aa
[FrameworkBundle] updated configuration
2011-05-03 14:36:42 +02:00
Fabien Potencier
e9b085ef42
[DoctrineBundle] fixed typo
2011-05-03 14:06:34 +02:00
Fabien Potencier
036be03dff
[HttpKernel] fixed a PHP notice
2011-05-03 13:55:00 +02:00
Fabien Potencier
3c2b3f2537
Merge remote branch 'Seldaek/exception_test'
...
* Seldaek/exception_test:
[HttpKernel] Fix console output for reals
2011-05-03 13:43:49 +02:00