Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

18841 Commits

Author SHA1 Message Date
Jeremy Bowman
c962e7914c TE-2631 Fix notes bok-choy tests in devstack 2018-07-05 11:55:24 -04:00
Jeremy Bowman
b74131a726 TE-2630 Fix discussions bok-choy tests in devstack 2018-07-03 14:33:54 -04:00
Jeremy Bowman
addbf0f0e6 Merge pull request #18503 from edx/jmbowman/TE-2586 
TE-2586 Add missing time zone data to bok-choy fixtures
 2018-07-03 11:35:44 -04:00
Feanil Patel
aa3b6643b7 Merge pull request #18505 from edx/feanil/remove_flaky_content_library_test 
Remove flaky content library test.
 2018-07-03 10:01:54 -04:00
Tasawer Nawaz
6a4924f9d4 Merge pull request #18478 from edx/tasawer/LEARNER-4744/inactive-enrollments-in-support-tool 
inactive enrollments in support tool
 2018-07-03 15:55:34 +05:00
Feanil Patel
1caeb3283e Remove flaky video test. 
This test failed on commit 7083797c54 even though
that change has nothing to do with the video tests.
 2018-07-02 15:02:45 -04:00
Feanil Patel
99dcf32eee Remove flaky content library test. 
This test failed on commit 7083797c54 even though
that change has nothing to do with the content library.
 2018-07-02 15:02:14 -04:00
Jeremy Bowman
451514e930 TE-2586 Add missing time zone data to bok-choy fixtures 2018-07-02 13:55:54 -04:00
Tasawer Nawaz
8868f07394 inactive enrollments in support tool 
LEARNER-4744
 2018-07-02 19:02:43 +05:00
aghaawais01
f4e4f7c96f bokchoy conversion of advanced settings 2018-07-02 13:56:01 +00:00
Awais Jibran
4b81ab6312 Merge pull request #18367 from edx/aj/EDUCATOR-3035/screenreader-issue 
Screen reader issue with structure of LMS course outline
 2018-07-02 15:33:54 +05:00
edx-cache-uploader-bot
c8ad22f457 Updating migrations 2018-06-29 15:08:44 -04:00
edx-cache-uploader-bot
41d0e56a0e Updating migrations 2018-06-29 15:08:43 -04:00
edx-cache-uploader-bot
48889c13f8 Updating migrations 2018-06-29 15:08:42 -04:00
edx-cache-uploader-bot
6670883b4d Updating migrations 2018-06-29 15:08:41 -04:00
edx-cache-uploader-bot
81c995e5f0 Updating migrations 2018-06-29 15:08:40 -04:00
edx-cache-uploader-bot
2a2e8d1d89 Updating migrations 2018-06-29 15:08:39 -04:00
Calen Pennington
b85d6f031c Merge pull request #18417 from cpennington/cale/fix-ora-webpack 
Cale/fix ora webpack
 2018-06-28 12:47:53 -04:00
Awais Jibran
b820c0c6f9 Merge pull request #18471 from edx/aj/fix-correct-map-problem 
Do not update correct_map if state is invalid (EDUCATOR-3016)
 2018-06-28 13:42:31 +05:00
Awais Jibran
19b5fc6b22 Screen reader issue with structure of LMS course outline 
Potential solutions:
1. Removal of the "role" attributes on the "li" elements and on the "ol"
2. Wrapping of the section/subsection titles in heading tags (<h4>-<h5>) that map to the correct nesting level of the content in the course (this is done correctly for the top-level elements)
EDUCATOR-3035
 2018-06-28 13:13:42 +05:00
Calen Pennington
07a15c681f Reapply the XBlock RequireJS -> Webpack changes 
This reverts commit 105db2cf59, reversing
changes made to 447457594f.
 2018-06-27 22:27:07 -04:00
Jeremy Bowman
e80152fd8a TE-2584 Upgrade XBlock to fix edx-sga warning 2018-06-27 10:16:51 -04:00
Awais Jibran
a8d6443df3 Do not update correctmap if state is invaid. 2018-06-27 17:54:39 +05:00
Feanil Patel
4e76a5d025 Merge pull request #18462 from edx/feanil/remove_beacon 
Get rid of all code related to the CDN Experiments.
 2018-06-26 10:47:38 -04:00
Feanil Patel
cd47b28339 Get rid of all code related to the CDN Experiments. 
These were very early experiments by the old performance team
on using CDNs for videos and logging performance data.  No one
is looking at this data and it's just extra cruft on every page.
 2018-06-25 18:03:33 -04:00
Stu Young
2803c0b37b Merge pull request #18457 from edx/testeng/bokchoy_auto_cache_update_54f8d4e7d2b218fec97f75271d5712b3ece9ab3c 
Bokchoy db cache update
 2018-06-25 14:07:03 -04:00
edx-cache-uploader-bot
11eeb19cb0 Updating migrations 2018-06-25 13:36:08 -04:00
noraiz-anwar
06780b2ded add delay in score recalculation on enrollment update 2018-06-25 14:59:09 +05:00
edx-cache-uploader-bot
7e504222b9 Updating migrations 2018-06-22 15:28:09 -04:00
Usman Khalid
8b1aad080a Add complete on view support to render_xblock view. 2018-06-22 14:46:03 -04:00
Albert (AJ) St. Aubin
85ab2e4036 Merge pull request #18443 from edx/LEARNER-5275 
Update the entitlement fulfilment logic to work with enrollment end
 2018-06-22 09:59:36 -04:00
Albert St. Aubin
06af818322 Update the entitlement fulfilment logic to work with enrollment end 
[LEARNER-5275]

Update the endtitlement fulfillment logic to work for users who have
enrolled, enrollment window has closed, but upgrade window is still
open. These users should be able to use that enrollment on their course
run that they are enrolled in.
 2018-06-22 07:48:35 -04:00
J Eskew
64ce2a0d8a Merge pull request #18405 from edx/jeskew/PLAT_2185_idempotent_endpoints 
Make retirement endpoints idempotent.
 2018-06-21 16:11:06 -04:00
John Eskew
a09a81b138 Make retirement endpoints idempotent. 2018-06-21 15:35:30 -04:00
J Eskew
df16836a8f Merge pull request #18427 from edx/jeskew/fix_some_deprecation_warnings 
Fix some deprecation warnings.
 2018-06-21 12:24:19 -04:00
John Eskew
b94ea6b4b1 Import XBlockMixin from the correct location. 2018-06-21 11:41:06 -04:00
John Eskew
56824d01cc Remove DataDog enrollment submissions using the deprecated offering. 2018-06-21 11:40:40 -04:00
Albert St. Aubin
f23fd19e99 Added search fields to the entitlements admin panel 2018-06-21 08:54:07 -04:00
Simon Chen
b273770934 Merge pull request #18213 from jolyonb/jolyonb/showanswer_on_attempts 
Allow solutions to be displayed past due on showanswer=attempted
 2018-06-20 09:37:42 -04:00
Eric Fischer
e72549cdbe Revert "Merge pull request #18340 from cpennington/fix-studio-xblock-rendering" 
This reverts commit 9a70ca78a5, reversing
changes made to efd5b9abbd.

Hopefully fixes EDUCATOR-3053
 2018-06-15 13:18:27 -04:00
uzairr
e77a19a4a3 Update UTM params of social sharing buttons 
To improve Customer experience small changes have done in the
Google Analytics so that incoming stats are organized efficiently.

LEARNER-5360
 2018-06-14 12:38:01 +00:00
Feanil Patel
c96bc8330c Merge pull request #18363 from edx/feanil/update_social_auth 
Actually update social auth packages.
 2018-06-13 22:25:03 -04:00
Nimisha Asthagiri
62266fd936 Merge pull request #18325 from edx/hack/course-validation-api 
Course Validation and Course Quality APIs
 2018-06-13 21:33:22 -04:00
Nimisha Asthagiri
8db2dd47dd Course Validation and Course Quality APIs 2018-06-13 20:33:45 -04:00
Jeremy Bowman
69092ac18b Fix unit tests with latest social-auth-* packages 2018-06-13 17:24:33 -04:00
Calen Pennington
9a70ca78a5 Merge pull request #18340 from cpennington/fix-studio-xblock-rendering 
Fix studio xblock failing renders (due to asset hashing loop)
 2018-06-13 15:58:34 -04:00
Calen Pennington
b735a127b9 Fix assorted linting errors 2018-06-13 10:00:13 -04:00
Calen Pennington
afc6899c30 Limit the length of browser log file names 2018-06-13 10:00:11 -04:00
edx-cache-uploader-bot
237d3114e9 Updating migrations 2018-06-13 09:30:52 -04:00
David Ormsbee
386699f7aa Merge pull request #18350 from edx/ormsbee/discussion_map_storage_change 
Fix forums ID mapping
 2018-06-13 09:06:44 -04:00