Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
38,830 Commits 1 Branch 0 Tags
1122c40f072dcda9744bdad7e90f249e16c2a641
Commit Graph

13918 Commits

Author SHA1 Message Date
cahrens
1122c40f07 Moving ignore rules to relevant classes instead general rule. 
Also replaces section with div, updates short_id, and makes textbox accessible.

TNL-5576, TNL-5575, TNL-5574, TNL-5671, TNL-5376
 2016-10-06 17:35:54 -04:00
muhammad-ammar
c3b6b10478 Problem (capa) feedback UX revamp. 
TNL-4877
 2016-10-06 17:34:43 -04:00
Christina Roberts
432f6cdf0c Merge pull request #13680 from edx/christina/revert-capa-form 
Revert "single form element per capa problem"
 2016-10-06 17:18:48 -04:00
John Eskew
b27f8a29b5 Merge pull request #13671 from edx/jeskew/move_xmodule_django_to_openedx_core 
Move xmodule_django app to openedx.core.djangoapps
 2016-10-06 16:53:25 -04:00
Eric Fischer
aae9f9ccaa Merge pull request #13676 from edx/release-10-06-conflict 
Merge release to master
 2016-10-06 16:10:20 -04:00
cahrens
53a6edd032 Revert "single form element per capa problem" 
This reverts commit 943a3a5eb1.
 2016-10-06 16:00:19 -04:00
Nimisha Asthagiri
6073ea2e2e Merge pull request #13658 from edx/common_cleanup/auth_exchange 
Move auth_exchange from common to openedx/core
 2016-10-06 15:16:33 -04:00
John Eskew
3614eb2800 Move xmodule_django app to openedx.core.djangoapps 2016-10-06 14:50:40 -04:00
John Eskew
24d29be3f3 Merge pull request #13667 from edx/jeskew/move_monkey_patch 
Move monkey_patch to openedx.core.djangoapps.
 2016-10-06 14:32:35 -04:00
Eric Fischer
50d55bbad6 Merge branch 'release' into release-10-06-conflict 2016-10-06 14:25:47 -04:00
Eric Fischer
e24915d286 Revert "Merge pull request #13614 from edx/efischer/revert_grades" 
This reverts commit 9aa35cd8ad.
 2016-10-06 14:25:27 -04:00
Andy Armstrong
a63bb0e50f Merge pull request #13664 from edx/andya/common-refactoring 
Move pipeline_js Django app into CMS
 2016-10-06 14:24:45 -04:00
Nimisha Asthagiri
4c0f85b4d9 Move auth_exchange from common to openedx/core. 
Move oauth_dispatch from lms to openedx/core.
 2016-10-06 12:54:39 -04:00
Nimisha Asthagiri
4bb8810957 Merge pull request #13660 from edx/common_cleanup/student_grades 
Move get_grades management command from student to grades app
 2016-10-06 12:40:06 -04:00
Andy Armstrong
0f18b740c8 Move pipeline_js Django app into CMS 
Note: this used to be in common, but it was only used in Studio.
 2016-10-06 12:08:04 -04:00
Nimisha Asthagiri
406daa513b Move get_grades management command from student to grades app. 2016-10-06 10:34:24 -04:00
John Eskew
fab11b90d7 Move monkey_patch to openedx.core.djangoapps. 2016-10-06 10:16:14 -04:00
muhammad-ammar
943a3a5eb1 single form element per capa problem 
TNL-5402
 2016-10-06 14:27:39 +05:00
Andy Armstrong
ecf4515b6e Introduce id verification step for proctored exams 
TNL-5083
 2016-10-05 17:22:35 -04:00
Jesse Zoldak
ce1eb237d1 Merge pull request #13651 from edx/revert-13483-itsjeyd/inline-discussion-assets 
Revert "Have DiscussionXBlock take care of loading assets it depends on"
 2016-10-05 17:20:56 -04:00
Jesse Shapiro
22c42dbf78 Merge pull request #13602 from open-craft/haikuginger/deprecate-dnd-v1 
[SOL-1612] Add DnDv2 to advanced problems; relabel DnDv1 as deprecated
 2016-10-05 15:28:50 -04:00
Marko Jevtić
1e1b7e1ad3 Merge pull request #13648 from edx/mjevtic/TNL-5709 
[TNL-5709] Mark a test as flaky
 2016-10-05 19:55:12 +02:00
alisan617
66ea22cab6 Merge pull request #13587 from edx/alisan/bookmark-btn-TNl-5625-unit-title-TNL-5623 
add new unit title and renew bookmark button
 2016-10-05 12:53:40 -04:00
Jesse Zoldak
dbab855742 Revert "Have DiscussionXBlock take care of loading assets it depends on" 2016-10-05 12:37:12 -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
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
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
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
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
Brandon DeRosier
ec6c924b7c Fixed site keying for SAMLConfigurationsfor SAML management command 2016-10-03 10:26:25 -04: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
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
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
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
ac2f71df99 Revert "Merge pull request #13547 from edx/beryl/correct_weight" 
This reverts commit 663fbbbaa0, reversing
changes made to 3f7441c80f.
 2016-09-30 10:06:10 -04:00
Eric Fischer
ca287c73c7 Revert "Merge pull request #13461 from edx/cdyer/test-block-types" 
This reverts commit c050ccc318, reversing
changes made to 9ba9772239.
 2016-09-30 10:06:01 -04:00
Sanford Student
39fb66fccf removing scored/has_score from randomized content block 
for TNL-4171
 2016-09-30 09:59:39 -04:00
Nimisha Asthagiri
1628c17695 Merge pull request #13603 from edx/beryl/grades_reset_capa 
Update grade when CAPA problem state is reset
 2016-09-29 14:01:21 -04:00
Nimisha Asthagiri
d3d776388f Update grade when CAPA problem state is reset 
TNL-5686
 2016-09-29 08:44:37 -04:00
J. Cliff Dyer
ddb383c3c2 Test different problem types. 2016-09-28 16:38:38 -04:00