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

39029 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
Stu Young
84b27e09ce Merge pull request #13741 from edx/estute/turn-off-coveralls-reporting 
stop reporting to coveralls
 2016-10-17 11:44:40 -04:00
Eric Fischer
76b3a65259 Use redefined LOW_PRIORITY queue 
aws.py redefines the default queues in order to expose cross-environment
work. The new recalculate grades routing key shgould use that value
rather than the default defined in common.py.
 2016-10-17 11:32:06 -04:00
Bill DeRusha
a36df010c0 Fix for UTM parameter tracking when UTM not present 2016-10-17 10:28:47 -04:00
Gregory Martin
2f868e5e24 Merge pull request #13733 from edx/yro_localized-datetime 
Set up DateUtil factory, modify requests to handle moment-timezones, moment-with-locales.
 2016-10-17 10:10:58 -04:00
stu
540c12fc27 stop reporting to coveralls 2016-10-17 10:01:33 -04:00
Tasawer Nawaz
252880e5de Merge pull request #13740 from edx/tasawer/ecom-5684/forgot-password-verbiage-pdate 
Forgot Password - Verbiage Update
 2016-10-17 16:03:55 +05:00
Ahsan Ulhaq
19496aef5d Merge pull request #13663 from edx/ahsan/ECOM-4763-update-log-messages 
update error messages in enrollment API
 2016-10-17 14:43:22 +05:00
Ahsan Ulhaq
21746f1e93 update error messages in enrollment API 
ECOM-4763
 2016-10-17 13:15:24 +05:00
tasawernawaz
ab8e5b82b6 Forgot Password - Verbiage Update 
ECOM-5684
 2016-10-17 11:56:35 +05:00
Andy Armstrong
39a461d8f7 Merge pull request #13698 from edx/andya/move-cors-csrf 
Move cors_crsf to openedx/core
 2016-10-16 20:07:37 -04:00
Robert Raposa
988db7b152 Merge pull request #13751 from edx/robrap/cleanup-student-urls 
Clean up student/urls.py
 2016-10-14 16:45:10 -04:00
Christina Roberts
a5fa635b24 Merge pull request #13753 from edx/christina/tnl-5758 
Flaky course outline bok choy test.
 2016-10-14 16:11:22 -04:00
Dmitry Viskov
bb09fdb7be Ability to hide Pages from students 2016-10-14 22:43:26 +03:00
Eric Fischer
b8a025347e Merge pull request #13757 from edx/efischer/low_queue 
Route grading updates to low priority queue
 2016-10-14 15:41:06 -04:00
Greg Martin
4ddda443b8 Implement localized datetimes in browser 
moment-timezone require config

jasmine test fix, duplicate req. cleanup
 2016-10-14 15:25:38 -04:00
cahrens
c9284835e1 Minor changes for flaky test. 
This test has been very flaky on master, but the failure
is not reproducible. Trying a few things that might help.
TNL-5758
 2016-10-14 15:16:47 -04:00
Christina Roberts
65723e2b12 Merge pull request #13758 from edx/christina/tnl-5513 
Fix textbook tests so a11y tests only run in a11y test phase
 2016-10-14 14:47:40 -04:00
Eric Fischer
c4c2875232 Route grading updates to low priority queue 2016-10-14 14:24:08 -04:00
Andy Armstrong
03c3ee53e5 Move cors_crsf to openedx/core 2016-10-14 13:59:01 -04:00
sanfordstudent
8c22d5229b Merge pull request #13761 from edx/sstudent/one_milestones_app 
removing extra instance of MILESTONES_APP
 2016-10-14 13:40:49 -04:00