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

51046 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brandon Baker
5012ed6ea4 Fix padding on discount banner for small screens (#21509) 
REV-918
 2019-08-29 16:00:26 -04: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
4b0f528ca4 Merge pull request #21467 from edx/BOM-191 
BOM-191 Python 3 fixes
 2019-08-29 17:06:39 +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
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
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
arbisoft
51d6059ecb BOM-177 
Fixing python querystring comparision in tests.
 2019-08-27 17:27:58 +05:00
Awais Jibran
69ca1ac448 Merge pull request #21284 from edx/aj/fix-japanees-chars-in-csv 
Fix Japaness Characters not visible on Data Download Report
 2019-08-27 15:44:16 +05:00
noraiz-anwar
ffeff8db3d check for too long data in task_input field 2019-08-27 15:39:30 +05:00
Awais Qureshi
544c68b1ff Merge pull request #21444 from edx/awais786/BOM-365 
BOM-365
 2019-08-27 14:47:49 +05:00
Ayub
81fa9272b5 Merge pull request #21422 from edx/BOM-279 
BOM-279
 2019-08-27 14:38:15 +05:00
Ayub
be0015276c Merge pull request #21449 from edx/BOM-397 
BOM-397
 2019-08-27 14:31:19 +05:00
Ayub
733d7cdc33 Merge pull request #21410 from edx/py3-fix-too-few-arguments-bug 
BOM-400, BOM-395, BOM-394, BOM-390, BOM-381, BOM-369, BOM-306, BOM-303
 2019-08-27 14:22:27 +05:00
Awais Qureshi
eddcf50260 Merge pull request #21432 from edx/awais786/BOM-356 
BOM-356
 2019-08-27 14:08:00 +05:00
Awais Qureshi
18a54087b0 Merge pull request #21418 from edx/awais786/BOM-105 
BOM-105
 2019-08-27 14:04:34 +05:00
arbisoft
e1aca5b659 BOM-365 
fixing python3 test.
 2019-08-27 13:52:56 +05:00
Michael Roytman
d53e0d7df8 Merge pull request #21456 from edx/mroytman/EDUCATOR-4568-gradebook-override-logging 
add log statements to aid debugging grading issue
 2019-08-26 17:26:36 -04:00
Michael Roytman
1b296c444d add log statements to aid debugging grading issue 2019-08-26 16:49:11 -04:00
edX Transifex Bot
d5c5912ed6 fix(i18n): update translations 2019-08-26 15:06:59 -04:00
Jansen Kantor
0ee01a3cac filter out disabled saml provider configs (#21454) 
* filter for enabled saml provider configs
 2019-08-26 12:29:38 -04:00
Christie Rice
a513d477ac ENT-2252 Remove journals urls (#21451) 2019-08-26 12:13:51 -04:00
edX Transifex Bot
233bf245ec fix(i18n): update translations 2019-08-26 08:33:10 -04:00
Ayub khan
8c4848ae35 BOM-397 
py3 compatibility and test fix
 2019-08-26 16:53:27 +05:00
edX Transifex Bot
51ea3edb4f fix(i18n): update translations 2019-08-26 06:04:30 -04:00
arbisoft
bf59475648 BOM-291 
fixing python3 test.
 2019-08-26 14:51:26 +05:00
Ayub khan
f5d97260a5 Fixed all py3 tests with AssertionError: "Error: too few arguments" 2019-08-26 14:19:57 +05:00
Awais Qureshi
5dc63a9aab Merge pull request #21405 from edx/awais786/BOM-399 
BOM-399
 2019-08-26 11:03:07 +05:00