Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
46,934 Commits 1 Branch 0 Tags
67945fa3ef8311bf6f7c4466cd633352f19aa70f
Commit Graph

46934 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brandon Baker
67945fa3ef Change styling on view program record button in program detail sidebar 2018-07-30 14:50:38 -04:00
Troy Sankey
9ad65031a0 Merge pull request #18662 from edx/pwnage101/add-created-field-to-partner-report-serialization 
Add created field to UserRetirementPartnerReportSerializer
 2018-07-30 13:33:32 -04:00
J Eskew
3fe348598f Merge pull request #18657 from open-craft/jill/dont-delete-enrollments 
Do not delete course enrollments
 2018-07-30 11:09:06 -04:00
Jeremy Bowman
7430fb8ff0 Merge pull request #18664 from edx/jmbowman/TE-2665 
TE-2665 Install xblock-utils from PyPI
 2018-07-30 10:23:14 -04:00
Tasawer Nawaz
9ef1ae2019 Merge pull request #18673 from edx/tasawer/learner-5867/fix-contrast-of-button-on-contact-us-page 
Fix contrast of button on contact us page
 2018-07-30 19:01:10 +05:00
Jeremy Bowman
52d3c68416 TE-2665 Install xblock-utils from PyPI 2018-07-30 09:39:34 -04:00
Ayub
2f6d33c6dc Merge pull request #18674 from edx/update-translations-30-july 
updated-translations
 2018-07-30 17:49:55 +05:00
Nimisha Asthagiri
473cc52077 Merge pull request #18629 from edx/arch/jwt-config 
Use Asymmetric JWTs
 2018-07-30 07:55:19 -04:00
Nimisha Asthagiri
eac1ce7bfd Asymmetric JWT support 2018-07-30 07:17:08 -04:00
ayub-khan
060a061663 updated-translations 2018-07-30 15:34:55 +05:00
Tasawer Nawaz
225479c3a9 fix contrast of button on contact us page 
LEARNER-5867
 2018-07-30 14:59:06 +05:00
Ahsan Ul Haq
d06545a3cd Merge pull request #18622 from edx/ahsan/LEARNER-5852-Student-un-enroll-refund-for-verified-learners 
Added Management command for bulk unenrollment of users
 2018-07-30 14:56:34 +05:00
Ayub
a54066e9e6 Merge pull request #18669 from edx/i18n-fix 
i18n-fix
 2018-07-30 14:33:22 +05:00
Ahsan Ulhaq
73857f6039 Added Management command for bulk unenrollment of users 
LEARNER-5852
 2018-07-30 14:26:46 +05:00
Saleem Latif
65454c8133 Merge pull request #18415 from edx/saleem-latif/ENT-1018 
ENT-876: Added XAPI to installed apps
 2018-07-30 13:55:38 +05:00
Saleem Latif
3f5c5c0460 Added XAPI to installed apps 2018-07-30 12:49:52 +05:00
muhammad-ammar
c360b4effb fix poster display issue with hls 
EDUCATOR-2606

another approach
 2018-07-30 12:11:00 +05:00
Ayub
be29d73cd5 Merge pull request #18668 from edx/revert-18667-transifex-bot-update-translations2018-07-29 
Revert "Update translations"
 2018-07-30 10:38:56 +05:00
ayub-khan
264304e45d src ignore sub directries with same name 2018-07-30 09:50:52 +05:00
Ayub
19a22234da Revert "Update translations" 
This reverts commit 5f2be814aa.
 2018-07-30 09:34:06 +05:00
edX Transifex Bot
5f2be814aa Update translations 2018-07-29 17:23:04 -04:00
Brittney Exline
ada4d4bf33 Merge pull request #18663 from edx/bexline/enterprise_version_bump 
ENT-1125 Upgrade edx-enterprise to 0.71.2
 2018-07-27 14:35:57 -06:00
Troy Sankey
64ca1ca215 Add created field to UserRetirementPartnerReportSerializer 
This would allow the processing date for each retired user to be
included in the user retirement partner reports.
 2018-07-27 15:29:35 -04:00
Brittney Exline
dee145b0d5 ENT-1125 Upgrade edx-enterprise to 0.71.2 2018-07-27 15:28:52 -04:00
Christopher Lee
06417b81bb Merge pull request #18655 from edx/clee/add-details-in-log 
Added more details to logs in a program certificate exception
 2018-07-27 14:10:39 -04:00
sanfordstudent
302d82710f Merge pull request #18611 from edx/sstudent/ora_date_validation 
add validation of ORAs
 2018-07-27 13:28:46 -04:00
Agha Awais
a4547183da Merge pull request #18497 from edx/awais/lett_2_bc_course_create 
TE-2622: Course Create bokchoy tests
 2018-07-27 14:56:55 +05:00
Jillian Vogel
2667c14e19 Fix failing test 
and use the self.assert* convention used by the other tests
 2018-07-27 13:50:06 +09:30
Jillian Vogel
7a63af9216 Add a test 2018-07-27 11:25:32 +09:30
Jillian Vogel
84eefa0e87 Adds migration 2018-07-27 11:25:32 +09:30
Jillian Vogel
2fd3592586 Do not delete course enrollments 
when the associated CourseOverview gets recreated.
 2018-07-27 09:26:20 +09:30
Christopher Lee
3c6a62edd0 Added more details to logs in a program certificate exception 
LEARNER-5332
 2018-07-26 16:18:48 -04:00
Sanford Student
5f96420dd3 add validation of ORAs 2018-07-26 15:24:23 -04:00
Brandon Baker
f279e56b75 Merge pull request #18645 from edx/bbaker/LEARNER-5923 
Add program record section to program detail sidebar
 2018-07-26 14:04:11 -04:00
Brandon Baker
7a3a228c69 Add program record section to program detail sidebar 
LEARNER-5923
 2018-07-26 12:51:08 -04:00
Jeremy Bowman
1beb1c95fa Merge pull request #18430 from openfun/allow-using-development-settings-other-than-devstack 
Allow using dev settings other than DEVSTACK
 2018-07-26 11:08:08 -04:00
Waheed Ahmed
35c5ad91d1 Merge pull request #18653 from edx/revert-18285-waheed/LEARNER-4520-fix-pdf-certificates 
Revert "Fix PDF cert gereration/regeneration and URLs."
 2018-07-26 19:24:27 +05:00
Simon Chen
8f52509bbd Merge pull request #18640 from edx/private_to_public_09dcd04 
Mergeback PR from private to public.
 2018-07-26 09:55:13 -04:00
Waheed Ahmed
c2ad6f4002 Revert "Fix PDF cert gereration/regeneration and URLs." 2018-07-26 18:20:27 +05:00
maiazadhun1
7faf59ff7a course create bokchoy tests 2018-07-26 11:45:06 +00:00
Agha Awais
8b9048bf8c Merge pull request #18498 from edx/awais/lett_2_bc_grading 
TE-2624: Grading bokchoy tests
 2018-07-26 12:50:39 +05:00
Agha Awais
442a0f510a Merge pull request #18515 from edx/awais/lett_2_bc_advanced_settings_II 
TE-2621: Advanced settings bokchoy tests 2
 2018-07-26 11:34:22 +05:00
Michael Roytman
41848b8ff3 Merge pull request #18626 from edx/mroytman/course-outline-status-alignment 
mroytman/course outline status alignment
 2018-07-25 17:22:30 -04:00
Simon Chen
a5054cff0e Upgrade recommender xblock to patch the xss risk 2018-07-25 17:04:31 -04:00
Michael Roytman
d502a75efb improve alignment between studio-frontend outlines status blocks and course highlights block and bump studio-frontend version to 1.16.0 2018-07-25 16:27:04 -04:00
Troy Sankey
ed0b130046 Merge pull request #18637 from edx/pwnage101/add-mgmt-command-to-rehash-emails 
Add one-off management command to rehash retired emails
 2018-07-25 15:48:03 -04:00
David Ormsbee
f275ae609d Merge pull request #18646 from edx/ormsbee/remove_unused_config_settings 
Remove ENABLE_MANUAL_GIT_RELOAD, DEBUG_LEVEL, USE_YOUTUBE_OBJECT_API
 2018-07-25 15:36:02 -04:00
Troy Sankey
71597e790a Add one-off management command to rehash retired emails 
PLAT-2254
 2018-07-25 14:49:42 -04:00
David Ormsbee
698f2b17b9 Remove ENABLE_MANUAL_GIT_RELOAD, DEBUG_LEVEL, USE_YOUTUBE_OBJECT_API 
These are old feature flags that are no longer used:

ENABLE_MANUAL_GIT_RELOAD was to allow instructors to reload an XML
Modulestore course directly from a git checkout. That Modulestore
backend hasn't existed for a while.

DEBUG_LEVEL was an early flag for how debug log verbosity.

USE_YOUTUBE_OBJECT_API was created in reaction to YouTube breaking
their iframe API. They have long since addressed those issues.
 2018-07-25 14:40:34 -04:00
Feanil Patel
d29ffce4df Merge pull request #18639 from edx/private_to_public_02d5477 
Mergeback PR from private to public.
 2018-07-25 14:37:57 -04:00