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

14320 Commits

Author SHA1 Message Date
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
Muzaffar yousaf
9d87472804 Merge pull request #13697 from edx/mzfr/flaky-bokchoy-4954 
Fixing flaky test_studio_help_links
 2016-10-13 12:02:40 +05:00
alisan617
8d429a91f3 add child of text check unit page 2016-10-12 17:23:51 -04:00
Robert Raposa
8a9cf7e10e Move track.views to new urls.py 2016-10-12 14:37:18 -04:00
Brian Beggs
fa81f303f5 Merge pull request #13735 from edx/release 
Merge release -> master for release-2016-10-12
 2016-10-12 14:06:17 -04:00
Robert Raposa
3f7503336e Merge pull request #13672 from edx/robrap/urls 
Move student.views to student/urls.py
 2016-10-12 08:47:53 -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
Albert St. Aubin
088b5c6615 Corrected issue with the Show Hint button enabled state with single hint. 
TNL-5737
 2016-10-11 15:50:40 -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
alisan617
69b5a4adfc classname clash in uxpl shims TNL-5534 2016-10-11 12:51:01 -04:00
Andy Armstrong
684aec8740 Move contentserver to openedx/core 2016-10-11 12:49:33 -04:00
Robert Raposa
fea03e466c Move student.views to student/urls.py 2016-10-11 11:41:16 -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