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

40050 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
alisan617
7b9c566f3d convert coffeeScript files in instructor dashboard to JS 2016-10-18 10:57:25 -04:00
Edward Fagin
dc4150ca51 Add logging when header permissions in use. 2016-10-18 10:21:43 -04: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
Nimisha Asthagiri
8f3a865cee Fix flaky test: test_youtube_id_w_different_local_server_sub 
TNL-5759
 2016-10-17 21:43:22 -04:00
Brandon DeRosier
4138622346 Merge pull request #13779 from edx/bdero/update-python-saml 
Update python-saml to latest version (v2.2.0)
 2016-10-17 20:18:08 -04:00
Nimisha Asthagiri
643d1d5404 Merge pull request #13775 from edx/robrap/mathjax 
Use MathJax -full config.
 2016-10-17 20:14:32 -04:00
Brandon DeRosier
0fe1bde7d1 Update python-saml to latest version. 
For more details, see the release document: https://github.com/onelogin/python-saml/releases/tag/v2.2.0

(cherry picked from commit bec0aeeb42d9b30580eed51efcde2b089e3693c5)
 2016-10-17 17:32:51 -04:00
Christina Roberts
046ee7bd96 Merge pull request #12923 from CredoReference/static-page-for-instructors-only 
Ability to hide Pages from students
 2016-10-17 17:10:33 -04:00
Robert Raposa
13495d88ab Use MathJax -full config. 2016-10-17 16:50:31 -04:00
Jesse Zoldak
ac1e4643a0 Add enable-migrations parameter for python unit tests 2016-10-17 15:59:44 -04:00
Cliff Dyer
41b519fdea Merge pull request #13767 from edx/cdyer/flakies-2016-10-14 
Added flaky tests.
 2016-10-17 14:22:32 -04:00
Eric Fischer
32ab4671d8 Merge pull request #13770 from edx/efischer/fix_grade_queue 
Use Correct queue for grade recalculation
 2016-10-17 13:27:30 -04:00
Deepa
f9c8e38df6 Update django-countries to the latest supported version 2016-10-17 21:48:19 +05:30
J. Cliff Dyer
87e2308801 Added flaky tests. 
New tickets:

    TNL-5770
    TNL-5771
    TNL-5772
    TNL-5773
    TNL-5774
    TNL-5775
 2016-10-17 11:59:46 -04:00
Bill DeRusha
50e399828a Merge pull request #13768 from edx/bderusha/release-fix-2016-10-16 
Fix for UTM parameter tracking when UTM not present
 2016-10-17 11:52:53 -04:00
Eric Fischer
5df9f20160 Allow Celery queue settings to be defined by ENV_TOKENS 
General good-practice cleanup requested by @jibsheet. Also includes some
pylint fixes myh editor flagged during this cleanup.
 2016-10-17 11:45:07 -04:00