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: MarkUsProject/Markus
base: 3ece04820670
Choose a base ref
...
head repository: MarkUsProject/Markus
compare: 8b896e7e1a6e
Choose a head ref
  • 5 commits
  • 129 files changed
  • 2 contributors

Commits on Dec 13, 2016

  1. Turn off jQuery noConflict mode

    Eugene Cheung committed Dec 13, 2016
    Copy the full SHA
    1bb9ded View commit details
    Browse the repository at this point in the history

Commits on Dec 17, 2016

  1. Updates

    Eugene Cheung committed Dec 17, 2016
    Copy the full SHA
    60c295d View commit details
    Browse the repository at this point in the history
  2. Resolve merge conflicts

    Eugene Cheung committed Dec 17, 2016
    Copy the full SHA
    bf382fd View commit details
    Browse the repository at this point in the history

Commits on Jan 7, 2017

  1. Merge branch 'jquery-noconflict' of https://github.com/arkon/Markus

    Conflicts:
    	app/assets/javascripts/Grader/file_selector.js
    	app/views/assignments/_feedback_file_window.js.erb
    david-yz-liu committed Jan 7, 2017
    Copy the full SHA
    6877fd5 View commit details
    Browse the repository at this point in the history
  2. Copy the full SHA
    8b896e7 View commit details
    Browse the repository at this point in the history