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

44548 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Calen Pennington
fea4eef359 Merge pull request #17006 from cpennington/synchro-cms-static-base 
Make module loading for cms/static/js/base.js sychronous to ease tran…
 2018-01-09 22:55:08 -05:00
Harry Rein
042a854bd0 Merge pull request #17124 from edx/HarryRein/dashboard-entitlement-with-no-course-runs 
Show more sessions coming soon on course dashboard.
 2018-01-09 14:13:33 -05:00
Harry Rein
b404173046 Show more sessions coming soon on course dashboard. 
LEARNER-3808

Ensures that users can see their entitlement purchase whether there
are available sessions or not. Notifies them with a message stating that
more sessions are coming soon, as is currently implemented on the programs
dashboard.
 2018-01-09 13:04:36 -05:00
Michael Terry
57ba9b2ac6 Remove deprecated enabled field 
The CertificateGenerationCourseSetting.enabled column is
deprecated. It is no longer referenced anywhere in the code, and
it's time to remove it.

Original code by Michael LoTurco.

LEARNER-2549
 2018-01-09 10:04:26 -05:00
Mushtaq Ali
5750495f86 Merge pull request #17052 from edx/show-transcripts-feature 
Show transcripts feature
 2018-01-09 19:29:47 +05:00
Zubair Afzal
dedbd288dc Merge pull request #17137 from edx/zub/ENT-768-display-friendly-error-message-for-third-party-auth 
ENT-768 Display friendly error message for third party auth error
 2018-01-09 19:25:50 +05:00
Waheed Ahmed
706dd4b836 Merge pull request #17135 from edx/waheed/LEARNER-3758-fix-webcam-not-loading 
Fix webcam not loading in safari.
 2018-01-09 19:25:24 +05:00
Mushtaq Ali
70fe33fc1e Change upload button text 2018-01-09 17:03:48 +05:00
Mushtaq Ali
f76d419bc7 Fix download transcript bug - EDUCATOR-2071 2018-01-09 17:03:48 +05:00
Mushtaq Ali
0ab6b825fa Bump VAL version to 0.1.7 2018-01-09 17:03:47 +05:00
Mushtaq Ali
10d79b0047 Update user strings 2018-01-09 17:03:46 +05:00
Mushtaq Ali
00a86ccef8 Transcript file upload - EDUCATOR-2029 2018-01-09 17:03:46 +05:00
Qubad786
4f422e37d9 Refactor transcript upload handler to add language-overwrite support - EDUCATOR-2022 2018-01-09 17:03:45 +05:00
Qubad786
090e5dc534 Transcript upload backend for Video Upload Page – EDUCATOR-1854 2018-01-09 17:03:44 +05:00
Qubad786
c760c6a01b Download transcript on video upload page - EDUCATOR-1853 2018-01-09 17:03:44 +05:00
Mushtaq Ali
e601767329 Show transcripts on video uploads page - EDUCATOR-1662 2018-01-09 17:03:43 +05:00
zubair-arbi
0b13d25b08 ENT-768 Display friendly error message for third party auth error 2018-01-09 16:57:14 +05:00
Waheed Ahmed
b3fe397f9b Fix webcam not loading in safari. 
LEARNER-3758
 2018-01-09 15:25:36 +05:00
Jeremy Bowman
7a69d2f771 Merge pull request #17116 from edx/jmbowman/PLAT-1873_1 
PLAT-1873 to_deprecated_string() cleanup part 1
 2018-01-08 17:02:44 -05:00
Ari Rizzitano
8dcfd7f163 Merge pull request #16839 from edx/ari/demo-react-renderer 
use reactrenderer for react includes in python templates
 2018-01-08 16:46:07 -05:00
Braden MacDonald
a230cf3b5c Merge pull request #16741 from open-craft/tomaszgy/ignore_old_progress 
Ignore deprecated progress event for blocks with new Completion API.
 2018-01-08 13:10:52 -08:00
Michael Youngstrom
5095ffe1ae Merge pull request #17110 from edx/youngstrom/db_cache_rewrite_fingerprint 
Paver flag to update local bokchoy fingerprint
 2018-01-08 14:41:45 -05:00
Jeremy Bowman
d3d6272d8f PLAT-1873 to_deprecated_string() cleanup part 1 2018-01-08 13:51:42 -05:00
Ari Rizzitano
a5ab620e3e convert course/library listing to use reactrenderer 2018-01-08 13:43:06 -05:00
Gabe Mulley
2580a76016 Merge pull request #17102 from edx/mulby/fix-schedules-tracking-docs 
fix analytics docs for the schedules app
 2018-01-08 13:21:41 -05:00
Michael Youngstrom
748621b8f4 Paver flag to update local bokchoy fingerprint 2018-01-08 13:04:17 -05:00
Brian Mesick
e46c7fc516 Merge pull request #17096 from edx/bmedx/django111_lms_unit_1_failures 
Small fixes to LMS unit 1 failures in Django 1.11 tests
 2018-01-08 11:30:21 -05:00
Farhanah Sheets
46b569a873 Merge pull request #17106 from edx/fsheets/EDUCATOR-2066 
Update SFE & Paragon versions
 2018-01-08 11:11:17 -05:00
Douglas Hall
9976771628 Merge pull request #17099 from edx/douglashall/ENT-779_migration_2 
Revert "Revert "ENT-779 Remove ProviderConfig.drop_existing_session f…
 2018-01-08 11:00:08 -05:00
Brian Mesick
9bb67e7f41 Merge pull request #17104 from edx/bmedx/django111_lms_unit_2_failures 
Small fixes to LMS unit 2 failures in Django 1.11 tests
 2018-01-08 10:47:52 -05:00
bmedx
95e76dcafe Small fixes to LMS unit 1 failures in Django 1.11 tests 2018-01-08 10:20:30 -05:00
Ahsan Ul Haq
e7c869f87a Merge pull request #16951 from edx/ahsan/LEARNER-3393-rate-limited-access-token-view 
Rate limited /oauth2/access_token/
 2018-01-08 18:52:47 +05:00
Rabia Iftikhar
4fa0a38bc7 Merge pull request #16837 from AmmarNaqvi/EDUCATOR-1676-progress-page-and-prerequisite-rounding 
Changed subsection gating on course outline to consider rounded off g…
 2018-01-08 17:24:54 +05:00
Ahsan Ulhaq
1b2fdc058d Rate limited /oauth2/access_token/ 
There has been some reports about attack on /oauth2/access_token/.
This cause LMS to be down. This is being resolved by rate limiting the
endpoint.
LEARNER-3393
 2018-01-08 16:58:16 +05:00
Ammar Naqvi
fde830b73a Updated subsections grade percentage to start rounding 
Changed subsection gating on course outline to consider rounded off grade instead of absolute grade to decide whether to show a subsection which has a prerequisite or not.
EDUCATOR-1676
 2018-01-08 15:29:42 +05:00
Tomasz Gargas
3da19d0ea8 Ignore deprecated progress event for blocks with new Completion API. 
Signed-off-by: Tomasz Gargas <tomasz@opencraft.com>
 2018-01-08 10:10:02 +01:00
Hasnain Naveed
c7743d41f9 Merge pull request #17071 from edx/hasnain-naveed/WL-1395 
WL-1395 | Added User profile for service users.
 2018-01-08 13:02:06 +05:00
Asad Iqbal
d894850513 Merge pull request #16950 from edx/asadiqbal08/ENT-772-Update-singin-UI 
ENT-772 - UI Updated to Support Ent Data Synchronization message
 2018-01-08 12:55:24 +05:00
Asad Iqbal
3daea9bae3 Merge pull request #17090 from edx/asadiqbal08/ENT-478-new 
[ENT-478]:asadiqbal08/ SAML Provider Configs List View Updates
 2018-01-08 12:55:01 +05:00
Nimisha Asthagiri
0c295c68d5 Merge pull request #17111 from edx/arch/delete-old-settings-files 
Delete unneeded settings for analytics_exporter and sauce
 2018-01-05 16:26:13 -05:00
John Eskew
b4552a60f3 Merge pull request #17048 from edx/jeskew/lms_shard_4_fixes_django_19 
Fix LMS shard 4 test failures under Django 1.9.
 2018-01-05 15:59:54 -05:00
Nimisha Asthagiri
57f09e987f Delete unneeded Django Settings files 2018-01-05 15:04:10 -05:00
Michael Terry
b7fbfc938d Fix expire_old_entitlements celery task 
Celery was not able to find the task implementation, because we were
putting it in a nonstandard place.
 2018-01-05 14:34:10 -05:00
John Eskew
63e885be55 Test fixes for student Django app for v1.9 2018-01-05 14:23:22 -05:00
John Eskew
fc2d0fc61a Remove edx-private requirements from tox env. 2018-01-05 14:23:22 -05:00
John Eskew
1504c098a9 Form expected test redirect urls properly. 2018-01-05 14:23:22 -05:00
McKenzie Welter
33467b9d3f Merge pull request #17033 from edx/McKenzieW/learner-3727 
course title link to course home when enrolled
 2018-01-05 13:44:32 -05:00
Stu Young
31acbb914b Merge pull request #17062 from edx/estute/db-cache-tests 
add tests for paver db cache command
 2018-01-05 12:44:06 -05:00
McKenzie Welter
82fb6e7ec0 course title link to course home when enrolled 2018-01-05 12:36:59 -05:00
Farhanah Sheets
7cdba0baa3 Update SFE & Paragon versions 2018-01-05 11:46:14 -05:00