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: 1fa63a265134
Choose a base ref
...
head repository: MarkUsProject/Markus
compare: 0ff5039f0969
Choose a head ref
  • 19 commits
  • 19 files changed
  • 2 contributors

Commits on Oct 24, 2012

  1. Removed the prototype_helper functions from the assignments/new page … 

    …into plain javascript in the associated js file.
    @ioev
    ioev committed Oct 24, 2012
    Copy the full SHA
    a71c743 View commit details
    Browse the repository at this point in the history

  2. Removed the create_assignment.js file.

    @ioev
    ioev committed Oct 24, 2012
    Copy the full SHA
    d1aaa51 View commit details
    Browse the repository at this point in the history

  3. Fixed 2 places that were referencing the old js file.

    @ioev
    ioev committed Oct 24, 2012
    Copy the full SHA
    ec6c21a View commit details
    Browse the repository at this point in the history

  4. Reverted moving create_assignment.js into assignments/new.js, not rea… 

    …dy for this clean up yet.
    @ioev
    ioev committed Oct 24, 2012
    Copy the full SHA
    b4c842e View commit details
    Browse the repository at this point in the history

  5. Removed prototype_legacy js code from graders page, also fixed a bug … 

    …that would cause the wrong auth code to be sent and would log out the user when the checkbox under criteria was changed. Also fixed a bug that was not sending an auth code to get the criteria.
    @ioev
    ioev committed Oct 24, 2012
    Copy the full SHA
    e288ea5 View commit details
    Browse the repository at this point in the history

  6. Removed prototype_helper functions in notes, moved into a js file and… 

    … included.
    @ioev
    ioev committed Oct 24, 2012
    Copy the full SHA
    d4187e0 View commit details
    Browse the repository at this point in the history

Commits on Oct 26, 2012

  1. Removed prototype_legacy_helper methods from the grade_entry_form page.

    @ioev
    ioev committed Oct 26, 2012
    Copy the full SHA
    44a2779 View commit details
    Browse the repository at this point in the history

  2. Fixed something I overlooked, where the correct path wasn't being pas… 

    …sed into one of the ajax calls. Also fixed a bug in the graders 'boot' method that was causing the populate calls to send un-urlencoded AUTH_CODEs.
    @ioev
    ioev committed Oct 26, 2012
    Copy the full SHA
    ec5a365 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' of git://github.com/MarkUsProject/Markus into i… 

    …ssue-475
    @ioev
    ioev committed Oct 26, 2012
    Copy the full SHA
    e953156 View commit details
    Browse the repository at this point in the history

  4. Removed some duplicate js includes on the graders page.

    @ioev
    ioev committed Oct 26, 2012
    Copy the full SHA
    c29b3d8 View commit details
    Browse the repository at this point in the history

Commits on Nov 2, 2012

  1. Just adding some placeholder javascript for something that will be wr… 

    …itten, and fixing the formatting on a js file.
    @ioev
    ioev committed Nov 2, 2012
    Copy the full SHA
    566984a View commit details
    Browse the repository at this point in the history

Commits on Nov 8, 2012

  1. Merge branch 'master' of git://github.com/MarkUsProject/Markus into i… 

    …ssue-475
    @ioev
    ioev committed Nov 8, 2012
    Copy the full SHA
    7ce4a44 View commit details
    Browse the repository at this point in the history

Commits on Nov 12, 2012

  1. Removed the protype_legacy_helper method from the edit overall commen… 

    …t form.
    @ioev
    ioev committed Nov 12, 2012
    Copy the full SHA
    ff319c7 View commit details
    Browse the repository at this point in the history

Commits on Nov 13, 2012

  1. Removed prototype_legacy_helper code from the edit Submission Results… 

    … page.
    @ioev
    ioev committed Nov 13, 2012
    Copy the full SHA
    86ed355 View commit details
    Browse the repository at this point in the history

Commits on Nov 20, 2012

  1. Merge branch 'master' into issue-475

    @ioev
    ioev committed Nov 20, 2012
    Copy the full SHA
    8b102c7 View commit details
    Browse the repository at this point in the history

Commits on Nov 22, 2012

  1. Removed the last bit of the Prototype_legacy_helper code from the fle… 

    …xible grading marker view, and removed the gem. All tests pass (except the 3 functionals that are also failing in master)
    @ioev
    ioev committed Nov 22, 2012
    Copy the full SHA
    86e0f9c View commit details
    Browse the repository at this point in the history

Commits on Nov 28, 2012

  1. Merge branch 'master' into issue-475

    @ioev
    ioev committed Nov 28, 2012
    Copy the full SHA
    b70011c View commit details
    Browse the repository at this point in the history

  2. Fixing the formatting on some very long lines.

    @ioev
    ioev committed Nov 28, 2012
    Copy the full SHA
    f3f2241 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #933 from ioev/issue-475 

    Issue 475 -- Replace Prototype Legacy with new code
    @jerboaa
    jerboaa committed Nov 28, 2012
    Copy the full SHA
    0ff5039 View commit details
    Browse the repository at this point in the history