1. 21 Sep, 2012 2 commits
  2. 19 Sep, 2012 1 commit
    • Fabien Potencier's avatar
      merged branch alex88/patch-1 (PR #494) · 78efb9a6
      Fabien Potencier authored
      Commits
      -------
      
      eb5d0a48 Fixed missing line before list
      07b1246b Fixed null from string to vartype
      b5fb45f6 Added configuration example for external server
      
      Discussion
      ----------
      
      Added configuration example for external server
      
      Just added an example of how to configure an external smtp server for newbie users which don't know where to set it up.
      
      ---------------------------------------------------------------------------
      
      by alex88 at 2012-09-18T17:59:13Z
      
      Sorry for the errors, is it ok now?
      78efb9a6
  3. 18 Sep, 2012 10 commits
    • Alessandro Tagliapietra's avatar
      Fixed missing line before list · eb5d0a48
      Alessandro Tagliapietra authored
      eb5d0a48
    • Alessandro Tagliapietra's avatar
      07b1246b
    • Alessandro Tagliapietra's avatar
      Added configuration example for external server · b5fb45f6
      Alessandro Tagliapietra authored
      Just added an example of how to configure an external smtp server for newbie users which don't know where to set it up.
      b5fb45f6
    • Fabien Potencier's avatar
      merged branch GromNaN/patch-7 (PR #492) · 66204d6b
      Fabien Potencier authored
      Commits
      -------
      
      b0dfe797 Removes non-lib directories from archives
      
      Discussion
      ----------
      
      Removes non-lib directories from archives
      
      Removes the followind directories:
      * vendor/swiftmailer/swiftmailer/test-suite
      * vendor/twig/twig/test
      * vendor/twig/twig/ext
      66204d6b
    • Jérôme Tamarelle's avatar
      Removes non-lib directories from archives · b0dfe797
      Jérôme Tamarelle authored
      Removes the followind directories:
      vendor/swiftmailer/swiftmailer/test-suite
      vendor/twig/twig/test
      vendor/twig/twig/ext
      b0dfe797
    • Fabien Potencier's avatar
      fixed typo · 222e58b4
      Fabien Potencier authored
      222e58b4
    • Fabien Potencier's avatar
      updated deps · f04ee841
      Fabien Potencier authored
      f04ee841
    • Fabien Potencier's avatar
      merged branch GromNaN/patch-6 (PR #442) · e7ac638c
      Fabien Potencier authored
      Commits
      -------
      
      a51a9a14 Make the event dispatcher class configurable.
      
      Discussion
      ----------
      
      Make the event dispatcher class configurable.
      
      <del>After 81bafcc6</del> There is no easy way to modify event dispatcher class.
      
      This PR allows @davedevelopment to use a customized class like this #426.
      
      ---------------------------------------------------------------------------
      
      by igorw at 2012-07-18T12:36:52Z
      
      +1
      
      ---------------------------------------------------------------------------
      
      by davedevelopment at 2012-07-18T12:41:07Z
      
      +1, I'll settle for this :)
      
      ---------------------------------------------------------------------------
      
      by stof at 2012-07-18T16:23:00Z
      
      To be clear, the commit you linked is a revert of a change committed by mistake in the previous commit just a few minutes earlier.
      
      ---------------------------------------------------------------------------
      
      by GromNaN at 2012-07-18T20:59:12Z
      
      @stof indeed.
      e7ac638c
    • Fabien Potencier's avatar
      merged branch bamarni/master (PR #481) · 122c9ba9
      Fabien Potencier authored
      Commits
      -------
      
      ab54a1bd simplified form factory creation
      
      Discussion
      ----------
      
      simplified form factory creation
      122c9ba9
    • Fabien Potencier's avatar
      merged branch GromNaN/archive-composer (PR #491) · 3a8a5ece
      Fabien Potencier authored
      Commits
      -------
      
      64185928 Add stability to dev for archive skeletons (fix GH-489)
      
      Discussion
      ----------
      
      Add stability to dev for archive skeletons (fix GH-489)
      
      The Silex archives are not correctly built since the minimum-stability option was removed from composer files : a189265a
      
      There is no stable version of Silex available yet.
      
      Fix GH-489
      3a8a5ece
  4. 17 Sep, 2012 1 commit
  5. 15 Sep, 2012 3 commits
    • Fabien Potencier's avatar
      updated deps · 97e418fc
      Fabien Potencier authored
      97e418fc
    • Fabien Potencier's avatar
      merged branch igorw/stable-deps (PR #480) · 6395d4b1
      Fabien Potencier authored
      Commits
      -------
      
      20124e93 Update doctrine constraint for fat skeleton as well (danke @stof)
      99451f2a Update doctrine/dbal require-dev to 2.2 branch
      a189265a Adjust minimum-stability in skeleton files
      3bc1e736 Switch dependencies to stable versions
      
      Discussion
      ----------
      
      Switch dependencies to stable versions
      
      ---------------------------------------------------------------------------
      
      by stof at 2012-09-08T20:12:19Z
      
      you also need to update the files of the skeleton for the archives
      
      ---------------------------------------------------------------------------
      
      by igorw at 2012-09-08T20:22:33Z
      
      Both done.
      
      ---------------------------------------------------------------------------
      
      by stof at 2012-09-08T20:51:06Z
      
      Please update DBAL in the fat archive too
      6395d4b1
    • Fabien Potencier's avatar
      prevented the execution of the before middlewares when an app before filter... · 8264be8e
      Fabien Potencier authored
      prevented the execution of the before middlewares when an app before filter returns a Response (refs #452)
      8264be8e
  6. 10 Sep, 2012 3 commits
  7. 09 Sep, 2012 2 commits
  8. 08 Sep, 2012 8 commits
  9. 07 Sep, 2012 3 commits
  10. 04 Sep, 2012 1 commit
  11. 30 Aug, 2012 2 commits
    • Fabien Potencier's avatar
      merged branch mageekguy/master (PR #471) · 52c6480b
      Fabien Potencier authored
      Commits
      -------
      
      6d3e410b Use $app['db'] instead of $conn and add autoinc
      
      Discussion
      ----------
      
      Use $app['db’] instead of $conn and add an auto increment
      
      `$conn` is not `$this->conn`and is identical to `$app['db'].
      Moreover, column `id` must be auto-increment.
      
      ---------------------------------------------------------------------------
      
      by igorw at 2012-08-28T13:08:50Z
      
      Apart from that thing, looks good. 👍
      
      ---------------------------------------------------------------------------
      
      by fabpot at 2012-08-29T13:06:24Z
      
      Can you squash your commits before I merge? Thanks.
      
      ---------------------------------------------------------------------------
      
      by stof at 2012-08-29T19:55:15Z
      
      @mageekguy when squashing, you need to force the push after that. Here, you merged your remote branch, meaning you kept all the older commits as well.
      
      ---------------------------------------------------------------------------
      
      by mageekguy at 2012-08-29T20:06:49Z
      
      Know it, but my push was refused because not fast-forward.
      So i pull and push, with this result.
      And i don't kown what to do know :/.
      
      ---------------------------------------------------------------------------
      
      by igorw at 2012-08-29T20:32:21Z
      
      You need to force push. Like this: `git push --force origin master`.
      
      ---------------------------------------------------------------------------
      
      by stof at 2012-08-29T23:24:27Z
      
      @mageekguy not being a fast-forward is expected when squashing as you are rewriting the history.
      
      And in such case, git tells you about both solutions (merging and forcing the push). You choose the wrong one :)
      
      ---------------------------------------------------------------------------
      
      by stof at 2012-08-30T09:42:38Z
      
      hmm, looks like you messed something when rebasing
      
      ---------------------------------------------------------------------------
      
      by mageekguy at 2012-08-30T11:13:46Z
      
      Seems to be ok now.
      Can you confirm ?
      
      ---------------------------------------------------------------------------
      
      by stof at 2012-08-30T11:14:28Z
      
      you still have 2 unrelated commits in the branch
      
      ---------------------------------------------------------------------------
      
      by igorw at 2012-08-30T11:51:14Z
      
      Now you need to fix that whitespace issue and it should be mergeable. :)
      
      ---------------------------------------------------------------------------
      
      by igorw at 2012-08-30T12:48:02Z
      
      Alright, now it looks good.
      52c6480b
    • Frédéric Hardy's avatar
      Use $app['db'] instead of $conn and add autoinc · 6d3e410b
      Frédéric Hardy authored
      `$conn` is not `$this->conn`and is identical to `$app['db'].
      Moreover, column `id` must be auto-increment.
      6d3e410b
  12. 29 Aug, 2012 1 commit
  13. 28 Aug, 2012 2 commits
    • Fabien Potencier's avatar
      merged branch mageekguy/patch-1 (PR #470) · 46639282
      Fabien Potencier authored
      Commits
      -------
      
      352497b2 Add / to FallbackResource apache directive
      
      Discussion
      ----------
      
      Add / to FallbackResource apache directive
      
      If you don't add the slash, you can have the error `Request exceeded the limit of 10 subrequest nesting levels due to probable confguration error.` when the requested URL is, for example, /foo/bar.
      46639282
    • Frédéric Hardy's avatar
      Add / to FallbackResource apache directive · 352497b2
      Frédéric Hardy authored
      If you don't add the slash, you can have the error `Request exceeded the limit of 10 subrequest nesting levels due to probable confguration error.` when the requested URL is, for example, /foo/bar.
      352497b2
  14. 23 Aug, 2012 1 commit