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: akc42/MBBall
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: akc42/MBBall
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: sqlite_separate_db
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 10 commits
  • 75 files changed
  • 1 contributor

Commits on Oct 15, 2010

  1. Temporary snapshot

    @akc42
    akc42 committed Oct 15, 2010
    Configuration menu
    Copy the full SHA
    c121e8b View commit details
    Browse the repository at this point in the history

Commits on Oct 20, 2010

  1. Snapshot prior in initial testing of display part of system 

    Note, at this stage there is no facility to allow a user to register
or for admin to do anything.  This is just to test the display capability
    @akc42
    akc42 committed Oct 20, 2010
    Configuration menu
    Copy the full SHA
    da38bdf View commit details
    Browse the repository at this point in the history

Commits on Oct 21, 2010

  1. Snapshot of this modification such that it now displays the main page

    @akc42
    akc42 committed Oct 21, 2010
    Configuration menu
    Copy the full SHA
    203924a View commit details
    Browse the repository at this point in the history

Commits on Oct 22, 2010

  1. Improve the curve in the header

    @akc42
    akc42 committed Oct 22, 2010
    Configuration menu
    Copy the full SHA
    f60a9ab View commit details
    Browse the repository at this point in the history

Commits on Dec 14, 2010

  1. Final tweek of header file

    @akc42
    akc42 committed Dec 14, 2010
    Configuration menu
    Copy the full SHA
    5382330 View commit details
    Browse the repository at this point in the history

Commits on Mar 31, 2012

  1. Merge tag 'v2.0' into sqlite 

    Conflicts:
	app/confdiv.php
	app/db.php
	app/emoticons.php
	app/inc/confdiv.inc
	app/inc/emoticons.inc
	app/inc/instructions.inc
	app/inc/picks.inc
	app/inc/playoff.inc
	app/inc/summary.inc
	app/inc/team.inc
	app/inc/tic.inc
	app/inc/userpick.inc
	app/index.php
	app/instructions.html
	app/mbbadmin.js
	app/mbball.js
	app/picks.php
	app/playoff.php
	app/registration.php
	app/summary.php
	app/team.php
	app/tic.php
	app/userpick.php
	confdiv.php
	emoticons.php
	instructions.html
	mbball.js
	picks.php
	playoff.php
	summary.php
	supporting/database.sql
	supporting/main_block.svg
	team.php
	tic.php
	userpick.php
    @akc42
    akc42 committed Mar 31, 2012
    Configuration menu
    Copy the full SHA
    68bdb00 View commit details
    Browse the repository at this point in the history

  2. Re add index from previous commits because we seem to get it lost in 

    the last merge
    @akc42
    akc42 committed Mar 31, 2012
    Configuration menu
    Copy the full SHA
    1a3753c View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into sqlite 

    Conflicts:
	app/confdiv.inc
	app/confdiv.php
	app/emoticons.inc
	app/emoticons.php
	app/inc/confdiv.inc
	app/inc/emoticons.inc
	app/inc/picks.inc
	app/inc/playoff.inc
	app/inc/summary.inc
	app/inc/team.inc
	app/inc/tic.inc
	app/inc/userpick.inc
	app/index.php
	app/mbball.js
	app/nostart.php
	app/picks.inc
	app/picks.php
	app/playoff.inc
	app/playoff.php
	app/registration.inc
	app/summary.inc
	app/summary.php
	app/team.inc
	app/team.php
	app/tic.inc
	app/tic.php
	app/userpick.inc
	app/userpick.php
	supporting/main_block.svg
    @akc42
    akc42 committed Mar 31, 2012
    Configuration menu
    Copy the full SHA
    e48f099 View commit details
    Browse the repository at this point in the history

Commits on Apr 11, 2012

  1. Update the dump.php command in support the rename in master of db.php 

    to db.inc

Also updated the comments to add the fact that there is now a branch
off master to do this.
    @akc42
    akc42 committed Apr 11, 2012
    Configuration menu
    Copy the full SHA
    442d22d View commit details
    Browse the repository at this point in the history

  2. Add the files created with the dump command after the 2011 competition 

    had finished
    @akc42
    akc42 committed Apr 11, 2012
    Configuration menu
    Copy the full SHA
    ca2276b View commit details
    Browse the repository at this point in the history
Loading