Permalink
Commits on Jun 4, 2012
  1. Merge pull request #1471 from EmilioBravo/2.1/develop

    calling $this->add_package_path(SHARED_ADDONPATH); before parent constru...
    jerel committed Jun 4, 2012
  2. calling $this->add_package_path(SHARED_ADDONPATH); before parent cons…

    …truct was preventing PyroCMS from loading libraries directly from /addons/shared_addons
    EmilioBravo committed Jun 4, 2012
Commits on Jun 3, 2012
  1. Regex for Twitter feeds was breaking with emails.

    Phil Sturgeon committed Jun 3, 2012
  2. Merge branch 'release/2.1.2' into 2.1/develop

    Phil Sturgeon committed Jun 3, 2012
  3. Merge branch 'release/2.1.2' into 2.1/master

    Phil Sturgeon committed Jun 3, 2012
  4. Updated version numbers for 2.1.2.

    Phil Sturgeon committed Jun 3, 2012
  5. Fixed conflicts.

    Phil Sturgeon committed Jun 3, 2012
  6. Merge branch 'release/2.0.4' into 2.0/master

    Phil Sturgeon committed Jun 3, 2012
  7. Released 2.0.4.

    Phil Sturgeon committed Jun 3, 2012
  8. Merge branch '2.0/master' of github.com:pyrocms/pyrocms into release/…

    …2.0.4
    Phil Sturgeon committed Jun 3, 2012
  9. Fixed conflicts.

    Phil Sturgeon committed Jun 3, 2012
  10. Only unit test the unit tests branch.

    Phil Sturgeon committed Jun 3, 2012
Commits on May 31, 2012
  1. Fixed minor XSS issue in blog categories module.

    Phil Sturgeon committed May 31, 2012
  2. Fixed minor XSS issue in blog categories module.

    Phil Sturgeon committed May 31, 2012
  3. Merge pull request #1467 from jagcrete/2.1/develop

    Fixed bug where username became foo123 instead of foo3
    jerel committed May 31, 2012
Commits on May 29, 2012
  1. Merge branch '2.1/develop' of github.com:pyrocms/pyrocms into 2.1/dev…

    …elop
    Phil Sturgeon committed May 29, 2012
  2. Added $vars back, which should go soon.

    Phil Sturgeon committed May 29, 2012
  3. Don't really know what that was doing.

    Phil Sturgeon committed May 29, 2012
  4. Make error reporting be always true, just HIDE errors in production.

    Signed-off-by: Phil Sturgeon <email@philsturgeon.co.uk>
    Phil Sturgeon committed May 29, 2012
  5. Merged conflicts in users.php

    Phil Sturgeon committed May 29, 2012
Commits on May 27, 2012
  1. Travis blacklist

    toopay committed May 27, 2012
  2. Travis blacklist

    toopay committed May 27, 2012
Commits on May 21, 2012
Commits on May 20, 2012
  1. Added cookie prefix config to the installer. If you've recently insta…

    …lled from
    
    develop you may want to update your config file
    jerel committed May 20, 2012
  2. Pagination option override replaces whole array

    Phil Sturgeon committed May 20, 2012
  3. Merge branch '2.1/develop' of github.com:pyrocms/pyrocms into 2.1/dev…

    …elop
    Phil Sturgeon committed May 20, 2012