Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
39,549 Commits 1 Branch 0 Tags
5f2ffbe75bed60dc8958bbce90eefb4aebb84a30
Commit Graph

14189 Commits

Author SHA1 Message Date
Sanford Student
5f2ffbe75b implementation of grading events 
for TNL-5045
 2016-12-07 14:47:08 -05:00
Sanford Student
44074f30a2 move course version repopulation to runtime layer 
for TNL-6065
 2016-12-06 10:22:13 -05:00
Christina Roberts
7b2239b5d2 Merge pull request #14072 from edx/christina/jsinput_title 
Allow passing through title to iFrame.
 2016-12-05 15:00:25 -05:00
cahrens
156b43ec0f Allow passing through title to iFrame. 
Also changes section to div.

TNL-6044
 2016-12-05 12:53:57 -05:00
Calen Pennington
b24c22804e Merge pull request #14047 from cpennington/safer-opaque-keys 
Safer opaque keys
 2016-12-02 10:44:36 -05:00
Calen Pennington
fd0d69594a Upgrade to the latest version of opaque-keys 2016-12-01 13:04:31 -05:00
Christina Roberts
81ff20c029 Merge pull request #14080 from edx/christina/delete-javascriptinput 
Delete javascriptinput and javascriptresponse.
 2016-12-01 11:02:25 -05:00
cahrens
a949efc6b5 Delete javascriptinput and javascriptresponse. 
TNL-6034
 2016-12-01 09:14:04 -05:00
attiyaishaque
be32d74afe TNL-6017 Receive Updates checkbox saved in discussion forums. 2016-12-01 11:25:44 +05:00
Nimisha Asthagiri
b2cd0359e5 Merge pull request #14032 from edx/beryl/unattempted-grade-report 
Update grade report to distinguish between Not Attempted and 0
 2016-11-30 18:03:07 -05:00
Cliff Dyer
876cb596f0 Merge pull request #14065 from edx/cdyer/flakies-2016-11-29 
Mark flaky tests flaky
 2016-11-30 13:39:33 -05:00
Nimisha Asthagiri
aca69f78f2 Update Subsection Grade Report to differentiate Not Attempted and 0 
TNL-5990
 2016-11-30 12:36:26 -05:00
Nimisha Asthagiri
3bb5617abd fixup! review comments 2016-11-30 12:36:25 -05:00
Nimisha Asthagiri
e87388e24c Grades cleanup before updating grade report 
Remove deprecated SingleSectionGrader.  TNL-5987
Remove display_name and module_id from Scores objects
Update CourseGradeFactory.__init__ to not be user-specific
Update some callers to use CourseGrade class instead of "summary" dict
Remove no longer needed course_grades.py module.
Renamed django signal from GRADES_UPDATED to COURSE_GRADE_CHANGED
 2016-11-30 12:36:25 -05:00
Toby Lawrence
205ded9918 Merge pull request #14068 from edx/release 
Merge release back into master
 2016-11-30 08:06:26 -05:00
J. Cliff Dyer
cdbb48b71b Mark flaky tests flaky 2016-11-29 11:10:06 -05:00
Brian Jacobel
5492fb9b8b Merge pull request #14057 from edx/bjacobel/discussion-test-fixture-cleanup 
Get rid of this 4000-char long line
 2016-11-29 09:59:06 -05:00
M. Rehan
a0f99e6d4a Merge pull request #14050 from edx/mrehan/ecom-6154-integrity-error 
ECOM-6154 – remove transaction.atomic decorator
 2016-11-29 12:55:50 +05:00
Toby Lawrence
6cdb417019 Merge pull request #13879 from open-craft/haikuginger/disable-ccx-studio 
Remove access to CCX courses from Studio
 2016-11-28 15:44:29 -05:00
Christina Roberts
af504fc61d Merge pull request #13805 from edx/christina/ac-583 
Christina/ac 583
 2016-11-28 12:22:55 -05:00
Brian Jacobel
7806b8a482 Out-of-band cleanup on this test fixture because it horrified me so much 2016-11-28 12:00:03 -05:00
Chris Rodriguez
29dcbfefe4 Progress graph a11y updates. 
TNL-5891
 2016-11-28 10:55:39 -05:00
Albert (AJ) St. Aubin
be7f6ecb6c Merge pull request #14036 from edx/aj/AC588_TNL-5894 
Aj/ac588 tnl 5894
 2016-11-28 08:25:24 -05:00
Nimisha Asthagiri
562aeee0ba Fix CAPA's max_score computation 2016-11-28 07:51:03 -05:00
Albert St. Aubin
282ded7442 Addressed test failures and PR comments 
TNL-5894
 2016-11-28 07:12:23 -05:00
attiyaishaque
f3a30e6f08 TNL-6004 Fixing 500 in video transcripts. 2016-11-28 15:28:39 +05:00
Qubad786
05ad083ae0 remove transaction.atomic decorator 2016-11-28 01:43:42 +05:00
Marko Jevtic
682e030ad0 [TNL-6009] Mark test as flaky 2016-11-25 08:12:40 +00:00
Andy Armstrong
3fb7134efc Merge pull request #14020 from edx/andya/update-gemnasium-libraries 
Clean up npm-installed packages
 2016-11-23 14:02:29 -05:00
Andy Armstrong
746e310088 Clean up npm-installed packages 2016-11-22 17:51:09 -05:00
Albert St. Aubin
6752b90dae Removed flaky annotations and updated tests to correct flakiness 
TNL-5774
 2016-11-22 11:18:28 -05:00
Calen Pennington
ac2b5bccf2 Merge pull request #13717 from open-craft/smarnach/anonymous-id 
Allow to store multiple anonymous ids per (user, course)
 2016-11-22 10:11:40 -05:00
Douglas Hall
5b432edee3 Merge pull request #14031 from edx/douglashall/WL-833 
WL-833 Allow for LinkedIn add to profile cert name override
 2016-11-21 14:49:53 -05:00
Albert (AJ) St. Aubin
97ec6ec374 Merge pull request #14014 from edx/aj/meta_test 
Additional acceptance test to check the problem meta is not altered b…
 2016-11-21 13:54:47 -05:00
Toby Lawrence
c67ee94d80 Merge pull request #13996 from edx/PERF-321 
[PERF-321] Move heavy JS files for WordCloud out of lms-modules.js
 2016-11-21 13:49:00 -05:00
Douglas Hall
1c8e859b51 Allow for LinkedIn add to profile cert name override 2016-11-21 12:33:33 -05:00
Albert St. Aubin
25fd6b57af Test update for PR comments 2016-11-21 11:31:17 -05:00
Albert St. Aubin
96eeb3fcc5 Additional acceptance test to check the problem meta is not altered by sequence navigation. 2016-11-21 11:04:26 -05:00
alisan617
1f987f186f Merge pull request #14009 from edx/alisan/TNL-5807-discussion-post-preview 
add discussion thread post preview in Discussion tab thread list sidebar
 2016-11-18 15:41:41 -05:00
alisan617
ad2a2f29bc discussion thread post preview in DiscussionThreadListView 2016-11-18 13:58:17 -05:00
Clinton Blackburn
d7a7bcc1d7 Setting user info cookie on learner dashboard 
The user info is now updated every time a user loads the learner dashboard. Given that this is the page most learners land on after enrolling in a course, updating this cookie here will ensure that the enrollment status hash is relatively up-to-date.

ECOM-4895
 2016-11-18 13:56:48 -05:00
Clinton Blackburn
f0030334af Added enrollment hash to login cookie 
This will allow the marketing site to determine if locally-stored enrollment data needs to be refreshed.

ECOM-4896
 2016-11-18 13:56:48 -05:00
Nimisha Asthagiri
bc551b9b25 Merge pull request #14001 from edx/beryl/get-max-score-opt 
Optimize max_score by moving from XModule to Descriptor
 2016-11-18 11:41:55 -05:00
Max Rothman
0f7f83ac1b Merge pull request #14024 from edx/release 
Merging release into master for hotfix-2016-11-17
 2016-11-18 11:34:47 -05:00
Nimisha Asthagiri
6e1471e442 Merge pull request #14012 from edx/beryl/unattempted-problems 
Compute Attempted versus Grade of Zero
 2016-11-18 11:23:30 -05:00
Nimisha Asthagiri
257fcc0328 Fix CAPA progress display flakiness 2016-11-18 10:27:12 -05:00
Nimisha Asthagiri
7899528b52 Compute Attempted versus Grade of Zero 
TNL-5953
 2016-11-18 10:05:23 -05:00
J. Cliff Dyer
b796ba1900 Add missing migrations 2016-11-17 12:11:25 -05:00
Douglas Hall
062e0506ef Merge pull request #13977 from edx/afzaledx/wl-693-contact-us-form-in-email 
submit_feedback function now conditionally sends emails.
 2016-11-17 10:11:08 -05:00
Nimisha Asthagiri
f1f5a8f12f Optimize max_score by moving from XModule to Descriptor 
TNL-5939
 2016-11-17 09:17:59 -05:00