Commit Graph

17531 Commits

Author SHA1 Message Date
Uzair Rasheed
a32786a184 Merge pull request #22111 from edx/PROD-769/add-warning-to-verification-card
Add warning to the bottom of verification status card on dashboard.
2019-10-28 13:25:56 +05:00
Awais Qureshi
c3733d05e0 Merge pull request #22154 from edx/awais786/BOM-995
BOM-995
2019-10-28 11:40:40 +05:00
Awais Qureshi
2760d401c7 BOM-995
Fixing acceptance test.
2019-10-26 15:05:33 +05:00
Aarif
4285d265b8 Merge pull request #22128 from edx/BOM-992
changes made to sanitize the urls for consistent comparison - BOM-992
2019-10-25 23:20:25 +05:00
edX cache uploader bot
468b4771d4 Updating Bokchoy testing database cache (#22157) 2019-10-25 10:48:10 -04:00
Matthew Piatetsky
9df790cca5 Merge pull request #22123 from edx/REV-728
[REV-728] add discount percentage configuration
2019-10-25 10:10:20 -04:00
uzairr
386e05d3b1 Add warning to the bottom of verification status card on dashboard.
Learners are not allowed to make an attempt of the procotored exam if
they verify their identity near to proctored exam date.To make them,
aware about their expiry date, modification are done to the status card
so that user experience will be improved.

PROD-769
2019-10-25 18:09:39 +05:00
aarif
45338f4160 changes made to sanitize the urls for consistent comparison
changes made to finalize the url sanitization to make url comparison consistent

changes made to avoid running sanitize in python 2

changes made to substitute proper query param in url for comparison

changes made to split and compare the query parameter with expected url

updated the split logic to properly split/slice url parts for comparison

updated the dashboard template to remove encode and avoid bytes encoded embeded url

updated the dashboard template to enclose social media urls with unicode
2019-10-25 15:20:32 +05:00
Awais Qureshi
2cf8341189 Merge pull request #22138 from edx/awais786/BOM-968
BOM-968
2019-10-25 14:55:27 +05:00
Ayub
8cc509e448 Merge pull request #22107 from edx/BOM-949
BOM-949
2019-10-25 11:01:51 +05: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
edX cache uploader bot
2ccbeda27d Updating Bokchoy testing database cache (#22148) 2019-10-24 15:05:24 -04:00
Jason Myatt
da90e2e851 Merge pull request #22131 from edx/jmyatt/enable_null_order_numbers_in_entitlements_admin
Allow empty order numbers in django admin for Entitlements
2019-10-24 14:21:15 -04:00
Feanil Patel
b5a765e676 Merge pull request #22135 from edx/feanil/fix_show_answer_render
Pass back the answer html as a string instead of bytes.
2019-10-24 13:59:53 -04:00
Manjinder Singh
7f3045cf75 BOM-933: Fix type mismatches in various migrations 4 (#22146)
* fix type mismatch in course_goals  migrations

* fix type mismatch in experiments  migrations

* fix type mismatch in xblock_django  migrations

* fix type mismatch in catalog  migrations

* fix type mismatch in static_replace  migrations

* fix type mismatch in bulk_email  migrations

* fix type mismatch in course_overviews migrations
2019-10-24 13:47:51 -04:00
Jeremy Bowman
05e9e56d56 Fix CSS selector under Python 3 BOM-991 (#22124) 2019-10-24 13:19:18 -04:00
Jason Myatt
c30865cce6 Allow empty order numbers in django admin for Entitlements 2019-10-24 12:52:41 -04:00
Manjinder Singh
a384e753fd BOM-933: Fix type mismatches in various migrations (#22112)
* Fix type mismatches in the course_modes migrations

* Fix type mismatches in the course_action_state migrations

* Fix type mismatches in the schedules migrations

* Fix type mismatches in grades migrations

* Fix type mismatches in video_pipeline

* Fix type mismatches in api_admin

* Fix mismatches in credential migrations
2019-10-24 11:42:39 -04:00
Feanil Patel
c009d4550a Pass back the answer html as a string instead of bytes.
We did this already for the 'get_html' function for a capa problem but
there wasn't a test to ensure this works correctly for the
get_question_answer function that powers the show answer button.

I ran into it while doing a quick smoke test on the python 3 sandbox.
2019-10-24 09:46:26 -04:00
Awais Qureshi
6abaf893f1 BOM-968
Fixing migrations.
2019-10-24 15:21:13 +05:00
Ayub khan
897bd25b01 BOM-949
student: Explicitly Set fields to unicode to avoid migration
2019-10-24 13:16:57 +05:00
edX Transifex Bot
28a48fe6a6 geoip2: update maxmind geolite country database 2019-10-23 16:58:32 -04:00
Manjinder Singh
a40f1d9bd6 BOM-933: Fix type mismatches in various migrations 2 (#22115)
* Fix type mismatches in track migrations

* Fix type mismatches in oauth_dispatch

* Fix type mismatches in badges migrations

* fix type mismatch in contentserver migrations

* Fix type mismatches in mobile_api migrations

* fix type mismatch in crawlers migrations

* fix type mismatch in dark_lang migrations

* fix type mismatch in branding  migrations
2019-10-23 13:04:36 -04:00
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