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

Commits on Nov 3, 2015

  1. Merge branch 'master' into register_groups

    @kergerza
    kergerza committed Nov 3, 2015
    Configuration menu
    Copy the full SHA
    dc8caa1 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into register_groups

    @kergerza
    kergerza committed Nov 3, 2015
    Configuration menu
    Copy the full SHA
    3145bd3 View commit details
    Browse the repository at this point in the history

  3. correction oneToOne Court 

    Conflicts:
	ASMAE/db.sqlite3
	ASMAE/tennis/models.py
	ASMAE/tennis/views.py
    @kergerza
    kergerza committed Nov 3, 2015
    Configuration menu
    Copy the full SHA
    6debe26 View commit details
    Browse the repository at this point in the history

Commits on Nov 4, 2015

  1. Merge branch 'master' into register_groups

    @kergerza
    kergerza committed Nov 4, 2015
    Configuration menu
    Copy the full SHA
    400b9eb View commit details
    Browse the repository at this point in the history

  2. add condition and table match

    @kergerza
    kergerza committed Nov 4, 2015
    Configuration menu
    Copy the full SHA
    c267e0f View commit details
    Browse the repository at this point in the history

  3. Affichage pré-erreurs + display + groups collapse + renommage JSON

    Alexandre Kühn authored and Alexandre Kühn committed Nov 4, 2015
    Configuration menu
    Copy the full SHA
    08b35ad View commit details
    Browse the repository at this point in the history

Commits on Nov 7, 2015

  1. Ajout de la fonction print

    georgesben committed Nov 7, 2015
    Configuration menu
    Copy the full SHA
    00d77d5 View commit details
    Browse the repository at this point in the history

Commits on Nov 10, 2015

  1. Gestion status tournoi (groupes uniquement)

    Alexandre Kühn authored and Alexandre Kühn committed Nov 10, 2015
    Configuration menu
    Copy the full SHA
    8c7881c View commit details
    Browse the repository at this point in the history

Commits on Nov 11, 2015

  1. Update tournoi status

    Alexandre Kühn authored and Alexandre Kühn committed Nov 11, 2015
    Configuration menu
    Copy the full SHA
    182e2e6 View commit details
    Browse the repository at this point in the history

  2. Debut pour editMatch

    georgesben committed Nov 11, 2015
    Configuration menu
    Copy the full SHA
    2086ebf View commit details
    Browse the repository at this point in the history

Commits on Nov 12, 2015

  1. suite enregistrement des scores (corrections)

    @kergerza
    kergerza committed Nov 12, 2015
    Configuration menu
    Copy the full SHA
    d1b95c3 View commit details
    Browse the repository at this point in the history

  2. Swap des courts

    Alexandre Kühn authored and Alexandre Kühn committed Nov 12, 2015
    Configuration menu
    Copy the full SHA
    941f1dc View commit details
    Browse the repository at this point in the history

Commits on Nov 13, 2015

  1. scores DB 

    Conflicts:
	ASMAE/tennis/admin.py
	ASMAE/tennis/models.py
	ASMAE/tennis/templates/tennis/staffTournoi.html
	ASMAE/tennis/urls.py
	ASMAE/tennis/views.py
    @kergerza
    kergerza committed Nov 13, 2015
    Configuration menu
    Copy the full SHA
    8a89e8b View commit details
    Browse the repository at this point in the history

  2. Persistence des matchs + affichage

    Alexandre Kühn authored and Alexandre Kühn committed Nov 13, 2015
    Configuration menu
    Copy the full SHA
    3a633a8 View commit details
    Browse the repository at this point in the history

  3. Match field: default + blank + null authorised

    Alexandre Kühn authored and Alexandre Kühn committed Nov 13, 2015
    Configuration menu
    Copy the full SHA
    75cc39c View commit details
    Browse the repository at this point in the history
Loading