Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
45,731 Commits 1 Branch 0 Tags
435c3c633811ea5164311caefc7d94de1595c435
Commit Graph

45731 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
bmedx
95e76dcafe Small fixes to LMS unit 1 failures in Django 1.11 tests 2018-01-08 10:20:30 -05:00
Ari Rizzitano
27546f646f move bootstrap doc from developer docs 2018-01-08 09:53:44 -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
Ari Rizzitano
37c5591be5 first stab at a js doc 2018-01-07 23:24:47 -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
Stuart Young
386f0e7cb7 add tests for paver db cache command 2018-01-05 11:38:02 -05:00
bmedx
f7a36aae64 Small fixes to LMS unit 2 failures in Django 1.11 tests 2018-01-05 10:41:07 -05:00
Gabe Mulley
1a9434f967 fix analytics docs for the schedules app 2018-01-05 09:59:31 -05:00
asadiqbal
e536811640 remove backend_name 2018-01-05 17:32:33 +05:00
asadiqbal
5d92b42fe3 UI Updates to Support Ent Data Synchronization 2018-01-05 17:16:02 +05:00
Albert (AJ) St. Aubin
97ba86da7c Merge pull request #17097 from edx/aj/LEARNER-3629_refund_api_refactor 
Corrected incorrect refund data in refund logic
 2018-01-05 07:06:54 -05:00
Douglas Hall
9071117ea2 Revert "Revert "ENT-779 Remove ProviderConfig.drop_existing_session field from DB."" 
This reverts commit 23e17b3c35.
 2018-01-04 16:57:52 -05:00
Albert St. Aubin
06c5d0c1a9 Corrected incorrect refund data in refund logic 
[LEARNER-3629]

This is the refactor logic for refunds. With the addition of
Course Entitlement Refunds shared refund logic was merged and tests were added.
 2018-01-04 15:31:33 -05:00
Matthew Piatetsky
57c45c6453 Merge pull request #16969 from edx/LEARNER-3058 
LEARNER-3058 Move hero upsell to sidebar
 2018-01-04 14:48:18 -05:00
Albert (AJ) St. Aubin
e149182aeb Merge pull request #17095 from edx/revert-16934-aj/LEARNER-3629_refund_api_refactor 
Revert "Refactor of the CourseEntitlement Refund API to handle refund failures"
 2018-01-04 14:32:16 -05:00
Douglas Hall
ea40de7a73 Merge pull request #17094 from edx/revert-17030-douglashall/ENT-779_drop_existing_session_migration 
Revert "ENT-779 Remove ProviderConfig.drop_existing_session field from DB."
 2018-01-04 14:30:55 -05:00
Albert (AJ) St. Aubin
e53013ec70 Revert "Refactor of the CourseEntitlement Refund API to handle refund failures" 2018-01-04 14:28:12 -05:00
Douglas Hall
23e17b3c35 Revert "ENT-779 Remove ProviderConfig.drop_existing_session field from DB." 2018-01-04 13:20:22 -05:00
sanfordstudent
d06ef04640 Merge pull request #17092 from edx/sstudent/EDUCATOR-2055 
EDUCATOR-2055: resolving error causing upgrades to verified to fail
 2018-01-04 12:50:41 -05:00
Albert (AJ) St. Aubin
14ddb59f90 Merge pull request #16934 from edx/aj/LEARNER-3629_refund_api_refactor 
Refactor of the CourseEntitlement Refund API to handle refund failures
 2018-01-04 12:16:35 -05:00
Michael Terry
64b7fb88b8 Pass serializable data to celery 
The expire_old_entitlements management command was passing a
Paginator object to celery, which it can't serialize when it is
running async. Instead, we'll do the pagination manually inside the
task code and simply pass it integers.
 2018-01-04 12:01:41 -05:00
Diana Huang
dd80638736 Merge pull request #17086 from edx/diana/i18n-sock 
Mark sock strings for translation.
 2018-01-04 11:29:15 -05:00
Sanford Student
38db15cbe9 EDUCATOR-2055: resolving error causing upgrades to verified to fail 2018-01-04 11:14:47 -05:00
Albert St. Aubin
417ef0583b Refactor of the CourseEntitlement Refund API to handle refund failures 
[LEARNER-3629]

The CourseEntitlement Refund API will not respond with ERROR codes when
the attempted refund call to Ecommerce fails.
 2018-01-04 11:02:13 -05:00
Diana Huang
b4e7d35095 Mark sock strings for translation. 2018-01-04 09:34:14 -05:00
Nimisha Asthagiri
faecaf3316 Merge pull request #17088 from edx/arch/delete-dev-files 
Delete old development config files
 2018-01-04 09:23:57 -05:00
sanfordstudent
5867f2d632 Merge pull request #17085 from edx/sstudent/EDUCATOR-1290-loggin 
EDUCATOR-1290: logging
 2018-01-04 09:10:58 -05:00
Daniel Clemente Laboreo
902f83c12b Add some blocks to course_about.html 2018-01-04 15:17:28 +02:00
Hasnain
2305fd9688 WL-1395 | Added User profile for service users. 2018-01-04 18:09:56 +05:00
Zubair Afzal
2eddbad3af Merge pull request #17072 from edx/zub/ENT-403-django-admin-thrid-party-auth-name-with-update_link 
add update link on name field for django admin SAMLProviderConfigAdmin
 2018-01-04 16:39:03 +05:00
Nimisha Asthagiri
ddfeb61b08 Delete old development config files 2018-01-03 17:26:09 -05:00
Sanford Student
14618c35de EDUCATOR-1290: logging 2018-01-03 16:36:23 -05:00
Tyler Hallada
e2d449b432 Merge pull request #17057 from edx/thallada/file-upload-limit 
Pass max_file_size_in_mbs to studio-frontend
 2018-01-03 16:06:35 -05:00