Skip to content
Commits on Feb 1, 2013
  1. @stloyd @fabpot

    Update `composer.json` files: - to allow versions ~2.2 (>=2.2,<3.0) o…

    stloyd committed with fabpot
    …f Doctrine DBAL, ORM & Common - fixed Propel1 versions difference between main and bridge files - fixed Twig versions difference between main and bridge files - to allow versions ~1.11 (>=1.11,<2.0) of Twig - fixed Locale ext-intl version to accept all, not non-existing version
Commits on Jan 23, 2013
  1. @fabpot
Commits on Jan 9, 2013
  1. @Seldaek
Commits on Jan 8, 2013
  1. @Seldaek
Commits on Jan 5, 2013
  1. @fabpot

    Merge branch '2.1'

    fabpot committed
    * 2.1:
      [Console] made Application::getTerminalDimensions() public
      Revert "merged branch egeloen/f-2.0-terminal-width (PR #6571)"
      [2.1] [Console] Added getTerminalDimensions() with fix for osx/freebsd
      Restrict Monolog version to be in version `<1.3`. Because of conflict between `HttpKernel/Log/LoggerInterface` and `Psr\Log\LoggerInterface` (PSR-3)
    
    Conflicts:
    	composer.json
  2. @stloyd

    Restrict Monolog version to be in version `<1.3`.

    stloyd committed
    Because of conflict between `HttpKernel/Log/LoggerInterface` and `Psr\Log\LoggerInterface` (PSR-3)
Commits on Dec 13, 2012
  1. @fabpot
Commits on Dec 6, 2012
  1. @hason
Commits on Nov 10, 2012
  1. @vicb

    Add missing symfony/stopwatch in the replace section of composer.json

    vicb committed
    And order the sections alphabeticaly for easier navigation
Commits on Oct 18, 2012
  1. @fabpot

    Merge branch '2.1'

    fabpot committed
    * 2.1: (28 commits)
      Delete use of CreationExeption
      [Form] Fixed error message in PropertyPath to not advice to use a non-existing feature
      [Form] Fixed creation of multiple money fields with different currencies
      [Form] Fixed setting the "data" option to an object in "choice" and "entity" type
      Fixed Serbian plural translations.
      Fixed IPv6 Check in RequestMatcher
      Fix typo
      change what I think is a typo
      [Console] Fix error when mode is not in PATH
      [WebProfilerBundle] fixed macro usage (to be forward compatible with Twig 2.x)
      Change monolog require-dev to use the branch alias instead of dev-master
      [FrameworkBundle] partially reverted previous merge
      [2.1] Added missing error return codes in commands
      Made the router lazy when setting the context
      [WebProfilerBundle] fixed typos
      Fix incorrect variable in FileProfilerStorage
      UnitTest fix
      UnitTest fix
      added a unit test
      fixed #5384
      ...
Commits on Oct 14, 2012
  1. @igorw
Commits on Sep 29, 2012
  1. @fabpot

    merged branch jalliot/autoloader-update (PR #5213)

    fabpot committed
    This PR was merged into the master branch.
    
    Commits
    -------
    
    92e10a8 Updated HttpFoundation and Locale for proper Composer autoloading
    
    Discussion
    ----------
    
    Updated HttpFoundation and Locale for proper Composer autoloading
    
    This PR uses better Composer autoloading strategy for the stubs in HttpFoundation and Locale.
    
    It also fixes a bug inside HttpFoundation's composer.json file where the path for SessionHandlerInterface was wrong.
    
    [![Build Status](https://secure.travis-ci.org/jalliot/symfony.png?branch=autoloader-update)](http://travis-ci.org/jalliot/symfony)
    
    After merging this PR and updating the vendors of the SE, you can also merge symfony/symfony-standard#387
    
    ---------------------------------------------------------------------------
    
    by datiecher at 2012-09-05T11:15:39Z
    
    Any updates on this issue?
    
    ---------------------------------------------------------------------------
    
    by jalliot at 2012-09-05T16:43:46Z
    
    Well I guess it is up to @fabpot to decide now :)
    
    ---------------------------------------------------------------------------
    
    by drak at 2012-09-07T11:59:22Z
    
    > It also fixes a bug inside HttpFoundation's composer.json file where the path for SessionHandlerInterface was wrong.
    
    If so should be part of a separate PR imo.
Commits on Sep 28, 2012
  1. @Slamdunk

    Optimize autoload prefix in composer.json

    Slamdunk committed
    By having more specific autoload prefixes it is possible to reduce the
    number of stat calls made. Also it prevents conflicts with similar
    namespaces.
Commits on Sep 13, 2012
  1. @fabpot

    merged 2.1

    fabpot committed
Commits on Sep 10, 2012
  1. @fabpot
  2. @fabpot

    merged 2.1

    fabpot committed
  3. @fabpot
Commits on Sep 6, 2012
  1. @fabpot

    udpated composer.json to 2.2

    fabpot committed
Commits on Aug 8, 2012
  1. @jalliot
Commits on Jul 31, 2012
  1. @vicb
Commits on Jul 22, 2012
  1. @webmozart

    [Form] Improved FormRenderer API to reduce the size of the function c…

    webmozart committed
    …all stack during rendering
Commits on Jul 15, 2012
  1. @fabpot
Commits on Jul 13, 2012
  1. @fabpot

    raised the minimum version of PHP to 5.3.4 (closes #3856)

    fabpot committed
    We've raised the minimum version of PHP because of a PHP
    bug before 5.3.4:
    
    https://bugs.php.net/bug.php?id=52083
    https://bugs.php.net/bug.php?id=50027
Commits on Jul 4, 2012
  1. @stof
Commits on Jun 20, 2012
  1. @fabpot

    merged 2.0

    fabpot committed
Commits on Jun 19, 2012
  1. @stof
Commits on May 20, 2012
  1. @stof

    Added missing dependency to doctrine common in the global composer.json

    stof committed
    Doctrine Common is a dependency of FrameworkBundle for the annotation
    reader.
Commits on May 17, 2012
  1. @stof
Commits on May 14, 2012
  1. @webmozart
  2. @webmozart
Commits on May 8, 2012
  1. @fabpot
Commits on May 7, 2012
  1. @fabpot

    updated minimum PHP version to 5.3.3

    fabpot committed
    5.3.3 has some interesting fixes and this is the version used by
    Redhat 6 and Debian 6
Commits on Apr 27, 2012
  1. @fabpot

    Revert "merged branch Seldaek/master (PR #4133)"

    fabpot committed
    This reverts commit 00e7a94, reversing
    changes made to a01dec0.
  2. @Seldaek

    Update branch aliases

    Seldaek committed
Commits on Apr 25, 2012
  1. @fabpot

    merged 2.0

    fabpot committed
Something went wrong with that request. Please try again.