8000 Merge branch '2.1' into 2.2 · symfony/symfony@57f93b8 · GitHub
[go: up one dir, main page]

Skip to content

Commit 57f93b8

Browse files
committed
Merge branch '2.1' into 2.2
* 2.1: updated VERSION for 2.1.11 update CONTRIBUTORS for 2.1.11 updated CHANGELOG for 2.1.11 Conflicts: src/Symfony/Component/HttpKernel/Kernel.php
2 parents afe1872 + e029409 commit 57f93b8

File tree

2 files changed

+51
-21
lines changed

2 files changed

+51
-21
lines changed

CHANGELOG-2.1.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,20 @@ in 2.1 minor versions.
77
To get the diff for a specific change, go to https://github.com/symfony/symfony/commit/XXX where XXX is the change hash
88
To get the diff between two versions, go to https://github.com/symfony/symfony/compare/v2.1.0...v2.1.1
99

10+
* 2.1.11 (2013-06-02)
11+
12+
* 2038329: [Form] [Validator] Fixed post_max_size = 0 bug (Issue #8065)
13+
* 169c0b9: [Finder] Fix iteration fails with non-rewindable streams
14+
* 45b68e0: [Finder] Fix unexpected duplicate sub path related AppendIterator issue
15+
* 5321600: Fixed two bugs in HttpCache
16+
* 5c317b7: [Console] fix and refactor exit code handling
17+
* 1469953: [CssSelector] Fix :nth-last-child() translation
18+
* 91b8490: Fix Crawler::children() to not trigger a notice for childless node
19+
* 0a4837d: Fixed XML syntax.
20+
* a5441b2: Fixed parsing of leading blank lines in folded scalars. Closes #7989.
21+
* e8d5d16: Fixed Loader import
22+
* 37af771: [Console] Added dedicated testcase for HelperSet class
23+
1024
* 2.1.10 (2013-05-06)
1125

1226
* 5b7e1e6: added a missing check for the provider key

CONTRIBUTORS.md

Lines changed: 37 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Symfony2 is the result of the work of many people who made the code better
1515
- Pascal Borreli (pborreli)
1616
- Karma Dordrak (drak)
1717
- Lukas Kahwe Smith (lsmith)
18-
- Ryan Weaver
18+
- Ryan Weaver (weaverryan)
1919
- Joseph Bielawski (stloyd)
2020
- Jeremy Mikola (jmikola)
2121
- Igor Wiedler (igorw)
@@ -24,9 +24,9 @@ Symfony2 is the result of the work of many people who made the code better
2424
- Hugo Hamon (hhamon)
2525
- Eriksen Costa (eriksencosta)
2626
- Martin Hasoň (hason)
27+
- Jakub Zalas (jakubzalas)
2728
- Jonathan Wage (jwage)
2829
- William Durand (couac)
29-
- Jakub Zalas (jakubzalas)
3030
- Alexandre Salomé (alexandresalome)
3131
- ornicar
3232
- stealth35 ‏ (stealth35)
@@ -35,11 +35,11 @@ Symfony2 is the result of the work of many people who made the code better
3535
- Francis Besset (francisbesset)
3636
- Henrik Bjørnskov (henrikbjorn)
3737
- Miha Vrhovnik
38+
- Bilal Amarni (bamarni)
3839
- Romain Neutron (romain)
40+
- Florin Patan (florinpatan)
3941
- Konstantin Kudryashov (everzet)
4042
- Saša Stamenković (umpirsky)
41-
- Florin Patan (florinpatan)
42-
- Bilal Amarni (bamarni)
4343
- Arnaud Le Blanc (arnaud-lb)
4444
- Eric Clemmons (ericclemmons)
4545
- Dariusz Górecki (canni)
@@ -50,9 +50,9 @@ Symfony2 is the result of the work of many people who made the code better
5050
- Arnout Boks (aboks)
5151
- Hidenori Goto (hidenorigoto)
5252
- Fran Moreno (franmomu)
53+
- Andrej Hudec (pulzarraider)
5354
- Lee McDermott
5455
- Brandon Turner
55-
- Andrej Hudec (pulzarraider)
5656
- Daniel Holmes (dholmes)
5757
- Brikou Carré (brikou)
5858
- John Wards (johnwards)
@@ -99,12 +99,12 @@ Symfony2 is the result of the work of many people who made the code better
9999
- Pablo Godel (pgodel)
100100
- Helmer Aaviksoo
101101
- Clément JOBEILI (dator)
102+
- Hiromi Hishida (77web)
102103
- Julien Brochet (mewt)
103104
- Rafael Dohms (rdohms)
104105
- Benjamin Dulau (dbenjamin)
105106
- Andreas Hucks (meandmymonkey)
106107
- Noel Guilbert (noel)
107-
- Hiromi Hishida (77web)
108108
- Guilherme Blanco (guilhermeblanco)
109109
- Martin Schuhfuß (usefulthink)
110110
- Thomas Rabaix (rande)
@@ -122,6 +122,7 @@ Symfony2 is the result of the work of many people who made the code better
122122
- Clemens Tolboom
123123
- Justin Hileman (bobthecow)
124124
- Sven Paulus (subsven)
125+
- Dmitrii Chekaliuk (lazyhammer)
125126
- Xavier Perez
126127
- Rui Marinho (ruimarinho)
127128
- Dorian Villet (gnutix)
@@ -141,19 +142,22 @@ Symfony2 is the result of the work of many people who made the code better
141142
- Adrien Brault (adrienbrault)
142143
- jules boussekeyt (gordonslondon)
143144
- Jan Sorgalla (jsor)
145+
- Ait Boudad Abdellatif (aitboudad)
144146
- jdhoek
145147
- geoffrey
146148
- Wodor Wodorski
147149
- Elnur Abdurrakhimov (elnur)
148150
- Matthew Lewinski (lewinski)
149151
- Kim Hemsø Rasmussen
152+
- Wouter De Jong (wouterj)
150153
- Dirk Pahl (dirkaholic)
151154
- Wouter Van Hecke
152155
- Gyula Sallai (salla)
153156
- Michael Holm (hollo)
154157
- Yaroslav Kiliba
155158
- Sebastian Bergmann
156159
- arjen
160+
- Matthias Pigulla (mpdude)
157161
- sun (sun)
158162
- Manuel Kiessling (manuelkiessling)
159163
- Sergey Linnik
@@ -165,7 +169,6 @@ Symfony2 is the result of the work of many people who made the code better
165169
- Grégoire Passault (gregwar)
166170
- Uwe Jäger (uwej711)
167171
- Aurelijus Valeiša (aurelijus)
168-
- Ait Boudad Abdellatif (aitboudad)
169172
- Gustavo Piltcher
170173
- Stepan Tanasiychuk (stfalcon)
171174
- Albert Jessurum (ajessu)
@@ -180,15 +183,15 @@ Symfony2 is the result of the work of many people who made the code better
180183
- Ricard Clau (ricardclau)
181184
- Niklas Fiekas
182185
- Konstantin Myakshin (koc)
183-
- Wouter De Jong (wouterj)
186+
- Erin Millard
184187
- Manuel Reinhard (sprain)
185188
- Francesco Levorato
186189
- Michele Orselli (orso)
187190
- Tom Van Looy (tvlooy)
188191
- Brouznouf
189192
- Peter Kruithof (pkruithof)
190-
- Dmitrii Chekaliuk
191-
- Matthias Pigulla (mpdude)
193+
- Kristen Gilden (kgilden)
194+
- hossein zolfi (ocean)
192195
- Greg Thornton (xdissent)
193196
- Lars Strojny
194197
- Costin Bereveanu (schniper)
@@ -210,43 +213,46 @@ Symfony2 is the result of the work of many people who made the code better
210213
- Oscar Cubo Medina (ocubom)
211214
- Karel Souffriau
212215
- Christophe L. (christophelau)
216+
- Thomas Tourlourat (armetiz)
213217
- Michael Ridgway
214218
- Pavel Campr (pcampr)
215219
- janschoenherr
216220
- Emanuele Gaspari (inmarelibero)
217221
- Brian King
218222
- Jan Schumann
219-
- Erin Millard
220223
- Antonio J. García Lagar (ajgarlag)
221224
- Olivier Dolbeau (odolbeau)
222225
- Robert Kiss (kepten)
223226
- Asier Illarramendi (doup)
224227
- Javier López (loalf)
225228
- Chris Heng (gigablah)
226229
- Christoph Mewes (xrstf)
230+
- Vitaliy Tverdokhlib (vitaliytv)
227231
- Jonas Flodén (flojon)
228232
- Shigenibu Nishikawa
229233
- Marcin Sikoń (marphi)
230234
- Miquel Rodríguez Telep (mrtorrent)
231235
- Filippo Tessarotto
232-
- Kristen Gilden (kgilden)
233236
- Adam Harvey
234237
- Laurent Bachelier (laurentb)
235238
- Fabian Lange (codingfabian)
236239
- Yoshio HANAWA
237240
- Tiago Brito (blackmx)
238-
- hossein zolfi (ocean)
239241
- Kevin McBride
240242
- Pablo Díez (pablodip)
241243
- Michael Piecko (michael.piecko)
242244
- Sebastian Krebs
243245
- Manuel de Ruiter (manuel)
246+
- Iker Ibarguren (ikerib)
247+
- Ricardo Oliveira (ricardolotr)
244248
- ondrowan
245249
- Roman Marintsenko (inori)
246250
- Stéphane PY (steph_py)
247251
- mcben
252+
- Christian Flothmann (xabbuh)
248253
- Maks Slesarenko
249254
- Vicent Soria Durá (vicentgodella)
255+
- alexpods
250256
- Erik Trapman (eriktrapman)
251257
- De Cock Xavier (xdecock)
252258
- Matthijs van den Bos
@@ -273,7 +279,6 @@ Symfony2 is the result of the work of many people who made the code better
273279
- Zach Badgett (zachbadgett)
274280
- Aurélien Fredouelle
275281
- Karoly Negyesi (chx)
276-
- Thomas Tourlourat (armetiz)
277282
- jamogon
278283
- Miha Vrhovnik
279284
- Geoffrey Tran (geoff)
@@ -282,6 +287,7 @@ Symfony2 is the result of the work of many people who made the code better
282287
- Christian Schaefer (caefer)
283288
- Elliot Anderson (elliot)
284289
- Patrick Kaufmann
290+
- Marco Pivetta (ocramius)
285291
- Ben Ramsey (ramsey)
286292
- Christian Jul Jensen
287293
- Chris Jones (leek)
@@ -292,6 +298,7 @@ Symfony2 is the result of the work of many people who made the code better
292298
- Ruben Gonzalez (rubenrua)
293299
- Sinan Eldem
294300
- DerManoMann
301+
- alquerci
295302
- Nahuel Cuesta (ncuesta)
296303
- Chris Boden (cboden)
297304
- Roumen Damianoff (roumen)
@@ -307,6 +314,7 @@ Symfony2 is the result of the work of many people who made the code better
307314
- Rostyslav Kinash
308315
- jfcixmedia
309316
- Vincent Simonin
317+
- Stefan Warman
310318
- yktd26
311319
- Jakub Kucharovic
312320
- umpirski
@@ -354,8 +362,6 @@ Symfony2 is the result of the work of many people who made the code better
354362
- cgonzalez
355363
- matt foster
356364
- Evan S Kaufman (evanskaufman)
357-
- Iker Ibarguren (ikerib)
358-
- Ricardo Oliveira (ricardolotr)
359365
- Jayson Xu (superjavason)
360366
- Jan Prieser
361367
- James Michael DuPont
@@ -368,10 +374,12 @@ Symfony2 is the result of the work of many people who made the code better
368374
- Luis Cordova (cordoval)
369375
- Philipp Kräutli (pkraeutli)
370376
- Stefano Sala (stefano.sala)
377+
- Vitaliy Zakharov (zakharovvi)
371378
- frost-nzcr4
372379
- Abhoryo
373380
- Fabian Vogler (fabian)
374381
- Maksim Kotlyar (makasim)
382+
- Tugdual Saunier (tucksaun)
375383
- Neil Ferreira
376384
- Tony Malzhacker
377385
- Cyril Quintin (cyqui)
@@ -398,7 +406,6 @@ Symfony2 is the result of the work of many people who made the code better
398406
- Thibault Duplessis
399407
- Marc Abramowitz
400408
- Martijn Evers
401-
- alexpods
402409
- Mathias Rohnstock (drmonty)
403410
- Harry Walter (haswalt)
404411
- Michael Roterman (wtfzdotnet)
@@ -444,14 +451,14 @@ Symfony2 is the result of the work of many people who made the code better
444451
- julien.galenski
445452
- Sébastien Lavoie
446453
- Per Sandström (per)
454+
- Lin Clark
447455
- Troy McCabe
448456
- Ville Mattila
449457
- Sescandell (sescandell)
450458
- Ben Davies
451459
- Max Beutel
452460
- Marcos Quesada (marcos_quesada)
453461
- Dan Finnie
454-
- Vitaliy Tverdokhlib (vitaliytv)
455462
- Martijn Evers
456463
- Benjamin Paap (benjaminpaap)
457464
- Sergii Smertin (nfx)
@@ -512,18 +519,22 @@ Symfony2 is the result of the work of many people who made the code better
512519
- George Giannoulopoulos
513520
- Chris Wilkinson (thewilkybarkid)
514521
- Ilya Biryukov
522+
- Jason Desrosiers
523+
- m.chwedziak
515524
- Lance McNearney
516525
- Alberto Pirovano (geezmo)
517526
- Gabor Toth (tgabi333)
518527
- Xavier Briand (xavierbriand)
519528
- Evan Kaufman
520529
- Romain Geissler
521530
- Marcus Stöhr (dafish)
531+
- Eduardo Oliveira (entering)
522532
- Carsten Nielsen (phreaknerd)
523533
- Jay Severson
524534
- René Kerner
525535
- Adrien Samson (adriensamson)
526536
- Samuel Gordalina (gordalina)
537+
- Timothy Anido (xanido)
527538
- Martin Eckhardt
528539
- Michael Dowling (mtdowling)
529540
- Robert Queck
@@ -545,10 +556,10 @@ Symfony2 is the result of the work of many people who made the code better
545556
- Benoit Lévêque (benoit_leveque)
546557
- jskvara
547558
- Mephistofeles
559+
- Hoffmann András
548560
- pscheit
549561
- Ramon Kleiss (akathos)
550562
- Nicolas Badey (nico-b)
551-
- Vitaliy Zakharov (zakharovvi)
552563
- Gunnar Lium
553564
- povilas
554565
- Lars Strojny
@@ -586,6 +597,7 @@ Symfony2 is the result of the work of many people who made the code better
586597
- Bob den Otter (bopp)
587598
- Simone Fumagalli (hpatoio)
588599
- Alessio Baglio (ioalessio)
600+
- John Bafford (jbafford)
589601
- Jérôme Macias (jeromemacias)
590602
- Jordi Llonch (jordillonch)
591603
- Cédric Dugat (ph3nol)
@@ -613,7 +625,6 @@ Symfony2 is the result of the work of many people who made the code better
613625
- Dan Patrick (mdpatrick)
614626
- Rares Vlaseanu (raresvla)
615627
- tante kinast (tante)
616-
- Tugdual Saunier (tucksaun)
617628
- Alexander Zogheb
618629
- Florian Pfitzer
619630
- Linnik Sergey
@@ -669,6 +680,7 @@ Symfony2 is the result of the work of many people who made the code better
669680
- Jimmy Leger (redpanda)
670681
- Baptiste Clavié (talus)
671682
- Yanick Witschi
683+
- ramonornela
672684
- Till Klampaeckel
673685
- srsbiz
674686
- Nicolas A. Bérard-Nault
@@ -683,6 +695,7 @@ Symfony2 is the result of the work of many people who made the code better
683695
- Wotre
684696
- goohib
685697
- Xavier HAUSHERR
698+
- Myke79
686699
- Brian Debuire
687700
- Lars Vierbergen
688701
- Sylvain Lorinet
@@ -694,6 +707,7 @@ Symfony2 is the result of the work of many people who made the code better
694707
- Johannes
695708
- Jörg Rühl
696709
- patrick-mcdougle
710+
- Giacomo Gallico
697711
- andreabreu98
698712
- Michael Schneider
699713
- Jerome Tamarelle
@@ -727,6 +741,7 @@ Symfony2 is the result of the work of many people who made the code better
727741
- parhs
728742
- Oncle Tom
729743
- Xavier Amado
744+
- Andreas Forsblom
730745
- Christian Stocker
731746
- dorkitude
732747
- tirnanog06
@@ -762,6 +777,7 @@ Symfony2 is the result of the work of many people who made the code better
762777
- Philipp Hoffmann (philipphoffmann)
763778
- Alex Carol (picard89)
764779
- Daniel Perez Pinazo (pitiflautico)
780+
- Rich Sage (richsage)
765781
- Ruud Kamphuis (ruudk)
766782
- Sarah Khalil (saro0h)
767783
- Sebastian Busch (sebu)
@@ -781,11 +797,11 @@ Symfony2 is the result of the work of many people who made the code better
781797
- Michael
782798
- Xavier REN
783799
- max
800+
- Mohamed Karnichi (amiral)
784801
- Muharrem Demirci (mdemirci)
785802
- Evgeny Z (meze)
786803
- Nicolas de Marqué (nicola)
787804
- Pierre Geyer (ptheg)
788805
- Erik Saunier (snickers)
789806
- Tony Piper (tonypiper)
790807
- Vladislav Vlastovskiy (vlastv)
791-
- Christian Flothmann (xabbuh)

0 commit comments

Comments
 (0)
0