Commits on Aug 26, 2013
  1. @Zeelot
  2. @Zeelot

    Merge pull request #88 from ingenerator/3.3/feature/4776/composer-pac…

    …kage-definition
    
    3.3/feature/4776/composer package definition (refs #4776)
    Zeelot committed Aug 25, 2013
Commits on Aug 24, 2013
  1. @Zeelot

    Merge pull request #89 from melvinmt/bugfix/4765

    fix bug count_all w/ ->object_name (refs #4765)
    Zeelot committed Aug 24, 2013
  2. @melvinmt
Commits on Aug 19, 2013
  1. @acoulton
Commits on Jul 29, 2013
  1. @Zeelot

    Merge pull request #86 from hinton/3.3/develop

    Refs #4730, Fixed Auth_ORM::logged_in not working if $role is an ORM object.
    Zeelot committed Jul 29, 2013
Commits on Jul 24, 2013
  1. @Hinton
Commits on Jul 6, 2013
  1. @Zeelot

    Merge pull request #85 from rjd22/3.3/bugfix/fix_docs_mistake_for_cou…

    …nt_relations
    
    Refs #4750: Fixes API guide issue for count_relations
    Zeelot committed Jul 6, 2013
Commits on Jun 20, 2013
  1. Refs #4750: Fixes API guide issue for count_relations

    Robert-Jan de Dreu committed Jun 20, 2013
Commits on May 31, 2013
  1. @Zeelot

    Merge pull request #83 from neo22s/patch-2

    Update ORM.php
    refs #4652
    Zeelot committed May 30, 2013
Commits on May 30, 2013
  1. @neo22s

    Update ORM.php

    neo22s committed May 31, 2013
Commits on May 2, 2013
  1. @Zeelot

    Merge pull request #81 from shadlaws/3.3/develop

    Change _initialize() to set the object name only if none predefined.  Fixes #4733
    Zeelot committed May 2, 2013
  2. @Zeelot

    Merge pull request #82 from bharat/3.3/develop

    Make ORM::count_all() return an integer instead of a string.
    
    refs #4737
    Zeelot committed May 1, 2013
Commits on Apr 30, 2013
  1. @bharat
Commits on Apr 28, 2013
  1. @bharat
Commits on Apr 21, 2013
  1. @shadlaws

    Change _initialize() to set the object name only if none predefined.

    This follows the same pattern as object plural and table name, and gives devs the freedom to set their own name.  This is useful, for example, if you want to translate "Model_FooBar" to "foo_bar" instead of "foobar".
    shadlaws committed Apr 21, 2013
Commits on Oct 21, 2012
  1. @Zeelot
Commits on Oct 13, 2012
  1. @Zeelot

    Merge pull request #74 from synchrone/3.3/develop

    Updating Kohana_ORM PHPDoc (refs #4447)
    Zeelot committed Oct 13, 2012
  2. Updating Kohana_ORM PHPDoc (refs #4447)

    Alexander Bogdanov committed Oct 13, 2012
Commits on Oct 1, 2012
  1. @Zeelot

    remove type column (refs #4588)

    Zeelot committed Sep 30, 2012
Commits on Jul 26, 2012
  1. @Zeelot

    Merge branch '3.2/develop' into 3.3/develop

    refs (#4572)
    Zeelot committed Jul 25, 2012
  2. @Zeelot

    Merge pull request #52 from radsystems/3.2/develop

    Fixes #4420 - ORM belongs_to relationships can now be set to NULL
    Zeelot committed Jul 25, 2012
  3. @Zeelot

    Merge branch '3.2/develop' into 3.3/develop

    refs (#4571)
    Zeelot committed Jul 25, 2012
  4. @Zeelot

    Merge pull request #51 from kiddivouchers/issue/4244

    Store PK if it has been set on a created model, fixes #4244
    Zeelot committed Jul 25, 2012
  5. @Zeelot

    Merge branch '3.2/develop' into 3.3/develop

    refs (#4570)
    Zeelot committed Jul 25, 2012
  6. @Zeelot
Commits on Jun 2, 2012
  1. @Zeelot

    Merge branch '3.2/develop' into 3.3/develop

    refs #4536
    Zeelot committed Jun 2, 2012
  2. @Zeelot

    Merge branch '3.1/develop' into 3.2/develop

    refs #4535
    Zeelot committed Jun 2, 2012
  3. @Zeelot
  4. @Zeelot

    Merge branch '3.2/develop' into 3.3/develop

    refs #4534
    Zeelot committed Jun 1, 2012
  5. @Zeelot

    Merge branch '3.1/develop' into 3.2/develop

    refs #4533
    Zeelot committed Jun 1, 2012
  6. @Zeelot

    fix documentation grammar

    refs #4056
    Zeelot committed Jun 1, 2012
  7. @Zeelot
Commits on Jun 1, 2012
  1. Merge 3.3/develop with 3.2/develop

    Isaiah DeRose-Wilson committed May 31, 2012
  2. Merge branch '3.1/develop' into 3.2/develop

    Isaiah DeRose-Wilson committed May 31, 2012