Permalink
Commits on Jan 22, 2014
  1. @aembler

    fixing incorrect status message

    aembler committed Jan 22, 2014
  2. @aembler

    Merge pull request #1567 from mlocati/fix-page-getcollectionpathfromid

    Fix Page::getCollectionPathFromID
    aembler committed Jan 22, 2014
Commits on Jan 21, 2014
  1. @aembler

    Merge pull request #1565 from Remo/patch-65

    reset replyto in mail helper
    aembler committed Jan 21, 2014
  2. @aembler

    Merge pull request #1566 from Remo/bind-variables

    use bind variables in SQL queries
    aembler committed Jan 21, 2014
  3. @aembler

    Merge pull request #1515 from mlocati/normalize-onsubmit-handling-add…

    …-collection
    
    Normalize form submission event handler
    aembler committed Jan 21, 2014
Commits on Jan 13, 2014
  1. @mlocati

    Fix Page::getCollectionPathFromID

    getCollectionPathFromID should return the canonical path of a page.
    
    This fix will fix this, by ordering by ppIsCanonical in descendant order,
    so that the first row (ie the returned one) is the one with
    ppIsCanonical = 1
    mlocati committed Jan 13, 2014
Commits on Jan 11, 2014
  1. @Remo
  2. @Remo
  3. @Remo
Commits on Jan 10, 2014
  1. @aembler
Commits on Jan 6, 2014
  1. @aembler

    reverting broken model change

    aembler committed Jan 6, 2014
Commits on Jan 3, 2014
  1. @aembler

    Merge pull request #1557 from worldskills/error_reporting

    Show errors in install script
    aembler committed Jan 3, 2014
  2. @aembler

    Merge pull request #1530 from mkly/cleanup_model_class

    Remove Unnecessary Code from Model Class
    aembler committed Jan 3, 2014
  3. @aembler

    Merge pull request #1534 from mkly/fire_group_events_userinfo_update_…

    …groups
    
    Fire group events in `UserInfo::updateGroups()`
    aembler committed Jan 3, 2014
  4. @aembler

    Merge pull request #1535 from mkly/fix_tag_block_save_stacks_dashboard

    Fix Tags Block Save in Stacks Dashboard Page
    aembler committed Jan 3, 2014
  5. @aembler

    Merge pull request #1558 from mlocati/avoid-redirect-check-when-c5_en…

    …vironment_only
    
    Don't check for redirect if C5_ENVIRONMENT_ONLY
    aembler committed Jan 3, 2014
Commits on Dec 16, 2013
  1. @mlocati

    Don't check for redirect if C5_ENVIRONMENT_ONLY

    When C5_ENVIRONMENT_ONLY is set to true, the concrete5 should sanitize the
    current URL.
    mlocati committed Dec 16, 2013
Commits on Dec 14, 2013
  1. @aembler

    Merge pull request #1547 from patrickheck/db-backup-width

    make db backup container wider
    aembler committed Dec 14, 2013
  2. @aembler

    Merge pull request #1551 from mkly/fix_reinstall_cli

    Fix reinstall flag in cli
    aembler committed Dec 14, 2013
Commits on Dec 13, 2013
  1. @aembler

    Update README.md

    aembler committed Dec 13, 2013
Commits on Dec 12, 2013
  1. @fabian

    Show errors in install script

    fabian committed Dec 12, 2013
Commits on Dec 11, 2013
  1. @mkly

    Fix reinstall flag in cli

    - Change to check `$config['reinstall']` as `$reinstall` is never set
    mkly committed Dec 11, 2013
Commits on Dec 9, 2013
  1. @patrickheck
Commits on Dec 3, 2013
  1. @mkly

    Fix Tags Block Save in Stacks Dashboard Page

    Fix tags blocks save in stacks dashboard page.
    
    Block does not save propertly when in stacks dashboard page as blocks
    are unable to save to the page based on `$_REQUEST['cID']` as they are
    expecting to be in a page not a dashboard dialog.
    
    - Check for being in the Stack Dashboard page and display accordingly
    - Do not show tag attribute form in add / edit in dashboard page
    mkly committed Dec 3, 2013
Commits on Dec 2, 2013
  1. @aembler

    Merge pull request #1533 from mkly/fix_group_set_permission_access_en…

    …tity_2
    
    Fix GroupSetPermissionAccessEntity property load
    aembler committed Dec 2, 2013
  2. @aembler

    Merge pull request #1532 from mkly/fix_group_set_permission_access_en…

    …tity_1
    
    Fix GroupSetPermissionAccessEntity ingids
    aembler committed Dec 2, 2013
  3. @mkly

    Fire group events in `UserInfo::updateGroups()`

    Fire on_user_enter_group and on_user_exit_group in
    `UserInfo::updateGroups()`
    
    `UserInfo::updateGroups()` does not call `User::exitGroup()` and
    `User::enterGroup()` and instead used single SQL `DELETE`.
    
    - Fire group events for each group removed or added
    mkly committed Dec 2, 2013
Commits on Dec 1, 2013
  1. @mkly

    Fix GroupSetPermissionAccessEntity property load

    Fix `GroupSetPermissionAccessEntity::getAccessEntityUsers()` accessing
    of unset `groupset` property
    
    - Check if `$this->groupset` is set and attempt to load it if not
      set by calling `GroupSetPermissionAccessEntity::load()`
    
    Of note is that this could still fail with a fatal error if the gID
    does not exist and the `load()` method still does not set `groupset`
    mkly committed Dec 1, 2013
  2. @mkly

    Fix GroupSetPermissionAccessEntity ingids

    Fix `GroupSetPermissionAccessEntity::getAccessEntityUsers()` ingids
    
    - Change `foreach` to iterate throup `$groups` array as opposed to an
      undefined `$user` variable
    mkly committed Dec 1, 2013
Commits on Nov 20, 2013
  1. @mkly

    Remove Unnecessary Code from Model Class

    Remove Unnecessary Code from Model Class
    
    `Model::__construct()` does not actually accomplish anything anymore. It
    is just a stub to `ADOdb_Active_Record`
    
    - Pass onto parent class by removing stub constructor
    mkly committed Nov 20, 2013
  2. @aembler

    Merge pull request #1402 from JohntheFish/patch-13

    Illegal Job run duration causes a database exception
    aembler committed Nov 20, 2013
  3. @aembler

    Merge pull request #1528 from worldskills/php-versions

    Test multiple PHP versions
    aembler committed Nov 20, 2013
  4. @aembler

    Merge pull request #1529 from mlocati/fix-test-readme

    Update tests/README.md
    aembler committed Nov 20, 2013
  5. @aembler

    Merge pull request #1527 from worldskills/iconv

    IGNORE must be before TRANSLIT in iconv
    aembler committed Nov 20, 2013
  6. @mlocati

    Fix sample output

    mlocati committed Nov 20, 2013