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

44486 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Michael Terry
66980b53cc Merge pull request #17060 from edx/mikix/ie-login-align 
Fix login box alignment in IE
 2018-01-03 08:51:10 -05:00
Zubair Afzal
b281bb5b32 Merge pull request #17066 from edx/zub/ENT-832-third-party-auth-stop-username-sync 
Remove username from force syncing in third party auth pipeline
 2018-01-03 18:40:23 +05:00
Noraiz Anwar
7e0d7c151a Merge pull request #17073 from edx/revert-16858-noraiz/EDUCATOR-1931 
Revert "temporary logs to check if anonymous user is accessing courseware"
 2018-01-03 18:36:37 +05:00
ayub-khan
5e05da6dad remove compilejsi18n commands 2018-01-03 17:43:35 +05:00
Noraiz Anwar
31fb4a1b19 Revert "temporary logs to check if anonymous user is accessing courseware" 2018-01-03 14:51:30 +05:00
zubair-arbi
4a5f3e8e52 add update link on name field for django admin SAMLProviderConfigAdmin 
ENT-403
 2018-01-03 14:40:03 +05:00
Ayub khan
40be878ac3 Merge pull request #17070 from edx/LEARNER-2653-make-target-for-pull-translations 
Make Target for pull translations
 2018-01-02 18:40:34 +05:00
ayub-khan
634e152752 Make target for pulling translations 2018-01-02 17:00:10 +05:00
Noraiz Anwar
a222f01ac8 Merge pull request #17051 from edx/noraiz/EDUCATOR-2028 
fix course staff ability to perform operations on instructor dashboard
 2018-01-02 16:32:48 +05:00
noraiz-anwar
9d2fad7144 fix course staff ability to perform operations on instructor dashboard 2018-01-02 14:34:38 +05:00
Saleem Latif
81b200ae9e Merge pull request #17043 from edx/saleem-latif/ENT-829 
[ENT-829]: Move enterprise specific code in student_account views to enterprise_support
 2018-01-01 17:29:10 +05:00
zubair-arbi
7504be1c67 Remove username from force syncing in third party auth pipeline 2018-01-01 16:24:03 +05:00
Saleem Latif
26cc70a7bc Move enterprise specific code in student_account views to enterprise_support 2018-01-01 16:08:41 +05:00
Christopher Lee
96977fe2de Merge pull request #17058 from edx/clee/LEARNER-2353 
Use user's language preference on bookmark page
 2017-12-29 14:18:49 -05:00
christopher lee
02a98a7232 Use user's language preference on bookmark page 2017-12-29 13:11:00 -05:00
Stu Young
d75bbf05e4 Merge pull request #17053 from edx/estute/bokchoy-option-to-load-data-without-migrations 
add bokchoy script option for running migrations
 2017-12-29 12:03:12 -05:00
Michael Terry
4e05d43345 Fix login box alignment in IE 
In IE 11, the login page form was being shown right-aligned on the
page. This is because of some IE interaction with margin: auto.
Removing that and relying on flexbox flow fixes it and makes the
form centered again.

LEARNER-3001
 2017-12-29 11:36:49 -05:00
Stuart Young
454e5a3b55 bokchoy option for explicitly running migrations 2017-12-29 08:51:32 -05:00
David Ormsbee
cc229ebb65 Merge pull request #17031 from edx/ormsbee/collectstatic_ignore 
Ignore certain patterns during collectstatic.
 2017-12-28 20:42:12 -05:00