Commit Graph

8792 Commits

Author SHA1 Message Date
DawoudSheraz
e306bc74c0 avoid pretty printing of pre tags in course import 2019-11-12 13:57:25 +05:00
Dave St.Germain
0e4c04ed2e Merge pull request #21961 from edx/dcs/jumpnav
Improve navigation on Studio unit page
2019-11-08 10:32:43 -05:00
Dave St.Germain
3e73ba3879 TNL-6929:
Improves navigation within Studio for Learning Sequences, speeding up authors who want to see how a learner progresses through content without needing to jump over to the LMS.

This adds a dropdown section navigator to the breadcrumbs on the unit page and copies the sequence navigator from LMS to the studio unit page.
2019-11-07 09:13:00 -05:00
Dave St.Germain
37aafb3fe6 Add in-context display name editor for units on the course outline.
For TNL-6938
2019-11-06 11:08:42 -05:00
Awais Qureshi
076a2b5a7e BOM-998
Fixing decoding issue.
Fixing flaky unit test.
2019-11-01 15:54:23 +05:00
Braden MacDonald
05d7592eda Read CMS_BASE from the environment, define it explicitly as public host 2019-10-31 16:17:08 -07:00
Dave St.Germain
729e03b951 Merge pull request #22159 from edx/dcs/title-edit
TNL-6968 Access settings modal should not have an editable title
2019-10-31 11:09:39 -04:00
Dillon Dumesnil
87c9563da5 Encoding course key for url
DISCO-1422
2019-10-30 14:27:20 -04:00
Nimisha Asthagiri
f533134db1 Merge pull request #22086 from edx/arch/user-authn-delete-deprecated
User Authn: Remove deprecated, ENABLE_COMBINED_LOGIN_REGISTRATION
2019-10-29 09:37:53 -04:00
Nimisha Asthagiri
db42c7e1e2 User Authn: Remove deprecated, ENABLE_COMBINED_LOGIN_REGISTRATION 2019-10-29 08:57:58 -04:00
Dave St.Germain
05e0de2956 TNL-6968
The access settings modal should not have an editable title. Also, the title of the modal was not being interpolated correctly.
2019-10-28 10:21:34 -04:00
Manjinder Singh
80c7f5af01 BOM-933: Fix type mismatches in various migrations 5 (#22147)
* fix type mismatch in third_party_auth migrations

* fix type mismatch in verify_student  migrations

* fix type mismatch in video_config  migrations

* fix type mismatch in verified_track_content  migrations

* fix type mismatch in commercemigrations

* fix type mismatch in xblock_config migrations

* fix type mismatch in course_creators migrations

* fix type mismatch in contentstore migrations
2019-10-24 16:08:04 -04:00
Ayub khan
b3c062be1b BOM-848 Different Hash Values
hashlib produces different md5 hash in python3 against same values as
compared to python2.
2019-10-21 14:02:49 +05:00
syedimranhassan
814d1bf52d Move lms/cms defaults from configration repo 2019-10-21 11:53:31 +05:00
Ned Batchelder
ea30aba6fc Revert pull request #22042
Revert "Fix code quality test failures"

This reverts commit 8c55e11d1f.

Revert "Fix celery send_activation_email task failure"

This reverts commit 810eea0e51.

Revert "Convert Account Activation Emails to edx-ACE"

This reverts commit 7984c37a4f.
2019-10-18 15:31:09 -04:00
Feanil Patel
05ab349c88 Merge pull request #22068 from edx/feanil/get_out_of_a_pickle
Create a custom Pickle Serializer
2019-10-18 14:48:24 -04:00
Feanil Patel
bfc02dc3ab Create custom pickle serializer.
We need to do this because when I tride to go to the JSON serializer a
bunch of tests started failing because various parts of our code are
putting things into the session that are not JSON serializable.

We can't keep using the default pickle serializer because it defaluts to
using the highest available protocol and that will cause issues with the
python 2 to 3 upgrade since both will be running in production at the
same time.  We need to use a version of the pickle protocol that both
can use interchangably.

We also need to make sure we read with latin1 encoding to make datetimes
work correctly between the two versions of python.
2019-10-18 13:46:47 -04:00
Ned Batchelder
855346e9e1 Merge pull request #22042 from mahyard/activation-email-to-ace
Activation email to ace
2019-10-18 12:10:20 -04:00
Feanil Patel
1e97de9105 Use the default json session serializer.
This will force a logout as sessions fail to load but this should be a
more performant and secure serializer moving forward.  The reason we
overwrote it in our config is that it previously used to be the default
and we didn't want things to breake and force logouts when we changed
it.  We're no more okay with people getting logged out.
2019-10-18 10:29:16 -04:00
syedimranhassan
99bda3cfd3 Revert "Added new variables from configuration repo" 2019-10-18 17:44:58 +05:00
syedimranhassan
6ad9458ffb Added new variables from configuration repo 2019-10-18 15:55:28 +05:00
Awais Qureshi
744e40f62a Merge pull request #22061 from edx/awais786/transcript_issues
BOM-932
2019-10-17 17:41:16 +05:00
Awais Qureshi
3d58a0ded8 BOM-932
Fixing byte issues.
2019-10-17 17:05:13 +05:00
syedimranhassan
559e280bee Move cms defaults from configration repo 2019-10-17 12:28:35 +05:00
syedimranhassan
480d7875c7 Move cms defaults from configration repo 2019-10-17 12:26:50 +05:00
Shadi Naif
7984c37a4f Convert Account Activation Emails to edx-ACE 2019-10-14 17:22:03 +03:30
Régis Behmo
ae216c8584 Rename API decorators to "apidocs" to be provider-agnostic
The API documentation decorators do not have to leak which solution we
use to generate the docs. Here, and as discussed in PR #21820, we rename
the `openapi` module to `apidocs`, and we make sure that this module
includes all the right functions to document API Views without referring
to Open API.
2019-10-14 08:14:18 +02:00
Jeremy Bowman
3db3403fc4 Fix mock transcript responses BOM-918 (#22020) 2019-10-11 16:22:52 -04:00
Nick
d1ebd1294b Remove backtick typo in advanced_entry.underscore 2019-10-11 15:25:33 -04:00
Nicholas D'Alfonso
545d5eddc8 DISCO-188 publisher link
Add publisher link to settings dropdown if the features setting
is set.
2019-10-11 09:29:24 -04:00
Feanil Patel
067d95f797 Fix transcript tests to be consistent. 2019-10-08 15:26:52 -04:00
Feanil Patel
92e06d52a6 Delete items by their asset_key instead of _id.
The _id comes back as a dict and it's in the wrong order compared to the
dict stored in mongo.  This results in lookups for deletion failing when
we use the '_id' as the lookup key.

Luckily the delete function also takes the asset_key as a valid key to
delete by so we just use that instead.
2019-10-08 15:26:52 -04:00
Feanil Patel
9610aab0f8 Fix more cms contentstore tests. 2019-10-08 15:26:52 -04:00
Feanil Patel
2d766e7b5d Skip tests that can't succeed in Python3 + Django 1.11
There is a bug in the underlying management/base code that tries to make
all manageent command output be unicode.  This management command
outputs the binary tar file data and so breaks in python3.  In python2
the code is happy to pass bytes back and forth and in later versions of
django this is fixed.  Howevere it's not possible to get this test to
pass in Python3 and django 1.11
2019-10-08 15:26:52 -04:00
Aarif
4db48ae9b0 Merge pull request #21862 from edx/BOM-762
BOM-762
2019-10-08 13:40:12 +05:00
Feanil Patel
ca705a2757 Encoding that was breaking import. 2019-10-07 13:49:25 -04:00
Feanil Patel
c9895477fd Import binary files an byte arrays. 2019-10-07 13:49:25 -04:00
Feanil Patel
ef27928e67 Decode content from django test client. 2019-10-07 13:49:25 -04:00
Feanil Patel
66382961a7 Fix all transcript related tests.
Treat transcript content as unicode strings and convert them at any edge
where we encounter them.  One decision made here was to not update
edx-val it treats transcripts as byte but is much closer to the actual
files so it makes more sense over there. But within the platform they
are generally passed around as serialized json and so it's much better
for them to be unicode.
2019-10-07 13:49:25 -04:00
Diana Huang
df32ffd37b Remove notes app and remaining js. 2019-10-02 15:00:37 -04:00
Manjinder Singh
84ccc9b41c Merge pull request #21829 from edx/msingh/type_error
BOM-749: Fixing: a bytes-like object is required, not 'str'
2019-10-02 12:45:36 -04:00
Manjinder Singh
341360ada1 Merge pull request #21868 from edx/msingh/python3_test_course_index_py
BOM-749: Fixing error in test_course_Index
2019-09-30 15:04:10 -04:00
Michael Terry
e4617f0dde Show expired VUD in Studio
If the verified mode has expired, we still want to show its
upgrade deadline in Studio settings.
2019-09-30 11:49:06 -04:00
Manjinder Singh
6e2c5f0044 Merge pull request #21867 from edx/msingh/python3_certificates
BOM-749: Fixing error in test_certificates.py
2019-09-30 11:44:44 -04:00
Manjinder Singh
139d1330da Merge pull request #21864 from edx/msingh/type_error2
BOM-749: Fixing error in test_assets.py
2019-09-30 11:44:21 -04:00
jinder1s
9ac5a0b76a explicitly set value byte 2019-09-30 11:25:53 -04:00
jinder1s
c05d469a62 Fixing conditional 2019-09-30 11:12:36 -04:00
jinder1s
61f6dabdcf correctly decoding bytes to utf-8 2019-09-30 11:01:31 -04:00
jinder1s
e727ded167 Explicitly setting string to byte 2019-09-30 09:37:06 -04:00
jinder1s
067ae46483 explicitly declaring value a byte 2019-09-30 09:31:50 -04:00