Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
50,957 Commits 1 Branch 0 Tags
58802c34a2eedc4eed240efe2ee467134c80c280
Commit Graph

19875 Commits

Author SHA1 Message Date
Ayub
81a99e4d32 Merge pull request #21371 from edx/BOM-90 
BOM-90
 2019-08-23 13:34:27 +05:00
Awais Qureshi
0c2f4b793d Merge pull request #21395 from edx/awais/BOM-97 
BOM-97
 2019-08-22 21:01:49 +05:00
Ayub khan
67224f401a BOM-90 
Made all tests py3 compatible.
 2019-08-22 13:04:05 +05:00
noraiz-anwar
1c4f9da92d improved quality of multiple files 2019-08-22 12:47:08 +05:00
Ayub
85be57b64a Merge pull request #21397 from edx/BOM-95 
BOM-95
 2019-08-22 12:41:08 +05:00
arbisoft
a680f01aa2 Fixing encode/decode issues for python3. 2019-08-22 11:11:36 +05:00
Uzair Rasheed
93a2259ec2 Merge pull request #21321 from edx/PROD-491/beta-tester-access-earn-cert 
Beta tester doesn't allow to earn cert
 2019-08-21 18:50:05 +05:00
Uzair Rasheed
4600051bf0 Merge pull request #21383 from edx/PROD-319/empty-cert-signatories 
Remove empty signatories from certificate.
 2019-08-21 18:49:43 +05:00
Feanil Patel
f332b81e4c Merge pull request #21384 from edx/bom/python-3-swarm 
Bom/python 3 swarm
 2019-08-21 09:27:59 -04:00
Ayub khan
8a95a8e520 BOM-95 
assertItemsEqual with six.assertCountEqual
 2019-08-21 17:01:40 +05:00
uzairr
38cd616f06 Beta tester doesn't allow to earn cert 
If beta tester wants to earn a cert then they must
create a separate user account by using email and
username different from the account with beta tester
role.

PROD-491
 2019-08-21 16:24:00 +05:00
uzairr
97a468fa86 Remove empty signatories from certificate. 
Empty signatories are shown as broken images on the certs which is
affecting user experience.To improve it, empty signatories are
filtered before rendering the cert.

PROD-319
 2019-08-21 15:45:51 +05:00
Aarif
acf3cb684d Merge pull request #21362 from edx/BOM-89 
BOM-89 Fixed tests for python 3
 2019-08-21 14:00:22 +05:00
aarif
3ff6d1b942 changes made to fix failing tests for python 3 
changes made to fix failing tests for python 3

minor changes

minor changes

changes made to fix failing tests for python 3

changes made to fix failing tests for python 3

minor changes

minor changes
 2019-08-21 12:14:53 +05:00
Bill DeRusha
aebdf77f8e Revert "PROD-145: Added validation to discussion topic input in studio, testing 2" 2019-08-20 20:31:15 -04:00
Feanil Patel
fde27196f9 Fix quality issues. 2019-08-20 18:02:30 -04:00
Matt Hughes
0ad8753cd6 Add waffle for hiding bulk management in masters courses 2019-08-20 16:32:13 -04:00
Feanil Patel
73a146fbbe Revert "assertItemsEqual() moved to assertCountEqual()" 
This reverts commit 3d2617983b.

The change was not quite right because the method six provides needs to
have `self` be passed in as well.  See the docs here:
https://six.readthedocs.io/#unittest-assertions

Reverting for now and we can fix it in smaller chunks later.
 2019-08-20 15:31:20 -04:00
Diana Huang
c94ffcdc72 Remove the microsites djangoapp. 2019-08-20 12:31:51 -04:00
Awais Qureshi
3f3caba0da Merge pull request #21360 from edx/awais786/BOM-88 
BOM-88
 2019-08-20 20:51:32 +05:00
Feanil Patel
6e6c489f1f Merge pull request #21372 from edx/feanil/fix_cmp_issues 
Fix a few issues we run into when running tests in python 3.
 2019-08-20 11:28:23 -04:00
Feanil Patel
74904339dd Go from a courselocator to a unicode string. 
We don't need the ignore since courselocators sholud be
managing unicode already.
 2019-08-20 10:59:42 -04:00
arbisoft
44c798feb2 Fixing encode/decode issues for python3. 2019-08-20 14:10:37 +05:00
Dave St.Germain
3d2617983b assertItemsEqual() moved to assertCountEqual() 2019-08-19 17:00:17 -04:00
Dave St.Germain
c51db6c92d Must compare with bytes 2019-08-19 16:35:41 -04:00
Dave St.Germain
8e725c9eee Prevent comparison to None 2019-08-19 16:21:28 -04:00
Dave St.Germain
521cdbe309 Response content is bytes 2019-08-19 16:16:31 -04:00
Feanil Patel
5ea74e0282 Ensure that the course_id is unicode. 2019-08-19 15:28:37 -04:00
Dave St.Germain
eccfeef94b Convert from utf8 2019-08-19 15:13:37 -04:00
Dave St.Germain
9d8db8e4ca Convert to utf-8 before JSON decoding 2019-08-19 15:10:56 -04:00
Dave St.Germain
e64c61160e Iterating dictionaries 2019-08-19 14:54:03 -04:00
Nimisha Asthagiri
d564af8301 Fix for decode errors in bulk_email.tests.test_course_optout.py 2019-08-19 14:26:48 -04:00
David Ormsbee
95a4e9ba3c Fix BlockTransformer Py3 issues (#21376) 
Django's reverse can handle Unicode for arguments.
 2019-08-19 12:16:39 -04:00
Feanil Patel
68933ec089 Fix quality issues. 2019-08-19 11:51:30 -04:00
Nimisha Asthagiri
1951d2eab8 Fix byte encoding of Grades hashes 2019-08-19 11:42:36 -04:00
Feanil Patel
7a3230a260 Fix another discussions test. 2019-08-19 11:16:26 -04:00
Nimisha Asthagiri
38333624ac Fixes for test_retire_order.py 2019-08-19 11:06:00 -04:00
David Ormsbee
9a1385585f Convert response bytes to str before JSON parsing. (#21375) 
Convert response bytes to str before JSON parsing.
 2019-08-19 11:01:55 -04:00
Feanil Patel
65eebe63e7 Hash byte strings. 2019-08-19 11:00:22 -04:00
Dave St.Germain
3275388276 Merge branch 'feanil/fix_cmp_issues' of github.com:edx/edx-platform into feanil/fix_cmp_issues 2019-08-19 10:54:46 -04:00
Dave St.Germain
0267b5c85f Fix issue of out of order calls 2019-08-19 10:54:39 -04:00
Nimisha Asthagiri
b7019bddff CourseInfoTestCase fixes for "a bytes-like object is required, not 'str'" 2019-08-19 10:54:12 -04:00
Feanil Patel
1bfa575ada Update discussion api tests. 
json doesn't do any magic with byte strings in python 3.  In python 2 it
used to convert str objects to unicode automatically.
 2019-08-19 10:48:30 -04:00
Dave St.Germain
5febcce20c Fix python3 compatibility in SafeCookieData and elsewhere 2019-08-19 10:24:15 -04:00
Feanil Patel
269a57445d Fix a few issues we run into when running the discussion tests. 2019-08-19 10:14:29 -04:00
Ayub khan
ea0c6922fe BOM-87 
Fixed the test for py3.
 2019-08-19 18:52:19 +05:00
adeelehsan
1eda18a317 Merge pull request #21367 from edx/private_to_public_76a13fa 
Mergeback PR from private to public.
 2019-08-19 15:06:30 +05:00
adeelehsan
76a13fae73 Merge pull request #156 from edx/aehsan/prod-349/remove_google_api_key_from_github 
Removed google api key from github
 2019-08-19 14:32:26 +05:00
Feanil Patel
9925aaadb9 Be able to override this setting from yaml. 2019-08-16 15:09:13 -04:00
Ayub
658cd5c62e BOM-70 (#21327) 
* Update Financial Assistance logic

Use the zendesk proxy app instead of the unsupported zendesk library.

* Move to pre-fetching the group IDs.

Rather than making extra requests to zendesk to list all groups and find
a specific group ID. Just make a pre-filled list of group IDs for the
groups we care about.  When a group name is passed in, it is checked
against this list and the ticket is created in the correct group so the
right people can respond to it.
 2019-08-16 13:05:35 -04:00