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

991 Commits

Author SHA1 Message Date
Nimisha Asthagiri
266bfb1ab3 Optimize async grades computation 
TNL-5909
 2016-11-08 19:22:30 -05:00
Christopher Lee
8a784eef24 Merge pull request #13949 from edx/release-2016-11-08-conflict 
Release 2016 11 08 conflict
 2016-11-08 15:32:16 -05:00
John Eskew
cd522358f2 Merge pull request #13706 from edx/jeskew/move_embargo_out_of_common 
Move embargo from common to openedx/core/djangoapps.
 2016-11-08 14:38:24 -05:00
christopher lee
d3c3a9a63d Merge branch 'release' into release-2016-11-08-conflict 2016-11-08 14:23:57 -05:00
Gregory Martin
f0cd29f02a Revert "Merge pull request #13915 from edx/revert-13794-yro_implement-dateutil" 
This reverts commit d59ab18b27, reversing
changes made to 0ebab35e89.
 2016-11-07 17:04:13 -05:00
Cliff Dyer
7db6dc7d7f Merge pull request #13895 from edx/cdyer/flaky-request-factory-as-request 
Fix sporadic "'RequestFactory' object has no attribute 'build_absolute_uri'" python test error.
 2016-11-07 13:55:09 -05:00
Adam
332fcd0c9b Merge pull request #13924 from edx/adam/neo4j-lists 
only pass lists of text as iterable neo4j values
 2016-11-07 12:49:41 -05:00
J. Cliff Dyer
9366c43a83 Fix issues with RequestFactory used as Request. 
* Centralize creation of quick request objects.
* Isolate caches to individual tests to prevent test ordering
  dependencies.

TNL-5811
 2016-11-07 10:51:04 -05:00
Adam Palay
e4b39c5c42 only pass lists of text as iterable neo4j values 2016-11-07 10:48:42 -05:00
John Eskew
e3cb462d18 Move embargo from common to openedx/core/djangoapps. 2016-11-07 08:47:36 -05:00
Syed Hasan raza
8234581024 Merge pull request #13853 from edx/shr/bug/TNL-5591-update-orientation-with-None-value 
fix None value for orientation update
 2016-11-06 17:56:04 +05:00
Adam Palay
5b1d0fd3d9 add ability to skip courses when dumping to neo4j 2016-11-04 13:12:55 -04:00
Ben Patterson
d59ab18b27 Merge pull request #13915 from edx/revert-13794-yro_implement-dateutil 
Revert "Implement DateUtils in LMS"
 2016-11-04 10:44:59 -04:00
Matthew Piatetsky
586c9480a8 Merge pull request #13896 from edx/ECOM-5769_enable_jwt 
ECOM-5769 Add JWT auth and hidden flag to course_api for retrieving hidden courses
 2016-11-04 10:26:57 -04:00
Jesse Zoldak
ec880138d2 Revert "Implement DateUtils in LMS" 2016-11-04 07:50:26 -04:00
Syed Hassan Raza
178e497c65 fix None value for orientation update 2016-11-04 16:48:25 +05:00
Matthew Piatetsky
af976a0ef5 Add JWT auth and hidden flag to course_api 2016-11-03 17:35:45 -04:00
Gregory Martin
3fd16eb6be Implement DateUtils in LMS 2016-11-03 10:06:10 -04:00
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
Ahsan Ulhaq
53e84390de Expose the user email to the api-admin view 
ECOM-5365
 2016-10-28 12:55:27 +05: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
Eric Fischer
8ceb73455a Merge pull request #13773 from edx/efischer/actually_retry 
update_course_in_cache should retry on exceptions
 2016-10-20 10:48:13 -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
Eric Fischer
8f0134b7e4 update_course_in_cache should retry on exceptions 
Previously, retry() was never called, so the task was never retried despite
defining several retry-related variables.
 2016-10-19 14:09:28 -04:00
Saleem Latif
38931957e2 Add testing for 'saml' management command 2016-10-19 12:49:41 +05:00
Christina Roberts
9dc2d11736 Merge pull request #13542 from deepsrijit1105/Country 
Fix Moldova spelling on dropdown list
 2016-10-18 17:56:23 -04:00
Toby Lawrence
6704e17afd [TNL-5632] Optimize the single_thread view. 
Firstly, we're now explicitly instructing the comments service to not
return thread responses/comments if the request isn't AJAX.  So, if you
load the URL for a single discussion thread in your browser, this would
be a non-AJAX call and we'll avoid loading the responses for the entire
thread behind-the-scenes.  Big win here for large threads.

Next, we removed a redundant "get threads" call which was also happening
behind-the-scenes.  This call was redundant as the front-end JS also
grabs the thread list when a topic is chosen, so we were making an
extranenous call for no benefit.  Poof, gone!

Finally, we added some caching of database queries that are required to
drive a lot of the permissions/cohorts machinery around discussion.
This will have a minimal effect but introduced a cleaner way to apply
general memoization at the per-request level which will let us further
cache things as we identify them as issues.
 2016-10-18 13:11:30 -04:00
Edward Fagin
dc4150ca51 Add logging when header permissions in use. 2016-10-18 10:21:43 -04:00
Douglas Hall
ac390e13f6 Refactored middleware that supports SESSION_COOKIE_DOMAIN overrides. 2016-10-18 09:07:03 -04:00
Deepa
f9c8e38df6 Update django-countries to the latest supported version 2016-10-17 21:48:19 +05:30
Andy Armstrong
03c3ee53e5 Move cors_crsf to openedx/core 2016-10-14 13:59:01 -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
Andy Armstrong
4d4097e13c Move dark_lang and lang_pref apps to openedx/core 2016-10-13 11:56:24 -04:00
Adam
644a5798a1 Merge pull request #13715 from edx/adam/export-location-to-neo4j 
add location to attributes exported to neo4j
 2016-10-13 10:34:55 -04:00
Robert Raposa
cd869d29a4 Move performance.views to its own urls.py. 2016-10-12 14:37:18 -04:00
Andy Armstrong
0b24614d6f Move session_inactivity_timeout to openedx/core 2016-10-12 00:17:54 -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
27c99e1cf2 Move header_control from common to openedx/core 2016-10-11 17:56:56 -04:00
Andy Armstrong
fbdc34e7f4 Merge pull request #13699 from edx/andya/move-contentserver 
Move contentserver to openedx/core
 2016-10-11 16:10:28 -04:00
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
Adam Palay
076651d8b8 add location to attributes exported to neo4j 2016-10-11 13:00:19 -04:00
Andy Armstrong
684aec8740 Move contentserver to openedx/core 2016-10-11 12:49:33 -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
Adam Palay
da58ad2a2b only dump courses to neo4j if they've been updated since the last time they were dumped 
improvements to the command line interface for caching
 2016-10-11 08:20:23 -04:00
Nimisha Asthagiri
cf2c48ab8f Merge pull request #13688 from edx/common_cleanup/datadog 
Move datadog from common to openedx/core
 2016-10-07 14:13:34 -04:00
Nimisha Asthagiri
5cb129e222 Merge pull request #13690 from edx/common_cleanup/heartbeat 
Move heartbeat from common to openedx/core
 2016-10-07 13:59:25 -04:00
Nimisha Asthagiri
0df9fb355b Merge pull request #13692 from edx/common_cleanup/monitoring 
Move monitoring from common to openedx/core
 2016-10-07 13:52:00 -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