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

7548 Commits

Author SHA1 Message Date
Brandon DeRosier
6e23a2ca95 Merge pull request #13196 from open-craft/haikuginger/change-coaches-to-staff 
Change CCX coaches to have staff role on CCX courses.
 2016-10-07 18:29:14 -04:00
Nimisha Asthagiri
3b304029e6 Merge pull request #13679 from edx/common_cleanup/remove_old_one_off_script 
Move sync_user_info management command from common to LMS
 2016-10-07 13:44:43 -04:00
Nimisha Asthagiri
010f7eb5c8 Merge pull request #13684 from edx/student_cleanup/decoupled_dependencies 
Decouple student's dependency on badges with django signals
 2016-10-07 13:44:11 -04:00
Nimisha Asthagiri
2112e7f8c8 Merge pull request #13659 from edx/common_cleanup/external_auth 
Moves external_auth from common to openedx/core
 2016-10-07 13:39:21 -04:00
Nimisha Asthagiri
84bdd8598b Merge pull request #13686 from edx/openedx_cleanup/misc 
Remove few LMS references from openedx/core
 2016-10-07 13:33:51 -04:00
Nimisha Asthagiri
fd49f88e08 Moves external_auth from common to openedx/core. 2016-10-07 12:34:22 -04:00
Brandon DeRosier
9563b4d2fe Change content groups message when in a CCX 2016-10-07 11:59:16 -04:00
Brandon DeRosier
8c3224b4f0 Finish implementing CCX coach as staff 2016-10-07 11:53:32 -04:00
Jesse Shapiro
8533fd9734 Adding change to staff role for new users and draft migration 2016-10-07 11:52:59 -04:00
Nimisha Asthagiri
7b365bcaa0 Move view_course_access functionality to sole caller lms/mobile_api. 2016-10-06 22:28:23 -04:00
Nimisha Asthagiri
15d9883f76 Create core/url_utils.py, moving utilities from lms_xblock/runtime 2016-10-06 21:59:11 -04:00
Nimisha Asthagiri
1717e0c4f6 Decouple student's dependency on badges with django signals. 2016-10-06 18:13:37 -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
Nimisha Asthagiri
8b0a26a419 Move sync_user_info management command from common to LMS. 2016-10-06 17:04:49 -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
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
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
Nimisha Asthagiri
406daa513b Move get_grades management command from student to grades app. 2016-10-06 10:34:24 -04:00
J. Cliff Dyer
fb38488083 Revert "Move student_account templates into app." 
This reverts commit 4dc744b104.
 2016-10-06 10:31:09 -04:00
J. Cliff Dyer
4dc744b104 Move student_account templates into app. 2016-10-06 10:29:42 -04:00
sanfordstudent
1db70deb92 Merge pull request #13643 from edx/sstudent/TNL-5310 
SQL model for course grades
 2016-10-06 09:49:41 -04:00
Eric Fischer
7be2093edb Break early if max_score is not defined 
Some XModules are breaking their contracts and defining has_score but not
max_score.

TNL-5715
 2016-10-06 09:15: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
Sanford Student
9d71ac2ecf SQL model for course grades 
Includes unit tests
For TNL-5310
 2016-10-05 15:45:54 -04:00
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
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
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
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
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
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
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