Commit Graph

199 Commits

Author SHA1 Message Date
Edward Fagin
e1eb23dfe4 Merge pull request #13774 from edx/efagin/auth-logging
Add logging when header permissions in use.
2016-10-28 11:08:18 -04:00
Nimisha Asthagiri
aa000c1a3d Support for rescoring a problem only if the new score is higher
TNL-5046
2016-10-20 15:08:54 -04:00
J. Cliff Dyer
1cfff02f06 Add tests for scoring of diverse problem types.
Includes:
* CAPA
* ORA
* LTI
* LTI-Consumer
* SGA
* Randomized Content Block

TNL-5692
TNL-5464
2016-10-20 09:29:55 -04:00
Edward Fagin
dc4150ca51 Add logging when header permissions in use. 2016-10-18 10:21:43 -04:00
alisan617
21eb03e116 Merge pull request #13513 from edx/alisan/inline-discussion-TNL-4756
New inline discussion home view TNL-4756
2016-10-14 12:09:42 -04:00
alisan617
d5635cf1ba New inline discussion home view UI
TNL-4756
2016-10-14 10:54:50 -04:00
chrisndodge
6d327594ac add restricted DOT OAUTH2 client with reduced privileges 2016-10-14 07:31:26 -04:00
Jesse Zoldak
8004545cf5 Revert "Cdodge/restricted oauth2 applications" 2016-10-13 13:18:29 -04:00
Clinton Blackburn
8a97a5b8f4 Merge pull request #13627 from Microsoft/cdodge/restricted-oauth2-applications
Cdodge/restricted oauth2 applications
2016-10-13 12:48:50 -04:00
chrisndodge
1732663486 add restricted DOT OAUTH2 client with reduced privileges 2016-10-12 09:40:49 -04:00
Jillian Vogel
3b7ca029c9 Merge pull request #13713 from open-craft/fix-reverted-itsjeyd/inline-discussion-assets
Fix Reverted: Have DiscussionXBlock take care of loading JS and CSS files it depends on
2016-10-12 13:38:48 +10:30
Nimisha Asthagiri
f5ef22adeb Merge pull request #13695 from edx/common_cleanup/audit_log
Move audit_log utility function to openedx/core
2016-10-11 13:33:00 -04:00
Tim Krones
3649f8181d 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-12 01:22:42 +10:30
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
6793c8f6ab Move audit_log utility function to openedx/core 2016-10-07 13:25:08 -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
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
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
Jesse Zoldak
dbab855742 Revert "Have DiscussionXBlock take care of loading assets it depends on" 2016-10-05 12:37:12 -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
Adam
9aa35cd8ad Merge pull request #13614 from edx/efischer/revert_grades
Potential Grades revert PR
2016-09-30 14:08:58 -04:00
J. Cliff Dyer
ddb383c3c2 Test different problem types. 2016-09-28 16:38:38 -04:00
Nimisha Asthagiri
f0f7a5389b Optimize Subsection computation 2016-09-09 13:57:51 -04:00
Douglas Hall
f915befe93 Merge pull request #13359 from edx/release
Merging rc/2016-08-31 into master
2016-08-31 11:41:51 -04:00
Giovanni Di Milia
cc65094b03 Added Current Grade Rest API 2016-08-30 13:51:41 -04:00
Diana Huang
c9a8b59904 Fix spelling of permission. 2016-08-29 15:50:01 -04:00
Matjaz Gregoric
0dd0f1f81d Hide 'Reset Attempts' and 'Rescore Problem' on unsupported blocks.
CAPA problems have the "Staff Debug Info" button, which allows
instructors to "Reset Attempts" and "Rescore problem" for any individual
student.

XBlocks, such as Drag and Drop v2 do not support those, though the UI
was still present. Clicking any of those links would result in an
"Unknown Error Occurred" message.

This commit hides the two buttons if the associated block does not
support them.
2016-08-09 16:28:11 +08:00
Sanford Student
fc943ff539 moving milestones check to access.py and upgrading milestones version 2016-08-04 14:47:15 -04:00
Calen Pennington
bc20a37c2b Simplify how shards are selected in CI 2016-08-03 16:23:02 -04:00
Ned Batchelder
8b1978ba6c Fix unused-import errors 2016-08-03 12:44:41 -04:00
Kevin Kim
127095b94a Add endpoint for commonly used country time zones 2016-07-28 19:02:55 +00:00
Kevin Kim
a39d6c2e94 Add gated content banner for staff in lms 2016-07-27 14:03:08 +00:00
Saleem Latif
8ae92901ef 1. Merge microsites into Comprehensive Theming
2. Add site configuration overrides to theming/helpers.py
3. Move microsite.get_value from theming/helpers to site_configuration/helpers
4. Move microsite_configuration.microsite.get_value usages to site_configuration.helpers.values
2016-07-27 13:55:14 +05:00
sanfordstudent
8acd1bb19f Merge pull request #13090 from edx/sstudent/TNL-5071
adding request cache for milestones
2016-07-26 15:03:01 -04:00
E. Kolpakov
fe6a942baa [TNL-5001] Import-export issues when importing legacy discussion OLX format
Observed Problems:
1. Discussion categories and targets were missing
2. When imported over existing course Discussion IDs have changed unexpectedly - all posts were missing

Solutions:
* Parsing legacy discussion OLX
* Do not force exporting discussion ID
2016-07-25 14:35:19 -07:00
Sanford Student
7d690dde8a adding request cache for milestones 2016-07-25 16:55:06 -04:00
Kevin Kim
1ab52f8b0a Merge pull request #12945 from edx/kkim/ora_tz_date
Convert ORA Due Dates
2016-07-21 10:52:07 -04:00
Kevin Kim
94100f5944 Convert ORA due dates to user preferred time zone 2016-07-21 13:57:20 +00:00
Renzo Lucioni
f6d7371dd1 Unify JWT generation code
These changes unify four different approaches to JWT creation, moving the core of the AccessTokenView to a general-purpose JwtBuilder class. This utility class defaults to using the system's JWT configuration, but it will allow overriding of the signing key and audience claim to support those clients which still require this. Part of ECOM-4566.
2016-07-07 16:38:39 -04:00
Kevin Kim
0bf8fc4b44 Converts the dates on the dashboard, sidebar navigation, and important course dates to user specified time zone. 2016-07-05 17:45:13 +00:00
Nimisha Asthagiri
69410948c9 Reduce number of transformer traversals (#12881)
This change improves grading performance by combining what had previously been
multiple course tree traversals into a single traversal with combined
filtering logic.
2016-07-01 12:28:33 -04:00
Matt Drayer
68312bdd2d Revert "Revert "saleem-latif/WL-328: Multi-Site Comprehensive Theming""
2. Update COMPREHNSIVE_THEME_DIR to COMPREHENSIVE_THEME_DIRS
3. Update paver commands to support multi theme dirs
4. Updating template loaders
5. Add ENABLE_COMPREHENSIVE_THEMING flag to enable or disable theming via settings
6. Update tests
7. Add backward compatibility for COMPREHEHNSIVE_THEME_DIR
2016-06-30 15:19:51 +05:00
Jillian Vogel
e19fb06e9d Merge pull request #12582 from open-craft/feature/discussion_xblock
Convert Discussion Module to XBlock
2016-06-29 20:49:35 +12:00
E. Kolpakov
33b3dfcc92 Converts Discussion XModule to Discussion XBlock
* Renames discussion_module to discussion_xblock
* Moves common/lib/xmodule/xmodule_discussion to openedx/core/lib/xblock_builtin/xblock_discussion
2016-06-29 06:47:04 +12:00
Nimisha Asthagiri
b9b164866e Update BlockStructure version number
https://openedx.atlassian.net/browse/TNL-4865
Without this change, we get 500 errors when the server tries to
deserialize cached data using a previous data structure.
2016-06-27 11:15:07 -04:00
Nimisha Asthagiri
a7a6fa77fe Grading followup
1. update query counts with more accuracy
2. don't use defaultdict in block_structure
2016-06-24 09:07:45 -04:00
Nimisha Asthagiri
1fbb4b8b25 Update BlockStructure API 2016-06-23 20:22:31 -04:00
Nimisha Asthagiri
02e6925275 Update grades to use Block Structures 2016-06-23 20:22:31 -04:00