Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: sirkris/phpSQL
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: sirkris/phpSQL
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: develop
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 15 commits
  • 7 files changed
  • 3 contributors

Commits on Sep 13, 2012

  1. SQL configuration.

    @sirkris
    sirkris committed Sep 13, 2012
    Configuration menu
    Copy the full SHA
    adbe995 View commit details
    Browse the repository at this point in the history

  2. Attempt to load the main configuration. If module is not bundled with… 

    … phpNova, it will load the placeholder config skeleton instead.
    @sirkris
    sirkris committed Sep 13, 2012
    Configuration menu
    Copy the full SHA
    bee6acf View commit details
    Browse the repository at this point in the history

  3. Stand-alone config class. Loaded ONLY if phpNova config can't be load… 

    …ed (i.e. probably doesn't exist). This allows for modular cherry-picking without breaking anything.
    @sirkris
    sirkris committed Sep 13, 2012
    Configuration menu
    Copy the full SHA
    e2edfc8 View commit details
    Browse the repository at this point in the history

  4. SQL class for the php_mysqli extension.

    @sirkris
    sirkris committed Sep 13, 2012
    Configuration menu
    Copy the full SHA
    bfaef6d View commit details
    Browse the repository at this point in the history

  5. Merge branch 'Kris_Main' into develop

    @sirkris
    sirkris committed Sep 13, 2012
    Configuration menu
    Copy the full SHA
    715bf2b View commit details
    Browse the repository at this point in the history

  6. Dependencies file.

    Kris Craig (R&D Manager) committed Sep 13, 2012
    Configuration menu
    Copy the full SHA
    fe7f6ff View commit details
    Browse the repository at this point in the history

  7. Merge branch 'Kris_Dependencies' into develop

    Kris Craig (R&D Manager) committed Sep 13, 2012
    Configuration menu
    Copy the full SHA
    7598050 View commit details
    Browse the repository at this point in the history

  8. Added legacy php_mysql class.

    Kris Craig (R&D Manager) committed Sep 13, 2012
    Configuration menu
    Copy the full SHA
    c8c9301 View commit details
    Browse the repository at this point in the history

  9. Merge branch 'Kris_php_mysql' into develop

    Kris Craig (R&D Manager) committed Sep 13, 2012
    Configuration menu
    Copy the full SHA
    757335f View commit details
    Browse the repository at this point in the history

  10. Updated config logic. What we end up with is a V-shaped 'bounce' effe… 

    …ct, but this will enable us to set the db type outside the main configuration file, so I think it's a fair trade-off.
    Kris Craig (R&D Manager) committed Sep 13, 2012
    Configuration menu
    Copy the full SHA
    d9eb234 View commit details
    Browse the repository at this point in the history

  11. Merge branch 'Kris_Logic' into develop

    Kris Craig (R&D Manager) committed Sep 13, 2012
    Configuration menu
    Copy the full SHA
    b11c135 View commit details
    Browse the repository at this point in the history

  12. Parent config loader is generic. Renamed to reflect that.

    Kris Craig committed Sep 13, 2012
    Configuration menu
    Copy the full SHA
    dca6fa1 View commit details
    Browse the repository at this point in the history

  13. Merge branch 'Kris_Rename' into develop

    Kris Craig committed Sep 13, 2012
    Configuration menu
    Copy the full SHA
    c3383fb View commit details
    Browse the repository at this point in the history

Commits on Sep 14, 2012

  1. Typo fix.

    @sirkris
    sirkris committed Sep 14, 2012
    Configuration menu
    Copy the full SHA
    ce10ac6 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'Kris_Fix' into develop

    @sirkris
    sirkris committed Sep 14, 2012
    Configuration menu
    Copy the full SHA
    62cab7c View commit details
    Browse the repository at this point in the history
Loading