Skip to content

Commit

Permalink
merged 2.0
Browse files Browse the repository at this point in the history
  • Loading branch information
fabpot committed May 18, 2012
2 parents 1e15f21 + c9ba077 commit ec36ae7
Show file tree
Hide file tree
Showing 34 changed files with 290 additions and 66 deletions.
13 changes: 13 additions & 0 deletions CHANGELOG-2.0.md
Expand Up @@ -7,6 +7,19 @@ in 2.0 minor versions.
To get the diff for a specific change, go to https://github.com/symfony/symfony/commit/XXX where XXX is the change hash
To get the diff between two versions, go to https://github.com/symfony/symfony/compare/v2.0.0...v2.0.1

* 2.0.14 (2012-05-17)

* d1c831d: Change must-proxy-revalidate by proxy-revalidate
* 445fd2f: In console terms columns are width and rows are height
* 926ac98: [Finder] replaced static by self on a private variable
* 47605f6: [Form][DataMapper] Do not update form to data when form is read only
* c642a5e: [CssSelector] ignored an optional whitespace after a combinator
* cbc3ed3: [HttpKernel] added some constant for better forward compatibility
* 906f6f6: [DependencyInjection] fixed private services removal when used as configurators (closes #3758)
* 970d0b4: [BrowserKit] Check class existence only when required.
* 1ed8b72: Autoloader should not throw exception because PHP will continue to call other registered autoloaders.
* 7fe236a: [Security] Configure ports in RetryAuthenticationEntryPoint according to router settings

* 2.0.13 (2012-04-30)

* 5b92b9e: [Console] Selectively output to STDOUT or OUTPUT stream
Expand Down
53 changes: 32 additions & 21 deletions CONTRIBUTORS.md
Expand Up @@ -20,23 +20,23 @@ Symfony2 is the result of the work of many people who made the code better
- Joseph Bielawski (stloyd)
- Igor Wiedler (igorw)
- Hugo Hamon (hhamon)
- Eriksen Costa (eriksencosta)
- William DURAND (willdurand)
- Eriksen Costa (eriksencosta)
- Alexandre Salomé (alexandresalome)
- stealth35 (stealth35)
- Jonathan H. Wage (jwage)
- Thibault Duplessis (ornicar)
- Jakub Zalas (jakzal)
- Eric Clemmons (ericclemmons)
- Martin Hasoň (hason)
- Henrik Westphal (snc)
- Dariusz Górecki (canni)
- Tobias Schultze (Tobion)
- Miha Vrhovnik (mvrhov)
- Bulat Shakirzyanov (avalanche123)
- Martin Hasoň (hason)
- Henrik Bjørnskov (henrikbjorn)
- Francis Besset (francisbesset)
- Tobias Schultze (Tobion)
- Andrej Hudec (pulzarraider)
- Francis Besset (francisbesset)
- Kevin Bond (kbond)
- Deni (yethee)
- Arnout Boks (aboks)
Expand All @@ -53,8 +53,8 @@ Symfony2 is the result of the work of many people who made the code better
- John Wards (johnwards)
- Jean-François Simon (jfsimon)
- Daniel Holmes (danielholmes)
- Tigran Azatyan (tigranazatyan)
- Antoine Hérault (Herzult)
- Tigran Azatyan (tigranazatyan)
- Helmer Aaviksoo (helmer)
- Jacob Dreesen (jdreesen)
- umpirsky (umpirsky)
Expand All @@ -63,6 +63,7 @@ Symfony2 is the result of the work of many people who made the code better
- Fabien Pennequin (FabienPennequin)
- Richard Shank (IamPersistent)
- Benjamin Dulau (benjamindulau)
- Douglas Greenshields (shieldo)
- Christian Raue (craue)
- Grégoire Pineau (lyrixx)
- Katsuhiro OGAWA (fivestar)
Expand All @@ -75,6 +76,7 @@ Symfony2 is the result of the work of many people who made the code better
- Florin Patan (dlsniper)
- Rafael Dohms (rdohms)
- Tim Nagel (merk)
- Włodzimierz Gajda (gajdaw)
- Michel Weimerskirch (mweimerskirch)
- Javier Eguiluz (javiereguiluz)
- Joseph Rouff (rouffj)
Expand All @@ -87,12 +89,12 @@ Symfony2 is the result of the work of many people who made the code better
- Gustavo Piltcher
- Rui Marinho
- Clément JOBEILI (dator)
- Michael Holm (hollodk)
- dbu
- Julien Brochet (aerialls)
- Thomas (rande)
- Alexander (asm89)
- Gordon Franke (gimler)
- Włodzimierz Gajda (gajdaw)
- Noel GUILBERT (noelg)
- Alif Rachmawadi (subosito)
- Lars Strojny (lstrojny)
Expand All @@ -102,39 +104,40 @@ Symfony2 is the result of the work of many people who made the code better
- Jonathan Ingram (jonathaningram)
- Alessandro Desantis (alessandro1997)
- Oscar Cubo Medina (ocubom)
- Pablo Godel (pgodel)
- Dustin Whittle (dustinwhittle)
- Jean-François PHILIPPE (jfphilippe)
- Arnaud Le Blanc (arnaud-lb)
- Justin Hileman (bobthecow)
- Danny Berger (dpb587)
- Sven Paulus (subsven)
- Gábor Egyed (1ed)
- Xavier Perez (DuoSRX)
- Joel Wurtz (Brouznouf)
- Douglas Greenshields (shieldo)
- Joe Lencioni (lencioni)
- brki (brki)
- Pablo Godel (pgodel)
- Francois Zaninotto
- Leszek Prabucki (l3l0)
- Francois Zaninotto (fzaninotto)
- Gyula Sallai (thesalla)
- Xavier Montaña Carreras (xmontana)
- Andreas Hucks (meandmymonkey)
- Arjen Brouwer (arjenjb)
- Michael Holm (hollodk)
- Jérémie Augustin (jaugustin)
- Boussekeyt Jules (gordonslondon)
- Jan Sorgalla (jsor)
- Daniel Gomes (danielcsgomes)
- Lee McDermott (lmcd)
- Manuel Reinhard (sprain)
- Jeroen Hoek (jdhoek)
- Albert Jessurum (ajessu)
- Ryan Rogers (timewasted)
- flevour (flevour)
- Michel Salib (michelsalib)
- geoffrey
- Kim Hemsø Rasmussen (kimhemsoe)
- Gábor Egyed (1ed)
- Jérémie Augustin (jaugustin)
- Manuel Kiessling (ManuelKiessling)
- Bilal Amarni (bamarni)
- Tobias Naumann (tna)
- Shein Alexey (conf)
- Aurelijus Valeiša (aurelijus)
Expand All @@ -146,17 +149,21 @@ Symfony2 is the result of the work of many people who made the code better
- drak3 (drak3)
- Chris Boden (cboden)
- Dustin Dobervich (dustin10)
- Sebastian Marek (proofek)
- Olivier Dolbeau (odolbeau)
- Michele Orselli (micheleorselli)
- Andréia Bohner (andreia)
- Sebastian Bergmann (sebastianbergmann)
- Miquel Rodríguez Telep (mrtorrent)
- Peter Kokot (maastermedia)
- Jérôme Tamarelle (GromNaN)
- Jérémy Romey (jeremyFreeAgent)
- Yuen-Chi Lian (yclian)
- John Bohn (jjbohn)
- Greg Thornton (xdissent)
- andrewtch (andrewtch)
- Costin Bereveanu (schniper)
- Ondrej Slinták (ondrowan)
- Markus Lanthaler (lanthaler)
- Konstantin Leboev (realmfoo)
- Thomas Adam (tecbot)
Expand All @@ -165,19 +172,18 @@ Symfony2 is the result of the work of many people who made the code better
- Matthew Lewinski
- Kai
- Sergey Linnik (Partugal)
- Albert Jessurum (ajessu)
- Johnny Peck (johnnypeck)
- Laszlo Korte (laszlokorte)
- Hubert LECORCHE (hlecorche)
- Sergey Skopin (grizlik)
- drmonty (drmonty)
- Michael Ridgway (mridgway)
- Anthon Pang (robocoder)
- Stepan Tanasiychuk (stfalcon)
- Bertrand Zuchuat (Garfield-fr)
- Bilal Amarni (bamarni)
- Sebastien Armand (khepin)
- Sebastiaan Stok (sstok)
- Jan Schumann (janschumann)
- Olivier Dolbeau (odolbeau)
- Sebastian Marek (proofek)
- Asier Illarramendi (doup)
- Shigenobu Nishikawa (shishi)
- Marcin Sikoń (marphi)
Expand All @@ -188,12 +194,11 @@ Symfony2 is the result of the work of many people who made the code better
- Pablo Díez (pablodip)
- Fran Moreno (franmomu)
- Manuel de Ruiter (ManuelAC)
- Ondrej Slinták (ondrowan)
- Crell (Crell)
- Benoit Tirmarche (mcbennn)
- Grégoire Passault
- Ismael Ambrosi (iambrosi)
- Tom Klingenberg (ktomk)
- Daniel Gomes (danielcsgomes)
- De Cock Xavier (xdecock)
- Cristian González Sánchez (cristiangsp)
- Nils Adermann (naderman)
Expand All @@ -205,6 +210,7 @@ Symfony2 is the result of the work of many people who made the code better
- Ziumin (Ziumin)
- Aurélien Fredouelle (AurelC2G)
- Marek Kalnik (marekkalnik)
- Adán Lobato (adanlobato)
- Tiago Ribeiro (fixe)
- Geoffrey Tran (geoffreytran)
- Christian Schaefer (caefer)
Expand All @@ -220,12 +226,14 @@ Symfony2 is the result of the work of many people who made the code better
- Tom Van Looy (tvlooy)
- umpirski (umpirski)
- Neil Katin
- John Kary (johnkary)
- Peter Kokot (peterkokot)
- Hossein Bukhamsin (husinluck)
- Fabrice Bernhard (fabriceb)
- develop
- Hiromi Hishida (77web)
- Klein Florian (docteurklein)
- Stéphane PY (stephpy)
- Joshua Nye (zerosanity)
- markchalloner (markchalloner)
- Mike Lively (mlively)
Expand All @@ -234,7 +242,6 @@ Symfony2 is the result of the work of many people who made the code better
- Casper Valdemar Poulsen (cvaldemar)
- Degory Valentine
- Krzysiek Łabuś (Crozin)
- Ismael Ambrosi (iambrosi)
- Thomas Bibb (thomasbibb)
- Ivan Kurnosov
- stloyd
Expand All @@ -260,6 +267,7 @@ Symfony2 is the result of the work of many people who made the code better
- Chris Smith (cs278)
- Derek ROTH (DerekRoth)
- mwsaz
- corphi (corphi)
- Giulio De Donato (liuggio)
- Matthias (mpdude)
- Emil Einarsson (Einarsson)
Expand Down Expand Up @@ -290,13 +298,13 @@ Symfony2 is the result of the work of many people who made the code better
- Hans (drublic)
- m0ppers (m0ppers)
- Michael Shtukin (mshtukin)
- Anthon Pang (robocoder)
- Teo (teo-sk)
- Tony Piper (tonypiper)
- sensio
- Théophile Helleboid - chtitux (chtitux)
- Matthew Lewinski (lewinski)
- Markus Bachmann (Baachi)
- scoolen (scoolen)
- irmantas (irmantas)
- tero (tero)
- Vadim Tyukov (vatson)
Expand All @@ -305,7 +313,6 @@ Symfony2 is the result of the work of many people who made the code better
- Tobias Sjösten (tobiassjosten)
- Wojciech Sznapka (wowo)
- julien.galenski
- John Kary (johnkary)
- Martijn Evers (martijn4evers)
- Jeremy Bush (zombor)
- Evan Villemez (evillemez)
Expand All @@ -316,11 +323,14 @@ Symfony2 is the result of the work of many people who made the code better
- Nicolas Fabre (nfabre)
- Clément Herreman (clemherreman)
- heccjj (heccjj)
- Ringosan (Ringosan)
- Balázs Benyó (duplabe)
- Sebastian Utz (seut)
- Cédric Lahouste (RapotOR)
- George Giannoulopoulos (dotoree)
- Alberto Pirovano (geezmo)
- Xavier Briand (xavierbriand)
- Romain Geissler (Romain-Geissler)
- Carsten Nielsen (phreaknerd)
- JerikVenture (JerikVenture)
- Evan Kaufman (EvanK)
Expand Down Expand Up @@ -363,6 +373,7 @@ Symfony2 is the result of the work of many people who made the code better
- cim-dch (cim-dch)
- Dan Ordille (dordille)
- Martin Mayer (martinmayer)
- Uwe Jäger (uwej711)
- Baptiste Clavié (Taluu)
- Tuxosaurus (Tuxosaurus)
- Hugo Hamon
Expand All @@ -385,7 +396,6 @@ Symfony2 is the result of the work of many people who made the code better
- Jimmy Leger (redpanda)
- Nicolas A. Bérard-Nault
- Alexey Popkov
- Adán Lobato (adanlobato)
- Arnaud Buathier (arnapou)
- chesteroni (chesteroni)
- Elnur Abdurrakhimov (elnur)
Expand All @@ -395,6 +405,7 @@ Symfony2 is the result of the work of many people who made the code better
- Eugene Babushkin (EugeneBabushkin)
- Fabien D. (FabienD)
- Matt Drollette (MDrollette)
- Matthieu Moquet (MattKetmo)
- Kornienko Alexander (Skorney)
- Vincent (Vincent-P)
- Drew Butler
Expand Down
19 changes: 19 additions & 0 deletions src/Symfony/Bridge/Doctrine/LICENSE
@@ -0,0 +1,19 @@
Copyright (c) 2004-2012 Fabien Potencier

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is furnished
to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
19 changes: 19 additions & 0 deletions src/Symfony/Bridge/Monolog/LICENSE
@@ -0,0 +1,19 @@
Copyright (c) 2004-2012 Fabien Potencier

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is furnished
to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
19 changes: 19 additions & 0 deletions src/Symfony/Bridge/Propel1/LICENSE
@@ -0,0 +1,19 @@
Copyright (c) 2004-2012 Fabien Potencier

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is furnished
to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
19 changes: 19 additions & 0 deletions src/Symfony/Bridge/Swiftmailer/LICENSE
@@ -0,0 +1,19 @@
Copyright (c) 2004-2012 Fabien Potencier

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is furnished
to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
19 changes: 19 additions & 0 deletions src/Symfony/Bridge/Twig/LICENSE
@@ -0,0 +1,19 @@
Copyright (c) 2004-2012 Fabien Potencier

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is furnished
to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.

0 comments on commit ec36ae7

Please sign in to comment.