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

51067 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
aarif
e60f767fc4 python 3 fixes 
minor fix
 2019-08-30 18:01:16 +05:00
Awais Qureshi
7676858282 Merge pull request #21462 from edx/awais786/BOM-114 
Bom-114
 2019-08-30 17:50:22 +05:00
Albert (AJ) St. Aubin
e0e77d02d4 Merge pull request #21495 from edx/aj/ENT-2191 
Aj/ent 2191
 2019-08-30 08:32:07 -04:00
Uzair Rasheed
61ebdaf2cd Merge pull request #21478 from edx/PROD-611/edx-logo-not-loading-on-cert 
edX logo is not loading on invalid cert view
 2019-08-30 16:49:19 +05:00
Awais Qureshi
f1f6d2b257 Merge pull request #21506 from edx/awais786/BOM-349 
BOM-349
 2019-08-30 14:38:45 +05:00
arbisoft
5a2114ac6c BOM-114 
python2 tests failures.
 2019-08-30 14:02:24 +05:00
Aarif
36066458a4 Merge pull request #21482 from edx/BOM-274 
BOM-274 Python 3 fixes
 2019-08-30 11:28:48 +05:00
Aarif
924a1d2171 Merge pull request #21499 from edx/BOM-379 
BOM-379 Python 3 fixes
 2019-08-30 11:18:27 +05:00
Aarif
efb5d1ad7f Merge pull request #21483 from edx/BOM-278 
BOM-278 Python 3 fixes
 2019-08-30 11:16:12 +05:00
Aarif
4cb616037e Merge pull request #21464 from edx/BOM-158 
BOM-158 Python 3 fixes
 2019-08-30 11:05:00 +05:00
Aarif
b4025d84a3 Merge pull request #21447 from edx/BOM-307 
BOM-307 - Python 3 fixes
 2019-08-30 11:03:51 +05:00
Awais Qureshi
50dde225d1 Merge pull request #21498 from edx/awais786/BOM-175 
BOM-175
 2019-08-30 09:25:54 +05:00
Brandon Baker
5012ed6ea4 Fix padding on discount banner for small screens (#21509) 
REV-918
 2019-08-29 16:00:26 -04:00
Albert (AJ) St. Aubin
920f0dcf45 Upgrading the edx-enterprise version in support of new 
feature roles and permissions
 2019-08-29 14:50:17 -04:00
arbisoft
bcf1e781e2 BOM-349 
Fixing python3
 2019-08-29 23:26:41 +05:00
Michael Roytman
d71fd1181f Merge pull request #21502 from edx/mroytman/bump-edx-bulk-grades-0.5.9 
bump version of edx-bulk-grades to 0.5.9
 2019-08-29 12:31:29 -04:00
Michael Roytman
6ff132e7d8 bump version of edx-bulk-grades to 0.5.9 2019-08-29 10:53:26 -04:00
Aarif
f365bd888d Merge pull request #21481 from edx/BOM-259 
BOM-259 Python 3 fixes
 2019-08-29 17:42:52 +05:00
aarif
d4924d661e python 3 fixes 2019-08-29 17:32:49 +05:00
Aarif
4b0f528ca4 Merge pull request #21467 from edx/BOM-191 
BOM-191 Python 3 fixes
 2019-08-29 17:06:39 +05:00
arbisoft
641ba0215a BOM-296 
Fixing python3
 2019-08-29 16:58:25 +05:00
aarif
30c61ba907 fixed range function float input failure 
changes made as suggested
 2019-08-29 14:45:45 +05:00
edX Transifex Bot
2e92668e9e geoip2: update maxmind geolite country database 2019-08-28 16:58:30 -04:00
Michael Roytman
2243c02410 Merge pull request #21492 from edx/mroytman/bump-edx-proctoring-2.0.7 
bump edx-proctoring version to 2.0.7
 2019-08-28 13:23:33 -04:00
Jansen Kantor
9e97e5107e Jkantor/overview active (#21494) 
* filter for active course enrollments
 2019-08-28 13:16:09 -04:00
Kyle McCormick
a8e4461ef7 Return absolute URIs from program_enrollments API responses (#21474) 
Issues were caused in Learner Portal from inconsistency
in whether URLs returned by API calls were absolute
or relative. This commit standardizes them to all be
absolute.
 2019-08-28 12:57:46 -04:00
Michael Roytman
021b48b063 bump edx-proctoring version to 2.0.7 2019-08-28 11:44:28 -04:00
Zachary Hancock
b9a2646e4d log all social auth creation failures (#21470) 
logging on social auth creation failures
 2019-08-28 11:39:24 -04:00
aarif
ee264b38e9 python 3 fixes 2019-08-28 15:44:35 +05:00
aarif
fb256b53b0 python 3 fixes 2019-08-28 15:38:10 +05:00
aarif
b4f1da25ee python 3 fixes 2019-08-28 15:29:12 +05:00
Ayub
fb2595e783 Merge pull request #21465 from edx/BOM-117 
BOM-117
 2019-08-28 14:43:33 +05:00
uzairr
1f531571ff edX logo is not loading on invalid cert view 
edX logo image is not loading on invalid certificate view because
context is not been updated with the logo image for invalid cert view.
To overcome it, context is updated before rendering invalid cert.

PROD-611
 2019-08-28 14:37:36 +05:00
aarif
4584f4becb fixed tests for python 3 
quality fixes

changes made as suggested
 2019-08-28 13:17:04 +05:00
Awais Qureshi
33e5d01c54 Merge pull request #21466 from edx/awais786/BOM-172 
BOM-172
 2019-08-28 11:06:30 +05:00
Awais Qureshi
a2acc97b96 Merge pull request #21446 from edx/awais786/BOM-291 
BOM-291
 2019-08-28 09:37:22 +05:00
Joseph Mulloy
0c3d0544b5 Merge pull request #21473 from edx/jdmulloy/refactor_csmh_bigint 
Refactor CSME id, CSMH_EXTENDED default true
 2019-08-27 15:15:13 -06:00
Cory Lee
8eddb822ab Refactor CSME id, CSMH_EXTENDED default true 2019-08-27 16:47:47 -04:00
Jansen Kantor
1febfa047c make link_program_enrollments atomic per user (#21439) 
* make link_program_enrollments atomic per user
 2019-08-27 16:26:26 -04:00
Kyle McCormick
708e08930f Fix program course enrollment overview docstring (#21472) 
The program course enrollment overview endpoint says
it has a field 'course_status' with a possible value 'in-progress'.
Update it to say it has a field 'course_run_status with a
possible value 'in_progress'.
 2019-08-27 16:23:06 -04:00
edX cache uploader bot
aa33743006 Updating Bokchoy testing database cache (#21471) 2019-08-27 15:42:12 -04:00
Kyle McCormick
2c572e1b59 Add new ProgramCourseEnrollment uniqueness constriant (#21463) 
ProgramCourseEnrollments were already unique on
(program_enrollment, course_enrollment) by nature of the
OneToOneField on course_enrollment. However, this only
affects realized enrollments. For waiting enrollments, we
need to add a uniqueness constraint on
(program_enrollment, course_key).
 2019-08-27 15:05:30 -04:00
edX cache uploader bot
ac989e8211 Updating Bokchoy testing database cache (#21468) 2019-08-27 12:04:34 -04:00
Andytr1
74757a021c Merge pull request #21458 from edx/andytr1/bulk-grades-2019-8-26 
bulk grades version increment
 2019-08-27 11:15:55 -04:00
atesker
53524ba9f8 bulk grades version increment 
reverting django-user-tasks to 0.1.7 to fix build
 2019-08-27 10:54:24 -04:00
Farhanah Sheets
5fa3024a54 Merge pull request #21441 from edx/azarembok/youtube-disable-flag 
PROD-202: Add per-course flag to block access to youtube videos.
 2019-08-27 10:16:29 -04:00
aarif
a66cf74c5c fixed NoneType and integer comparison issue 2019-08-27 18:41:48 +05:00
arbisoft
f3d351d04a BOM-172 
Fixing python3 unicode not found issue.
 2019-08-27 18:32:02 +05:00
Ayub khan
f1dee91f82 BOM-117 
py3 test fix
 2019-08-27 18:15:27 +05:00
Awais Qureshi
4a248aef7d Merge pull request #21460 from edx/awais786/BOM-177 
BOM-177
 2019-08-27 18:11:08 +05:00