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

14199 Commits

Author SHA1 Message Date
Ben Patterson
a15be622bb Merge pull request #14133 from edx/benp/fix-flaky-video-trans 
Flaky video translations test fix.
 2016-12-12 16:01:33 -05:00
Ben Patterson
4c48e6a307 Cleanup, remove flaky decorator. 2016-12-12 11:40:25 -05:00
Jesse Shapiro
da6303ad4d Merge pull request #14053 from open-craft/haikuginger/final-consent-hooks 
[ENT-61] Changes to accommodate consent logic on Enterprise app
 2016-12-12 11:05:59 -05:00
Mark Sadecki
3468ca345e Merge pull request #14121 from edx/cptvitamin/AC-680 
removes redundant alt attribute value
 2016-12-12 11:04:01 -05:00
Ben Patterson
ec6ea40bc6 Flaky test fix. 
Sadly, I introduce a time.sleep here. The hovering over the elements is
particularly brittle, and there is no obvious signal for when the page is
done rendering. I'm putting a sleep in here so we can more-quickly support
Firefox 45.
 2016-12-12 10:23:18 -05:00
Jesse Shapiro
fc814aee95 Add data sharing consent features for EnterpriseCustomer 2016-12-12 09:30:38 -05:00
Mark Sadecki
33949571b7 adds a test so this doesn't regress again 2016-12-12 08:32:43 -05:00
Ben Patterson
0795e514cf Merge pull request #14120 from edx/benp/TNL-5453 
Fix TNL-5453
 2016-12-11 09:31:19 -05:00
Ben Patterson
62a9dd616d Ensure makemigrations test is called. 2016-12-08 15:22:10 -05:00
Ben Patterson
e77b4e9a21 Fix TNL-5453 2016-12-08 15:07:56 -05:00
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