E0d/fix conflicts - #1955

Closed

e0d wants to merge 11 commits into

e0d/fix_conflicts

Commits on Dec 4, 2013

Change video transcripts to use locators instead of locations.

cahrens
authored and
jarv
committed
Disable Peer Track Changes

zubair-arbi
authored and
jarv
committed

Commits on Dec 5, 2013

Commits on Dec 6, 2013

Merge pull request #1877 from edx/ned/hotfix-2013-12-04-with-temp-stuff-removed
nedbat
committed

Commits on Dec 9, 2013

Merge pull request #1821 from edx/rc/2013-12-03
jarv
committed

Commits on Dec 10, 2013

Reduce sql queries for groupname tests. (STUD-1039)

Don Mitchell
authored and
adampalay
committed
In OpenEndedModule latest_score and all_score calculate sum of rubric scores every time for ML grading.

waheedahmed
authored and
adampalay
committed

Commits on Dec 11, 2013

Merge pull request #1906 from edx/hotfix/2013-12-10
jarv
committed

Commits on Dec 13, 2013

fixing merge conflicts between master and release
e0d
committed