Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
52,068 Commits 1 Branch 0 Tags
86bb0cfa2c8fd162e288dda0c2139ae5ae08d29b
Commit Graph

17508 Commits

Author SHA1 Message Date
Matthew Piatetsky
86bb0cfa2c add discount percentage configuration 2019-10-23 12:00:34 -04:00
julianajlk
6e0914ad5d add FPD banner to courseware (#22113) 
REV-980
 2019-10-23 09:33:11 -04:00
Aarif
9ac9a50650 Merge pull request #22094 from edx/BOM-960 
Updated the assertion make comparison consistent - BOM-960
 2019-10-23 14:12:32 +05:00
aarif
d74324a2d8 updated the comparison operation to make comparison consistent (irrespective of the order of items) 
changes made to allow non field dictionary comparisons as intended

changes made to fix failure on reading values for dictionaries

updated the comparison operation to make comparison consistent (irrespective of the order of items)

changes made to allow non field dictionary comparisons as intended

changes made to fix failure on reading values for dictionaries
 2019-10-23 12:51:54 +05:00
Zia Fazal
7ccd2a6901 Refactored enterprise unlink code to fix ENT-1890 
Refactored enterprise unlink code to fix ENT-1890

Fixed quality violations and brokent test

Fixed pylint quality violations

Fixed failing unit test

Fixed broken test after rebasing with master
 2019-10-23 11:35:58 +05:00
Jeremy Bowman
d4b0968e3a Fix JSON parsing in edxnotes.helpers BOM-990 (#22122) 2019-10-22 17:57:01 -04:00
edX cache uploader bot
cf53a3f4bb Updating Bokchoy testing database cache (#22119) 2019-10-22 17:49:09 -04:00
Braden MacDonald
5fc73468b3 Change completion API to work with any learning context 2019-10-22 14:04:31 -04:00
Feanil Patel
9946fd3918 Merge pull request #22099 from edx/revert-22058-julianajlk/REV-980/first-purchase-discount-courseware 
Revert "add first purchase discount to courseware (#22058)"
 2019-10-22 09:39:08 -04:00
Manjinder Singh
936e1d48a3 BOM-928: Fixing test error due to dict ordering (#22055) 
* Fixing test error due to dict ordering

* Dict ordering fixes

* replacing dict with list to maintain consistency

* better html parsing
 2019-10-22 09:30:24 -04:00
Feanil Patel
aa25b4a365 Merge pull request #22097 from edx/feanil/fix_sandbox_issues 
Feanil/fix sandbox issues
 2019-10-21 14:08:29 -04:00
julianajlk
98f907f23c Revert "add first purchase discount to courseware (#22058)" 
This reverts commit 059b619794.
 2019-10-21 13:57:18 -04:00
julianajlk
059b619794 add first purchase discount to courseware (#22058) 
REV-980.
* moved get_first_purchase_offer_banner_fragment to Discounts utils.py
* added banner wrapper method
* updated banner with time limit
 2019-10-21 13:56:38 -04:00
Feanil Patel
798dde2156 Fix type mismatches in the course_modes migrations. 
Mixing byte and unicode strings causes migrations to fail.
 2019-10-21 10:56:50 -04:00
Awais Qureshi
91e5ab93de Merge pull request #22073 from edx/awais786/accept_tests 
Fixing python3 ordering issue in acceptance tests.
 2019-10-21 17:15:53 +05:00
Aarif
75e2df1476 Merge pull request #22074 from edx/BOM-934 
Fix: Bokchoy "TypeError: write() argument must be str, not bytes"
 2019-10-21 17:00:48 +05:00
aarif
4e0684a363 updated the social link creation to send back social links sorted 
reverted unnecessary changes

added pylint supression for quality error fix
 2019-10-21 16:10:00 +05:00
aarif
8910a83ffd updated the csv writer for python 3 
re arranged the imports to fix quality errors
 2019-10-21 15:01:17 +05:00
Awais Qureshi
a22bcd5805 BOM-935 
Fixing python3 ordering issue in acceptance tests.
 2019-10-20 01:19:09 +05:00
Awais Qureshi
8882b8c60d Merge pull request #22078 from edx/awais786/BOM-937 
BOM-937
 2019-10-19 10:11:43 +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
Kyle McCormick
cd3bc236eb Make the team discussion thread private 
Develop the capability to allow instructors to designate teams to have private discussions. This way, so non-teammembers cannot view discussion. And the intend is for course teams to manage the team membership as well.
MST-10
 2019-10-18 13:06:50 -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
Awais Qureshi
0c6c3a6f47 BOM-937 
Open a file in read binary mode to avoid bytes issues.
 2019-10-18 20:02:57 +05:00
Michael Terry
8e832a3c6a Show Display Name advanced field again 
We had hidden it when using Publisher. But there are valid use
cases for editing it, so we're adding it back again.

DISCO-1390
 2019-10-18 10:40:49 -04:00
Awais Qureshi
544959026a BOM-937 
Open a file in read binary mode to avoid bytes issues.
 2019-10-18 19:40:33 +05:00
Manjinder Singh
e4b30e7bf3 BOM-931: explicitly setting strings to unicode (#22064) 
* explicitly setting strings to unicode
 2019-10-17 15:32:58 -04:00
Calen Pennington
97cc816d0b Pre-select the course overview during dashboard loading 2019-10-17 13:02:02 -04:00
Calen Pennington
7ceb0e30fa Mark course outline with graded and scored status in the DOM so that we can run optimizely code on them 2019-10-17 12:14:49 -04:00
Jeremy Bowman
e258fab1ea Fix YouTube stub under Python 3 BOM-930 (#22056) 2019-10-17 10:43:04 -04:00
edX Transifex Bot
e3479587d2 geoip2: update maxmind geolite country database 2019-10-16 17:03:32 -04:00
Aarif
47e1785a89 Merge pull request #21990 from edx/BOM-911 
Added the util to handle bytes input to json.loads function - BOM-911
 2019-10-17 01:24:36 +05:00
Mahyar Damavand
8c55e11d1f Fix code quality test failures 2019-10-16 22:30:31 +03:30
Matthew Piatetsky
7436f9c186 Merge pull request #21915 from edx/REV-733 
[REV-733] check if discount expired
 2019-10-16 12:03:58 -04:00
Matthew Piatetsky
f6d0bf77df check if discount expired 2019-10-16 11:32:27 -04:00
Chris Pappas
0e1dba1b24 ENT-1289 | Running make upgrade to bump edx-enterprise (#22047) 2019-10-16 10:18:15 -04:00
edX cache uploader bot
c27643e5ce Updating Bokchoy testing database cache (#22049) 2019-10-16 10:15:41 -04:00
aarif
164141def9 replaced json.loads with a util to handle bytes 
changes made to fix jenkins/quality errors

changes made as suggested

added the docstring to fix quality issue

made a few changes to fix some tests

replaced json.loads with a util to handle bytes

changes made to fix jenkins/quality errors

changes made as suggested

added the docstring to fix quality issue

made a few changes to fix some tests

made changes as suggested

made changes as suggested

updated the requirements with make upgrade
 2019-10-16 12:14:01 +05:00
Aarif
6e7f2f61ef Merge pull request #21994 from edx/BOM-914 
Fixed all instances of "TypeError: a bytes-like object is required, not 'str" - BOM-914
 2019-10-16 01:44:31 +05:00
edX cache uploader bot
f37de7464c Updating Bokchoy testing database cache (#22044) 2019-10-15 14:29:16 -04:00
Mahyar Damavand
810eea0e51 Fix celery send_activation_email task failure 2019-10-15 18:30:13 +03:30
Bill DeRusha
d9180b472d Merge pull request #22006 from edx/bderusha/remove-mailchimp 
remove mailchimp tracking
 2019-10-15 09:47:08 -04:00
Christie Rice
1d5fcc60bb ENT-1604 Send signal when user is verified via SSO (#21946) 2019-10-15 08:18:54 -04:00
Aarif
6304aa5b9b Merge pull request #22030 from edx/BOM-922 
Fixed - " AttributeError: 'str' object has no attribute 'decode' " - BOM-922
 2019-10-15 16:21:25 +05:00
Shadi Naif
7984c37a4f Convert Account Activation Emails to edx-ACE 2019-10-14 17:22:03 +03:30
aarif
d176957708 Updated the tests to fix the string/bytes input 
changes made to pass tests with python 2 and other minor changes

Updated the tests to fix the string/bytes input

changes made to pass tests with python 2 and other minor changes

made some changes as suggested

made changes as suggested

changes made as suggested
 2019-10-14 18:47:18 +05:00
Ayub
8aa2fad4ec Merge pull request #21988 from edx/BOM-898 
BOM fix remaining capa module issues
 2019-10-14 17:33:27 +05:00
aarif
ea4557ff70 removed unnecesary transcript decode 2019-10-14 17:28:47 +05:00
Ayub
dbc27fd57d Merge pull request #21921 from edx/BOM-805 
BOM-805
 2019-10-14 16:42:26 +05:00
Ayub khan
8717510d35 BOM-805 
python3 compatibility: Before comparison with unicode decode text if its type is bytes.
 2019-10-14 15:15:28 +05:00