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

44505 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Stuart Young
386f0e7cb7 add tests for paver db cache command 2018-01-05 11:38:02 -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
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
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
Douglas Hall
c223ccdc5b Merge pull request #17030 from edx/douglashall/ENT-779_drop_existing_session_migration 
ENT-779 Remove ProviderConfig.drop_existing_session field from DB.
 2018-01-03 15:51:35 -05:00
Nimisha Asthagiri
2d6c9d459d Merge pull request #17039 from edx/pacing/upsell-date-translation 
Schedules: Fix date translation of upsell messaging
 2018-01-03 14:16:33 -05:00
Michael LoTurco
70522862a3 Merge pull request #17023 from edx/MLoTurco/learner-serialize-entitlement-enrollment 
Add enrollment_course_run to CourseEntitlementSerializer

The marketing site currently cannot use the entitlement
api to determine whether a user has an unfilled entitlement.
Including the entitlement enrollment_course_run makes this
information accessible to consumers of the entitlement API.

Learner-3731
 2018-01-03 13:54:28 -05:00
Tyler Hallada
5728ce49cc Pass max_file_size_in_mbs to studio frontend 2018-01-03 13:53:57 -05:00
Matthew Piatetsky
277407f2a6 move course upsell 2018-01-03 13:51:55 -05:00
Alex Dusenbery
792d0db5da Convert weekly highlights exception to warning. 2018-01-03 13:11:46 -05:00
Brittney Exline
034bdf991e Merge pull request #17082 from edx/bexline/enterprise_version_bump 
ENT-775 Upgrade edx-enterprise to 0.60.0
 2018-01-03 11:10:58 -07:00
Ayub khan
4d77d7c38f Merge pull request #17080 from edx/update-translations-3-jan 
updated translations
 2018-01-03 22:49:46 +05:00
Brittney Exline
175eb1d0f6 ENT-775 Upgrade edx-enterprise to 0.60.0 2018-01-03 11:53:53 -05:00
Nimisha Asthagiri
a1047794e8 Schedules: Fix date translation of upsell messaging 2018-01-03 11:53:09 -05:00
Christopher Lee
e928c11368 Merge pull request #17046 from edx/clee/LEARNER-271 
Wrap strings in gettext for graders file
 2018-01-03 11:41:10 -05:00
Michael LoTurco
2807d9915e Add enrollment_course_run to entitlementserializer 
The marketing site currently cannot use the entitlement
api to determine whether a user has an unfilled entitlement.
Including the entitlement enrollment_course_run makes this
information accessible to consumers of the entitlement API.

Learner-3731
 2018-01-03 11:28:53 -05:00
christopher lee
10f1907ff4 Wrap strings in gettext for graders file 2018-01-03 10:27:46 -05:00
ayub-khan
7085dc77f3 updated translations 2018-01-03 20:04:28 +05:00
Ayub khan
565e1271cf Merge pull request #17077 from edx/update-pull-translations-make-target 
LEARNER-2653 Remove compilejsi18n commands
 2018-01-03 19:08:38 +05:00