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

14035 Commits

Author SHA1 Message Date
Nimisha Asthagiri
6e7f131c40 Merge pull request #13790 from edx/release 
Merge Release to Master
 2016-10-18 19:23:23 -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
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
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
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
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
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
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
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
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
Andy Armstrong
03c3ee53e5 Move cors_crsf to openedx/core 2016-10-14 13:59:01 -04:00
cahrens
3e6b545f5e Change to only run a11y test in a11y phase. 
Not able to reproduce flakiness.
TNL-5513
 2016-10-14 13:39:54 -04:00
cahrens
1b03a0090d Replace with CoffeeScript generated version of JS. 
Includes reformatting to 4 spaces.
 2016-10-14 13:14:19 -04:00
cahrens
7a443737f6 Convert display.coffee to js. 
First just rename.
 2016-10-14 13:13:14 -04:00
cahrens
b366ad6d33 Convert display.coffee to js. 2016-10-14 13:13:14 -04:00
Christina Roberts
c8a3367269 Merge pull request #13705 from edx/christina/javascript_loader 
Christina/javascript loader
 2016-10-14 12:57:19 -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
Ben Patterson
8772df0435 Merge pull request #13756 from edx/benp/flaky-textbook-tests 
Stabilize textbook tests
 2016-10-14 11:03:31 -04:00
alisan617
d5635cf1ba New inline discussion home view UI 
TNL-4756
 2016-10-14 10:54:50 -04:00
Ben Patterson
b34600f140 Stabilize textbook tests 2016-10-14 10:05:49 -04:00
Jillian Vogel
1a8a1274d8 Merge pull request #13534 from open-craft/jill/choice_response_computed 
Allows ChoiceResponse problems to set correctness with python variables
 2016-10-14 17:55:12 +10:30
Jillian Vogel
8124aacfcc Allows ChoiceResponse CAPA problems to use script-computed variables to 
determine choice correctness, as MultipleChoiceResponse problems already do.

Adds a unit test for this change, and for the existing MultipleChoiceResponse
computed correctness capability.
 2016-10-14 08:20:14 +10:30
Robert Raposa
3bfe3f8488 Clean up student/urls.py. 2016-10-13 15:48:20 -04:00
Andy Armstrong
f2c3fa90f9 Merge pull request #13677 from edx/andya/move-language-apps 
Move dark_lang and lang_pref apps to openedx/core
 2016-10-13 14:47:37 -04:00
Brian Beggs
9a23babc9d Merge pull request #13747 from edx/release 
Merge hotfix back to master.
 2016-10-13 14:46:02 -04:00
cahrens
bee04095bd Fix eslint violations. 2016-10-13 13:59:00 -04:00
cahrens
b8ddf709dc Convert javascript_loader to JS. 
Also reformat to 4 spaces per indent.
 2016-10-13 13:59:00 -04:00
Andy Armstrong
4d4097e13c Move dark_lang and lang_pref apps to openedx/core 2016-10-13 11:56:24 -04:00
Nimisha Asthagiri
14d8a46d8c Merge pull request #13739 from edx/flaky/cohort-test 
Fix flaky bokchoy test: test_automatic_cohort_help, test_manual_cohort_help
 2016-10-13 11:36:37 -04:00
Robert Raposa
e96bcbd79e Merge pull request #13682 from edx/robrap/urls-2 
Move more urls.py
 2016-10-13 10:34:03 -04:00
Nimisha Asthagiri
9ed598e607 Merge pull request #13708 from edx/jeskew/move_config_models_to_external_repo 
Remove config_models & use external config_models repo instead.
 2016-10-13 08:55:01 -04:00
Nimisha Asthagiri
9f1d4cbf6f Fix flaky test_automatic_cohort_help bokchoy test 
TNL-5709
 2016-10-13 03:58:01 -04:00