Skip to content
Commits on Dec 11, 2014
  1. @enov
Commits on Nov 11, 2014
  1. @acoulton

    Merge pull request #70 from kohana/3.2/master

    acoulton committed
    Merge 3.2/master into 3.3/develop
    
    Closes #70, merged manually due to github merge problem
Commits on Oct 10, 2014
  1. @acoulton

    Update copyright year in userguide footer

    acoulton committed
    Identified by @aaronott in #60 but applied manually to target
    3.3 and because it's now a year since he changed it and it needs
    changed again...
    
    Closes #60
  2. @acoulton

    Merge pull request #53 from @Mytho

    acoulton committed
    Improved documentation comments
    
    Fixes #53
    
    Conflicts:
    	classes/Kohana/Controller/Userguide.php
    	classes/Kohana/Kodoc/Markdown.php
  3. @acoulton

    Merge pull request #58 from KostyaTretyak/3.3/develop

    acoulton committed
    Added preg_match() for generating link for 'uses constant'
  4. @acoulton

    Merge pull request #57 from feketegy/3.3/develop

    acoulton committed
    Changed sidebar menu style, dropped expand/collapse functionality
  5. @acoulton

    Merge pull request #55 from visualfanatic/3.3/hide-breadcrumbs

    acoulton committed
    Hide breadcrumbs if there is only one element
  6. @acoulton

    Merge pull request #44 from cbandy:3.3/feature/phpcs-cleanup

    acoulton committed
    Fixes Coding Standard violations - applied manually to resolve
    conflicts. The controller fixes have been reapplied to
    Kohana_Controller_Userguide.
    
    Fixes #44
    
    Conflicts:
    	classes/Controller/Userguide.php
  7. @acoulton

    Merge pull request #50 from randomecho/3.3/develop

    acoulton committed
    Copyedits on Adding page, breaking it down into sections
  8. @acoulton

    Add travis build badges

    acoulton committed
    [skip ci]
Commits on Sep 23, 2014
  1. @enov

    Merge pull request #63 from kohana/3.3/feat/travis-module-build

    enov committed
    Configure Koharness for standalone Travis build
Commits on Sep 22, 2014
  1. @acoulton
Commits on Sep 18, 2014
  1. @acoulton

    Merge pull request #64 from kohana/3.3/bugfix/4814/duplicate-line-of-…

    acoulton committed
    …code
    
    Resolves R4814 by removing duplicate line of code
    
    fixes #61
  2. @enov
Commits on Sep 17, 2014
  1. @acoulton

    Configure standalone travis build

    acoulton committed
    Adds and configures kohana/koharness to build a skeleton Kohana
    application and then uses that environment to run the unit tests
    on travis (and locally, if required).
    
    Continues kohana/kohana#50
Commits on May 7, 2014
  1. @shadowhand
Commits on Jan 28, 2014
  1. @Zeelot

    Merge pull request #61 from paulsschwarz/3.2/develop

    Zeelot committed
    Resolves #4814 by removing duplicate line of code.
Commits on Jan 24, 2014
  1. @paulschwarz
Commits on Oct 2, 2013
Commits on Aug 27, 2013
  1. @feketegy
Commits on Aug 26, 2013
  1. @Zeelot
  2. @Zeelot

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

    Zeelot committed
    …kage-definition
    
    3.3/feature/4776/composer package definition (refs #4776)
Commits on Aug 19, 2013
  1. @acoulton
Commits on Aug 3, 2013
  1. Don't show breadcrumbs if there is only one link

    webking committed
Commits on May 31, 2013
  1. @Zeelot

    Merge pull request #54 from LekisS/3.3/develop

    Zeelot committed
    refs #4659: fixed redirection
Commits on Feb 7, 2013
  1. @LekisS

    refs #4659: fixed redirection

    LekisS committed
Commits on Jan 16, 2013
  1. @Mytho

    Improved documentation comments

    Mytho committed
    - Consistent copyright (2012 -> 2013)
    - Fixed incorrect license link
Commits on Aug 24, 2012
  1. @zombor
Commits on Aug 12, 2012
  1. @Zeelot

    Merge branch '3.2/develop' into 3.3/develop

    Zeelot committed
    refs #4544
  2. @Zeelot

    Merge pull request #52 from diogotozzi/3.2/develop

    Zeelot committed
    3.2/develop Fixing to $config->load() instance to read the configuration file.
    
    refs #4274
Commits on Jun 20, 2012
Commits on Jun 6, 2012
  1. @Zeelot

    Merge branch '3.2/develop' into 3.3/develop

    Zeelot committed
    refs #4150
  2. @Zeelot

    Merge branch '3.1/develop' into 3.2/develop

    Zeelot committed
    refs #4149
    
    Conflicts:
    	classes/kohana/controller/userguide.php
    	i18n/de.php
    	i18n/es.php
    	i18n/fr.php
    	i18n/he.php
    	i18n/nl.php
    	i18n/ru.php
    	i18n/zh.php
  3. @Zeelot

    remove all uses of __() refs #4148

    Zeelot committed
    The userguide pages are not translated and only one language
    even had entries for this stuff! No point translating 0.001%
    of the content.
Commits on Jun 5, 2012
  1. @Zeelot

    Merge branch '3.2/develop' into 3.3/develop

    Zeelot committed
    refs #4552
    
    Conflicts:
    	classes/Controller/Userguide.php
Something went wrong with that request. Please try again.