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

8630 Commits

Author SHA1 Message Date
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
3bb7d0f61a unicode -> text_type 2019-08-19 16:42:20 -04:00
Dave St.Germain
7a28bc8759 Response content is bytes 2019-08-19 16:39:09 -04:00
Dave St.Germain
9d8db8e4ca Convert to utf-8 before JSON decoding 2019-08-19 15:10:56 -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
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
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
Diana Huang
5d7d3f7770 Merge pull request #21336 from edx/diana/remove-microsites 
Remove microsite djangoapp and configuration.
 2019-08-16 10:55:56 -04:00
Diana Huang
bf7dad15e4 Remove microsite djangoapp except migrations and configuration. 2019-08-16 09:42:57 -04:00
Feanil Patel
602970ed90 Fix test collection for CMS in python 3. (#21338) 2019-08-13 13:54:49 -04:00
Feanil Patel
083d1b4ce7 Merge pull request #21313 from edx/BOM-85 
BOM-85
 2019-08-12 10:01:07 -04:00
arbisoft
9b87cb0172 BOM-85 
he builtin basestring abstract type was removed. Use str instead.
 2019-08-09 22:08:57 +05:00
Ayub
45ab1fec53 Merge pull request #21316 from edx/BOM-70-1 
BOM-70
 2019-08-09 20:19:18 +05:00
Cory Lee
a8fd936d27 Delete enterprise reporting secret because I believe it is not used anywhere (#21309) 2019-08-08 13:00:57 -04:00
Ayub khan
3b074323b8 BOM-70 
-Remove Depricated View and tests
 2019-08-08 21:32:42 +05:00
Feanil Patel
b63d881462 Merge pull request #21303 from edx/BOM-80 
BOM-80
 2019-08-08 12:13:54 -04:00
Zainab Amir
6b78107081 Fix unregistered celery task (#21305) 
openedx.core.djangoapps.ccxcon.tasks.update_ccxcon is not get auto
discovered by celery. Adding it to CELERY_IMPORTS to be explicitly
added.

PROD-283
 2019-08-08 11:32:17 +05:00
Zainab Amir
adb2c672e4 Fix Unregistered Task (#21297) 
Fix Unregistered Task

openedx.core.djangoapps.bookmarks.tasks.update_xblock_cache task is not
getting autodiscovered by celery and needs to be imported explicitly

PROD-284
 2019-08-08 10:50:40 +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
Feanil Patel
2c3e97dfbb Merge pull request #21301 from edx/feanil/fix_test_collection 
Fix some test collection in python 3.
 2019-08-07 10:12:10 -04:00
Feanil Patel
18e988b747 Fix some minor issues that prevent some tests from being collected. 2019-08-06 15:19:55 -04:00
Feanil Patel
21fd145ab9 Use relative import for content store reference. 
The full import path was having issues in python 3 complaining that it
couldn't find the module.
 2019-08-06 14:56:57 -04:00
Nimisha Asthagiri
4c7d437bdd DEPR-20 Remove django-openid-auth 2019-08-06 14:02:48 -04:00
Waheed Ahmed
23bc5af0fc Fix course:org link creation upon rerun. 
Upon rerun creation from publisher course:organization link
was not creating, due to which org logo was not appearing on
course certificates.

Fixed by creating course:org link upon rerun.

PROD-125
 2019-08-05 13:48:50 +05:00
uzairr
80316c632d Update Help msgs of management commands 
PROD-399
 2019-08-02 15:20:26 +05:00
Dillon-Dumesnil
d5cfe35ece Merge pull request #21252 from edx/ddumesnil/disco-1222 
DISCO-1222: Allow switching course numbers for reruns
 2019-08-01 15:22:46 -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
Dillon Dumesnil
e5fbfb02c6 DISCO-1222: Allow switching course numbers for reruns 
Adds in tests for the new functionality while maintaining the old Validation Error message
 2019-07-31 10:42:09 -04:00
Awais Jibran
6a7ddbb271 Merge pull request #21182 from edx/aj/fix-ltr-numaric-inputs 
Fix Numeric input problems are backwards for right-to-left languages
 2019-07-31 16:01:25 +05: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
Calen Pennington
5e8f90caa1 Revert "Convert a has_access check into a bridgekeeper rule" 2019-07-29 11:38:26 -04:00
Awais Jibran
1dcfaef703 Fix Numeric input problems are backwards for right-to-left languages 2019-07-29 15:19:48 +05:00
Feanil Patel
63f8167dfc Remove the task that is no longer being referenced. 
Second phase for removing the task. The references to it were removed
earlier as a part of DEPR-41
 2019-07-26 16:24:05 -04:00
Feanil Patel
f21017d5d6 Remove the configmodel for push notifications. 
This feature was used to enable/disable push notifications using
Parse.com.  That service died a few years ago but this was never cleaned
up.  Cleaning it up as a part of DEPR-41 now that we've removed the code
that references this model.
 2019-07-26 16:19:55 -04:00
Calen Pennington
7fba761050 Convert a has_access check into a bridgekeeper rule 2019-07-26 11:41:30 -04:00
Usama Sadiq
af7ee42bde Merge pull request #21228 from edx/usama/prod-493-contact-us-form-spanish-translation 
Contact Us Form Spanish Translations
 2019-07-26 17:42:47 +05:00
usama sadiq
c131418f9d Contact Us Form Spanish Translations 
Additional PR to enable the js and jsx translations.
 2019-07-26 15:18:08 +05:00
Muhammad Zaid Bamber
b7d4f30769 Revert "Fixed CDN urls to Static urls on edit." 2019-07-26 11:42:15 +05:00
Feanil Patel
e1b9869b26 Merge pull request #21194 from edx/feanil/remove_parsepy 
DEPR-41 Remove parsepy
 2019-07-25 10:25:08 -04:00
Aarif
60c6f4ff2d Merge pull request #20987 from edx/INCR-332 
INCR-332 Python 3 compatibility
 2019-07-25 12:40:50 +05:00
David Ormsbee
670540225a Merge pull request #20944 from open-craft/fix-capa-editor-html 
Fix: Malformed HTML in capa problem studio_view
 2019-07-24 16:02:11 -04:00
Feanil Patel
1f7b12a38d Remove references to push notifications. 
Push notifications was only ever setup to connect to Parse.com a service
that has been discontinued.  Since we haven't replaced the functionality
for a few years now, remove this dead code.

In cms/templates/js/course_info_update.underscore we're allowing content
to not be escaped because this is by design according to the tests.
Long term there should be a better fix for this but for now this is
intended behavior.
 2019-07-24 11:45:46 -04:00
Usman Khalid
8dfc8e5fda Convert AboutModule, CourseInfoModule, HtmlModule and StaticTabModule to XBlocks. 2019-07-24 20:19:44 +05:00
Calen Pennington
1823d9f098 Add django app for running Coverage who-tests-what in bokchoy 2019-07-24 10:13:46 -04:00
hasnain-naveed
c42d7de780 WL-1948 | Added cornerstone in CMS. 2019-07-23 17:39:16 +05:00
Ayub
e8fa5a4fc9 Merge pull request #21164 from edx/INCR-347-2 
INCR-347 python3 compatibility
 2019-07-23 13:00:08 +05:00
Aarif
89f5282089 Merge pull request #21137 from edx/INCR-343 
INCR-343 Python 3 compatibility
 2019-07-23 12:25:59 +05:00
aarif
b20eb309ff ran python-modernize and isort on files mentioned in INCR-332 
changes made to comply with pylint

refactored the code to comply with PEP8

further changes made to comply with quality

changes made as suggested
 2019-07-22 10:02:59 +00:00