Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
51,993 Commits 1 Branch 0 Tags
cd3bc236eb8d38c64acdedf74367dfa7cecefe59
Commit Graph

8774 Commits

Author SHA1 Message Date
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
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
Nimisha Asthagiri
8cfc33c0f1 Python 3: multi-line regex replacement of assertIn and assertNotIn 2019-09-30 08:51:02 -04:00
Nimisha Asthagiri
4914c42364 Python 3: resp.content regex searches 2019-09-30 08:51:02 -04:00
Nimisha Asthagiri
9bbc21ea8c Python 3: multi-lined assertIn, assertNotIn -> assertContains, assertNotContains 2019-09-30 08:51:02 -04:00
Nimisha Asthagiri
beb95eb69c Python 3: assertIn -> assertContains consistency 2019-09-30 08:51:01 -04:00
Nimisha Asthagiri
d4832a65aa Python 3: assertNotIn -> assertNotContains consistency 2019-09-30 08:50:38 -04:00
Nimisha Asthagiri
ccefde8d3c Python-3: assertNotIn(..response.content) -> assertNotContains 2019-09-30 08:50:38 -04:00
Nimisha Asthagiri
a6b219a9e9 Python-3: assertIn(..response.content) -> assertContains 2019-09-30 08:50:38 -04:00
aarif
ac38a76c48 python 3 fixes 2019-09-30 17:35:02 +05:00
Awais Qureshi
9b39f91599 BOM-529 
Python3 fix.
 2019-09-30 12:02:54 +05:00
Ned Batchelder
b3845b2b96 Merge pull request #21581 from edx/nedbat/fix-courseware-warning 
Finally import courseware properly everywhere to get rid of a warning
 2019-09-26 14:25:27 -04:00
Jeremy Bowman
4babc5ee1c Fix CorruptGridFile in Python 3 tests BOM-375 (#21794) 2019-09-26 13:43:26 -04:00
Uzair Rasheed
eb8bb72123 Merge pull request #21769 from edx/PROD-663/nulltranslations-attribute-error 
NullTranslations object doesn't have ugettext attribute
 2019-09-26 22:23:25 +05:00
David Ormsbee
21aca9ccb8 Merge pull request #21633 from open-craft/samuel/celery-fix 
SE-1463 add djangoapps.heartbeat to INSTALLED_APPS by default
 2019-09-26 13:19:44 -04:00
uzairr
a35b452877 NullTranslations object doesn't have ugettext attribute 
Some of the tests are failing because NullTranslations object is
behaving differently with py2 and py3.With py2, it has 'ugettext'
attribute but with py3 it doesn't have.To make it compliant with
both versions modifications in the tests have been added so that
build will not fail.

PROD-663
 2019-09-26 21:37:38 +05:00
Dave St.Germain
26026782b0 Merge pull request #21538 from edx/dcs/component-tweaks 
Studio Component Editor Tweaks
 2019-09-26 10:05:23 -04:00
Ned Batchelder
efba6e45e8 Finally import courseware properly everywhere to get rid of a warning 2019-09-26 09:40:15 -04:00
Dave St.Germain
ea3232feac TNL-6920 Component Editor Efficiency Improvements 
* Enlarges component modal for easier editing
* Allows display name to be edited in place
* Improves markdown button labeling
* Moves markdown cheatsheet to the edit modal, for quick reference
 2019-09-26 09:34:14 -04:00
Aarif
0125bd40c8 Merge pull request #21749 from edx/BOM-532 
BOM-532
 2019-09-26 18:03:43 +05:00