Permalink
Commits on Jan 9, 2012
  1. Fix failing test in App.

    markstory committed Jan 9, 2012
  2. Merge branch '2.0' into 2.1

    markstory committed Jan 9, 2012
    Conflicts:
    	lib/Cake/Model/BehaviorCollection.php
    	lib/Cake/basics.php
  3. Fix issue with find(count) and translated conditions.

    markstory committed Jan 8, 2012
    Because count queries did not have joins created for the translated
    fields pagination would generate invalid queries. Checking the conditions
    for translated fields and adding in the correct joins solves that.
    Extract what would have been duplicated code into methods.
    
    Add a few protected properties to keep method signatures sane. The code
    could be even simpler if the existing find(count) join was removed.
    
    Fixes #2349
Commits on Jan 8, 2012
  1. Fix failing test.

    markstory committed Jan 8, 2012
  2. Remove incorrect constant.

    markstory committed Jan 8, 2012
  3. Fix a few problems with the build.xml

    markstory committed Jan 6, 2012
    - Fix condition checking. Phing was barfing on the old 'code'
    - Packages would always be made for the previous release.  Fix that.
    - Check return codes so we don't blunder ahead when things go wrong.
    - Put in invalid data so accidents don't happen.
  4. Add other core members.

    markstory committed Jan 5, 2012
  5. distribute target works

    markstory committed Jan 5, 2012
  6. Update build definition.

    markstory committed Jan 2, 2012
  7. Add help and docs.

    markstory committed Jan 2, 2012
  8. Remove un-used property.

    markstory committed Dec 29, 2011
  9. Update core cake.php to match other versions.

    markstory committed Dec 29, 2011
    This makes the pear package install play nice as well.
  10. Revert version number change.

    markstory committed Dec 29, 2011
    Add trim to fix cli display.
  11. Add distribute task.

    markstory committed Dec 29, 2011
    Once the pear channel is setup, this will publish tar
    files to the pear channel.
  12. Add next-version task.

    markstory committed Dec 28, 2011
  13. Adding phing build.xml

    markstory committed Dec 28, 2011
Commits on Jan 7, 2012
  1. Initializing CakeSession class only when required, mixing procedural …

    lorenzo committed Jan 7, 2012
    …code with class definitions is not good
  2. Using an explicit fetch mode in all calls to PDOStatement::fetch, thi…

    lorenzo committed Jan 7, 2012
    …s also reduces the memory usage
  3. Fix illegal offset caused by TranslateBehavior.

    markstory committed Jan 7, 2012
    If you load TranslateBehavior at runtime in a disabled state, the enabled
    flag would be interpreted as an association and cause errors.
    
    Fixes #2443
  4. Update Configure::load() to use Set::merge()

    markstory committed Jan 7, 2012
    This Fixes some of the awkward behavior that using
    array_merge_recursive() could create.
    
    Fixes #2441