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: onPHP/onphp-framework
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: mvcaaa/onphp-framework
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 19 commits
  • 46 files changed
  • 2 contributors

Commits on Mar 14, 2012

  1. #75 Add Uuid support

    @suquant
    suquant committed Mar 14, 2012
    Configuration menu
    Copy the full SHA
    469567b View commit details
    Browse the repository at this point in the history

  2. #5 Code clean & add SocketMemcache instead of Memcached

    @suquant
    suquant committed Mar 14, 2012
    Configuration menu
    Copy the full SHA
    d0f9cd7 View commit details
    Browse the repository at this point in the history

  3. #73 fix

    @suquant
    suquant committed Mar 14, 2012
    Configuration menu
    Copy the full SHA
    e2ac63f View commit details
    Browse the repository at this point in the history

  4. #75 fix

    @suquant
    suquant committed Mar 14, 2012
    Configuration menu
    Copy the full SHA
    8f0fceb View commit details
    Browse the repository at this point in the history

Commits on Mar 20, 2012

  1. Merge remote-tracking branch 'upstream-soloweb/uuidFeature'

    @mvcaaa
    mvcaaa committed Mar 20, 2012
    Configuration menu
    Copy the full SHA
    fab032d View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'upstream-soloweb/jsonBasedFeature'

    @mvcaaa
    mvcaaa committed Mar 20, 2012
    Configuration menu
    Copy the full SHA
    a57fcbd View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'upstream-soloweb/memcachedFix'

    @mvcaaa
    mvcaaa committed Mar 20, 2012
    Configuration menu
    Copy the full SHA
    645f408 View commit details
    Browse the repository at this point in the history

  4. #75 fix

    @suquant
    suquant committed Mar 20, 2012
    Configuration menu
    Copy the full SHA
    1d0dedd View commit details
    Browse the repository at this point in the history

Commits on Mar 27, 2012

  1. +enumFeature

    @mvcaaa
    mvcaaa committed Mar 27, 2012
    Configuration menu
    Copy the full SHA
    f14bab6 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'uuidFeature'

    @suquant
    suquant committed Mar 27, 2012
    Configuration menu
    Copy the full SHA
    3b8d8d5 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'jsonBasedFeature'

    @suquant
    suquant committed Mar 27, 2012
    Configuration menu
    Copy the full SHA
    fe5c323 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'enumFeature' 

    Conflicts:
	core/Form/Primitive.class.php

fix conflict
    @suquant
    suquant committed Mar 27, 2012
    Configuration menu
    Copy the full SHA
    889c357 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'memcachedFix'

    @suquant
    suquant committed Mar 27, 2012
    Configuration menu
    Copy the full SHA
    17aa5c8 View commit details
    Browse the repository at this point in the history

  6. fix

    @suquant
    suquant committed Mar 27, 2012
    Configuration menu
    Copy the full SHA
    4dee544 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'uuidFeature'

    @suquant
    suquant committed Mar 27, 2012
    Configuration menu
    Copy the full SHA
    08b4b2c View commit details
    Browse the repository at this point in the history

  8. Fix tables tests

    @suquant
    suquant committed Mar 27, 2012
    Configuration menu
    Copy the full SHA
    b05265e View commit details
    Browse the repository at this point in the history

Commits on Apr 4, 2012

  1. Merge branch 'enumFeature'

    @suquant
    suquant committed Apr 4, 2012
    Configuration menu
    Copy the full SHA
    b66527b View commit details
    Browse the repository at this point in the history

Commits on Apr 9, 2012

  1. && ||

    @mvcaaa
    mvcaaa committed Apr 9, 2012
    Configuration menu
    Copy the full SHA
    d0e8937 View commit details
    Browse the repository at this point in the history

  2. mergetool try

    @mvcaaa
    mvcaaa committed Apr 9, 2012
    Configuration menu
    Copy the full SHA
    cae1f9e View commit details
    Browse the repository at this point in the history
Loading