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

39062 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eric Fischer
7c1913b702 Merge pull request #13765 from edx/efischer/grades_task_retry 
Recalculate Subsection Grade task retry logic
 2016-10-20 10:47:58 -04:00
Cliff Dyer
ac48c2e42f Merge pull request #13716 from edx/cdyer/fix-problem-block-tests 
Make problem block tests more realistic.
 2016-10-20 10:36:45 -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
alisan617
04fa2a4263 Merge pull request #13793 from edx/alisan/page-navs-wraps-TNL-5794 
byte-size fix for 2 lines page navs
 2016-10-20 09:19:15 -04:00
Mushtaq Ali
8f11bca03c Merge pull request #13712 from edx/mushtaq/numerical-additional-answers 
Add support for additional answers for Numerical Input problems
 2016-10-20 15:50:27 +05:00
Mushtaq Ali
387f210363 Add support for additional answers for Numerical Input problems 
TNL-5581
 2016-10-20 09:40:01 +00:00
alisan617
9bcbb25b86 byte-size fix for 2 lines page navs 2016-10-19 19:13:58 -04:00
Christina Roberts
19ce439360 Merge pull request #13710 from edx/christina/capa-edit-coffee 
Convert problem/edit.coffee to JS
 2016-10-19 17:45:29 -04:00
cahrens
113aec25bf eslint corrections 2016-10-19 16:19:10 -04:00
sanfordstudent
f5647878d9 Merge pull request #13771 from edx/sstudent/TNL-5658 
add grading policy hash to transformer
 2016-10-19 13:38:25 -04:00
Jesse Zoldak
d777749f18 Merge pull request #13792 from edx/zoldak/adjust-lint-thresholds 
Adjust lint thresholds
 2016-10-19 12:21:19 -04:00
Sanford Student
9209eef7e2 add grading policy hash to transformer 2016-10-19 11:35:51 -04:00
Jesse Zoldak
6afe026a4c Adjust lint thresholds 2016-10-19 11:11:42 -04:00
Eric Fischer
2ca7484c1a Merge pull request #13763 from edx/efischer/use_env_tokens 
Allow Celery queue settings to be defined by ENV_TOKENS
 2016-10-19 10:02:22 -04:00
Jeremy Bowman
c8b36a6ac1 Merge pull request #13161 from mitocw/fix/aq/support_django_oauth_toolkit 
Fixed authentication classes to support Django OAUTH Toolkit
 2016-10-19 10:00:15 -04:00
Eric Fischer
529889f3f2 Recalculate Subsection Grade task retry logic 
The task will now be retried if an IntegrityError is encountered, up to
the default of 3 times. Test included.

TNL-5739
 2016-10-19 09:45:34 -04:00
Jesse Shapiro
6ccb74c7d5 Merge pull request #13323 from open-craft/upgrade-django-storage-swift 
Upgrading django-storage-swift module to take advantage of pending PR
 2016-10-19 09:27:23 -04:00
Jesse Shapiro
e431459cb5 Upgrade django-storage-swift to 1.2.12 2016-10-19 08:16:37 -04:00
Saleem Latif
f3089e9eec Merge pull request #13783 from edx/saleem-latif/ENT-28 
ENT-28: Add testing for 'saml' management command
 2016-10-19 14:11:31 +05:00
Saleem Latif
38931957e2 Add testing for 'saml' management command 2016-10-19 12:49:41 +05:00
Tim Krones
907801d6e4 Merge pull request #13611 from open-craft/itsjeyd/update-xblock-drag-and-drop-v2 
Update DnDv2 to v2.0.11.
 2016-10-19 09:02:34 +02:00
Ayub khan
d3fcb44631 Merge pull request #13782 from edx/ECOM-5846 
ECOM-5846 Add more logs for enrollment api
 2016-10-19 11:51:04 +05:00
Jesse Zoldak
b15378a28b Merge pull request #13776 from edx/zoldak/TE-1587 
Add enable-migrations parameter for python unit tests
 2016-10-18 22:52:22 -04:00
Christina Roberts
6b3aa71102 Merge pull request #13730 from indagation/fix_staticbook_url 
Fix Malformed Staticbook url
 2016-10-18 21:45:56 -04:00
Nimisha Asthagiri
6e7f131c40 Merge pull request #13790 from edx/release 
Merge Release to Master
 2016-10-18 19:23:23 -04:00
Nimisha Asthagiri
3ebdec220a Merge pull request #13760 from edx/release-candidate 
Release Candidate rc/2016-10-18
 2016-10-18 18:06:28 -04: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
Christina Roberts
fbf0e9447c Merge pull request #13685 from indagation/http-duplicate-fix 
Removed unnecessary http:
 2016-10-18 17:53:16 -04:00
Nimisha Asthagiri
d078b65ea7 Merge pull request #13754 from edx/flaky/video-test 
Fix flaky test: test_youtube_id_w_different_local_server_sub
 2016-10-18 16:42:43 -04:00
cahrens
0fb37ceeb6 Replace with JS code. 2016-10-18 16:27:29 -04:00
cahrens
337d4947c0 Rename to edit.js 2016-10-18 16:27:29 -04:00
Christina Roberts
7de60d1278 Merge pull request #13764 from edx/christina/tnl-5735 
Fix screen-reader capa status prefixing
 2016-10-18 14:43:01 -04:00
Christina Roberts
b693d98a1f Merge pull request #13531 from Bound3R/patch-1 
Remove invalid selector
 2016-10-18 14:38:46 -04:00
Toby Lawrence
ef3b0e4702 Merge pull request #13544 from edx/TNL-5632 
[TNL-5632] Don't request responses/comments for non-AJAX requests.
 2016-10-18 14:06:21 -04:00
Nimisha Asthagiri
ba9ef89e8d Fix CCX migration to be resilient to course-not-found 2016-10-18 13:55:25 -04:00
Robert Raposa
4d301b9b98 Revert MathJax -full config. 2016-10-18 13:55:25 -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
cahrens
485a88fabc Prefix status with Question number. 
TNL-5735
 2016-10-18 12:58:16 -04:00
Christina Roberts
971f102b1d Merge pull request #13743 from edx/christina/capa-display-conversion 
Convert capa/display.coffee to JS.
 2016-10-18 12:56:28 -04:00
Douglas Hall
9cf6880534 Merge pull request #13777 from edx/douglashall/fix_session_cookie_domain_middleware 
Refactored middleware that supports SESSION_COOKIE_DOMAIN overrides.
 2016-10-18 11:20:43 -04:00
Amir Qayyum Khan
fc042c9bbd Merge branch 'master' into fix/aq/support_django_oauth_toolkit 2016-10-18 20:09:13 +05:00
Saleem Latif
9fb891fbd7 Merge pull request #13769 from edx/saleem-latif/ENT-36 
ENT-36: Fix NameError issue for saml mangemement command
 2016-10-18 18:39:31 +05:00
cahrens
a1d3c31681 eslint fixes and other cleanup 2016-10-18 09:33:59 -04:00
Douglas Hall
ac390e13f6 Refactored middleware that supports SESSION_COOKIE_DOMAIN overrides. 2016-10-18 09:07:03 -04:00
Saleem Latif
cb527f1e39 Fix NameError issue for saml mangemement command 2016-10-18 17:25:43 +05:00
Amir Qayyum Khan
f09445ed18 Added more tests 2016-10-18 16:20:57 +05:00
Amir Qayyum Khan
164d324449 Refactor tests 2016-10-18 16:20:57 +05:00
Amir Qayyum Khan
25d8085b79 Fixed authentication classes to support Django OAUTH Toolkit 2016-10-18 16:20:57 +05:00
Tim Krones
bbbf86e14a Update xblock-drag-and-drop-v2 to v2.0.11. 2016-10-18 09:41:10 +02:00
Ayub-Khan
d9e5c9e9ee added logs 2016-10-18 07:29:17 +00:00