Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

4136 Commits

Author SHA1 Message Date
Aarif
36066458a4 Merge pull request #21482 from edx/BOM-274 
BOM-274 Python 3 fixes
 2019-08-30 11:28:48 +05:00
Joseph Mulloy
f9e9b72d97 Add CSM primary key to bigint migration 2019-08-29 17:17:16 -04:00
Aarif
4b0f528ca4 Merge pull request #21467 from edx/BOM-191 
BOM-191 Python 3 fixes
 2019-08-29 17:06:39 +05:00
aarif
fb256b53b0 python 3 fixes 2019-08-28 15:38:10 +05:00
Ayub
fb2595e783 Merge pull request #21465 from edx/BOM-117 
BOM-117
 2019-08-28 14:43:33 +05:00
Cory Lee
8eddb822ab Refactor CSME id, CSMH_EXTENDED default true 2019-08-27 16:47:47 -04:00
aarif
a66cf74c5c fixed NoneType and integer comparison issue 2019-08-27 18:41:48 +05:00
Ayub khan
f1dee91f82 BOM-117 
py3 test fix
 2019-08-27 18:15:27 +05:00
Ayub
f0a033e69a Merge pull request #21420 from edx/BOM-297 
BOM-297
 2019-08-26 09:33:54 +05:00
Ayub khan
caa63452da py3 bytes Assertion Error 2019-08-23 14:18:56 +05:00
Ayub khan
2ca9a95c20 Py3 fixed Assertion Error 2019-08-23 14:15:13 +05:00
Ayub khan
67224f401a BOM-90 
Made all tests py3 compatible.
 2019-08-22 13:04:05 +05:00
Ayub
85be57b64a Merge pull request #21397 from edx/BOM-95 
BOM-95
 2019-08-22 12:41:08 +05:00
Ayub khan
8a95a8e520 BOM-95 
assertItemsEqual with six.assertCountEqual
 2019-08-21 17:01:40 +05: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
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
9d8db8e4ca Convert to utf-8 before JSON decoding 2019-08-19 15:10:56 -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
Nimisha Asthagiri
b7019bddff CourseInfoTestCase fixes for "a bytes-like object is required, not 'str'" 2019-08-19 10:54:12 -04: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
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
Feanil Patel
dc078bb5da Create a new SRT file for this test. 
Usingthe shared file with the other tests wolud sometimes cause this
test to fail.  Made this change to make it less flaky.
 2019-08-13 16:33:09 -04:00
Feanil Patel
9d7f0ca46e Get LMS test collection working in python 3. 
This should be all the changes needed to get test collection working in
python 3 for the `lms` folder.
 2019-08-13 16:32:40 -04:00
Dave St.Germain
05375b40fa Merge pull request #21318 from edx/dcs/missing-when 
Added edx-when's FieldData
 2019-08-12 12:41:51 -04:00
Dave St.Germain
267be29ab7 Added edx-when's FieldData 
EDUCATOR-4554
This fixes a bug where extended due dates were visible in the outline but not reflected on the courseware pages, resulting in problems not being submittable past the due date.
In order for edx-when to work on courseware pages, it has to be more careful about field inheritance, which version 0.2 achieves.
 2019-08-12 11:05:44 -04:00
arbisoft
9b87cb0172 BOM-85 
he builtin basestring abstract type was removed. Use str instead.
 2019-08-09 22:08:57 +05:00
Feanil Patel
b63d881462 Merge pull request #21303 from edx/BOM-80 
BOM-80
 2019-08-08 12:13:54 -04:00
Ayub
26a1445c93 Revert "BOM-70" 2019-08-08 17:39:45 +05:00
adeelehsan
3136b3ecd3 Removed google api key from github 
Prod-349
 2019-08-08 02:12:21 +05:00
aarif
61800c619f replaced StringIO imports with import from six 
replaced cStringIO and StringIO imports with import from six

fixed StringIO imports

fixed StringIO imports

fixed XSS python-wrap warning
 2019-08-08 00:09:16 +05:00
Ayub
3f2bd0a020 Merge pull request #21229 from edx/BOM-70 
BOM-70
 2019-08-06 18:48:42 +05:00
Ayub khan
c9080e257e -fixed tests 2019-08-06 15:31:41 +05:00
Calen Pennington
f319d20d6d Fix publishing for access control experiment 2019-08-05 14:53:56 -04:00
Ayub khan
9b3960ed90 -added zendesk api endpoints 2019-08-05 13:38:46 +05:00
Calen Pennington
7bbf4ad15c Switch courseware.masquerade_as_student over to using a StaffAccessRule with query checking 2019-08-02 15:06:35 -04:00
Christie Rice
bf414335cc REVMI-354 Add edit_bookmark permission (#21254) 2019-08-02 11:01:43 -04:00
Christie Rice
1c9904859b REVMI-354 Add view_xqa permission (#21255) 2019-08-02 11:01:21 -04:00
Christie Rice
c146f82e84 REVMI-354 REVMI-356 Revert more masquerade code (#21278) 
* REVMI-354 REVMI-356 Revert more masquerade code

* Fix quality
 2019-08-01 13:17:52 -04:00
Christie Rice
a9ebf91c4d REVMI-354 Revert masquerade changes (#21276) 2019-08-01 12:05:59 -04:00
David Ormsbee
b3614f3a00 Merge pull request #20954 from open-craft/symbolist/html-block 
HtmlModule to HtmlBlock [SE-1089]
 2019-08-01 11:36:23 -04:00
Christie Rice
0426446549 REVMI-354 Add view_courseware permission (#21237) 2019-08-01 09:12:48 -04:00
Christie Rice
3d062aab62 REVMI-354 Add enroll_in_course permission (#21243) 
* REVMI-354 Add enroll_in_course permission

* Fix test
 2019-08-01 08:37:41 -04:00
Calen Pennington
136f58cb2d Add a staff-access specific bridgekeeper rule with full query support 2019-07-31 13:07:52 -04:00
Ayub
69b647ae08 Merge pull request #21104 from edx/INCR-432 
INCR-432 python3 compatibility
 2019-07-31 12:29:26 +05:00
Calen Pennington
c00b60ffa5 Merge pull request #21244 from cpennington/check-permissions-view-course-home 
Check permissions view course home
 2019-07-30 13:06:13 -04:00
Calen Pennington
2d1eb9923f Convert a has_access check into a bridgekeeper rule 
This reverts commit 5e8f90caa1.
 2019-07-30 12:02:24 -04:00
Ayub khan
ffc9e14635 INCR-432 python3 compatibility 2019-07-30 15:12:56 +05:00
Ayub khan
7ca32f9197 INCR-433 python3 compatibility 2019-07-30 12:21:56 +05:00