Commit Graph

20747 Commits

Author SHA1 Message Date
Joseph Mulloy
f9e9b72d97 Add CSM primary key to bigint migration 2019-08-29 17:17:16 -04: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
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
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
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
Zachary Hancock
b9a2646e4d log all social auth creation failures (#21470)
logging on social auth creation failures
2019-08-28 11:39:24 -04:00
Awais Jibran
1a4eb7d2e8 Pervent reverse tabnabbing in edx platform 2019-08-28 16:08:34 +05:00
Ayub khan
eef343d212 BOM-264
py3 unit test fix
2019-08-28 15:49:58 +05: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 khan
f7d528eee4 BOM-289
py3 unittest fix
2019-08-28 15:09:48 +05:00
Ayub khan
70b4004be8 BOM-335
py3 unittest fix
2019-08-28 15:07:29 +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
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
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
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
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
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
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
1b296c444d add log statements to aid debugging grading issue 2019-08-26 16:49:11 -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
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
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