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

39204 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jesse Zoldak
dbab855742 Revert "Have DiscussionXBlock take care of loading assets it depends on" 2016-10-05 12:37:12 -04:00
Eric Fischer
78075d8bf6 Persistent Grades Flag multiple entries per course 
With this change, it is now possible to enable and disable the feature for a
particular course as many times as desired. Fix confirmed locally.

TNL-5698
 2016-10-05 11:35:13 -04:00
Adam
6043fcb195 Merge pull request #13647 from edx/hotfix/2016-10-05 
Hotfix: Revert "Fix Gating to use grades API, instead of its own calculations"
 2016-10-05 10:32:20 -04:00
Jesse Shapiro
47d18c35fe Add DnDv2 to advanced problems; relabel DnDv1 as deprecated 2016-10-05 09:22:35 -04:00
Marko Jevtic
5d128f32ee [TNL-5709] Mark a test as flaky 2016-10-05 10:45:14 +00:00
Muddasser
c943d42b7d Merge pull request #13566 from edx/muddasser/help/cohort 
cohort help tests
 2016-10-05 12:33:31 +05:00
Nimisha Asthagiri
99ce254b15 Fix import required by downstream commit. 2016-10-05 01:25:57 -04:00
Brian Beggs
9ec45e8ed7 Merge pull request #13499 from mitocw/blarghmatey/update_compute_grades_command 
Updated `compute_grades` command for Django 1.8
 2016-10-04 18:38:43 -04:00
J. Cliff Dyer
62042188f5 Revert "Fix Gating to use grades API, instead of its own calculations" 
This reverts commit 318121411a.
 2016-10-04 17:19:30 -04:00
Cliff Dyer
bd38ed2645 Merge pull request #13620 from edx/cdyer/flakies-2016-09-30 
Flaky test annotations 2016
 2016-10-04 17:03:24 -04:00
alisan617
a0a46c461e add new unit page title TNL-5623 
new bookmark button placement and look TNL-5625
 2016-10-04 16:51:34 -04:00
Christina Roberts
ddce329118 Merge pull request #13629 from ubc/fix-OpenSeaDragonAnnotation 
Fix the wrong target.src for annotations
 2016-10-04 14:41:42 -04:00
Adam
75772d2084 Merge pull request #13616 from edx/rc/2016-10-04 
Release Candidate rc/2016-10-04
 2016-10-04 10:06:58 -04:00
Muzaffar yousaf
29061fcd97 Merge pull request #13528 from edx/mushtaq/fix-flaky-edxnotes-test 
Fix flaky test test_easy_access_from_notes_page
 2016-10-04 16:02:35 +05:00
Mushtaq Ali
0abd2fce81 Increase connect & read timeout to fix flaky test test_easy_access_from_notes_page. 
TNL-4590
 2016-10-04 14:52:41 +05:00
Muddasser
cde90fd120 cohort help tests 2016-10-04 06:51:50 +00:00
Eric Fischer
13bb05c26f ORA version update 2016-10-03 16:48:07 -04:00
Joel Barciauskas
cfbe307874 Upgrade django-oauth2-provider to 1.1.4 2016-10-03 16:22:56 -04:00
sanfordstudent
44bddf8a69 Merge pull request #13610 from edx/sstudent/TNL-4171 
Removing Scored/has_score from randomized content block
 2016-10-03 16:14:57 -04:00
Eric Fischer
db2eb2dced Merge pull request #13599 from edx/efischer/tnl-4895 
Masquerade should not apply to user dropdown
 2016-10-03 15:31:31 -04:00
Douglas Hall
7efa282233 Merge pull request #13634 from open-craft/bdero/saml-hotfix 
Hotfix: Remove is_enabled check for SAMLConfiguration in SAML management command
 2016-10-03 12:14:40 -04:00
Jillian Vogel
f7fba5525d Merge pull request #13483 from open-craft/itsjeyd/inline-discussion-assets 
Have DiscussionXBlock take care of loading assets it depends on
 2016-10-04 02:13:31 +10:30
Ahsan Ulhaq
1c00f1fed3 Merge pull request #13538 from edx/ahsan/ECOM-4641-Invalidate-all-access-tokens-refresh-tokens-on-password-reset 
Invalidate access token
 2016-10-03 20:33:18 +05:00
Adam
d9f3c70e75 Merge pull request #13626 from edx/efischer/grades_rc_fix 
Grades RC cleanup
 2016-10-03 11:24:17 -04:00
Brandon DeRosier
ec6c924b7c Fixed site keying for SAMLConfigurationsfor SAML management command 2016-10-03 10:26:25 -04:00
Saleem Latif
96fb00cff8 Merge pull request #13612 from edx/saleem-latif/WL-611 
WL-611: Fix "Access Denied" when downloading report
 2016-10-03 17:16:04 +05:00
Tim Krones
baa9d06e97 Have DiscussionXBlock take care of loading JS and CSS files it depends on. 
* Add openedx.core.lib.xblock_builtin.get_css_dependencies and get_js_dependencies,
  which respect PIPELINE_ENABLED setting when determining dependencies.
* Move new discussion-related Sass files into discussion subdirectory.
* Use "load_unicode" instead of "render_template" to load JS to add to fragment for DiscussionXBlock.
* Remove unused "course" parameter from context for DiscussionXBlock.student_view.
* Add RTL stylesheet for DiscussionXBlock, and enable the block to load correct stylesheet.
* Load MathJax only once, and include code for configuring MathJax in discussion bundle.
* Make sure username renders correctly in DiscussionXBlock response header.
* Move WYSIWYIG Markdown editor styles to _build-discussion.scss.
* Remove unnecessary import of discussion/utilities/v1-compatibility from _build-discussion.scss.
* Keep courseware-chromeless.html in sync with courseware.html.
* Load CSS for discussions on Teams tab.  This makes it possible to remove CSS for discussions from Sass files for "Course" tab.
* Load js/src/tooltip_manager.js, jquery.autocomplete.js and jquery.autocomplete.css on "Course" tab.
 2016-10-03 22:11:31 +10:30
Saleem Latif
434584114a Fix "Access Denied" when downloading report 2016-10-03 15:05:54 +05:00
Ahsan
c5d975577a Invalidate access token 
ECOM-4641
 2016-10-03 13:02:52 +05:00
Pan Luo
03809c8c5c Fix the wrong target.src for annotations 
The annotation.target.src was assigned to a function instead of a string
because the missing brackets.
 2016-10-02 00:20:50 -07:00
Sanford Student
bcaa873be0 bug fix for TNL-5601 
fixes signal handling for delete student state
 2016-10-01 23:23:09 -04:00
Eric Fischer
4793a42767 Silence more grades-related logging 2016-10-01 23:23:09 -04:00
Nimisha Asthagiri
969c75a7d1 Fix for grade assertions 2016-10-01 23:23:09 -04:00
Eric Fischer
d772cb0ada Revert "Merge pull request #13614 from edx/efischer/revert_grades" 
This reverts commit 0ea8e1b9b2, reversing
changes made to e3db08f194.
 2016-09-30 16:52:05 -04:00
J. Cliff Dyer
9c5759ed1c Flaky test decorators. Tickets exist: 
TNL-5643:
    test_lms_courseware:ProctoredExamTest.test_timed_exam_flow
TNL-4132:
    test_lms_matlab_problem:MatlabProblemTest.test_run_code
TNL-5582:
    test_studio_course_info.UsersCanAddUpdatesTest.test_delete_course_update
TNL-5691:
    test_account_settings.AccountSettingsPageTest.test_full_name_field
 2016-09-30 16:50:46 -04:00
Eric Fischer
46ed93807c Review feedback and actual fix 
TIL about defining variables in Mako templates.
 2016-09-30 16:27:17 -04:00
Eric Fischer
b3e4e81e97 TNL-4895 User dropdown reflects real user 
Exposes real_user to the user_dropdown template, allowing for the requested
feature change of keeping the profile links pointed at the real user's profile.
 2016-09-30 16:27:17 -04:00
Eric Fischer
5573690af6 Merge pull request #13618 from edx/efischer/more_reverts 
Unbreak master
 2016-09-30 15:04:17 -04:00
J. Cliff Dyer
628e4cfe63 Revert "Flaky test decorators. Tickets exist:" 
This reverts commit 988bfa046b.
 2016-09-30 14:55:43 -04:00
J. Cliff Dyer
aaa37d6797 Revert "Annotate flaky decorators with ticket numbers." 
This reverts commit 25bd32bc1c.
 2016-09-30 14:55:28 -04:00
J. Cliff Dyer
25bd32bc1c Annotate flaky decorators with ticket numbers. 2016-09-30 14:43:38 -04:00
J. Cliff Dyer
988bfa046b Flaky test decorators. Tickets exist: 
TNL-5643:
    test_lms_courseware:ProctoredExamTest.test_timed_exam_flow
TNL-4132:
    test_lms_matlab_problem:MatlabProblemTest.test_run_code
TNL-5582:
    test_studio_course_info.UsersCanAddUpdatesTest.test_delete_course_update
TNL-5691:
    test_account_settings.AccountSettingsPageTest.test_full_name_field
 2016-09-30 14:15:11 -04:00
Adam
9aa35cd8ad Merge pull request #13614 from edx/efischer/revert_grades 
Potential Grades revert PR
 2016-09-30 14:08:58 -04:00
Eric Fischer
853d2a8688 Revert "Handle null weighted_possible values safely." 
This reverts commit 2ec95262ab.
 2016-09-30 14:08:44 -04:00
Adam
0ea8e1b9b2 Merge pull request #13614 from edx/efischer/revert_grades 
Potential Grades revert PR
 2016-09-30 13:40:09 -04:00
Cliff Dyer
e1a0b116dc Merge pull request #13615 from edx/beryl/allow_null_weighted_possible 
Handle null weighted_possible values safely.
 2016-09-30 12:25:39 -04:00
Bill DeRusha
102ec18351 Merge pull request #11986 from mreyk/master 
Added number receipt to the PDF filename
 2016-09-30 12:08:31 -04:00
Alison Hodges
9c27a8ec82 Merge pull request #13477 from deepsrijit1105/master 
Lower case the term partner manager in UI strings
 2016-09-30 10:50:42 -04:00
Eric Fischer
242f3a79c5 Quality fix in revert 2016-09-30 10:46:45 -04:00
J. Cliff Dyer
2ec95262ab Handle null weighted_possible values safely. 
Rather than failing, treat them as unscored blocks.

[TNL-5689](https://openedx.atlassian.net/browse/TNL-5689): Server error when
checking a problem.
 2016-09-30 10:21:35 -04:00