1. 09 Sep, 2012 1 commit
  2. 08 Sep, 2012 5 commits
  3. 07 Sep, 2012 3 commits
  4. 04 Sep, 2012 1 commit
  5. 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
  6. 29 Aug, 2012 1 commit
  7. 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
  8. 23 Aug, 2012 4 commits
  9. 21 Aug, 2012 1 commit
  10. 08 Aug, 2012 2 commits
    • Fabien Potencier's avatar
      merged branch ShaunK/patch-1 (PR #461) · 6d7cf048
      Fabien Potencier authored
      Commits
      -------
      
      a9da5bbc Fixed missing use statement in Forwards example
      
      Discussion
      ----------
      
      Fixed missing use statement in Forwards example
      
      The example provided in the Forwards section didn't work for me as presented. I added a use statement to the example to make it clearer.
      6d7cf048
    • Shaun Kiernan's avatar
      Fixed missing use statement in Forwards example · a9da5bbc
      Shaun Kiernan authored
      The example provided in the Forwards section didn't work for me as presented. I added a use statement to the example to make it clearer.
      a9da5bbc
  11. 04 Aug, 2012 1 commit
  12. 03 Aug, 2012 2 commits
    • Fabien Potencier's avatar
      updated deps · a6af6f1e
      Fabien Potencier authored
      a6af6f1e
    • Fabien Potencier's avatar
      merged branch henrikbjorn/form-httpfoundation (PR #458) · 9566175f
      Fabien Potencier authored
      Commits
      -------
      
      1981d132 Updated FormServiceProvider documentation to not use the deprecated `bindRequest` method
      a12b0cc4 Add HttpFoundationExtension to FormServiceProvider.
      
      Discussion
      ----------
      
      Add HttpFoundationExtension to FormServiceProvider.
      
      This closes all of the issues with `$form->bind($request)` does not
      work issues.
      
      ---------------------------------------------------------------------------
      
      by stof at 2012-08-01T22:56:23Z
      
      this fixes #457
      
      ---------------------------------------------------------------------------
      
      by thomasjbradley at 2012-08-02T15:45:47Z
      
      I'd love to have this merged soon. I've been recording a bunch of screen casts for my students and this bug is kinda a show-stopper. Thanks!
      
      ---------------------------------------------------------------------------
      
      by alexandresalome at 2012-08-02T15:55:27Z
      
      If you're in a hurry:
      
          cd /path/to/your/project
          cd vendor/silex/silex
          git remote add henrikbjorn https://github.com/henrikbjorn/Silex.git
          git fetch henrikbjorn
          git checkout henrikbjorn/form-httpfoundation
      
      This will do the job temporarly
      
      ---------------------------------------------------------------------------
      
      by bradlet at 2012-08-02T15:58:38Z
      
      Thanks so much; I really appreciate it!
      
      ---------------------------------------------------------------------------
      
      by bradlet at 2012-08-02T16:16:58Z
      
      I'm a little confused. This update breaks form validation using the constraints array option, like in the Silex docs:
      
      ```php
      <?php
      $form = $app['form.factory']->createBuilder('form')
          ->add('name', 'text', array(
              'constraints' => array(new Assert\NotBlank(), new Assert\MinLength(5))
          ))
      ```
      
      It throws a `Symfony\Component\OptionsResolver\Exception\InvalidOptionsException`.
      
      Is this something that is no longer allowed within Silex?
      Do we need to now make classes like in the Symfony Forms component documentation?
      9566175f
  13. 02 Aug, 2012 1 commit
  14. 01 Aug, 2012 1 commit
  15. 31 Jul, 2012 3 commits
  16. 30 Jul, 2012 2 commits
  17. 25 Jul, 2012 2 commits
  18. 22 Jul, 2012 2 commits
  19. 20 Jul, 2012 1 commit
  20. 19 Jul, 2012 1 commit
  21. 18 Jul, 2012 2 commits