Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
53,340 Commits 1 Branch 0 Tags
667df875bdb2bb66546b395d3aba2c9e3f40b0f7
Commit Graph

53340 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
arbisoft
51d6059ecb BOM-177 
Fixing python querystring comparision in tests.
 2019-08-27 17:27:58 +05:00
Ayub khan
f80cbf3ed4 BOM-294 
fixed failing test;
 2019-08-27 16:45:46 +05:00
Ayub khan
136bdf8c0f BOM-357 
Fix failing test
 2019-08-27 15:50:05 +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
Awais Qureshi
a24d70c3b3 Merge pull request #21415 from edx/awais786/BOM-352 
BOM-352
 2019-08-26 11:02:38 +05:00
Awais Qureshi
b01da17949 Merge pull request #21416 from edx/awais786/BOM-354 
BOM-354
 2019-08-26 10:57:58 +05:00
Ayub
ec325d8654 Merge pull request #21419 from edx/bytes-assertion-errors 
BOM-326
 2019-08-26 09:34:57 +05:00
Ayub
f0a033e69a Merge pull request #21420 from edx/BOM-297 
BOM-297
 2019-08-26 09:33:54 +05:00
Ayub
a4195fe83a Merge pull request #21421 from edx/BOM-281 
BOM-281
 2019-08-26 09:32:37 +05:00
Ayub
579e2af00f Merge pull request #21423 from edx/BOM-241 
BOM-241
 2019-08-26 09:31:25 +05:00
Ayub
f51306b2be Merge pull request #21424 from edx/BOM-221 
BOM-221
 2019-08-26 09:28:34 +05:00
Ayub
1a53fb6dc6 Merge pull request #21425 from edx/BOM-202 
BOM-202
 2019-08-26 09:25:29 +05:00
Ayub
356f92add7 Merge pull request #21426 from edx/BOM-190 
BOM-190
 2019-08-26 09:23:40 +05:00